mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-07-22 03:27:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

ata: Use named initializers for pci_device_id arrays

Browse Source 
While being less compact, using named initializers allows to more easily
see which members of the structs are assigned which value without having
to lookup the declaration of the struct. And it's also more robust
against changes to the struct definition.

The mentioned robustness is relevant for a planned change to struct
pci_device_id that replaces .driver_data by an anonymous union.

Also drop the comma after a few list terminators.

This patch doesn't modify the compiled array, only their representation
in source form benefits. The former was confirmed with x86 and arm64
builds.

Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
Signed-off-by: Niklas Cassel <cassel@kernel.org>
This commit is contained in:
Uwe Kleine-König (The Capable Hub)
2026-06-12 10:21:48 +02:00
committed by Niklas Cassel
parent 3b5b35f28e
commit 21e7b9710a
25 changed files with 1932 additions and 700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/ata/acard-ahci.c
View File

@@ -91,9 +91,11 @@ static const struct ata_port_info acard_ahci_port_info[] = {
};
static const struct pci_device_id acard_ahci_pci_tbl[] = {
/* ACard */
{ PCI_VDEVICE(ARTOP, 0x000d), board_acard_ahci }, /* ATP8620 */
{
/* ACard ATP8620 */
PCI_VDEVICE(ARTOP, 0x000d),
.driver_data = board_acard_ahci,
},
{ } /* terminate list */
};

1626
drivers/ata/ahci.c
View File

File diff suppressed because it is too large Load Diff

532
drivers/ata/ata_piix.c
View File

@@ -154,184 +154,364 @@ static unsigned int in_module_init = 1;
static const struct pci_device_id piix_pci_tbl[] = {
/* Intel PIIX3 for the 430HX etc */
{ 0x8086, 0x7010, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_mwdma },
/* VMware ICH4 */
{ 0x8086, 0x7111, 0x15ad, 0x1976, 0, 0, piix_pata_vmw },
/* Intel PIIX4 for the 430TX/440BX/MX chipset: UDMA 33 */
/* Also PIIX4E (fn3 rev 2) and PIIX4M (fn3 rev 3) */
{ 0x8086, 0x7111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
/* Intel PIIX4 */
{ 0x8086, 0x7199, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
/* Intel PIIX4 */
{ 0x8086, 0x7601, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
/* Intel PIIX */
{ 0x8086, 0x84CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
/* Intel ICH (i810, i815, i840) UDMA 66*/
{ 0x8086, 0x2411, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_66 },
/* Intel ICH0 : UDMA 33*/
{ 0x8086, 0x2421, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_33 },
/* Intel ICH2M */
{ 0x8086, 0x244A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
/* Intel ICH2 (i810E2, i845, 850, 860) UDMA 100 */
{ 0x8086, 0x244B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
/* Intel ICH3M */
{ 0x8086, 0x248A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
/* Intel ICH3 (E7500/1) UDMA 100 */
{ 0x8086, 0x248B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
/* Intel ICH4-L */
{ 0x8086, 0x24C1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
/* Intel ICH4 (i845GV, i845E, i852, i855) UDMA 100 */
{ 0x8086, 0x24CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
{ 0x8086, 0x24CB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
/* Intel ICH5 */
{ 0x8086, 0x24DB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
/* C-ICH (i810E2) */
{ 0x8086, 0x245B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
/* ESB (855GME/875P + 6300ESB) UDMA 100 */
{ 0x8086, 0x25A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
/* ICH6 (and 6) (i915) UDMA 100 */
{ 0x8086, 0x266F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
/* ICH7/7-R (i945, i975) UDMA 100*/
{ 0x8086, 0x27DF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100_nomwdma1 },
{ 0x8086, 0x269E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100_nomwdma1 },
/* ICH8 Mobile PATA Controller */
{ 0x8086, 0x2850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
{
PCI_DEVICE(0x8086, 0x7010),
.driver_data = piix_pata_mwdma,
}, {
/* VMware ICH4 */
PCI_DEVICE_SUB(0x8086, 0x7111, 0x15ad, 0x1976),
.driver_data = piix_pata_vmw,
}, {
/* Intel PIIX4 for the 430TX/440BX/MX chipset: UDMA 33 */
/* Also PIIX4E (fn3 rev 2) and PIIX4M (fn3 rev 3) */
PCI_DEVICE(0x8086, 0x7111),
.driver_data = piix_pata_33,
}, {
/* Intel PIIX4 */
PCI_DEVICE(0x8086, 0x7199),
.driver_data = piix_pata_33,
}, {
/* Intel PIIX4 */
PCI_DEVICE(0x8086, 0x7601),
.driver_data = piix_pata_33,
}, {
/* Intel PIIX */
PCI_DEVICE(0x8086, 0x84CA),
.driver_data = piix_pata_33,
}, {
/* Intel ICH (i810, i815, i840) UDMA 66*/
PCI_DEVICE(0x8086, 0x2411),
.driver_data = ich_pata_66,
}, {
/* Intel ICH0 : UDMA 33*/
PCI_DEVICE(0x8086, 0x2421),
.driver_data = ich_pata_33,
}, {
/* Intel ICH2M */
PCI_DEVICE(0x8086, 0x244A),
.driver_data = ich_pata_100,
}, {
/* Intel ICH2 (i810E2, i845, 850, 860) UDMA 100 */
PCI_DEVICE(0x8086, 0x244B),
.driver_data = ich_pata_100,
}, {
/* Intel ICH3M */
PCI_DEVICE(0x8086, 0x248A),
.driver_data = ich_pata_100,
}, {
/* Intel ICH3 (E7500/1) UDMA 100 */
PCI_DEVICE(0x8086, 0x248B),
.driver_data = ich_pata_100,
}, {
/* Intel ICH4-L */
PCI_DEVICE(0x8086, 0x24C1),
.driver_data = ich_pata_100,
}, {
/* Intel ICH4 (i845GV, i845E, i852, i855) UDMA 100 */
PCI_DEVICE(0x8086, 0x24CA),
.driver_data = ich_pata_100,
}, {
PCI_DEVICE(0x8086, 0x24CB),
.driver_data = ich_pata_100,
}, {
/* Intel ICH5 */
PCI_DEVICE(0x8086, 0x24DB),
.driver_data = ich_pata_100,
}, {
/* C-ICH (i810E2) */
PCI_DEVICE(0x8086, 0x245B),
.driver_data = ich_pata_100,
}, {
/* ESB (855GME/875P + 6300ESB) UDMA 100 */
PCI_DEVICE(0x8086, 0x25A2),
.driver_data = ich_pata_100,
}, {
/* ICH6 (and 6) (i915) UDMA 100 */
PCI_DEVICE(0x8086, 0x266F),
.driver_data = ich_pata_100,
}, {
/* ICH7/7-R (i945, i975) UDMA 100*/
PCI_DEVICE(0x8086, 0x27DF),
.driver_data = ich_pata_100_nomwdma1,
}, {
PCI_DEVICE(0x8086, 0x269E),
.driver_data = ich_pata_100_nomwdma1,
}, {
/* ICH8 Mobile PATA Controller */
PCI_DEVICE(0x8086, 0x2850),
.driver_data = ich_pata_100,
},
/* SATA ports */
/* 82801EB (ICH5) */
{ 0x8086, 0x24d1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata },
/* 82801EB (ICH5) */
{ 0x8086, 0x24df, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata },
/* 6300ESB (ICH5 variant with broken PCS present bits) */
{ 0x8086, 0x25a3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata },
/* 6300ESB pretending RAID */
{ 0x8086, 0x25b0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata },
/* 82801FB/FW (ICH6/ICH6W) */
{ 0x8086, 0x2651, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata },
/* 82801FR/FRW (ICH6R/ICH6RW) */
{ 0x8086, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata },
/* 82801FBM ICH6M (ICH6R with only port 0 and 2 implemented).
* Attach iff the controller is in IDE mode. */
{ 0x8086, 0x2653, PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_STORAGE_IDE << 8, 0xffff00, ich6m_sata },
/* 82801GB/GR/GH (ICH7, identical to ICH6) */
{ 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata },
/* 82801GBM/GHM (ICH7M, identical to ICH6M) */
{ 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6m_sata },
/* Enterprise Southbridge 2 (631xESB/632xESB) */
{ 0x8086, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata },
/* SATA Controller 1 IDE (ICH8) */
{ 0x8086, 0x2820, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
/* SATA Controller 2 IDE (ICH8) */
{ 0x8086, 0x2825, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* Mobile SATA Controller IDE (ICH8M), Apple */
{ 0x8086, 0x2828, 0x106b, 0x00a0, 0, 0, ich8m_apple_sata },
{ 0x8086, 0x2828, 0x106b, 0x00a1, 0, 0, ich8m_apple_sata },
{ 0x8086, 0x2828, 0x106b, 0x00a3, 0, 0, ich8m_apple_sata },
/* Mobile SATA Controller IDE (ICH8M) */
{ 0x8086, 0x2828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
/* SATA Controller IDE (ICH9) */
{ 0x8086, 0x2920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
/* SATA Controller IDE (ICH9) */
{ 0x8086, 0x2921, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (ICH9) */
{ 0x8086, 0x2926, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (ICH9M) */
{ 0x8086, 0x2928, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (ICH9M) */
{ 0x8086, 0x292d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (ICH9M) */
{ 0x8086, 0x292e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
/* SATA Controller IDE (Tolapai) */
{ 0x8086, 0x5028, PCI_ANY_ID, PCI_ANY_ID, 0, 0, tolapai_sata },
/* SATA Controller IDE (ICH10) */
{ 0x8086, 0x3a00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
/* SATA Controller IDE (ICH10) */
{ 0x8086, 0x3a06, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (ICH10) */
{ 0x8086, 0x3a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
/* SATA Controller IDE (ICH10) */
{ 0x8086, 0x3a26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (PCH) */
{ 0x8086, 0x3b20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
/* SATA Controller IDE (PCH) */
{ 0x8086, 0x3b21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (PCH) */
{ 0x8086, 0x3b26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (PCH) */
{ 0x8086, 0x3b28, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
/* SATA Controller IDE (PCH) */
{ 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (PCH) */
{ 0x8086, 0x3b2e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
/* SATA Controller IDE (CPT) */
{ 0x8086, 0x1c00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
/* SATA Controller IDE (CPT) */
{ 0x8086, 0x1c01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
/* SATA Controller IDE (CPT) */
{ 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (CPT) */
{ 0x8086, 0x1c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (PBG) */
{ 0x8086, 0x1d00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
/* SATA Controller IDE (PBG) */
{ 0x8086, 0x1d08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (Panther Point) */
{ 0x8086, 0x1e00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
/* SATA Controller IDE (Panther Point) */
{ 0x8086, 0x1e01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
/* SATA Controller IDE (Panther Point) */
{ 0x8086, 0x1e08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (Panther Point) */
{ 0x8086, 0x1e09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (Lynx Point) */
{ 0x8086, 0x8c00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
/* SATA Controller IDE (Lynx Point) */
{ 0x8086, 0x8c01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
/* SATA Controller IDE (Lynx Point) */
{ 0x8086, 0x8c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_snb },
/* SATA Controller IDE (Lynx Point) */
{ 0x8086, 0x8c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (Lynx Point-LP) */
{ 0x8086, 0x9c00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
/* SATA Controller IDE (Lynx Point-LP) */
{ 0x8086, 0x9c01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
/* SATA Controller IDE (Lynx Point-LP) */
{ 0x8086, 0x9c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (Lynx Point-LP) */
{ 0x8086, 0x9c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (DH89xxCC) */
{ 0x8086, 0x2326, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (Avoton) */
{ 0x8086, 0x1f20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
/* SATA Controller IDE (Avoton) */
{ 0x8086, 0x1f21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
/* SATA Controller IDE (Avoton) */
{ 0x8086, 0x1f30, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (Avoton) */
{ 0x8086, 0x1f31, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (Wellsburg) */
{ 0x8086, 0x8d00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
/* SATA Controller IDE (Wellsburg) */
{ 0x8086, 0x8d08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_snb },
/* SATA Controller IDE (Wellsburg) */
{ 0x8086, 0x8d60, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
/* SATA Controller IDE (Wellsburg) */
{ 0x8086, 0x8d68, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (BayTrail) */
{ 0x8086, 0x0F20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_byt },
{ 0x8086, 0x0F21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_byt },
/* SATA Controller IDE (Coleto Creek) */
{ 0x8086, 0x23a6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (9 Series) */
{ 0x8086, 0x8c88, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_snb },
/* SATA Controller IDE (9 Series) */
{ 0x8086, 0x8c89, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_snb },
/* SATA Controller IDE (9 Series) */
{ 0x8086, 0x8c80, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
/* SATA Controller IDE (9 Series) */
{ 0x8086, 0x8c81, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
{
/* 82801EB (ICH5) */
PCI_DEVICE(0x8086, 0x24d1),
.driver_data = ich5_sata,
}, {
/* 82801EB (ICH5) */
PCI_DEVICE(0x8086, 0x24df),
.driver_data = ich5_sata,
}, {
/* 6300ESB (ICH5 variant with broken PCS present bits) */
PCI_DEVICE(0x8086, 0x25a3),
.driver_data = ich5_sata,
}, {
/* 6300ESB pretending RAID */
PCI_DEVICE(0x8086, 0x25b0),
.driver_data = ich5_sata,
}, {
/* 82801FB/FW (ICH6/ICH6W) */
PCI_DEVICE(0x8086, 0x2651),
.driver_data = ich6_sata,
}, {
/* 82801FR/FRW (ICH6R/ICH6RW) */
PCI_DEVICE(0x8086, 0x2652),
.driver_data = ich6_sata,
}, {
/* 82801FBM ICH6M (ICH6R with only port 0 and 2 implemented).
* Attach iff the controller is in IDE mode. */
PCI_DEVICE(0x8086, 0x2653),
.class = PCI_CLASS_STORAGE_IDE << 8,
.class_mask = 0xffff00,
.driver_data = ich6m_sata,
}, {
/* 82801GB/GR/GH (ICH7, identical to ICH6) */
PCI_DEVICE(0x8086, 0x27c0),
.driver_data = ich6_sata,
}, {
/* 82801GBM/GHM (ICH7M, identical to ICH6M) */
PCI_DEVICE(0x8086, 0x27c4),
.driver_data = ich6m_sata,
}, {
/* Enterprise Southbridge 2 (631xESB/632xESB) */
PCI_DEVICE(0x8086, 0x2680),
.driver_data = ich6_sata,
}, {
/* SATA Controller 1 IDE (ICH8) */
PCI_DEVICE(0x8086, 0x2820),
.driver_data = ich8_sata,
}, {
/* SATA Controller 2 IDE (ICH8) */
PCI_DEVICE(0x8086, 0x2825),
.driver_data = ich8_2port_sata,
}, {
/* Mobile SATA Controller IDE (ICH8M), Apple */
PCI_DEVICE_SUB(0x8086, 0x2828, 0x106b, 0x00a0),
.driver_data = ich8m_apple_sata,
}, {
PCI_DEVICE_SUB(0x8086, 0x2828, 0x106b, 0x00a1),
.driver_data = ich8m_apple_sata,
}, {
PCI_DEVICE_SUB(0x8086, 0x2828, 0x106b, 0x00a3),
.driver_data = ich8m_apple_sata,
}, {
/* Mobile SATA Controller IDE (ICH8M) */
PCI_DEVICE(0x8086, 0x2828),
.driver_data = ich8_sata,
}, {
/* SATA Controller IDE (ICH9) */
PCI_DEVICE(0x8086, 0x2920),
.driver_data = ich8_sata,
}, {
/* SATA Controller IDE (ICH9) */
PCI_DEVICE(0x8086, 0x2921),
.driver_data = ich8_2port_sata,
}, {
/* SATA Controller IDE (ICH9) */
PCI_DEVICE(0x8086, 0x2926),
.driver_data = ich8_2port_sata,
}, {
/* SATA Controller IDE (ICH9M) */
PCI_DEVICE(0x8086, 0x2928),
.driver_data = ich8_2port_sata,
}, {
/* SATA Controller IDE (ICH9M) */
PCI_DEVICE(0x8086, 0x292d),
.driver_data = ich8_2port_sata,
}, {
/* SATA Controller IDE (ICH9M) */
PCI_DEVICE(0x8086, 0x292e),
.driver_data = ich8_sata,
}, {
/* SATA Controller IDE (Tolapai) */
PCI_DEVICE(0x8086, 0x5028),
.driver_data = tolapai_sata,
}, {
/* SATA Controller IDE (ICH10) */
PCI_DEVICE(0x8086, 0x3a00),
.driver_data = ich8_sata,
}, {
/* SATA Controller IDE (ICH10) */
PCI_DEVICE(0x8086, 0x3a06),
.driver_data = ich8_2port_sata,
}, {
/* SATA Controller IDE (ICH10) */
PCI_DEVICE(0x8086, 0x3a20),
.driver_data = ich8_sata,
}, {
/* SATA Controller IDE (ICH10) */
PCI_DEVICE(0x8086, 0x3a26),
.driver_data = ich8_2port_sata,
}, {
/* SATA Controller IDE (PCH) */
PCI_DEVICE(0x8086, 0x3b20),
.driver_data = ich8_sata,
}, {
/* SATA Controller IDE (PCH) */
PCI_DEVICE(0x8086, 0x3b21),
.driver_data = ich8_2port_sata,
}, {
/* SATA Controller IDE (PCH) */
PCI_DEVICE(0x8086, 0x3b26),
.driver_data = ich8_2port_sata,
}, {
/* SATA Controller IDE (PCH) */
PCI_DEVICE(0x8086, 0x3b28),
.driver_data = ich8_sata,
}, {
/* SATA Controller IDE (PCH) */
PCI_DEVICE(0x8086, 0x3b2d),
.driver_data = ich8_2port_sata,
}, {
/* SATA Controller IDE (PCH) */
PCI_DEVICE(0x8086, 0x3b2e),
.driver_data = ich8_sata,
}, {
/* SATA Controller IDE (CPT) */
PCI_DEVICE(0x8086, 0x1c00),
.driver_data = ich8_sata_snb,
}, {
/* SATA Controller IDE (CPT) */
PCI_DEVICE(0x8086, 0x1c01),
.driver_data = ich8_sata_snb,
}, {
/* SATA Controller IDE (CPT) */
PCI_DEVICE(0x8086, 0x1c08),
.driver_data = ich8_2port_sata,
}, {
/* SATA Controller IDE (CPT) */
PCI_DEVICE(0x8086, 0x1c09),
.driver_data = ich8_2port_sata,
}, {
/* SATA Controller IDE (PBG) */
PCI_DEVICE(0x8086, 0x1d00),
.driver_data = ich8_sata_snb,
}, {
/* SATA Controller IDE (PBG) */
PCI_DEVICE(0x8086, 0x1d08),
.driver_data = ich8_2port_sata,
}, {
/* SATA Controller IDE (Panther Point) */
PCI_DEVICE(0x8086, 0x1e00),
.driver_data = ich8_sata_snb,
}, {
/* SATA Controller IDE (Panther Point) */
PCI_DEVICE(0x8086, 0x1e01),
.driver_data = ich8_sata_snb,
}, {
/* SATA Controller IDE (Panther Point) */
PCI_DEVICE(0x8086, 0x1e08),
.driver_data = ich8_2port_sata,
}, {
/* SATA Controller IDE (Panther Point) */
PCI_DEVICE(0x8086, 0x1e09),
.driver_data = ich8_2port_sata,
}, {
/* SATA Controller IDE (Lynx Point) */
PCI_DEVICE(0x8086, 0x8c00),
.driver_data = ich8_sata_snb,
}, {
/* SATA Controller IDE (Lynx Point) */
PCI_DEVICE(0x8086, 0x8c01),
.driver_data = ich8_sata_snb,
}, {
/* SATA Controller IDE (Lynx Point) */
PCI_DEVICE(0x8086, 0x8c08),
.driver_data = ich8_2port_sata_snb,
}, {
/* SATA Controller IDE (Lynx Point) */
PCI_DEVICE(0x8086, 0x8c09),
.driver_data = ich8_2port_sata,
}, {
/* SATA Controller IDE (Lynx Point-LP) */
PCI_DEVICE(0x8086, 0x9c00),
.driver_data = ich8_sata_snb,
}, {
/* SATA Controller IDE (Lynx Point-LP) */
PCI_DEVICE(0x8086, 0x9c01),
.driver_data = ich8_sata_snb,
}, {
/* SATA Controller IDE (Lynx Point-LP) */
PCI_DEVICE(0x8086, 0x9c08),
.driver_data = ich8_2port_sata,
}, {
/* SATA Controller IDE (Lynx Point-LP) */
PCI_DEVICE(0x8086, 0x9c09),
.driver_data = ich8_2port_sata,
}, {
/* SATA Controller IDE (DH89xxCC) */
PCI_DEVICE(0x8086, 0x2326),
.driver_data = ich8_2port_sata,
}, {
/* SATA Controller IDE (Avoton) */
PCI_DEVICE(0x8086, 0x1f20),
.driver_data = ich8_sata_snb,
}, {
/* SATA Controller IDE (Avoton) */
PCI_DEVICE(0x8086, 0x1f21),
.driver_data = ich8_sata_snb,
}, {
/* SATA Controller IDE (Avoton) */
PCI_DEVICE(0x8086, 0x1f30),
.driver_data = ich8_2port_sata,
}, {
/* SATA Controller IDE (Avoton) */
PCI_DEVICE(0x8086, 0x1f31),
.driver_data = ich8_2port_sata,
}, {
/* SATA Controller IDE (Wellsburg) */
PCI_DEVICE(0x8086, 0x8d00),
.driver_data = ich8_sata_snb,
}, {
/* SATA Controller IDE (Wellsburg) */
PCI_DEVICE(0x8086, 0x8d08),
.driver_data = ich8_2port_sata_snb,
}, {
/* SATA Controller IDE (Wellsburg) */
PCI_DEVICE(0x8086, 0x8d60),
.driver_data = ich8_sata_snb,
}, {
/* SATA Controller IDE (Wellsburg) */
PCI_DEVICE(0x8086, 0x8d68),
.driver_data = ich8_2port_sata,
}, {
/* SATA Controller IDE (BayTrail) */
PCI_DEVICE(0x8086, 0x0F20),
.driver_data = ich8_2port_sata_byt,
}, {
PCI_DEVICE(0x8086, 0x0F21),
.driver_data = ich8_2port_sata_byt,
}, {
/* SATA Controller IDE (Coleto Creek) */
PCI_DEVICE(0x8086, 0x23a6),
.driver_data = ich8_2port_sata,
}, {
/* SATA Controller IDE (9 Series) */
PCI_DEVICE(0x8086, 0x8c88),
.driver_data = ich8_2port_sata_snb,
}, {
/* SATA Controller IDE (9 Series) */
PCI_DEVICE(0x8086, 0x8c89),
.driver_data = ich8_2port_sata_snb,
}, {
/* SATA Controller IDE (9 Series) */
PCI_DEVICE(0x8086, 0x8c80),
.driver_data = ich8_sata_snb,
}, {
/* SATA Controller IDE (9 Series) */
PCI_DEVICE(0x8086, 0x8c81),
.driver_data = ich8_sata_snb,
},
{ } /* terminate list */
};

5
drivers/ata/pata_acpi.c
View File

@@ -257,7 +257,10 @@ static int pacpi_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
}
static const struct pci_device_id pacpi_pci_tbl[] = {
{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_IDE << 8, 0xFFFFFF00UL, 1},
{
PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_IDE << 8, 0xFFFFFF00UL),
.driver_data = 1, /* is this used at all? */
},
{ } /* terminate list */
};

88
drivers/ata/pata_amd.c
View File

@@ -597,29 +597,71 @@ static int amd_reinit_one(struct pci_dev *pdev)
#endif
static const struct pci_device_id amd[] = {
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_COBRA_7401), 0 },
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_VIPER_7409), 1 },
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_VIPER_7411), 3 },
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_OPUS_7441), 4 },
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_8111_IDE), 5 },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_IDE), 7 },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE), 8 },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE), 8 },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3_IDE), 8 },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_IDE), 8 },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE), 8 },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE), 8 },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE), 8 },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE), 8 },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE), 8 },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE), 8 },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP67_IDE), 8 },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_IDE), 8 },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP77_IDE), 8 },
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5536_IDE), 9 },
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5536_DEV_IDE), 9 },
{ },
{
PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_COBRA_7401),
.driver_data = 0,
}, {
PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_VIPER_7409),
.driver_data = 1,
}, {
PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_VIPER_7411),
.driver_data = 3,
}, {
PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_OPUS_7441),
.driver_data = 4,
}, {
PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_8111_IDE),
.driver_data = 5,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_IDE),
.driver_data = 7,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE),
.driver_data = 8,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE),
.driver_data = 8,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3_IDE),
.driver_data = 8,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_IDE),
.driver_data = 8,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE),
.driver_data = 8,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE),
.driver_data = 8,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE),
.driver_data = 8,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE),
.driver_data = 8,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE),
.driver_data = 8,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE),
.driver_data = 8,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP67_IDE),
.driver_data = 8,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_IDE),
.driver_data = 8,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP77_IDE),
.driver_data = 8,
}, {
PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5536_IDE),
.driver_data = 9,
}, {
PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5536_DEV_IDE),
.driver_data = 9
},
{ }
};
static struct pci_driver amd_pci_driver = {

11
drivers/ata/pata_artop.c
View File

@@ -421,12 +421,11 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
}
static const struct pci_device_id artop_pci_tbl[] = {
{ PCI_VDEVICE(ARTOP, 0x0005), 0 },
{ PCI_VDEVICE(ARTOP, 0x0006), 1 },
{ PCI_VDEVICE(ARTOP, 0x0007), 1 },
{ PCI_VDEVICE(ARTOP, 0x0008), 2 },
{ PCI_VDEVICE(ARTOP, 0x0009), 2 },
{ PCI_VDEVICE(ARTOP, 0x0005), .driver_data = 0 },
{ PCI_VDEVICE(ARTOP, 0x0006), .driver_data = 1 },
{ PCI_VDEVICE(ARTOP, 0x0007), .driver_data = 1 },
{ PCI_VDEVICE(ARTOP, 0x0008), .driver_data = 2 },
{ PCI_VDEVICE(ARTOP, 0x0009), .driver_data = 2 },
{ } /* terminate list */
};

11
drivers/ata/pata_cmd64x.c
View File

@@ -506,12 +506,11 @@ static int cmd64x_reinit_one(struct pci_dev *pdev)
#endif
static const struct pci_device_id cmd64x[] = {
{ PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_643), 0 },
{ PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_646), 1 },
{ PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_648), 5 },
{ PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_649), 6 },
{ },
{ PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_643), .driver_data = 0 },
{ PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_646), .driver_data = 1 },
{ PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_648), .driver_data = 5 },
{ PCI_VDEVICE(CMD, PCI_DEVICE_ID_CMD_649), .driver_data = 6 },
{ }
};
static struct pci_driver cmd64x_pci_driver = {

7
drivers/ata/pata_opti.c
View File

@@ -174,10 +174,9 @@ static int opti_init_one(struct pci_dev *dev, const struct pci_device_id *id)
}
static const struct pci_device_id opti[] = {
{ PCI_VDEVICE(OPTI, PCI_DEVICE_ID_OPTI_82C621), 0 },
{ PCI_VDEVICE(OPTI, PCI_DEVICE_ID_OPTI_82C825), 1 },
{ },
{ PCI_VDEVICE(OPTI, PCI_DEVICE_ID_OPTI_82C621), .driver_data = 0 },
{ PCI_VDEVICE(OPTI, PCI_DEVICE_ID_OPTI_82C825), .driver_data = 1 },
{ }
};
static struct pci_driver opti_pci_driver = {

30
drivers/ata/pata_pdc2027x.c
View File

@@ -100,14 +100,28 @@ static const struct pdc2027x_udma_timing {
};
static const struct pci_device_id pdc2027x_pci_tbl[] = {
{ PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20268), PDC_UDMA_100 },
{ PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20269), PDC_UDMA_133 },
{ PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20270), PDC_UDMA_100 },
{ PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20271), PDC_UDMA_133 },
{ PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20275), PDC_UDMA_133 },
{ PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20276), PDC_UDMA_133 },
{ PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20277), PDC_UDMA_133 },
{
PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20268),
.driver_data = PDC_UDMA_100,
}, {
PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20269),
.driver_data = PDC_UDMA_133,
}, {
PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20270),
.driver_data = PDC_UDMA_100,
}, {
PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20271),
.driver_data = PDC_UDMA_133,
}, {
PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20275),
.driver_data = PDC_UDMA_133,
}, {
PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20276),
.driver_data = PDC_UDMA_133,
}, {
PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20277),
.driver_data = PDC_UDMA_133,
},
{ } /* terminate list */
};

13
drivers/ata/pata_pdc202xx_old.c
View File

@@ -362,13 +362,12 @@ static int pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *id
}
static const struct pci_device_id pdc202xx[] = {
{ PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20246), 0 },
{ PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20262), 1 },
{ PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20263), 1 },
{ PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20265), 2 },
{ PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20267), 2 },
{ },
{ PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20246), .driver_data = 0 },
{ PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20262), .driver_data = 1 },
{ PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20263), .driver_data = 1 },
{ PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20265), .driver_data = 2 },
{ PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20267), .driver_data = 2 },
{ }
};
static struct pci_driver pdc202xx_pci_driver = {

24
drivers/ata/pata_serverworks.c
View File

@@ -467,13 +467,23 @@ static int serverworks_reinit_one(struct pci_dev *pdev)
#endif
static const struct pci_device_id serverworks[] = {
{ PCI_VDEVICE(SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4IDE), 0},
{ PCI_VDEVICE(SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB5IDE), 2},
{ PCI_VDEVICE(SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6IDE), 2},
{ PCI_VDEVICE(SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2), 2},
{ PCI_VDEVICE(SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1000IDE), 2},
{ },
{
PCI_VDEVICE(SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4IDE),
.driver_data = 0,
}, {
PCI_VDEVICE(SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB5IDE),
.driver_data = 2,
}, {
PCI_VDEVICE(SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6IDE),
.driver_data = 2,
}, {
PCI_VDEVICE(SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2),
.driver_data = 2,
}, {
PCI_VDEVICE(SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1000IDE),
.driver_data = 2
},
{ }
};
static struct pci_driver serverworks_pci_driver = {

1
drivers/ata/pata_sis.c
View File

@@ -891,7 +891,6 @@ static const struct pci_device_id sis_pci_tbl[] = {
{ PCI_VDEVICE(SI, 0x5513), }, /* SiS 5513 */
{ PCI_VDEVICE(SI, 0x5518), }, /* SiS 5518 */
{ PCI_VDEVICE(SI, 0x1180), }, /* SiS 1180 */
{ }
};

19
drivers/ata/pata_via.c
View File

@@ -675,16 +675,15 @@ static int via_reinit_one(struct pci_dev *pdev)
#endif
static const struct pci_device_id via[] = {
{ PCI_VDEVICE(VIA, 0x0415), },
{ PCI_VDEVICE(VIA, 0x0571), },
{ PCI_VDEVICE(VIA, 0x0581), },
{ PCI_VDEVICE(VIA, 0x1571), },
{ PCI_VDEVICE(VIA, 0x3164), },
{ PCI_VDEVICE(VIA, 0x5324), },
{ PCI_VDEVICE(VIA, 0xC409), VIA_IDFLAG_SINGLE },
{ PCI_VDEVICE(VIA, 0x9001), VIA_IDFLAG_SINGLE },
{ },
{ PCI_VDEVICE(VIA, 0x0415), .driver_data = 0 },
{ PCI_VDEVICE(VIA, 0x0571), .driver_data = 0 },
{ PCI_VDEVICE(VIA, 0x0581), .driver_data = 0 },
{ PCI_VDEVICE(VIA, 0x1571), .driver_data = 0 },
{ PCI_VDEVICE(VIA, 0x3164), .driver_data = 0 },
{ PCI_VDEVICE(VIA, 0x5324), .driver_data = 0 },
{ PCI_VDEVICE(VIA, 0xC409), .driver_data = VIA_IDFLAG_SINGLE },
{ PCI_VDEVICE(VIA, 0x9001), .driver_data = VIA_IDFLAG_SINGLE },
{ }
};
static struct pci_driver via_pci_driver = {

3
drivers/ata/pdc_adma.c
View File

@@ -157,8 +157,7 @@ static struct ata_port_info adma_port_info[] = {
};
static const struct pci_device_id adma_ata_pci_tbl[] = {
{ PCI_VDEVICE(PDC, 0x1841), board_1841_idx },
{ PCI_VDEVICE(PDC, 0x1841), .driver_data = board_1841_idx },
{ } /* terminate list */
};

34
drivers/ata/sata_mv.c
View File

@@ -4274,32 +4274,32 @@ static int mv_pci_device_resume(struct pci_dev *pdev);
#endif
static const struct pci_device_id mv_pci_tbl[] = {
{ PCI_VDEVICE(MARVELL, 0x5040), chip_504x },
{ PCI_VDEVICE(MARVELL, 0x5041), chip_504x },
{ PCI_VDEVICE(MARVELL, 0x5080), chip_5080 },
{ PCI_VDEVICE(MARVELL, 0x5081), chip_508x },
{ PCI_VDEVICE(MARVELL, 0x5040), .driver_data = chip_504x },
{ PCI_VDEVICE(MARVELL, 0x5041), .driver_data = chip_504x },
{ PCI_VDEVICE(MARVELL, 0x5080), .driver_data = chip_5080 },
{ PCI_VDEVICE(MARVELL, 0x5081), .driver_data = chip_508x },
/* RocketRAID 1720/174x have different identifiers */
{ PCI_VDEVICE(TTI, 0x1720), chip_6042 },
{ PCI_VDEVICE(TTI, 0x1740), chip_6042 },
{ PCI_VDEVICE(TTI, 0x1742), chip_6042 },
{ PCI_VDEVICE(TTI, 0x1720), .driver_data = chip_6042 },
{ PCI_VDEVICE(TTI, 0x1740), .driver_data = chip_6042 },
{ PCI_VDEVICE(TTI, 0x1742), .driver_data = chip_6042 },
{ PCI_VDEVICE(MARVELL, 0x6040), chip_604x },
{ PCI_VDEVICE(MARVELL, 0x6041), chip_604x },
{ PCI_VDEVICE(MARVELL, 0x6042), chip_6042 },
{ PCI_VDEVICE(MARVELL, 0x6080), chip_608x },
{ PCI_VDEVICE(MARVELL, 0x6081), chip_608x },
{ PCI_VDEVICE(MARVELL, 0x6040), .driver_data = chip_604x },
{ PCI_VDEVICE(MARVELL, 0x6041), .driver_data = chip_604x },
{ PCI_VDEVICE(MARVELL, 0x6042), .driver_data = chip_6042 },
{ PCI_VDEVICE(MARVELL, 0x6080), .driver_data = chip_608x },
{ PCI_VDEVICE(MARVELL, 0x6081), .driver_data = chip_608x },
{ PCI_VDEVICE(ADAPTEC2, 0x0241), chip_604x },
{ PCI_VDEVICE(ADAPTEC2, 0x0241), .driver_data = chip_604x },
/* Adaptec 1430SA */
{ PCI_VDEVICE(ADAPTEC2, 0x0243), chip_7042 },
{ PCI_VDEVICE(ADAPTEC2, 0x0243), .driver_data = chip_7042 },
/* Marvell 7042 support */
{ PCI_VDEVICE(MARVELL, 0x7042), chip_7042 },
{ PCI_VDEVICE(MARVELL, 0x7042), .driver_data = chip_7042 },
/* Highpoint RocketRAID PCIe series */
{ PCI_VDEVICE(TTI, 0x2300), chip_7042 },
{ PCI_VDEVICE(TTI, 0x2310), chip_7042 },
{ PCI_VDEVICE(TTI, 0x2300), .driver_data = chip_7042 },
{ PCI_VDEVICE(TTI, 0x2310), .driver_data = chip_7042 },
{ } /* terminate list */
};

58
drivers/ata/sata_nv.c
View File

@@ -344,21 +344,49 @@ enum nv_host_type
};
static const struct pci_device_id nv_pci_tbl[] = {
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA), NFORCE2 },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA), NFORCE3 },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2), NFORCE3 },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA), CK804 },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA2), CK804 },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA), CK804 },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2), CK804 },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA), MCP5x },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA2), MCP5x },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA), MCP5x },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA2), MCP5x },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA), GENERIC },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA2), GENERIC },
{ PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA3), GENERIC },
{
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA),
.driver_data = NFORCE2,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA),
.driver_data = NFORCE3,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2),
.driver_data = NFORCE3,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA),
.driver_data = CK804,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_SATA2),
.driver_data = CK804,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA),
.driver_data = CK804,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA2),
.driver_data = CK804,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA),
.driver_data = MCP5x,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA2),
.driver_data = MCP5x,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA),
.driver_data = MCP5x,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA2),
.driver_data = MCP5x,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA),
.driver_data = GENERIC,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA2),
.driver_data = GENERIC,
}, {
PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA3),
.driver_data = GENERIC,
},
{ } /* terminate list */
};

34
drivers/ata/sata_promise.c
View File

@@ -281,25 +281,25 @@ static const struct ata_port_info pdc_port_info[] = {
};
static const struct pci_device_id pdc_ata_pci_tbl[] = {
{ PCI_VDEVICE(PROMISE, 0x3371), board_2037x },
{ PCI_VDEVICE(PROMISE, 0x3373), board_2037x },
{ PCI_VDEVICE(PROMISE, 0x3375), board_2037x },
{ PCI_VDEVICE(PROMISE, 0x3376), board_2037x },
{ PCI_VDEVICE(PROMISE, 0x3570), board_2057x },
{ PCI_VDEVICE(PROMISE, 0x3571), board_2057x },
{ PCI_VDEVICE(PROMISE, 0x3574), board_2057x },
{ PCI_VDEVICE(PROMISE, 0x3577), board_2057x },
{ PCI_VDEVICE(PROMISE, 0x3d73), board_2057x },
{ PCI_VDEVICE(PROMISE, 0x3d75), board_2057x },
{ PCI_VDEVICE(PROMISE, 0x3371), .driver_data = board_2037x },
{ PCI_VDEVICE(PROMISE, 0x3373), .driver_data = board_2037x },
{ PCI_VDEVICE(PROMISE, 0x3375), .driver_data = board_2037x },
{ PCI_VDEVICE(PROMISE, 0x3376), .driver_data = board_2037x },
{ PCI_VDEVICE(PROMISE, 0x3570), .driver_data = board_2057x },
{ PCI_VDEVICE(PROMISE, 0x3571), .driver_data = board_2057x },
{ PCI_VDEVICE(PROMISE, 0x3574), .driver_data = board_2057x },
{ PCI_VDEVICE(PROMISE, 0x3577), .driver_data = board_2057x },
{ PCI_VDEVICE(PROMISE, 0x3d73), .driver_data = board_2057x },
{ PCI_VDEVICE(PROMISE, 0x3d75), .driver_data = board_2057x },
{ PCI_VDEVICE(PROMISE, 0x3318), board_20319 },
{ PCI_VDEVICE(PROMISE, 0x3319), board_20319 },
{ PCI_VDEVICE(PROMISE, 0x3515), board_40518 },
{ PCI_VDEVICE(PROMISE, 0x3519), board_40518 },
{ PCI_VDEVICE(PROMISE, 0x3d17), board_40518 },
{ PCI_VDEVICE(PROMISE, 0x3d18), board_40518 },
{ PCI_VDEVICE(PROMISE, 0x3318), .driver_data = board_20319 },
{ PCI_VDEVICE(PROMISE, 0x3319), .driver_data = board_20319 },
{ PCI_VDEVICE(PROMISE, 0x3515), .driver_data = board_40518 },
{ PCI_VDEVICE(PROMISE, 0x3519), .driver_data = board_40518 },
{ PCI_VDEVICE(PROMISE, 0x3d17), .driver_data = board_40518 },
{ PCI_VDEVICE(PROMISE, 0x3d18), .driver_data = board_40518 },
{ PCI_VDEVICE(PROMISE, 0x6629), board_20619 },
{ PCI_VDEVICE(PROMISE, 0x6629), .driver_data = board_20619 },
{ } /* terminate list */
};

3
drivers/ata/sata_qstor.c
View File

@@ -146,8 +146,7 @@ static const struct ata_port_info qs_port_info[] = {
};
static const struct pci_device_id qs_ata_pci_tbl[] = {
{ PCI_VDEVICE(PDC, 0x2068), board_2068_idx },
{ PCI_VDEVICE(PDC, 0x2068), .driver_data = board_2068_idx },
{ } /* terminate list */
};

15
drivers/ata/sata_sil.c
View File

@@ -112,14 +112,13 @@ static void sil_thaw(struct ata_port *ap);
static const struct pci_device_id sil_pci_tbl[] = {
{ PCI_VDEVICE(CMD, 0x3112), sil_3112 },
{ PCI_VDEVICE(CMD, 0x0240), sil_3112 },
{ PCI_VDEVICE(CMD, 0x3512), sil_3512 },
{ PCI_VDEVICE(CMD, 0x3114), sil_3114 },
{ PCI_VDEVICE(ATI, 0x436e), sil_3112 },
{ PCI_VDEVICE(ATI, 0x4379), sil_3112_no_sata_irq },
{ PCI_VDEVICE(ATI, 0x437a), sil_3112_no_sata_irq },
{ PCI_VDEVICE(CMD, 0x3112), .driver_data = sil_3112 },
{ PCI_VDEVICE(CMD, 0x0240), .driver_data = sil_3112 },
{ PCI_VDEVICE(CMD, 0x3512), .driver_data = sil_3512 },
{ PCI_VDEVICE(CMD, 0x3114), .driver_data = sil_3114 },
{ PCI_VDEVICE(ATI, 0x436e), .driver_data = sil_3112 },
{ PCI_VDEVICE(ATI, 0x4379), .driver_data = sil_3112_no_sata_irq },
{ PCI_VDEVICE(ATI, 0x437a), .driver_data = sil_3112_no_sata_irq },
{ } /* terminate list */
};

15
drivers/ata/sata_sil24.c
View File

@@ -351,14 +351,13 @@ static int sil24_port_resume(struct ata_port *ap);
#endif
static const struct pci_device_id sil24_pci_tbl[] = {
{ PCI_VDEVICE(CMD, 0x3124), BID_SIL3124 },
{ PCI_VDEVICE(INTEL, 0x3124), BID_SIL3124 },
{ PCI_VDEVICE(CMD, 0x3132), BID_SIL3132 },
{ PCI_VDEVICE(CMD, 0x0242), BID_SIL3132 },
{ PCI_VDEVICE(CMD, 0x0244), BID_SIL3132 },
{ PCI_VDEVICE(CMD, 0x3131), BID_SIL3131 },
{ PCI_VDEVICE(CMD, 0x3531), BID_SIL3131 },
{ PCI_VDEVICE(CMD, 0x3124), .driver_data = BID_SIL3124 },
{ PCI_VDEVICE(INTEL, 0x3124), .driver_data = BID_SIL3124 },
{ PCI_VDEVICE(CMD, 0x3132), .driver_data = BID_SIL3132 },
{ PCI_VDEVICE(CMD, 0x0242), .driver_data = BID_SIL3132 },
{ PCI_VDEVICE(CMD, 0x0244), .driver_data = BID_SIL3132 },
{ PCI_VDEVICE(CMD, 0x3131), .driver_data = BID_SIL3131 },
{ PCI_VDEVICE(CMD, 0x3531), .driver_data = BID_SIL3131 },
{ } /* terminate list */
};

32
drivers/ata/sata_sis.c
View File

@@ -51,13 +51,31 @@ static int sis_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val);
static int sis_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val);
static const struct pci_device_id sis_pci_tbl[] = {
{ PCI_VDEVICE(SI, 0x0180), sis_180 }, /* SiS 964/180 */
{ PCI_VDEVICE(SI, 0x0181), sis_180 }, /* SiS 964/180 */
{ PCI_VDEVICE(SI, 0x0182), sis_180 }, /* SiS 965/965L */
{ PCI_VDEVICE(SI, 0x0183), sis_180 }, /* SiS 965/965L */
{ PCI_VDEVICE(SI, 0x1182), sis_180 }, /* SiS 966/680 */
{ PCI_VDEVICE(SI, 0x1183), sis_180 }, /* SiS 966/966L/968/680 */
{
/* SiS 964/180 */
PCI_VDEVICE(SI, 0x0180),
.driver_data = sis_180,
}, {
/* SiS 964/180 */
PCI_VDEVICE(SI, 0x0181),
.driver_data = sis_180,
}, {
/* SiS 965/965L */
PCI_VDEVICE(SI, 0x0182),
.driver_data = sis_180,
}, {
/* SiS 965/965L */
PCI_VDEVICE(SI, 0x0183),
.driver_data = sis_180,
}, {
/* SiS 966/680 */
PCI_VDEVICE(SI, 0x1182),
.driver_data = sis_180,
}, {
/* SiS 966/966L/968/680 */
PCI_VDEVICE(SI, 0x1183),
.driver_data = sis_180,
},
{ } /* terminate list */
};

15
drivers/ata/sata_svw.c
View File

@@ -500,14 +500,13 @@ static int k2_sata_init_one(struct pci_dev *pdev, const struct pci_device_id *en
* controller
* */
static const struct pci_device_id k2_sata_pci_tbl[] = {
{ PCI_VDEVICE(SERVERWORKS, 0x0240), chip_svw4 },
{ PCI_VDEVICE(SERVERWORKS, 0x0241), chip_svw8 },
{ PCI_VDEVICE(SERVERWORKS, 0x0242), chip_svw4 },
{ PCI_VDEVICE(SERVERWORKS, 0x024a), chip_svw4 },
{ PCI_VDEVICE(SERVERWORKS, 0x024b), chip_svw4 },
{ PCI_VDEVICE(SERVERWORKS, 0x0410), chip_svw42 },
{ PCI_VDEVICE(SERVERWORKS, 0x0411), chip_svw43 },
{ PCI_VDEVICE(SERVERWORKS, 0x0240), .driver_data = chip_svw4 },
{ PCI_VDEVICE(SERVERWORKS, 0x0241), .driver_data = chip_svw8 },
{ PCI_VDEVICE(SERVERWORKS, 0x0242), .driver_data = chip_svw4 },
{ PCI_VDEVICE(SERVERWORKS, 0x024a), .driver_data = chip_svw4 },
{ PCI_VDEVICE(SERVERWORKS, 0x024b), .driver_data = chip_svw4 },
{ PCI_VDEVICE(SERVERWORKS, 0x0410), .driver_data = chip_svw42 },
{ PCI_VDEVICE(SERVERWORKS, 0x0411), .driver_data = chip_svw43 },
{ }
};

3
drivers/ata/sata_sx4.c
View File

@@ -267,8 +267,7 @@ static const struct ata_port_info pdc_port_info[] = {
};
static const struct pci_device_id pdc_sata_pci_tbl[] = {
{ PCI_VDEVICE(PROMISE, 0x6622), board_20621 },
{ PCI_VDEVICE(PROMISE, 0x6622), .driver_data = board_20621 },
{ } /* terminate list */
};

7
drivers/ata/sata_uli.c
View File

@@ -45,10 +45,9 @@ static int uli_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val);
static int uli_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val);
static const struct pci_device_id uli_pci_tbl[] = {
{ PCI_VDEVICE(AL, 0x5289), uli_5289 },
{ PCI_VDEVICE(AL, 0x5287), uli_5287 },
{ PCI_VDEVICE(AL, 0x5281), uli_5281 },
{ PCI_VDEVICE(AL, 0x5289), .driver_data = uli_5289 },
{ PCI_VDEVICE(AL, 0x5287), .driver_data = uli_5287 },
{ PCI_VDEVICE(AL, 0x5281), .driver_data = uli_5281 },
{ } /* terminate list */
};

38
drivers/ata/sata_via.c
View File

@@ -85,15 +85,35 @@ static void vt6421_set_dma_mode(struct ata_port *ap, struct ata_device *adev);
static void vt6421_error_handler(struct ata_port *ap);
static const struct pci_device_id svia_pci_tbl[] = {
{ PCI_VDEVICE(VIA, 0x5337), vt6420 },
{ PCI_VDEVICE(VIA, 0x0591), vt6420 }, /* 2 sata chnls (Master) */
{ PCI_VDEVICE(VIA, 0x3149), vt6420 }, /* 2 sata chnls (Master) */
{ PCI_VDEVICE(VIA, 0x3249), vt6421 }, /* 2 sata chnls, 1 pata chnl */
{ PCI_VDEVICE(VIA, 0x5372), vt6420 },
{ PCI_VDEVICE(VIA, 0x7372), vt6420 },
{ PCI_VDEVICE(VIA, 0x5287), vt8251 }, /* 2 sata chnls (Master/Slave) */
{ PCI_VDEVICE(VIA, 0x9000), vt8251 },
{
PCI_VDEVICE(VIA, 0x5337),
.driver_data = vt6420,
}, {
/* 2 sata chnls (Master) */
PCI_VDEVICE(VIA, 0x0591),
.driver_data = vt6420,
}, {
/* 2 sata chnls (Master) */
PCI_VDEVICE(VIA, 0x3149),
.driver_data = vt6420,
}, {
/* 2 sata chnls, 1 pata chnl */
PCI_VDEVICE(VIA, 0x3249),
.driver_data = vt6421,
}, {
PCI_VDEVICE(VIA, 0x5372),
.driver_data = vt6420,
}, {
PCI_VDEVICE(VIA, 0x7372),
.driver_data = vt6420,
}, {
/* 2 sata chnls (Master/Slave) */
PCI_VDEVICE(VIA, 0x5287),
.driver_data = vt8251,
}, {
PCI_VDEVICE(VIA, 0x9000),
.driver_data = vt8251,
},
{ } /* terminate list */
};