Patchwork [06/20] powerpc/xmon: Remove renaming #defines of scanhex() and skipbl()

login
register
mail settings
Submitter Michael Ellerman
Date Oct. 9, 2012, 2:20 p.m.
Message ID <1349792447-15714-6-git-send-email-michael@ellerman.id.au>
Download mbox | patch
Permalink /patch/190318/
State Accepted, archived
Commit b3dc19cddce37a1aaebc911c8db94e5209a9764d
Delegated to: Benjamin Herrenschmidt
Headers show

Comments

Michael Ellerman - Oct. 9, 2012, 2:20 p.m.
We have two #defines that rename scanhex() and skipbl() to
xmon_scanhex() and xmon_skipbl() - but no one ever uses those
names.

So the only effect is to rename the actual symbols in the generated
code, and AFACIS there is no reason to do that, so drop them.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
---
 arch/powerpc/xmon/xmon.c |    3 ---
 1 file changed, 3 deletions(-)
David Laight - Oct. 9, 2012, 2:59 p.m.
> We have two #defines that rename scanhex() and skipbl() to
> xmon_scanhex() and xmon_skipbl() - but no one ever uses those
> names.

It looks like they are there for namespace protection.

	David
Paul Mackerras - Oct. 9, 2012, 10:15 p.m.
On Wed, Oct 10, 2012 at 01:20:33AM +1100, Michael Ellerman wrote:
> We have two #defines that rename scanhex() and skipbl() to
> xmon_scanhex() and xmon_skipbl() - but no one ever uses those
> names.
> 
> So the only effect is to rename the actual symbols in the generated
> code, and AFACIS there is no reason to do that, so drop them.

You might as well make scanhex() and skipbl() static while you're at
it.

Paul.
Michael Ellerman - Oct. 10, 2012, 1 a.m.
On Wed, 2012-10-10 at 09:15 +1100, Paul Mackerras wrote:
> On Wed, Oct 10, 2012 at 01:20:33AM +1100, Michael Ellerman wrote:
> > We have two #defines that rename scanhex() and skipbl() to
> > xmon_scanhex() and xmon_skipbl() - but no one ever uses those
> > names.
> > 
> > So the only effect is to rename the actual symbols in the generated
> > code, and AFACIS there is no reason to do that, so drop them.
> 
> You might as well make scanhex() and skipbl() static while you're at
> it.

Actually I was hoping to move the spu code that uses them into a
separate file, so I'll leave them for now.

cheers

Patch

diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 67d36ab..cc96a71 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -52,9 +52,6 @@ 
 #include "nonstdio.h"
 #include "dis-asm.h"
 
-#define scanhex	xmon_scanhex
-#define skipbl	xmon_skipbl
-
 #ifdef CONFIG_SMP
 static cpumask_t cpus_in_xmon = CPU_MASK_NONE;
 static unsigned long xmon_taken = 1;