diff options
Diffstat (limited to 'drivers/usb/core/devio.c')
-rw-r--r-- | drivers/usb/core/devio.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c index cfc3cff6e8d5..8e6ef671be9b 100644 --- a/drivers/usb/core/devio.c +++ b/drivers/usb/core/devio.c | |||
@@ -475,11 +475,11 @@ static void snoop_urb(struct usb_device *udev, | |||
475 | 475 | ||
476 | if (userurb) { /* Async */ | 476 | if (userurb) { /* Async */ |
477 | if (when == SUBMIT) | 477 | if (when == SUBMIT) |
478 | dev_info(&udev->dev, "userurb %p, ep%d %s-%s, " | 478 | dev_info(&udev->dev, "userurb %pK, ep%d %s-%s, " |
479 | "length %u\n", | 479 | "length %u\n", |
480 | userurb, ep, t, d, length); | 480 | userurb, ep, t, d, length); |
481 | else | 481 | else |
482 | dev_info(&udev->dev, "userurb %p, ep%d %s-%s, " | 482 | dev_info(&udev->dev, "userurb %pK, ep%d %s-%s, " |
483 | "actual_length %u status %d\n", | 483 | "actual_length %u status %d\n", |
484 | userurb, ep, t, d, length, | 484 | userurb, ep, t, d, length, |
485 | timeout_or_status); | 485 | timeout_or_status); |
@@ -1895,7 +1895,7 @@ static int proc_reapurb(struct usb_dev_state *ps, void __user *arg) | |||
1895 | if (as) { | 1895 | if (as) { |
1896 | int retval; | 1896 | int retval; |
1897 | 1897 | ||
1898 | snoop(&ps->dev->dev, "reap %p\n", as->userurb); | 1898 | snoop(&ps->dev->dev, "reap %pK\n", as->userurb); |
1899 | retval = processcompl(as, (void __user * __user *)arg); | 1899 | retval = processcompl(as, (void __user * __user *)arg); |
1900 | free_async(as); | 1900 | free_async(as); |
1901 | return retval; | 1901 | return retval; |
@@ -1912,7 +1912,7 @@ static int proc_reapurbnonblock(struct usb_dev_state *ps, void __user *arg) | |||
1912 | 1912 | ||
1913 | as = async_getcompleted(ps); | 1913 | as = async_getcompleted(ps); |
1914 | if (as) { | 1914 | if (as) { |
1915 | snoop(&ps->dev->dev, "reap %p\n", as->userurb); | 1915 | snoop(&ps->dev->dev, "reap %pK\n", as->userurb); |
1916 | retval = processcompl(as, (void __user * __user *)arg); | 1916 | retval = processcompl(as, (void __user * __user *)arg); |
1917 | free_async(as); | 1917 | free_async(as); |
1918 | } else { | 1918 | } else { |
@@ -2043,7 +2043,7 @@ static int proc_reapurb_compat(struct usb_dev_state *ps, void __user *arg) | |||
2043 | if (as) { | 2043 | if (as) { |
2044 | int retval; | 2044 | int retval; |
2045 | 2045 | ||
2046 | snoop(&ps->dev->dev, "reap %p\n", as->userurb); | 2046 | snoop(&ps->dev->dev, "reap %pK\n", as->userurb); |
2047 | retval = processcompl_compat(as, (void __user * __user *)arg); | 2047 | retval = processcompl_compat(as, (void __user * __user *)arg); |
2048 | free_async(as); | 2048 | free_async(as); |
2049 | return retval; | 2049 | return retval; |
@@ -2060,7 +2060,7 @@ static int proc_reapurbnonblock_compat(struct usb_dev_state *ps, void __user *ar | |||
2060 | 2060 | ||
2061 | as = async_getcompleted(ps); | 2061 | as = async_getcompleted(ps); |
2062 | if (as) { | 2062 | if (as) { |
2063 | snoop(&ps->dev->dev, "reap %p\n", as->userurb); | 2063 | snoop(&ps->dev->dev, "reap %pK\n", as->userurb); |
2064 | retval = processcompl_compat(as, (void __user * __user *)arg); | 2064 | retval = processcompl_compat(as, (void __user * __user *)arg); |
2065 | free_async(as); | 2065 | free_async(as); |
2066 | } else { | 2066 | } else { |
@@ -2489,7 +2489,7 @@ static long usbdev_do_ioctl(struct file *file, unsigned int cmd, | |||
2489 | #endif | 2489 | #endif |
2490 | 2490 | ||
2491 | case USBDEVFS_DISCARDURB: | 2491 | case USBDEVFS_DISCARDURB: |
2492 | snoop(&dev->dev, "%s: DISCARDURB %p\n", __func__, p); | 2492 | snoop(&dev->dev, "%s: DISCARDURB %pK\n", __func__, p); |
2493 | ret = proc_unlinkurb(ps, p); | 2493 | ret = proc_unlinkurb(ps, p); |
2494 | break; | 2494 | break; |
2495 | 2495 | ||