Skip to content

L
linux
Commit bdec7773 authored by Isaac Assegai's avatar Isaac Assegai Committed by Greg Kroah-Hartman
Browse files
Options

Staging: sm750fb: sm750_hw.c: Insert spaces after commas. 

Insert Spaces after commas to rectify the
following checkpatch errors in sm750_hw.c:
ERROR: space required after that ','
Signed-off-by: default avatarIsaac Assegai <isaac.a.travers@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 555a6b1e
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 32 deletions
drivers/staging/sm750fb/sm750_hw.c
View file @ bdec7773
...@@ -30,7 +30,7 @@ int hw_sm750_map(struct lynx_share* share, struct pci_dev* pdev) ...@@ -30,7 +30,7 @@ int hw_sm750_map(struct lynx_share* share, struct pci_dev* pdev)
struct sm750_share * spec_share; struct sm750_share * spec_share;
spec_share = container_of(share, struct sm750_share,share); spec_share = container_of(share, struct sm750_share, share);
ret = 0; ret = 0;
share->vidreg_start = pci_resource_start(pdev, 1); share->vidreg_start = pci_resource_start(pdev, 1);
...@@ -64,7 +64,7 @@ int hw_sm750_map(struct lynx_share* share, struct pci_dev* pdev) ...@@ -64,7 +64,7 @@ int hw_sm750_map(struct lynx_share* share, struct pci_dev* pdev)
share->accel.dprBase = share->pvReg + DE_BASE_ADDR_TYPE1; share->accel.dprBase = share->pvReg + DE_BASE_ADDR_TYPE1;
share->accel.dpPortBase = share->pvReg + DE_PORT_ADDR_TYPE1; share->accel.dpPortBase = share->pvReg + DE_PORT_ADDR_TYPE1;
ddk750_set_mmio(share->pvReg,share->devid, share->revid); ddk750_set_mmio(share->pvReg, share->devid, share->revid);
share->vidmem_start = pci_resource_start(pdev, 0); share->vidmem_start = pci_resource_start(pdev, 0);
/* don't use pdev_resource[x].end - resource[x].start to /* don't use pdev_resource[x].end - resource[x].start to
...@@ -78,7 +78,7 @@ int hw_sm750_map(struct lynx_share* share, struct pci_dev* pdev) ...@@ -78,7 +78,7 @@ int hw_sm750_map(struct lynx_share* share, struct pci_dev* pdev)
/* reserve the vidmem space of smi adaptor */ /* reserve the vidmem space of smi adaptor */
#if 0 #if 0
if((ret = pci_request_region(pdev,0,_moduleName_))) if((ret = pci_request_region(pdev, 0, _moduleName_)))
{ {
pr_err("Can not request PCI regions.\n"); pr_err("Can not request PCI regions.\n");
goto exit; goto exit;
...@@ -105,7 +105,7 @@ int hw_sm750_inithw(struct lynx_share* share, struct pci_dev * pdev) ...@@ -105,7 +105,7 @@ int hw_sm750_inithw(struct lynx_share* share, struct pci_dev * pdev)
struct sm750_share * spec_share; struct sm750_share * spec_share;
struct init_status * parm; struct init_status * parm;
spec_share = container_of(share, struct sm750_share,share); spec_share = container_of(share, struct sm750_share, share);
parm = &spec_share->state.initParm; parm = &spec_share->state.initParm;
if(parm->chip_clk == 0) if(parm->chip_clk == 0)
parm->chip_clk = (getChipType() == SM750LE)? parm->chip_clk = (getChipType() == SM750LE)?
...@@ -171,7 +171,7 @@ int hw_sm750_inithw(struct lynx_share* share, struct pci_dev * pdev) ...@@ -171,7 +171,7 @@ int hw_sm750_inithw(struct lynx_share* share, struct pci_dev * pdev)
/* Set up GPIO for software I2C to program DVI chip in the /* Set up GPIO for software I2C to program DVI chip in the
Xilinx SP605 board, in order to have video signal. Xilinx SP605 board, in order to have video signal.
*/ */
swI2CInit(0,1); swI2CInit(0, 1);
/* Customer may NOT use CH7301 DVI chip, which has to be /* Customer may NOT use CH7301 DVI chip, which has to be
...@@ -269,7 +269,7 @@ int hw_sm750_crtc_checkMode(struct lynxfb_crtc* crtc, struct fb_var_screeninfo* ...@@ -269,7 +269,7 @@ int hw_sm750_crtc_checkMode(struct lynxfb_crtc* crtc, struct fb_var_screeninfo*
struct lynx_share * share; struct lynx_share * share;
share = container_of(crtc, struct lynxfb_par,crtc)->share; share = container_of(crtc, struct lynxfb_par, crtc)->share;
switch (var->bits_per_pixel){ switch (var->bits_per_pixel){
case 8: case 8:
...@@ -297,7 +297,7 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc* crtc, ...@@ -297,7 +297,7 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc* crtc,
struct fb_var_screeninfo* var, struct fb_var_screeninfo* var,
struct fb_fix_screeninfo* fix) struct fb_fix_screeninfo* fix)
{ {
int ret,fmt; int ret, fmt;
u32 reg; u32 reg;
mode_parameter_t modparm; mode_parameter_t modparm;
clock_type_t clock; clock_type_t clock;
...@@ -364,7 +364,7 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc* crtc, ...@@ -364,7 +364,7 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc* crtc,
reg = var->xres * (var->bits_per_pixel >> 3); reg = var->xres * (var->bits_per_pixel >> 3);
/* crtc->channel is not equal to par->index on numeric,be aware of that */ /* crtc->channel is not equal to par->index on numeric,be aware of that */
reg = PADDING(crtc->line_pad,reg); reg = PADDING(crtc->line_pad, reg);
POKE32(PANEL_FB_WIDTH, POKE32(PANEL_FB_WIDTH,
FIELD_VALUE(0, PANEL_FB_WIDTH, WIDTH, reg)| FIELD_VALUE(0, PANEL_FB_WIDTH, WIDTH, reg)|
...@@ -382,7 +382,7 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc* crtc, ...@@ -382,7 +382,7 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc* crtc,
POKE32(PANEL_PLANE_BR, POKE32(PANEL_PLANE_BR,
FIELD_VALUE(0, PANEL_PLANE_BR, BOTTOM, var->yres - 1)| FIELD_VALUE(0, PANEL_PLANE_BR, BOTTOM, var->yres - 1)|
FIELD_VALUE(0, PANEL_PLANE_BR,RIGHT, var->xres - 1)); FIELD_VALUE(0, PANEL_PLANE_BR, RIGHT, var->xres - 1));
/* set pixel format */ /* set pixel format */
reg = PEEK32(PANEL_DISPLAY_CTRL); reg = PEEK32(PANEL_DISPLAY_CTRL);
...@@ -423,17 +423,17 @@ void hw_sm750_crtc_clear(struct lynxfb_crtc* crtc) ...@@ -423,17 +423,17 @@ void hw_sm750_crtc_clear(struct lynxfb_crtc* crtc)
int hw_sm750_setColReg(struct lynxfb_crtc* crtc, ushort index, int hw_sm750_setColReg(struct lynxfb_crtc* crtc, ushort index,
ushort red, ushort green, ushort blue) ushort red, ushort green, ushort blue)
{ {
static unsigned int add[]={PANEL_PALETTE_RAM,CRT_PALETTE_RAM}; static unsigned int add[]={PANEL_PALETTE_RAM, CRT_PALETTE_RAM};
POKE32(add[crtc->channel] + index*4, (red<<16)|(green<<8)|blue); POKE32(add[crtc->channel] + index*4, (red<<16)|(green<<8)|blue);
return 0; return 0;
} }
int hw_sm750le_setBLANK(struct lynxfb_output * output, int blank){ int hw_sm750le_setBLANK(struct lynxfb_output * output, int blank){
int dpms,crtdb; int dpms, crtdb;
switch(blank) switch(blank)
{ {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
case FB_BLANK_UNBLANK: case FB_BLANK_UNBLANK:
#else #else
case VESA_NO_BLANKING: case VESA_NO_BLANKING:
...@@ -441,13 +441,13 @@ int hw_sm750le_setBLANK(struct lynxfb_output * output, int blank){ ...@@ -441,13 +441,13 @@ int hw_sm750le_setBLANK(struct lynxfb_output * output, int blank){
dpms = CRT_DISPLAY_CTRL_DPMS_0; dpms = CRT_DISPLAY_CTRL_DPMS_0;
crtdb = CRT_DISPLAY_CTRL_BLANK_OFF; crtdb = CRT_DISPLAY_CTRL_BLANK_OFF;
break; break;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
case FB_BLANK_NORMAL: case FB_BLANK_NORMAL:
dpms = CRT_DISPLAY_CTRL_DPMS_0; dpms = CRT_DISPLAY_CTRL_DPMS_0;
crtdb = CRT_DISPLAY_CTRL_BLANK_ON; crtdb = CRT_DISPLAY_CTRL_BLANK_ON;
break; break;
#endif #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
case FB_BLANK_VSYNC_SUSPEND: case FB_BLANK_VSYNC_SUSPEND:
#else #else
case VESA_VSYNC_SUSPEND: case VESA_VSYNC_SUSPEND:
...@@ -455,7 +455,7 @@ int hw_sm750le_setBLANK(struct lynxfb_output * output, int blank){ ...@@ -455,7 +455,7 @@ int hw_sm750le_setBLANK(struct lynxfb_output * output, int blank){
dpms = CRT_DISPLAY_CTRL_DPMS_2; dpms = CRT_DISPLAY_CTRL_DPMS_2;
crtdb = CRT_DISPLAY_CTRL_BLANK_ON; crtdb = CRT_DISPLAY_CTRL_BLANK_ON;
break; break;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
case FB_BLANK_HSYNC_SUSPEND: case FB_BLANK_HSYNC_SUSPEND:
#else #else
case VESA_HSYNC_SUSPEND: case VESA_HSYNC_SUSPEND:
...@@ -463,7 +463,7 @@ int hw_sm750le_setBLANK(struct lynxfb_output * output, int blank){ ...@@ -463,7 +463,7 @@ int hw_sm750le_setBLANK(struct lynxfb_output * output, int blank){
dpms = CRT_DISPLAY_CTRL_DPMS_1; dpms = CRT_DISPLAY_CTRL_DPMS_1;
crtdb = CRT_DISPLAY_CTRL_BLANK_ON; crtdb = CRT_DISPLAY_CTRL_BLANK_ON;
break; break;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
case FB_BLANK_POWERDOWN: case FB_BLANK_POWERDOWN:
#else #else
case VESA_POWERDOWN: case VESA_POWERDOWN:
...@@ -482,7 +482,7 @@ int hw_sm750le_setBLANK(struct lynxfb_output * output, int blank){ ...@@ -482,7 +482,7 @@ int hw_sm750le_setBLANK(struct lynxfb_output * output, int blank){
return 0; return 0;
} }
int hw_sm750_setBLANK(struct lynxfb_output* output,int blank) int hw_sm750_setBLANK(struct lynxfb_output* output, int blank)
{ {
unsigned int dpms, pps, crtdb; unsigned int dpms, pps, crtdb;
...@@ -490,7 +490,7 @@ int hw_sm750_setBLANK(struct lynxfb_output* output,int blank) ...@@ -490,7 +490,7 @@ int hw_sm750_setBLANK(struct lynxfb_output* output,int blank)
switch (blank) switch (blank)
{ {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
case FB_BLANK_UNBLANK: case FB_BLANK_UNBLANK:
#else #else
case VESA_NO_BLANKING: case VESA_NO_BLANKING:
...@@ -500,7 +500,7 @@ int hw_sm750_setBLANK(struct lynxfb_output* output,int blank) ...@@ -500,7 +500,7 @@ int hw_sm750_setBLANK(struct lynxfb_output* output,int blank)
pps = PANEL_DISPLAY_CTRL_DATA_ENABLE; pps = PANEL_DISPLAY_CTRL_DATA_ENABLE;
crtdb = CRT_DISPLAY_CTRL_BLANK_OFF; crtdb = CRT_DISPLAY_CTRL_BLANK_OFF;
break; break;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
case FB_BLANK_NORMAL: case FB_BLANK_NORMAL:
pr_info("flag = FB_BLANK_NORMAL \n"); pr_info("flag = FB_BLANK_NORMAL \n");
dpms = SYSTEM_CTRL_DPMS_VPHP; dpms = SYSTEM_CTRL_DPMS_VPHP;
...@@ -508,7 +508,7 @@ int hw_sm750_setBLANK(struct lynxfb_output* output,int blank) ...@@ -508,7 +508,7 @@ int hw_sm750_setBLANK(struct lynxfb_output* output,int blank)
crtdb = CRT_DISPLAY_CTRL_BLANK_ON; crtdb = CRT_DISPLAY_CTRL_BLANK_ON;
break; break;
#endif #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
case FB_BLANK_VSYNC_SUSPEND: case FB_BLANK_VSYNC_SUSPEND:
#else #else
case VESA_VSYNC_SUSPEND: case VESA_VSYNC_SUSPEND:
...@@ -517,7 +517,7 @@ int hw_sm750_setBLANK(struct lynxfb_output* output,int blank) ...@@ -517,7 +517,7 @@ int hw_sm750_setBLANK(struct lynxfb_output* output,int blank)
pps = PANEL_DISPLAY_CTRL_DATA_DISABLE; pps = PANEL_DISPLAY_CTRL_DATA_DISABLE;
crtdb = CRT_DISPLAY_CTRL_BLANK_ON; crtdb = CRT_DISPLAY_CTRL_BLANK_ON;
break; break;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
case FB_BLANK_HSYNC_SUSPEND: case FB_BLANK_HSYNC_SUSPEND:
#else #else
case VESA_HSYNC_SUSPEND: case VESA_HSYNC_SUSPEND:
...@@ -526,7 +526,7 @@ int hw_sm750_setBLANK(struct lynxfb_output* output,int blank) ...@@ -526,7 +526,7 @@ int hw_sm750_setBLANK(struct lynxfb_output* output,int blank)
pps = PANEL_DISPLAY_CTRL_DATA_DISABLE; pps = PANEL_DISPLAY_CTRL_DATA_DISABLE;
crtdb = CRT_DISPLAY_CTRL_BLANK_ON; crtdb = CRT_DISPLAY_CTRL_BLANK_ON;
break; break;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
case FB_BLANK_POWERDOWN: case FB_BLANK_POWERDOWN:
#else #else
case VESA_POWERDOWN: case VESA_POWERDOWN:
...@@ -539,8 +539,8 @@ int hw_sm750_setBLANK(struct lynxfb_output* output,int blank) ...@@ -539,8 +539,8 @@ int hw_sm750_setBLANK(struct lynxfb_output* output,int blank)
if(output->paths & sm750_crt){ if(output->paths & sm750_crt){
POKE32(SYSTEM_CTRL,FIELD_VALUE(PEEK32(SYSTEM_CTRL), SYSTEM_CTRL, DPMS, dpms)); POKE32(SYSTEM_CTRL, FIELD_VALUE(PEEK32(SYSTEM_CTRL), SYSTEM_CTRL, DPMS, dpms));
POKE32(CRT_DISPLAY_CTRL,FIELD_VALUE(PEEK32(CRT_DISPLAY_CTRL), CRT_DISPLAY_CTRL,BLANK, crtdb)); POKE32(CRT_DISPLAY_CTRL, FIELD_VALUE(PEEK32(CRT_DISPLAY_CTRL), CRT_DISPLAY_CTRL, BLANK, crtdb));
} }
if(output->paths & sm750_panel){ if(output->paths & sm750_panel){
...@@ -558,21 +558,21 @@ void hw_sm750_initAccel(struct lynx_share * share) ...@@ -558,21 +558,21 @@ void hw_sm750_initAccel(struct lynx_share * share)
if(getChipType() == SM750LE){ if(getChipType() == SM750LE){
reg = PEEK32(DE_STATE1); reg = PEEK32(DE_STATE1);
reg = FIELD_SET(reg, DE_STATE1, DE_ABORT,ON); reg = FIELD_SET(reg, DE_STATE1, DE_ABORT, ON);
POKE32(DE_STATE1,reg); POKE32(DE_STATE1, reg);
reg = PEEK32(DE_STATE1); reg = PEEK32(DE_STATE1);
reg = FIELD_SET(reg, DE_STATE1, DE_ABORT,OFF); reg = FIELD_SET(reg, DE_STATE1, DE_ABORT, OFF);
POKE32(DE_STATE1, reg); POKE32(DE_STATE1, reg);
}else{ }else{
/* engine reset */ /* engine reset */
reg = PEEK32(SYSTEM_CTRL); reg = PEEK32(SYSTEM_CTRL);
reg = FIELD_SET(reg, SYSTEM_CTRL, DE_ABORT,ON); reg = FIELD_SET(reg, SYSTEM_CTRL, DE_ABORT, ON);
POKE32(SYSTEM_CTRL, reg); POKE32(SYSTEM_CTRL, reg);
reg = PEEK32(SYSTEM_CTRL); reg = PEEK32(SYSTEM_CTRL);
reg = FIELD_SET(reg, SYSTEM_CTRL, DE_ABORT,OFF); reg = FIELD_SET(reg, SYSTEM_CTRL, DE_ABORT, OFF);
POKE32(SYSTEM_CTRL, reg); POKE32(SYSTEM_CTRL, reg);
} }
...@@ -602,9 +602,9 @@ int hw_sm750_deWait(void) ...@@ -602,9 +602,9 @@ int hw_sm750_deWait(void)
int i=0x10000000; int i=0x10000000;
while(i--){ while(i--){
unsigned int dwVal = PEEK32(SYSTEM_CTRL); unsigned int dwVal = PEEK32(SYSTEM_CTRL);
if((FIELD_GET(dwVal,SYSTEM_CTRL,DE_STATUS) == SYSTEM_CTRL_DE_STATUS_IDLE) && if((FIELD_GET(dwVal, SYSTEM_CTRL, DE_STATUS) == SYSTEM_CTRL_DE_STATUS_IDLE) &&
(FIELD_GET(dwVal,SYSTEM_CTRL,DE_FIFO) == SYSTEM_CTRL_DE_FIFO_EMPTY) && (FIELD_GET(dwVal, SYSTEM_CTRL, DE_FIFO) == SYSTEM_CTRL_DE_FIFO_EMPTY) &&
(FIELD_GET(dwVal,SYSTEM_CTRL,DE_MEM_FIFO) == SYSTEM_CTRL_DE_MEM_FIFO_EMPTY)) (FIELD_GET(dwVal, SYSTEM_CTRL, DE_MEM_FIFO) == SYSTEM_CTRL_DE_MEM_FIFO_EMPTY))
{ {
return 0; return 0;
} }
......
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