mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
bf08ce132c
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>
84 lines
1.7 KiB
C
84 lines
1.7 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (C) 2009 Wolfram Sang, Pengutronix
|
|
*
|
|
* Check max730x.c for further details.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/init.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/mutex.h>
|
|
#include <linux/i2c.h>
|
|
#include <linux/spi/max7301.h>
|
|
#include <linux/slab.h>
|
|
|
|
static int max7300_i2c_write(struct device *dev, unsigned int reg,
|
|
unsigned int val)
|
|
{
|
|
struct i2c_client *client = to_i2c_client(dev);
|
|
|
|
return i2c_smbus_write_byte_data(client, reg, val);
|
|
}
|
|
|
|
static int max7300_i2c_read(struct device *dev, unsigned int reg)
|
|
{
|
|
struct i2c_client *client = to_i2c_client(dev);
|
|
|
|
return i2c_smbus_read_byte_data(client, reg);
|
|
}
|
|
|
|
static int max7300_probe(struct i2c_client *client)
|
|
{
|
|
struct max7301 *ts;
|
|
|
|
if (!i2c_check_functionality(client->adapter,
|
|
I2C_FUNC_SMBUS_BYTE_DATA))
|
|
return -EIO;
|
|
|
|
ts = devm_kzalloc(&client->dev, sizeof(struct max7301), GFP_KERNEL);
|
|
if (!ts)
|
|
return -ENOMEM;
|
|
|
|
ts->read = max7300_i2c_read;
|
|
ts->write = max7300_i2c_write;
|
|
ts->dev = &client->dev;
|
|
|
|
return __max730x_probe(ts);
|
|
}
|
|
|
|
static void max7300_remove(struct i2c_client *client)
|
|
{
|
|
__max730x_remove(&client->dev);
|
|
}
|
|
|
|
static const struct i2c_device_id max7300_id[] = {
|
|
{ "max7300", 0 },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(i2c, max7300_id);
|
|
|
|
static struct i2c_driver max7300_driver = {
|
|
.driver = {
|
|
.name = "max7300",
|
|
},
|
|
.probe_new = max7300_probe,
|
|
.remove = max7300_remove,
|
|
.id_table = max7300_id,
|
|
};
|
|
|
|
static int __init max7300_init(void)
|
|
{
|
|
return i2c_add_driver(&max7300_driver);
|
|
}
|
|
subsys_initcall(max7300_init);
|
|
|
|
static void __exit max7300_exit(void)
|
|
{
|
|
i2c_del_driver(&max7300_driver);
|
|
}
|
|
module_exit(max7300_exit);
|
|
|
|
MODULE_AUTHOR("Wolfram Sang");
|
|
MODULE_LICENSE("GPL v2");
|
|
MODULE_DESCRIPTION("MAX7300 GPIO-Expander");
|