[PATCH] pm2fb: removal of pm2fb_par fields

From: Krzysztof Helt <redacted>

This patch removes two redudant fields in the pm2fb_par 
structure.

Signed-off-by: Krzysztof Helt <redacted>

---

This is a patch against mm tree with already sent pm2fb patches 
applied.

Regards,
Krzysztof

--- linux-2.6.21.orig/drivers/video/pm2fb.c	2007-05-01 11:38:

55.000000000 +0200

+++ linux-2.6.21/drivers/video/pm2fb.c	2007-05-02 21:14:25.

000000000 +0200

@@ -81,8 +81,6 @@ static int lowvsync;
 struct pm2fb_par
 {
 	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 */
 	u32 	   	memclock;	/* memclock */
 	u32		video;		/* video flags before blanking */

@@ -1169,20 +1167,20 @@ static int __devinit pm2fb_probe(struct 
 	/* Now work out how big lfb is going to be. */
 	switch(default_par->mem_config & PM2F_MEM_CONFIG_RAM_MASK) 

{
 	case PM2F_MEM_BANKS_1:
-		default_par->fb_size=0x200000;
+		pm2fb_fix.smem_len=0x200000;
 		break;
 	case PM2F_MEM_BANKS_2:
-		default_par->fb_size=0x400000;
+		pm2fb_fix.smem_len=0x400000;
 		break;
 	case PM2F_MEM_BANKS_3:
-		default_par->fb_size=0x600000;
+		pm2fb_fix.smem_len=0x600000;
 		break;
 	case PM2F_MEM_BANKS_4:
-		default_par->fb_size=0x800000;
+		pm2fb_fix.smem_len=0x800000;
 		break;
 	}
 	pm2fb_fix.smem_start = pci_resource_start(pdev, 1);
-	pm2fb_fix.smem_len = default_par->fb_size;
+	pm2fb_fix.smem_len = pm2fb_fix.smem_len;
 
 	/* Linear frame buffer - request region and map it. */
 	if ( !request_mem_region(pm2fb_fix.smem_start, pm2fb_fix.
smem_len,

@@ -1190,9 +1188,9 @@ static int __devinit pm2fb_probe(struct 
 		printk(KERN_WARNING "pm2fb: Can't reserve smem.\n");
 		goto err_exit_mmio;
 	}
-	info->screen_base = default_par->v_fb =
+	info->screen_base =
 		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")
;
 		release_mem_region(pm2fb_fix.smem_start, pm2fb_fix.
smem_len);
 		goto err_exit_mmio;

@@ -1218,7 +1216,7 @@ static int __devinit pm2fb_probe(struct 
 		goto err_exit_both;
 
 	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


----------------------------------------------------
P.S.
Masz bardzo du¿e szanse, aby wygraæ nawet kilka z 1200 nagród!
Kino domowe, kamery cyfrowe, internetowe, filmy DVD... Kliknij:
http://klik.wp.pl/?adr=www.poczta.wp.pl%2Fkonkursintro.html&sid=1123



-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/

On Wed, 2007-05-02 at 21:39 +0200, Krzysztof Helt wrote:

Your mailer is wrapping long lines. Check your mailer and send a copy to
yourself before sending again.

Tony



-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/

On Wed, 2007-05-02 at 21:39 +0200, Krzysztof Helt wrote:

 	pm2fb_fix.smem_start = pci_resource_start(pdev, 1);
-	pm2fb_fix.smem_len = default_par->fb_size;
+	pm2fb_fix.smem_len = pm2fb_fix.smem_len;

We don't need this assignment, correct?

No need to resend, I'll just remove that line.

Tony



-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/