2020-03-20 08:13:07

by Andreas Kemnade

Subject: [PATCH v7 7/7] mfd: rn5t618: cleanup i2c_device_id

That list was just empty, so it can be removed if .probe_new
instead of .probe is used

Suggested-by: Lee Jones <[email protected]>
Signed-off-by: Andreas Kemnade <[email protected]>
---
Functional independent from the other patches, but since they are
touching similar areas, commit/merge conflicts would occur.
drivers/mfd/rn5t618.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/drivers/mfd/rn5t618.c b/drivers/mfd/rn5t618.c
index bc117adede4c..232de50562f9 100644
--- a/drivers/mfd/rn5t618.c
+++ b/drivers/mfd/rn5t618.c
@@ -146,8 +146,7 @@ static const struct of_device_id rn5t618_of_match[] = {
};
MODULE_DEVICE_TABLE(of, rn5t618_of_match);

-static int rn5t618_i2c_probe(struct i2c_client *i2c,
- const struct i2c_device_id *id)
+static int rn5t618_i2c_probe(struct i2c_client *i2c)
{
const struct of_device_id *of_id;
struct rn5t618 *priv;
@@ -244,11 +243,6 @@ static int __maybe_unused rn5t618_i2c_resume(struct device *dev)
return 0;
}

-static const struct i2c_device_id rn5t618_i2c_id[] = {
- { }
-};
-MODULE_DEVICE_TABLE(i2c, rn5t618_i2c_id);
-
static SIMPLE_DEV_PM_OPS(rn5t618_i2c_dev_pm_ops,
rn5t618_i2c_suspend,
rn5t618_i2c_resume);
@@ -259,9 +253,8 @@ static struct i2c_driver rn5t618_i2c_driver = {
.of_match_table = of_match_ptr(rn5t618_of_match),
.pm = &rn5t618_i2c_dev_pm_ops,
},
- .probe = rn5t618_i2c_probe,
+ .probe_new = rn5t618_i2c_probe,
.remove = rn5t618_i2c_remove,
- .id_table = rn5t618_i2c_id,
};

module_i2c_driver(rn5t618_i2c_driver);
--
2.20.1

2020-03-24 10:58:25

by Lee Jones

Subject: Re: [PATCH v7 7/7] mfd: rn5t618: cleanup i2c_device_id

On Fri, 20 Mar 2020, Andreas Kemnade wrote:

> That list was just empty, so it can be removed if .probe_new
> instead of .probe is used
>
> Suggested-by: Lee Jones <[email protected]>
> Signed-off-by: Andreas Kemnade <[email protected]>
> ---
> Functional independent from the other patches, but since they are
> touching similar areas, commit/merge conflicts would occur.
> drivers/mfd/rn5t618.c | 11 ++---------
> 1 file changed, 2 insertions(+), 9 deletions(-)

For my own reference:
Acked-for-MFD-by: Lee Jones <[email protected]>

--
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog