| Message ID | 20200628123654.32830-15-jic23@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iio:adc more of_match_ptr and similar removal | expand |
On Sun, 28 Jun 2020 13:36:45 +0100 Jonathan Cameron <jic23@kernel.org> wrote: > From: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > Dropping of_match_ptr allows this driver to be used with ACPI. > The header includes are adjusted to include platform_device.h > and mod_devicetable.h instead of OF specific header as nothing > from that header itself is actually used. > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Cc: Arnaud Pouliquen <arnaud.pouliquen@st.com> Applied. Thanks, J > --- > drivers/iio/adc/sd_adc_modulator.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/iio/adc/sd_adc_modulator.c b/drivers/iio/adc/sd_adc_modulator.c > index 1d6c246609c8..327cc2097f6c 100644 > --- a/drivers/iio/adc/sd_adc_modulator.c > +++ b/drivers/iio/adc/sd_adc_modulator.c > @@ -9,7 +9,8 @@ > #include <linux/iio/iio.h> > #include <linux/iio/triggered_buffer.h> > #include <linux/module.h> > -#include <linux/of_device.h> > +#include <linux/mod_devicetable.h> > +#include <linux/platform_device.h> > > static const struct iio_info iio_sd_mod_iio_info; > > @@ -54,7 +55,7 @@ MODULE_DEVICE_TABLE(of, sd_adc_of_match); > static struct platform_driver iio_sd_mod_adc = { > .driver = { > .name = "iio_sd_adc_mod", > - .of_match_table = of_match_ptr(sd_adc_of_match), > + .of_match_table = sd_adc_of_match, > }, > .probe = iio_sd_mod_probe, > };
diff --git a/drivers/iio/adc/sd_adc_modulator.c b/drivers/iio/adc/sd_adc_modulator.c index 1d6c246609c8..327cc2097f6c 100644 --- a/drivers/iio/adc/sd_adc_modulator.c +++ b/drivers/iio/adc/sd_adc_modulator.c @@ -9,7 +9,8 @@ #include <linux/iio/iio.h> #include <linux/iio/triggered_buffer.h> #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/mod_devicetable.h> +#include <linux/platform_device.h> static const struct iio_info iio_sd_mod_iio_info; @@ -54,7 +55,7 @@ MODULE_DEVICE_TABLE(of, sd_adc_of_match); static struct platform_driver iio_sd_mod_adc = { .driver = { .name = "iio_sd_adc_mod", - .of_match_table = of_match_ptr(sd_adc_of_match), + .of_match_table = sd_adc_of_match, }, .probe = iio_sd_mod_probe, };