diff options
-rw-r--r-- | drivers/ata/ahci.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 6b91c26a4635..cd832cb69492 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
@@ -313,7 +313,6 @@ static void ahci_error_handler(struct ata_port *ap); | |||
313 | static void ahci_post_internal_cmd(struct ata_queued_cmd *qc); | 313 | static void ahci_post_internal_cmd(struct ata_queued_cmd *qc); |
314 | static int ahci_port_resume(struct ata_port *ap); | 314 | static int ahci_port_resume(struct ata_port *ap); |
315 | static void ahci_dev_config(struct ata_device *dev); | 315 | static void ahci_dev_config(struct ata_device *dev); |
316 | static unsigned int ahci_fill_sg(struct ata_queued_cmd *qc, void *cmd_tbl); | ||
317 | static void ahci_fill_cmd_slot(struct ahci_port_priv *pp, unsigned int tag, | 316 | static void ahci_fill_cmd_slot(struct ahci_port_priv *pp, unsigned int tag, |
318 | u32 opts); | 317 | u32 opts); |
319 | #ifdef CONFIG_PM | 318 | #ifdef CONFIG_PM |
@@ -404,14 +403,14 @@ static struct ata_port_operations ahci_sb600_ops = { | |||
404 | #define AHCI_HFLAGS(flags) .private_data = (void *)(flags) | 403 | #define AHCI_HFLAGS(flags) .private_data = (void *)(flags) |
405 | 404 | ||
406 | static const struct ata_port_info ahci_port_info[] = { | 405 | static const struct ata_port_info ahci_port_info[] = { |
407 | /* board_ahci */ | 406 | [board_ahci] = |
408 | { | 407 | { |
409 | .flags = AHCI_FLAG_COMMON, | 408 | .flags = AHCI_FLAG_COMMON, |
410 | .pio_mask = ATA_PIO4, | 409 | .pio_mask = ATA_PIO4, |
411 | .udma_mask = ATA_UDMA6, | 410 | .udma_mask = ATA_UDMA6, |
412 | .port_ops = &ahci_ops, | 411 | .port_ops = &ahci_ops, |
413 | }, | 412 | }, |
414 | /* board_ahci_vt8251 */ | 413 | [board_ahci_vt8251] = |
415 | { | 414 | { |
416 | AHCI_HFLAGS (AHCI_HFLAG_NO_NCQ | AHCI_HFLAG_NO_PMP), | 415 | AHCI_HFLAGS (AHCI_HFLAG_NO_NCQ | AHCI_HFLAG_NO_PMP), |
417 | .flags = AHCI_FLAG_COMMON, | 416 | .flags = AHCI_FLAG_COMMON, |
@@ -419,7 +418,7 @@ static const struct ata_port_info ahci_port_info[] = { | |||
419 | .udma_mask = ATA_UDMA6, | 418 | .udma_mask = ATA_UDMA6, |
420 | .port_ops = &ahci_vt8251_ops, | 419 | .port_ops = &ahci_vt8251_ops, |
421 | }, | 420 | }, |
422 | /* board_ahci_ign_iferr */ | 421 | [board_ahci_ign_iferr] = |
423 | { | 422 | { |
424 | AHCI_HFLAGS (AHCI_HFLAG_IGN_IRQ_IF_ERR), | 423 | AHCI_HFLAGS (AHCI_HFLAG_IGN_IRQ_IF_ERR), |
425 | .flags = AHCI_FLAG_COMMON, | 424 | .flags = AHCI_FLAG_COMMON, |
@@ -427,7 +426,7 @@ static const struct ata_port_info ahci_port_info[] = { | |||
427 | .udma_mask = ATA_UDMA6, | 426 | .udma_mask = ATA_UDMA6, |
428 | .port_ops = &ahci_ops, | 427 | .port_ops = &ahci_ops, |
429 | }, | 428 | }, |
430 | /* board_ahci_sb600 */ | 429 | [board_ahci_sb600] = |
431 | { | 430 | { |
432 | AHCI_HFLAGS (AHCI_HFLAG_IGN_SERR_INTERNAL | | 431 | AHCI_HFLAGS (AHCI_HFLAG_IGN_SERR_INTERNAL | |
433 | AHCI_HFLAG_32BIT_ONLY | AHCI_HFLAG_NO_MSI | | 432 | AHCI_HFLAG_32BIT_ONLY | AHCI_HFLAG_NO_MSI | |
@@ -437,7 +436,7 @@ static const struct ata_port_info ahci_port_info[] = { | |||
437 | .udma_mask = ATA_UDMA6, | 436 | .udma_mask = ATA_UDMA6, |
438 | .port_ops = &ahci_sb600_ops, | 437 | .port_ops = &ahci_sb600_ops, |
439 | }, | 438 | }, |
440 | /* board_ahci_mv */ | 439 | [board_ahci_mv] = |
441 | { | 440 | { |
442 | AHCI_HFLAGS (AHCI_HFLAG_NO_NCQ | AHCI_HFLAG_NO_MSI | | 441 | AHCI_HFLAGS (AHCI_HFLAG_NO_NCQ | AHCI_HFLAG_NO_MSI | |
443 | AHCI_HFLAG_MV_PATA | AHCI_HFLAG_NO_PMP), | 442 | AHCI_HFLAG_MV_PATA | AHCI_HFLAG_NO_PMP), |
@@ -447,7 +446,7 @@ static const struct ata_port_info ahci_port_info[] = { | |||
447 | .udma_mask = ATA_UDMA6, | 446 | .udma_mask = ATA_UDMA6, |
448 | .port_ops = &ahci_ops, | 447 | .port_ops = &ahci_ops, |
449 | }, | 448 | }, |
450 | /* board_ahci_sb700, for SB700 and SB800 */ | 449 | [board_ahci_sb700] = /* for SB700 and SB800 */ |
451 | { | 450 | { |
452 | AHCI_HFLAGS (AHCI_HFLAG_IGN_SERR_INTERNAL), | 451 | AHCI_HFLAGS (AHCI_HFLAG_IGN_SERR_INTERNAL), |
453 | .flags = AHCI_FLAG_COMMON, | 452 | .flags = AHCI_FLAG_COMMON, |
@@ -455,7 +454,7 @@ static const struct ata_port_info ahci_port_info[] = { | |||
455 | .udma_mask = ATA_UDMA6, | 454 | .udma_mask = ATA_UDMA6, |
456 | .port_ops = &ahci_sb600_ops, | 455 | .port_ops = &ahci_sb600_ops, |
457 | }, | 456 | }, |
458 | /* board_ahci_mcp65 */ | 457 | [board_ahci_mcp65] = |
459 | { | 458 | { |
460 | AHCI_HFLAGS (AHCI_HFLAG_YES_NCQ), | 459 | AHCI_HFLAGS (AHCI_HFLAG_YES_NCQ), |
461 | .flags = AHCI_FLAG_COMMON, | 460 | .flags = AHCI_FLAG_COMMON, |
@@ -463,7 +462,7 @@ static const struct ata_port_info ahci_port_info[] = { | |||
463 | .udma_mask = ATA_UDMA6, | 462 | .udma_mask = ATA_UDMA6, |
464 | .port_ops = &ahci_ops, | 463 | .port_ops = &ahci_ops, |
465 | }, | 464 | }, |
466 | /* board_ahci_nopmp */ | 465 | [board_ahci_nopmp] = |
467 | { | 466 | { |
468 | AHCI_HFLAGS (AHCI_HFLAG_NO_PMP), | 467 | AHCI_HFLAGS (AHCI_HFLAG_NO_PMP), |
469 | .flags = AHCI_FLAG_COMMON, | 468 | .flags = AHCI_FLAG_COMMON, |