2017-12-29 07:16:28

by Dmitry Mastykin

Subject: [PATCH] iio: adc: max9611: fix module auto-loading

Module auto-load doesn't work because i2c table is not exported.

Signed-off-by: Dmitry Mastykin <[email protected]>
---
drivers/iio/adc/max9611.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/iio/adc/max9611.c b/drivers/iio/adc/max9611.c
index b1dd17c..7924b5c 100644
--- a/drivers/iio/adc/max9611.c
+++ b/drivers/iio/adc/max9611.c
@@ -516,13 +516,20 @@ static int max9611_init(struct max9611_dev *max9611)
return 0;
}

+static const struct i2c_device_id max9611_id[] = {
+ { "max9611", 0 },
+ { "max9612", 0 },
+ { },
+ };
+MODULE_DEVICE_TABLE(i2c, max9611_id);
+
static const struct of_device_id max9611_of_table[] = {
{.compatible = "maxim,max9611", .data = "max9611"},
{.compatible = "maxim,max9612", .data = "max9612"},
{ },
};
-
MODULE_DEVICE_TABLE(of, max9611_of_table);
+
static int max9611_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
--
2.7.4

2017-12-29 09:11:40

by jacopo mondi

Subject: Re: [PATCH] iio: adc: max9611: fix module auto-loading

Hi Dmitry,

On Fri, Dec 29, 2017 at 10:14:27AM +0300, Dmitry Mastykin wrote:
> Module auto-load doesn't work because i2c table is not exported.
>
> Signed-off-by: Dmitry Mastykin <[email protected]>
> ---
> drivers/iio/adc/max9611.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/iio/adc/max9611.c b/drivers/iio/adc/max9611.c
> index b1dd17c..7924b5c 100644
> --- a/drivers/iio/adc/max9611.c
> +++ b/drivers/iio/adc/max9611.c
> @@ -516,13 +516,20 @@ static int max9611_init(struct max9611_dev *max9611)
> return 0;
> }
>
> +static const struct i2c_device_id max9611_id[] = {
> + { "max9611", 0 },
> + { "max9612", 0 },
> + { },
> + };
> +MODULE_DEVICE_TABLE(i2c, max9611_id);
> +

Wouldn't you need to also set the "id_table" field of "struct
i2c_driver" to point this?

Thanks
j


> static const struct of_device_id max9611_of_table[] = {
> {.compatible = "maxim,max9611", .data = "max9611"},
> {.compatible = "maxim,max9612", .data = "max9612"},
> { },
> };
> -
> MODULE_DEVICE_TABLE(of, max9611_of_table);
> +
> static int max9611_probe(struct i2c_client *client,
> const struct i2c_device_id *id)
> {
> --
> 2.7.4
>

2017-12-29 09:13:01

by Andy Shevchenko

Subject: Re: [PATCH] iio: adc: max9611: fix module auto-loading

On Fri, Dec 29, 2017 at 9:14 AM, Dmitry Mastykin <[email protected]> wrote:
> Module auto-load doesn't work because i2c table is not exported.
>

The simplest fix is to move to ->probe_new() since the driver is not
used out of DT/ACPI enumeration.

> Signed-off-by: Dmitry Mastykin <[email protected]>
> ---
> drivers/iio/adc/max9611.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/iio/adc/max9611.c b/drivers/iio/adc/max9611.c
> index b1dd17c..7924b5c 100644
> --- a/drivers/iio/adc/max9611.c
> +++ b/drivers/iio/adc/max9611.c
> @@ -516,13 +516,20 @@ static int max9611_init(struct max9611_dev *max9611)
> return 0;
> }
>
> +static const struct i2c_device_id max9611_id[] = {
> + { "max9611", 0 },
> + { "max9612", 0 },
> + { },
> + };
> +MODULE_DEVICE_TABLE(i2c, max9611_id);
> +
> static const struct of_device_id max9611_of_table[] = {
> {.compatible = "maxim,max9611", .data = "max9611"},
> {.compatible = "maxim,max9612", .data = "max9612"},
> { },
> };
> -
> MODULE_DEVICE_TABLE(of, max9611_of_table);
> +
> static int max9611_probe(struct i2c_client *client,
> const struct i2c_device_id *id)
> {
> --
> 2.7.4
>



--
With Best Regards,
Andy Shevchenko