diff mbox series

drm: etnaviv: Replace of_platform.h with explicit includes

Message ID 20230410232647.1561308-1-robh@kernel.org (mailing list archive)
State New, archived
Headers show
Series drm: etnaviv: Replace of_platform.h with explicit includes | expand

Commit Message

Rob Herring (Arm) April 10, 2023, 11:26 p.m. UTC
Etnaviv doesn't use anything from of_platform.h, but depends on
of.h, of_device.h, and platform_device.h which are all implicitly
included, but that is going to be removed soon.

Signed-off-by: Rob Herring <robh@kernel.org>
---
 drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Rob Herring (Arm) June 9, 2023, 8:17 p.m. UTC | #1
On Mon, Apr 10, 2023 at 5:26 PM Rob Herring <robh@kernel.org> wrote:
>
> Etnaviv doesn't use anything from of_platform.h, but depends on
> of.h, of_device.h, and platform_device.h which are all implicitly
> included, but that is going to be removed soon.
>
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
>  drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Ping!

>
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> index 44ca803237a5..c68e83ed5a23 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> @@ -6,7 +6,9 @@
>  #include <linux/component.h>
>  #include <linux/dma-mapping.h>
>  #include <linux/module.h>
> -#include <linux/of_platform.h>
> +#include <linux/of.h>
> +#include <linux/of_device.h>
> +#include <linux/platform_device.h>
>  #include <linux/uaccess.h>
>
>  #include <drm/drm_debugfs.h>
> --
> 2.39.2
>
Sui Jingfeng June 11, 2023, 6:49 a.m. UTC | #2
Reviewed-by: Sui Jingfeng <suijingfeng@loongson.cn>


On 2023/6/10 04:17, Rob Herring wrote:
> On Mon, Apr 10, 2023 at 5:26 PM Rob Herring <robh@kernel.org> wrote:
>> Etnaviv doesn't use anything from of_platform.h, but depends on
>> of.h, of_device.h, and platform_device.h which are all implicitly
>> included, but that is going to be removed soon.
>>
>> Signed-off-by: Rob Herring <robh@kernel.org>
>> ---
>>   drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 +++-
>>   1 file changed, 3 insertions(+), 1 deletion(-)
> Ping!


of_device.h already has 'linux/of.h' and 'linux/platform_device.h' included,

Would it be sufficient by simply including linux/of_device.h ?


I'm fine with the above question explained.


```

#include <linux/platform_device.h>
#include <linux/of_platform.h> /* temporary until merge */

#include <linux/of.h>

```


>> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
>> index 44ca803237a5..c68e83ed5a23 100644
>> --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
>> +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
>> @@ -6,7 +6,9 @@
>>   #include <linux/component.h>
>>   #include <linux/dma-mapping.h>
>>   #include <linux/module.h>
>> -#include <linux/of_platform.h>
>> +#include <linux/of.h>
>> +#include <linux/of_device.h>
>> +#include <linux/platform_device.h>
>>   #include <linux/uaccess.h>
>>
>>   #include <drm/drm_debugfs.h>
>> --
>> 2.39.2
>>
Rob Herring (Arm) June 12, 2023, 6:15 p.m. UTC | #3
On Sun, Jun 11, 2023 at 12:49 AM Sui Jingfeng <suijingfeng@loongson.cn> wrote:
>
> Reviewed-by: Sui Jingfeng <suijingfeng@loongson.cn>
>
>
> On 2023/6/10 04:17, Rob Herring wrote:
> > On Mon, Apr 10, 2023 at 5:26 PM Rob Herring <robh@kernel.org> wrote:
> >> Etnaviv doesn't use anything from of_platform.h, but depends on
> >> of.h, of_device.h, and platform_device.h which are all implicitly
> >> included, but that is going to be removed soon.
> >>
> >> Signed-off-by: Rob Herring <robh@kernel.org>
> >> ---
> >>   drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 +++-
> >>   1 file changed, 3 insertions(+), 1 deletion(-)
> > Ping!
>
>
> of_device.h already has 'linux/of.h' and 'linux/platform_device.h' included,
>
> Would it be sufficient by simply including linux/of_device.h ?

That's part of what I'm trying to remove. Standard practice is to not
rely on implicit includes.

Rob
Sui Jingfeng June 12, 2023, 6:20 p.m. UTC | #4
On 2023/6/13 02:15, Rob Herring wrote:
> On Sun, Jun 11, 2023 at 12:49 AM Sui Jingfeng <suijingfeng@loongson.cn> wrote:
>> Reviewed-by: Sui Jingfeng <suijingfeng@loongson.cn>
>>
>>
>> On 2023/6/10 04:17, Rob Herring wrote:
>>> On Mon, Apr 10, 2023 at 5:26 PM Rob Herring <robh@kernel.org> wrote:
>>>> Etnaviv doesn't use anything from of_platform.h, but depends on
>>>> of.h, of_device.h, and platform_device.h which are all implicitly
>>>> included, but that is going to be removed soon.
>>>>
>>>> Signed-off-by: Rob Herring <robh@kernel.org>
>>>> ---
>>>>    drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 +++-
>>>>    1 file changed, 3 insertions(+), 1 deletion(-)
>>> Ping!
>>
>> of_device.h already has 'linux/of.h' and 'linux/platform_device.h' included,
>>
>> Would it be sufficient by simply including linux/of_device.h ?
> That's part of what I'm trying to remove. Standard practice is to not
> rely on implicit includes.

Ok, that's fine then.


Tested-by: Sui Jingfeng <suijingfeng@loongson.cn>


> Rob
Lucas Stach June 21, 2023, 1:20 p.m. UTC | #5
Am Freitag, dem 09.06.2023 um 14:17 -0600 schrieb Rob Herring:
> On Mon, Apr 10, 2023 at 5:26 PM Rob Herring <robh@kernel.org> wrote:
> > 
> > Etnaviv doesn't use anything from of_platform.h, but depends on
> > of.h, of_device.h, and platform_device.h which are all implicitly
> > included, but that is going to be removed soon.
> > 
> > Signed-off-by: Rob Herring <robh@kernel.org>
> > ---
> >  drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> Ping!

Thanks, applied to etnaviv/next.

Regards,
Lucas

> 
> > 
> > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> > index 44ca803237a5..c68e83ed5a23 100644
> > --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> > +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> > @@ -6,7 +6,9 @@
> >  #include <linux/component.h>
> >  #include <linux/dma-mapping.h>
> >  #include <linux/module.h>
> > -#include <linux/of_platform.h>
> > +#include <linux/of.h>
> > +#include <linux/of_device.h>
> > +#include <linux/platform_device.h>
> >  #include <linux/uaccess.h>
> > 
> >  #include <drm/drm_debugfs.h>
> > --
> > 2.39.2
> >
diff mbox series

Patch

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
index 44ca803237a5..c68e83ed5a23 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
@@ -6,7 +6,9 @@ 
 #include <linux/component.h>
 #include <linux/dma-mapping.h>
 #include <linux/module.h>
-#include <linux/of_platform.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
 #include <linux/uaccess.h>
 
 #include <drm/drm_debugfs.h>