lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usb/mv_udc_core: fix compile

Browse Source 
|drivers/usb/gadget/mv_udc_core.c:2108: error: label `error' used but not defined

This seems to be broken since the initial commit. I changed this to a
simple return. The other user is the probe code which lets ->probe()
fail on error here.

|drivers/usb/gadget/mv_udc_core.c:2107: warning: passing argument 1 of `dev_err' from incompatible pointer type
|drivers/usb/gadget/mv_udc_core.c:2118: warning: initialization from incompatible pointer type
|drivers/usb/gadget/mv_udc_core.c:2119: warning: initialization from incompatible pointer type
|drivers/usb/gadget/mv_udc_core.c:2130: error: initializer element is not constant
|drivers/usb/gadget/mv_udc_core.c:2130: error: (near initialization for `udc_driver.driver.pm')

Cc: Chao Xie <chao.xie@marvell.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Sebastian Andrzej Siewior
2011-06-03 19:50:45 +02:00
committed by Greg Kroah-Hartman
parent b38b03b363
commit cb42447374
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/gadget/mv_udc_core.c
View File

@@ -2083,7 +2083,7 @@ out:
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int mv_udc_suspend(struct platform_device *_dev, pm_message_t state) static int mv_udc_suspend(struct device *_dev)
{ {
struct mv_udc *udc = the_controller; struct mv_udc *udc = the_controller;
@@ -2092,7 +2092,7 @@ static int mv_udc_suspend(struct platform_device *_dev, pm_message_t state)
return 0; return 0;
} }
static int mv_udc_resume(struct platform_device *_dev) static int mv_udc_resume(struct device *_dev)
{ {
struct mv_udc *udc = the_controller; struct mv_udc *udc = the_controller;
int retval; int retval;
@@ -2100,7 +2100,7 @@ static int mv_udc_resume(struct platform_device *_dev)
retval = mv_udc_phy_init(udc->phy_regs); retval = mv_udc_phy_init(udc->phy_regs);
if (retval) { if (retval) {
dev_err(_dev, "phy initialization error %d\n", retval); dev_err(_dev, "phy initialization error %d\n", retval);
goto error; return retval;
} }
udc_reset(udc); udc_reset(udc);
ep0_reset(udc); ep0_reset(udc);
@@ -2122,7 +2122,7 @@ static struct platform_driver udc_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "pxa-u2o", .name = "pxa-u2o",
#ifdef CONFIG_PM #ifdef CONFIG_PM
.pm = mv_udc_pm_ops, .pm = &mv_udc_pm_ops,
#endif #endif
}, },
}; };