lkml.org 
[lkml]   [2012]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 036/117] USB: move usb_translate_errors to linux/usb.h
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Johan Hovold <jhovold@gmail.com>

    commit 2c4d6bf295ae10ffcd84f0df6cb642598eb66603 upstream.

    Move usb_translate_errors from usb core to linux/usb.h as it is meant to
    be accessed from drivers.

    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/usb/core/usb.h | 14 --------------
    include/linux/usb.h | 13 +++++++++++++
    2 files changed, 13 insertions(+), 14 deletions(-)

    diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
    index 3888778..45e8479 100644
    --- a/drivers/usb/core/usb.h
    +++ b/drivers/usb/core/usb.h
    @@ -132,20 +132,6 @@ static inline int is_usb_device_driver(struct device_driver *drv)
    for_devices;
    }

    -/* translate USB error codes to codes user space understands */
    -static inline int usb_translate_errors(int error_code)
    -{
    - switch (error_code) {
    - case 0:
    - case -ENOMEM:
    - case -ENODEV:
    - return error_code;
    - default:
    - return -EIO;
    - }
    -}
    -
    -
    /* for labeling diagnostics */
    extern const char *usbcore_name;

    diff --git a/include/linux/usb.h b/include/linux/usb.h
    index d3d0c13..2f05a7f 100644
    --- a/include/linux/usb.h
    +++ b/include/linux/usb.h
    @@ -1598,6 +1598,19 @@ usb_maxpacket(struct usb_device *udev, int pipe, int is_out)

    /* ----------------------------------------------------------------------- */

    +/* translate USB error codes to codes user space understands */
    +static inline int usb_translate_errors(int error_code)
    +{
    + switch (error_code) {
    + case 0:
    + case -ENOMEM:
    + case -ENODEV:
    + return error_code;
    + default:
    + return -EIO;
    + }
    +}
    +
    /* Events from the usb core */
    #define USB_DEVICE_ADD 0x0001
    #define USB_DEVICE_REMOVE 0x0002



    \
     
     \ /
      Last update: 2012-05-28 08:21    [W:0.025 / U:29.464 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site