HID: i2c: use simple i2c probe
authorStephen Kitt <steve@sk2.org>
Wed, 12 Oct 2022 16:33:00 +0000 (18:33 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 18 Oct 2022 14:13:25 +0000 (16:13 +0200)
commitbaf34f3bbe6de7ac1efb4e31342403e9cca8888d
tree88d699845af8ddccc4442f71045e60705af51fbb
parent79d11de9637a37035b4a72ccb528b3dfebc1bf67
HID: i2c: use simple i2c probe

All these drivers have an i2c probe function which doesn't use the
"struct i2c_device_id *id" parameter, so they can trivially be
converted to the "probe_new" style of probe with a single argument.

This is part of an ongoing transition to single-argument i2c probe
functions. Old-style probe functions involve a call to i2c_match_id:
in drivers/i2c/i2c-core-base.c,

         /*
          * When there are no more users of probe(),
          * rename probe_new to probe.
          */
         if (driver->probe_new)
                 status = driver->probe_new(client);
         else if (driver->probe)
                 status = driver->probe(client,
                                        i2c_match_id(driver->id_table, client));
         else
                 status = -EINVAL;

Drivers which don't need the second parameter can be declared using
probe_new instead, avoiding the call to i2c_match_id. Drivers which do
can still be converted to probe_new-style, calling i2c_match_id
themselves (as is done currently for of_match_id).

This change was done using the following Coccinelle script, and fixed
up for whitespace changes:

@ rule1 @
identifier fn;
identifier client, id;
@@

- static int fn(struct i2c_client *client, const struct i2c_device_id *id)
+ static int fn(struct i2c_client *client)
{
...when != id
}

@ rule2 depends on rule1 @
identifier rule1.fn;
identifier driver;
@@

struct i2c_driver driver = {
-       .probe
+       .probe_new
                =
(
                   fn
|
-                  &fn
+                  fn
)
                ,
};

Signed-off-by: Stephen Kitt <steve@sk2.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/i2c-hid/i2c-hid-of-elan.c
drivers/hid/i2c-hid/i2c-hid-of-goodix.c
drivers/hid/i2c-hid/i2c-hid-of.c