diff options
| author | Sachin Kamat | 2013-05-03 11:09:23 +0200 |
|---|---|---|
| committer | Mark Brown | 2013-05-12 18:19:53 +0200 |
| commit | b1d9e66c1c8d0e4ad29328c4f37266f292d722d3 (patch) | |
| tree | b9718597e4ca5d4f9e6ef9ac9745e18fe21c6488 /sound/soc/codecs/88pm860x-codec.c | |
| parent | Linux 3.10-rc1 (diff) | |
| download | kernel-qcow2-linux-b1d9e66c1c8d0e4ad29328c4f37266f292d722d3.tar.gz kernel-qcow2-linux-b1d9e66c1c8d0e4ad29328c4f37266f292d722d3.tar.xz kernel-qcow2-linux-b1d9e66c1c8d0e4ad29328c4f37266f292d722d3.zip | |
ASoC: 88pm860x: Remove redundant platform_set_drvdata()
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>
Diffstat (limited to 'sound/soc/codecs/88pm860x-codec.c')
| -rw-r--r-- | sound/soc/codecs/88pm860x-codec.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c index 60159c07448d..1382f3f3f4bf 100644 --- a/sound/soc/codecs/88pm860x-codec.c +++ b/sound/soc/codecs/88pm860x-codec.c @@ -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; } |