Skip to content

Commit

Permalink
EDAC, mpc85xx: Use platform_register/unregister_drivers()
Browse files Browse the repository at this point in the history
These new helpers simplify implementing multi-driver modules and
properly handle failure to register one driver by unregistering all
previously registered drivers.

Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Thierry 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.com
Signed-off-by: Borislav Petkov <bp@suse.de>
  • Loading branch information
Thierry Reding authored and Borislav Petkov committed Dec 3, 2015
1 parent 255379a commit d54051f
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/edac/mpc85xx_edac.c
Original file line number Diff line number Diff line change
Expand Up @@ -1208,6 +1208,11 @@ static void __init mpc85xx_mc_clear_rfxe(void *data)
}
#endif

static struct platform_driver * const drivers[] = {
&mpc85xx_mc_err_driver,
&mpc85xx_l2_err_driver,
};

static int __init mpc85xx_mc_init(void)
{
int res = 0;
Expand All @@ -1226,13 +1231,9 @@ static int __init mpc85xx_mc_init(void)
break;
}

res = platform_driver_register(&mpc85xx_mc_err_driver);
if (res)
printk(KERN_WARNING EDAC_MOD_STR "MC fails to register\n");

res = platform_driver_register(&mpc85xx_l2_err_driver);
res = platform_register_drivers(drivers, ARRAY_SIZE(drivers));
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
pvr = mfspr(SPRN_PVR);
Expand Down Expand Up @@ -1270,8 +1271,7 @@ static void __exit mpc85xx_mc_exit(void)
on_each_cpu(mpc85xx_mc_restore_hid1, NULL, 0);
}
#endif
platform_driver_unregister(&mpc85xx_l2_err_driver);
platform_driver_unregister(&mpc85xx_mc_err_driver);
platform_unregister_drivers(drivers, ARRAY_SIZE(drivers));
}

module_exit(mpc85xx_mc_exit);
Expand Down

0 comments on commit d54051f

Please sign in to comment.