Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b36810e authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

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: default avatarAlan Stern <stern@rowland.harvard.edu>
Reviewed-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 36caff5d

drivers/usb/chipidea/host.c

+1 −6
Original line number Diff line number Diff line
@@ -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;

}

drivers/usb/host/ehci-hcd.c

+5 −4
Original line number Diff line number Diff line
@@ -1231,11 +1231,12 @@ 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;

	if (over) {

		drv->hcd_priv_size += over->extra_priv_size;

		if (over->reset)

			drv->reset = over->reset;

	}

}

EXPORT_SYMBOL_GPL(ehci_init_driver);



/*-------------------------------------------------------------------------*/

drivers/usb/host/ehci-pci.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

drivers/usb/host/ehci-platform.c

+1 −2
Original line number Diff line number Diff line
@@ -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,

};

drivers/usb/host/ehci.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

};