Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57bac0f0 authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds
Browse files

pm3fb: checkpatch fixes 



This patch fixes all errors detected by checkpatch.pl script in the pm3fb.c
file.

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 3843faa2

drivers/video/pm3fb.c

+82 −70
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ 


#undef PM3FB_MASTER_DEBUG

#ifdef PM3FB_MASTER_DEBUG

#define DPRINTK(a,b...)	printk(KERN_DEBUG "pm3fb: %s: " a, __FUNCTION__ , ## b)

#define DPRINTK(a, b...)	\

	printk(KERN_DEBUG "pm3fb: %s: " a, __FUNCTION__ , ## b)

#else

#define DPRINTK(a, b...)

#endif
@@ -55,11 +56,11 @@ 
 * Driver data

 */

static char *mode_option __devinitdata;

static int noaccel   __devinitdata = 0;

static int noaccel __devinitdata;



/* mtrr option */

#ifdef CONFIG_MTRR

static int nomtrr __devinitdata = 0;

static int nomtrr __devinitdata;

#endif



/*
@@ -72,7 +73,7 @@ static int nomtrr __devinitdata = 0; 
struct pm3_par {

	unsigned char	__iomem *v_regs;/* virtual address of p_regs */

	u32		video;		/* video flags before blanking */

	u32		base;		/* screen base (xoffset+yoffset) in 128 bits unit */

	u32		base;		/* screen base in 128 bits unit */

	u32		palette[16];

	int		mtrr_handle;

};
@@ -536,9 +537,9 @@ static void pm3fb_imageblit(struct fb_info *info, const struct fb_image *image) 
		bgx = par->palette[image->bg_color];

		break;

	}

	if (image->depth != 1) {

	if (image->depth != 1)

		return cfb_imageblit(info, image);

	}



	if (info->var.bits_per_pixel == 8) {

		fgx |= fgx << 8;

		bgx |= bgx << 8;
@@ -607,7 +608,8 @@ static void pm3fb_imageblit(struct fb_info *info, const struct fb_image *image) 
static void pm3fb_write_mode(struct fb_info *info)

{

	struct pm3_par *par = info->par;

	char tempsync = 0x00, tempmisc = 0x00;

	char tempsync = 0x00;

	char tempmisc = 0x00;

	const u32 hsstart = info->var.right_margin;

	const u32 hsend = hsstart + info->var.hsync_len;

	const u32 hbend = hsend + info->var.left_margin;
@@ -809,42 +811,52 @@ static int pm3fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) 


		switch (var->bits_per_pixel) {

		case 8:

			var->red.length = var->green.length = var->blue.length = 8;

			var->red.offset = var->green.offset = var->blue.offset = 0;

			var->red.length = 8;

			var->green.length = 8;

			var->blue.length = 8;

			var->red.offset = 0;

			var->green.offset = 0;

			var->blue.offset = 0;

			var->transp.offset = 0;

			var->transp.length = 0;

			break;

		case 16:

			var->red.length = var->blue.length = 5;

			var->red.length = 5;

			var->blue.length = 5;

			var->green.length = 6;

			var->transp.length = 0;

			break;

		case 32:

			var->red.length = var->green.length = var->blue.length = 8;

			var->red.length = 8;

			var->green.length = 8;

			var->blue.length = 8;

			var->transp.length = 8;

			break;

		default:

			DPRINTK("depth not supported: %u\n", var->bits_per_pixel);

			DPRINTK("depth not supported: %u\n",

				var->bits_per_pixel);

			return -EINVAL;

		}

	}

	/* it is assumed BGRA order */

	if (var->bits_per_pixel > 8 )

	{

	if (var->bits_per_pixel > 8 ) {

		var->blue.offset = 0;

		var->green.offset = var->blue.length;

		var->red.offset = var->green.offset + var->green.length;

		var->transp.offset = var->red.offset + var->red.length;

	}

	var->height = var->width = -1;

	var->height = -1;

	var->width = -1;



	if (var->xres != var->xres_virtual) {

		DPRINTK("virtual x resolution != physical x resolution not supported\n");

		DPRINTK("virtual x resolution != "

			"physical x resolution not supported\n");

		return -EINVAL;

	}



	if (var->yres > var->yres_virtual) {

		DPRINTK("virtual y resolution < physical y resolution not possible\n");

		DPRINTK("virtual y resolution < "

			"physical y resolution not possible\n");

		return -EINVAL;

	}
@@ -878,7 +890,8 @@ static int pm3fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) 
	}



	if (PICOS2KHZ(var->pixclock) > PM3_MAX_PIXCLOCK) {

		DPRINTK("pixclock too high (%ldKHz)\n", PICOS2KHZ(var->pixclock));

		DPRINTK("pixclock too high (%ldKHz)\n",

			PICOS2KHZ(var->pixclock));

		return -EINVAL;

	}
@@ -954,10 +967,9 @@ static int pm3fb_setcolreg(unsigned regno, unsigned red, unsigned green, 
	   return -EINVAL;



	/* grayscale works only partially under directcolor */

	if (info->var.grayscale) {

	/* grayscale = 0.30*R + 0.59*G + 0.11*B */

	if (info->var.grayscale)

	   red = green = blue = (red * 77 + green * 151 + blue * 28) >> 8;

	}



	/* Directcolor:

	 *   var->{color}.offset contains start of bitfield
@@ -971,8 +983,8 @@ static int pm3fb_setcolreg(unsigned regno, unsigned red, unsigned green, 
	 *

	 * Pseudocolor:

	 *	var->{color}.offset is 0

	 *	var->{color}.length contains width of DAC or the number of unique

	 *			colors available (color depth)

	 *	var->{color}.length contains width of DAC or the number

	 *			of unique colors available (color depth)

	 *	pseudo_palette is not used

	 *	RAMDAC[X] is programmed to (red, green, blue)

	 *	color depth = var->{color}.length
@@ -1010,8 +1022,7 @@ static int pm3fb_setcolreg(unsigned regno, unsigned red, unsigned green, 
			break;

		}

		return 0;

	}

	else if (info->fix.visual == FB_VISUAL_PSEUDOCOLOR)

	} else if (info->fix.visual == FB_VISUAL_PSEUDOCOLOR)

		pm3fb_set_color(par, regno, red, green, blue);



	return 0;
@@ -1104,7 +1115,8 @@ static struct fb_ops pm3fb_ops = { 
/* the pm3fb_fix.smem_start is also set */

static unsigned long pm3fb_size_memory(struct pm3_par *par)

{

	unsigned long	memsize = 0, tempBypass, i, temp1, temp2;

	unsigned long	memsize = 0;

	unsigned long	tempBypass, i, temp1, temp2;

	unsigned char	__iomem *screen_mem;



	pm3fb_fix.smem_len = 64 * 1024l * 1024; /* request full aperture size */
@@ -1132,7 +1144,9 @@ static unsigned long pm3fb_size_memory(struct pm3_par *par) 
	PM3_WAIT(par, 1);

	PM3_WRITE_REG(par, PM3MemBypassWriteMask, 0xFFFFFFFF);



	/* pm3 split up memory, replicates, and do a lot of nasty stuff IMHO ;-) */

	/* pm3 split up memory, replicates, and do a lot of

	 * nasty stuff IMHO ;-)

	 */

	for (i = 0; i < 32; i++) {

		fb_writel(i * 0x00345678,

			  (screen_mem + (i * 1048576)));
@@ -1190,7 +1204,8 @@ static int __devinit pm3fb_probe(struct pci_dev *dev, 
	struct fb_info *info;

	struct pm3_par *par;

	struct device *device = &dev->dev; /* for pci drivers */

	int err, retval = -ENXIO;

	int err;

	int retval = -ENXIO;



	err = pci_enable_device(dev);

	if (err) {
@@ -1235,8 +1250,7 @@ static int __devinit pm3fb_probe(struct pci_dev *dev, 
	/* Linear frame buffer - request region and map it. */

	pm3fb_fix.smem_start = pci_resource_start(dev, 1);

	pm3fb_fix.smem_len = pm3fb_size_memory(par);

	if (!pm3fb_fix.smem_len)

	{

	if (!pm3fb_fix.smem_len) {

		printk(KERN_WARNING "pm3fb: Can't find memory on board.\n");

		goto err_exit_mmio;

	}
@@ -1255,11 +1269,10 @@ static int __devinit pm3fb_probe(struct pci_dev *dev, 
	info->screen_size = pm3fb_fix.smem_len;



#ifdef CONFIG_MTRR

	if (!nomtrr) {

	if (!nomtrr)

		par->mtrr_handle = mtrr_add(pm3fb_fix.smem_start,

						pm3fb_fix.smem_len,

						MTRR_TYPE_WRCOMB, 1);

	}

#endif

	info->fbops = &pm3fb_ops;
@@ -1403,16 +1416,15 @@ static int __init pm3fb_setup(char *options) 
	while ((this_opt = strsep(&options, ",")) != NULL) {

		if (!*this_opt)

			continue;

		else if (!strncmp(this_opt, "noaccel", 7)) {

		else if (!strncmp(this_opt, "noaccel", 7))

			noaccel = 1;

#ifdef CONFIG_MTRR

		} else if (!strncmp(this_opt, "nomtrr", 6)) {

		else if (!strncmp(this_opt, "nomtrr", 6))

			nomtrr = 1;

#endif

		} else {

		else

			mode_option = this_opt;

	}

	}

	return 0;

}

#endif /* MODULE */