Skip to contentSkip to conversation

mux: adgs1408: Add mod_devicetable.h and remove of_match_ptr

PATCH In review Andy Shevchenko 3 participants 5 messages May 20, 2020 – May 25, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mux: adgs1408: Add mod_devicetable.h and remove of_match_ptr

Enables probing via the ACPI PRP0001 route but more is mostly about removing examples of this that might get copied into new drivers.

Also fixes
drivers/mux/adgs1408.c:112:34: warning: unused variable 'adgs1408_of_match
as has been reported recently.

Fixes e9e40543ad5b ("spi: Add generic SPI multiplexer")
---
 drivers/mux/adgs1408.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/mux/adgs1408.c +3 -3
index 89096f10f4c4..12466b06692c 100644
@@ -6,9 +6,9 @@
  */
 
 #include <linux/err.h>
+#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mux/driver.h>
-#include <linux/of_platform.h>
 #include <linux/property.h>
 #include <linux/spi/spi.h>
 
@@ -59,7 +59,7 @@ static int adgs1408_probe(struct spi_device *spi)
 	s32 idle_state;
 	int ret;
 
-	chip_id = (enum adgs1408_chip_id)of_device_get_match_data(dev);
+	chip_id = (enum adgs1408_chip_id)device_get_match_data(dev);
 	if (!chip_id)
 		chip_id = spi_get_device_id(spi)->driver_data;
 
@@ -119,7 +119,7 @@ MODULE_DEVICE_TABLE(of, adgs1408_of_match);
 static struct spi_driver adgs1408_driver = {
 	.driver = {
 		.name = "adgs1408",
-		.of_match_table = of_match_ptr(adgs1408_of_match),
+		.of_match_table = adgs1408_of_match,
 	},
 	.probe = adgs1408_probe,
 	.id_table = adgs1408_spi_id,
Signature · 1 line
2.26.2
#1 lore raw
Quoted 6 lines · Andy Shevchenko

Enables probing via the ACPI PRP0001 route but more is mostly about removing examples of this that might get copied into new drivers.

Also fixes
drivers/mux/adgs1408.c:112:34: warning: unused variable 'adgs1408_of_match
as has been reported recently.

Maybe Mark or Greg can take this?

I can resend Cc'ing you.

Quoted 44 lines
Fixes e9e40543ad5b ("spi: Add generic SPI multiplexer")
---
 drivers/mux/adgs1408.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/mux/adgs1408.c +3 -3
index 89096f10f4c4..12466b06692c 100644
@@ -6,9 +6,9 @@
  */
 
 #include <linux/err.h>
+#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mux/driver.h>
-#include <linux/of_platform.h>
 #include <linux/property.h>
 #include <linux/spi/spi.h>
 
@@ -59,7 +59,7 @@ static int adgs1408_probe(struct spi_device *spi)
 	s32 idle_state;
 	int ret;
 
-	chip_id = (enum adgs1408_chip_id)of_device_get_match_data(dev);
+	chip_id = (enum adgs1408_chip_id)device_get_match_data(dev);
 	if (!chip_id)
 		chip_id = spi_get_device_id(spi)->driver_data;
 
@@ -119,7 +119,7 @@ MODULE_DEVICE_TABLE(of, adgs1408_of_match);
 static struct spi_driver adgs1408_driver = {
 	.driver = {
 		.name = "adgs1408",
-		.of_match_table = of_match_ptr(adgs1408_of_match),
+		.of_match_table = adgs1408_of_match,
 	},
 	.probe = adgs1408_probe,
 	.id_table = adgs1408_spi_id,
Signature · 1 line
2.26.2
Signature · 2 lines
With Best Regards,
Andy Shevchenko
#2 lore raw
Quoted 9 lines · Andy Shevchenko
Quoted 6 lines · Andy Shevchenko

Enables probing via the ACPI PRP0001 route but more is mostly about removing examples of this that might get copied into new drivers.

Also fixes
drivers/mux/adgs1408.c:112:34: warning: unused variable 'adgs1408_of_match
as has been reported recently.

Maybe Mark or Greg can take this?

$ ./scripts/get_maintainer.pl --file drivers/mux/adgs1408.c
Mircea Caprioru <[email protected]> (supporter:ANALOG DEVICES INC ADGS1408 DRIVER)
Peter Rosin <[email protected]> (maintainer:MULTIPLEXER SUBSYSTEM)
[email protected] (open list)

Not me!

#3 lore raw
In reply to Andy Shevchenko
Quoted 11 lines · Andy Shevchenko
Quoted 6 lines · Andy Shevchenko

Enables probing via the ACPI PRP0001 route but more is mostly about removing examples of this that might get copied into new drivers.

Also fixes
drivers/mux/adgs1408.c:112:34: warning: unused variable 'adgs1408_of_match
as has been reported recently.

Maybe Mark or Greg can take this?

I can resend Cc'ing you.

I'll have a look after the (long) weekend.

Cheers,
Peter

#4 lore raw
In reply to Andy Shevchenko
Quoted 10 lines · Andy Shevchenko

Enables probing via the ACPI PRP0001 route but more is mostly about removing examples of this that might get copied into new drivers.

Also fixes
drivers/mux/adgs1408.c:112:34: warning: unused variable 'adgs1408_of_match
as has been reported recently.

Fixes e9e40543ad5b ("spi: Add generic SPI multiplexer")

Looks ok to me, so it is added to linux-next. I'll let it soak there for a couple of days and then intend to pass it on to Greg.

Cheers,
Peter

Quoted 37 lines
---
 drivers/mux/adgs1408.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/mux/adgs1408.c +3 -3
index 89096f10f4c4..12466b06692c 100644
@@ -6,9 +6,9 @@
  */
 
 #include <linux/err.h>
+#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mux/driver.h>
-#include <linux/of_platform.h>
 #include <linux/property.h>
 #include <linux/spi/spi.h>
 
@@ -59,7 +59,7 @@ static int adgs1408_probe(struct spi_device *spi)
 	s32 idle_state;
 	int ret;
 
-	chip_id = (enum adgs1408_chip_id)of_device_get_match_data(dev);
+	chip_id = (enum adgs1408_chip_id)device_get_match_data(dev);
 	if (!chip_id)
 		chip_id = spi_get_device_id(spi)->driver_data;
 
@@ -119,7 +119,7 @@ MODULE_DEVICE_TABLE(of, adgs1408_of_match);
 static struct spi_driver adgs1408_driver = {
 	.driver = {
 		.name = "adgs1408",
-		.of_match_table = of_match_ptr(adgs1408_of_match),
+		.of_match_table = adgs1408_of_match,
 	},
 	.probe = adgs1408_probe,
 	.id_table = adgs1408_spi_id,