p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

staging: sm750: move '{' to previous line 

Fix checkpatch.pl error:
"ERROR: that open brace { should be on the previous line"

Signed-off-by: Michel von Czettritz <michel.von.czettritz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Michel von Czettritz 2015-03-26 23:25:08 +01:00 committed by Greg Kroah-Hartman
parent 45e3b3da82
commit 70407df776
1 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/staging/sm750fb/sm750.c
View File

@ -154,8 +154,7 @@ static int lynxfb_ops_cursor(struct fb_info* info, struct fb_cursor* fbcursor)
} }
if(fbcursor->set & (FB_CUR_SETSHAPE | FB_CUR_SETIMAGE)) if(fbcursor->set & (FB_CUR_SETSHAPE | FB_CUR_SETIMAGE)) {
{
cursor->setData(cursor, cursor->setData(cursor,
fbcursor->rop, fbcursor->rop,
fbcursor->image.data, fbcursor->image.data,
@ -255,13 +254,10 @@ static void lynxfb_ops_imageblit(struct fb_info*info, const struct fb_image* ima
if(image->depth == 1){ if(image->depth == 1){
if(info->fix.visual == FB_VISUAL_TRUECOLOR || if(info->fix.visual == FB_VISUAL_TRUECOLOR ||
info->fix.visual == FB_VISUAL_DIRECTCOLOR) info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
{
fgcol = ((u32*)info->pseudo_palette)[image->fg_color]; fgcol = ((u32*)info->pseudo_palette)[image->fg_color];
bgcol = ((u32*)info->pseudo_palette)[image->bg_color]; bgcol = ((u32*)info->pseudo_palette)[image->bg_color];
} } else {
else
{
fgcol = image->fg_color; fgcol = image->fg_color;
bgcol = image->bg_color; bgcol = image->bg_color;
} }
@ -630,8 +626,7 @@ static int lynxfb_ops_setcolreg(unsigned regno, unsigned red,
if(info->var.grayscale) if(info->var.grayscale)
red = green = blue = (red * 77 + green * 151 + blue * 28) >> 8; red = green = blue = (red * 77 + green * 151 + blue * 28) >> 8;
if(var->bits_per_pixel == 8 && info->fix.visual == FB_VISUAL_PSEUDOCOLOR) if(var->bits_per_pixel == 8 && info->fix.visual == FB_VISUAL_PSEUDOCOLOR) {
{
red >>= 8; red >>= 8;
green >>= 8; green >>= 8;
blue >>= 8; blue >>= 8;
@ -640,13 +635,11 @@ static int lynxfb_ops_setcolreg(unsigned regno, unsigned red,
} }
if(info->fix.visual == FB_VISUAL_TRUECOLOR && regno < 256 ) if(info->fix.visual == FB_VISUAL_TRUECOLOR && regno < 256 ) {
{
u32 val; u32 val;
if(var->bits_per_pixel == 16 || if(var->bits_per_pixel == 16 ||
var->bits_per_pixel == 32 || var->bits_per_pixel == 32 ||
var->bits_per_pixel == 24) var->bits_per_pixel == 24) {
{
val = chan_to_field(red, &var->red); val = chan_to_field(red, &var->red);
val |= chan_to_field(green, &var->green); val |= chan_to_field(green, &var->green);
val |= chan_to_field(blue, &var->blue); val |= chan_to_field(blue, &var->blue);
@ -709,8 +702,7 @@ static int sm750fb_set_drv(struct lynxfb_par * par)
output->clear = hw_sm750_output_clear; output->clear = hw_sm750_output_clear;
/* chip specific phase */ /* chip specific phase */
share->accel.de_wait = (share->revid == SM750LE_REVISION_ID)?hw_sm750le_deWait: hw_sm750_deWait; share->accel.de_wait = (share->revid == SM750LE_REVISION_ID)?hw_sm750le_deWait: hw_sm750_deWait;
switch (spec_share->state.dataflow) switch (spec_share->state.dataflow) {
{
case sm750_simul_pri: case sm750_simul_pri:
output->paths = sm750_pnc; output->paths = sm750_pnc;
crtc->channel = sm750_primary; crtc->channel = sm750_primary;
@ -794,8 +786,7 @@ static int lynxfb_set_fbinfo(struct fb_info* info, int index)
}; };
static const char * fixId[2]= static const char * fixId[2] = {
{
"sm750_fb1", "sm750_fb2", "sm750_fb1", "sm750_fb2",
}; };
@ -935,8 +926,7 @@ static int lynxfb_set_fbinfo(struct fb_info* info, int index)
pr_info("fix->mmio_start = %lx\n", fix->mmio_start); pr_info("fix->mmio_start = %lx\n", fix->mmio_start);
fix->mmio_len = share->vidreg_size; fix->mmio_len = share->vidreg_size;
pr_info("fix->mmio_len = %x\n", fix->mmio_len); pr_info("fix->mmio_len = %x\n", fix->mmio_len);
switch(var->bits_per_pixel) switch(var->bits_per_pixel) {
{
case 8: case 8:
fix->visual = FB_VISUAL_PSEUDOCOLOR; fix->visual = FB_VISUAL_PSEUDOCOLOR;
break; break;
@ -1028,8 +1018,7 @@ static void sm750fb_setup(struct lynx_share * share, char * src)
g_hwcursor &= ~0x2; g_hwcursor &= ~0x2;
else if(!strncmp(opt, "nohwc", strlen("nohwc"))) else if(!strncmp(opt, "nohwc", strlen("nohwc")))
g_hwcursor = 0; g_hwcursor = 0;
else else {
{
if(!g_fbmode[0]){ if(!g_fbmode[0]){
g_fbmode[0] = opt; g_fbmode[0] = opt;
pr_info("find fbmode0 : %s\n", g_fbmode[0]); pr_info("find fbmode0 : %s\n", g_fbmode[0]);
@ -1042,8 +1031,7 @@ static void sm750fb_setup(struct lynx_share * share, char * src)
} }
} }
#ifdef CAP_EXPANSION #ifdef CAP_EXPANSION
if(getExpRes(exp_res, &spec_share->state.xLCD, &spec_share->state.yLCD)) if(getExpRes(exp_res, &spec_share->state.xLCD, &spec_share->state.yLCD)) {
{
/* seems exp_res is not valid*/ /* seems exp_res is not valid*/
spec_share->state.xLCD = spec_share->state.yLCD = 0; spec_share->state.xLCD = spec_share->state.yLCD = 0;
} }
@ -1051,8 +1039,7 @@ static void sm750fb_setup(struct lynx_share * share, char * src)
NO_PARAM: NO_PARAM:
if(share->revid != SM750LE_REVISION_ID){ if(share->revid != SM750LE_REVISION_ID){
if(share->dual) if(share->dual) {
{
if(swap) if(swap)
spec_share->state.dataflow = sm750_dual_swap; spec_share->state.dataflow = sm750_dual_swap;
else else
@ -1168,16 +1155,13 @@ static int lynxfb_pci_probe(struct pci_dev * pdev,
fbidx = 0; fbidx = 0;
ALLOC_FB: ALLOC_FB:
info[fbidx] = framebuffer_alloc(sizeof(struct lynxfb_par), &pdev->dev); info[fbidx] = framebuffer_alloc(sizeof(struct lynxfb_par), &pdev->dev);
if(!info[fbidx]) if(!info[fbidx]) {
{
pr_err("Could not allocate framebuffer #%d.\n", fbidx); pr_err("Could not allocate framebuffer #%d.\n", fbidx);
if(fbidx == 0) if(fbidx == 0)
goto err_info0_alloc; goto err_info0_alloc;
else else
goto err_info1_alloc; goto err_info1_alloc;
} } else {
else
{
struct lynxfb_par * par; struct lynxfb_par * par;
int errno; int errno;
pr_info("framebuffer #%d alloc okay\n", fbidx); pr_info("framebuffer #%d alloc okay\n", fbidx);
@ -1296,8 +1280,7 @@ static int __init lynxfb_setup(char * options)
strsep() updates @options to pointer after the first found token strsep() updates @options to pointer after the first found token
it also returns the pointer ahead the token. it also returns the pointer ahead the token.
*/ */
while((opt = strsep(&options, ":"))!=NULL) while((opt = strsep(&options, ":"))!=NULL) {
{
/* options that mean for any lynx chips are configured here */ /* options that mean for any lynx chips are configured here */
if(!strncmp(opt, "noaccel", strlen("noaccel"))) if(!strncmp(opt, "noaccel", strlen("noaccel")))
g_noaccel = 1; g_noaccel = 1;
@ -1307,8 +1290,7 @@ static int __init lynxfb_setup(char * options)
#endif #endif
else if(!strncmp(opt, "dual", strlen("dual"))) else if(!strncmp(opt, "dual", strlen("dual")))
g_dualview = 1; g_dualview = 1;
else else {
{
strcat(tmp, opt); strcat(tmp, opt);
tmp += strlen(opt); tmp += strlen(opt);
if(options != NULL) if(options != NULL)