Re: [PATCH v2 2/2] Input: st1232 - add support for st1633

[Dmitry Torokhov]

Hi Martin,

On Thu, Jan 24, 2019 at 11:21:25AM +0100, Martin Kepplinger wrote:
> From: Martin Kepplinger <martin.kepplin...@ginzinger.com>
> 
> Add support for the Sitronix ST1633 touchscreen controller to the st1232
> driver. A protocol spec can be found here:
> www.ampdisplay.com/documents/pdf/AM-320480B6TZQW-TC0H.pdf
> 
> Signed-off-by: Martin Kepplinger <martin.kepplin...@ginzinger.com>
> ---
> 
> while this works, I'm not totally convinced by how the i2c path of probe
> looks. what do you say?

Not quite what I had in mind. See below...

>  static int st1232_ts_probe(struct i2c_client *client,
>                          const struct i2c_device_id *id)
>  {
>       struct st1232_ts_data *ts;
> +     struct st1232_ts_finger *finger;
>       struct input_dev *input_dev;
>       int error;
> +     const struct st_chip_info *match = NULL;
> +
> +     if (dev_fwnode(&client->dev))
> +             match = device_get_match_data(&client->dev);
> +     else if (id && id->driver_data == st1232)
> +             match = &st1232_chip_info;
> +     else if (id && id->driver_data == st1633)
> +             match = &st1633_chip_info;
> +     if (!match) {
> +             dev_err(&client->dev, "unknown device model\n");
> +             return -ENODEV;
> +     }

If you do:

static const struct i2c_device_id st1232_ts_id[] = {
        { ST1232_TS_NAME, (unsigned long)&st1232_chip_info },
        { ST1633_TS_NAME, (unsigned long)&st1633_chip_info },
        { }
};


Then you can do:

        match = device_get_match_data(&client->dev);
        if (!match && id)
                match = (const void *)id->driver_data;
        if (!match) {
                dev_err(&client->dev, "unknown device model\n");
                return -ENODEV;
        }

Thanks.

-- 
Dmitry