[PATCH] drm/vram-helper: remove unneeded #if defined/endif guards.

Daniel Vetter daniel at ffwll.ch
Mon Mar 23 15:37:52 UTC 2020


On Mon, Mar 23, 2020 at 12:37:26PM +0100, Greg KH wrote:
> On Mon, Mar 23, 2020 at 02:28:02PM +0300, Wambui Karuga wrote:
> > Remove unneeded #if/#endif guards for checking whether the
> > CONFIG_DEBUG_FS option is set or not. If the option is not set, the
> > compiler optimizes the functions making the guards
> > unnecessary.
> > 
> > Signed-off-by: Wambui Karuga <wambui.karugax at gmail.com>

Applied, thanks a lot.
-Daniel

> > ---
> >  drivers/gpu/drm/drm_gem_vram_helper.c | 4 ----
> >  1 file changed, 4 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c
> > index 76506bedac11..b3201a70cbfc 100644
> > --- a/drivers/gpu/drm/drm_gem_vram_helper.c
> > +++ b/drivers/gpu/drm/drm_gem_vram_helper.c
> > @@ -1018,7 +1018,6 @@ static struct ttm_bo_driver bo_driver = {
> >   * struct drm_vram_mm
> >   */
> >  
> > -#if defined(CONFIG_DEBUG_FS)
> >  static int drm_vram_mm_debugfs(struct seq_file *m, void *data)
> >  {
> >  	struct drm_info_node *node = (struct drm_info_node *) m->private;
> > @@ -1035,7 +1034,6 @@ static int drm_vram_mm_debugfs(struct seq_file *m, void *data)
> >  static const struct drm_info_list drm_vram_mm_debugfs_list[] = {
> >  	{ "vram-mm", drm_vram_mm_debugfs, 0, NULL },
> >  };
> > -#endif
> >  
> >  /**
> >   * drm_vram_mm_debugfs_init() - Register VRAM MM debugfs file.
> > @@ -1045,11 +1043,9 @@ static const struct drm_info_list drm_vram_mm_debugfs_list[] = {
> >   */
> >  void drm_vram_mm_debugfs_init(struct drm_minor *minor)
> >  {
> > -#if defined(CONFIG_DEBUG_FS)
> >  	drm_debugfs_create_files(drm_vram_mm_debugfs_list,
> >  				 ARRAY_SIZE(drm_vram_mm_debugfs_list),
> >  				 minor->debugfs_root, minor);
> > -#endif
> >  }
> >  EXPORT_SYMBOL(drm_vram_mm_debugfs_init);
> >  
> > -- 
> > 2.25.1
> 
> Reviewed-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the dri-devel mailing list