lkml.org 
[lkml]   [2010]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCHv4 03/13] USB: gadget: f_fs: functionfs_add() renamed to functionfs_bind_config()
    FunctionFS 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_fs.c | 6 +++---
    drivers/usb/gadget/g_ffs.c | 2 +-
    include/linux/usb/functionfs.h | 6 +++---
    3 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
    index d69eccf..3fe120f 100644
    --- a/drivers/usb/gadget/f_fs.c
    +++ b/drivers/usb/gadget/f_fs.c
    @@ -1480,9 +1480,9 @@ static void ffs_epfiles_destroy(struct ffs_epfile *epfiles, unsigned count)
    }


    -static int functionfs_add(struct usb_composite_dev *cdev,
    - struct usb_configuration *c,
    - struct ffs_data *ffs)
    +static int functionfs_bind_config(struct usb_composite_dev *cdev,
    + struct usb_configuration *c,
    + struct ffs_data *ffs)
    {
    struct ffs_function *func;
    int ret;
    diff --git a/drivers/usb/gadget/g_ffs.c b/drivers/usb/gadget/g_ffs.c
    index 4b0e4a0..2f26470 100644
    --- a/drivers/usb/gadget/g_ffs.c
    +++ b/drivers/usb/gadget/g_ffs.c
    @@ -388,7 +388,7 @@ static int __gfs_do_config(struct usb_configuration *c,
    return ret;
    }

    - ret = functionfs_add(c->cdev, c, gfs_ffs_data);
    + ret = functionfs_bind_config(c->cdev, c, gfs_ffs_data);
    if (unlikely(ret < 0))
    return ret;

    diff --git a/include/linux/usb/functionfs.h b/include/linux/usb/functionfs.h
    index a34a2a0..6f649c1 100644
    --- a/include/linux/usb/functionfs.h
    +++ b/include/linux/usb/functionfs.h
    @@ -180,9 +180,9 @@ static int functionfs_bind(struct ffs_data *ffs, struct usb_composite_dev *cdev)
    static void functionfs_unbind(struct ffs_data *ffs)
    __attribute__((nonnull));

    -static int functionfs_add(struct usb_composite_dev *cdev,
    - struct usb_configuration *c,
    - struct ffs_data *ffs)
    +static int functionfs_bind_config(struct usb_composite_dev *cdev,
    + struct usb_configuration *c,
    + struct ffs_data *ffs)
    __attribute__((warn_unused_result, nonnull));


    --
    1.7.1


    \
     
     \ /
      Last update: 2010-06-07 14:45    [W:0.023 / U:65.396 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site