diff options
| author | Alexey Charkov <alchark@gmail.com> | 2010-12-20 16:03:14 +0300 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-20 19:05:43 +0300 |
| commit | a7f53284e97af9670a68993c31f61a4e62a19ea5 (patch) | |
| tree | 9469611835d11654197d671537535b4425a6cfea | |
| parent | 521bc83b0fcda6f323f1de0e7bf137401a8145a2 (diff) | |
| download | linux-a7f53284e97af9670a68993c31f61a4e62a19ea5.tar.xz | |
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>
| -rw-r--r-- | drivers/video/wm8505fb.c | 2 | ||||
| -rw-r--r-- | drivers/video/wmt_ge_rops.c | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/drivers/video/wm8505fb.c b/drivers/video/wm8505fb.c index e37251b792c9..9ca9dbb62f96 100644 --- a/drivers/video/wm8505fb.c +++ b/drivers/video/wm8505fb.c @@ -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 f31883f8eaf7..45832b7ef7d2 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) |