drivers/gpio: 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: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
This commit is contained in:
parent
9abf2313ad
commit
bf08ce132c
|
@ -67,8 +67,7 @@ static void gw_pld_set8(struct gpio_chip *gc, unsigned offset, int value)
|
|||
gw_pld_output8(gc, offset, value);
|
||||
}
|
||||
|
||||
static int gw_pld_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
static int gw_pld_probe(struct i2c_client *client)
|
||||
{
|
||||
struct device *dev = &client->dev;
|
||||
struct gw_pld *gw;
|
||||
|
@ -126,7 +125,7 @@ static struct i2c_driver gw_pld_driver = {
|
|||
.name = "gw_pld",
|
||||
.of_match_table = gw_pld_dt_ids,
|
||||
},
|
||||
.probe = gw_pld_probe,
|
||||
.probe_new = gw_pld_probe,
|
||||
.id_table = gw_pld_id,
|
||||
};
|
||||
module_i2c_driver(gw_pld_driver);
|
||||
|
|
|
@ -28,8 +28,7 @@ static int max7300_i2c_read(struct device *dev, unsigned int reg)
|
|||
return i2c_smbus_read_byte_data(client, reg);
|
||||
}
|
||||
|
||||
static int max7300_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
static int max7300_probe(struct i2c_client *client)
|
||||
{
|
||||
struct max7301 *ts;
|
||||
|
||||
|
@ -63,7 +62,7 @@ static struct i2c_driver max7300_driver = {
|
|||
.driver = {
|
||||
.name = "max7300",
|
||||
},
|
||||
.probe = max7300_probe,
|
||||
.probe_new = max7300_probe,
|
||||
.remove = max7300_remove,
|
||||
.id_table = max7300_id,
|
||||
};
|
||||
|
|
|
@ -98,8 +98,7 @@ static const struct of_device_id tpic2810_of_match_table[] = {
|
|||
};
|
||||
MODULE_DEVICE_TABLE(of, tpic2810_of_match_table);
|
||||
|
||||
static int tpic2810_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
static int tpic2810_probe(struct i2c_client *client)
|
||||
{
|
||||
struct tpic2810 *gpio;
|
||||
int ret;
|
||||
|
@ -144,7 +143,7 @@ static struct i2c_driver tpic2810_driver = {
|
|||
.name = "tpic2810",
|
||||
.of_match_table = tpic2810_of_match_table,
|
||||
},
|
||||
.probe = tpic2810_probe,
|
||||
.probe_new = tpic2810_probe,
|
||||
.remove = tpic2810_remove,
|
||||
.id_table = tpic2810_id_table,
|
||||
};
|
||||
|
|
|
@ -136,8 +136,7 @@ static const struct of_device_id ts4900_gpio_of_match_table[] = {
|
|||
};
|
||||
MODULE_DEVICE_TABLE(of, ts4900_gpio_of_match_table);
|
||||
|
||||
static int ts4900_gpio_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
static int ts4900_gpio_probe(struct i2c_client *client)
|
||||
{
|
||||
struct ts4900_gpio_priv *priv;
|
||||
u32 ngpio;
|
||||
|
@ -186,7 +185,7 @@ static struct i2c_driver ts4900_gpio_driver = {
|
|||
.name = "ts4900-gpio",
|
||||
.of_match_table = ts4900_gpio_of_match_table,
|
||||
},
|
||||
.probe = ts4900_gpio_probe,
|
||||
.probe_new = ts4900_gpio_probe,
|
||||
.id_table = ts4900_gpio_id_table,
|
||||
};
|
||||
module_i2c_driver(ts4900_gpio_driver);
|
||||
|
|
Loading…
Reference in New Issue