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

Commit 4560daaf authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds
Browse files

pm2fb: removal of pm2fb_par fields 



This patch removes two redundant fields in the pm2fb_par structure.

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 4c7bf386

drivers/video/pm2fb.c

+7 −10
Original line number Original line Diff line number Diff line
@@ -81,8 +81,6 @@ static int lowvsync; 
struct pm2fb_par

struct pm2fb_par

{

{

	pm2type_t	type;		/* Board type */

	pm2type_t	type;		/* Board type */

	u32		fb_size;	/* framebuffer memory size */

	unsigned char	__iomem *v_fb;  /* virtual address of frame buffer */

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

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

	u32 	   	memclock;	/* memclock */

	u32 	   	memclock;	/* memclock */

	u32		video;		/* video flags before blanking */

	u32		video;		/* video flags before blanking */
@@ -1293,20 +1291,19 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev, 
	/* Now work out how big lfb is going to be. */

	/* Now work out how big lfb is going to be. */

	switch(default_par->mem_config & PM2F_MEM_CONFIG_RAM_MASK) {

	switch(default_par->mem_config & PM2F_MEM_CONFIG_RAM_MASK) {

	case PM2F_MEM_BANKS_1:

	case PM2F_MEM_BANKS_1:

		default_par->fb_size=0x200000;

		pm2fb_fix.smem_len=0x200000;

		break;

		break;

	case PM2F_MEM_BANKS_2:

	case PM2F_MEM_BANKS_2:

		default_par->fb_size=0x400000;

		pm2fb_fix.smem_len=0x400000;

		break;

		break;

	case PM2F_MEM_BANKS_3:

	case PM2F_MEM_BANKS_3:

		default_par->fb_size=0x600000;

		pm2fb_fix.smem_len=0x600000;

		break;

		break;

	case PM2F_MEM_BANKS_4:

	case PM2F_MEM_BANKS_4:

		default_par->fb_size=0x800000;

		pm2fb_fix.smem_len=0x800000;

		break;

		break;

	}

	}

	pm2fb_fix.smem_start = pci_resource_start(pdev, 1);

	pm2fb_fix.smem_start = pci_resource_start(pdev, 1);

	pm2fb_fix.smem_len = default_par->fb_size;





	/* Linear frame buffer - request region and map it. */

	/* Linear frame buffer - request region and map it. */

	if ( !request_mem_region(pm2fb_fix.smem_start, pm2fb_fix.smem_len,

	if ( !request_mem_region(pm2fb_fix.smem_start, pm2fb_fix.smem_len,
@@ -1314,9 +1311,9 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev, 
		printk(KERN_WARNING "pm2fb: Can't reserve smem.\n");

		printk(KERN_WARNING "pm2fb: Can't reserve smem.\n");

		goto err_exit_mmio;

		goto err_exit_mmio;

	}

	}

	info->screen_base = default_par->v_fb =

	info->screen_base =

		ioremap_nocache(pm2fb_fix.smem_start, pm2fb_fix.smem_len);

		ioremap_nocache(pm2fb_fix.smem_start, pm2fb_fix.smem_len);

	if ( !default_par->v_fb ) {

	if ( !info->screen_base ) {

		printk(KERN_WARNING "pm2fb: Can't ioremap smem area.\n");

		printk(KERN_WARNING "pm2fb: Can't ioremap smem area.\n");

		release_mem_region(pm2fb_fix.smem_start, pm2fb_fix.smem_len);

		release_mem_region(pm2fb_fix.smem_start, pm2fb_fix.smem_len);

		goto err_exit_mmio;

		goto err_exit_mmio;
@@ -1344,7 +1341,7 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev, 
		goto err_exit_both;

		goto err_exit_both;





	printk(KERN_INFO "fb%d: %s frame buffer device, memory = %dK.\n",

	printk(KERN_INFO "fb%d: %s frame buffer device, memory = %dK.\n",

	       info->node, info->fix.id, default_par->fb_size / 1024);

	       info->node, info->fix.id, pm2fb_fix.smem_len / 1024);





	/*

	/*

	 * Our driver data

	 * Our driver data