Commit b7820ae2 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

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: e9e40543 ("spi: Add generic SPI multiplexer")
Reported-by: default avatarkbuild test robot <lkp@intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarPeter Rosin <peda@axentia.se>
Link: https://lore.kernel.org/r/20200529145726.5708-1-peda@axentia.se


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 85c5cbeb

drivers/mux/adgs1408.c

+3 −3
Original line number Diff line number Diff line
@@ -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,