EDAC: Remove edac_get_sysfs_subsys() error handling

It cannot fail now. We either load EDAC core after having successfully
initialized edac_subsys or we don't.

Signed-off-by: Borislav Petkov <bp@suse.de>

diff --git a/drivers/edac/edac_device_sysfs.c b/drivers/edac/edac_device_sysfs.c
index 1705271653749ba8ae1a9918dbf68c69b9f122cf..93da1a45c7161a83cd021cbbf1ac73c300b2b9e9 100644 (file)
--- a/drivers/edac/edac_device_sysfs.c
+++ b/drivers/edac/edac_device_sysfs.c
@@ -237,11 +237,6 @@ int edac_device_register_sysfs_main_kobj(struct edac_device_ctl_info *edac_dev)
 
        /* get the /sys/devices/system/edac reference */
        edac_subsys = edac_get_sysfs_subsys();
-       if (edac_subsys == NULL) {
-               edac_dbg(1, "no edac_subsys error\n");
-               err = -ENODEV;
-               goto err_out;
-       }
 
        /* Point to the 'edac_subsys' this instance 'reports' to */
        edac_dev->edac_subsys = edac_subsys;

diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index 1c79ae3e083a1d4dac885103c0c320f266b628a8..26e65ab5932abbb6e766f54f2cfc9009fe61df44 100644 (file)
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -1025,24 +1025,15 @@ static struct device_type mc_attr_type = {
  */
 int __init edac_mc_sysfs_init(void)
 {
-       struct bus_type *edac_subsys;
        int err;
 
-       /* get the /sys/devices/system/edac subsys reference */
-       edac_subsys = edac_get_sysfs_subsys();
-       if (edac_subsys == NULL) {
-               edac_dbg(1, "no edac_subsys\n");
-               err = -EINVAL;
-               goto out;
-       }
-
        mci_pdev = kzalloc(sizeof(*mci_pdev), GFP_KERNEL);
        if (!mci_pdev) {
                err = -ENOMEM;
                goto out;
        }
 
-       mci_pdev->bus = edac_subsys;
+       mci_pdev->bus = edac_get_sysfs_subsys();
        mci_pdev->type = &mc_attr_type;
        device_initialize(mci_pdev);
        dev_set_name(mci_pdev, "mc");

diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
index 262f56cca9ffff2b925382ba8d0a069f694fbd5f..6e3428ba400f38774f7ac562b51b3759b81913d2 100644 (file)
--- a/drivers/edac/edac_pci_sysfs.c
+++ b/drivers/edac/edac_pci_sysfs.c
@@ -331,10 +331,7 @@ static struct kobj_type ktype_edac_pci_main_kobj = {
 };
 
 /**
- * edac_pci_main_kobj_setup()
- *
- *     setup the sysfs for EDAC PCI attributes
- *     assumes edac_subsys has already been initialized
+ * edac_pci_main_kobj_setup: Setup the sysfs for EDAC PCI attributes.
  */
 static int edac_pci_main_kobj_setup(void)
 {
@@ -351,11 +348,6 @@ static int edac_pci_main_kobj_setup(void)
         * controls and attributes
         */
        edac_subsys = edac_get_sysfs_subsys();
-       if (edac_subsys == NULL) {
-               edac_dbg(1, "no edac_subsys\n");
-               err = -ENODEV;
-               goto decrement_count_fail;
-       }
 
        /* Bump the reference count on this module to ensure the
         * modules isn't unloaded until we deconstruct the top