The patch titled
Subject: rtc: convert rtc spi drivers to module_spi_driver
has been added to the -mm tree. Its filename is
rtc-convert-rtc-spi-drivers-to-module_spi_driver.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Axel Lin <axel.lin@xxxxxxxxx>
Subject: rtc: convert rtc spi drivers to module_spi_driver
Factor out some boilerplate code for spi driver registration into
module_spi_driver.
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
Cc: Mark Jackson <mpfj@xxxxxxxxxx>
Cc: Dennis Aberilla <denzzzhome@xxxxxxxxx>
Cc: Nikolaus Voss <n.voss@xxxxxxxxxxx>
Cc: "Kim B. Heino" <Kim.Heino@xxxxxxxxxxxx>
Cc: Raphael Assenat <raph@xxxxxxxxxxx>
Cc: Chris Verges <chrisv@xxxxxxxxxxxxxxxxxx>
Cc: Magnus Damm <damm@xxxxxxxxxxxxx>
Cc: Atsushi Nemoto <anemo@xxxxxxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rtc/rtc-ds1305.c | 12 +-----------
drivers/rtc/rtc-ds1390.c | 12 +-----------
drivers/rtc/rtc-ds3234.c | 12 +-----------
drivers/rtc/rtc-m41t93.c | 12 +-----------
drivers/rtc/rtc-m41t94.c | 14 +-------------
drivers/rtc/rtc-max6902.c | 12 +-----------
drivers/rtc/rtc-pcf2123.c | 13 +------------
drivers/rtc/rtc-r9701.c | 12 +-----------
drivers/rtc/rtc-rs5c348.c | 13 +------------
9 files changed, 9 insertions(+), 103 deletions(-)
diff -puN drivers/rtc/rtc-ds1305.c~rtc-convert-rtc-spi-drivers-to-module_spi_driver drivers/rtc/rtc-ds1305.c
--- a/drivers/rtc/rtc-ds1305.c~rtc-convert-rtc-spi-drivers-to-module_spi_driver
+++ a/drivers/rtc/rtc-ds1305.c
@@ -814,17 +814,7 @@ static struct spi_driver ds1305_driver =
/* REVISIT add suspend/resume */
};
-static int __init ds1305_init(void)
-{
- return spi_register_driver(&ds1305_driver);
-}
-module_init(ds1305_init);
-
-static void __exit ds1305_exit(void)
-{
- spi_unregister_driver(&ds1305_driver);
-}
-module_exit(ds1305_exit);
+module_spi_driver(ds1305_driver);
MODULE_DESCRIPTION("RTC driver for DS1305 and DS1306 chips");
MODULE_LICENSE("GPL");
diff -puN drivers/rtc/rtc-ds1390.c~rtc-convert-rtc-spi-drivers-to-module_spi_driver drivers/rtc/rtc-ds1390.c
--- a/drivers/rtc/rtc-ds1390.c~rtc-convert-rtc-spi-drivers-to-module_spi_driver
+++ a/drivers/rtc/rtc-ds1390.c
@@ -175,17 +175,7 @@ static struct spi_driver ds1390_driver =
.remove = __devexit_p(ds1390_remove),
};
-static __init int ds1390_init(void)
-{
- return spi_register_driver(&ds1390_driver);
-}
-module_init(ds1390_init);
-
-static __exit void ds1390_exit(void)
-{
- spi_unregister_driver(&ds1390_driver);
-}
-module_exit(ds1390_exit);
+module_spi_driver(ds1390_driver);
MODULE_DESCRIPTION("Dallas/Maxim DS1390/93/94 SPI RTC driver");
MODULE_AUTHOR("Mark Jackson <mpfj@xxxxxxxxxx>");
diff -puN drivers/rtc/rtc-ds3234.c~rtc-convert-rtc-spi-drivers-to-module_spi_driver drivers/rtc/rtc-ds3234.c
--- a/drivers/rtc/rtc-ds3234.c~rtc-convert-rtc-spi-drivers-to-module_spi_driver
+++ a/drivers/rtc/rtc-ds3234.c
@@ -173,17 +173,7 @@ static struct spi_driver ds3234_driver =
.remove = __devexit_p(ds3234_remove),
};
-static __init int ds3234_init(void)
-{
- return spi_register_driver(&ds3234_driver);
-}
-module_init(ds3234_init);
-
-static __exit void ds3234_exit(void)
-{
- spi_unregister_driver(&ds3234_driver);
-}
-module_exit(ds3234_exit);
+module_spi_driver(ds3234_driver);
MODULE_DESCRIPTION("DS3234 SPI RTC driver");
MODULE_AUTHOR("Dennis Aberilla <denzzzhome@xxxxxxxxx>");
diff -puN drivers/rtc/rtc-m41t93.c~rtc-convert-rtc-spi-drivers-to-module_spi_driver drivers/rtc/rtc-m41t93.c
--- a/drivers/rtc/rtc-m41t93.c~rtc-convert-rtc-spi-drivers-to-module_spi_driver
+++ a/drivers/rtc/rtc-m41t93.c
@@ -206,17 +206,7 @@ static struct spi_driver m41t93_driver =
.remove = __devexit_p(m41t93_remove),
};
-static __init int m41t93_init(void)
-{
- return spi_register_driver(&m41t93_driver);
-}
-module_init(m41t93_init);
-
-static __exit void m41t93_exit(void)
-{
- spi_unregister_driver(&m41t93_driver);
-}
-module_exit(m41t93_exit);
+module_spi_driver(m41t93_driver);
MODULE_AUTHOR("Nikolaus Voss <n.voss@xxxxxxxxxxx>");
MODULE_DESCRIPTION("Driver for ST M41T93 SPI RTC");
diff -puN drivers/rtc/rtc-m41t94.c~rtc-convert-rtc-spi-drivers-to-module_spi_driver drivers/rtc/rtc-m41t94.c
--- a/drivers/rtc/rtc-m41t94.c~rtc-convert-rtc-spi-drivers-to-module_spi_driver
+++ a/drivers/rtc/rtc-m41t94.c
@@ -153,19 +153,7 @@ static struct spi_driver m41t94_driver =
.remove = __devexit_p(m41t94_remove),
};
-static __init int m41t94_init(void)
-{
- return spi_register_driver(&m41t94_driver);
-}
-
-module_init(m41t94_init);
-
-static __exit void m41t94_exit(void)
-{
- spi_unregister_driver(&m41t94_driver);
-}
-
-module_exit(m41t94_exit);
+module_spi_driver(m41t94_driver);
MODULE_AUTHOR("Kim B. Heino <Kim.Heino@xxxxxxxxxxxx>");
MODULE_DESCRIPTION("Driver for ST M41T94 SPI RTC");
diff -puN drivers/rtc/rtc-max6902.c~rtc-convert-rtc-spi-drivers-to-module_spi_driver drivers/rtc/rtc-max6902.c
--- a/drivers/rtc/rtc-max6902.c~rtc-convert-rtc-spi-drivers-to-module_spi_driver
+++ a/drivers/rtc/rtc-max6902.c
@@ -160,17 +160,7 @@ static struct spi_driver max6902_driver
.remove = __devexit_p(max6902_remove),
};
-static __init int max6902_init(void)
-{
- return spi_register_driver(&max6902_driver);
-}
-module_init(max6902_init);
-
-static __exit void max6902_exit(void)
-{
- spi_unregister_driver(&max6902_driver);
-}
-module_exit(max6902_exit);
+module_spi_driver(max6902_driver);
MODULE_DESCRIPTION ("max6902 spi RTC driver");
MODULE_AUTHOR ("Raphael Assenat");
diff -puN drivers/rtc/rtc-pcf2123.c~rtc-convert-rtc-spi-drivers-to-module_spi_driver drivers/rtc/rtc-pcf2123.c
--- a/drivers/rtc/rtc-pcf2123.c~rtc-convert-rtc-spi-drivers-to-module_spi_driver
+++ a/drivers/rtc/rtc-pcf2123.c
@@ -346,20 +346,9 @@ static struct spi_driver pcf2123_driver
.remove = __devexit_p(pcf2123_remove),
};
-static int __init pcf2123_init(void)
-{
- return spi_register_driver(&pcf2123_driver);
-}
-
-static void __exit pcf2123_exit(void)
-{
- spi_unregister_driver(&pcf2123_driver);
-}
+module_spi_driver(pcf2123_driver);
MODULE_AUTHOR("Chris Verges <chrisv@xxxxxxxxxxxxxxxxxx>");
MODULE_DESCRIPTION("NXP PCF2123 RTC driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
-
-module_init(pcf2123_init);
-module_exit(pcf2123_exit);
diff -puN drivers/rtc/rtc-r9701.c~rtc-convert-rtc-spi-drivers-to-module_spi_driver drivers/rtc/rtc-r9701.c
--- a/drivers/rtc/rtc-r9701.c~rtc-convert-rtc-spi-drivers-to-module_spi_driver
+++ a/drivers/rtc/rtc-r9701.c
@@ -159,17 +159,7 @@ static struct spi_driver r9701_driver =
.remove = __devexit_p(r9701_remove),
};
-static __init int r9701_init(void)
-{
- return spi_register_driver(&r9701_driver);
-}
-module_init(r9701_init);
-
-static __exit void r9701_exit(void)
-{
- spi_unregister_driver(&r9701_driver);
-}
-module_exit(r9701_exit);
+module_spi_driver(r9701_driver);
MODULE_DESCRIPTION("r9701 spi RTC driver");
MODULE_AUTHOR("Magnus Damm <damm@xxxxxxxxxxxxx>");
diff -puN drivers/rtc/rtc-rs5c348.c~rtc-convert-rtc-spi-drivers-to-module_spi_driver drivers/rtc/rtc-rs5c348.c
--- a/drivers/rtc/rtc-rs5c348.c~rtc-convert-rtc-spi-drivers-to-module_spi_driver
+++ a/drivers/rtc/rtc-rs5c348.c
@@ -235,18 +235,7 @@ static struct spi_driver rs5c348_driver
.remove = __devexit_p(rs5c348_remove),
};
-static __init int rs5c348_init(void)
-{
- return spi_register_driver(&rs5c348_driver);
-}
-
-static __exit void rs5c348_exit(void)
-{
- spi_unregister_driver(&rs5c348_driver);
-}
-
-module_init(rs5c348_init);
-module_exit(rs5c348_exit);
+module_spi_driver(rs5c348_driver);
MODULE_AUTHOR("Atsushi Nemoto <anemo@xxxxxxxxxxxxx>");
MODULE_DESCRIPTION("Ricoh RS5C348 RTC driver");
_
Subject: Subject: rtc: convert rtc spi drivers to module_spi_driver
Patches currently in -mm which might be from axel.lin@xxxxxxxxx are
drivers-video-backlight-adp88x0_blc-fix-bit-testing-logic.patch
drivers-video-backlight-l4f00242t03c-return-proper-error-in-l4f00242t03_probe-if-regulator_get-fails.patch
linux-next.patch
platform-drivers-x86-convert-drivers-platform-x86-to-use-module_platform_driver.patch
backlight-convert-backlight-i2c-drivers-to-module_i2c_driver.patch
backlight-convert-backlight-spi-drivers-to-module_spi_driver.patch
rtc-convert-rtc-spi-drivers-to-module_spi_driver.patch
rtc-convert-rtc-i2c-drivers-to-module_i2c_driver.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
