git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USB: skeleton: Use dev_info instead of info
[pandora-kernel.git]
/
drivers
/
usb
/
usb-skeleton.c
diff --git
a/drivers/usb/usb-skeleton.c
b/drivers/usb/usb-skeleton.c
index
8de11de
..
60ba631
100644
(file)
--- a/
drivers/usb/usb-skeleton.c
+++ b/
drivers/usb/usb-skeleton.c
@@
-88,7
+88,7
@@
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",
interface = usb_find_interface(&skel_driver, subminor);
if (!interface) {
err ("%s - error, can't find device for minor %d",
- __
FUNCTION
__, subminor);
+ __
func
__, subminor);
retval = -ENODEV;
goto exit;
}
retval = -ENODEV;
goto exit;
}
@@
-125,6
+125,7
@@
static int skel_open(struct inode *inode, struct file *file)
/* save our object in the file's private structure */
file->private_data = dev;
/* save our object in the file's private structure */
file->private_data = dev;
+ mutex_unlock(&dev->io_mutex);
exit:
return retval;
exit:
return retval;
@@
-211,7
+212,7
@@
static void skel_write_bulk_callback(struct urb *urb)
{
struct usb_skel *dev;
{
struct usb_skel *dev;
- dev =
(struct usb_skel *)
urb->context;
+ dev = urb->context;
/* sync/async unlink faults aren't errors */
if (urb->status) {
/* sync/async unlink faults aren't errors */
if (urb->status) {
@@
-219,7
+220,7
@@
static void skel_write_bulk_callback(struct urb *urb)
urb->status == -ECONNRESET ||
urb->status == -ESHUTDOWN))
err("%s - nonzero write bulk status received: %d",
urb->status == -ECONNRESET ||
urb->status == -ESHUTDOWN))
err("%s - nonzero write bulk status received: %d",
- __
FUNCTION
__, urb->status);
+ __
func
__, urb->status);
spin_lock(&dev->err_lock);
dev->errors = urb->status;
spin_lock(&dev->err_lock);
dev->errors = urb->status;
@@
-300,7
+301,7
@@
static ssize_t skel_write(struct file *file, const char *user_buffer, size_t cou
retval = usb_submit_urb(urb, GFP_KERNEL);
mutex_unlock(&dev->io_mutex);
if (retval) {
retval = usb_submit_urb(urb, GFP_KERNEL);
mutex_unlock(&dev->io_mutex);
if (retval) {
- err("%s - failed submitting write urb, error %d", __
FUNCTION
__, retval);
+ err("%s - failed submitting write urb, error %d", __
func
__, retval);
goto error_unanchor;
}
goto error_unanchor;
}
@@
-409,7
+410,9
@@
static int skel_probe(struct usb_interface *interface, const struct usb_device_i
}
/* let the user know what node this device is now attached to */
}
/* let the user know what node this device is now attached to */
- info("USB Skeleton device now attached to USBSkel-%d", interface->minor);
+ dev_info(&interface->dev,
+ "USB Skeleton device now attached to USBSkel-%d",
+ interface->minor);
return 0;
error:
return 0;
error:
@@
-440,7
+443,7
@@
static void skel_disconnect(struct usb_interface *interface)
/* decrement our usage count */
kref_put(&dev->kref, skel_delete);
/* decrement our usage count */
kref_put(&dev->kref, skel_delete);
-
info(
"USB Skeleton #%d now disconnected", minor);
+
dev_info(&interface->dev,
"USB Skeleton #%d now disconnected", minor);
}
static void skel_draw_down(struct usb_skel *dev)
}
static void skel_draw_down(struct usb_skel *dev)