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

Groups > linux.kernel > #1657032

[PATCH 3/9] mfd: palmas: 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>
---

Boot tested on dra7-evm and dra72-evm and checked for regulator registrations.

 drivers/mfd/palmas.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
index 9103aff..db9e53c 100644
--- a/drivers/mfd/palmas.c
+++ b/drivers/mfd/palmas.c
@@ -499,8 +499,7 @@ struct palmas_driver_data {
 };
 MODULE_DEVICE_TABLE(of, of_palmas_match_tbl);
 
-static int palmas_i2c_probe(struct i2c_client *i2c,
-			    const struct i2c_device_id *id)
+static int palmas_i2c_probe(struct i2c_client *i2c)
 {
 	struct palmas *palmas;
 	struct palmas_platform_data *pdata;
@@ -717,23 +716,13 @@ static int palmas_i2c_remove(struct i2c_client *i2c)
 	return 0;
 }
 
-static const struct i2c_device_id palmas_i2c_id[] = {
-	{ "palmas", },
-	{ "twl6035", },
-	{ "twl6037", },
-	{ "tps65913", },
-	{ /* end */ }
-};
-MODULE_DEVICE_TABLE(i2c, palmas_i2c_id);
-
 static struct i2c_driver palmas_i2c_driver = {
 	.driver = {
 		   .name = "palmas",
 		   .of_match_table = of_palmas_match_tbl,
 	},
-	.probe = palmas_i2c_probe,
+	.probe_new = palmas_i2c_probe,
 	.remove = palmas_i2c_remove,
-	.id_table = palmas_i2c_id,
 };
 
 static int __init palmas_i2c_init(void)
-- 
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