Skip to contentSkip to conversation

iio:accel:stk8312: Remove ACPI support

PATCH In review Guenter Roeck 4 participants 4 messages May 6, 2021 – May 8, 2021 IIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iio:accel:stk8312: Remove ACPI support

With CONFIG_ACPI=n, W=1 and -Werror, 0-day reports:

drivers/iio/accel/stk8312.c:644:36: error:
'stk8312_acpi_id' defined but not used

Apparently STK8312 is not a valid ACPI ID. Remove it and with it ACPI support from the stk8312 driver.

---
There is another patch pending which makes whitespace changes in struct acpi_device_id stk8312_acpi_id. This will result in a conflict if this patch is applied. In that patch, it is claimed that the driver would possibly only be used based on its ACPI ID (even though that ACPI device ID is not official).

I can not determine if that claim has any truth in it. Still, it appears that the device ID is not an official device ID.

 drivers/iio/accel/stk8312.c | 9 ---------
 1 file changed, 9 deletions(-)
drivers/iio/accel/stk8312.c +0 -9
index 157d8faefb9e..2fc30cfe1457 100644
@@ -7,7 +7,6 @@
  * IIO driver for STK8312; 7-bit I2C address: 0x3D.
  */
 
-#include <linux/acpi.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
@@ -640,18 +639,10 @@ static const struct i2c_device_id stk8312_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, stk8312_i2c_id);
 
-static const struct acpi_device_id stk8312_acpi_id[] = {
-	{"STK8312", 0},
-	{}
-};
-
-MODULE_DEVICE_TABLE(acpi, stk8312_acpi_id);
-
 static struct i2c_driver stk8312_driver = {
 	.driver = {
 		.name = STK8312_DRIVER_NAME,
 		.pm = STK8312_PM_OPS,
-		.acpi_match_table = ACPI_PTR(stk8312_acpi_id),
 	},
 	.probe =            stk8312_probe,
 	.remove =           stk8312_remove,
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw

Hi,

Quoted 5 lines · Guenter Roeck

With CONFIG_ACPI=n, W=1 and -Werror, 0-day reports:

drivers/iio/accel/stk8312.c:644:36: error:
'stk8312_acpi_id' defined but not used

Quoted 7 lines

Apparently STK8312 is not a valid ACPI ID. Remove it and with it ACPI support from the stk8312 driver.

Thanks, patch looks good to me:

Regards,

Hans

Quoted 45 lines

---
There is another patch pending which makes whitespace changes in struct acpi_device_id stk8312_acpi_id. This will result in a conflict if this patch is applied. In that patch, it is claimed that the driver would possibly only be used based on its ACPI ID (even though that ACPI device ID is not official).

I can not determine if that claim has any truth in it. Still, it appears that the device ID is not an official device ID.

 drivers/iio/accel/stk8312.c | 9 ---------
 1 file changed, 9 deletions(-)
drivers/iio/accel/stk8312.c +0 -9
index 157d8faefb9e..2fc30cfe1457 100644
@@ -7,7 +7,6 @@
  * IIO driver for STK8312; 7-bit I2C address: 0x3D.
  */
 
-#include <linux/acpi.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
@@ -640,18 +639,10 @@ static const struct i2c_device_id stk8312_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, stk8312_i2c_id);
 
-static const struct acpi_device_id stk8312_acpi_id[] = {
-	{"STK8312", 0},
-	{}
-};
-
-MODULE_DEVICE_TABLE(acpi, stk8312_acpi_id);
-
 static struct i2c_driver stk8312_driver = {
 	.driver = {
 		.name = STK8312_DRIVER_NAME,
 		.pm = STK8312_PM_OPS,
-		.acpi_match_table = ACPI_PTR(stk8312_acpi_id),
 	},
 	.probe =            stk8312_probe,
 	.remove =           stk8312_remove,
Reviewed-by on v1 1/1
#2 lore raw
In reply to Guenter Roeck
Quoted 8 lines · Guenter Roeck

With CONFIG_ACPI=n, W=1 and -Werror, 0-day reports:

drivers/iio/accel/stk8312.c:644:36: error:
'stk8312_acpi_id' defined but not used

Apparently STK8312 is not a valid ACPI ID. Remove it and with it ACPI support from the stk8312 driver.

For the record, point finger on me in case somebody complains about any of such patches.

Quoted 51 lines

---
There is another patch pending which makes whitespace changes in struct acpi_device_id stk8312_acpi_id. This will result in a conflict if this patch is applied. In that patch, it is claimed that the driver would possibly only be used based on its ACPI ID (even though that ACPI device ID is not official).

I can not determine if that claim has any truth in it. Still, it appears that the device ID is not an official device ID.

 drivers/iio/accel/stk8312.c | 9 ---------
 1 file changed, 9 deletions(-)
drivers/iio/accel/stk8312.c +0 -10
index 157d8faefb9e..2fc30cfe1457 100644
@@ -7,7 +7,6 @@
  * IIO driver for STK8312; 7-bit I2C address: 0x3D.
  */
 
-#include <linux/acpi.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
@@ -640,18 +639,10 @@ static const struct i2c_device_id stk8312_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, stk8312_i2c_id);
 
-static const struct acpi_device_id stk8312_acpi_id[] = {
-       {"STK8312", 0},
-       {}
-};
-
-MODULE_DEVICE_TABLE(acpi, stk8312_acpi_id);
-
 static struct i2c_driver stk8312_driver = {
        .driver = {
                .name = STK8312_DRIVER_NAME,
                .pm = STK8312_PM_OPS,
-               .acpi_match_table = ACPI_PTR(stk8312_acpi_id),
        },
        .probe =            stk8312_probe,
        .remove =           stk8312_remove,
--

2.25.1

Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#3 lore raw
Quoted 7 lines · On Thu, 6 May 2021 12:29:44 +0300 Andy Shevchenko <[email protected]>…
Quoted 6 lines · Guenter Roeck

With CONFIG_ACPI=n, W=1 and -Werror, 0-day reports:

drivers/iio/accel/stk8312.c:644:36: error:
'stk8312_acpi_id' defined but not used

Quoted 21 lines
Quoted 2 lines

Apparently STK8312 is not a valid ACPI ID. Remove it and with it ACPI support from the stk8312 driver.

For the record, point finger on me in case somebody complains about any of such patches.

Quoted 13 lines

---
There is another patch pending which makes whitespace changes in struct acpi_device_id stk8312_acpi_id. This will result in a conflict if this patch is applied. In that patch, it is claimed that the driver would possibly only be used based on its ACPI ID (even though that ACPI device ID is not official).

I can not determine if that claim has any truth in it. Still, it appears that the device ID is not an official device ID.

So this is a fun corner case and I suspect reflects most that the device isn't in common use with mainline Linux outside of the hobbyist community. The other type of ID in the driver was in capitals whereas those IDs are always lowercase. That rather implied that it had been copied over from the ACPI binding.

Anyhow, I've applied this with the commit message adjusted to suggest that if anyone does want ACPI binding support for this and doesn't have control of a vendor ID then they should add the of_match_table and use PRP0001.

Jonathan

Quoted 40 lines
Quoted 38 lines
 drivers/iio/accel/stk8312.c | 9 ---------
 1 file changed, 9 deletions(-)
drivers/iio/accel/stk8312.c +0 -10
index 157d8faefb9e..2fc30cfe1457 100644
@@ -7,7 +7,6 @@
  * IIO driver for STK8312; 7-bit I2C address: 0x3D.
  */
 
-#include <linux/acpi.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
@@ -640,18 +639,10 @@ static const struct i2c_device_id stk8312_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, stk8312_i2c_id);
 
-static const struct acpi_device_id stk8312_acpi_id[] = {
-       {"STK8312", 0},
-       {}
-};
-
-MODULE_DEVICE_TABLE(acpi, stk8312_acpi_id);
-
 static struct i2c_driver stk8312_driver = {
        .driver = {
                .name = STK8312_DRIVER_NAME,
                .pm = STK8312_PM_OPS,
-               .acpi_match_table = ACPI_PTR(stk8312_acpi_id),
        },
        .probe =            stk8312_probe,
        .remove =           stk8312_remove,
--

2.25.1