leds: lp50xx: Switch to new style i2c-driver probe function

Switch to the new style i2c-driver probe_new probe function.
Note we do not have any old style board files using this but
user still has a possibility to instantiate device from sysfs.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Pavel Machek <pavel@ucw.cz>

diff --git a/drivers/leds/leds-lp50xx.c b/drivers/leds/leds-lp50xx.c
index a2d18ec..19aec80 100644 (file)
--- a/drivers/leds/leds-lp50xx.c
+++ b/drivers/leds/leds-lp50xx.c
@@ -526,8 +526,7 @@ child_out:
        return ret;
 }
 
-static int lp50xx_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int lp50xx_probe(struct i2c_client *client)
 {
        struct lp50xx *led;
        int count;
@@ -547,7 +546,7 @@ static int lp50xx_probe(struct i2c_client *client,
        mutex_init(&led->lock);
        led->client = client;
        led->dev = &client->dev;
-       led->chip_info = &lp50xx_chip_info_tbl[id->driver_data];
+       led->chip_info = device_get_match_data(&client->dev);
        i2c_set_clientdata(client, led);
        led->regmap = devm_regmap_init_i2c(client,
                                        led->chip_info->lp50xx_regmap_config);
@@ -593,24 +592,24 @@ static int lp50xx_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id lp50xx_id[] = {
-       { "lp5009", LP5009 },
-       { "lp5012", LP5012 },
-       { "lp5018", LP5018 },
-       { "lp5024", LP5024 },
-       { "lp5030", LP5030 },
-       { "lp5036", LP5036 },
+       { "lp5009", (kernel_ulong_t)&lp50xx_chip_info_tbl[LP5009] },
+       { "lp5012", (kernel_ulong_t)&lp50xx_chip_info_tbl[LP5012] },
+       { "lp5018", (kernel_ulong_t)&lp50xx_chip_info_tbl[LP5018] },
+       { "lp5024", (kernel_ulong_t)&lp50xx_chip_info_tbl[LP5024] },
+       { "lp5030", (kernel_ulong_t)&lp50xx_chip_info_tbl[LP5030] },
+       { "lp5036", (kernel_ulong_t)&lp50xx_chip_info_tbl[LP5036] },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, lp50xx_id);
 
 static const struct of_device_id of_lp50xx_leds_match[] = {
-       { .compatible = "ti,lp5009", .data = (void *)LP5009 },
-       { .compatible = "ti,lp5012", .data = (void *)LP5012 },
-       { .compatible = "ti,lp5018", .data = (void *)LP5018 },
-       { .compatible = "ti,lp5024", .data = (void *)LP5024 },
-       { .compatible = "ti,lp5030", .data = (void *)LP5030 },
-       { .compatible = "ti,lp5036", .data = (void *)LP5036 },
-       {},
+       { .compatible = "ti,lp5009", .data = &lp50xx_chip_info_tbl[LP5009] },
+       { .compatible = "ti,lp5012", .data = &lp50xx_chip_info_tbl[LP5012] },
+       { .compatible = "ti,lp5018", .data = &lp50xx_chip_info_tbl[LP5018] },
+       { .compatible = "ti,lp5024", .data = &lp50xx_chip_info_tbl[LP5024] },
+       { .compatible = "ti,lp5030", .data = &lp50xx_chip_info_tbl[LP5030] },
+       { .compatible = "ti,lp5036", .data = &lp50xx_chip_info_tbl[LP5036] },
+       {}
 };
 MODULE_DEVICE_TABLE(of, of_lp50xx_leds_match);
 
@@ -619,7 +618,7 @@ static struct i2c_driver lp50xx_driver = {
                .name   = "lp50xx",
                .of_match_table = of_lp50xx_leds_match,
        },
-       .probe          = lp50xx_probe,
+       .probe_new      = lp50xx_probe,
        .remove         = lp50xx_remove,
        .id_table       = lp50xx_id,
 };