| Message ID | 1386606085-26838-15-git-send-email-balbi@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 09 Dec 2013, Felipe Balbi wrote: > By using devm_request_threaded_irq() we can drop a few extra lines of > code and rely on device managed resources layer to free our IRQ for us. > > Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi> > Signed-off-by: Felipe Balbi <balbi@ti.com> > --- > drivers/mfd/menelaus.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c > index bffe978..b87c2bd 100644 > --- a/drivers/mfd/menelaus.c > +++ b/drivers/mfd/menelaus.c > @@ -1271,8 +1271,8 @@ static int menelaus_probe(struct i2c_client *client, > /* Set output buffer strengths */ > menelaus_write_reg(m, MENELAUS_MCT_CTRL1, 0x73); > > - err = request_threaded_irq(client->irq, NULL, menelaus_irq, > - IRQF_ONESHOT, DRIVER_NAME, m); > + err = devm_request_threaded_irq(&client->dev, client->irq, > + NULL, menelaus_irq, IRQF_ONESHOT, DRIVER_NAME, m); No need for a separate patch here. Convert straight from request_irq() to devm_request_threaded_irq() in patch 3.
On Tue, Dec 10, 2013 at 09:30:42AM +0000, Lee Jones wrote: > On Mon, 09 Dec 2013, Felipe Balbi wrote: > > > By using devm_request_threaded_irq() we can drop a few extra lines of > > code and rely on device managed resources layer to free our IRQ for us. > > > > Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi> > > Signed-off-by: Felipe Balbi <balbi@ti.com> > > --- > > drivers/mfd/menelaus.c | 11 ++++------- > > 1 file changed, 4 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c > > index bffe978..b87c2bd 100644 > > --- a/drivers/mfd/menelaus.c > > +++ b/drivers/mfd/menelaus.c > > @@ -1271,8 +1271,8 @@ static int menelaus_probe(struct i2c_client *client, > > /* Set output buffer strengths */ > > menelaus_write_reg(m, MENELAUS_MCT_CTRL1, 0x73); > > > > - err = request_threaded_irq(client->irq, NULL, menelaus_irq, > > - IRQF_ONESHOT, DRIVER_NAME, m); > > + err = devm_request_threaded_irq(&client->dev, client->irq, > > + NULL, menelaus_irq, IRQF_ONESHOT, DRIVER_NAME, m); > > No need for a separate patch here. Convert straight from request_irq() > to devm_request_threaded_irq() in patch 3. that would be 2 changes in a single patch.
On Tue, 10 Dec 2013, Felipe Balbi wrote: > On Tue, Dec 10, 2013 at 09:30:42AM +0000, Lee Jones wrote: > > On Mon, 09 Dec 2013, Felipe Balbi wrote: > > > > > By using devm_request_threaded_irq() we can drop a few extra lines of > > > code and rely on device managed resources layer to free our IRQ for us. > > > > > > Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi> > > > Signed-off-by: Felipe Balbi <balbi@ti.com> > > > --- > > > drivers/mfd/menelaus.c | 11 ++++------- > > > 1 file changed, 4 insertions(+), 7 deletions(-) > > > > > > diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c > > > index bffe978..b87c2bd 100644 > > > --- a/drivers/mfd/menelaus.c > > > +++ b/drivers/mfd/menelaus.c > > > @@ -1271,8 +1271,8 @@ static int menelaus_probe(struct i2c_client *client, > > > /* Set output buffer strengths */ > > > menelaus_write_reg(m, MENELAUS_MCT_CTRL1, 0x73); > > > > > > - err = request_threaded_irq(client->irq, NULL, menelaus_irq, > > > - IRQF_ONESHOT, DRIVER_NAME, m); > > > + err = devm_request_threaded_irq(&client->dev, client->irq, > > > + NULL, menelaus_irq, IRQF_ONESHOT, DRIVER_NAME, m); > > > > No need for a separate patch here. Convert straight from request_irq() > > to devm_request_threaded_irq() in patch 3. > > that would be 2 changes in a single patch. I think it's the right thing to do.
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index bffe978..b87c2bd 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c @@ -1271,8 +1271,8 @@ static int menelaus_probe(struct i2c_client *client, /* Set output buffer strengths */ menelaus_write_reg(m, MENELAUS_MCT_CTRL1, 0x73); - err = request_threaded_irq(client->irq, NULL, menelaus_irq, - IRQF_ONESHOT, DRIVER_NAME, m); + err = devm_request_threaded_irq(&client->dev, client->irq, + NULL, menelaus_irq, IRQF_ONESHOT, DRIVER_NAME, m); if (err) { dev_dbg(&client->dev, "can't get IRQ %d, err %d\n", client->irq, err); @@ -1283,7 +1283,7 @@ static int menelaus_probe(struct i2c_client *client, val = menelaus_read_reg(m, MENELAUS_VCORE_CTRL1); if (val < 0) - goto fail_free_irq; + goto fail_free_descs; if (val & (1 << 7)) m->vcore_hw_mode = 1; else @@ -1292,14 +1292,12 @@ static int menelaus_probe(struct i2c_client *client, if (menelaus_pdata != NULL && menelaus_pdata->late_init != NULL) { err = menelaus_pdata->late_init(&client->dev); if (err < 0) - goto fail_free_irq; + goto fail_free_descs; } menelaus_rtc_init(m); return 0; -fail_free_irq: - free_irq(client->irq, m); fail_free_descs: irq_free_descs(irq_base, MENELAUS_NR_IRQS); @@ -1311,7 +1309,6 @@ static int menelaus_remove(struct i2c_client *client) { struct menelaus_chip *m = i2c_get_clientdata(client); - free_irq(client->irq, m); irq_free_descs(m->irq_base, MENELAUS_NR_IRQS); the_menelaus = NULL; return 0;