Skip to contentSkip to conversation

ata: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)

PATCH Applied Peter Huewe 2 participants 2 messages Jul 15, 2010 – Aug 1, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 4/25 ata: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)

From: Peter Huewe <[email protected]>

This patch converts pci_table entries, where .subvendor=PCI_ANY_ID and .subdevice=PCI_ANY_ID, .class=0 and .class_mask=0, to use the PCI_VDEVICE macro, and thus improves readability.

---
 drivers/ata/pata_scc.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
drivers/ata/pata_scc.c +1 -2
index d9db3f8..fe36966 100644
@@ -168,8 +168,7 @@ static const unsigned long JCACTSELtbl[2][7] = {
 };
 
 static const struct pci_device_id scc_pci_tbl[] = {
-	{PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_SCC_ATA,
-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+	{ PCI_VDEVICE(TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_SCC_ATA), 0},
 	{ }	/* terminate list */
 };
 
Signature · 1 line
1.7.1
Applied
#1 lore raw
Quoted 16 lines · Peter Huewe

From: Peter Huewe<[email protected]>

This patch converts pci_table entries, where .subvendor=PCI_ANY_ID and .subdevice=PCI_ANY_ID, .class=0 and .class_mask=0, to use the PCI_VDEVICE macro, and thus improves readability.

---
  drivers/ata/pata_scc.c |    3 +--
  1 files changed, 1 insertions(+), 2 deletions(-)
drivers/ata/pata_scc.c +0 -0
index d9db3f8..fe36966 100644

drivers/ata/pata_scc.c static const unsigned long JCACTSELtbl[2][7] = { · line 172

Quoted 7 lines
drivers/ata/pata_scc.c +1 -2
@@ -168,8 +168,7 @@ static const unsigned long JCACTSELtbl[2][7] = {
  };
 
  static const struct pci_device_id scc_pci_tbl[] = {
-	{PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_SCC_ATA,
-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+	{ PCI_VDEVICE(TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_SCC_ATA), 0},
  	{ }	/* terminate list */

applied

I would prefer to leave ata_piix as it is, though. It's nice and manageable :)