Commit 3cbe9cff authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds

tdfxfb: checkpatch fixes

This patch fixes all errors pointed by the checkpatch.pl script.
Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarAntonino Daplas <adaplas@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent deea62d3
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* *
* Author: Hannu Mallat <hmallat@cc.hut.fi> * Author: Hannu Mallat <hmallat@cc.hut.fi>
* *
* Copyright 1999 Hannu Mallat * Copyright © 1999 Hannu Mallat
* All rights reserved * All rights reserved
* *
* Created : Thu Sep 23 18:17:43 1999, hmallat * Created : Thu Sep 23 18:17:43 1999, hmallat
...@@ -70,12 +70,7 @@ ...@@ -70,12 +70,7 @@
#include <video/tdfx.h> #include <video/tdfx.h>
#undef TDFXFB_DEBUG #define DPRINTK(a, b...) pr_debug("fb: %s: " a, __FUNCTION__ , ## b)
#ifdef TDFXFB_DEBUG
#define DPRINTK(a,b...) printk(KERN_DEBUG "fb: %s: " a, __FUNCTION__ , ## b)
#else
#define DPRINTK(a,b...)
#endif
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR
#include <asm/mtrr.h> #include <asm/mtrr.h>
...@@ -475,8 +470,12 @@ static int tdfxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) ...@@ -475,8 +470,12 @@ static int tdfxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
} }
var->yoffset = 0; var->yoffset = 0;
/* Banshee doesn't support interlace, but Voodoo4/5 and probably Voodoo3 do. */ /*
/* no direct information about device id now? use max_pixclock for this... */ * Banshee doesn't support interlace, but Voodoo4/5 and probably
* Voodoo3 do.
* no direct information about device id now?
* use max_pixclock for this...
*/
if (((var->vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) && if (((var->vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) &&
(par->max_pixclock < VOODOO3_MAX_PIXCLOCK)) { (par->max_pixclock < VOODOO3_MAX_PIXCLOCK)) {
DPRINTK("interlace not supported\n"); DPRINTK("interlace not supported\n");
...@@ -516,7 +515,10 @@ static int tdfxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) ...@@ -516,7 +515,10 @@ static int tdfxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
var->transp.length = 0; var->transp.length = 0;
switch (var->bits_per_pixel) { switch (var->bits_per_pixel) {
case 8: case 8:
var->red.length = var->green.length = var->blue.length = 8; var->red.length = 8;
var->red.offset = 0;
var->green = var->red;
var->blue = var->red;
break; break;
case 16: case 16:
var->red.offset = 11; var->red.offset = 11;
...@@ -536,7 +538,8 @@ static int tdfxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) ...@@ -536,7 +538,8 @@ static int tdfxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
var->red.length = var->green.length = var->blue.length = 8; var->red.length = var->green.length = var->blue.length = 8;
break; break;
} }
var->height = var->width = -1; var->width = -1;
var->height = -1;
var->accel_flags = FB_ACCELF_TEXT; var->accel_flags = FB_ACCELF_TEXT;
...@@ -581,7 +584,8 @@ static int tdfxfb_set_par(struct fb_info *info) ...@@ -581,7 +584,8 @@ static int tdfxfb_set_par(struct fb_info *info)
htotal >>= 1; htotal >>= 1;
} }
hd = wd = (hdispend >> 3) - 1; wd = (hdispend >> 3) - 1;
hd = wd;
hs = (hsyncsta >> 3) - 1; hs = (hsyncsta >> 3) - 1;
he = (hsyncend >> 3) - 1; he = (hsyncend >> 3) - 1;
ht = (htotal >> 3) - 1; ht = (htotal >> 3) - 1;
...@@ -589,21 +593,23 @@ static int tdfxfb_set_par(struct fb_info *info) ...@@ -589,21 +593,23 @@ static int tdfxfb_set_par(struct fb_info *info)
hbe = ht; hbe = ht;
if ((info->var.vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE) { if ((info->var.vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE) {
vbs = vd = (info->var.yres << 1) - 1; vd = (info->var.yres << 1) - 1;
vs = vd + (info->var.lower_margin << 1); vs = vd + (info->var.lower_margin << 1);
ve = vs + (info->var.vsync_len << 1); ve = vs + (info->var.vsync_len << 1);
vbe = vt = ve + (info->var.upper_margin << 1) - 1; vt = ve + (info->var.upper_margin << 1) - 1;
reg.screensize = info->var.xres | (info->var.yres << 13); reg.screensize = info->var.xres | (info->var.yres << 13);
reg.vidcfg |= VIDCFG_HALF_MODE; reg.vidcfg |= VIDCFG_HALF_MODE;
reg.crt[0x09] = 0x80; reg.crt[0x09] = 0x80;
} else { } else {
vbs = vd = info->var.yres - 1; vd = info->var.yres - 1;
vs = vd + info->var.lower_margin; vs = vd + info->var.lower_margin;
ve = vs + info->var.vsync_len; ve = vs + info->var.vsync_len;
vbe = vt = ve + info->var.upper_margin - 1; vt = ve + info->var.upper_margin - 1;
reg.screensize = info->var.xres | (info->var.yres << 12); reg.screensize = info->var.xres | (info->var.yres << 12);
reg.vidcfg &= ~VIDCFG_HALF_MODE; reg.vidcfg &= ~VIDCFG_HALF_MODE;
} }
vbs = vd;
vbe = vt;
/* this is all pretty standard VGA register stuffing */ /* this is all pretty standard VGA register stuffing */
reg.misc[0x00] = 0x0f | reg.misc[0x00] = 0x0f |
...@@ -736,7 +742,7 @@ static int tdfxfb_set_par(struct fb_info *info) ...@@ -736,7 +742,7 @@ static int tdfxfb_set_par(struct fb_info *info)
} }
/* A handy macro shamelessly pinched from matroxfb */ /* A handy macro shamelessly pinched from matroxfb */
#define CNVT_TOHW(val, width) ((((val)<<(width))+0x7FFF-(val))>>16) #define CNVT_TOHW(val, width) ((((val) << (width)) + 0x7FFF - (val)) >> 16)
static int tdfxfb_setcolreg(unsigned regno, unsigned red, unsigned green, static int tdfxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
unsigned blue, unsigned transp, unsigned blue, unsigned transp,
...@@ -751,12 +757,14 @@ static int tdfxfb_setcolreg(unsigned regno, unsigned red, unsigned green, ...@@ -751,12 +757,14 @@ static int tdfxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
/* grayscale works only partially under directcolor */ /* grayscale works only partially under directcolor */
if (info->var.grayscale) { if (info->var.grayscale) {
/* grayscale = 0.30*R + 0.59*G + 0.11*B */ /* grayscale = 0.30*R + 0.59*G + 0.11*B */
red = green = blue = (red * 77 + green * 151 + blue * 28) >> 8; blue = (red * 77 + green * 151 + blue * 28) >> 8;
green = blue;
red = blue;
} }
switch (info->fix.visual) { switch (info->fix.visual) {
case FB_VISUAL_PSEUDOCOLOR: case FB_VISUAL_PSEUDOCOLOR:
rgbcol =(((u32)red & 0xff00) << 8) | rgbcol = (((u32)red & 0xff00) << 8) |
(((u32)green & 0xff00) << 0) | (((u32)green & 0xff00) << 0) |
(((u32)blue & 0xff00) >> 8); (((u32)blue & 0xff00) >> 8);
do_setpalentry(par, regno, rgbcol); do_setpalentry(par, regno, rgbcol);
...@@ -851,7 +859,7 @@ static void tdfxfb_fillrect(struct fb_info *info, ...@@ -851,7 +859,7 @@ static void tdfxfb_fillrect(struct fb_info *info,
struct tdfx_par *par = info->par; struct tdfx_par *par = info->par;
u32 bpp = info->var.bits_per_pixel; u32 bpp = info->var.bits_per_pixel;
u32 stride = info->fix.line_length; u32 stride = info->fix.line_length;
u32 fmt= stride | ((bpp + ((bpp == 8) ? 0 : 8)) << 13); u32 fmt = stride | ((bpp + ((bpp == 8) ? 0 : 8)) << 13);
int tdfx_rop; int tdfx_rop;
u32 dx = rect->dx; u32 dx = rect->dx;
u32 dy = rect->dy; u32 dy = rect->dy;
...@@ -922,13 +930,13 @@ static void tdfxfb_copyarea(struct fb_info *info, ...@@ -922,13 +930,13 @@ static void tdfxfb_copyarea(struct fb_info *info,
} }
if (area->sx <= area->dx) { if (area->sx <= area->dx) {
//-X /* -X */
blitcmd |= BIT(14); blitcmd |= BIT(14);
sx += area->width - 1; sx += area->width - 1;
dx += area->width - 1; dx += area->width - 1;
} }
if (area->sy <= area->dy) { if (area->sy <= area->dy) {
//-Y /* -Y */
blitcmd |= BIT(15); blitcmd |= BIT(15);
sy += area->height - 1; sy += area->height - 1;
dy += area->height - 1; dy += area->height - 1;
...@@ -961,9 +969,13 @@ static void tdfxfb_imageblit(struct fb_info *info, const struct fb_image *image) ...@@ -961,9 +969,13 @@ static void tdfxfb_imageblit(struct fb_info *info, const struct fb_image *image)
u32 dstbase = 0; u32 dstbase = 0;
if (image->depth != 1) { if (image->depth != 1) {
//banshee_make_room(par, 6 + ((size + 3) >> 2)); #ifdef BROKEN_CODE
//srcfmt = stride | ((bpp+((bpp==8) ? 0 : 8)) << 13) | 0x400000; banshee_make_room(par, 6 + ((size + 3) >> 2));
srcfmt = stride | ((bpp + ((bpp == 8) ? 0 : 8)) << 13) |
0x400000;
#else
cfb_imageblit(info, image); cfb_imageblit(info, image);
#endif
return; return;
} }
banshee_make_room(par, 9); banshee_make_room(par, 9);
...@@ -998,7 +1010,8 @@ static void tdfxfb_imageblit(struct fb_info *info, const struct fb_image *image) ...@@ -998,7 +1010,8 @@ static void tdfxfb_imageblit(struct fb_info *info, const struct fb_image *image)
tdfx_outl(par, DSTBASE, dstbase); tdfx_outl(par, DSTBASE, dstbase);
tdfx_outl(par, SRCXY, 0); tdfx_outl(par, SRCXY, 0);
tdfx_outl(par, DSTXY, dx | (dy << 16)); tdfx_outl(par, DSTXY, dx | (dy << 16));
tdfx_outl(par, COMMAND_2D, COMMAND_2D_H2S_BITBLT | (TDFX_ROP_COPY << 24)); tdfx_outl(par, COMMAND_2D,
COMMAND_2D_H2S_BITBLT | (TDFX_ROP_COPY << 24));
tdfx_outl(par, SRCFORMAT, srcfmt); tdfx_outl(par, SRCFORMAT, srcfmt);
tdfx_outl(par, DSTFORMAT, dstfmt); tdfx_outl(par, DSTFORMAT, dstfmt);
tdfx_outl(par, DSTSIZE, image->width | (image->height << 16)); tdfx_outl(par, DSTSIZE, image->width | (image->height << 16));
...@@ -1013,7 +1026,7 @@ static void tdfxfb_imageblit(struct fb_info *info, const struct fb_image *image) ...@@ -1013,7 +1026,7 @@ static void tdfxfb_imageblit(struct fb_info *info, const struct fb_image *image)
fifo_free = 31; fifo_free = 31;
banshee_make_room(par, fifo_free); banshee_make_room(par, fifo_free);
} }
tdfx_outl(par, LAUNCH_2D, *(u32*)chardata); tdfx_outl(par, LAUNCH_2D, *(u32 *)chardata);
chardata += 4; chardata += 4;
} }
...@@ -1026,11 +1039,11 @@ static void tdfxfb_imageblit(struct fb_info *info, const struct fb_image *image) ...@@ -1026,11 +1039,11 @@ static void tdfxfb_imageblit(struct fb_info *info, const struct fb_image *image)
tdfx_outl(par, LAUNCH_2D, *chardata); tdfx_outl(par, LAUNCH_2D, *chardata);
break; break;
case 2: case 2:
tdfx_outl(par, LAUNCH_2D, *(u16*)chardata); tdfx_outl(par, LAUNCH_2D, *(u16 *)chardata);
break; break;
case 3: case 3:
tdfx_outl(par, LAUNCH_2D, tdfx_outl(par, LAUNCH_2D,
*(u16*)chardata | ((chardata[3]) << 24)); *(u16 *)chardata | (chardata[3] << 24));
break; break;
} }
} }
...@@ -1175,8 +1188,9 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev, ...@@ -1175,8 +1188,9 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev,
struct fb_info *info; struct fb_info *info;
int err, lpitch; int err, lpitch;
if ((err = pci_enable_device(pdev))) { err = pci_enable_device(pdev);
printk(KERN_WARNING "tdfxfb: Can't enable pdev: %d\n", err); if (err) {
printk(KERN_ERR "tdfxfb: Can't enable pdev: %d\n", err);
return err; return err;
} }
...@@ -1207,33 +1221,36 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev, ...@@ -1207,33 +1221,36 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev,
tdfx_fix.mmio_len = pci_resource_len(pdev, 0); tdfx_fix.mmio_len = pci_resource_len(pdev, 0);
if (!request_mem_region(tdfx_fix.mmio_start, tdfx_fix.mmio_len, if (!request_mem_region(tdfx_fix.mmio_start, tdfx_fix.mmio_len,
"tdfx regbase")) { "tdfx regbase")) {
printk(KERN_WARNING "tdfxfb: Can't reserve regbase\n"); printk(KERN_ERR "tdfxfb: Can't reserve regbase\n");
goto out_err; goto out_err;
} }
default_par->regbase_virt = default_par->regbase_virt =
ioremap_nocache(tdfx_fix.mmio_start, tdfx_fix.mmio_len); ioremap_nocache(tdfx_fix.mmio_start, tdfx_fix.mmio_len);
if (!default_par->regbase_virt) { if (!default_par->regbase_virt) {
printk("fb: Can't remap %s register area.\n", tdfx_fix.id); printk(KERN_ERR "fb: Can't remap %s register area.\n",
tdfx_fix.id);
goto out_err_regbase; goto out_err_regbase;
} }
tdfx_fix.smem_start = pci_resource_start(pdev, 1); tdfx_fix.smem_start = pci_resource_start(pdev, 1);
if (!(tdfx_fix.smem_len = do_lfb_size(default_par, pdev->device))) { tdfx_fix.smem_len = do_lfb_size(default_par, pdev->device);
printk("fb: Can't count %s memory.\n", tdfx_fix.id); if (!tdfx_fix.smem_len) {
printk(KERN_ERR "fb: Can't count %s memory.\n", tdfx_fix.id);
goto out_err_regbase; goto out_err_regbase;
} }
if (!request_mem_region(tdfx_fix.smem_start, if (!request_mem_region(tdfx_fix.smem_start,
pci_resource_len(pdev, 1), "tdfx smem")) { pci_resource_len(pdev, 1), "tdfx smem")) {
printk(KERN_WARNING "tdfxfb: Can't reserve smem\n"); printk(KERN_ERR "tdfxfb: Can't reserve smem\n");
goto out_err_regbase; goto out_err_regbase;
} }
info->screen_base = ioremap_nocache(tdfx_fix.smem_start, info->screen_base = ioremap_nocache(tdfx_fix.smem_start,
tdfx_fix.smem_len); tdfx_fix.smem_len);
if (!info->screen_base) { if (!info->screen_base) {
printk("fb: Can't remap %s framebuffer.\n", tdfx_fix.id); printk(KERN_ERR "fb: Can't remap %s framebuffer.\n",
tdfx_fix.id);
goto out_err_screenbase; goto out_err_screenbase;
} }
...@@ -1241,11 +1258,12 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev, ...@@ -1241,11 +1258,12 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev,
if (!request_region(pci_resource_start(pdev, 2), if (!request_region(pci_resource_start(pdev, 2),
pci_resource_len(pdev, 2), "tdfx iobase")) { pci_resource_len(pdev, 2), "tdfx iobase")) {
printk(KERN_WARNING "tdfxfb: Can't reserve iobase\n"); printk(KERN_ERR "tdfxfb: Can't reserve iobase\n");
goto out_err_screenbase; goto out_err_screenbase;
} }
printk("fb: %s memory = %dK\n", tdfx_fix.id, tdfx_fix.smem_len >> 10); printk(KERN_INFO "fb: %s memory = %dK\n", tdfx_fix.id,
tdfx_fix.smem_len >> 10);
default_par->mtrr_handle = -1; default_par->mtrr_handle = -1;
if (!nomtrr) if (!nomtrr)
...@@ -1286,12 +1304,12 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev, ...@@ -1286,12 +1304,12 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev,
goto out_err_iobase; goto out_err_iobase;
if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) { if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
printk(KERN_WARNING "tdfxfb: Can't allocate color map\n"); printk(KERN_ERR "tdfxfb: Can't allocate color map\n");
goto out_err_iobase; goto out_err_iobase;
} }
if (register_framebuffer(info) < 0) { if (register_framebuffer(info) < 0) {
printk("tdfxfb: can't register framebuffer\n"); printk(KERN_ERR "tdfxfb: can't register framebuffer\n");
fb_dealloc_cmap(&info->cmap); fb_dealloc_cmap(&info->cmap);
goto out_err_iobase; goto out_err_iobase;
} }
......
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