2022-11-19 00:40:53

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 560/606] rtc: ds1307: Convert to i2c's .probe_new()

From: Uwe Kleine-König <[email protected]>

.probe_new() doesn't get the i2c_device_id * parameter, so determine
that explicitly in the probe function.

Signed-off-by: Uwe Kleine-König <[email protected]>
---
drivers/rtc/rtc-ds1307.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index 7c2276cf5514..b49c02fd78f7 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -1713,9 +1713,9 @@ static const struct regmap_config regmap_config = {
.val_bits = 8,
};

-static int ds1307_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int ds1307_probe(struct i2c_client *client)
{
+ const struct i2c_device_id *id = i2c_client_get_device_id(client);
struct ds1307 *ds1307;
const void *match;
int err = -ENODEV;
@@ -2012,7 +2012,7 @@ static struct i2c_driver ds1307_driver = {
.name = "rtc-ds1307",
.of_match_table = ds1307_of_match,
},
- .probe = ds1307_probe,
+ .probe_new = ds1307_probe,
.id_table = ds1307_id,
};

--
2.38.1



2023-01-06 18:41:19

by Uwe Kleine-König

[permalink] [raw]
Subject: Re: [PATCH 560/606] rtc: ds1307: Convert to i2c's .probe_new()

Hello Alexandre,

On Fri, Nov 18, 2022 at 11:44:54PM +0100, Uwe Kleine-K?nig wrote:
> From: Uwe Kleine-K?nig <[email protected]>
>
> .probe_new() doesn't get the i2c_device_id * parameter, so determine
> that explicitly in the probe function.
>
> Signed-off-by: Uwe Kleine-K?nig <[email protected]>
> ---
> drivers/rtc/rtc-ds1307.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
> index 7c2276cf5514..b49c02fd78f7 100644
> --- a/drivers/rtc/rtc-ds1307.c
> +++ b/drivers/rtc/rtc-ds1307.c
> @@ -1713,9 +1713,9 @@ static const struct regmap_config regmap_config = {
> .val_bits = 8,
> };
>
> -static int ds1307_probe(struct i2c_client *client,
> - const struct i2c_device_id *id)
> +static int ds1307_probe(struct i2c_client *client)
> {
> + const struct i2c_device_id *id = i2c_client_get_device_id(client);
> struct ds1307 *ds1307;
> const void *match;
> int err = -ENODEV;
> @@ -2012,7 +2012,7 @@ static struct i2c_driver ds1307_driver = {
> .name = "rtc-ds1307",
> .of_match_table = ds1307_of_match,
> },
> - .probe = ds1307_probe,
> + .probe_new = ds1307_probe,
> .id_table = ds1307_id,
> };

This is the last remaining rtc patch in my i2c probe_new stack. Would
you mind to apply it?

Best regards
Uwe

--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | https://www.pengutronix.de/ |

Attachments:
(No filename) (1.51 kB)
 signature.asc (499.00 B)
 Download all attachments

2023-01-09 22:19:55

by Alexandre Belloni

[permalink] [raw]
Subject: Re: (subset) [PATCH 560/606] rtc: ds1307: Convert to i2c's .probe_new()


On Fri, 18 Nov 2022 23:44:54 +0100, Uwe Kleine-K?nig wrote:
> .probe_new() doesn't get the i2c_device_id * parameter, so determine
> that explicitly in the probe function.
>
>

Applied, thanks!

[560/606] rtc: ds1307: Convert to i2c's .probe_new()
commit: 4cd0ca1fe9a79d81a001ff14f14035531773fe43

Best regards,

--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com