Skip to contentSkip to conversation

fbdev: Minor cleanup in WM8505-related code

PATCH In review Alexey Charkov 3 participants 8 messages Dec 19, 2010 – Dec 20, 2010 Framebuffer layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fbdev: Minor cleanup in WM8505-related code

This fixes vsync timing calculation in wm8505fb.c (was off by one, which caused some flicker with larger panels) and replaces the last remaining driver name reference with the macro for uniformity.

In addition, the error return path in wmt_ge_rops.c is made more uniform by getting rid of goto's in remaining places.

---

Paul, could you please apply this to your fbdev tree? The patch seems to be trivial, and it would bring the mainline code in line with what people use when pulling from our Gitorious development repo.

Best regards,
Alexey

drivers/video/wm8505fb.c +2 -2
index e37251b..96e34a5 100644
@@ -88,7 +88,7 @@ static int wm8505fb_set_timing(struct fb_info *info)
 	int v_start = info->var.upper_margin;
 	int v_end = v_start + info->var.yres;
 	int v_all = v_end + info->var.lower_margin;
-	int v_sync = info->var.vsync_len + 1;
+	int v_sync = info->var.vsync_len;
 
 	writel(0, fbi->regbase + WMT_GOVR_TG);
 
@@ -291,7 +291,7 @@ static int __devinit wm8505fb_probe(struct platform_device *pdev)
 		goto failed_fbi;
 	}
 
-	res = request_mem_region(res->start, resource_size(res), "wm8505fb");
+	res = request_mem_region(res->start, resource_size(res), DRIVER_NAME);
 	if (res = NULL) {
 		dev_err(&pdev->dev, "failed to request I/O memory\n");
 		ret = -EBUSY;
drivers/video/wmt_ge_rops.c +2 -8
index f31883f..45832b7 100644
@@ -127,13 +127,11 @@ EXPORT_SYMBOL_GPL(wmt_ge_sync);
 static int __devinit wmt_ge_rops_probe(struct platform_device *pdev)
 {
 	struct resource *res;
-	int ret;
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (res = NULL) {
 		dev_err(&pdev->dev, "no I/O memory resource defined\n");
-		ret = -ENODEV;
-		goto error;
+		return -ENODEV;
 	}
 
 	/* Only one ROP engine is presently supported. */
@@ -145,17 +143,13 @@ static int __devinit wmt_ge_rops_probe(struct platform_device *pdev)
 	regbase = ioremap(res->start, resource_size(res));
 	if (regbase = NULL) {
 		dev_err(&pdev->dev, "failed to map I/O memory\n");
-		ret = -EBUSY;
-		goto error;
+		return -EBUSY;
 	}
 
 	writel(1, regbase + GE_ENABLE_OFF);
 	printk(KERN_INFO "Enabled support for WMT GE raster acceleration\n");
 
 	return 0;
-
-error:
-	return ret;
 }
 
 static int __devexit wmt_ge_rops_remove(struct platform_device *pdev)
#1 lore raw

Alexey,

How about sending this as two different patches?
1) Correcting vsync
2) code cleanup

-Thanks,
Mayuresh

Quoted 95 lines

-----Original Message-----
From: [email protected] [mailto:linux-fbdev- [email protected]] On Behalf Of Alexey Charkov
Sent: Sunday, December 19, 2010 11:43 PM
To: Paul Mundt
Cc: [email protected]; [email protected]; vt8500- [email protected]
Subject: [PATCH] fbdev: Minor cleanup in WM8505-related code

This fixes vsync timing calculation in wm8505fb.c (was off by one, which caused some flicker with larger panels) and replaces the last remaining driver name reference with the macro for uniformity.

In addition, the error return path in wmt_ge_rops.c is made more uniform by getting rid of goto's in remaining places.

---

Paul, could you please apply this to your fbdev tree? The patch seems to be trivial, and it would bring the mainline code in line with what people use when pulling from our Gitorious development repo.

Best regards,
Alexey

drivers/video/wm8505fb.c +2 -2
index e37251b..96e34a5 100644
@@ -88,7 +88,7 @@ static int wm8505fb_set_timing(struct fb_info *info)
 	int v_start = info->var.upper_margin;
 	int v_end = v_start + info->var.yres;
 	int v_all = v_end + info->var.lower_margin;
-	int v_sync = info->var.vsync_len + 1;
+	int v_sync = info->var.vsync_len;
 
 	writel(0, fbi->regbase + WMT_GOVR_TG);
 
@@ -291,7 +291,7 @@ static int __devinit wm8505fb_probe(struct
 platform_device *pdev)
 		goto failed_fbi;
 	}
 
-	res = request_mem_region(res->start, resource_size(res),
 "wm8505fb");
+	res = request_mem_region(res->start, resource_size(res),
 DRIVER_NAME);
drivers/video/wm8505fb.c +0 -0
 	if (res == NULL) {
 		dev_err(&pdev->dev, "failed to request I/O memory\n");
 		ret = -EBUSY;
drivers/video/wmt_ge_rops.c +2 -8
index f31883f..45832b7 100644
@@ -127,13 +127,11 @@ EXPORT_SYMBOL_GPL(wmt_ge_sync);
 static int __devinit wmt_ge_rops_probe(struct platform_device *pdev)
 {
 	struct resource *res;
-	int ret;
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (res == NULL) {
 		dev_err(&pdev->dev, "no I/O memory resource defined\n");
-		ret = -ENODEV;
-		goto error;
+		return -ENODEV;
 	}
 
 	/* Only one ROP engine is presently supported. */
@@ -145,17 +143,13 @@ static int __devinit wmt_ge_rops_probe(struct
 platform_device *pdev)
 	regbase = ioremap(res->start, resource_size(res));
 	if (regbase == NULL) {
 		dev_err(&pdev->dev, "failed to map I/O memory\n");
-		ret = -EBUSY;
-		goto error;
+		return -EBUSY;
 	}
 
 	writel(1, regbase + GE_ENABLE_OFF);
 	printk(KERN_INFO "Enabled support for WMT GE raster
 acceleration\n");
 
 	return 0;
-
-error:
-	return ret;
 }

static int __devexit wmt_ge_rops_remove(struct platform_device *pdev)
--
To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#2 lore raw

PATCH 1/2 fbdev: Minor cleanup in WM8505-related code

This replaces the last remaining driver name reference with the macro for uniformity in wm8505fb.

In addition, the error return path in wmt_ge_rops.c is made more uniform by getting rid of goto's in remaining places.

---

Splitted the vsync change (will follow in PATCH 2/2) from trivial cleanups. This indeed makes sense for at least bisecting purposes. Thanks Mayuresh for the suggestion!

Best regards,
Alexey

 drivers/video/wm8505fb.c    |    2 +-
 drivers/video/wmt_ge_rops.c |   10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)
drivers/video/wm8505fb.c +1 -1
index e37251b..9ca9dbb 100644
@@ -291,7 +291,7 @@ static int __devinit wm8505fb_probe(struct platform_device *pdev)
 		goto failed_fbi;
 	}
 
-	res = request_mem_region(res->start, resource_size(res), "wm8505fb");
+	res = request_mem_region(res->start, resource_size(res), DRIVER_NAME);
 	if (res = NULL) {
 		dev_err(&pdev->dev, "failed to request I/O memory\n");
 		ret = -EBUSY;
drivers/video/wmt_ge_rops.c +2 -8
index f31883f..45832b7 100644
@@ -127,13 +127,11 @@ EXPORT_SYMBOL_GPL(wmt_ge_sync);
 static int __devinit wmt_ge_rops_probe(struct platform_device *pdev)
 {
 	struct resource *res;
-	int ret;
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (res = NULL) {
 		dev_err(&pdev->dev, "no I/O memory resource defined\n");
-		ret = -ENODEV;
-		goto error;
+		return -ENODEV;
 	}
 
 	/* Only one ROP engine is presently supported. */
@@ -145,17 +143,13 @@ static int __devinit wmt_ge_rops_probe(struct platform_device *pdev)
 	regbase = ioremap(res->start, resource_size(res));
 	if (regbase = NULL) {
 		dev_err(&pdev->dev, "failed to map I/O memory\n");
-		ret = -EBUSY;
-		goto error;
+		return -EBUSY;
 	}
 
 	writel(1, regbase + GE_ENABLE_OFF);
 	printk(KERN_INFO "Enabled support for WMT GE raster acceleration\n");
 
 	return 0;
-
-error:
-	return ret;
 }
 
 static int __devexit wmt_ge_rops_remove(struct platform_device *pdev)
Signature · 1 line
1.7.3.4
#3 lore raw

PATCH 2/2 fbdev: Modify vsync timing calculation in wm8505fb

This removes the '+1' in vsync timing calculation for wm8505fb to directly use values provided from the board setup code.

---
 drivers/video/wm8505fb.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/video/wm8505fb.c +1 -1
index 9ca9dbb..96e34a5 100644
@@ -88,7 +88,7 @@ static int wm8505fb_set_timing(struct fb_info *info)
 	int v_start = info->var.upper_margin;
 	int v_end = v_start + info->var.yres;
 	int v_all = v_end + info->var.lower_margin;
-	int v_sync = info->var.vsync_len + 1;
+	int v_sync = info->var.vsync_len;
 
 	writel(0, fbi->regbase + WMT_GOVR_TG);
 
Signature · 1 line
1.7.3.4
#4 lore raw

Re: [PATCH 2/2] fbdev: Modify vsync timing calculation in wm8505fb

Quoted 4 lines · Alexey Charkov

This removes the '+1' in vsync timing calculation for wm8505fb to directly use values provided from the board setup code.

This is queued for .37, thanks.

#5 lore raw

Re: [PATCH 2/2] fbdev: Modify vsync timing calculation in wm8505fb

2010/12/20 Paul Mundt <[email protected]>:

Quoted 8 lines · Alexey Charkov
Quoted 4 lines

This removes the '+1' in vsync timing calculation for wm8505fb to directly use values provided from the board setup code.

This is queued for .37, thanks.

Paul, in fact, relevant code is only scheduled for merge in .38 (it is in linux-next right now). This does not apply to .37.

Thanks,
Alexey

#6 lore raw

Re: [PATCH 2/2] fbdev: Modify vsync timing calculation in wm8505fb

Quoted 5 lines · Alexey Charkov

2010/12/20 Paul Mundt <[email protected]>:

Quoted 4 lines · Alexey Charkov
Quoted 3 lines

This removes the '+1' in vsync timing calculation for wm8505fb to directly use values provided from the board setup code.

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

This is queued for .37, thanks.

Paul, in fact, relevant code is only scheduled for merge in .38 (it is in linux-next right now). This does not apply to .37.

I noticed that as I went to apply it.. ok, queued for .38 then :-)

#7 lore raw
In reply to Alexey Charkov
Quoted 7 lines · Alexey Charkov

This replaces the last remaining driver name reference with the macro for uniformity in wm8505fb.

In addition, the error return path in wmt_ge_rops.c is made more uniform by getting rid of goto's in remaining places.

I'll hold on to this for .38, as there's nothing really pressing here.