Merge tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / hwmon / da9052-hwmon.c

diff --git a/drivers/hwmon/da9052-hwmon.c b/drivers/hwmon/da9052-hwmon.c
index 19704948801c4b93de48b89d7b24cf5a8493624f..ab4452c5a98c629c1d66b583d7ccd1ac359d5ea5 100644 (file)
--- a/drivers/hwmon/da9052-hwmon.c
+++ b/drivers/hwmon/da9052-hwmon.c
@@ -270,7 +270,7 @@ static struct attribute *da9052_attr[] = {
 
 static const struct attribute_group da9052_attr_group = {.attrs = da9052_attr};
 
-static int __devinit da9052_hwmon_probe(struct platform_device *pdev)
+static int da9052_hwmon_probe(struct platform_device *pdev)
 {
        struct da9052_hwmon *hwmon;
        int ret;
@@ -303,7 +303,7 @@ err_mem:
        return ret;
 }
 
-static int __devexit da9052_hwmon_remove(struct platform_device *pdev)
+static int da9052_hwmon_remove(struct platform_device *pdev)
 {
        struct da9052_hwmon *hwmon = platform_get_drvdata(pdev);
 
@@ -315,7 +315,7 @@ static int __devexit da9052_hwmon_remove(struct platform_device *pdev)
 
 static struct platform_driver da9052_hwmon_driver = {
        .probe = da9052_hwmon_probe,
-       .remove = __devexit_p(da9052_hwmon_remove),
+       .remove = da9052_hwmon_remove,
        .driver = {
                .name = "da9052-hwmon",
                .owner = THIS_MODULE,