Skip to content

Commit

Permalink
rtc: convert drivers/rtc/* to use module_platform_driver()
Browse files Browse the repository at this point in the history
This patch converts the drivers in drivers/rtc/* to use the
module_platform_driver() macro which makes the code smaller and a bit
simpler.

Signed-off-by: Axel Lin <[email protected]>
Acked-by: Mark Brown <[email protected]>
Acked-by: Mike Frysinger <[email protected]>
Acked-by: Guan Xuetao <[email protected]>
Acked-by: Linus Walleij <[email protected]>
Acked-by: Haojian Zhuang <[email protected]>
Cc: Alessandro Zummo <[email protected]>
Cc: Srinidhi Kasagar <[email protected]>
Cc: Lars-Peter Clausen <[email protected]>
Cc: Ben Dooks <[email protected]>
Cc: John Stultz <[email protected]>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
AxelLin authored and torvalds committed Jan 11, 2012
1 parent 5f85d20 commit 0c4eae6
Show file tree
Hide file tree
Showing 30 changed files with 30 additions and 351 deletions.
12 changes: 1 addition & 11 deletions drivers/rtc/rtc-88pm860x.c
Original file line number Diff line number Diff line change
Expand Up @@ -410,17 +410,7 @@ static struct platform_driver pm860x_rtc_driver = {
.remove = __devexit_p(pm860x_rtc_remove),
};

static int __init pm860x_rtc_init(void)
{
return platform_driver_register(&pm860x_rtc_driver);
}
module_init(pm860x_rtc_init);

static void __exit pm860x_rtc_exit(void)
{
platform_driver_unregister(&pm860x_rtc_driver);
}
module_exit(pm860x_rtc_exit);
module_platform_driver(pm860x_rtc_driver);

MODULE_DESCRIPTION("Marvell 88PM860x RTC driver");
MODULE_AUTHOR("Haojian Zhuang <[email protected]>");
Expand Down
12 changes: 1 addition & 11 deletions drivers/rtc/rtc-ab8500.c
Original file line number Diff line number Diff line change
Expand Up @@ -463,18 +463,8 @@ static struct platform_driver ab8500_rtc_driver = {
.remove = __devexit_p(ab8500_rtc_remove),
};

static int __init ab8500_rtc_init(void)
{
return platform_driver_register(&ab8500_rtc_driver);
}

static void __exit ab8500_rtc_exit(void)
{
platform_driver_unregister(&ab8500_rtc_driver);
}
module_platform_driver(ab8500_rtc_driver);

module_init(ab8500_rtc_init);
module_exit(ab8500_rtc_exit);
MODULE_AUTHOR("Virupax Sadashivpetimath <[email protected]>");
MODULE_DESCRIPTION("AB8500 RTC Driver");
MODULE_LICENSE("GPL v2");
13 changes: 1 addition & 12 deletions drivers/rtc/rtc-bfin.c
Original file line number Diff line number Diff line change
Expand Up @@ -456,18 +456,7 @@ static struct platform_driver bfin_rtc_driver = {
.resume = bfin_rtc_resume,
};

static int __init bfin_rtc_init(void)
{
return platform_driver_register(&bfin_rtc_driver);
}

static void __exit bfin_rtc_exit(void)
{
platform_driver_unregister(&bfin_rtc_driver);
}

module_init(bfin_rtc_init);
module_exit(bfin_rtc_exit);
module_platform_driver(bfin_rtc_driver);

MODULE_DESCRIPTION("Blackfin On-Chip Real Time Clock Driver");
MODULE_AUTHOR("Mike Frysinger <[email protected]>");
Expand Down
13 changes: 1 addition & 12 deletions drivers/rtc/rtc-bq4802.c
Original file line number Diff line number Diff line change
Expand Up @@ -218,15 +218,4 @@ static struct platform_driver bq4802_driver = {
.remove = __devexit_p(bq4802_remove),
};

static int __init bq4802_init(void)
{
return platform_driver_register(&bq4802_driver);
}

static void __exit bq4802_exit(void)
{
platform_driver_unregister(&bq4802_driver);
}

module_init(bq4802_init);
module_exit(bq4802_exit);
module_platform_driver(bq4802_driver);
12 changes: 1 addition & 11 deletions drivers/rtc/rtc-dm355evm.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,16 +161,6 @@ static struct platform_driver rtc_dm355evm_driver = {
},
};

static int __init dm355evm_rtc_init(void)
{
return platform_driver_register(&rtc_dm355evm_driver);
}
module_init(dm355evm_rtc_init);

static void __exit dm355evm_rtc_exit(void)
{
platform_driver_unregister(&rtc_dm355evm_driver);
}
module_exit(dm355evm_rtc_exit);
module_platform_driver(rtc_dm355evm_driver);

MODULE_LICENSE("GPL");
13 changes: 1 addition & 12 deletions drivers/rtc/rtc-ds1286.c
Original file line number Diff line number Diff line change
Expand Up @@ -396,21 +396,10 @@ static struct platform_driver ds1286_platform_driver = {
.remove = __devexit_p(ds1286_remove),
};

static int __init ds1286_init(void)
{
return platform_driver_register(&ds1286_platform_driver);
}

static void __exit ds1286_exit(void)
{
platform_driver_unregister(&ds1286_platform_driver);
}
module_platform_driver(ds1286_platform_driver);

MODULE_AUTHOR("Thomas Bogendoerfer <[email protected]>");
MODULE_DESCRIPTION("DS1286 RTC driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
MODULE_ALIAS("platform:rtc-ds1286");

module_init(ds1286_init);
module_exit(ds1286_exit);
15 changes: 1 addition & 14 deletions drivers/rtc/rtc-ds1511.c
Original file line number Diff line number Diff line change
Expand Up @@ -580,20 +580,7 @@ static struct platform_driver ds1511_rtc_driver = {
},
};

static int __init
ds1511_rtc_init(void)
{
return platform_driver_register(&ds1511_rtc_driver);
}

static void __exit
ds1511_rtc_exit(void)
{
platform_driver_unregister(&ds1511_rtc_driver);
}

module_init(ds1511_rtc_init);
module_exit(ds1511_rtc_exit);
module_platform_driver(ds1511_rtc_driver);

MODULE_AUTHOR("Andrew Sharp <[email protected]>");
MODULE_DESCRIPTION("Dallas DS1511 RTC driver");
Expand Down
13 changes: 1 addition & 12 deletions drivers/rtc/rtc-ds1553.c
Original file line number Diff line number Diff line change
Expand Up @@ -361,18 +361,7 @@ static struct platform_driver ds1553_rtc_driver = {
},
};

static __init int ds1553_init(void)
{
return platform_driver_register(&ds1553_rtc_driver);
}

static __exit void ds1553_exit(void)
{
platform_driver_unregister(&ds1553_rtc_driver);
}

module_init(ds1553_init);
module_exit(ds1553_exit);
module_platform_driver(ds1553_rtc_driver);

MODULE_AUTHOR("Atsushi Nemoto <[email protected]>");
MODULE_DESCRIPTION("Dallas DS1553 RTC driver");
Expand Down
13 changes: 1 addition & 12 deletions drivers/rtc/rtc-ds1742.c
Original file line number Diff line number Diff line change
Expand Up @@ -240,18 +240,7 @@ static struct platform_driver ds1742_rtc_driver = {
},
};

static __init int ds1742_init(void)
{
return platform_driver_register(&ds1742_rtc_driver);
}

static __exit void ds1742_exit(void)
{
platform_driver_unregister(&ds1742_rtc_driver);
}

module_init(ds1742_init);
module_exit(ds1742_exit);
module_platform_driver(ds1742_rtc_driver);

MODULE_AUTHOR("Atsushi Nemoto <[email protected]>");
MODULE_DESCRIPTION("Dallas DS1742 RTC driver");
Expand Down
12 changes: 1 addition & 11 deletions drivers/rtc/rtc-jz4740.c
Original file line number Diff line number Diff line change
Expand Up @@ -355,17 +355,7 @@ struct platform_driver jz4740_rtc_driver = {
},
};

static int __init jz4740_rtc_init(void)
{
return platform_driver_register(&jz4740_rtc_driver);
}
module_init(jz4740_rtc_init);

static void __exit jz4740_rtc_exit(void)
{
platform_driver_unregister(&jz4740_rtc_driver);
}
module_exit(jz4740_rtc_exit);
module_platform_driver(jz4740_rtc_driver);

MODULE_AUTHOR("Lars-Peter Clausen <[email protected]>");
MODULE_LICENSE("GPL");
Expand Down
12 changes: 1 addition & 11 deletions drivers/rtc/rtc-lpc32xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -396,17 +396,7 @@ static struct platform_driver lpc32xx_rtc_driver = {
},
};

static int __init lpc32xx_rtc_init(void)
{
return platform_driver_register(&lpc32xx_rtc_driver);
}
module_init(lpc32xx_rtc_init);

static void __exit lpc32xx_rtc_exit(void)
{
platform_driver_unregister(&lpc32xx_rtc_driver);
}
module_exit(lpc32xx_rtc_exit);
module_platform_driver(lpc32xx_rtc_driver);

MODULE_AUTHOR("Kevin Wells <[email protected]");
MODULE_DESCRIPTION("RTC driver for the LPC32xx SoC");
Expand Down
13 changes: 1 addition & 12 deletions drivers/rtc/rtc-m48t35.c
Original file line number Diff line number Diff line change
Expand Up @@ -216,21 +216,10 @@ static struct platform_driver m48t35_platform_driver = {
.remove = __devexit_p(m48t35_remove),
};

static int __init m48t35_init(void)
{
return platform_driver_register(&m48t35_platform_driver);
}

static void __exit m48t35_exit(void)
{
platform_driver_unregister(&m48t35_platform_driver);
}
module_platform_driver(m48t35_platform_driver);

MODULE_AUTHOR("Thomas Bogendoerfer <[email protected]>");
MODULE_DESCRIPTION("M48T35 RTC driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
MODULE_ALIAS("platform:rtc-m48t35");

module_init(m48t35_init);
module_exit(m48t35_exit);
13 changes: 1 addition & 12 deletions drivers/rtc/rtc-m48t59.c
Original file line number Diff line number Diff line change
Expand Up @@ -530,18 +530,7 @@ static struct platform_driver m48t59_rtc_driver = {
.remove = __devexit_p(m48t59_rtc_remove),
};

static int __init m48t59_rtc_init(void)
{
return platform_driver_register(&m48t59_rtc_driver);
}

static void __exit m48t59_rtc_exit(void)
{
platform_driver_unregister(&m48t59_rtc_driver);
}

module_init(m48t59_rtc_init);
module_exit(m48t59_rtc_exit);
module_platform_driver(m48t59_rtc_driver);

MODULE_AUTHOR("Mark Zhan <[email protected]>");
MODULE_DESCRIPTION("M48T59/M48T02/M48T08 RTC driver");
Expand Down
13 changes: 1 addition & 12 deletions drivers/rtc/rtc-m48t86.c
Original file line number Diff line number Diff line change
Expand Up @@ -185,21 +185,10 @@ static struct platform_driver m48t86_rtc_platform_driver = {
.remove = __devexit_p(m48t86_rtc_remove),
};

static int __init m48t86_rtc_init(void)
{
return platform_driver_register(&m48t86_rtc_platform_driver);
}

static void __exit m48t86_rtc_exit(void)
{
platform_driver_unregister(&m48t86_rtc_platform_driver);
}
module_platform_driver(m48t86_rtc_platform_driver);

MODULE_AUTHOR("Alessandro Zummo <[email protected]>");
MODULE_DESCRIPTION("M48T86 RTC driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
MODULE_ALIAS("platform:rtc-m48t86");

module_init(m48t86_rtc_init);
module_exit(m48t86_rtc_exit);
12 changes: 1 addition & 11 deletions drivers/rtc/rtc-max8925.c
Original file line number Diff line number Diff line change
Expand Up @@ -299,17 +299,7 @@ static struct platform_driver max8925_rtc_driver = {
.remove = __devexit_p(max8925_rtc_remove),
};

static int __init max8925_rtc_init(void)
{
return platform_driver_register(&max8925_rtc_driver);
}
module_init(max8925_rtc_init);

static void __exit max8925_rtc_exit(void)
{
platform_driver_unregister(&max8925_rtc_driver);
}
module_exit(max8925_rtc_exit);
module_platform_driver(max8925_rtc_driver);

MODULE_DESCRIPTION("Maxim MAX8925 RTC driver");
MODULE_AUTHOR("Haojian Zhuang <[email protected]>");
Expand Down
12 changes: 1 addition & 11 deletions drivers/rtc/rtc-max8998.c
Original file line number Diff line number Diff line change
Expand Up @@ -327,17 +327,7 @@ static struct platform_driver max8998_rtc_driver = {
.id_table = max8998_rtc_id,
};

static int __init max8998_rtc_init(void)
{
return platform_driver_register(&max8998_rtc_driver);
}
module_init(max8998_rtc_init);

static void __exit max8998_rtc_exit(void)
{
platform_driver_unregister(&max8998_rtc_driver);
}
module_exit(max8998_rtc_exit);
module_platform_driver(max8998_rtc_driver);

MODULE_AUTHOR("Minkyu Kang <[email protected]>");
MODULE_AUTHOR("Joonyoung Shim <[email protected]>");
Expand Down
12 changes: 1 addition & 11 deletions drivers/rtc/rtc-mpc5121.c
Original file line number Diff line number Diff line change
Expand Up @@ -418,17 +418,7 @@ static struct platform_driver mpc5121_rtc_driver = {
.remove = __devexit_p(mpc5121_rtc_remove),
};

static int __init mpc5121_rtc_init(void)
{
return platform_driver_register(&mpc5121_rtc_driver);
}
module_init(mpc5121_rtc_init);

static void __exit mpc5121_rtc_exit(void)
{
platform_driver_unregister(&mpc5121_rtc_driver);
}
module_exit(mpc5121_rtc_exit);
module_platform_driver(mpc5121_rtc_driver);

MODULE_LICENSE("GPL");
MODULE_AUTHOR("John Rigby <[email protected]>");
13 changes: 1 addition & 12 deletions drivers/rtc/rtc-mrst.c
Original file line number Diff line number Diff line change
Expand Up @@ -537,18 +537,7 @@ static struct platform_driver vrtc_mrst_platform_driver = {
}
};

static int __init vrtc_mrst_init(void)
{
return platform_driver_register(&vrtc_mrst_platform_driver);
}

static void __exit vrtc_mrst_exit(void)
{
platform_driver_unregister(&vrtc_mrst_platform_driver);
}

module_init(vrtc_mrst_init);
module_exit(vrtc_mrst_exit);
module_platform_driver(vrtc_mrst_platform_driver);

MODULE_AUTHOR("Jacob Pan; Feng Tang");
MODULE_DESCRIPTION("Driver for Moorestown virtual RTC");
Expand Down
12 changes: 1 addition & 11 deletions drivers/rtc/rtc-pcf50633.c
Original file line number Diff line number Diff line change
Expand Up @@ -294,17 +294,7 @@ static struct platform_driver pcf50633_rtc_driver = {
.remove = __devexit_p(pcf50633_rtc_remove),
};

static int __init pcf50633_rtc_init(void)
{
return platform_driver_register(&pcf50633_rtc_driver);
}
module_init(pcf50633_rtc_init);

static void __exit pcf50633_rtc_exit(void)
{
platform_driver_unregister(&pcf50633_rtc_driver);
}
module_exit(pcf50633_rtc_exit);
module_platform_driver(pcf50633_rtc_driver);

MODULE_DESCRIPTION("PCF50633 RTC driver");
MODULE_AUTHOR("Balaji Rao <[email protected]>");
Expand Down
12 changes: 1 addition & 11 deletions drivers/rtc/rtc-pm8xxx.c
Original file line number Diff line number Diff line change
Expand Up @@ -532,17 +532,7 @@ static struct platform_driver pm8xxx_rtc_driver = {
},
};

static int __init pm8xxx_rtc_init(void)
{
return platform_driver_register(&pm8xxx_rtc_driver);
}
module_init(pm8xxx_rtc_init);

static void __exit pm8xxx_rtc_exit(void)
{
platform_driver_unregister(&pm8xxx_rtc_driver);
}
module_exit(pm8xxx_rtc_exit);
module_platform_driver(pm8xxx_rtc_driver);

MODULE_ALIAS("platform:rtc-pm8xxx");
MODULE_DESCRIPTION("PMIC8xxx RTC driver");
Expand Down
Loading

0 comments on commit 0c4eae6

Please sign in to comment.