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

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / pwm / pwm-tiecap.c

diff --git a/drivers/pwm/pwm-tiecap.c b/drivers/pwm/pwm-tiecap.c
index b4f9d4756d584da21dda71f0cabd169ca6d05479..5cf016dd982238f4dac9ba5e4da12194d0e614aa 100644 (file)
--- a/drivers/pwm/pwm-tiecap.c
+++ b/drivers/pwm/pwm-tiecap.c
@@ -194,7 +194,7 @@ static const struct of_device_id ecap_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, ecap_of_match);
 
-static int __devinit ecap_pwm_probe(struct platform_device *pdev)
+static int ecap_pwm_probe(struct platform_device *pdev)
 {
        int ret;
        struct resource *r;
@@ -271,7 +271,7 @@ pwmss_clk_failure:
        return ret;
 }
 
-static int __devexit ecap_pwm_remove(struct platform_device *pdev)
+static int ecap_pwm_remove(struct platform_device *pdev)
 {
        struct ecap_pwm_chip *pc = platform_get_drvdata(pdev);
 
@@ -295,7 +295,7 @@ static struct platform_driver ecap_pwm_driver = {
                .of_match_table = ecap_of_match,
        },
        .probe = ecap_pwm_probe,
-       .remove = __devexit_p(ecap_pwm_remove),
+       .remove = ecap_pwm_remove,
 };
 
 module_platform_driver(ecap_pwm_driver);