From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from saturn.retrosnub.co.uk ([178.18.118.26]:43150 "EHLO saturn.retrosnub.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752487AbaBOJwz (ORCPT ); Sat, 15 Feb 2014 04:52:55 -0500 Message-ID: <52FF391B.4030600@kernel.org> Date: Sat, 15 Feb 2014 09:53:31 +0000 From: Jonathan Cameron MIME-Version: 1.0 To: Hartmut Knaack , linux-iio@vger.kernel.org Subject: Re: [PATCH V2 2/2]staging:iio:ad799x fix error_free_irq, use devm_request_threaded_irq References: <52C49EED.5000206@gmx.de> In-Reply-To: <52C49EED.5000206@gmx.de> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Sender: linux-iio-owner@vger.kernel.org List-Id: linux-iio@vger.kernel.org On 01/01/14 23:04, Hartmut Knaack wrote: > Move to devm_request_threaded_irq to make device-removal easier. > > Signed-off-by: Hartmut Knaack Applied to the togreg branch of iio.git I took the short description above and used it as the patch title as it was more accurate after the patch split up. > --- > diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c > index 3deb390..bc886f6 100644 > --- a/drivers/staging/iio/adc/ad799x_core.c > +++ b/drivers/staging/iio/adc/ad799x_core.c > @@ -573,25 +573,23 @@ static int ad799x_probe(struct i2c_client *client, > goto error_disable_reg; > > if (client->irq > 0) { > - ret = request_threaded_irq(client->irq, > - NULL, > - ad799x_event_handler, > - IRQF_TRIGGER_FALLING | > - IRQF_ONESHOT, > - client->name, > - indio_dev); > + ret = devm_request_threaded_irq(&client->dev, > + client->irq, > + NULL, > + ad799x_event_handler, > + IRQF_TRIGGER_FALLING | > + IRQF_ONESHOT, > + client->name, > + indio_dev); > if (ret) > goto error_cleanup_ring; > } > ret = iio_device_register(indio_dev); > if (ret) > - goto error_free_irq; > + goto error_cleanup_ring; > > return 0; > > -error_free_irq: > - if (client->irq > 0) > - free_irq(client->irq, indio_dev); > error_cleanup_ring: > ad799x_ring_cleanup(indio_dev); > error_disable_reg: > @@ -607,8 +605,6 @@ static int ad799x_remove(struct i2c_client *client) > struct ad799x_state *st = iio_priv(indio_dev); > > iio_device_unregister(indio_dev); > - if (client->irq > 0) > - free_irq(client->irq, indio_dev); > > ad799x_ring_cleanup(indio_dev); > if (!IS_ERR(st->reg)) > -- > To unsubscribe from this list: send the line "unsubscribe linux-iio" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >