Skip to contentSkip to conversation

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

PATCH Applied Peter Huewe 3 participants 3 messages Jul 15, 2010 – Jul 16, 2010

Subsystems (2)
Block layer Kernel janitors
lore
Share & tools
lore

Peter Huewe

author
#0 lore raw

PATCH 11/25 block: 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.

Signed-off-by Peter Huewe <[email protected]>
---
 drivers/block/sx8.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/block/sx8.c +2 -2
index b70f0fc..15745e4 100644
@@ -410,8 +410,8 @@ static void carm_remove_one (struct pci_dev *pdev);
 static int carm_bdev_getgeo(struct block_device *bdev, struct hd_geometry *geo);
 
 static const struct pci_device_id carm_pci_tbl[] = {
-	{ PCI_VENDOR_ID_PROMISE, 0x8000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
-	{ PCI_VENDOR_ID_PROMISE, 0x8002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+	{ PCI_VDEVICE(PROMISE, 0x8000), },
+	{ PCI_VDEVICE(PROMISE, 0x8002), },
 	{ }	/* terminate list */
 };
 MODULE_DEVICE_TABLE(pci, carm_pci_tbl);
Signature · 1 line
1.7.1
#1 lore raw
Quoted 3 lines · Peter Huewe

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.

Well, it doesn't improve readability, and ## usage prevents grepping and long term plan to switch to numbers instead of PCI_VENDOR_ID_*, but whatever.

Quoted 4 lines
drivers/block/sx8.c +2 -2
-	{ PCI_VENDOR_ID_PROMISE, 0x8000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
-	{ PCI_VENDOR_ID_PROMISE, 0x8002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+	{ PCI_VDEVICE(PROMISE, 0x8000), },
+	{ PCI_VDEVICE(PROMISE, 0x8002), },
#2 lore raw
Quoted 5 lines · Alexey Dobriyan
Quoted 3 lines · Peter Huewe

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.

Quoted 8 lines

Well, it doesn't improve readability, and ## usage prevents grepping and long term plan to switch to numbers instead of PCI_VENDOR_ID_*, but whatever.

drivers/block/sx8.c static void carm_remove_one (struct pci_dev *pdev); · line 414

Quoted 4 lines
drivers/block/sx8.c +2 -2
-	{ PCI_VENDOR_ID_PROMISE, 0x8000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
-	{ PCI_VENDOR_ID_PROMISE, 0x8002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+	{ PCI_VDEVICE(PROMISE, 0x8000), },
+	{ PCI_VDEVICE(PROMISE, 0x8002), },

Switching to use hex numbers for _device ids_ is encouraged, because history has proven its pointless to create named constants for single-use ids. However, using named constants for PCI vendor ids makes a lot of sense.

Jeff