Commit c67808ee authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman

[PATCH] USB: Use new PCI_CLASS_SERIAL_USB_* defines

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: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9fb81ce6
...@@ -1097,7 +1097,7 @@ pmac_pci_enable_device_hook(struct pci_dev *dev, int initial) ...@@ -1097,7 +1097,7 @@ pmac_pci_enable_device_hook(struct pci_dev *dev, int initial)
* (iBook second controller) * (iBook second controller)
*/ */
if (dev->vendor == PCI_VENDOR_ID_APPLE if (dev->vendor == PCI_VENDOR_ID_APPLE
&& (dev->class == ((PCI_CLASS_SERIAL_USB << 8) | 0x10)) && dev->class == PCI_CLASS_SERIAL_USB_OHCI
&& !node) { && !node) {
printk(KERN_INFO "Apple USB OHCI %s disabled by firmware\n", printk(KERN_INFO "Apple USB OHCI %s disabled by firmware\n",
pci_name(dev)); pci_name(dev));
......
...@@ -350,7 +350,7 @@ static const struct hc_driver ehci_pci_hc_driver = { ...@@ -350,7 +350,7 @@ static const struct hc_driver ehci_pci_hc_driver = {
/* PCI driver selection metadata; PCI hotplugging uses this */ /* PCI driver selection metadata; PCI hotplugging uses this */
static const struct pci_device_id pci_ids [] = { { static const struct pci_device_id pci_ids [] = { {
/* handle any USB 2.0 EHCI controller */ /* 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, .driver_data = (unsigned long) &ehci_pci_hc_driver,
}, },
{ /* end: all zeroes */ } { /* end: all zeroes */ }
......
...@@ -206,7 +206,7 @@ static const struct hc_driver ohci_pci_hc_driver = { ...@@ -206,7 +206,7 @@ static const struct hc_driver ohci_pci_hc_driver = {
static const struct pci_device_id pci_ids [] = { { static const struct pci_device_id pci_ids [] = { {
/* handle any USB OHCI controller */ /* 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, .driver_data = (unsigned long) &ohci_pci_hc_driver,
}, { /* end: all zeroes */ } }, { /* end: all zeroes */ }
}; };
......
...@@ -858,7 +858,7 @@ static const struct hc_driver uhci_driver = { ...@@ -858,7 +858,7 @@ static const struct hc_driver uhci_driver = {
static const struct pci_device_id uhci_pci_ids[] = { { static const struct pci_device_id uhci_pci_ids[] = { {
/* handle any USB UHCI controller */ /* 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, .driver_data = (unsigned long) &uhci_driver,
}, { /* end: all zeroes */ } }, { /* end: all zeroes */ }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment