xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mfd: sta2x11: Use platform_register/unregister_drivers()

Browse Source 
These new helpers simplify implementing multi-driver modules and
properly handle failure to register one driver by unregistering all
previously registered drivers.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Thierry Reding
2015-12-02 17:28:11 +01:00
committed by Lee Jones
parent 742dcd115c
commit d91d76d84c
1 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/mfd/sta2x11-mfd.c
View File

@@ -372,12 +372,6 @@ static struct platform_driver sta2x11_sctl_platform_driver = {
.probe = sta2x11_sctl_probe, .probe = sta2x11_sctl_probe,
}; };
static int __init sta2x11_sctl_init(void)
{
pr_info("%s\n", __func__);
return platform_driver_register(&sta2x11_sctl_platform_driver);
}
static struct platform_driver sta2x11_platform_driver = { static struct platform_driver sta2x11_platform_driver = {
.driver = { .driver = {
.name = STA2X11_MFD_APBREG_NAME, .name = STA2X11_MFD_APBREG_NAME,
@@ -385,12 +379,6 @@ static struct platform_driver sta2x11_platform_driver = {
.probe = sta2x11_apbreg_probe, .probe = sta2x11_apbreg_probe,
}; };
static int __init sta2x11_apbreg_init(void)
{
pr_info("%s\n", __func__);
return platform_driver_register(&sta2x11_platform_driver);
}
static struct platform_driver sta2x11_apb_soc_regs_platform_driver = { static struct platform_driver sta2x11_apb_soc_regs_platform_driver = {
.driver = { .driver = {
.name = STA2X11_MFD_APB_SOC_REGS_NAME, .name = STA2X11_MFD_APB_SOC_REGS_NAME,
@@ -398,12 +386,6 @@ static struct platform_driver sta2x11_apb_soc_regs_platform_driver = {
.probe = sta2x11_apb_soc_regs_probe, .probe = sta2x11_apb_soc_regs_probe,
}; };
static int __init sta2x11_apb_soc_regs_init(void)
{
pr_info("%s\n", __func__);
return platform_driver_register(&sta2x11_apb_soc_regs_platform_driver);
}
static struct platform_driver sta2x11_scr_platform_driver = { static struct platform_driver sta2x11_scr_platform_driver = {
.driver = { .driver = {
.name = STA2X11_MFD_SCR_NAME, .name = STA2X11_MFD_SCR_NAME,
@@ -411,12 +393,17 @@ static struct platform_driver sta2x11_scr_platform_driver = {
.probe = sta2x11_scr_probe, .probe = sta2x11_scr_probe,
}; };
static int __init sta2x11_scr_init(void) static struct platform_driver * const drivers[] = {
{ &sta2x11_platform_driver,
pr_info("%s\n", __func__); &sta2x11_sctl_platform_driver,
return platform_driver_register(&sta2x11_scr_platform_driver); &sta2x11_apb_soc_regs_platform_driver,
} &sta2x11_scr_platform_driver,
};
static int __init sta2x11_drivers_init(void)
{
return platform_register_drivers(drivers, ARRAY_SIZE(drivers));
}
/* /*
* What follows are the PCI devices that host the above pdevs. * What follows are the PCI devices that host the above pdevs.
@@ -664,10 +651,7 @@ static int __init sta2x11_mfd_init(void)
* prepares platform drivers very early and probe the PCI device later, * prepares platform drivers very early and probe the PCI device later,
* but before other PCI devices. * but before other PCI devices.
*/ */
subsys_initcall(sta2x11_apbreg_init); subsys_initcall(sta2x11_drivers_init);
subsys_initcall(sta2x11_sctl_init);
subsys_initcall(sta2x11_apb_soc_regs_init);
subsys_initcall(sta2x11_scr_init);
rootfs_initcall(sta2x11_mfd_init); rootfs_initcall(sta2x11_mfd_init);
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");