tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[libata] ahci: use less error-prone array initializers

Also, remove unneeded prototype.

Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

authored by

Jeff Garzik and committed by
Jeff Garzik 4da646b7 07a2039b

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