summaryrefslogtreecommitdiffstats
path: root/drivers/video/wmt_ge_rops.c
diff options
context:
space:
mode:
authorAlexey Charkov <alchark@gmail.com>2010-12-20 16:03:14 +0300
committerPaul Mundt <lethal@linux-sh.org>2010-12-21 01:05:43 +0900
commita7f53284e97af9670a68993c31f61a4e62a19ea5 (patch)
tree9469611835d11654197d671537535b4425a6cfea /drivers/video/wmt_ge_rops.c
parent521bc83b0fcda6f323f1de0e7bf137401a8145a2 (diff)
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. Signed-off-by: Alexey Charkov <alchark@gmail.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/wmt_ge_rops.c')
-rw-r--r--drivers/video/wmt_ge_rops.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/video/wmt_ge_rops.c b/drivers/video/wmt_ge_rops.c
index f31883f8eaf..45832b7ef7d 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)