USB: gadget: Remove pr_<level> uses of KERN_<level>

[net-next-2.6.git] / drivers / usb / gadget / r8a66597-udc.c

diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c
index 70a817842755484f5ee0b19e51db505b32532bf5..157640f7d2a8edb21c719028c548c9e6cc6dbc98 100644 (file)
--- a/drivers/usb/gadget/r8a66597-udc.c
+++ b/drivers/usb/gadget/r8a66597-udc.c
@@ -274,7 +274,7 @@ static int pipe_buffer_setting(struct r8a66597 *r8a66597,
        }
 
        if (buf_bsize && ((bufnum + 16) >= R8A66597_MAX_BUFNUM)) {
-               pr_err(KERN_ERR "r8a66597 pipe memory is insufficient\n");
+               pr_err("r8a66597 pipe memory is insufficient\n");
                return -ENOMEM;
        }
 
@@ -1405,14 +1405,15 @@ static struct usb_ep_ops r8a66597_ep_ops = {
 /*-------------------------------------------------------------------------*/
 static struct r8a66597 *the_controller;
 
-int usb_gadget_register_driver(struct usb_gadget_driver *driver)
+int usb_gadget_probe_driver(struct usb_gadget_driver *driver,
+               int (*bind)(struct usb_gadget *))
 {
        struct r8a66597 *r8a66597 = the_controller;
        int retval;
 
        if (!driver
                        || driver->speed != USB_SPEED_HIGH
-                       || !driver->bind
+                       || !bind
                        || !driver->setup)
                return -EINVAL;
        if (!r8a66597)
@@ -1431,7 +1432,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
                goto error;
        }
 
-       retval = driver->bind(&r8a66597->gadget);
+       retval = bind(&r8a66597->gadget);
        if (retval) {
                printk(KERN_ERR "bind to driver error (%d)\n", retval);
                device_del(&r8a66597->gadget.dev);
@@ -1456,7 +1457,7 @@ error:
 
        return retval;
 }
-EXPORT_SYMBOL(usb_gadget_register_driver);
+EXPORT_SYMBOL(usb_gadget_probe_driver);
 
 int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
 {
@@ -1557,6 +1558,7 @@ static int __init r8a66597_probe(struct platform_device *pdev)
        /* initialize ucd */
        r8a66597 = kzalloc(sizeof(struct r8a66597), GFP_KERNEL);
        if (r8a66597 == NULL) {
+               ret = -ENOMEM;
                printk(KERN_ERR "kzalloc error\n");
                goto clean_up;
        }