lkml.org 
[lkml]   [2022]   [Nov]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 399/606] media: vidtv: Convert to i2c's .probe_new()
    Date
    From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

    The probe functions doesn't make use of the i2c_device_id * parameter so it
    can be trivially converted.

    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    ---
    drivers/media/test-drivers/vidtv/vidtv_demod.c | 5 ++---
    drivers/media/test-drivers/vidtv/vidtv_tuner.c | 5 ++---
    2 files changed, 4 insertions(+), 6 deletions(-)

    diff --git a/drivers/media/test-drivers/vidtv/vidtv_demod.c b/drivers/media/test-drivers/vidtv/vidtv_demod.c
    index d60c6d16beea..b878db798686 100644
    --- a/drivers/media/test-drivers/vidtv/vidtv_demod.c
    +++ b/drivers/media/test-drivers/vidtv/vidtv_demod.c
    @@ -412,8 +412,7 @@ static const struct i2c_device_id vidtv_demod_i2c_id_table[] = {
    };
    MODULE_DEVICE_TABLE(i2c, vidtv_demod_i2c_id_table);

    -static int vidtv_demod_i2c_probe(struct i2c_client *client,
    - const struct i2c_device_id *id)
    +static int vidtv_demod_i2c_probe(struct i2c_client *client)
    {
    struct vidtv_tuner_config *config = client->dev.platform_data;
    struct vidtv_demod_state *state;
    @@ -450,7 +449,7 @@ static struct i2c_driver vidtv_demod_i2c_driver = {
    .name = "dvb_vidtv_demod",
    .suppress_bind_attrs = true,
    },
    - .probe = vidtv_demod_i2c_probe,
    + .probe_new = vidtv_demod_i2c_probe,
    .remove = vidtv_demod_i2c_remove,
    .id_table = vidtv_demod_i2c_id_table,
    };
    diff --git a/drivers/media/test-drivers/vidtv/vidtv_tuner.c b/drivers/media/test-drivers/vidtv/vidtv_tuner.c
    index aabc97ed736b..55a4387f3854 100644
    --- a/drivers/media/test-drivers/vidtv/vidtv_tuner.c
    +++ b/drivers/media/test-drivers/vidtv/vidtv_tuner.c
    @@ -390,8 +390,7 @@ static const struct i2c_device_id vidtv_tuner_i2c_id_table[] = {
    };
    MODULE_DEVICE_TABLE(i2c, vidtv_tuner_i2c_id_table);

    -static int vidtv_tuner_i2c_probe(struct i2c_client *client,
    - const struct i2c_device_id *id)
    +static int vidtv_tuner_i2c_probe(struct i2c_client *client)
    {
    struct vidtv_tuner_config *config = client->dev.platform_data;
    struct dvb_frontend *fe = config->fe;
    @@ -426,7 +425,7 @@ static struct i2c_driver vidtv_tuner_i2c_driver = {
    .name = "dvb_vidtv_tuner",
    .suppress_bind_attrs = true,
    },
    - .probe = vidtv_tuner_i2c_probe,
    + .probe_new = vidtv_tuner_i2c_probe,
    .remove = vidtv_tuner_i2c_remove,
    .id_table = vidtv_tuner_i2c_id_table,
    };
    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-19 00:49    [W:3.202 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site