summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci-pci.c
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2012-11-07 16:12:47 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-11 18:06:48 -0800
commit1b36810e27a9791878e4694357ab6d4c06acc22d (patch)
tree7d671926432dac18b705c5bbde6cbfb275fb97a6 /drivers/usb/host/ehci-pci.c
parent36caff5d795429c572443894e8789c2150dd796b (diff)
downloadtalos-obmc-linux-1b36810e27a9791878e4694357ab6d4c06acc22d.tar.gz
talos-obmc-linux-1b36810e27a9791878e4694357ab6d4c06acc22d.zip
USB: EHCI: miscellaneous cleanups for the library conversion
This patch (as1630) cleans up a few minor items resulting from the split-up of the ehci-hcd driver: Remove the product_desc string from the ehci_driver_overrides structure. All drivers will use the generic "EHCI Host Controller" string. (This was requested by Felipe Balbi.) Allow drivers to pass a NULL pointer to ehci_init_driver() if they don't have to override any settings. Remove a #define symbol that is no longer used from the ChipIdea host driver. Rename overrides to pci_overrides in ehci-pci.c, for consistency with ehci-platform.c. Mark the *_overrides structures as __initdata. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Reviewed-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ehci-pci.c')
-rw-r--r--drivers/usb/host/ehci-pci.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 46018e975244..3fb76ca61848 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -383,8 +383,7 @@ static int ehci_pci_resume(struct usb_hcd *hcd, bool hibernated)
static struct hc_driver __read_mostly ehci_pci_hc_driver;
-static const struct ehci_driver_overrides overrides = {
- .product_desc = "EHCI PCI host controller",
+static const struct ehci_driver_overrides pci_overrides __initdata = {
.reset = ehci_pci_setup,
};
@@ -426,7 +425,7 @@ static int __init ehci_pci_init(void)
pr_info("%s: " DRIVER_DESC "\n", hcd_name);
- ehci_init_driver(&ehci_pci_hc_driver, &overrides);
+ ehci_init_driver(&ehci_pci_hc_driver, &pci_overrides);
/* Entries for the PCI suspend/resume callbacks are special */
ehci_pci_hc_driver.pci_suspend = ehci_suspend;
OpenPOWER on IntegriCloud