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: Alexandre Belloni <alexandre.belloni@free-electrons.com>

diff --git a/drivers/rtc/rtc-rx8025.c b/drivers/rtc/rtc-rx8025.c
index d8737713135d8855ecc79be11b2d2b7ec98f4e0e..be91e922a139d23025504443577dd2900dd25bf4 100644 (file)
--- a/drivers/rtc/rtc-rx8025.c
+++ b/drivers/rtc/rtc-rx8025.c
@@ -554,8 +554,9 @@ static int rx8025_probe(struct i2c_client *client,
 
        if (client->irq > 0) {
                dev_info(&client->dev, "IRQ %d supplied\n", client->irq);
-               err = request_threaded_irq(client->irq, NULL, rx8025_handle_irq,
-                                 0, "rx8025", client);
+               err = devm_request_threaded_irq(&client->dev, client->irq, NULL,
+                                               rx8025_handle_irq, 0, "rx8025",
+                                               client);
                if (err) {
                        dev_err(&client->dev, "unable to request IRQ\n");
                        goto errout;
@@ -567,14 +568,10 @@ static int rx8025_probe(struct i2c_client *client,
 
        err = rx8025_sysfs_register(&client->dev);
        if (err)
-               goto errout_irq;
+               goto errout;
 
        return 0;
 
-errout_irq:
-       if (client->irq > 0)
-               free_irq(client->irq, client);
-
 errout:
        dev_err(&adapter->dev, "probing for rx8025 failed\n");
        return err;
@@ -582,9 +579,6 @@ errout:
 
 static int rx8025_remove(struct i2c_client *client)
 {
-       if (client->irq > 0)
-               free_irq(client->irq, client);
-
        rx8025_sysfs_unregister(&client->dev);
        return 0;
 }