hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: sm750fb: remove multiple blank line 

Multiple blank lines are not kernel coding style and so checkpatch
complains. Remove them.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sudip Mukherjee 2015-08-07 17:34:02 +05:30 committed by Greg Kroah-Hartman
parent 5dab10f444
commit 5fd93ddf32
1 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,6 @@
int smi_indent; int smi_indent;
/* /*
* #ifdef __BIG_ENDIAN * #ifdef __BIG_ENDIAN
* ssize_t lynxfb_ops_write(struct fb_info *info, const char __user *buf, * ssize_t lynxfb_ops_write(struct fb_info *info, const char __user *buf,
@ -40,7 +39,6 @@ typedef void (*PROC_SPEC_SETUP)(struct lynx_share*, char *);
typedef int (*PROC_SPEC_MAP)(struct lynx_share*, struct pci_dev*); typedef int (*PROC_SPEC_MAP)(struct lynx_share*, struct pci_dev*);
typedef int (*PROC_SPEC_INITHW)(struct lynx_share*, struct pci_dev*); typedef int (*PROC_SPEC_INITHW)(struct lynx_share*, struct pci_dev*);
/* common var for all device */ /* common var for all device */
static int g_hwcursor = 1; static int g_hwcursor = 1;
static int g_noaccel; static int g_noaccel;
@ -51,7 +49,6 @@ static char *g_settings;
static int g_dualview; static int g_dualview;
static char *g_option; static char *g_option;
static const struct fb_videomode lynx750_ext[] = { static const struct fb_videomode lynx750_ext[] = {
/* 1024x600-60 VESA [1.71:1] */ /* 1024x600-60 VESA [1.71:1] */
{NULL, 60, 1024, 600, 20423, 144, 40, 18, 1, 104, 3, {NULL, 60, 1024, 600, 20423, 144, 40, 18, 1, 104, 3,
@ -115,8 +112,6 @@ static const struct fb_videomode lynx750_ext[] = {
}; };
/* no hardware cursor supported under version 2.6.10, kernel bug */ /* no hardware cursor supported under version 2.6.10, kernel bug */
static int lynxfb_ops_cursor(struct fb_info *info, struct fb_cursor *fbcursor) static int lynxfb_ops_cursor(struct fb_info *info, struct fb_cursor *fbcursor)
{ {
@ -160,7 +155,6 @@ static int lynxfb_ops_cursor(struct fb_info *info, struct fb_cursor *fbcursor)
cursor->setColor(cursor, fg, bg); cursor->setColor(cursor, fg, bg);
} }
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,
@ -300,7 +294,6 @@ static int lynxfb_ops_pan_display(struct fb_var_screeninfo *var,
struct lynxfb_crtc *crtc; struct lynxfb_crtc *crtc;
int ret; int ret;
if (!info) if (!info)
return -EINVAL; return -EINVAL;
@ -466,7 +459,6 @@ static int lynxfb_resume(struct pci_dev *pdev)
int ret; int ret;
ret = 0; ret = 0;
share = pci_get_drvdata(pdev); share = pci_get_drvdata(pdev);
@ -478,7 +470,6 @@ static int lynxfb_resume(struct pci_dev *pdev)
return ret; return ret;
} }
if (pdev->dev.power.power_state.event != PM_EVENT_FREEZE) { if (pdev->dev.power.power_state.event != PM_EVENT_FREEZE) {
pci_restore_state(pdev); pci_restore_state(pdev);
ret = pci_enable_device(pdev); ret = pci_enable_device(pdev);
@ -493,7 +484,6 @@ static int lynxfb_resume(struct pci_dev *pdev)
hw_sm750_inithw(share, pdev); hw_sm750_inithw(share, pdev);
info = share->fbinfo[0]; info = share->fbinfo[0];
if (info) { if (info) {
@ -518,7 +508,6 @@ static int lynxfb_resume(struct pci_dev *pdev)
fb_set_suspend(info, 0); fb_set_suspend(info, 0);
} }
console_unlock(); console_unlock();
return ret; return ret;
} }
@ -534,7 +523,6 @@ static int lynxfb_ops_check_var(struct fb_var_screeninfo *var,
int ret; int ret;
resource_size_t request; resource_size_t request;
par = info->par; par = info->par;
crtc = &par->crtc; crtc = &par->crtc;
output = &par->output; output = &par->output;
@ -546,7 +534,6 @@ static int lynxfb_ops_check_var(struct fb_var_screeninfo *var,
var->yres, var->yres,
var->bits_per_pixel); var->bits_per_pixel);
switch (var->bits_per_pixel) { switch (var->bits_per_pixel) {
case 8: case 8:
case 16: case 16:
@ -617,7 +604,6 @@ exit:
return ret; return ret;
} }
static int lynxfb_ops_setcolreg(unsigned regno, static int lynxfb_ops_setcolreg(unsigned regno,
unsigned red, unsigned red,
unsigned green, unsigned green,
@ -652,7 +638,6 @@ static int lynxfb_ops_setcolreg(unsigned regno,
goto exit; goto exit;
} }
if (info->fix.visual == FB_VISUAL_TRUECOLOR && regno < 256) { if (info->fix.visual == FB_VISUAL_TRUECOLOR && regno < 256) {
u32 val; u32 val;
@ -782,7 +767,6 @@ static struct fb_ops lynxfb_ops = {
.fb_cursor = lynxfb_ops_cursor, .fb_cursor = lynxfb_ops_cursor,
}; };
static int lynxfb_set_fbinfo(struct fb_info *info, int index) static int lynxfb_set_fbinfo(struct fb_info *info, int index)
{ {
int i; int i;
@ -803,7 +787,6 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
"kernel HELPERS prepared vesa_modes", "kernel HELPERS prepared vesa_modes",
}; };
static const char *fixId[2] = { static const char *fixId[2] = {
"sm750_fb1", "sm750_fb2", "sm750_fb1", "sm750_fb2",
}; };
@ -824,7 +807,6 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
sm750fb_set_drv(par); sm750fb_set_drv(par);
lynxfb_ops.fb_pan_display = lynxfb_ops_pan_display; lynxfb_ops.fb_pan_display = lynxfb_ops_pan_display;
/* set current cursor variable and proc pointer, /* set current cursor variable and proc pointer,
* must be set after crtc member initialized */ * must be set after crtc member initialized */
crtc->cursor.offset = crtc->oScreen + crtc->vidmem_size - 1024; crtc->cursor.offset = crtc->oScreen + crtc->vidmem_size - 1024;
@ -841,7 +823,6 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
crtc->cursor.setData = hw_cursor_setData; crtc->cursor.setData = hw_cursor_setData;
crtc->cursor.vstart = share->pvMem + crtc->cursor.offset; crtc->cursor.vstart = share->pvMem + crtc->cursor.offset;
crtc->cursor.share = share; crtc->cursor.share = share;
memset_io(crtc->cursor.vstart, 0, crtc->cursor.size); memset_io(crtc->cursor.vstart, 0, crtc->cursor.size);
if (!g_hwcursor) { if (!g_hwcursor) {
@ -849,7 +830,6 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
crtc->cursor.disable(&crtc->cursor); crtc->cursor.disable(&crtc->cursor);
} }
/* set info->fbops, must be set before fb_find_mode */ /* set info->fbops, must be set before fb_find_mode */
if (!share->accel_off) { if (!share->accel_off) {
/* use 2d acceleration */ /* use 2d acceleration */
@ -865,7 +845,6 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
g_fbmode[index] = g_fbmode[0]; g_fbmode[index] = g_fbmode[0];
} }
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
ret = fb_find_mode(var, info, g_fbmode[index], ret = fb_find_mode(var, info, g_fbmode[index],
@ -935,7 +914,6 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
strlcpy(fix->id, fixId[index], sizeof(fix->id)); strlcpy(fix->id, fixId[index], sizeof(fix->id));
fix->smem_start = crtc->oScreen + share->vidmem_start; fix->smem_start = crtc->oScreen + share->vidmem_start;
pr_info("fix->smem_start = %lx\n", fix->smem_start); pr_info("fix->smem_start = %lx\n", fix->smem_start);
/* according to mmap experiment from user space application, /* according to mmap experiment from user space application,
@ -998,7 +976,6 @@ static void sm750fb_setup(struct lynx_share *share, char *src)
#endif #endif
int swap; int swap;
spec_share = container_of(share, struct sm750_share, share); spec_share = container_of(share, struct sm750_share, share);
#ifdef CAP_EXPENSIION #ifdef CAP_EXPENSIION
exp_res = NULL; exp_res = NULL;
@ -1096,7 +1073,6 @@ static int lynxfb_pci_probe(struct pci_dev *pdev,
size_t spec_offset = 0; size_t spec_offset = 0;
int fbidx; int fbidx;
/* enable device */ /* enable device */
if (pci_enable_device(pdev)) { if (pci_enable_device(pdev)) {
pr_err("can not enable device.\n"); pr_err("can not enable device.\n");
@ -1268,7 +1244,6 @@ static int __init lynxfb_setup(char *options)
int len; int len;
char *opt, *tmp; char *opt, *tmp;
if (!options || !*options) { if (!options || !*options) {
pr_warn("no options.\n"); pr_warn("no options.\n");
return 0; return 0;
@ -1332,7 +1307,6 @@ static struct pci_driver lynxfb_driver = {
#endif #endif
}; };
static int __init lynxfb_init(void) static int __init lynxfb_init(void)
{ {
char *option; char *option;