On Tue, 10 Jan 2012, Alex,Shi wrote: > > Adding Intel USB3 xhci host controller ID in pci_ids.h, and a MSI_FST > flags in pci hcd driver. That HCD may just works under MSI, so need to > skip line irq checking in pci hcd core probe. That is a preparation for > next fixing patch. > > Signed-off-by: Alex Shi <alex.shi@xxxxxxxxx> > --- > include/linux/pci_ids.h | 1 + > include/linux/usb/hcd.h | 4 ++-- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h > index 2aaee0c..b66f538 100644 > --- a/include/linux/pci_ids.h > +++ b/include/linux/pci_ids.h > @@ -2779,6 +2779,7 @@ > #define PCI_DEVICE_ID_INTEL_IXP4XX 0x8500 > #define PCI_DEVICE_ID_INTEL_IXP2800 0x9004 > #define PCI_DEVICE_ID_INTEL_S21152BB 0xb152 > +#define PCI_DEVICE_ID_INTEL_USB_XHCI 0x1e31 As others have pointed out, this isn't used or needed. > > #define PCI_VENDOR_ID_SCALEMP 0x8686 > #define PCI_DEVICE_ID_SCALEMP_VSMP_CTL 0x1010 > diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h > index 03354d5..4f67a41 100644 > --- a/include/linux/usb/hcd.h > +++ b/include/linux/usb/hcd.h > @@ -199,9 +199,8 @@ struct hcd_timeout { /* timeouts we allocate */ > > /*-------------------------------------------------------------------------*/ > > - > struct hc_driver { > - const char *description; /* "ehci-hcd" etc */ > + const char *description; /* "ehci_hcd", "xhci_hcd" etc */ This change to the comment isn't important. It can be left out. > const char *product_desc; /* product/vendor string */ > size_t hcd_priv_size; /* size of private data */ > > @@ -212,6 +211,7 @@ struct hc_driver { > #define HCD_MEMORY 0x0001 /* HC regs use memory (else I/O) */ > #define HCD_LOCAL_MEM 0x0002 /* HC needs local memory */ > #define HCD_SHARED 0x0004 /* Two (or more) usb_hcds share HW */ > +#define HCD_MSI_FST 0x0008 /* Try to get MSI first, PCI only */ Please spell it out fully: HCD_MSI_FIRST. That's only two letters more. Since this new flag isn't used in this patch, you might as well move it into patch 2/3. Then this patch will become completely empty. Alan Stern -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html