All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] fbdev: Minor cleanup in WM8505-related code
@ 2010-12-19 18:13 ` Alexey Charkov
  0 siblings, 0 replies; 16+ messages in thread
From: Alexey Charkov @ 2010-12-19 18:13 UTC (permalink / raw)
  To: Paul Mundt; +Cc: linux-fbdev, linux-kernel, vt8500-wm8505-linux-kernel

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.

Signed-off-by: Alexey Charkov <alchark@gmail.com>
---

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

diff --git a/drivers/video/wm8505fb.c b/drivers/video/wm8505fb.c
index e37251b..96e34a5 100644
--- a/drivers/video/wm8505fb.c
+++ b/drivers/video/wm8505fb.c
@@ -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;
diff --git a/drivers/video/wmt_ge_rops.c b/drivers/video/wmt_ge_rops.c
index f31883f..45832b7 100644
--- a/drivers/video/wmt_ge_rops.c
+++ b/drivers/video/wmt_ge_rops.c
@@ -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)

^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2010-12-20 16:06 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-12-19 18:13 [PATCH] fbdev: Minor cleanup in WM8505-related code Alexey Charkov
2010-12-19 18:13 ` Alexey Charkov
2010-12-20  5:06 ` Janorkar, Mayuresh
2010-12-20  5:18   ` Janorkar, Mayuresh
2010-12-20 13:03   ` [PATCH 1/2] " Alexey Charkov
2010-12-20 13:03     ` Alexey Charkov
2010-12-20 13:09     ` [PATCH 2/2] fbdev: Modify vsync timing calculation in wm8505fb Alexey Charkov
2010-12-20 13:09       ` Alexey Charkov
2010-12-20 16:00       ` Paul Mundt
2010-12-20 16:00         ` Paul Mundt
2010-12-20 16:04         ` Alexey Charkov
2010-12-20 16:04           ` Alexey Charkov
2010-12-20 16:05           ` Paul Mundt
2010-12-20 16:05             ` Paul Mundt
2010-12-20 16:00     ` [PATCH 1/2] fbdev: Minor cleanup in WM8505-related code Paul Mundt
2010-12-20 16:00       ` Paul Mundt

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.