]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
iio:adc:ti-tlc4541: Drop CONFIG_OF and of_match_ptr protections.
authorJonathan Cameron <Jonathan.Cameron@huawei.com>
Sun, 28 Jun 2020 12:36:52 +0000 (13:36 +0100)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Tue, 7 Jul 2020 19:24:11 +0000 (20:24 +0100)
These stop us using ACPI PRP0001 to instantiate the device.
I am slowly clearly out use of these in IIO to avoid this being coppied
into new drivers.

Here I also included mod_devicetable.h as we are using of_match_id
which is defined in there and hence it is best practice to include
it directly.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Phil Reid <preid@electromag.com.au>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
drivers/iio/adc/ti-tlc4541.c

index 432238246519393a87bbca3aecaf2e597aab1d24..53359a2e5bea7a37fb7f629ff26381964cd6d3f9 100644 (file)
@@ -24,6 +24,7 @@
 #include <linux/iio/triggered_buffer.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/mod_devicetable.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
 #include <linux/spi/spi.h>
@@ -235,14 +236,12 @@ static int tlc4541_remove(struct spi_device *spi)
        return 0;
 }
 
-#ifdef CONFIG_OF
 static const struct of_device_id tlc4541_dt_ids[] = {
        { .compatible = "ti,tlc3541", },
        { .compatible = "ti,tlc4541", },
        {}
 };
 MODULE_DEVICE_TABLE(of, tlc4541_dt_ids);
-#endif
 
 static const struct spi_device_id tlc4541_id[] = {
        {"tlc3541", TLC3541},
@@ -254,7 +253,7 @@ MODULE_DEVICE_TABLE(spi, tlc4541_id);
 static struct spi_driver tlc4541_driver = {
        .driver = {
                .name   = "tlc4541",
-               .of_match_table = of_match_ptr(tlc4541_dt_ids),
+               .of_match_table = tlc4541_dt_ids,
        },
        .probe          = tlc4541_probe,
        .remove         = tlc4541_remove,