| Message ID | 20200807153100.384845-1-steve@sk2.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arch/arm: use simple i2c probe function | expand |
On Fri, Aug 07, 2020 at 05:31:00PM +0200, Stephen Kitt wrote: > 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. > > Signed-off-by: Stephen Kitt <steve@sk2.org> > --- > arch/arm/mach-davinci/board-dm644x-evm.c | 5 ++--- > arch/arm/mach-davinci/board-dm646x-evm.c | 10 ++++------ > arch/arm/mach-s3c64xx/mach-crag6410-module.c | 5 ++--- > 3 files changed, 8 insertions(+), 12 deletions(-) > Hi, You need to split it per sub architecture maintainers. The subject prefix is then for example: "ARM: s3c64xx: ". Best regards, Krzysztof
Hi, On Sun, 9 Aug 2020 10:38:58 +0200, Krzysztof Kozlowski <krzk@kernel.org> wrote: > On Fri, Aug 07, 2020 at 05:31:00PM +0200, Stephen Kitt wrote: > > 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. > > > > Signed-off-by: Stephen Kitt <steve@sk2.org> > > --- > > arch/arm/mach-davinci/board-dm644x-evm.c | 5 ++--- > > arch/arm/mach-davinci/board-dm646x-evm.c | 10 ++++------ > > arch/arm/mach-s3c64xx/mach-crag6410-module.c | 5 ++--- > > 3 files changed, 8 insertions(+), 12 deletions(-) > > You need to split it per sub architecture maintainers. The subject > prefix is then for example: "ARM: s3c64xx: ". Thanks, will do! Regards, Stephen
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index a5d3708fedf6..d0dcf69cc76d 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c @@ -548,8 +548,7 @@ static const struct property_entry eeprom_properties[] = { */ static struct i2c_client *dm6446evm_msp; -static int dm6446evm_msp_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int dm6446evm_msp_probe(struct i2c_client *client) { dm6446evm_msp = client; return 0; @@ -569,7 +568,7 @@ static const struct i2c_device_id dm6446evm_msp_ids[] = { static struct i2c_driver dm6446evm_msp_driver = { .driver.name = "dm6446evm_msp", .id_table = dm6446evm_msp_ids, - .probe = dm6446evm_msp_probe, + .probe_new = dm6446evm_msp_probe, .remove = dm6446evm_msp_remove, }; diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index 4600b617f9b4..2dce16fff77e 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c @@ -160,8 +160,7 @@ static struct platform_device davinci_aemif_device = { #define DM646X_EVM_ATA_PWD BIT(1) /* CPLD Register 0 Client: used for I/O Control */ -static int cpld_reg0_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int cpld_reg0_probe(struct i2c_client *client) { if (HAS_ATA) { u8 data; @@ -197,7 +196,7 @@ static const struct i2c_device_id cpld_reg_ids[] = { static struct i2c_driver dm6467evm_cpld_driver = { .driver.name = "cpld_reg0", .id_table = cpld_reg_ids, - .probe = cpld_reg0_probe, + .probe_new = cpld_reg0_probe, }; /* LEDS */ @@ -402,8 +401,7 @@ static struct snd_platform_data dm646x_evm_snd_data[] = { #ifdef CONFIG_I2C static struct i2c_client *cpld_client; -static int cpld_video_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int cpld_video_probe(struct i2c_client *client) { cpld_client = client; return 0; @@ -424,7 +422,7 @@ static struct i2c_driver cpld_video_driver = { .driver = { .name = "cpld_video", }, - .probe = cpld_video_probe, + .probe_new = cpld_video_probe, .remove = cpld_video_remove, .id_table = cpld_video_id, }; diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c index 34f1baa10c54..43b587e79d21 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c @@ -378,8 +378,7 @@ static const struct { .i2c_devs = wm2200_i2c, .num_i2c_devs = ARRAY_SIZE(wm2200_i2c) }, }; -static int wlf_gf_module_probe(struct i2c_client *i2c, - const struct i2c_device_id *i2c_id) +static int wlf_gf_module_probe(struct i2c_client *i2c) { int ret, i, j, id, rev; @@ -432,7 +431,7 @@ static struct i2c_driver wlf_gf_module_driver = { .driver = { .name = "wlf-gf-module" }, - .probe = wlf_gf_module_probe, + .probe_new = wlf_gf_module_probe, .id_table = wlf_gf_module_id, };
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. Signed-off-by: Stephen Kitt <steve@sk2.org> --- arch/arm/mach-davinci/board-dm644x-evm.c | 5 ++--- arch/arm/mach-davinci/board-dm646x-evm.c | 10 ++++------ arch/arm/mach-s3c64xx/mach-crag6410-module.c | 5 ++--- 3 files changed, 8 insertions(+), 12 deletions(-)