diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-05-06 00:06:31 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-06-11 13:27:52 -0400 |
commit | 96ac2d1a3a352ce1f4d669ad222677ba2ed76271 (patch) | |
tree | 065f6713addb1c898041dadfaa4a5818f6c3c328 /drivers/mfd/twl4030-audio.c | |
parent | 9f74f5b541c2994c7cad4c450323913bff67fab7 (diff) |
mfd: twl4030-audio: Remove unnecessary platform_set_drvdata()
The driver core clears the driver data to NULL after device_release
or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d
(device-core: Ensure drvdata = NULL when no driver is bound).
Thus, it is not needed to manually clear the device driver data to NULL.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/twl4030-audio.c')
-rw-r--r-- | drivers/mfd/twl4030-audio.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c index d2ab222138c2..a31fba96ef43 100644 --- a/drivers/mfd/twl4030-audio.c +++ b/drivers/mfd/twl4030-audio.c | |||
@@ -261,10 +261,8 @@ static int twl4030_audio_probe(struct platform_device *pdev) | |||
261 | ret = -ENODEV; | 261 | ret = -ENODEV; |
262 | } | 262 | } |
263 | 263 | ||
264 | if (ret) { | 264 | if (ret) |
265 | platform_set_drvdata(pdev, NULL); | ||
266 | twl4030_audio_dev = NULL; | 265 | twl4030_audio_dev = NULL; |
267 | } | ||
268 | 266 | ||
269 | return ret; | 267 | return ret; |
270 | } | 268 | } |
@@ -272,7 +270,6 @@ static int twl4030_audio_probe(struct platform_device *pdev) | |||
272 | static int twl4030_audio_remove(struct platform_device *pdev) | 270 | static int twl4030_audio_remove(struct platform_device *pdev) |
273 | { | 271 | { |
274 | mfd_remove_devices(&pdev->dev); | 272 | mfd_remove_devices(&pdev->dev); |
275 | platform_set_drvdata(pdev, NULL); | ||
276 | twl4030_audio_dev = NULL; | 273 | twl4030_audio_dev = NULL; |
277 | 274 | ||
278 | return 0; | 275 | return 0; |