From: Daniel Vetter <daniel@ffwll.ch>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: only build i915_debugfs.c when CONFIG_DEBUG_FS is enabled
Date: Mon, 16 Dec 2013 16:53:42 +0100 [thread overview]
Message-ID: <20131216155342.GS9804@phenom.ffwll.local> (raw)
In-Reply-To: <1387192236-1918-1-git-send-email-jani.nikula@intel.com>
On Mon, Dec 16, 2013 at 01:10:36PM +0200, Jani Nikula wrote:
> The whole file is wrapped around in #if defined(CONFIG_DEBUG_FS) anyway,
> so skip the file at the build level already.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Queued for -next, thanks for the patch.
-Daniel
> ---
> drivers/gpu/drm/i915/Makefile | 3 ++-
> drivers/gpu/drm/i915/i915_debugfs.c | 4 ----
> 2 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
> index 41838eaa799c..da682cbcb806 100644
> --- a/drivers/gpu/drm/i915/Makefile
> +++ b/drivers/gpu/drm/i915/Makefile
> @@ -4,7 +4,6 @@
>
> ccflags-y := -Iinclude/drm
> i915-y := i915_drv.o i915_dma.o i915_irq.o \
> - i915_debugfs.o \
> i915_gpu_error.o \
> i915_suspend.o \
> i915_gem.o \
> @@ -55,6 +54,8 @@ i915-$(CONFIG_ACPI) += intel_acpi.o
>
> i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o
>
> +i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o
> +
> obj-$(CONFIG_DRM_I915) += i915.o
>
> CFLAGS_i915_trace_points.o := -I$(src)
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 242189ee3607..6294ffdcc0ac 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -40,8 +40,6 @@
> #include <drm/i915_drm.h>
> #include "i915_drv.h"
>
> -#if defined(CONFIG_DEBUG_FS)
> -
> enum {
> ACTIVE_LIST,
> INACTIVE_LIST,
> @@ -3282,5 +3280,3 @@ void i915_debugfs_cleanup(struct drm_minor *minor)
> drm_debugfs_remove_files(info_list, 1, minor);
> }
> }
> -
> -#endif /* CONFIG_DEBUG_FS */
> --
> 1.7.9.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
prev parent reply other threads:[~2013-12-16 15:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-16 11:10 [PATCH] drm/i915: only build i915_debugfs.c when CONFIG_DEBUG_FS is enabled Jani Nikula
2013-12-16 15:53 ` Daniel Vetter [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131216155342.GS9804@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox