[PATCHv7,10/11] mfd: as3722: Rid driver of superfluous I2C device ID structure

Message ID 1478522866-29620-11-git-send-email-kieran@bingham.xyz
State New
Headers show

Commit Message

Kieran Bingham Nov. 7, 2016, 12:47 p.m.
From: Lee Jones <lee.jones@linaro.org>


Also remove unused second probe() parameter 'i2c_device_id'.

Acked-by: Grant Likely <grant.likely@linaro.org>

Signed-off-by: Lee Jones <lee.jones@linaro.org>

Signed-off-by: Kieran Bingham <kieran@bingham.xyz>


---
Changes since v4
 - Rename .probe2 to probe_new

 drivers/mfd/as3722.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

-- 
2.7.4

Comments

Wolfram Sang Nov. 7, 2016, 11:09 p.m. | #1
> Remember that i2c_device_uevent() always reports modalias of the form

> MODALIAS=i2c:<foo> even when your series allows to match without a I2C

> device ID table.


Not always. Can't we do something similar like ACPI does with
acpi_device_uevent_modalias()?

I mean the whole point of this series is to remove the need of having an
I2C device ID table...

Patch hide | download patch | download mbox

diff --git a/drivers/mfd/as3722.c b/drivers/mfd/as3722.c
index f87342c211bc..7d8c5e4136e2 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;
@@ -441,12 +440,6 @@  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 const struct dev_pm_ops as3722_pm_ops = {
 	SET_SYSTEM_SLEEP_PM_OPS(as3722_i2c_suspend, as3722_i2c_resume)
 };
@@ -457,8 +450,7 @@  static struct i2c_driver as3722_i2c_driver = {
 		.of_match_table = as3722_of_match,
 		.pm = &as3722_pm_ops,
 	},
-	.probe = as3722_i2c_probe,
-	.id_table = as3722_i2c_id,
+	.probe_new = as3722_i2c_probe,
 };
 
 module_i2c_driver(as3722_i2c_driver);