On 28/08/2023 10:08:28+0100, Biju Das wrote:
> Make similar OF and ID table and simplify probe() by replacing
> of_device_get_match_data()->i2c_get_match_data().
>
> Signed-off-by: Biju Das <biju.das.jz@xxxxxxxxxxxxxx>
> ---
> Note:
> * This patch is only compile tested.
As you have access to a rx8571, please actually test.
> ---
> drivers/rtc/rtc-rx8581.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/rtc/rtc-rx8581.c b/drivers/rtc/rtc-rx8581.c
> index 48efd61a114d..68dd8b9b52f9 100644
> --- a/drivers/rtc/rtc-rx8581.c
> +++ b/drivers/rtc/rtc-rx8581.c
> @@ -250,8 +250,7 @@ static const struct rx85x1_config rx8571_config = {
> static int rx8581_probe(struct i2c_client *client)
> {
> struct rx8581 *rx8581;
> - const struct rx85x1_config *config = &rx8581_config;
> - const void *data = of_device_get_match_data(&client->dev);
> + const struct rx85x1_config *config = i2c_get_match_data(client);
> static struct nvmem_config nvmem_cfg[] = {
> {
> .name = "rx85x1-",
> @@ -273,9 +272,6 @@ static int rx8581_probe(struct i2c_client *client)
>
> dev_dbg(&client->dev, "%s\n", __func__);
>
> - if (data)
> - config = data;
> -
> rx8581 = devm_kzalloc(&client->dev, sizeof(struct rx8581), GFP_KERNEL);
> if (!rx8581)
> return -ENOMEM;
> @@ -307,7 +303,7 @@ static int rx8581_probe(struct i2c_client *client)
> }
>
> static const struct i2c_device_id rx8581_id[] = {
> - { "rx8581", 0 },
> + { "rx8581", (kernel_ulong_t)&rx8581_config },
> { }
> };
> MODULE_DEVICE_TABLE(i2c, rx8581_id);
> --
> 2.25.1
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
