lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] m68k: namespace pollution fix (custom->amiga_custom)

Browse Source 
in amigahw.h custom renamed to amiga_custom, in drivers with few instances the
same replacement, in the rest - #define custom amiga_custom in driver itself

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Al Viro
2006-01-12 01:06:12 -08:00
committed by Linus Torvalds
parent 198a410119
commit b4290a23cf
22 changed files with 108 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/ppc/platforms/apus_setup.c
View File

@@ -574,9 +574,9 @@ static __inline__ void ser_RTSon(void)
int __debug_ser_out( unsigned char c )
{
custom.serdat = c | 0x100;
amiga_custom.serdat = c | 0x100;
mb();
while (!(custom.serdatr & 0x2000))
while (!(amiga_custom.serdatr & 0x2000))
barrier();
return 1;
}
@@ -586,11 +586,11 @@ unsigned char __debug_ser_in( void )
unsigned char c;
/* XXX: is that ok?? derived from amiga_ser.c... */
while( !(custom.intreqr & IF_RBF) )
while( !(amiga_custom.intreqr & IF_RBF) )
barrier();
c = custom.serdatr;
c = amiga_custom.serdatr;
/* clear the interrupt, so that another character can be read */
custom.intreq = IF_RBF;
amiga_custom.intreq = IF_RBF;
return c;
}
@@ -601,10 +601,10 @@ int __debug_serinit( void )
local_irq_save(flags);
/* turn off Rx and Tx interrupts */
custom.intena = IF_RBF | IF_TBE;
amiga_custom.intena = IF_RBF | IF_TBE;
/* clear any pending interrupt */
custom.intreq = IF_RBF | IF_TBE;
amiga_custom.intreq = IF_RBF | IF_TBE;
local_irq_restore(flags);
@@ -617,7 +617,7 @@ int __debug_serinit( void )
#ifdef CONFIG_KGDB
/* turn Rx interrupts on for GDB */
custom.intena = IF_SETCLR | IF_RBF;
amiga_custom.intena = IF_SETCLR | IF_RBF;
ser_RTSon();
#endif