Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[cascardo/linux.git] / drivers / mfd / pcf50633-adc.c

diff --git a/drivers/mfd/pcf50633-adc.c b/drivers/mfd/pcf50633-adc.c
index 3927c17..18b53cb 100644 (file)
--- a/drivers/mfd/pcf50633-adc.c
+++ b/drivers/mfd/pcf50633-adc.c
@@ -199,7 +199,7 @@ static void pcf50633_adc_irq(int irq, void *data)
        kfree(req);
 }
 
-static int __devinit pcf50633_adc_probe(struct platform_device *pdev)
+static int pcf50633_adc_probe(struct platform_device *pdev)
 {
        struct pcf50633_adc *adc;
 
@@ -218,7 +218,7 @@ static int __devinit pcf50633_adc_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int __devexit pcf50633_adc_remove(struct platform_device *pdev)
+static int pcf50633_adc_remove(struct platform_device *pdev)
 {
        struct pcf50633_adc *adc = platform_get_drvdata(pdev);
        int i, head;
@@ -246,7 +246,7 @@ static struct platform_driver pcf50633_adc_driver = {
                .name = "pcf50633-adc",
        },
        .probe = pcf50633_adc_probe,
-       .remove = __devexit_p(pcf50633_adc_remove),
+       .remove = pcf50633_adc_remove,
 };
 
 module_platform_driver(pcf50633_adc_driver);