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

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

EDAC, mv64x60: 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.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/1449073138-10852-2-git-send-email-thierry.reding@gmail.com


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

drivers/edac/mv64x60_edac.c

+11 −28
Original line number Diff line number Diff line
@@ -847,6 +847,15 @@ static struct platform_driver mv64x60_mc_err_driver = { 
	}

};



static struct platform_driver * const drivers[] = {

	&mv64x60_mc_err_driver,

	&mv64x60_cpu_err_driver,

	&mv64x60_sram_err_driver,

#ifdef CONFIG_PCI

	&mv64x60_pci_err_driver,

#endif

};



static int __init mv64x60_edac_init(void)

{

	int ret = 0;
@@ -863,39 +872,13 @@ static int __init mv64x60_edac_init(void) 
		break;

	}



	ret = platform_driver_register(&mv64x60_mc_err_driver);

	if (ret)

		printk(KERN_WARNING EDAC_MOD_STR "MC err failed to register\n");



	ret = platform_driver_register(&mv64x60_cpu_err_driver);

	if (ret)

		printk(KERN_WARNING EDAC_MOD_STR

			"CPU err failed to register\n");



	ret = platform_driver_register(&mv64x60_sram_err_driver);

	if (ret)

		printk(KERN_WARNING EDAC_MOD_STR

			"SRAM err failed to register\n");



#ifdef CONFIG_PCI

	ret = platform_driver_register(&mv64x60_pci_err_driver);

	if (ret)

		printk(KERN_WARNING EDAC_MOD_STR

			"PCI err failed to register\n");

#endif



	return ret;

	return platform_register_drivers(drivers, ARRAY_SIZE(drivers));

}

module_init(mv64x60_edac_init);



static void __exit mv64x60_edac_exit(void)

{

#ifdef CONFIG_PCI

	platform_driver_unregister(&mv64x60_pci_err_driver);

#endif

	platform_driver_unregister(&mv64x60_sram_err_driver);

	platform_driver_unregister(&mv64x60_cpu_err_driver);

	platform_driver_unregister(&mv64x60_mc_err_driver);

	platform_unregister_drivers(drivers, ARRAY_SIZE(drivers));

}

module_exit(mv64x60_edac_exit);