Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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.com


Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent 255379ae

drivers/edac/mpc85xx_edac.c

+8 −8
Original line number Diff line number Diff line
@@ -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;
@@ -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);
@@ -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);