Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 13:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: 7362/1: AMBA: Add module_amba_driver() helper macro for amba_driver

Browse Source 
For simple modules that contain a single amba_driver without any
additional setup code then ends up being a block of duplicated
boilerplate. This patch adds a new macro, module_amba_driver(),
which replaces the module_init()/module_exit() registrations with
template functions.

Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
viresh kumar 2012-03-15 10:40:38 +01:00 committed by Russell King
parent a64ae394eb
commit 9e5ed094c8
9 changed files with 17 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/char/hw_random/nomadik-rng.c
View File

@ -107,17 +107,6 @@ static struct amba_driver nmk_rng_driver = {
.id_table = nmk_rng_ids,
};
static int __init nmk_rng_init(void)
{
return amba_driver_register(&nmk_rng_driver);
}
static void __devexit nmk_rng_exit(void)
{
amba_driver_unregister(&nmk_rng_driver);
}
module_init(nmk_rng_init);
module_exit(nmk_rng_exit);
module_amba_driver(nmk_rng_driver);
MODULE_LICENSE("GPL");

13
drivers/dma/pl330.c
View File

@ -1035,18 +1035,7 @@ static struct amba_driver pl330_driver = {
.remove = pl330_remove,
};
static int __init pl330_init(void)
{
return amba_driver_register(&pl330_driver);
}
module_init(pl330_init);
static void __exit pl330_exit(void)
{
amba_driver_unregister(&pl330_driver);
return;
}
module_exit(pl330_exit);
module_amba_driver(pl330_driver);
MODULE_AUTHOR("Jaswinder Singh <jassi.brar@samsung.com>");
MODULE_DESCRIPTION("API Driver for PL330 DMAC");

13
drivers/input/serio/ambakmi.c
View File

@ -208,18 +208,7 @@ static struct amba_driver ambakmi_driver = {
.resume = amba_kmi_resume,
};
static int __init amba_kmi_init(void)
{
return amba_driver_register(&ambakmi_driver);
}
static void __exit amba_kmi_exit(void)
{
amba_driver_unregister(&ambakmi_driver);
}
module_init(amba_kmi_init);
module_exit(amba_kmi_exit);
module_amba_driver(ambakmi_driver);
MODULE_AUTHOR("Russell King <rmk@arm.linux.org.uk>");
MODULE_DESCRIPTION("AMBA KMI controller driver");

12
drivers/mmc/host/mmci.c
View File

@ -1519,18 +1519,8 @@ static struct amba_driver mmci_driver = {
.id_table = mmci_ids,
};
static int __init mmci_init(void)
{
return amba_driver_register(&mmci_driver);
}
module_amba_driver(mmci_driver);
static void __exit mmci_exit(void)
{
amba_driver_unregister(&mmci_driver);
}
module_init(mmci_init);
module_exit(mmci_exit);
module_param(fmax, uint, 0444);
MODULE_DESCRIPTION("ARM PrimeCell PL180/181 Multimedia Card Interface driver");

13
drivers/rtc/rtc-pl030.c
View File

@ -185,18 +185,7 @@ static struct amba_driver pl030_driver = {
.id_table = pl030_ids,
};
static int __init pl030_init(void)
{
return amba_driver_register(&pl030_driver);
}
static void __exit pl030_exit(void)
{
amba_driver_unregister(&pl030_driver);
}
module_init(pl030_init);
module_exit(pl030_exit);
module_amba_driver(pl030_driver);
MODULE_AUTHOR("Russell King <rmk@arm.linux.org.uk>");
MODULE_DESCRIPTION("ARM AMBA PL030 RTC Driver");

13
drivers/rtc/rtc-pl031.c
View File

@ -431,18 +431,7 @@ static struct amba_driver pl031_driver = {
.remove = pl031_remove,
};
static int __init pl031_init(void)
{
return amba_driver_register(&pl031_driver);
}
static void __exit pl031_exit(void)
{
amba_driver_unregister(&pl031_driver);
}
module_init(pl031_init);
module_exit(pl031_exit);
module_amba_driver(pl031_driver);
MODULE_AUTHOR("Deepak Saxena <dsaxena@plexity.net");
MODULE_DESCRIPTION("ARM AMBA PL031 RTC Driver");

12
drivers/watchdog/sp805_wdt.c
View File

@ -370,17 +370,7 @@ static struct amba_driver sp805_wdt_driver = {
.remove = __devexit_p(sp805_wdt_remove),
};
static int __init sp805_wdt_init(void)
{
return amba_driver_register(&sp805_wdt_driver);
}
module_init(sp805_wdt_init);
static void __exit sp805_wdt_exit(void)
{
amba_driver_unregister(&sp805_wdt_driver);
}
module_exit(sp805_wdt_exit);
module_amba_driver(sp805_wdt_driver);
module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout,

9
include/linux/amba/bus.h
View File

@ -125,4 +125,13 @@ struct amba_device name##_device = { \
.periphid = id, \
}
/*
* module_amba_driver() - Helper macro for drivers that don't do anything
* special in module init/exit. This eliminates a lot of boilerplate. Each
* module may only use this macro once, and calling it replaces module_init()
* and module_exit()
*/
#define module_amba_driver(__amba_drv) \
module_driver(__amba_drv, amba_driver_register, amba_driver_unregister)
#endif

13
sound/arm/aaci.c
View File

@ -1110,18 +1110,7 @@ static struct amba_driver aaci_driver = {
.id_table = aaci_ids,
};
static int __init aaci_init(void)
{
return amba_driver_register(&aaci_driver);
}
static void __exit aaci_exit(void)
{
amba_driver_unregister(&aaci_driver);
}
module_init(aaci_init);
module_exit(aaci_exit);
module_amba_driver(aaci_driver);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("ARM PrimeCell PL041 Advanced Audio CODEC Interface driver");