leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USB: EHCI: miscellaneous cleanups for the library conversion

Browse Source 
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>
This commit is contained in:
Alan Stern 2012-11-07 16:12:47 -05:00 committed by Greg Kroah-Hartman
parent 36caff5d79
commit 1b36810e27
5 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/chipidea/host.c
View File

@ -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;
}

9
drivers/usb/host/ehci-hcd.c
View File

@ -1231,10 +1231,11 @@ void ehci_init_driver(struct hc_driver *drv,
/* 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);

5
drivers/usb/host/ehci-pci.c
View File

@ -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;

3
drivers/usb/host/ehci-platform.c
View File

@ -57,8 +57,7 @@ static int ehci_platform_reset(struct usb_hcd *hcd)
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,
};

1
drivers/usb/host/ehci.h
View File

@ -784,7 +784,6 @@ static inline u32 hc32_to_cpup (const struct ehci_hcd *ehci, const __hc32 *x)
/* 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);
};