diff mbox

drm: nouveau: fix nouveau_debugfs_init prototype

Message ID 3968390.Pvmnq3v7oC@wuerfel (mailing list archive)
State New, archived
Headers show

Commit Message

Arnd Bergmann Jan. 13, 2016, 1:48 p.m. UTC
The new debugfs initialization code fails to build when CONFIG_DEBUG_FS
is disabled:

In file included from /git/arm-soc/drivers/gpu/drm/nouveau/nouveau_drm.c:57:0:
drivers/gpu/drm/nouveau/nouveau_debugfs.h: In function 'nouveau_debugfs_init':
drivers/gpu/drm/nouveau/nouveau_debugfs.h:37:29: error: parameter name omitted
 nouveau_debugfs_init(struct nouveau_drm *)

This fixes the prototypes so we can build it again.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: b126a200e9db ("drm/nouveau/debugfs: we need a ctrl object for debugfs")
---
This broke when the nouveau patches got merged into drm-next on Monday.
Found on ARM randconfig builds.

Comments

Karol Herbst Jan. 13, 2016, 1:55 p.m. UTC | #1
> Arnd Bergmann <arnd@arndb.de> hat am 13. Januar 2016 um 14:48 geschrieben:
> 
> The new debugfs initialization code fails to build when CONFIG_DEBUG_FS
> is disabled:
> 
> In file included from /git/arm-soc/drivers/gpu/drm/nouveau/nouveau_drm.c:57:0:
> drivers/gpu/drm/nouveau/nouveau_debugfs.h: In function 'nouveau_debugfs_init':
> drivers/gpu/drm/nouveau/nouveau_debugfs.h:37:29: error: parameter name omitted
>  nouveau_debugfs_init(struct nouveau_drm *)
> 
> This fixes the prototypes so we can build it again.
> 

thanks for this. I already send a patch to the nouveau ML here:
http://lists.freedesktop.org/archives/nouveau/2016-January/023779.html

but I guess I should mail to the kernel list directly next time.

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: b126a200e9db ("drm/nouveau/debugfs: we need a ctrl object for debugfs")
> ---
> This broke when the nouveau patches got merged into drm-next on Monday.
> Found on ARM randconfig builds.
> 
> diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.h
> b/drivers/gpu/drm/nouveau/nouveau_debugfs.h
> index 52c7161297d7..b8c03ff5bf05 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_debugfs.h
> +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.h
> @@ -34,13 +34,13 @@ nouveau_drm_debugfs_cleanup(struct drm_minor *minor)
>  }
> 
>  static inline int
> -nouveau_debugfs_init(struct nouveau_drm *)
> +nouveau_debugfs_init(struct nouveau_drm *drm)
>  {
>  return 0;
>  }
> 
>  static inline void
> -nouveau_debugfs_fini(struct nouveau_drm *)
> +nouveau_debugfs_fini(struct nouveau_drm *drm)
>  {
>  }

>
Arnd Bergmann Jan. 13, 2016, 2 p.m. UTC | #2
On Wednesday 13 January 2016 14:55:47 Karol Herbst wrote:
> > Arnd Bergmann <arnd@arndb.de> hat am 13. Januar 2016 um 14:48 geschrieben:
> > 
> > The new debugfs initialization code fails to build when CONFIG_DEBUG_FS
> > is disabled:
> > 
> > In file included from /git/arm-soc/drivers/gpu/drm/nouveau/nouveau_drm.c:57:0:
> > drivers/gpu/drm/nouveau/nouveau_debugfs.h: In function 'nouveau_debugfs_init':
> > drivers/gpu/drm/nouveau/nouveau_debugfs.h:37:29: error: parameter name omitted
> >  nouveau_debugfs_init(struct nouveau_drm *)
> > 
> > This fixes the prototypes so we can build it again.
> > 
> 
> thanks for this. I already send a patch to the nouveau ML here:
> http://lists.freedesktop.org/archives/nouveau/2016-January/023779.html

Ok, thanks

	Arnd
Emil Velikov Jan. 15, 2016, 11:06 a.m. UTC | #3
On 13 January 2016 at 16:00, Arnd Bergmann <arnd@arndb.de> wrote:
> On Wednesday 13 January 2016 14:55:47 Karol Herbst wrote:
>> > Arnd Bergmann <arnd@arndb.de> hat am 13. Januar 2016 um 14:48 geschrieben:
>> >
>> > The new debugfs initialization code fails to build when CONFIG_DEBUG_FS
>> > is disabled:
>> >
>> > In file included from /git/arm-soc/drivers/gpu/drm/nouveau/nouveau_drm.c:57:0:
>> > drivers/gpu/drm/nouveau/nouveau_debugfs.h: In function 'nouveau_debugfs_init':
>> > drivers/gpu/drm/nouveau/nouveau_debugfs.h:37:29: error: parameter name omitted
>> >  nouveau_debugfs_init(struct nouveau_drm *)
>> >
>> > This fixes the prototypes so we can build it again.
>> >
>>
>> thanks for this. I already send a patch to the nouveau ML here:
>> http://lists.freedesktop.org/archives/nouveau/2016-January/023779.html
>
> Ok, thanks
>
Fwiw Arnd's fix feels a lot better - it lacks typos, has a fixes tag,
comprehensive commit message etc. etc. :-)

-Emil
Karol Herbst Jan. 15, 2016, 12:07 p.m. UTC | #4
> Emil Velikov <emil.l.velikov@gmail.com> hat am 15. Januar 2016 um 12:06
> geschrieben:
> 
> On 13 January 2016 at 16:00, Arnd Bergmann <arnd@arndb.de> wrote:
> > On Wednesday 13 January 2016 14:55:47 Karol Herbst wrote:
> >> > Arnd Bergmann <arnd@arndb.de> hat am 13. Januar 2016 um 14:48
> >> > geschrieben:
> >> >
> >> > The new debugfs initialization code fails to build when CONFIG_DEBUG_FS
> >> > is disabled:
> >> >
> >> > In file included from
> >> > /git/arm-soc/drivers/gpu/drm/nouveau/nouveau_drm.c:57:0:
> >> > drivers/gpu/drm/nouveau/nouveau_debugfs.h: In function
> >> > 'nouveau_debugfs_init':
> >> > drivers/gpu/drm/nouveau/nouveau_debugfs.h:37:29: error: parameter name
> >> > omitted
> >> > nouveau_debugfs_init(struct nouveau_drm *)
> >> >
> >> > This fixes the prototypes so we can build it again.
> >> >
> >>
> >> thanks for this. I already send a patch to the nouveau ML here:
> >> http://lists.freedesktop.org/archives/nouveau/2016-January/023779.html
> >
> > Ok, thanks
> >
> Fwiw Arnd's fix feels a lot better - it lacks typos, has a fixes tag,
> comprehensive commit message etc. etc. :-)
> 
> -Emil

no worries, I am still learning after all

Karol
diff mbox

Patch

diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.h b/drivers/gpu/drm/nouveau/nouveau_debugfs.h
index 52c7161297d7..b8c03ff5bf05 100644
--- a/drivers/gpu/drm/nouveau/nouveau_debugfs.h
+++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.h
@@ -34,13 +34,13 @@  nouveau_drm_debugfs_cleanup(struct drm_minor *minor)
 }
 
 static inline int
-nouveau_debugfs_init(struct nouveau_drm *)
+nouveau_debugfs_init(struct nouveau_drm *drm)
 {
 	return 0;
 }
 
 static inline void
-nouveau_debugfs_fini(struct nouveau_drm *)
+nouveau_debugfs_fini(struct nouveau_drm *drm)
 {
 }