lkml.org 
[lkml]   [2014]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH/RFC v9 11/19] v4l2-async: change custom.match callback argument type
    Date
    It is useful to have an access to the async sub-device
    being matched, not only to the related struct device.
    Change match callback argument from struct device
    to struct v4l2_subdev.

    Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
    Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
    Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Cc: Hans Verkuil <hans.verkuil@cisco.com>
    ---
    drivers/media/v4l2-core/v4l2-async.c | 16 ++++++++--------
    include/media/v4l2-async.h | 2 +-
    2 files changed, 9 insertions(+), 9 deletions(-)

    diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
    index 85a6a34..8140992 100644
    --- a/drivers/media/v4l2-core/v4l2-async.c
    +++ b/drivers/media/v4l2-core/v4l2-async.c
    @@ -22,10 +22,10 @@
    #include <media/v4l2-device.h>
    #include <media/v4l2-subdev.h>

    -static bool match_i2c(struct device *dev, struct v4l2_async_subdev *asd)
    +static bool match_i2c(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
    {
    #if IS_ENABLED(CONFIG_I2C)
    - struct i2c_client *client = i2c_verify_client(dev);
    + struct i2c_client *client = i2c_verify_client(sd->dev);
    return client &&
    asd->match.i2c.adapter_id == client->adapter->nr &&
    asd->match.i2c.address == client->addr;
    @@ -34,14 +34,14 @@ static bool match_i2c(struct device *dev, struct v4l2_async_subdev *asd)
    #endif
    }

    -static bool match_devname(struct device *dev, struct v4l2_async_subdev *asd)
    +static bool match_devname(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
    {
    - return !strcmp(asd->match.device_name.name, dev_name(dev));
    + return !strcmp(asd->match.device_name.name, dev_name(sd->dev));
    }

    -static bool match_of(struct device *dev, struct v4l2_async_subdev *asd)
    +static bool match_of(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
    {
    - return dev->of_node == asd->match.of.node;
    + return sd->dev->of_node == asd->match.of.node;
    }

    static LIST_HEAD(subdev_list);
    @@ -52,7 +52,7 @@ static struct v4l2_async_subdev *v4l2_async_belongs(struct v4l2_async_notifier *
    struct v4l2_subdev *sd)
    {
    struct v4l2_async_subdev *asd;
    - bool (*match)(struct device *, struct v4l2_async_subdev *);
    + bool (*match)(struct v4l2_subdev *, struct v4l2_async_subdev *);

    list_for_each_entry(asd, &notifier->waiting, list) {
    /* bus_type has been verified valid before */
    @@ -79,7 +79,7 @@ static struct v4l2_async_subdev *v4l2_async_belongs(struct v4l2_async_notifier *
    }

    /* match cannot be NULL here */
    - if (match(sd->dev, asd))
    + if (match(sd, asd))
    return asd;
    }

    diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
    index 7683569..1c0b586 100644
    --- a/include/media/v4l2-async.h
    +++ b/include/media/v4l2-async.h
    @@ -51,7 +51,7 @@ struct v4l2_async_subdev {
    unsigned short address;
    } i2c;
    struct {
    - bool (*match)(struct device *,
    + bool (*match)(struct v4l2_subdev *,
    struct v4l2_async_subdev *);
    void *priv;
    } custom;
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2014-12-03 17:41    [W:3.617 / U:0.540 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site