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 259/606] Input: st1232 - Convert to i2c's .probe_new()
    Date
    From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

    .probe_new() doesn't get the i2c_device_id * parameter, so determine
    that explicitly in the probe function.

    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    ---
    drivers/input/touchscreen/st1232.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c
    index e38ba3e4f183..bd68633dc6c0 100644
    --- a/drivers/input/touchscreen/st1232.c
    +++ b/drivers/input/touchscreen/st1232.c
    @@ -220,9 +220,9 @@ static const struct st_chip_info st1633_chip_info = {
    .max_fingers = 5,
    };

    -static int st1232_ts_probe(struct i2c_client *client,
    - const struct i2c_device_id *id)
    +static int st1232_ts_probe(struct i2c_client *client)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(client);
    const struct st_chip_info *match;
    struct st1232_ts_data *ts;
    struct input_dev *input_dev;
    @@ -384,7 +384,7 @@ static const struct of_device_id st1232_ts_dt_ids[] = {
    MODULE_DEVICE_TABLE(of, st1232_ts_dt_ids);

    static struct i2c_driver st1232_ts_driver = {
    - .probe = st1232_ts_probe,
    + .probe_new = st1232_ts_probe,
    .id_table = st1232_ts_id,
    .driver = {
    .name = ST1232_TS_NAME,
    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-19 01:11    [W:2.373 / U:0.248 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site