mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
leds: convert Renesas TPU LED driver to devm_kzalloc() and cleanup error exit path
Cc: Magnus Damm <damm@opensource.se> Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
This commit is contained in:
parent
94ca4bccac
commit
bfe4c04193
1 changed files with 9 additions and 14 deletions
|
@ -243,31 +243,30 @@ static int __devinit r_tpu_probe(struct platform_device *pdev)
|
|||
struct led_renesas_tpu_config *cfg = pdev->dev.platform_data;
|
||||
struct r_tpu_priv *p;
|
||||
struct resource *res;
|
||||
int ret = -ENXIO;
|
||||
int ret;
|
||||
|
||||
if (!cfg) {
|
||||
dev_err(&pdev->dev, "missing platform data\n");
|
||||
goto err0;
|
||||
}
|
||||
|
||||
p = kzalloc(sizeof(*p), GFP_KERNEL);
|
||||
p = devm_kzalloc(&pdev->dev, sizeof(*p), GFP_KERNEL);
|
||||
if (p == NULL) {
|
||||
dev_err(&pdev->dev, "failed to allocate driver data\n");
|
||||
ret = -ENOMEM;
|
||||
goto err0;
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
if (!res) {
|
||||
dev_err(&pdev->dev, "failed to get I/O memory\n");
|
||||
goto err1;
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
/* map memory, let mapbase point to our channel */
|
||||
p->mapbase = ioremap_nocache(res->start, resource_size(res));
|
||||
if (p->mapbase == NULL) {
|
||||
dev_err(&pdev->dev, "failed to remap I/O memory\n");
|
||||
goto err1;
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
/* get hold of clock */
|
||||
|
@ -275,7 +274,7 @@ static int __devinit r_tpu_probe(struct platform_device *pdev)
|
|||
if (IS_ERR(p->clk)) {
|
||||
dev_err(&pdev->dev, "cannot get clock\n");
|
||||
ret = PTR_ERR(p->clk);
|
||||
goto err2;
|
||||
goto err0;
|
||||
}
|
||||
|
||||
p->pdev = pdev;
|
||||
|
@ -294,7 +293,7 @@ static int __devinit r_tpu_probe(struct platform_device *pdev)
|
|||
p->ldev.flags |= LED_CORE_SUSPENDRESUME;
|
||||
ret = led_classdev_register(&pdev->dev, &p->ldev);
|
||||
if (ret < 0)
|
||||
goto err3;
|
||||
goto err1;
|
||||
|
||||
/* max_brightness may be updated by the LED core code */
|
||||
p->min_rate = p->ldev.max_brightness * p->refresh_rate;
|
||||
|
@ -302,14 +301,11 @@ static int __devinit r_tpu_probe(struct platform_device *pdev)
|
|||
pm_runtime_enable(&pdev->dev);
|
||||
return 0;
|
||||
|
||||
err3:
|
||||
err1:
|
||||
r_tpu_set_pin(p, R_TPU_PIN_UNUSED, LED_OFF);
|
||||
clk_put(p->clk);
|
||||
err2:
|
||||
iounmap(p->mapbase);
|
||||
err1:
|
||||
kfree(p);
|
||||
err0:
|
||||
iounmap(p->mapbase);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -327,7 +323,6 @@ static int __devexit r_tpu_remove(struct platform_device *pdev)
|
|||
clk_put(p->clk);
|
||||
|
||||
iounmap(p->mapbase);
|
||||
kfree(p);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue