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>
diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
index fed97d3..caecad9 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 @@
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;
}
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 28f694e..c97503b 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1231,10 +1231,11 @@
/* Copy the generic table to drv and then apply the overrides */
*drv = ehci_hc_driver;
- drv->product_desc = over->product_desc;
- drv->hcd_priv_size += over->extra_priv_size;
- if (over->reset)
- drv->reset = over->reset;
+ if (over) {
+ drv->hcd_priv_size += over->extra_priv_size;
+ if (over->reset)
+ drv->reset = over->reset;
+ }
}
EXPORT_SYMBOL_GPL(ehci_init_driver);
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 46018e9..3fb76ca 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -383,8 +383,7 @@
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 @@
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;
diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
index feeedf8..f14c542 100644
--- a/drivers/usb/host/ehci-platform.c
+++ b/drivers/usb/host/ehci-platform.c
@@ -57,8 +57,7 @@
static struct hc_driver __read_mostly ehci_platform_hc_driver;
-static const struct ehci_driver_overrides platform_overrides = {
- .product_desc = "Generic Platform EHCI controller",
+static const struct ehci_driver_overrides platform_overrides __initdata = {
.reset = ehci_platform_reset,
};
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index 24a8ada..9dadc71 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -784,7 +784,6 @@
/* Declarations of things exported for use by ehci platform drivers */
struct ehci_driver_overrides {
- const char *product_desc;
size_t extra_priv_size;
int (*reset)(struct usb_hcd *hcd);
};