Skip to content

Commit d2a6037

Browse files
aby0gregkh
authored andcommitted
Staging: sm750fb: Add space after ','
This patch adds space after ',' for the better readability of code. This issue is detected by checkpatch.pl Signed-off-by: Somya Anand <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent b30edfc commit d2a6037

File tree

1 file changed

+65
-65
lines changed

1 file changed

+65
-65
lines changed

drivers/staging/sm750fb/sm750_hw.c

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@
2424
#include "ddk750.h"
2525
#include "sm750_accel.h"
2626

27-
int hw_sm750_map(struct lynx_share* share,struct pci_dev* pdev)
27+
int hw_sm750_map(struct lynx_share* share, struct pci_dev* pdev)
2828
{
2929
int ret;
3030
struct sm750_share * spec_share;
3131

3232

33-
spec_share = container_of(share,struct sm750_share,share);
33+
spec_share = container_of(share, struct sm750_share,share);
3434
ret = 0;
3535

36-
share->vidreg_start = pci_resource_start(pdev,1);
36+
share->vidreg_start = pci_resource_start(pdev, 1);
3737
share->vidreg_size = MB(2);
3838

3939
pr_info("mmio phyAddr = %lx\n", share->vidreg_start);
@@ -44,37 +44,37 @@ int hw_sm750_map(struct lynx_share* share,struct pci_dev* pdev)
4444
* successfully
4545
* */
4646

47-
if((ret = pci_request_region(pdev,1,"sm750fb")))
47+
if((ret = pci_request_region(pdev, 1, "sm750fb")))
4848
{
4949
pr_err("Can not request PCI regions.\n");
5050
goto exit;
5151
}
5252

5353
/* now map mmio and vidmem*/
54-
share->pvReg = ioremap_nocache(share->vidreg_start,share->vidreg_size);
54+
share->pvReg = ioremap_nocache(share->vidreg_start, share->vidreg_size);
5555
if(!share->pvReg){
5656
pr_err("mmio failed\n");
5757
ret = -EFAULT;
5858
goto exit;
5959
}else{
60-
pr_info("mmio virtual addr = %p\n",share->pvReg);
60+
pr_info("mmio virtual addr = %p\n", share->pvReg);
6161
}
6262

6363

6464
share->accel.dprBase = share->pvReg + DE_BASE_ADDR_TYPE1;
6565
share->accel.dpPortBase = share->pvReg + DE_PORT_ADDR_TYPE1;
6666

67-
ddk750_set_mmio(share->pvReg,share->devid,share->revid);
67+
ddk750_set_mmio(share->pvReg,share->devid, share->revid);
6868

69-
share->vidmem_start = pci_resource_start(pdev,0);
69+
share->vidmem_start = pci_resource_start(pdev, 0);
7070
/* don't use pdev_resource[x].end - resource[x].start to
7171
* calculate the resource size,its only the maximum available
7272
* size but not the actual size,use
7373
* @hw_sm750_getVMSize function can be safe.
7474
* */
7575
share->vidmem_size = hw_sm750_getVMSize(share);
7676
pr_info("video memory phyAddr = %lx, size = %u bytes\n",
77-
share->vidmem_start,share->vidmem_size);
77+
share->vidmem_start, share->vidmem_size);
7878

7979
/* reserve the vidmem space of smi adaptor */
8080
#if 0
@@ -93,20 +93,20 @@ int hw_sm750_map(struct lynx_share* share,struct pci_dev* pdev)
9393
ret = -EFAULT;
9494
goto exit;
9595
}else{
96-
pr_info("video memory vaddr = %p\n",share->pvMem);
96+
pr_info("video memory vaddr = %p\n", share->pvMem);
9797
}
9898
exit:
9999
return ret;
100100
}
101101

102102

103103

104-
int hw_sm750_inithw(struct lynx_share* share,struct pci_dev * pdev)
104+
int hw_sm750_inithw(struct lynx_share* share, struct pci_dev * pdev)
105105
{
106106
struct sm750_share * spec_share;
107107
struct init_status * parm;
108108

109-
spec_share = container_of(share,struct sm750_share,share);
109+
spec_share = container_of(share, struct sm750_share,share);
110110
parm = &spec_share->state.initParm;
111111
if(parm->chip_clk == 0)
112112
parm->chip_clk = (getChipType() == SM750LE)?
@@ -122,7 +122,7 @@ int hw_sm750_inithw(struct lynx_share* share,struct pci_dev * pdev)
122122
/* for sm718,open pci burst */
123123
if(share->devid == 0x718){
124124
POKE32(SYSTEM_CTRL,
125-
FIELD_SET(PEEK32(SYSTEM_CTRL),SYSTEM_CTRL,PCI_BURST,ON));
125+
FIELD_SET(PEEK32(SYSTEM_CTRL), SYSTEM_CTRL, PCI_BURST, ON));
126126
}
127127

128128
/* sm750 use sii164, it can be setup with default value
@@ -138,22 +138,22 @@ int hw_sm750_inithw(struct lynx_share* share,struct pci_dev * pdev)
138138
POKE32(MISC_CTRL,
139139
FIELD_SET(PEEK32(MISC_CTRL),
140140
MISC_CTRL,
141-
DAC_POWER,OFF));
141+
DAC_POWER, OFF));
142142
/* shut off dpms */
143143
POKE32(SYSTEM_CTRL,
144144
FIELD_SET(PEEK32(SYSTEM_CTRL),
145145
SYSTEM_CTRL,
146-
DPMS,VNHN));
146+
DPMS, VNHN));
147147
}else{
148148
POKE32(MISC_CTRL,
149149
FIELD_SET(PEEK32(MISC_CTRL),
150150
MISC_CTRL,
151-
DAC_POWER,ON));
151+
DAC_POWER, ON));
152152
/* turn on dpms */
153153
POKE32(SYSTEM_CTRL,
154154
FIELD_SET(PEEK32(SYSTEM_CTRL),
155155
SYSTEM_CTRL,
156-
DPMS,VPHP));
156+
DPMS, VPHP));
157157
}
158158

159159
switch (spec_share->state.pnltype){
@@ -211,15 +211,15 @@ resource_size_t hw_sm750_getVMSize(struct lynx_share * share)
211211

212212

213213

214-
int hw_sm750_output_checkMode(struct lynxfb_output* output,struct fb_var_screeninfo* var)
214+
int hw_sm750_output_checkMode(struct lynxfb_output* output, struct fb_var_screeninfo* var)
215215
{
216216

217217
return 0;
218218
}
219219

220220

221221
int hw_sm750_output_setMode(struct lynxfb_output* output,
222-
struct fb_var_screeninfo* var,struct fb_fix_screeninfo* fix)
222+
struct fb_var_screeninfo* var, struct fb_fix_screeninfo* fix)
223223
{
224224
int ret;
225225
disp_output_t dispSet;
@@ -252,7 +252,7 @@ int hw_sm750_output_setMode(struct lynxfb_output* output,
252252
u32 reg;
253253
reg = PEEK32(DISPLAY_CONTROL_750LE);
254254
reg |= 0xf;
255-
POKE32(DISPLAY_CONTROL_750LE,reg);
255+
POKE32(DISPLAY_CONTROL_750LE, reg);
256256
}
257257

258258
pr_info("ddk setlogicdispout done \n");
@@ -265,12 +265,12 @@ void hw_sm750_output_clear(struct lynxfb_output* output)
265265
return;
266266
}
267267

268-
int hw_sm750_crtc_checkMode(struct lynxfb_crtc* crtc,struct fb_var_screeninfo* var)
268+
int hw_sm750_crtc_checkMode(struct lynxfb_crtc* crtc, struct fb_var_screeninfo* var)
269269
{
270270
struct lynx_share * share;
271271

272272

273-
share = container_of(crtc,struct lynxfb_par,crtc)->share;
273+
share = container_of(crtc, struct lynxfb_par,crtc)->share;
274274

275275
switch (var->bits_per_pixel){
276276
case 8:
@@ -307,7 +307,7 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc* crtc,
307307

308308

309309
ret = 0;
310-
par = container_of(crtc,struct lynxfb_par,crtc);
310+
par = container_of(crtc, struct lynxfb_par, crtc);
311311
share = par->share;
312312
#if 1
313313
if(!share->accel_off){
@@ -324,7 +324,7 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc* crtc,
324324
fmt = 2;
325325
break;
326326
}
327-
hw_set2dformat(&share->accel,fmt);
327+
hw_set2dformat(&share->accel, fmt);
328328
}
329329
#endif
330330

@@ -349,8 +349,8 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc* crtc,
349349
else
350350
clock = SECONDARY_PLL;
351351

352-
pr_debug("Request pixel clock = %lu\n",modparm.pixel_clock);
353-
ret = ddk750_setModeTiming(&modparm,clock);
352+
pr_debug("Request pixel clock = %lu\n", modparm.pixel_clock);
353+
ret = ddk750_setModeTiming(&modparm, clock);
354354
if(ret){
355355
pr_err("Set mode timing failed\n");
356356
goto exit;
@@ -359,54 +359,54 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc* crtc,
359359
if(crtc->channel != sm750_secondary){
360360
/* set pitch, offset ,width,start address ,etc... */
361361
POKE32(PANEL_FB_ADDRESS,
362-
FIELD_SET(0,PANEL_FB_ADDRESS,STATUS,CURRENT)|
363-
FIELD_SET(0,PANEL_FB_ADDRESS,EXT,LOCAL)|
364-
FIELD_VALUE(0,PANEL_FB_ADDRESS,ADDRESS,crtc->oScreen));
362+
FIELD_SET(0, PANEL_FB_ADDRESS, STATUS, CURRENT)|
363+
FIELD_SET(0, PANEL_FB_ADDRESS, EXT, LOCAL)|
364+
FIELD_VALUE(0, PANEL_FB_ADDRESS, ADDRESS, crtc->oScreen));
365365

366366
reg = var->xres * (var->bits_per_pixel >> 3);
367367
/* crtc->channel is not equal to par->index on numeric,be aware of that */
368368
reg = PADDING(crtc->line_pad,reg);
369369

370370
POKE32(PANEL_FB_WIDTH,
371-
FIELD_VALUE(0,PANEL_FB_WIDTH,WIDTH,reg)|
372-
FIELD_VALUE(0,PANEL_FB_WIDTH,OFFSET,fix->line_length));
371+
FIELD_VALUE(0, PANEL_FB_WIDTH, WIDTH, reg)|
372+
FIELD_VALUE(0, PANEL_FB_WIDTH, OFFSET, fix->line_length));
373373

374374
POKE32(PANEL_WINDOW_WIDTH,
375-
FIELD_VALUE(0,PANEL_WINDOW_WIDTH,WIDTH,var->xres -1)|
376-
FIELD_VALUE(0,PANEL_WINDOW_WIDTH,X,var->xoffset));
375+
FIELD_VALUE(0, PANEL_WINDOW_WIDTH, WIDTH, var->xres -1)|
376+
FIELD_VALUE(0, PANEL_WINDOW_WIDTH, X, var->xoffset));
377377

378378
POKE32(PANEL_WINDOW_HEIGHT,
379-
FIELD_VALUE(0,PANEL_WINDOW_HEIGHT,HEIGHT,var->yres_virtual - 1)|
380-
FIELD_VALUE(0,PANEL_WINDOW_HEIGHT,Y,var->yoffset));
379+
FIELD_VALUE(0, PANEL_WINDOW_HEIGHT, HEIGHT, var->yres_virtual - 1)|
380+
FIELD_VALUE(0, PANEL_WINDOW_HEIGHT, Y, var->yoffset));
381381

382-
POKE32(PANEL_PLANE_TL,0);
382+
POKE32(PANEL_PLANE_TL, 0);
383383

384384
POKE32(PANEL_PLANE_BR,
385-
FIELD_VALUE(0,PANEL_PLANE_BR,BOTTOM,var->yres - 1)|
386-
FIELD_VALUE(0,PANEL_PLANE_BR,RIGHT,var->xres - 1));
385+
FIELD_VALUE(0, PANEL_PLANE_BR, BOTTOM, var->yres - 1)|
386+
FIELD_VALUE(0, PANEL_PLANE_BR,RIGHT, var->xres - 1));
387387

388388
/* set pixel format */
389389
reg = PEEK32(PANEL_DISPLAY_CTRL);
390390
POKE32(PANEL_DISPLAY_CTRL,
391391
FIELD_VALUE(reg,
392-
PANEL_DISPLAY_CTRL,FORMAT,
392+
PANEL_DISPLAY_CTRL, FORMAT,
393393
(var->bits_per_pixel >> 4)
394394
));
395395
}else{
396396
/* not implemented now */
397-
POKE32(CRT_FB_ADDRESS,crtc->oScreen);
397+
POKE32(CRT_FB_ADDRESS, crtc->oScreen);
398398
reg = var->xres * (var->bits_per_pixel >> 3);
399399
/* crtc->channel is not equal to par->index on numeric,be aware of that */
400-
reg = PADDING(crtc->line_pad,reg);
400+
reg = PADDING(crtc->line_pad, reg);
401401

402402
POKE32(CRT_FB_WIDTH,
403-
FIELD_VALUE(0,CRT_FB_WIDTH,WIDTH,reg)|
404-
FIELD_VALUE(0,CRT_FB_WIDTH,OFFSET,fix->line_length));
403+
FIELD_VALUE(0, CRT_FB_WIDTH, WIDTH, reg)|
404+
FIELD_VALUE(0, CRT_FB_WIDTH, OFFSET, fix->line_length));
405405

406406
/* SET PIXEL FORMAT */
407407
reg = PEEK32(CRT_DISPLAY_CTRL);
408-
reg = FIELD_VALUE(reg,CRT_DISPLAY_CTRL,FORMAT,var->bits_per_pixel >> 4);
409-
POKE32(CRT_DISPLAY_CTRL,reg);
408+
reg = FIELD_VALUE(reg, CRT_DISPLAY_CTRL, FORMAT, var->bits_per_pixel >> 4);
409+
POKE32(CRT_DISPLAY_CTRL, reg);
410410

411411
}
412412

@@ -421,15 +421,15 @@ void hw_sm750_crtc_clear(struct lynxfb_crtc* crtc)
421421
return;
422422
}
423423

424-
int hw_sm750_setColReg(struct lynxfb_crtc* crtc,ushort index,
425-
ushort red,ushort green,ushort blue)
424+
int hw_sm750_setColReg(struct lynxfb_crtc* crtc, ushort index,
425+
ushort red, ushort green, ushort blue)
426426
{
427427
static unsigned int add[]={PANEL_PALETTE_RAM,CRT_PALETTE_RAM};
428-
POKE32(add[crtc->channel] + index*4 ,(red<<16)|(green<<8)|blue);
428+
POKE32(add[crtc->channel] + index*4, (red<<16)|(green<<8)|blue);
429429
return 0;
430430
}
431431

432-
int hw_sm750le_setBLANK(struct lynxfb_output * output,int blank){
432+
int hw_sm750le_setBLANK(struct lynxfb_output * output, int blank){
433433
int dpms,crtdb;
434434

435435
switch(blank)
@@ -477,15 +477,15 @@ int hw_sm750le_setBLANK(struct lynxfb_output * output,int blank){
477477
}
478478

479479
if(output->paths & sm750_crt){
480-
POKE32(CRT_DISPLAY_CTRL,FIELD_VALUE(PEEK32(CRT_DISPLAY_CTRL),CRT_DISPLAY_CTRL,DPMS,dpms));
481-
POKE32(CRT_DISPLAY_CTRL,FIELD_VALUE(PEEK32(CRT_DISPLAY_CTRL),CRT_DISPLAY_CTRL,BLANK,crtdb));
480+
POKE32(CRT_DISPLAY_CTRL, FIELD_VALUE(PEEK32(CRT_DISPLAY_CTRL), CRT_DISPLAY_CTRL, DPMS, dpms));
481+
POKE32(CRT_DISPLAY_CTRL, FIELD_VALUE(PEEK32(CRT_DISPLAY_CTRL), CRT_DISPLAY_CTRL, BLANK, crtdb));
482482
}
483483
return 0;
484484
}
485485

486486
int hw_sm750_setBLANK(struct lynxfb_output* output,int blank)
487487
{
488-
unsigned int dpms,pps,crtdb;
488+
unsigned int dpms, pps, crtdb;
489489

490490
dpms = pps = crtdb = 0;
491491

@@ -540,12 +540,12 @@ int hw_sm750_setBLANK(struct lynxfb_output* output,int blank)
540540

541541
if(output->paths & sm750_crt){
542542

543-
POKE32(SYSTEM_CTRL,FIELD_VALUE(PEEK32(SYSTEM_CTRL),SYSTEM_CTRL,DPMS,dpms));
544-
POKE32(CRT_DISPLAY_CTRL,FIELD_VALUE(PEEK32(CRT_DISPLAY_CTRL),CRT_DISPLAY_CTRL,BLANK,crtdb));
543+
POKE32(SYSTEM_CTRL,FIELD_VALUE(PEEK32(SYSTEM_CTRL), SYSTEM_CTRL, DPMS, dpms));
544+
POKE32(CRT_DISPLAY_CTRL,FIELD_VALUE(PEEK32(CRT_DISPLAY_CTRL), CRT_DISPLAY_CTRL,BLANK, crtdb));
545545
}
546546

547547
if(output->paths & sm750_panel){
548-
POKE32(PANEL_DISPLAY_CTRL,FIELD_VALUE(PEEK32(PANEL_DISPLAY_CTRL),PANEL_DISPLAY_CTRL,DATA,pps));
548+
POKE32(PANEL_DISPLAY_CTRL, FIELD_VALUE(PEEK32(PANEL_DISPLAY_CTRL), PANEL_DISPLAY_CTRL, DATA, pps));
549549
}
550550

551551
return 0;
@@ -559,22 +559,22 @@ void hw_sm750_initAccel(struct lynx_share * share)
559559

560560
if(getChipType() == SM750LE){
561561
reg = PEEK32(DE_STATE1);
562-
reg = FIELD_SET(reg,DE_STATE1,DE_ABORT,ON);
562+
reg = FIELD_SET(reg, DE_STATE1, DE_ABORT,ON);
563563
POKE32(DE_STATE1,reg);
564564

565565
reg = PEEK32(DE_STATE1);
566-
reg = FIELD_SET(reg,DE_STATE1,DE_ABORT,OFF);
567-
POKE32(DE_STATE1,reg);
566+
reg = FIELD_SET(reg, DE_STATE1, DE_ABORT,OFF);
567+
POKE32(DE_STATE1, reg);
568568

569569
}else{
570570
/* engine reset */
571571
reg = PEEK32(SYSTEM_CTRL);
572-
reg = FIELD_SET(reg,SYSTEM_CTRL,DE_ABORT,ON);
573-
POKE32(SYSTEM_CTRL,reg);
572+
reg = FIELD_SET(reg, SYSTEM_CTRL, DE_ABORT,ON);
573+
POKE32(SYSTEM_CTRL, reg);
574574

575575
reg = PEEK32(SYSTEM_CTRL);
576-
reg = FIELD_SET(reg,SYSTEM_CTRL,DE_ABORT,OFF);
577-
POKE32(SYSTEM_CTRL,reg);
576+
reg = FIELD_SET(reg, SYSTEM_CTRL, DE_ABORT,OFF);
577+
POKE32(SYSTEM_CTRL, reg);
578578
}
579579

580580
/* call 2d init */
@@ -586,9 +586,9 @@ int hw_sm750le_deWait(void)
586586
int i=0x10000000;
587587
while(i--){
588588
unsigned int dwVal = PEEK32(DE_STATE2);
589-
if((FIELD_GET(dwVal,DE_STATE2,DE_STATUS) == DE_STATE2_DE_STATUS_IDLE) &&
590-
(FIELD_GET(dwVal,DE_STATE2,DE_FIFO) == DE_STATE2_DE_FIFO_EMPTY) &&
591-
(FIELD_GET(dwVal,DE_STATE2,DE_MEM_FIFO) == DE_STATE2_DE_MEM_FIFO_EMPTY))
589+
if((FIELD_GET(dwVal, DE_STATE2, DE_STATUS) == DE_STATE2_DE_STATUS_IDLE) &&
590+
(FIELD_GET(dwVal, DE_STATE2, DE_FIFO) == DE_STATE2_DE_FIFO_EMPTY) &&
591+
(FIELD_GET(dwVal, DE_STATE2, DE_MEM_FIFO) == DE_STATE2_DE_MEM_FIFO_EMPTY))
592592
{
593593
return 0;
594594
}

0 commit comments

Comments
 (0)