Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6

[mirror_ubuntu-bionic-kernel.git] / drivers / hwspinlock / u8500_hsem.c

diff --git a/drivers/hwspinlock/u8500_hsem.c b/drivers/hwspinlock/u8500_hsem.c
index 86980fe041179e388007bb042dfde84a667acf59..401c33bcdb455eb873191701247c82bee56d824e 100644 (file)
--- a/drivers/hwspinlock/u8500_hsem.c
+++ b/drivers/hwspinlock/u8500_hsem.c
@@ -91,7 +91,7 @@ static const struct hwspinlock_ops u8500_hwspinlock_ops = {
        .relax          = u8500_hsem_relax,
 };
 
-static int __devinit u8500_hsem_probe(struct platform_device *pdev)
+static int u8500_hsem_probe(struct platform_device *pdev)
 {
        struct hwspinlock_pdata *pdata = pdev->dev.platform_data;
        struct hwspinlock_device *bank;
@@ -148,7 +148,7 @@ iounmap_base:
        return ret;
 }
 
-static int __devexit u8500_hsem_remove(struct platform_device *pdev)
+static int u8500_hsem_remove(struct platform_device *pdev)
 {
        struct hwspinlock_device *bank = platform_get_drvdata(pdev);
        void __iomem *io_base = bank->lock[0].priv - HSEM_REGISTER_OFFSET;
@@ -172,7 +172,7 @@ static int __devexit u8500_hsem_remove(struct platform_device *pdev)
 
 static struct platform_driver u8500_hsem_driver = {
        .probe          = u8500_hsem_probe,
-       .remove         = __devexit_p(u8500_hsem_remove),
+       .remove         = u8500_hsem_remove,
        .driver         = {
                .name   = "u8500_hsem",
                .owner  = THIS_MODULE,