Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1657038

[PATCH 6/9] mfd: lp3943: Remove redundant i2c_device_id

Show all headers | View raw

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@ti.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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/9] mfd: Remove redundant i2c_device_id Keerthy <j-keerthy@ti.com> - 2017-06-04 11:20 +0200
  [PATCH 3/9] mfd: palmas: Remove redundant i2c_device_id Keerthy <j-keerthy@ti.com> - 2017-06-04 11:30 +0200
  [PATCH 5/9] mfd: lp8788: Remove redundant i2c_device_id Keerthy <j-keerthy@ti.com> - 2017-06-04 11:30 +0200
  [PATCH 9/9] mfd: tps6586x: Remove redundant i2c_device_id Keerthy <j-keerthy@ti.com> - 2017-06-04 11:30 +0200
  [PATCH 7/9] mfd: tps65086: Remove redundant i2c_device_id Keerthy <j-keerthy@ti.com> - 2017-06-04 11:30 +0200
  [PATCH 2/9] mfd: tps65218: Remove redundant i2c_device_id Keerthy <j-keerthy@ti.com> - 2017-06-04 11:30 +0200
  [PATCH 8/9] mfd: tps65090: Remove redundant i2c_device_id Keerthy <j-keerthy@ti.com> - 2017-06-04 11:30 +0200
  [PATCH 6/9] mfd: lp3943: Remove redundant i2c_device_id Keerthy <j-keerthy@ti.com> - 2017-06-04 11:30 +0200
  [PATCH 4/9] mfd: lp873x: Remove redundant i2c_device_id Keerthy <j-keerthy@ti.com> - 2017-06-04 11:30 +0200
  Re: [PATCH 0/9] mfd: Remove redundant i2c_device_id Lee Jones <lee.jones@linaro.org> - 2017-06-05 12:40 +0200
    Re: [PATCH 0/9] mfd: Remove redundant i2c_device_id Keerthy <j-keerthy@ti.com> - 2017-06-05 16:40 +0200
      Re: [PATCH 0/9] mfd: Remove redundant i2c_device_id Lee Jones <lee.jones@linaro.org> - 2017-06-06 09:20 +0200
        Re: [PATCH 0/9] mfd: Remove redundant i2c_device_id Keerthy <j-keerthy@ti.com> - 2017-06-06 09:40 +0200
          Re: [PATCH 0/9] mfd: Remove redundant i2c_device_id Keerthy <j-keerthy@ti.com> - 2017-06-06 09:50 +0200
            Re: [PATCH 0/9] mfd: Remove redundant i2c_device_id Tony Lindgren <tony@atomide.com> - 2017-06-06 12:50 +0200
              Re: [PATCH 0/9] mfd: Remove redundant i2c_device_id Keerthy <j-keerthy@ti.com> - 2017-06-06 13:10 +0200

csiph-web