]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: 88pm860x: Remove redundant platform_set_drvdata()
authorSachin Kamat <sachin.kamat@linaro.org>
Fri, 3 May 2013 09:09:23 +0000 (14:39 +0530)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 12 May 2013 16:19:53 +0000 (20:19 +0400)
Commit 0998d06310 (device-core: Ensure drvdata = NULL when no
driver is bound) removes the need to set driver data field to
NULL.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/88pm860x-codec.c

index 60159c07448da792e62e8e68f61e7d48d7ec04a4..1382f3f3f4bf7fa87a2002105364e8bd5bae324d 100644 (file)
@@ -1444,7 +1444,7 @@ static int pm860x_codec_probe(struct platform_device *pdev)
                res = platform_get_resource(pdev, IORESOURCE_IRQ, i);
                if (!res) {
                        dev_err(&pdev->dev, "Failed to get IRQ resources\n");
-                       goto out;
+                       return -EINVAL;
                }
                pm860x->irq[i] = res->start + chip->irq_base;
                strncpy(pm860x->name[i], res->name, MAX_NAME_LEN);
@@ -1454,19 +1454,14 @@ static int pm860x_codec_probe(struct platform_device *pdev)
                                     pm860x_dai, ARRAY_SIZE(pm860x_dai));
        if (ret) {
                dev_err(&pdev->dev, "Failed to register codec\n");
-               goto out;
+               return -EINVAL;
        }
        return ret;
-
-out:
-       platform_set_drvdata(pdev, NULL);
-       return -EINVAL;
 }
 
 static int pm860x_codec_remove(struct platform_device *pdev)
 {
        snd_soc_unregister_codec(&pdev->dev);
-       platform_set_drvdata(pdev, NULL);
        return 0;
 }