[Intel-gfx] [PATCH] drm/i915: intel_overlay_print_error_state() only needed for debugfs (v2)

[Tobias Doerffel]

Hi,

Am Donnerstag, 26. August 2010, um 08:41:13 schrieb Andre Müller:
> On 08/26/10 01:52, Tobias Doerffel wrote:
> > The function intel_overlay_print_error_state() is called from within
> > i915_error_state() in i915_debufs.c which is only built if
> > CONFIG_DEBUG_FS is set. When building without this option, seq_printf()
> > is not declared in intel_overlay.c and the file fails to compile.
> > Furthermore the whole function is superfluous in this case. Therefore
> > only build it if CONFIG_DEBUG_FS is set.
> > 
> > Signed-off-by: Tobias Doerffel <tobias.doerffel at gmail.com>
> 
> You may want to refer to
> https://bugzilla.kernel.org/show_bug.cgi?id=16811
> in the description.
> Andrew Morton has a different fix for the failure
> applied to -mm, which just adds an (unconditional)
> #include <linux/seq_file.h>.

Yes, that works as well however the affected function is not required at all 
without debugfs so we can leave it out completely (like done with all the 
other functions in i915_debufs.c) and save some bytes.

Regards

Toby

> Regards,
> Andre
> 
> > ---
> > 
> >  drivers/gpu/drm/i915/intel_overlay.c |    2 ++
> >  1 files changed, 2 insertions(+), 0 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_overlay.c
> > b/drivers/gpu/drm/i915/intel_overlay.c index 4f00390..74feb89 100644
> > --- a/drivers/gpu/drm/i915/intel_overlay.c
> > +++ b/drivers/gpu/drm/i915/intel_overlay.c
> > 
> > @@ -1461,6 +1461,7 @@ err:
> >  	return NULL;
> >  
> >  }
> > 
> > +#ifdef CONFIG_DEBUG_FS
> > 
> >  void
> >  intel_overlay_print_error_state(struct seq_file *m, struct
> >  intel_overlay_error_state *error) {
> > 
> > @@ -1513,3 +1514,4 @@ intel_overlay_print_error_state(struct seq_file *m,
> > struct intel_overlay_error_s
> > 
> >  	P(UVSCALEV);
> >  
> >  #undef P
> >  }
> > 
> > +#endif	/* CONFIG_DEBUG_FS */

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20100826/13870e1d/attachment.sig>