| Message ID | 1367576922-31459-2-git-send-email-sachin.kamat@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Around Fri 03 May 2013 15:58:35 +0530 or thereabout, Sachin Kamat wrote: > 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> > Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no> > Cc: Mark Brown <broonie@kernel.org> Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no> > --- > drivers/input/touchscreen/atmel-wm97xx.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/input/touchscreen/atmel-wm97xx.c b/drivers/input/touchscreen/atmel-wm97xx.c > index 2c1e46b..268a35e 100644 > --- a/drivers/input/touchscreen/atmel-wm97xx.c > +++ b/drivers/input/touchscreen/atmel-wm97xx.c > @@ -372,7 +372,6 @@ static int __init atmel_wm97xx_probe(struct platform_device *pdev) > err_irq: > free_irq(atmel_wm97xx->ac97c_irq, atmel_wm97xx); > err: > - platform_set_drvdata(pdev, NULL); > kfree(atmel_wm97xx); > return ret; > } > @@ -386,7 +385,6 @@ static int __exit atmel_wm97xx_remove(struct platform_device *pdev) > free_irq(atmel_wm97xx->ac97c_irq, atmel_wm97xx); > del_timer_sync(&atmel_wm97xx->pen_timer); > wm97xx_unregister_mach_ops(wm); > - platform_set_drvdata(pdev, NULL); > kfree(atmel_wm97xx); > > return 0;
diff --git a/drivers/input/touchscreen/atmel-wm97xx.c b/drivers/input/touchscreen/atmel-wm97xx.c index 2c1e46b..268a35e 100644 --- a/drivers/input/touchscreen/atmel-wm97xx.c +++ b/drivers/input/touchscreen/atmel-wm97xx.c @@ -372,7 +372,6 @@ static int __init atmel_wm97xx_probe(struct platform_device *pdev) err_irq: free_irq(atmel_wm97xx->ac97c_irq, atmel_wm97xx); err: - platform_set_drvdata(pdev, NULL); kfree(atmel_wm97xx); return ret; } @@ -386,7 +385,6 @@ static int __exit atmel_wm97xx_remove(struct platform_device *pdev) free_irq(atmel_wm97xx->ac97c_irq, atmel_wm97xx); del_timer_sync(&atmel_wm97xx->pen_timer); wm97xx_unregister_mach_ops(wm); - platform_set_drvdata(pdev, NULL); kfree(atmel_wm97xx); return 0;
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> Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no> Cc: Mark Brown <broonie@kernel.org> --- drivers/input/touchscreen/atmel-wm97xx.c | 2 -- 1 file changed, 2 deletions(-)