Re: [PATCH v1] mux: adgs1408: Add mod_devicetable.h and remove of_match_ptr

[Peter Rosin]

On 2020-05-20 14:01, Andy Shevchenko wrote:
> 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")
> Reported-by: kbuild test robot <lkp@xxxxxxxxx>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>

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

> ---
>  drivers/mux/adgs1408.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mux/adgs1408.c b/drivers/mux/adgs1408.c
> index 89096f10f4c4..12466b06692c 100644
> --- a/drivers/mux/adgs1408.c
> +++ b/drivers/mux/adgs1408.c
> @@ -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,