lkml.org 
[lkml]   [2010]   [Jun]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCHv3 02/11] USB: gadget: f_mass_storage: fsg_add() renamed to fsg_bind_config()
    Mass Storage Function had a bit unique name for function
    used to add it to USB configuration. Renamed as to match
    naming convention of other functions.

    Signed-off-by: Michal Nazarewicz <m.nazarewicz@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    ---
    drivers/usb/gadget/f_mass_storage.c | 13 ++++++++++---
    drivers/usb/gadget/mass_storage.c | 2 +-
    drivers/usb/gadget/multi.c | 4 ++--
    3 files changed, 13 insertions(+), 6 deletions(-)

    diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
    index 7d05a0b..072cbf9 100644
    --- a/drivers/usb/gadget/f_mass_storage.c
    +++ b/drivers/usb/gadget/f_mass_storage.c
    @@ -3023,9 +3023,9 @@ static struct usb_gadget_strings *fsg_strings_array[] = {
    NULL,
    };

    -static int fsg_add(struct usb_composite_dev *cdev,
    - struct usb_configuration *c,
    - struct fsg_common *common)
    +static int fsg_bind_config(struct usb_composite_dev *cdev,
    + struct usb_configuration *c,
    + struct fsg_common *common)
    {
    struct fsg_dev *fsg;
    int rc;
    @@ -3072,6 +3072,13 @@ error_free_fsg:
    return rc;
    }

    +static inline int __deprecated __maybe_unused
    +fsg_add(struct usb_composite_dev *cdev,
    + struct usb_configuration *c,
    + struct fsg_common *common)
    +{
    + return fsg_bind_config(cdev, c, common);
    +}


    /************************* Module parameters *************************/
    diff --git a/drivers/usb/gadget/mass_storage.c b/drivers/usb/gadget/mass_storage.c
    index a3349f2..d6975f4 100644
    --- a/drivers/usb/gadget/mass_storage.c
    +++ b/drivers/usb/gadget/mass_storage.c
    @@ -159,7 +159,7 @@ static int __init msg_do_config(struct usb_configuration *c)
    if (IS_ERR(retp))
    return PTR_ERR(retp);

    - ret = fsg_add(c->cdev, c, &common);
    + ret = fsg_bind_config(c->cdev, c, &common);
    fsg_common_put(&common);
    return ret;
    }
    diff --git a/drivers/usb/gadget/multi.c b/drivers/usb/gadget/multi.c
    index a930d7f..d3d3140 100644
    --- a/drivers/usb/gadget/multi.c
    +++ b/drivers/usb/gadget/multi.c
    @@ -172,7 +172,7 @@ static int __init rndis_do_config(struct usb_configuration *c)
    if (ret < 0)
    return ret;

    - ret = fsg_add(c->cdev, c, fsg_common);
    + ret = fsg_bind_config(c->cdev, c, fsg_common);
    if (ret < 0)
    return ret;

    @@ -208,7 +208,7 @@ static int __init cdc_do_config(struct usb_configuration *c)
    if (ret < 0)
    return ret;

    - ret = fsg_add(c->cdev, c, fsg_common);
    + ret = fsg_bind_config(c->cdev, c, fsg_common);
    if (ret < 0)
    return ret;

    --
    1.7.1


    \
     
     \ /
      Last update: 2010-06-02 14:51    [W:0.025 / U:0.480 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site