diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-27 20:19:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-27 20:19:16 -0400 |
| commit | a83398570e17af6bb81eb94f4f5dd356bd2828d8 (patch) | |
| tree | 5b5c7c3a56898485479291b7c964a1f3887d469c /drivers/usb/usb-skeleton.c | |
| parent | f9384d41c02408dd404aa64d66d0ef38adcf6479 (diff) | |
| parent | 0b4d569de222452bcb55a4a536ade6cf4d8d1e30 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/usb/usb-skeleton.c')
| -rw-r--r-- | drivers/usb/usb-skeleton.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/usb-skeleton.c b/drivers/usb/usb-skeleton.c index be76084c8d7e..60ba631e99c2 100644 --- a/drivers/usb/usb-skeleton.c +++ b/drivers/usb/usb-skeleton.c | |||
| @@ -410,7 +410,9 @@ static int skel_probe(struct usb_interface *interface, const struct usb_device_i | |||
| 410 | } | 410 | } |
| 411 | 411 | ||
| 412 | /* let the user know what node this device is now attached to */ | 412 | /* let the user know what node this device is now attached to */ |
| 413 | info("USB Skeleton device now attached to USBSkel-%d", interface->minor); | 413 | dev_info(&interface->dev, |
| 414 | "USB Skeleton device now attached to USBSkel-%d", | ||
| 415 | interface->minor); | ||
| 414 | return 0; | 416 | return 0; |
| 415 | 417 | ||
| 416 | error: | 418 | error: |
| @@ -441,7 +443,7 @@ static void skel_disconnect(struct usb_interface *interface) | |||
| 441 | /* decrement our usage count */ | 443 | /* decrement our usage count */ |
| 442 | kref_put(&dev->kref, skel_delete); | 444 | kref_put(&dev->kref, skel_delete); |
| 443 | 445 | ||
| 444 | info("USB Skeleton #%d now disconnected", minor); | 446 | dev_info(&interface->dev, "USB Skeleton #%d now disconnected", minor); |
| 445 | } | 447 | } |
| 446 | 448 | ||
| 447 | static void skel_draw_down(struct usb_skel *dev) | 449 | static void skel_draw_down(struct usb_skel *dev) |