Merge branch 'staging/for_v3.7' into v4l_for_linus

[~andy/linux] / drivers / usb / usb-skeleton.c

diff --git a/drivers/usb/usb-skeleton.c b/drivers/usb/usb-skeleton.c
index 8efeae24764f97dedfe016f7006520fa61b8a09f..0616f235bd6b512ecf54769cfc346e12180febd7 100644 (file)
--- a/drivers/usb/usb-skeleton.c
+++ b/drivers/usb/usb-skeleton.c
@@ -27,8 +27,6 @@
 #define USB_SKEL_VENDOR_ID     0xfff0
 #define USB_SKEL_PRODUCT_ID    0xfff0
 
-static DEFINE_MUTEX(skel_mutex);
-
 /* table of devices that work with this driver */
 static const struct usb_device_id skel_table[] = {
        { USB_DEVICE(USB_SKEL_VENDOR_ID, USB_SKEL_PRODUCT_ID) },
@@ -95,31 +93,24 @@ static int skel_open(struct inode *inode, struct file *file)
 
        interface = usb_find_interface(&skel_driver, subminor);
        if (!interface) {
-               err("%s - error, can't find device for minor %d",
-                    __func__, subminor);
+               pr_err("%s - error, can't find device for minor %d\n",
+                       __func__, subminor);
                retval = -ENODEV;
                goto exit;
        }
 
-       mutex_lock(&skel_mutex);
        dev = usb_get_intfdata(interface);
        if (!dev) {
-               mutex_unlock(&skel_mutex);
                retval = -ENODEV;
                goto exit;
        }
 
        /* increment our usage count for the device */
        kref_get(&dev->kref);
-       mutex_unlock(&skel_mutex);
 
        /* lock the device to allow correctly handling errors
         * in resumption */
        mutex_lock(&dev->io_mutex);
-       if (!dev->interface) {
-               retval = -ENODEV;
-               goto out_err;
-       }
 
        retval = usb_autopm_get_interface(interface);
        if (retval)
@@ -127,11 +118,7 @@ static int skel_open(struct inode *inode, struct file *file)
 
        /* save our object in the file's private structure */
        file->private_data = dev;
-
-out_err:
        mutex_unlock(&dev->io_mutex);
-       if (retval)
-               kref_put(&dev->kref, skel_delete);
 
 exit:
        return retval;
@@ -192,8 +179,9 @@ static void skel_read_bulk_callback(struct urb *urb)
                if (!(urb->status == -ENOENT ||
                    urb->status == -ECONNRESET ||
                    urb->status == -ESHUTDOWN))
-                       err("%s - nonzero write bulk status received: %d",
-                           __func__, urb->status);
+                       dev_err(&dev->interface->dev,
+                               "%s - nonzero write bulk status received: %d\n",
+                               __func__, urb->status);
 
                dev->errors = urb->status;
        } else {
@@ -226,7 +214,8 @@ static int skel_do_read_io(struct usb_skel *dev, size_t count)
        /* do it */
        rv = usb_submit_urb(dev->bulk_in_urb, GFP_KERNEL);
        if (rv < 0) {
-               err("%s - failed submitting read urb, error %d",
+               dev_err(&dev->interface->dev,
+                       "%s - failed submitting read urb, error %d\n",
                        __func__, rv);
                dev->bulk_in_filled = 0;
                rv = (rv == -ENOMEM) ? rv : -EIO;
@@ -377,8 +366,9 @@ static void skel_write_bulk_callback(struct urb *urb)
                if (!(urb->status == -ENOENT ||
                    urb->status == -ECONNRESET ||
                    urb->status == -ESHUTDOWN))
-                       err("%s - nonzero write bulk status received: %d",
-                           __func__, urb->status);
+                       dev_err(&dev->interface->dev,
+                               "%s - nonzero write bulk status received: %d\n",
+                               __func__, urb->status);
 
                spin_lock(&dev->err_lock);
                dev->errors = urb->status;
@@ -472,8 +462,9 @@ static ssize_t skel_write(struct file *file, const char *user_buffer,
        retval = usb_submit_urb(urb, GFP_KERNEL);
        mutex_unlock(&dev->io_mutex);
        if (retval) {
-               err("%s - failed submitting write urb, error %d", __func__,
-                   retval);
+               dev_err(&dev->interface->dev,
+                       "%s - failed submitting write urb, error %d\n",
+                       __func__, retval);
                goto error_unanchor;
        }
 
@@ -532,7 +523,7 @@ static int skel_probe(struct usb_interface *interface,
        /* allocate memory for our device state and initialize it */
        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
        if (!dev) {
-               err("Out of memory");
+               dev_err(&interface->dev, "Out of memory\n");
                goto error;
        }
        kref_init(&dev->kref);
@@ -559,12 +550,14 @@ static int skel_probe(struct usb_interface *interface,
                        dev->bulk_in_endpointAddr = endpoint->bEndpointAddress;
                        dev->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
                        if (!dev->bulk_in_buffer) {
-                               err("Could not allocate bulk_in_buffer");
+                               dev_err(&interface->dev,
+                                       "Could not allocate bulk_in_buffer\n");
                                goto error;
                        }
                        dev->bulk_in_urb = usb_alloc_urb(0, GFP_KERNEL);
                        if (!dev->bulk_in_urb) {
-                               err("Could not allocate bulk_in_urb");
+                               dev_err(&interface->dev,
+                                       "Could not allocate bulk_in_urb\n");
                                goto error;
                        }
                }
@@ -576,7 +569,8 @@ static int skel_probe(struct usb_interface *interface,
                }
        }
        if (!(dev->bulk_in_endpointAddr && dev->bulk_out_endpointAddr)) {
-               err("Could not find both bulk-in and bulk-out endpoints");
+               dev_err(&interface->dev,
+                       "Could not find both bulk-in and bulk-out endpoints\n");
                goto error;
        }
 
@@ -587,7 +581,8 @@ static int skel_probe(struct usb_interface *interface,
        retval = usb_register_dev(interface, &skel_class);
        if (retval) {
                /* something prevented us from registering this driver */
-               err("Not able to get a minor for this device.");
+               dev_err(&interface->dev,
+                       "Not able to get a minor for this device.\n");
                usb_set_intfdata(interface, NULL);
                goto error;
        }
@@ -611,6 +606,7 @@ static void skel_disconnect(struct usb_interface *interface)
        int minor = interface->minor;
 
        dev = usb_get_intfdata(interface);
+       usb_set_intfdata(interface, NULL);
 
        /* give back our minor */
        usb_deregister_dev(interface, &skel_class);
@@ -622,12 +618,8 @@ static void skel_disconnect(struct usb_interface *interface)
 
        usb_kill_anchored_urbs(&dev->submitted);
 
-       mutex_lock(&skel_mutex);
-       usb_set_intfdata(interface, NULL);
-
        /* decrement our usage count */
        kref_put(&dev->kref, skel_delete);
-       mutex_unlock(&skel_mutex);
 
        dev_info(&interface->dev, "USB Skeleton #%d now disconnected", minor);
 }