iio:dac:ad5592r: Drop of_match_ptr and ACPI_PTR protections.
authorJonathan Cameron <Jonathan.Cameron@huawei.com>
Thu, 10 Sep 2020 17:32:14 +0000 (18:32 +0100)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Mon, 21 Sep 2020 17:41:27 +0000 (18:41 +0100)
These result in a very small reduction in driver size, but at the
cost of more complex build and slightly harder to read code.
In the case of of_match_ptr it also prevents use of PRP0001
ACPI based identification.  In this particular case we have
a valid ACPI/PNP ID that I am assuming was issued by Analog
Devices.  That should be used in preference to PRP0001 but doesn't
mean we should prevent that route.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Michael Hennerich <michael.hennerich@analog.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Link: https://lore.kernel.org/r/20200910173242.621168-11-jic23@kernel.org
drivers/iio/dac/ad5592r.c

index 49308ad13c4b42f9186376f6cd3e0e2f52a8a4e9..41f6515006681e7867f2bf5c26956be2690f0f6c 100644 (file)
@@ -10,9 +10,8 @@
 
 #include <linux/bitops.h>
 #include <linux/module.h>
-#include <linux/of.h>
+#include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
-#include <linux/acpi.h>
 
 #define AD5592R_GPIO_READBACK_EN       BIT(10)
 #define AD5592R_LDAC_READBACK_EN       BIT(6)
@@ -157,8 +156,8 @@ MODULE_DEVICE_TABLE(acpi, ad5592r_acpi_match);
 static struct spi_driver ad5592r_spi_driver = {
        .driver = {
                .name = "ad5592r",
-               .of_match_table = of_match_ptr(ad5592r_of_match),
-               .acpi_match_table = ACPI_PTR(ad5592r_acpi_match),
+               .of_match_table = ad5592r_of_match,
+               .acpi_match_table = ad5592r_acpi_match,
        },
        .probe = ad5592r_spi_probe,
        .remove = ad5592r_spi_remove,