OSDN Git Service

agp/intel: Move intel_fake_agp_sizes into #ifdef block
authorChris Wilson <chris@chris-wilson.co.uk>
Sat, 21 Jan 2017 18:22:33 +0000 (18:22 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 23 Jan 2017 09:15:29 +0000 (09:15 +0000)
Move the intel_fake_agp_sizes array into the same #ifdef block as it is
used to avoid instantiation when not used, and so triggering a compiler
warning

drivers/char/agp/intel-gtt.c:335:42: warning: ‘intel_fake_agp_sizes’
defined but not used [-Wunused-const-variable=]

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170121182233.30852-1-chris@chris-wilson.co.uk
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
drivers/char/agp/intel-gtt.c

index 9702c78..7fcc2a9 100644 (file)
@@ -332,14 +332,6 @@ static void i810_write_entry(dma_addr_t addr, unsigned int entry,
        writel_relaxed(addr | pte_flags, intel_private.gtt + entry);
 }
 
-static const struct aper_size_info_fixed intel_fake_agp_sizes[] = {
-       {32, 8192, 3},
-       {64, 16384, 4},
-       {128, 32768, 5},
-       {256, 65536, 6},
-       {512, 131072, 7},
-};
-
 static unsigned int intel_gtt_stolen_size(void)
 {
        u16 gmch_ctrl;
@@ -670,6 +662,14 @@ static int intel_gtt_init(void)
 }
 
 #if IS_ENABLED(CONFIG_AGP_INTEL)
+static const struct aper_size_info_fixed intel_fake_agp_sizes[] = {
+       {32, 8192, 3},
+       {64, 16384, 4},
+       {128, 32768, 5},
+       {256, 65536, 6},
+       {512, 131072, 7},
+};
+
 static int intel_fake_agp_fetch_size(void)
 {
        int num_sizes = ARRAY_SIZE(intel_fake_agp_sizes);