diff mbox series

[v2,3/3] iio: adc: twl4030-madc: add missing of.h include

Message ID 20220927154611.3330871-3-dmitry.torokhov@gmail.com
State Superseded
Headers show
Series [v2,1/3] watchdog: twl4030_wdt: add missing mod_devicetable.h include | expand

Commit Message

Dmitry Torokhov Sept. 27, 2022, 3:46 p.m. UTC
The driver is using of_device_id/of_match_ptr() and therefore needs
to include of.h header. We used to get this definition indirectly via
inclusion of matrix_keypad.h from twl.h, but we are cleaning up
matrix_keypad.h from unnecessary includes.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---

v2: adjusted patch description

 drivers/iio/adc/twl4030-madc.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Andy Shevchenko Sept. 27, 2022, 4:20 p.m. UTC | #1
On Tue, Sep 27, 2022 at 08:46:11AM -0700, Dmitry Torokhov wrote:
> The driver is using of_device_id/of_match_ptr() and therefore needs
> to include of.h header. We used to get this definition indirectly via
> inclusion of matrix_keypad.h from twl.h, but we are cleaning up
> matrix_keypad.h from unnecessary includes.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
> 
> v2: adjusted patch description
> 
>  drivers/iio/adc/twl4030-madc.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/iio/adc/twl4030-madc.c b/drivers/iio/adc/twl4030-madc.c
> index f8f8aea15612..c279c4f2c9b7 100644
> --- a/drivers/iio/adc/twl4030-madc.c
> +++ b/drivers/iio/adc/twl4030-madc.c
> @@ -30,6 +30,7 @@
>  #include <linux/types.h>
>  #include <linux/gfp.h>
>  #include <linux/err.h>
> +#include <linux/of.h>
>  #include <linux/regulator/consumer.h>
>  
>  #include <linux/iio/iio.h>
> -- 
> 2.38.0.rc1.362.ged0d419d3c-goog
>
Jonathan Cameron Oct. 1, 2022, 5:07 p.m. UTC | #2
On Tue, 27 Sep 2022 19:20:00 +0300
Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:

> On Tue, Sep 27, 2022 at 08:46:11AM -0700, Dmitry Torokhov wrote:
> > The driver is using of_device_id/of_match_ptr() and therefore needs
> > to include of.h header. We used to get this definition indirectly via
> > inclusion of matrix_keypad.h from twl.h, but we are cleaning up
> > matrix_keypad.h from unnecessary includes.  
> 
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Applied to the togreg branch of iio.git and pushed out as testing for
0-day to take a look.

Note that this is 6.2 material now - if that's an issue for the matrix_keypad.h
cleanup then feel free to take it via the input tree with
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
but shout in reply to this so I know to drop it from the iio tree.

Thanks,

Jonathan

> 
> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> > ---
> > 
> > v2: adjusted patch description
> > 
> >  drivers/iio/adc/twl4030-madc.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/drivers/iio/adc/twl4030-madc.c b/drivers/iio/adc/twl4030-madc.c
> > index f8f8aea15612..c279c4f2c9b7 100644
> > --- a/drivers/iio/adc/twl4030-madc.c
> > +++ b/drivers/iio/adc/twl4030-madc.c
> > @@ -30,6 +30,7 @@
> >  #include <linux/types.h>
> >  #include <linux/gfp.h>
> >  #include <linux/err.h>
> > +#include <linux/of.h>
> >  #include <linux/regulator/consumer.h>
> >  
> >  #include <linux/iio/iio.h>
> > -- 
> > 2.38.0.rc1.362.ged0d419d3c-goog
> >   
>
Dmitry Torokhov Oct. 1, 2022, 10:14 p.m. UTC | #3
On Sat, Oct 01, 2022 at 06:07:05PM +0100, Jonathan Cameron wrote:
> On Tue, 27 Sep 2022 19:20:00 +0300
> Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
> 
> > On Tue, Sep 27, 2022 at 08:46:11AM -0700, Dmitry Torokhov wrote:
> > > The driver is using of_device_id/of_match_ptr() and therefore needs
> > > to include of.h header. We used to get this definition indirectly via
> > > inclusion of matrix_keypad.h from twl.h, but we are cleaning up
> > > matrix_keypad.h from unnecessary includes.  
> > 
> > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Applied to the togreg branch of iio.git and pushed out as testing for
> 0-day to take a look.
> 
> Note that this is 6.2 material now - if that's an issue for the matrix_keypad.h
> cleanup then feel free to take it via the input tree with
> Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> but shout in reply to this so I know to drop it from the iio tree.

OK, it is not urgent, but I do not want to lose matrix keypad changes...

How about I'll wait to see where the rest of the patches end, and if
they end up in 6.1 I'll queue twl4030-madc.c through my tree together
with the header change?

Thanks.
Jonathan Cameron Oct. 2, 2022, 12:57 p.m. UTC | #4
On Sat, 1 Oct 2022 15:14:08 -0700
Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote:

> On Sat, Oct 01, 2022 at 06:07:05PM +0100, Jonathan Cameron wrote:
> > On Tue, 27 Sep 2022 19:20:00 +0300
> > Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
> >   
> > > On Tue, Sep 27, 2022 at 08:46:11AM -0700, Dmitry Torokhov wrote:  
> > > > The driver is using of_device_id/of_match_ptr() and therefore needs
> > > > to include of.h header. We used to get this definition indirectly via
> > > > inclusion of matrix_keypad.h from twl.h, but we are cleaning up
> > > > matrix_keypad.h from unnecessary includes.    
> > > 
> > > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>  
> > Applied to the togreg branch of iio.git and pushed out as testing for
> > 0-day to take a look.
> > 
> > Note that this is 6.2 material now - if that's an issue for the matrix_keypad.h
> > cleanup then feel free to take it via the input tree with
> > Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> > but shout in reply to this so I know to drop it from the iio tree.  
> 
> OK, it is not urgent, but I do not want to lose matrix keypad changes...
> 
> How about I'll wait to see where the rest of the patches end, and if
> they end up in 6.1 I'll queue twl4030-madc.c through my tree together
> with the header change?
> 
> Thanks.
> 
Ok. I'll drop it for now - let me know if I should pick it up once everything
settles down.

Jonathan
diff mbox series

Patch

diff --git a/drivers/iio/adc/twl4030-madc.c b/drivers/iio/adc/twl4030-madc.c
index f8f8aea15612..c279c4f2c9b7 100644
--- a/drivers/iio/adc/twl4030-madc.c
+++ b/drivers/iio/adc/twl4030-madc.c
@@ -30,6 +30,7 @@ 
 #include <linux/types.h>
 #include <linux/gfp.h>
 #include <linux/err.h>
+#include <linux/of.h>
 #include <linux/regulator/consumer.h>
 
 #include <linux/iio/iio.h>