Commit d54051f1 authored by Thierry Reding's avatar Thierry Reding Committed by Borislav Petkov

EDAC, mpc85xx: Use platform_register/unregister_drivers()

These new helpers simplify implementing multi-driver modules and
properly handle failure to register one driver by unregistering all
previously registered drivers.
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/1449136632-11680-1-git-send-email-thierry.reding@gmail.comSigned-off-by: default avatarBorislav Petkov <bp@suse.de>
parent 255379ae
...@@ -1208,6 +1208,11 @@ static void __init mpc85xx_mc_clear_rfxe(void *data) ...@@ -1208,6 +1208,11 @@ static void __init mpc85xx_mc_clear_rfxe(void *data)
} }
#endif #endif
static struct platform_driver * const drivers[] = {
&mpc85xx_mc_err_driver,
&mpc85xx_l2_err_driver,
};
static int __init mpc85xx_mc_init(void) static int __init mpc85xx_mc_init(void)
{ {
int res = 0; int res = 0;
...@@ -1226,13 +1231,9 @@ static int __init mpc85xx_mc_init(void) ...@@ -1226,13 +1231,9 @@ static int __init mpc85xx_mc_init(void)
break; break;
} }
res = platform_driver_register(&mpc85xx_mc_err_driver); res = platform_register_drivers(drivers, ARRAY_SIZE(drivers));
if (res)
printk(KERN_WARNING EDAC_MOD_STR "MC fails to register\n");
res = platform_driver_register(&mpc85xx_l2_err_driver);
if (res) if (res)
printk(KERN_WARNING EDAC_MOD_STR "L2 fails to register\n"); printk(KERN_WARNING EDAC_MOD_STR "drivers fail to register\n");
#ifdef CONFIG_FSL_SOC_BOOKE #ifdef CONFIG_FSL_SOC_BOOKE
pvr = mfspr(SPRN_PVR); pvr = mfspr(SPRN_PVR);
...@@ -1270,8 +1271,7 @@ static void __exit mpc85xx_mc_exit(void) ...@@ -1270,8 +1271,7 @@ static void __exit mpc85xx_mc_exit(void)
on_each_cpu(mpc85xx_mc_restore_hid1, NULL, 0); on_each_cpu(mpc85xx_mc_restore_hid1, NULL, 0);
} }
#endif #endif
platform_driver_unregister(&mpc85xx_l2_err_driver); platform_unregister_drivers(drivers, ARRAY_SIZE(drivers));
platform_driver_unregister(&mpc85xx_mc_err_driver);
} }
module_exit(mpc85xx_mc_exit); module_exit(mpc85xx_mc_exit);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment