[PATCH] PCI: Use new PCI_CLASS_SERIAL_USB_* defines

[Jean Delvare]

We could use the recently added PCI_CLASS_SERIAL_USB_UHCI,
PCI_CLASS_SERIAL_USB_OHCI and PCI_CLASS_SERIAL_USB_EHCI defines in
more places, for slightly shorter and clearer code.

Signed-off-by: Jean Delvare <khali@xxxxxxxxxxxx>
---
 arch/powerpc/platforms/powermac/pci.c |    2 +-
 drivers/usb/host/ehci-pci.c           |    2 +-
 drivers/usb/host/ohci-pci.c           |    2 +-
 drivers/usb/host/uhci-hcd.c           |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

--- linux-2.6.17-rc1.orig/arch/powerpc/platforms/powermac/pci.c	2006-04-03 20:12:30.000000000 +0200
+++ linux-2.6.17-rc1/arch/powerpc/platforms/powermac/pci.c	2006-04-09 19:12:07.000000000 +0200
@@ -1097,7 +1097,7 @@
 	 * (iBook second controller)
 	 */
 	if (dev->vendor == PCI_VENDOR_ID_APPLE
-	    && (dev->class == ((PCI_CLASS_SERIAL_USB << 8) | 0x10))
+	    && dev->class == PCI_CLASS_SERIAL_USB_OHCI
 	    && !node) {
 		printk(KERN_INFO "Apple USB OHCI %s disabled by firmware\n",
 		       pci_name(dev));
--- linux-2.6.17-rc1.orig/drivers/usb/host/ehci-pci.c	2006-04-03 20:13:10.000000000 +0200
+++ linux-2.6.17-rc1/drivers/usb/host/ehci-pci.c	2006-04-09 19:12:44.000000000 +0200
@@ -350,7 +350,7 @@
 /* PCI driver selection metadata; PCI hotplugging uses this */
 static const struct pci_device_id pci_ids [] = { {
 	/* handle any USB 2.0 EHCI controller */
-	PCI_DEVICE_CLASS(((PCI_CLASS_SERIAL_USB << 8) | 0x20), ~0),
+	PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
 	.driver_data =	(unsigned long) &ehci_pci_hc_driver,
 	},
 	{ /* end: all zeroes */ }
--- linux-2.6.17-rc1.orig/drivers/usb/host/ohci-pci.c	2006-04-03 20:13:10.000000000 +0200
+++ linux-2.6.17-rc1/drivers/usb/host/ohci-pci.c	2006-04-09 19:12:27.000000000 +0200
@@ -206,7 +206,7 @@
 
 static const struct pci_device_id pci_ids [] = { {
 	/* handle any USB OHCI controller */
-	PCI_DEVICE_CLASS((PCI_CLASS_SERIAL_USB << 8) | 0x10, ~0),
+	PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_OHCI, ~0),
 	.driver_data =	(unsigned long) &ohci_pci_hc_driver,
 	}, { /* end: all zeroes */ }
 };
--- linux-2.6.17-rc1.orig/drivers/usb/host/uhci-hcd.c	2006-04-03 20:13:10.000000000 +0200
+++ linux-2.6.17-rc1/drivers/usb/host/uhci-hcd.c	2006-04-09 19:10:16.000000000 +0200
@@ -861,7 +861,7 @@
 
 static const struct pci_device_id uhci_pci_ids[] = { {
 	/* handle any USB UHCI controller */
-	PCI_DEVICE_CLASS(((PCI_CLASS_SERIAL_USB << 8) | 0x00), ~0),
+	PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
 	.driver_data =	(unsigned long) &uhci_driver,
 	}, { /* end: all zeroes */ }
 };


-- 
Jean Delvare
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/