summaryrefslogtreecommitdiffstats
path: root/drivers/usb/chipidea/host.c
diff options
context:
space:
mode:
authorAlan Stern2012-11-07 22:12:47 +0100
committerGreg Kroah-Hartman2012-11-12 03:06:48 +0100
commit1b36810e27a9791878e4694357ab6d4c06acc22d (patch)
tree7d671926432dac18b705c5bbde6cbfb275fb97a6 /drivers/usb/chipidea/host.c
parentUSB: fix endpoint-disabling for failed config changes (diff)
downloadkernel-qcow2-linux-1b36810e27a9791878e4694357ab6d4c06acc22d.tar.gz
kernel-qcow2-linux-1b36810e27a9791878e4694357ab6d4c06acc22d.tar.xz
kernel-qcow2-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/chipidea/host.c')
-rw-r--r--drivers/usb/chipidea/host.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
index fed97d323899..caecad9213f5 100644
--- a/drivers/usb/chipidea/host.c
+++ b/drivers/usb/chipidea/host.c
@@ -25,17 +25,12 @@
#include <linux/usb/hcd.h>
#include <linux/usb/chipidea.h>
-#define CHIPIDEA_EHCI
#include "../host/ehci.h"
#include "ci.h"
#include "bits.h"
#include "host.h"
-static const struct ehci_driver_overrides ci_overrides = {
- .product_desc = "ChipIdea HDRC EHCI host controller",
-};
-
static struct hc_driver __read_mostly ci_ehci_hc_driver;
static irqreturn_t host_irq(struct ci13xxx *ci)
@@ -103,7 +98,7 @@ int ci_hdrc_host_init(struct ci13xxx *ci)
rdrv->name = "host";
ci->roles[CI_ROLE_HOST] = rdrv;
- ehci_init_driver(&ci_ehci_hc_driver, &ci_overrides);
+ ehci_init_driver(&ci_ehci_hc_driver, NULL);
return 0;
}