Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw

[cascardo/linux.git] / drivers / mfd / pm8921-core.c

diff --git a/drivers/mfd/pm8921-core.c b/drivers/mfd/pm8921-core.c
index e873b15..d4b297c 100644 (file)
--- a/drivers/mfd/pm8921-core.c
+++ b/drivers/mfd/pm8921-core.c
@@ -80,7 +80,7 @@ static struct pm8xxx_drvdata pm8921_drvdata = {
        .pmic_read_irq_stat     = pm8921_read_irq_stat,
 };
 
-static int __devinit pm8921_add_subdevices(const struct pm8921_platform_data
+static int pm8921_add_subdevices(const struct pm8921_platform_data
                                           *pdata,
                                           struct pm8921 *pmic,
                                           u32 rev)
@@ -104,7 +104,7 @@ static int __devinit pm8921_add_subdevices(const struct pm8921_platform_data
        return ret;
 }
 
-static int __devinit pm8921_probe(struct platform_device *pdev)
+static int pm8921_probe(struct platform_device *pdev)
 {
        const struct pm8921_platform_data *pdata = pdev->dev.platform_data;
        struct pm8921 *pmic;
@@ -165,7 +165,7 @@ err_read_rev:
        return rc;
 }
 
-static int __devexit pm8921_remove(struct platform_device *pdev)
+static int pm8921_remove(struct platform_device *pdev)
 {
        struct pm8xxx_drvdata *drvdata;
        struct pm8921 *pmic = NULL;
@@ -187,7 +187,7 @@ static int __devexit pm8921_remove(struct platform_device *pdev)
 
 static struct platform_driver pm8921_driver = {
        .probe          = pm8921_probe,
-       .remove         = __devexit_p(pm8921_remove),
+       .remove         = pm8921_remove,
        .driver         = {
                .name   = "pm8921-core",
                .owner  = THIS_MODULE,