When trying to instantiate a st_accel_i2c device from an ACPI based
system, I ran into some problems:
For my device, there is no ACPI match table entry, so rather than
creating /allocating a new ACPI HID for the device, I wanted to use an
existing DT table compatible entry via creating an ACPI_DT_NAMESPACE_HID
/PRP0001 HID ACPI entry (see Documentation/acpi/enumeration.txt).
This did not work because st_accel_i2c.c bails out if there is a ACPI
node but no ACPI table match. Use device_get_match_data API to get the
right driver data.
acpi_device_get_match_data() currently doesn't return DT compatible
matches. A separate patch is submitted to fix this.
v4:
- rebased onto linux-next
- add Andy Shevchenko as reviewer
v3:
- remove unused i2c_device_id .driver_data fields as suggested by
Javier Martinez Canillas.
v2:
- use device_get_match_data API as suggested by Andy Shevchenko
- removed syncing DT/I2C table names as Jonathan Cameron pointed out
this would be an ABI change
- converting from probe() to probe_new() is moved into a separate
patch (as suggested by Jonathan Cameron)
Nikolaus Voss (2):
IIO: st_accel_i2c.c: Simplify access to driver data
IIO: st_accel_i2c.c: Use probe_new() instead of probe()
drivers/iio/accel/st_accel_i2c.c | 64 ++++++++++++++------------------
1 file changed, 27 insertions(+), 37 deletions(-)
--
2.17.1
Use device_get_match_data API to simplify access to driver data.
Let acpi_device_id table entries point to the same driver data as
of_device_id table entries and uniquify access to driver data by using
device_get_match_data API. Remove unused i2c_device_id .driver_data
fields.
Reviewed-by: Andy Shevchenko <[email protected]>
Signed-off-by: Nikolaus Voss <[email protected]>
---
drivers/iio/accel/st_accel_i2c.c | 59 ++++++++++++++------------------
1 file changed, 25 insertions(+), 34 deletions(-)
diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
index 056dddb27236..d02298f0256c 100644
--- a/drivers/iio/accel/st_accel_i2c.c
+++ b/drivers/iio/accel/st_accel_i2c.c
@@ -14,8 +14,8 @@
#include <linux/acpi.h>
#include <linux/i2c.h>
#include <linux/iio/iio.h>
+#include <linux/property.h>
-#include <linux/iio/common/st_sensors.h>
#include <linux/iio/common/st_sensors_i2c.h>
#include "st_accel.h"
@@ -107,8 +107,8 @@ MODULE_DEVICE_TABLE(of, st_accel_of_match);
#ifdef CONFIG_ACPI
static const struct acpi_device_id st_accel_acpi_match[] = {
- {"SMO8840", LNG2DM},
- {"SMO8A90", LNG2DM},
+ {"SMO8840", (kernel_ulong_t)LNG2DM_ACCEL_DEV_NAME},
+ {"SMO8A90", (kernel_ulong_t)LNG2DM_ACCEL_DEV_NAME},
{ },
};
MODULE_DEVICE_TABLE(acpi, st_accel_acpi_match);
@@ -117,24 +117,24 @@ MODULE_DEVICE_TABLE(acpi, st_accel_acpi_match);
#endif
static const struct i2c_device_id st_accel_id_table[] = {
- { LSM303DLH_ACCEL_DEV_NAME, LSM303DLH },
- { LSM303DLHC_ACCEL_DEV_NAME, LSM303DLHC },
- { LIS3DH_ACCEL_DEV_NAME, LIS3DH },
- { LSM330D_ACCEL_DEV_NAME, LSM330D },
- { LSM330DL_ACCEL_DEV_NAME, LSM330DL },
- { LSM330DLC_ACCEL_DEV_NAME, LSM330DLC },
- { LIS331DLH_ACCEL_DEV_NAME, LIS331DLH },
- { LSM303DL_ACCEL_DEV_NAME, LSM303DL },
- { LSM303DLM_ACCEL_DEV_NAME, LSM303DLM },
- { LSM330_ACCEL_DEV_NAME, LSM330 },
- { LSM303AGR_ACCEL_DEV_NAME, LSM303AGR },
- { LIS2DH12_ACCEL_DEV_NAME, LIS2DH12 },
- { LIS3L02DQ_ACCEL_DEV_NAME, LIS3L02DQ },
- { LNG2DM_ACCEL_DEV_NAME, LNG2DM },
- { H3LIS331DL_ACCEL_DEV_NAME, H3LIS331DL },
- { LIS331DL_ACCEL_DEV_NAME, LIS331DL },
- { LIS3LV02DL_ACCEL_DEV_NAME, LIS3LV02DL },
- { LIS2DW12_ACCEL_DEV_NAME, LIS2DW12 },
+ { LSM303DLH_ACCEL_DEV_NAME },
+ { LSM303DLHC_ACCEL_DEV_NAME },
+ { LIS3DH_ACCEL_DEV_NAME },
+ { LSM330D_ACCEL_DEV_NAME },
+ { LSM330DL_ACCEL_DEV_NAME },
+ { LSM330DLC_ACCEL_DEV_NAME },
+ { LIS331DLH_ACCEL_DEV_NAME },
+ { LSM303DL_ACCEL_DEV_NAME },
+ { LSM303DLM_ACCEL_DEV_NAME },
+ { LSM330_ACCEL_DEV_NAME },
+ { LSM303AGR_ACCEL_DEV_NAME },
+ { LIS2DH12_ACCEL_DEV_NAME },
+ { LIS3L02DQ_ACCEL_DEV_NAME },
+ { LNG2DM_ACCEL_DEV_NAME },
+ { H3LIS331DL_ACCEL_DEV_NAME },
+ { LIS331DL_ACCEL_DEV_NAME },
+ { LIS3LV02DL_ACCEL_DEV_NAME },
+ { LIS2DW12_ACCEL_DEV_NAME },
{},
};
MODULE_DEVICE_TABLE(i2c, st_accel_id_table);
@@ -144,6 +144,7 @@ static int st_accel_i2c_probe(struct i2c_client *client,
{
struct iio_dev *indio_dev;
struct st_sensor_data *adata;
+ const char *match;
int ret;
indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*adata));
@@ -152,19 +153,9 @@ static int st_accel_i2c_probe(struct i2c_client *client,
adata = iio_priv(indio_dev);
- if (client->dev.of_node) {
- st_sensors_of_name_probe(&client->dev, st_accel_of_match,
- client->name, sizeof(client->name));
- } else if (ACPI_HANDLE(&client->dev)) {
- ret = st_sensors_match_acpi_device(&client->dev);
- if ((ret < 0) || (ret >= ST_ACCEL_MAX))
- return -ENODEV;
-
- strlcpy(client->name, st_accel_id_table[ret].name,
- sizeof(client->name));
- } else if (!id)
- return -ENODEV;
-
+ match = device_get_match_data(&client->dev);
+ if (match)
+ strlcpy(client->name, match, sizeof(client->name));
st_sensors_i2c_configure(indio_dev, client, adata);
--
2.17.1
struct i2c_device_id argument of probe() is not used, so use probe_new()
instead.
Reviewed-by: Andy Shevchenko <[email protected]>
Signed-off-by: Nikolaus Voss <[email protected]>
---
drivers/iio/accel/st_accel_i2c.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
index d02298f0256c..2ca5d1f6ade0 100644
--- a/drivers/iio/accel/st_accel_i2c.c
+++ b/drivers/iio/accel/st_accel_i2c.c
@@ -139,8 +139,7 @@ static const struct i2c_device_id st_accel_id_table[] = {
};
MODULE_DEVICE_TABLE(i2c, st_accel_id_table);
-static int st_accel_i2c_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int st_accel_i2c_probe(struct i2c_client *client)
{
struct iio_dev *indio_dev;
struct st_sensor_data *adata;
@@ -179,7 +178,7 @@ static struct i2c_driver st_accel_driver = {
.of_match_table = of_match_ptr(st_accel_of_match),
.acpi_match_table = ACPI_PTR(st_accel_acpi_match),
},
- .probe = st_accel_i2c_probe,
+ .probe_new = st_accel_i2c_probe,
.remove = st_accel_i2c_remove,
.id_table = st_accel_id_table,
};
--
2.17.1
On Tue, 3 Jul 2018 07:41:00 +0200
Nikolaus Voss <[email protected]> wrote:
> Use device_get_match_data API to simplify access to driver data.
> Let acpi_device_id table entries point to the same driver data as
> of_device_id table entries and uniquify access to driver data by using
> device_get_match_data API. Remove unused i2c_device_id .driver_data
> fields.
>
> Reviewed-by: Andy Shevchenko <[email protected]>
> Signed-off-by: Nikolaus Voss <[email protected]>
Applied to the togreg branch of iio.git and pushed out as testing for
the autobuilders to play with it.
Thanks and was interesting to follow the discussion I missed mid week!
Jonathan
> ---
> drivers/iio/accel/st_accel_i2c.c | 59 ++++++++++++++------------------
> 1 file changed, 25 insertions(+), 34 deletions(-)
>
> diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
> index 056dddb27236..d02298f0256c 100644
> --- a/drivers/iio/accel/st_accel_i2c.c
> +++ b/drivers/iio/accel/st_accel_i2c.c
> @@ -14,8 +14,8 @@
> #include <linux/acpi.h>
> #include <linux/i2c.h>
> #include <linux/iio/iio.h>
> +#include <linux/property.h>
>
> -#include <linux/iio/common/st_sensors.h>
> #include <linux/iio/common/st_sensors_i2c.h>
> #include "st_accel.h"
>
> @@ -107,8 +107,8 @@ MODULE_DEVICE_TABLE(of, st_accel_of_match);
>
> #ifdef CONFIG_ACPI
> static const struct acpi_device_id st_accel_acpi_match[] = {
> - {"SMO8840", LNG2DM},
> - {"SMO8A90", LNG2DM},
> + {"SMO8840", (kernel_ulong_t)LNG2DM_ACCEL_DEV_NAME},
> + {"SMO8A90", (kernel_ulong_t)LNG2DM_ACCEL_DEV_NAME},
> { },
> };
> MODULE_DEVICE_TABLE(acpi, st_accel_acpi_match);
> @@ -117,24 +117,24 @@ MODULE_DEVICE_TABLE(acpi, st_accel_acpi_match);
> #endif
>
> static const struct i2c_device_id st_accel_id_table[] = {
> - { LSM303DLH_ACCEL_DEV_NAME, LSM303DLH },
> - { LSM303DLHC_ACCEL_DEV_NAME, LSM303DLHC },
> - { LIS3DH_ACCEL_DEV_NAME, LIS3DH },
> - { LSM330D_ACCEL_DEV_NAME, LSM330D },
> - { LSM330DL_ACCEL_DEV_NAME, LSM330DL },
> - { LSM330DLC_ACCEL_DEV_NAME, LSM330DLC },
> - { LIS331DLH_ACCEL_DEV_NAME, LIS331DLH },
> - { LSM303DL_ACCEL_DEV_NAME, LSM303DL },
> - { LSM303DLM_ACCEL_DEV_NAME, LSM303DLM },
> - { LSM330_ACCEL_DEV_NAME, LSM330 },
> - { LSM303AGR_ACCEL_DEV_NAME, LSM303AGR },
> - { LIS2DH12_ACCEL_DEV_NAME, LIS2DH12 },
> - { LIS3L02DQ_ACCEL_DEV_NAME, LIS3L02DQ },
> - { LNG2DM_ACCEL_DEV_NAME, LNG2DM },
> - { H3LIS331DL_ACCEL_DEV_NAME, H3LIS331DL },
> - { LIS331DL_ACCEL_DEV_NAME, LIS331DL },
> - { LIS3LV02DL_ACCEL_DEV_NAME, LIS3LV02DL },
> - { LIS2DW12_ACCEL_DEV_NAME, LIS2DW12 },
> + { LSM303DLH_ACCEL_DEV_NAME },
> + { LSM303DLHC_ACCEL_DEV_NAME },
> + { LIS3DH_ACCEL_DEV_NAME },
> + { LSM330D_ACCEL_DEV_NAME },
> + { LSM330DL_ACCEL_DEV_NAME },
> + { LSM330DLC_ACCEL_DEV_NAME },
> + { LIS331DLH_ACCEL_DEV_NAME },
> + { LSM303DL_ACCEL_DEV_NAME },
> + { LSM303DLM_ACCEL_DEV_NAME },
> + { LSM330_ACCEL_DEV_NAME },
> + { LSM303AGR_ACCEL_DEV_NAME },
> + { LIS2DH12_ACCEL_DEV_NAME },
> + { LIS3L02DQ_ACCEL_DEV_NAME },
> + { LNG2DM_ACCEL_DEV_NAME },
> + { H3LIS331DL_ACCEL_DEV_NAME },
> + { LIS331DL_ACCEL_DEV_NAME },
> + { LIS3LV02DL_ACCEL_DEV_NAME },
> + { LIS2DW12_ACCEL_DEV_NAME },
> {},
> };
> MODULE_DEVICE_TABLE(i2c, st_accel_id_table);
> @@ -144,6 +144,7 @@ static int st_accel_i2c_probe(struct i2c_client *client,
> {
> struct iio_dev *indio_dev;
> struct st_sensor_data *adata;
> + const char *match;
> int ret;
>
> indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*adata));
> @@ -152,19 +153,9 @@ static int st_accel_i2c_probe(struct i2c_client *client,
>
> adata = iio_priv(indio_dev);
>
> - if (client->dev.of_node) {
> - st_sensors_of_name_probe(&client->dev, st_accel_of_match,
> - client->name, sizeof(client->name));
> - } else if (ACPI_HANDLE(&client->dev)) {
> - ret = st_sensors_match_acpi_device(&client->dev);
> - if ((ret < 0) || (ret >= ST_ACCEL_MAX))
> - return -ENODEV;
> -
> - strlcpy(client->name, st_accel_id_table[ret].name,
> - sizeof(client->name));
> - } else if (!id)
> - return -ENODEV;
> -
> + match = device_get_match_data(&client->dev);
> + if (match)
> + strlcpy(client->name, match, sizeof(client->name));
>
> st_sensors_i2c_configure(indio_dev, client, adata);
>
On Tue, 3 Jul 2018 08:06:57 +0200
Nikolaus Voss <[email protected]> wrote:
> struct i2c_device_id argument of probe() is not used, so use probe_new()
> instead.
>
> Reviewed-by: Andy Shevchenko <[email protected]>
> Signed-off-by: Nikolaus Voss <[email protected]>
Applied to the togreg branch of iio.git and pushed out as testing for the
autobuilders to play with it.
Thanks,
Jonathan
> ---
> drivers/iio/accel/st_accel_i2c.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
> index d02298f0256c..2ca5d1f6ade0 100644
> --- a/drivers/iio/accel/st_accel_i2c.c
> +++ b/drivers/iio/accel/st_accel_i2c.c
> @@ -139,8 +139,7 @@ static const struct i2c_device_id st_accel_id_table[] = {
> };
> MODULE_DEVICE_TABLE(i2c, st_accel_id_table);
>
> -static int st_accel_i2c_probe(struct i2c_client *client,
> - const struct i2c_device_id *id)
> +static int st_accel_i2c_probe(struct i2c_client *client)
> {
> struct iio_dev *indio_dev;
> struct st_sensor_data *adata;
> @@ -179,7 +178,7 @@ static struct i2c_driver st_accel_driver = {
> .of_match_table = of_match_ptr(st_accel_of_match),
> .acpi_match_table = ACPI_PTR(st_accel_acpi_match),
> },
> - .probe = st_accel_i2c_probe,
> + .probe_new = st_accel_i2c_probe,
> .remove = st_accel_i2c_remove,
> .id_table = st_accel_id_table,
> };