Commit 2ad28472 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Paul Mundt
Browse files

sisfb: remove InPort/OutPort wrappers 



Remove register IO wrappers.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent f7854e5d

drivers/video/sis/init.c

+10 −10
Original line number Diff line number Diff line
@@ -882,51 +882,51 @@ SiS_GetModeID_VGA2(int VGAEngine, unsigned int VBFlags, int HDisplay, int VDispl 
void

SiS_SetReg(SISIOADDRESS port, unsigned short index, unsigned short data)

{

   OutPortByte(port, index);

   OutPortByte(port + 1, data);

	outb((u8)index, port);

	outb((u8)data, port + 1);

}



void

SiS_SetRegByte(SISIOADDRESS port, unsigned short data)

{

   OutPortByte(port, data);

	outb((u8)data, port);

}



void

SiS_SetRegShort(SISIOADDRESS port, unsigned short data)

{

   OutPortWord(port, data);

	outw((u16)data, port);

}



void

SiS_SetRegLong(SISIOADDRESS port, unsigned int data)

{

   OutPortLong(port, data);

	outl((u32)data, port);

}



unsigned char

SiS_GetReg(SISIOADDRESS port, unsigned short index)

{

   OutPortByte(port, index);

   return(InPortByte(port + 1));

	outb((u8)index, port);

	return inb(port + 1);

}



unsigned char

SiS_GetRegByte(SISIOADDRESS port)

{

   return(InPortByte(port));

	return inb(port);

}



unsigned short

SiS_GetRegShort(SISIOADDRESS port)

{

   return(InPortWord(port));

	return inw(port);

}



unsigned int

SiS_GetRegLong(SISIOADDRESS port)

{

   return(InPortLong(port));

	return inl(port);

}



void

drivers/video/sis/osdef.h

+0 −30
Original line number Diff line number Diff line
@@ -54,30 +54,6 @@ 
#ifndef _SIS_OSDEF_H_

#define _SIS_OSDEF_H_



#ifdef OutPortByte

#undef OutPortByte

#endif



#ifdef OutPortWord

#undef OutPortWord

#endif



#ifdef OutPortLong

#undef OutPortLong

#endif



#ifdef InPortByte

#undef InPortByte

#endif



#ifdef InPortWord

#undef InPortWord

#endif



#ifdef InPortLong

#undef InPortLong

#endif



/**********************************************************************/

/*  LINUX KERNEL                                                      */

/**********************************************************************/
@@ -87,12 +63,6 @@ 
#warning sisfb will not work!

#endif



#define OutPortByte(p,v) outb((u8)(v),(SISIOADDRESS)(p))

#define OutPortWord(p,v) outw((u16)(v),(SISIOADDRESS)(p))

#define OutPortLong(p,v) outl((u32)(v),(SISIOADDRESS)(p))

#define InPortByte(p)    inb((SISIOADDRESS)(p))

#define InPortWord(p)    inw((SISIOADDRESS)(p))

#define InPortLong(p)    inl((SISIOADDRESS)(p))

#define SiS_SetMemory(MemoryAddress,MemorySize,value) memset_io(MemoryAddress, value, MemorySize)



#endif  /* _OSDEF_H_ */