| Message ID | 20171108155020.3851-3-andi@etezian.org (mailing list archive) |
|---|---|
| State | Under Review |
| Headers | show |
Hi Andi, On Wed, Nov 08, 2017 at 05:50:19PM +0200, Andi Shyti wrote: > Use the ad7877_disable() as a custom action when the driver gets > removed instead of calling it from the remove function. > > Because ad7877_remove() was just calling the disable function, > get rid of it. > There is not reason why this change needs to be split from the first one; I folded it back in and applied, thank you. > CC: Michael Hennerich <michael.hennerich@analog.com> > Signed-off-by: Andi Shyti <andi@etezian.org> > --- > drivers/input/touchscreen/ad7877.c | 20 +++++++------------- > 1 file changed, 7 insertions(+), 13 deletions(-) > > diff --git a/drivers/input/touchscreen/ad7877.c b/drivers/input/touchscreen/ad7877.c > index dd59e4a5eb7d..04ab8fbc8184 100644 > --- a/drivers/input/touchscreen/ad7877.c > +++ b/drivers/input/touchscreen/ad7877.c > @@ -417,8 +417,10 @@ static irqreturn_t ad7877_irq(int irq, void *handle) > return IRQ_HANDLED; > } > > -static void ad7877_disable(struct ad7877 *ts) > +static void ad7877_disable(void *data) > { > + struct ad7877 *ts = data; > + > mutex_lock(&ts->mutex); > > if (!ts->disabled) { > @@ -712,6 +714,10 @@ static int ad7877_probe(struct spi_device *spi) > if (!ts || !input_dev) > return -ENOMEM; > > + err = devm_add_action_or_reset(&spi->dev, ad7877_disable, ts); > + if (err) > + return err; > + > spi_set_drvdata(spi, ts); > ts->spi = spi; > ts->input = input_dev; > @@ -787,17 +793,6 @@ static int ad7877_probe(struct spi_device *spi) > return input_register_device(input_dev); > } > > -static int ad7877_remove(struct spi_device *spi) > -{ > - struct ad7877 *ts = spi_get_drvdata(spi); > - > - ad7877_disable(ts); > - > - dev_dbg(&spi->dev, "unregistered touchscreen\n"); > - > - return 0; > -} > - > static int __maybe_unused ad7877_suspend(struct device *dev) > { > struct ad7877 *ts = dev_get_drvdata(dev); > @@ -824,7 +819,6 @@ static struct spi_driver ad7877_driver = { > .pm = &ad7877_pm, > }, > .probe = ad7877_probe, > - .remove = ad7877_remove, > }; > > module_spi_driver(ad7877_driver); > -- > 2.15.0 >
diff --git a/drivers/input/touchscreen/ad7877.c b/drivers/input/touchscreen/ad7877.c index dd59e4a5eb7d..04ab8fbc8184 100644 --- a/drivers/input/touchscreen/ad7877.c +++ b/drivers/input/touchscreen/ad7877.c @@ -417,8 +417,10 @@ static irqreturn_t ad7877_irq(int irq, void *handle) return IRQ_HANDLED; } -static void ad7877_disable(struct ad7877 *ts) +static void ad7877_disable(void *data) { + struct ad7877 *ts = data; + mutex_lock(&ts->mutex); if (!ts->disabled) { @@ -712,6 +714,10 @@ static int ad7877_probe(struct spi_device *spi) if (!ts || !input_dev) return -ENOMEM; + err = devm_add_action_or_reset(&spi->dev, ad7877_disable, ts); + if (err) + return err; + spi_set_drvdata(spi, ts); ts->spi = spi; ts->input = input_dev; @@ -787,17 +793,6 @@ static int ad7877_probe(struct spi_device *spi) return input_register_device(input_dev); } -static int ad7877_remove(struct spi_device *spi) -{ - struct ad7877 *ts = spi_get_drvdata(spi); - - ad7877_disable(ts); - - dev_dbg(&spi->dev, "unregistered touchscreen\n"); - - return 0; -} - static int __maybe_unused ad7877_suspend(struct device *dev) { struct ad7877 *ts = dev_get_drvdata(dev); @@ -824,7 +819,6 @@ static struct spi_driver ad7877_driver = { .pm = &ad7877_pm, }, .probe = ad7877_probe, - .remove = ad7877_remove, }; module_spi_driver(ad7877_driver);
Use the ad7877_disable() as a custom action when the driver gets removed instead of calling it from the remove function. Because ad7877_remove() was just calling the disable function, get rid of it. CC: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Andi Shyti <andi@etezian.org> --- drivers/input/touchscreen/ad7877.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)