Re: [Linux-fbdev-devel] [PATCH 1/2] atyfb: fix CONFIG_ namespace violations

[Geert Uytterhoeven <geert@linux-m68k.org>]

On Mon, 2 Feb 2009, Randy Dunlap wrote:
> On Sat, 31 Jan 2009 12:10:08 -0800 Andrew Morton wrote:
> > On Sat, 31 Jan 2009 11:53:36 -0800 Randy Dunlap <randy.dunlap@oracle.com> wrote:
> > 
> > > so staging adds a new config symbol that conflicts with the
> > > (incorrect namespace) usage in mach64.h.
> > > 
> > > mach64 needs to change IMO, even though it is older.
> > 
> > Sigh, yes, that file has gone on a rampage through the namespace
> > rules.  I'll take a look at it sometime.
> > --
> 
> I went ahead with a minimal set of changes, but you can toss them
> and do more if you prefer.
> 
> ---
> 
> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> [1/2] Fix namespace violations by changing non-kconfig CONFIG_ names
> to CNFG_*.
> 
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> ---
>  drivers/video/aty/aty128fb.c    |    8 ++++----
>  drivers/video/aty/atyfb_base.c  |   22 +++++++++++-----------
>  drivers/video/aty/radeon_base.c |   10 +++++-----
>  drivers/video/aty/radeon_pm.c   |   18 +++++++++---------
>  include/video/aty128.h          |    4 ++--
>  include/video/mach64.h          |   24 ++++++++++++------------
>  include/video/radeon.h          |   18 +++++++++---------
>  7 files changed, 52 insertions(+), 52 deletions(-)
> 
> --- linux-2.6.29-rc3-git3.orig/drivers/video/aty/atyfb_base.c
> +++ linux-2.6.29-rc3-git3/drivers/video/aty/atyfb_base.c
> @@ -135,7 +135,7 @@
>  #if defined(CONFIG_PM) || defined(CONFIG_PMAC_BACKLIGHT) || \
>  defined (CONFIG_FB_ATY_GENERIC_LCD) || defined(CONFIG_FB_ATY_BACKLIGHT)
>  static const u32 lt_lcd_regs[] = {
> -	CONFIG_PANEL_LG,
> +	CNFG_PANEL_LG,

These were the official names as used in the ATI docs. After these changes, you
can no longer easily grep for them.

Perhaps it's better to prefix everything with ATI_? yes, I know it's more work
(for the writer), but we want to optimize for the reader, right?

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds