[PATCH 9/9] mfd: as3722: Rid driver of superfluous I2C device ID structure
From: Lee Jones <hidden>
Date: 2014-06-20 12:03:54
Also in:
linux-arm-kernel, linux-i2c, lkml
Subsystem:
multifunction devices (mfd), the rest · Maintainers:
Lee Jones, Linus Torvalds
Also remove unused second probe() parameter 'i2c_device_id'. Acked-by: Grant Likely <redacted> Signed-off-by: Lee Jones <redacted> --- drivers/mfd/as3722.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/mfd/as3722.c b/drivers/mfd/as3722.c
index 39fa554..cb2fcf9 100644
--- a/drivers/mfd/as3722.c
+++ b/drivers/mfd/as3722.c@@ -354,8 +354,7 @@ static int as3722_i2c_of_probe(struct i2c_client *i2c, return 0; } -static int as3722_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int as3722_i2c_probe(struct i2c_client *i2c) { struct as3722 *as3722; unsigned long irq_flags;
@@ -428,21 +427,14 @@ static const struct of_device_id as3722_of_match[] = { }; MODULE_DEVICE_TABLE(of, as3722_of_match); -static const struct i2c_device_id as3722_i2c_id[] = { - { "as3722", 0 }, - {}, -}; -MODULE_DEVICE_TABLE(i2c, as3722_i2c_id); - static struct i2c_driver as3722_i2c_driver = { .driver = { .name = "as3722", .owner = THIS_MODULE, .of_match_table = as3722_of_match, }, - .probe = as3722_i2c_probe, + .probe2 = as3722_i2c_probe, .remove = as3722_i2c_remove, - .id_table = as3722_i2c_id, }; module_i2c_driver(as3722_i2c_driver);
--
1.8.3.2