mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2024-12-29 09:13:38 +00:00
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: e9e40543ad
("spi: Add generic SPI multiplexer")
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Peter Rosin <peda@axentia.se>
Link: https://lore.kernel.org/r/20200529145726.5708-1-peda@axentia.se
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
85c5cbeba8
commit
b7820ae2d2
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user