linux-kernel - [PATCH 6/9] mfd: lp3943: Remove redundant i2c_device

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Sun, 4 Jun 2017 14:48:41 +0530
From:   Keerthy <j-keerthy@...com>
To:     <tony@...mide.com>, <milo.kim@...com>, <lee.jones@...aro.org>
CC:     <j-keerthy@...com>, <linux-omap@...r.kernel.org>,
        <linux-kernel@...r.kernel.org>
Subject: [PATCH 6/9] mfd: lp3943: Remove redundant i2c_device_id

With the introduction of probe_new function the i2c_device_id
is no longer needed. Hence the remove the same and use probe_new
instead of probe.

Signed-off-by: Keerthy <j-keerthy@...com>
---

Compile tested.

 drivers/mfd/lp3943.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/drivers/mfd/lp3943.c b/drivers/mfd/lp3943.c
index 65a2a8f1..84ec685 100644
--- a/drivers/mfd/lp3943.c
+++ b/drivers/mfd/lp3943.c
@@ -105,7 +105,7 @@ int lp3943_update_bits(struct lp3943 *lp3943, u8 reg, u8 mask, u8 data)
 	.max_register = LP3943_MAX_REGISTERS,
 };
 
-static int lp3943_probe(struct i2c_client *cl, const struct i2c_device_id *id)
+static int lp3943_probe(struct i2c_client *cl)
 {
 	struct lp3943 *lp3943;
 	struct device *dev = &cl->dev;
@@ -128,12 +128,6 @@ static int lp3943_probe(struct i2c_client *cl, const struct i2c_device_id *id)
 				    NULL, 0, NULL);
 }
 
-static const struct i2c_device_id lp3943_ids[] = {
-	{ "lp3943", 0 },
-	{ }
-};
-MODULE_DEVICE_TABLE(i2c, lp3943_ids);
-
 #ifdef CONFIG_OF
 static const struct of_device_id lp3943_of_match[] = {
 	{ .compatible = "ti,lp3943", },
@@ -143,12 +137,11 @@ static int lp3943_probe(struct i2c_client *cl, const struct i2c_device_id *id)
 #endif
 
 static struct i2c_driver lp3943_driver = {
-	.probe = lp3943_probe,
+	.probe_new = lp3943_probe,
 	.driver = {
 		.name = "lp3943",
 		.of_match_table = of_match_ptr(lp3943_of_match),
 	},
-	.id_table = lp3943_ids,
 };
 
 module_i2c_driver(lp3943_driver);
-- 
1.9.1