Merge tag 'please-pull-misc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / input / misc / bfin_rotary.c

diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c
index 1c4146fccfdf53d7fd93a5e152998a3fabced2fa..a6666e142a91b04719efcc4f7721a66df06cad23 100644 (file)
--- a/drivers/input/misc/bfin_rotary.c
+++ b/drivers/input/misc/bfin_rotary.c
@@ -90,7 +90,7 @@ static irqreturn_t bfin_rotary_isr(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-static int __devinit bfin_rotary_probe(struct platform_device *pdev)
+static int bfin_rotary_probe(struct platform_device *pdev)
 {
        struct bfin_rotary_platform_data *pdata = pdev->dev.platform_data;
        struct bfin_rot *rotary;
@@ -196,7 +196,7 @@ out1:
        return error;
 }
 
-static int __devexit bfin_rotary_remove(struct platform_device *pdev)
+static int bfin_rotary_remove(struct platform_device *pdev)
 {
        struct bfin_rot *rotary = platform_get_drvdata(pdev);
 
@@ -255,7 +255,7 @@ static const struct dev_pm_ops bfin_rotary_pm_ops = {
 
 static struct platform_driver bfin_rotary_device_driver = {
        .probe          = bfin_rotary_probe,
-       .remove         = __devexit_p(bfin_rotary_remove),
+       .remove         = bfin_rotary_remove,
        .driver         = {
                .name   = "bfin-rotary",
                .owner  = THIS_MODULE,