mirror of
https://github.com/torvalds/linux.git
synced 2024-12-29 06:12:08 +00:00
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>
This commit is contained in:
parent
521bc83b0f
commit
a7f53284e9
@ -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;
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user