Merge remote-tracking branch 'asoc/fix/arizona' into tmp

[~andy/linux] / drivers / usb / gadget / lpc32xx_udc.c

diff --git a/drivers/usb/gadget/lpc32xx_udc.c b/drivers/usb/gadget/lpc32xx_udc.c
index 21a9861dabf0a9660a3c1cf74f04d055fbb0b649..dd1c9b1fe528d7ab432c3938a8736e6dcc40f02b 100644 (file)
--- a/drivers/usb/gadget/lpc32xx_udc.c
+++ b/drivers/usb/gadget/lpc32xx_udc.c
@@ -2399,7 +2399,7 @@ static void udc_handle_ep0_setup(struct lpc32xx_udc *udc)
 
                if (i < 0) {
                        /* setup processing failed, force stall */
-                       dev_err(udc->dev,
+                       dev_dbg(udc->dev,
                                "req %02x.%02x protocol STALL; stat %d\n",
                                reqtype, req, i);
                        udc->ep0state = WAIT_FOR_SETUP;
@@ -3352,7 +3352,7 @@ phy_fail:
        return retval;
 }
 
-static int __devexit lpc32xx_udc_remove(struct platform_device *pdev)
+static int lpc32xx_udc_remove(struct platform_device *pdev)
 {
        struct lpc32xx_udc *udc = platform_get_drvdata(pdev);
 
@@ -3447,7 +3447,7 @@ MODULE_DEVICE_TABLE(of, lpc32xx_udc_of_match);
 #endif
 
 static struct platform_driver lpc32xx_udc_driver = {
-       .remove         = __devexit_p(lpc32xx_udc_remove),
+       .remove         = lpc32xx_udc_remove,
        .shutdown       = lpc32xx_udc_shutdown,
        .suspend        = lpc32xx_udc_suspend,
        .resume         = lpc32xx_udc_resume,