Merge tag 'edac_fixes_for_3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

torvalds · torvalds · commit 57a0c1e2d6cb · 2013-01-09T08:43:56.000-08:00
Pull EDAC fixes from Borislav Petkov:
 "Two error path fixes causing a crash and a Kconfig fix for an issue
  which spilled all EDAC suboptions into the 'Device Drivers' menu."

* tag 'edac_fixes_for_3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC: Cleanup device deregistering path
  EDAC: Fix EDAC Kconfig menu
  EDAC: Fix kernel panic on module unloading
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
@@ -4,6 +4,9 @@
 #	Licensed and distributed under the GPL
 #
 
+config EDAC_SUPPORT
+	bool
+
 menuconfig EDAC
 	bool "EDAC (Error Detection And Correction) reporting"
 	depends on HAS_IOMEM
@@ -27,13 +30,8 @@ menuconfig EDAC
 	  There is also a mailing list for the EDAC project, which can
 	  be found via the sourceforge page.
 
-config EDAC_SUPPORT
-	bool
-
 if EDAC
 
-comment "Reporting subsystems"
-
 config EDAC_LEGACY_SYSFS
 	bool "EDAC legacy sysfs"
 	default y
diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
@@ -472,8 +472,7 @@ static void edac_delete_csrow_objects(struct mem_ctl_info *mci)
 			device_remove_file(&csrow->dev,
 						dynamic_csrow_ce_count_attr[chan]);
 		}
-		put_device(&mci->csrows[i]->dev);
-		device_del(&mci->csrows[i]->dev);
+		device_unregister(&mci->csrows[i]->dev);
 	}
 }
 #endif
@@ -1055,11 +1054,9 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
 		struct dimm_info *dimm = mci->dimms[i];
 		if (dimm->nr_pages == 0)
 			continue;
-		put_device(&dimm->dev);
-		device_del(&dimm->dev);
+		device_unregister(&dimm->dev);
 	}
-	put_device(&mci->dev);
-	device_del(&mci->dev);
+	device_unregister(&mci->dev);
 	bus_unregister(&mci->bus);
 	kfree(mci->bus.name);
 	return err;
@@ -1086,16 +1083,14 @@ void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci)
 		if (dimm->nr_pages == 0)
 			continue;
 		edac_dbg(0, "removing device %s\n", dev_name(&dimm->dev));
-		put_device(&dimm->dev);
-		device_del(&dimm->dev);
+		device_unregister(&dimm->dev);
 	}
 }
 
 void edac_unregister_sysfs(struct mem_ctl_info *mci)
 {
 	edac_dbg(1, "Unregistering device %s\n", dev_name(&mci->dev));
-	put_device(&mci->dev);
-	device_del(&mci->dev);
+	device_unregister(&mci->dev);
 	bus_unregister(&mci->bus);
 	kfree(mci->bus.name);
 }
@@ -1159,8 +1154,6 @@ int __init edac_mc_sysfs_init(void)
 
 void __exit edac_mc_sysfs_exit(void)
 {
-	put_device(mci_pdev);
-	device_del(mci_pdev);
+	device_unregister(mci_pdev);
 	edac_put_sysfs_subsys();
-	kfree(mci_pdev);
 }

Original file line number	Diff line number	Diff line change
`@@ -472,8 +472,7 @@ static void edac_delete_csrow_objects(struct mem_ctl_info *mci)`
`472`	`472`	`device_remove_file(&csrow->dev,`
`473`	`473`	`dynamic_csrow_ce_count_attr[chan]);`
`474`	`474`	`}`
`475`		`- put_device(&mci->csrows[i]->dev);`
`476`		`- device_del(&mci->csrows[i]->dev);`
	`475`	`+ device_unregister(&mci->csrows[i]->dev);`
`477`	`476`	`}`
`478`	`477`	`}`
`479`	`478`	`#endif`
`@@ -1055,11 +1054,9 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)`
`1055`	`1054`	`struct dimm_info *dimm = mci->dimms[i];`
`1056`	`1055`	`if (dimm->nr_pages == 0)`
`1057`	`1056`	`continue;`
`1058`		`- put_device(&dimm->dev);`
`1059`		`- device_del(&dimm->dev);`
	`1057`	`+ device_unregister(&dimm->dev);`
`1060`	`1058`	`}`
`1061`		`- put_device(&mci->dev);`
`1062`		`- device_del(&mci->dev);`
	`1059`	`+ device_unregister(&mci->dev);`
`1063`	`1060`	`bus_unregister(&mci->bus);`
`1064`	`1061`	`kfree(mci->bus.name);`
`1065`	`1062`	`return err;`
`@@ -1086,16 +1083,14 @@ void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci)`
`1086`	`1083`	`if (dimm->nr_pages == 0)`
`1087`	`1084`	`continue;`
`1088`	`1085`	`edac_dbg(0, "removing device %s\n", dev_name(&dimm->dev));`
`1089`		`- put_device(&dimm->dev);`
`1090`		`- device_del(&dimm->dev);`
	`1086`	`+ device_unregister(&dimm->dev);`
`1091`	`1087`	`}`
`1092`	`1088`	`}`
`1093`	`1089`
`1094`	`1090`	`void edac_unregister_sysfs(struct mem_ctl_info *mci)`
`1095`	`1091`	`{`
`1096`	`1092`	`edac_dbg(1, "Unregistering device %s\n", dev_name(&mci->dev));`
`1097`		`- put_device(&mci->dev);`
`1098`		`- device_del(&mci->dev);`
	`1093`	`+ device_unregister(&mci->dev);`
`1099`	`1094`	`bus_unregister(&mci->bus);`
`1100`	`1095`	`kfree(mci->bus.name);`
`1101`	`1096`	`}`
`@@ -1159,8 +1154,6 @@ int __init edac_mc_sysfs_init(void)`
`1159`	`1154`
`1160`	`1155`	`void __exit edac_mc_sysfs_exit(void)`
`1161`	`1156`	`{`
`1162`		`- put_device(mci_pdev);`
`1163`		`- device_del(mci_pdev);`
	`1157`	`+ device_unregister(mci_pdev);`
`1164`	`1158`	`edac_put_sysfs_subsys();`
`1165`		`- kfree(mci_pdev);`
`1166`	`1159`	`}`