mfd: twl4030-madc: 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>
This commit is contained in:
parent
96ac2d1a3a
commit
c3d6a0a319
@ -775,12 +775,10 @@ static int twl4030_madc_probe(struct platform_device *pdev)
|
|||||||
IRQF_TRIGGER_RISING, "twl4030_madc", madc);
|
IRQF_TRIGGER_RISING, "twl4030_madc", madc);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
dev_dbg(&pdev->dev, "could not request irq\n");
|
dev_dbg(&pdev->dev, "could not request irq\n");
|
||||||
goto err_irq;
|
goto err_i2c;
|
||||||
}
|
}
|
||||||
twl4030_madc = madc;
|
twl4030_madc = madc;
|
||||||
return 0;
|
return 0;
|
||||||
err_irq:
|
|
||||||
platform_set_drvdata(pdev, NULL);
|
|
||||||
err_i2c:
|
err_i2c:
|
||||||
twl4030_madc_set_current_generator(madc, 0, 0);
|
twl4030_madc_set_current_generator(madc, 0, 0);
|
||||||
err_current_generator:
|
err_current_generator:
|
||||||
@ -796,7 +794,6 @@ static int twl4030_madc_remove(struct platform_device *pdev)
|
|||||||
struct twl4030_madc_data *madc = platform_get_drvdata(pdev);
|
struct twl4030_madc_data *madc = platform_get_drvdata(pdev);
|
||||||
|
|
||||||
free_irq(platform_get_irq(pdev, 0), madc);
|
free_irq(platform_get_irq(pdev, 0), madc);
|
||||||
platform_set_drvdata(pdev, NULL);
|
|
||||||
twl4030_madc_set_current_generator(madc, 0, 0);
|
twl4030_madc_set_current_generator(madc, 0, 0);
|
||||||
twl4030_madc_set_power(madc, 0);
|
twl4030_madc_set_power(madc, 0);
|
||||||
kfree(madc);
|
kfree(madc);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user