Merge tag 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty...

[deliverable/linux.git] / drivers / rtc / rtc-pl030.c

diff --git a/drivers/rtc/rtc-pl030.c b/drivers/rtc/rtc-pl030.c
index 02111fee077e423140966159787ee8cef7660706..22bacdbf9139dce42e82754ec9de7c061dea755e 100644 (file)
--- a/drivers/rtc/rtc-pl030.c
+++ b/drivers/rtc/rtc-pl030.c
@@ -123,7 +123,7 @@ static int pl030_probe(struct amba_device *dev, const struct amba_id *id)
 
        amba_set_drvdata(dev, rtc);
 
-       ret = request_irq(dev->irq[0], pl030_interrupt, IRQF_DISABLED,
+       ret = request_irq(dev->irq[0], pl030_interrupt, 0,
                          "rtc-pl030", rtc);
        if (ret)
                goto err_irq;
@@ -185,18 +185,7 @@ static struct amba_driver pl030_driver = {
        .id_table       = pl030_ids,
 };
 
-static int __init pl030_init(void)
-{
-       return amba_driver_register(&pl030_driver);
-}
-
-static void __exit pl030_exit(void)
-{
-       amba_driver_unregister(&pl030_driver);
-}
-
-module_init(pl030_init);
-module_exit(pl030_exit);
+module_amba_driver(pl030_driver);
 
 MODULE_AUTHOR("Russell King <rmk@arm.linux.org.uk>");
 MODULE_DESCRIPTION("ARM AMBA PL030 RTC Driver");