Merge tag 'for-3.8-rc1' of git://gitorious.org/linux-pwm/linux-pwm

[karo-tx-linux.git] / drivers / pwm / pwm-tiehrpwm.c

diff --git a/drivers/pwm/pwm-tiehrpwm.c b/drivers/pwm/pwm-tiehrpwm.c
index 542d5f38ccf62f295d5e7b9db8dc5f6ac45183f9..72a6dd40c9ec5a566ccdffaffe69d8d4cc13f0af 100644 (file)
--- a/drivers/pwm/pwm-tiehrpwm.c
+++ b/drivers/pwm/pwm-tiehrpwm.c
@@ -409,7 +409,7 @@ static const struct of_device_id ehrpwm_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, ehrpwm_of_match);
 
-static int __devinit ehrpwm_pwm_probe(struct platform_device *pdev)
+static int ehrpwm_pwm_probe(struct platform_device *pdev)
 {
        int ret;
        struct resource *r;
@@ -493,7 +493,7 @@ pwmss_clk_failure:
        return ret;
 }
 
-static int __devexit ehrpwm_pwm_remove(struct platform_device *pdev)
+static int ehrpwm_pwm_remove(struct platform_device *pdev)
 {
        struct ehrpwm_pwm_chip *pc = platform_get_drvdata(pdev);
 
@@ -517,7 +517,7 @@ static struct platform_driver ehrpwm_pwm_driver = {
                .of_match_table = ehrpwm_of_match,
        },
        .probe = ehrpwm_pwm_probe,
-       .remove = __devexit_p(ehrpwm_pwm_remove),
+       .remove = ehrpwm_pwm_remove,
 };
 
 module_platform_driver(ehrpwm_pwm_driver);