Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 308988
b: refs/heads/master
c: 84d56b3
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Linus Torvalds committed May 29, 2012
1 parent e79f81b commit 54c679b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0108c4ff62a0ee324c58175ff6b7000865023498
refs/heads/master: 84d56b38b9abd36565f74cbf68501cee6206761e
24 changes: 6 additions & 18 deletions trunk/drivers/rtc/rtc-ep93xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ static const struct attribute_group ep93xx_rtc_sysfs_files = {
.attrs = ep93xx_rtc_attrs,
};

static int __init ep93xx_rtc_probe(struct platform_device *pdev)
static int __devinit ep93xx_rtc_probe(struct platform_device *pdev)
{
struct ep93xx_rtc *ep93xx_rtc;
struct resource *res;
Expand Down Expand Up @@ -174,7 +174,7 @@ static int __init ep93xx_rtc_probe(struct platform_device *pdev)
return err;
}

static int __exit ep93xx_rtc_remove(struct platform_device *pdev)
static int __devexit ep93xx_rtc_remove(struct platform_device *pdev)
{
struct ep93xx_rtc *ep93xx_rtc = platform_get_drvdata(pdev);

Expand All @@ -186,31 +186,19 @@ static int __exit ep93xx_rtc_remove(struct platform_device *pdev)
return 0;
}

/* work with hotplug and coldplug */
MODULE_ALIAS("platform:ep93xx-rtc");

static struct platform_driver ep93xx_rtc_driver = {
.driver = {
.name = "ep93xx-rtc",
.owner = THIS_MODULE,
},
.remove = __exit_p(ep93xx_rtc_remove),
.probe = ep93xx_rtc_probe,
.remove = __devexit_p(ep93xx_rtc_remove),
};

static int __init ep93xx_rtc_init(void)
{
return platform_driver_probe(&ep93xx_rtc_driver, ep93xx_rtc_probe);
}

static void __exit ep93xx_rtc_exit(void)
{
platform_driver_unregister(&ep93xx_rtc_driver);
}
module_platform_driver(ep93xx_rtc_driver);

MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
MODULE_DESCRIPTION("EP93XX RTC driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);

module_init(ep93xx_rtc_init);
module_exit(ep93xx_rtc_exit);
MODULE_ALIAS("platform:ep93xx-rtc");

0 comments on commit 54c679b

Please sign in to comment.