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

Commit 9cb0f819 authored by Russell King's avatar Russell King
Browse files

USB: sa1111: sparse and checkpatch cleanups 



Clean up the ohci-sa1111 driver formatting to be more compliant with
current standards, and add 'static' to various function definitions
to avoid sparse complaints about undeclared functions.  Remove the
unnecessary local declaration of 'usb_disabled', which can be found
instead in linux/usb.h.

Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 876c1f27

drivers/usb/host/ohci-sa1111.c

+17 −16
Original line number Original line Diff line number Diff line
@@ -41,8 +41,6 @@ 
#define USB_STATUS_NHCIMFCLR      (1 << 10)

#define USB_STATUS_NHCIMFCLR      (1 << 10)

#define USB_STATUS_USBPWRSENSE    (1 << 11)

#define USB_STATUS_USBPWRSENSE    (1 << 11)





extern int usb_disabled(void);



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

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





static int sa1111_start_hc(struct sa1111_dev *dev)

static int sa1111_start_hc(struct sa1111_dev *dev)
@@ -82,6 +80,7 @@ static int sa1111_start_hc(struct sa1111_dev *dev) 
static void sa1111_stop_hc(struct sa1111_dev *dev)

static void sa1111_stop_hc(struct sa1111_dev *dev)

{

{

	unsigned int usb_rst;

	unsigned int usb_rst;



	printk(KERN_DEBUG "%s: stopping SA-1111 OHCI USB Controller\n",

	printk(KERN_DEBUG "%s: stopping SA-1111 OHCI USB Controller\n",

	       __FILE__);

	       __FILE__);
@@ -131,7 +130,7 @@ static void dump_hci_status(struct usb_hcd *hcd, const char *label) 
 *

 *

 * Store this function in the HCD's struct pci_driver as probe().

 * Store this function in the HCD's struct pci_driver as probe().

 */

 */

int usb_hcd_sa1111_probe (const struct hc_driver *driver,

static int usb_hcd_sa1111_probe(const struct hc_driver *driver,

	struct sa1111_dev *dev)

	struct sa1111_dev *dev)

{

{

	struct usb_hcd *hcd;

	struct usb_hcd *hcd;
@@ -140,6 +139,7 @@ int usb_hcd_sa1111_probe (const struct hc_driver *driver, 
	hcd = usb_create_hcd(driver, &dev->dev, "sa1111");

	hcd = usb_create_hcd(driver, &dev->dev, "sa1111");

	if (!hcd)

	if (!hcd)

		return -ENOMEM;

		return -ENOMEM;



	hcd->rsrc_start = dev->res.start;

	hcd->rsrc_start = dev->res.start;

	hcd->rsrc_len = resource_size(&dev->res);

	hcd->rsrc_len = resource_size(&dev->res);
@@ -148,6 +148,7 @@ int usb_hcd_sa1111_probe (const struct hc_driver *driver, 
		retval = -EBUSY;

		retval = -EBUSY;

		goto err1;

		goto err1;

	}

	}



	hcd->regs = dev->mapbase;

	hcd->regs = dev->mapbase;





	ret = sa1111_start_hc(dev);

	ret = sa1111_start_hc(dev);
@@ -180,9 +181,8 @@ int usb_hcd_sa1111_probe (const struct hc_driver *driver, 
 * Reverses the effect of usb_hcd_sa1111_probe(), first invoking

 * Reverses the effect of usb_hcd_sa1111_probe(), first invoking

 * the HCD's stop() method.  It is always called from a thread

 * the HCD's stop() method.  It is always called from a thread

 * context, normally "rmmod", "apmd", or something similar.

 * context, normally "rmmod", "apmd", or something similar.

 *

 */

 */

void usb_hcd_sa1111_remove (struct usb_hcd *hcd, struct sa1111_dev *dev)

static void usb_hcd_sa1111_remove(struct usb_hcd *hcd, struct sa1111_dev *dev)

{

{

	usb_remove_hcd(hcd);

	usb_remove_hcd(hcd);

	sa1111_stop_hc(dev);

	sa1111_stop_hc(dev);
@@ -192,16 +192,17 @@ void usb_hcd_sa1111_remove (struct usb_hcd *hcd, struct sa1111_dev *dev) 




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

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





static int __devinit

static int __devinit ohci_sa1111_start(struct usb_hcd *hcd)

ohci_sa1111_start (struct usb_hcd *hcd)

{

{

	struct ohci_hcd	*ohci = hcd_to_ohci(hcd);

	struct ohci_hcd	*ohci = hcd_to_ohci(hcd);

	int ret;

	int ret;





	if ((ret = ohci_init(ohci)) < 0)

	ret = ohci_init(ohci);

	if (ret < 0)

		return ret;

		return ret;





	if ((ret = ohci_run (ohci)) < 0) {

	ret = ohci_run(ohci);

	if (ret < 0) {

		err("can't start %s", hcd->self.bus_name);

		err("can't start %s", hcd->self.bus_name);

		ohci_stop(hcd);

		ohci_stop(hcd);

		return ret;

		return ret;