diff options
Diffstat (limited to 'drivers/watchdog/cpwd.c')
-rw-r--r-- | drivers/watchdog/cpwd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c index 95b1b954de1b..11d55ce5ca81 100644 --- a/drivers/watchdog/cpwd.c +++ b/drivers/watchdog/cpwd.c | |||
@@ -528,7 +528,7 @@ static const struct file_operations cpwd_fops = { | |||
528 | .llseek = no_llseek, | 528 | .llseek = no_llseek, |
529 | }; | 529 | }; |
530 | 530 | ||
531 | static int __devinit cpwd_probe(struct platform_device *op) | 531 | static int cpwd_probe(struct platform_device *op) |
532 | { | 532 | { |
533 | struct device_node *options; | 533 | struct device_node *options; |
534 | const char *str_prop; | 534 | const char *str_prop; |
@@ -640,7 +640,7 @@ out_free: | |||
640 | goto out; | 640 | goto out; |
641 | } | 641 | } |
642 | 642 | ||
643 | static int __devexit cpwd_remove(struct platform_device *op) | 643 | static int cpwd_remove(struct platform_device *op) |
644 | { | 644 | { |
645 | struct cpwd *p = dev_get_drvdata(&op->dev); | 645 | struct cpwd *p = dev_get_drvdata(&op->dev); |
646 | int i; | 646 | int i; |
@@ -684,7 +684,7 @@ static struct platform_driver cpwd_driver = { | |||
684 | .of_match_table = cpwd_match, | 684 | .of_match_table = cpwd_match, |
685 | }, | 685 | }, |
686 | .probe = cpwd_probe, | 686 | .probe = cpwd_probe, |
687 | .remove = __devexit_p(cpwd_remove), | 687 | .remove = cpwd_remove, |
688 | }; | 688 | }; |
689 | 689 | ||
690 | module_platform_driver(cpwd_driver); | 690 | module_platform_driver(cpwd_driver); |