Skip to content

L
linux
Commit 602f2c96 authored by Prashant P. Shah's avatar Prashant P. Shah Committed by Greg Kroah-Hartman
Browse files
Options

Staging: xgifb: fixed many style issues in vb_util.c 

This is a patch to the vb_util.c file that fixes many style
issues found by the checkpatch.pl tool.
- extra spaces
- invalid code indent
- extra braces
- invalid comment style
Signed-off-by: default avatarPrashant P. Shah <pshah.mumbai@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a24d60f4
Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 127 deletions
drivers/staging/xgifb/vb_util.c
View file @ 602f2c96
...@@ -6,200 +6,131 @@ ...@@ -6,200 +6,131 @@
#include <asm/io.h> #include <asm/io.h>
#include <linux/types.h> #include <linux/types.h>
void XGINew_SetReg1(unsigned long,unsigned short,unsigned short); void XGINew_SetReg1(unsigned long, unsigned short, unsigned short);
void XGINew_SetReg2(unsigned long,unsigned short,unsigned short); void XGINew_SetReg2(unsigned long, unsigned short, unsigned short);
void XGINew_SetReg3(unsigned long,unsigned short); void XGINew_SetReg3(unsigned long, unsigned short);
void XGINew_SetReg4(unsigned long,unsigned long); void XGINew_SetReg4(unsigned long, unsigned long);
unsigned char XGINew_GetReg1(unsigned long, unsigned short); unsigned char XGINew_GetReg1(unsigned long, unsigned short);
unsigned char XGINew_GetReg2(unsigned long); unsigned char XGINew_GetReg2(unsigned long);
unsigned long XGINew_GetReg3(unsigned long); unsigned long XGINew_GetReg3(unsigned long);
void XGINew_ClearDAC(unsigned char *); void XGINew_ClearDAC(unsigned char *);
void XGINew_SetRegANDOR(unsigned long Port,unsigned short Index, void XGINew_SetRegANDOR(unsigned long Port, unsigned short Index,
unsigned short DataAND,unsigned short DataOR); unsigned short DataAND, unsigned short DataOR);
void XGINew_SetRegOR(unsigned long Port,unsigned short Index, void XGINew_SetRegOR(unsigned long Port, unsigned short Index,
unsigned short DataOR); unsigned short DataOR);
void XGINew_SetRegAND(unsigned long Port,unsigned short Index, void XGINew_SetRegAND(unsigned long Port, unsigned short Index,
unsigned short DataAND); unsigned short DataAND);
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
/* Function : XGINew_SetReg1 */ /* Function : XGINew_SetReg1 */
/* Input : */ /* Input : */
/* Output : */ /* Output : */
/* Description : SR CRTC GR */ /* Description : SR CRTC GR */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
void XGINew_SetReg1( unsigned long port , unsigned short index , unsigned short data ) void XGINew_SetReg1(unsigned long port, unsigned short index,
unsigned short data)
{ {
outb(index, port); outb(index, port);
outb(data, port + 1); outb(data, port + 1);
} }
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
/* Function : XGINew_SetReg2 */ /* Function : XGINew_SetReg2 */
/* Input : */ /* Input : */
/* Output : */ /* Output : */
/* Description : AR( 3C0 ) */ /* Description : AR( 3C0 ) */
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
/*void XGINew_SetReg2( unsigned long port , unsigned short index , unsigned short data ) /*
void XGINew_SetReg2(unsigned long port, unsigned short index, unsigned short data)
{ {
InPortByte((P unsigned char )port + 0x3da - 0x3c0) ; InPortByte((P unsigned char)port + 0x3da - 0x3c0) ;
OutPortByte( XGINew_P3c0 , index ) ; OutPortByte(XGINew_P3c0, index);
OutPortByte( XGINew_P3c0 , data ) ; OutPortByte(XGINew_P3c0, data);
OutPortByte( XGINew_P3c0 , 0x20 ) ; OutPortByte(XGINew_P3c0, 0x20);
}*/ }
*/
/* --------------------------------------------------------------------- */ void XGINew_SetReg3(unsigned long port, unsigned short data)
/* Function : */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
void XGINew_SetReg3( unsigned long port , unsigned short data )
{ {
outb(data, port); outb(data, port);
} }
void XGINew_SetReg4(unsigned long port, unsigned long data)
/* --------------------------------------------------------------------- */
/* Function : XGINew_SetReg4 */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
void XGINew_SetReg4( unsigned long port , unsigned long data )
{ {
outl(data, port); outl(data, port);
} }
/* --------------------------------------------------------------------- */
/* Function : XGINew_GetReg1 */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
unsigned char XGINew_GetReg1(unsigned long port, unsigned short index) unsigned char XGINew_GetReg1(unsigned long port, unsigned short index)
{ {
unsigned char data ; unsigned char data;
outb(index, port); outb(index, port);
data = inb(port + 1) ; data = inb(port + 1);
return( data ) ; return data;
} }
/* --------------------------------------------------------------------- */
/* Function : XGINew_GetReg2 */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
unsigned char XGINew_GetReg2(unsigned long port) unsigned char XGINew_GetReg2(unsigned long port)
{ {
unsigned char data ; unsigned char data;
data = inb(port) ; data = inb(port);
return( data ) ; return data;
} }
unsigned long XGINew_GetReg3(unsigned long port)
/* --------------------------------------------------------------------- */
/* Function : XGINew_GetReg3 */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
unsigned long XGINew_GetReg3( unsigned long port )
{ {
unsigned long data ; unsigned long data;
data = inl(port) ; data = inl(port);
return( data ) ; return data;
} }
void XGINew_SetRegANDOR(unsigned long Port, unsigned short Index,
unsigned short DataAND, unsigned short DataOR)
/* --------------------------------------------------------------------- */
/* Function : XGINew_SetRegANDOR */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
void XGINew_SetRegANDOR( unsigned long Port , unsigned short Index , unsigned short DataAND , unsigned short DataOR )
{ {
unsigned short temp ; unsigned short temp;
temp = XGINew_GetReg1( Port , Index ) ; /* XGINew_Part1Port index 02 */ temp = XGINew_GetReg1(Port, Index); /* XGINew_Part1Port index 02 */
temp = ( temp & ( DataAND ) ) | DataOR ; temp = (temp & (DataAND)) | DataOR;
XGINew_SetReg1( Port , Index , temp ) ; XGINew_SetReg1(Port, Index, temp);
} }
void XGINew_SetRegAND(unsigned long Port, unsigned short Index,
/* --------------------------------------------------------------------- */ unsigned short DataAND)
/* Function : XGINew_SetRegAND */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
void XGINew_SetRegAND(unsigned long Port,unsigned short Index,unsigned short DataAND)
{ {
unsigned short temp ; unsigned short temp;
temp = XGINew_GetReg1( Port , Index ) ; /* XGINew_Part1Port index 02 */ temp = XGINew_GetReg1(Port, Index); /* XGINew_Part1Port index 02 */
temp &= DataAND ; temp &= DataAND;
XGINew_SetReg1( Port , Index , temp ) ; XGINew_SetReg1(Port, Index, temp);
} }
void XGINew_SetRegOR(unsigned long Port, unsigned short Index,
/* --------------------------------------------------------------------- */ unsigned short DataOR)
/* Function : XGINew_SetRegOR */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
void XGINew_SetRegOR( unsigned long Port , unsigned short Index , unsigned short DataOR )
{ {
unsigned short temp ; unsigned short temp;
temp = XGINew_GetReg1( Port , Index ) ; /* XGINew_Part1Port index 02 */ temp = XGINew_GetReg1(Port, Index); /* XGINew_Part1Port index 02 */
temp |= DataOR ; temp |= DataOR;
XGINew_SetReg1( Port , Index , temp ) ; XGINew_SetReg1(Port, Index, temp);
} }
#if 0 #if 0
/* --------------------------------------------------------------------- */ void NewDelaySeconds(int seconds)
/* Function : NewDelaySecond */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
void NewDelaySeconds( int seconds )
{ {
int i ; int i;
for( i = 0 ; i < seconds ; i++ )
{
for (i = 0; i < seconds; i++) {
} }
} }
/* --------------------------------------------------------------------- */
/* Function : Newdebugcode */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
void Newdebugcode(unsigned char code) void Newdebugcode(unsigned char code)
{ {
// OutPortByte ( 0x80 , code ) ; /* OutPortByte(0x80, code); */
/* OutPortByte ( 0x300 , code ) ; */ /* OutPortByte(0x300, code); */
/* NewDelaySeconds( 0x3 ) ; */ /* NewDelaySeconds(0x3); */
} }
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7