projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
rtc
/
rtc-pcf50633.c
diff --git
a/drivers/rtc/rtc-pcf50633.c
b/drivers/rtc/rtc-pcf50633.c
index a20202f9ee577d5ec477630c4a8073b7ed8abee0..e9f3135d305ff35eb4594dd6e35dfaee93a5c35a 100644
(file)
--- a/
drivers/rtc/rtc-pcf50633.c
+++ b/
drivers/rtc/rtc-pcf50633.c
@@
-248,7
+248,7
@@
static void pcf50633_rtc_irq(int irq, void *data)
rtc->alarm_pending = 1;
}
rtc->alarm_pending = 1;
}
-static int
__devinit
pcf50633_rtc_probe(struct platform_device *pdev)
+static int pcf50633_rtc_probe(struct platform_device *pdev)
{
struct pcf50633_rtc *rtc;
{
struct pcf50633_rtc *rtc;
@@
-272,7
+272,7
@@
static int __devinit pcf50633_rtc_probe(struct platform_device *pdev)
return 0;
}
return 0;
}
-static int
__devexit
pcf50633_rtc_remove(struct platform_device *pdev)
+static int pcf50633_rtc_remove(struct platform_device *pdev)
{
struct pcf50633_rtc *rtc;
{
struct pcf50633_rtc *rtc;
@@
-291,7
+291,7
@@
static struct platform_driver pcf50633_rtc_driver = {
.name = "pcf50633-rtc",
},
.probe = pcf50633_rtc_probe,
.name = "pcf50633-rtc",
},
.probe = pcf50633_rtc_probe,
- .remove =
__devexit_p(pcf50633_rtc_remove)
,
+ .remove =
pcf50633_rtc_remove
,
};
module_platform_driver(pcf50633_rtc_driver);
};
module_platform_driver(pcf50633_rtc_driver);