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

Commit d4538000 authored by Borislav Petkov's avatar Borislav Petkov
Browse files

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: default avatarBorislav Petkov <bp@suse.de>
parent a97d2627

drivers/edac/edac_device_sysfs.c

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

drivers/edac/edac_mc_sysfs.c

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

drivers/edac/edac_pci_sysfs.c

+1 −9
Original line number Diff line number Diff line
@@ -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