| Message ID | 20170121182233.30852-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, 21 Jan 2017, Chris Wilson <chris@chris-wilson.co.uk> wrote: > 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> Reviewed-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/char/agp/intel-gtt.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c > index 9702c78f458d..7fcc2a9d1d5a 100644 > --- a/drivers/char/agp/intel-gtt.c > +++ b/drivers/char/agp/intel-gtt.c > @@ -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);
On la, 2017-01-21 at 18:22 +0000, Chris Wilson wrote: > 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> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Regards, Joonas
On Mon, Jan 23, 2017 at 10:06:15AM +0200, Joonas Lahtinen wrote: > On la, 2017-01-21 at 18:22 +0000, Chris Wilson wrote: > > 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> > > Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Applied, thanks for the review. -Chris
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index 9702c78f458d..7fcc2a9d1d5a 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c @@ -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);
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> --- drivers/char/agp/intel-gtt.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)