Commit ea1ff99c authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Pavel Machek

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarPavel Machek <pavel@ucw.cz>
parent 9a10def9
...@@ -526,8 +526,7 @@ static int lp50xx_probe_dt(struct lp50xx *priv) ...@@ -526,8 +526,7 @@ static int lp50xx_probe_dt(struct lp50xx *priv)
return ret; return ret;
} }
static int lp50xx_probe(struct i2c_client *client, static int lp50xx_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
struct lp50xx *led; struct lp50xx *led;
int count; int count;
...@@ -547,7 +546,7 @@ static int lp50xx_probe(struct i2c_client *client, ...@@ -547,7 +546,7 @@ static int lp50xx_probe(struct i2c_client *client,
mutex_init(&led->lock); mutex_init(&led->lock);
led->client = client; led->client = client;
led->dev = &client->dev; 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); i2c_set_clientdata(client, led);
led->regmap = devm_regmap_init_i2c(client, led->regmap = devm_regmap_init_i2c(client,
led->chip_info->lp50xx_regmap_config); led->chip_info->lp50xx_regmap_config);
...@@ -593,24 +592,24 @@ static int lp50xx_remove(struct i2c_client *client) ...@@ -593,24 +592,24 @@ static int lp50xx_remove(struct i2c_client *client)
} }
static const struct i2c_device_id lp50xx_id[] = { static const struct i2c_device_id lp50xx_id[] = {
{ "lp5009", LP5009 }, { "lp5009", (kernel_ulong_t)&lp50xx_chip_info_tbl[LP5009] },
{ "lp5012", LP5012 }, { "lp5012", (kernel_ulong_t)&lp50xx_chip_info_tbl[LP5012] },
{ "lp5018", LP5018 }, { "lp5018", (kernel_ulong_t)&lp50xx_chip_info_tbl[LP5018] },
{ "lp5024", LP5024 }, { "lp5024", (kernel_ulong_t)&lp50xx_chip_info_tbl[LP5024] },
{ "lp5030", LP5030 }, { "lp5030", (kernel_ulong_t)&lp50xx_chip_info_tbl[LP5030] },
{ "lp5036", LP5036 }, { "lp5036", (kernel_ulong_t)&lp50xx_chip_info_tbl[LP5036] },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, lp50xx_id); MODULE_DEVICE_TABLE(i2c, lp50xx_id);
static const struct of_device_id of_lp50xx_leds_match[] = { static const struct of_device_id of_lp50xx_leds_match[] = {
{ .compatible = "ti,lp5009", .data = (void *)LP5009 }, { .compatible = "ti,lp5009", .data = &lp50xx_chip_info_tbl[LP5009] },
{ .compatible = "ti,lp5012", .data = (void *)LP5012 }, { .compatible = "ti,lp5012", .data = &lp50xx_chip_info_tbl[LP5012] },
{ .compatible = "ti,lp5018", .data = (void *)LP5018 }, { .compatible = "ti,lp5018", .data = &lp50xx_chip_info_tbl[LP5018] },
{ .compatible = "ti,lp5024", .data = (void *)LP5024 }, { .compatible = "ti,lp5024", .data = &lp50xx_chip_info_tbl[LP5024] },
{ .compatible = "ti,lp5030", .data = (void *)LP5030 }, { .compatible = "ti,lp5030", .data = &lp50xx_chip_info_tbl[LP5030] },
{ .compatible = "ti,lp5036", .data = (void *)LP5036 }, { .compatible = "ti,lp5036", .data = &lp50xx_chip_info_tbl[LP5036] },
{}, {}
}; };
MODULE_DEVICE_TABLE(of, of_lp50xx_leds_match); MODULE_DEVICE_TABLE(of, of_lp50xx_leds_match);
...@@ -619,7 +618,7 @@ static struct i2c_driver lp50xx_driver = { ...@@ -619,7 +618,7 @@ static struct i2c_driver lp50xx_driver = {
.name = "lp50xx", .name = "lp50xx",
.of_match_table = of_lp50xx_leds_match, .of_match_table = of_lp50xx_leds_match,
}, },
.probe = lp50xx_probe, .probe_new = lp50xx_probe,
.remove = lp50xx_remove, .remove = lp50xx_remove,
.id_table = lp50xx_id, .id_table = lp50xx_id,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment