Commit f0b63a1d authored by Alexandre Belloni's avatar Alexandre Belloni

rtc: rx8025: switch to managed irq allocation

Use devm_request_threaded_irq() so it is not necessary to call free_irq()
explicitly.
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent b6a57c95
...@@ -554,8 +554,9 @@ static int rx8025_probe(struct i2c_client *client, ...@@ -554,8 +554,9 @@ static int rx8025_probe(struct i2c_client *client,
if (client->irq > 0) { if (client->irq > 0) {
dev_info(&client->dev, "IRQ %d supplied\n", client->irq); dev_info(&client->dev, "IRQ %d supplied\n", client->irq);
err = request_threaded_irq(client->irq, NULL, rx8025_handle_irq, err = devm_request_threaded_irq(&client->dev, client->irq, NULL,
0, "rx8025", client); rx8025_handle_irq, 0, "rx8025",
client);
if (err) { if (err) {
dev_err(&client->dev, "unable to request IRQ\n"); dev_err(&client->dev, "unable to request IRQ\n");
goto errout; goto errout;
...@@ -567,14 +568,10 @@ static int rx8025_probe(struct i2c_client *client, ...@@ -567,14 +568,10 @@ static int rx8025_probe(struct i2c_client *client,
err = rx8025_sysfs_register(&client->dev); err = rx8025_sysfs_register(&client->dev);
if (err) if (err)
goto errout_irq; goto errout;
return 0; return 0;
errout_irq:
if (client->irq > 0)
free_irq(client->irq, client);
errout: errout:
dev_err(&adapter->dev, "probing for rx8025 failed\n"); dev_err(&adapter->dev, "probing for rx8025 failed\n");
return err; return err;
...@@ -582,9 +579,6 @@ static int rx8025_probe(struct i2c_client *client, ...@@ -582,9 +579,6 @@ static int rx8025_probe(struct i2c_client *client,
static int rx8025_remove(struct i2c_client *client) static int rx8025_remove(struct i2c_client *client)
{ {
if (client->irq > 0)
free_irq(client->irq, client);
rx8025_sysfs_unregister(&client->dev); rx8025_sysfs_unregister(&client->dev);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment