Commit 7de3f326 authored by Stephen Kitt's avatar Stephen Kitt Committed by Sekhar Nori

ARM: davinci: use simple i2c probe function

The i2c probe functions here don't use the id information provided in
their second argument, so the single-parameter i2c probe function
("probe_new") can be used instead.

This avoids scanning the identifier tables during probes.
Acked-by: default avatarWolfram Sang <wsa@kernel.org>
Reviewed-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: default avatarLuca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: default avatarStephen Kitt <steve@sk2.org>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 9123e3a7
...@@ -548,8 +548,7 @@ static const struct property_entry eeprom_properties[] = { ...@@ -548,8 +548,7 @@ static const struct property_entry eeprom_properties[] = {
*/ */
static struct i2c_client *dm6446evm_msp; static struct i2c_client *dm6446evm_msp;
static int dm6446evm_msp_probe(struct i2c_client *client, static int dm6446evm_msp_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
dm6446evm_msp = client; dm6446evm_msp = client;
return 0; return 0;
...@@ -569,7 +568,7 @@ static const struct i2c_device_id dm6446evm_msp_ids[] = { ...@@ -569,7 +568,7 @@ static const struct i2c_device_id dm6446evm_msp_ids[] = {
static struct i2c_driver dm6446evm_msp_driver = { static struct i2c_driver dm6446evm_msp_driver = {
.driver.name = "dm6446evm_msp", .driver.name = "dm6446evm_msp",
.id_table = dm6446evm_msp_ids, .id_table = dm6446evm_msp_ids,
.probe = dm6446evm_msp_probe, .probe_new = dm6446evm_msp_probe,
.remove = dm6446evm_msp_remove, .remove = dm6446evm_msp_remove,
}; };
......
...@@ -160,8 +160,7 @@ static struct platform_device davinci_aemif_device = { ...@@ -160,8 +160,7 @@ static struct platform_device davinci_aemif_device = {
#define DM646X_EVM_ATA_PWD BIT(1) #define DM646X_EVM_ATA_PWD BIT(1)
/* CPLD Register 0 Client: used for I/O Control */ /* CPLD Register 0 Client: used for I/O Control */
static int cpld_reg0_probe(struct i2c_client *client, static int cpld_reg0_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
if (HAS_ATA) { if (HAS_ATA) {
u8 data; u8 data;
...@@ -197,7 +196,7 @@ static const struct i2c_device_id cpld_reg_ids[] = { ...@@ -197,7 +196,7 @@ static const struct i2c_device_id cpld_reg_ids[] = {
static struct i2c_driver dm6467evm_cpld_driver = { static struct i2c_driver dm6467evm_cpld_driver = {
.driver.name = "cpld_reg0", .driver.name = "cpld_reg0",
.id_table = cpld_reg_ids, .id_table = cpld_reg_ids,
.probe = cpld_reg0_probe, .probe_new = cpld_reg0_probe,
}; };
/* LEDS */ /* LEDS */
...@@ -397,8 +396,7 @@ static struct snd_platform_data dm646x_evm_snd_data[] = { ...@@ -397,8 +396,7 @@ static struct snd_platform_data dm646x_evm_snd_data[] = {
#ifdef CONFIG_I2C #ifdef CONFIG_I2C
static struct i2c_client *cpld_client; static struct i2c_client *cpld_client;
static int cpld_video_probe(struct i2c_client *client, static int cpld_video_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
cpld_client = client; cpld_client = client;
return 0; return 0;
...@@ -419,7 +417,7 @@ static struct i2c_driver cpld_video_driver = { ...@@ -419,7 +417,7 @@ static struct i2c_driver cpld_video_driver = {
.driver = { .driver = {
.name = "cpld_video", .name = "cpld_video",
}, },
.probe = cpld_video_probe, .probe_new = cpld_video_probe,
.remove = cpld_video_remove, .remove = cpld_video_remove,
.id_table = cpld_video_id, .id_table = cpld_video_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