checkpatch: prefer strscpy to strlcpy

[linux-2.6-microblaze.git] / drivers / pwm / pwm-zx.c

diff --git a/drivers/pwm/pwm-zx.c b/drivers/pwm/pwm-zx.c
index e2c21cc..34e9119 100644 (file)
--- a/drivers/pwm/pwm-zx.c
+++ b/drivers/pwm/pwm-zx.c
@@ -196,7 +196,6 @@ static const struct pwm_ops zx_pwm_ops = {
 static int zx_pwm_probe(struct platform_device *pdev)
 {
        struct zx_pwm_chip *zpc;
-       struct resource *res;
        unsigned int i;
        int ret;
 
@@ -204,8 +203,7 @@ static int zx_pwm_probe(struct platform_device *pdev)
        if (!zpc)
                return -ENOMEM;
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       zpc->base = devm_ioremap_resource(&pdev->dev, res);
+       zpc->base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(zpc->base))
                return PTR_ERR(zpc->base);
 
@@ -238,6 +236,7 @@ static int zx_pwm_probe(struct platform_device *pdev)
        ret = pwmchip_add(&zpc->chip);
        if (ret < 0) {
                dev_err(&pdev->dev, "failed to add PWM chip: %d\n", ret);
+               clk_disable_unprepare(zpc->pclk);
                return ret;
        }