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

Commit 917c85b5 authored by Takashi Iwai's avatar Takashi Iwai Committed by Borislav Petkov
Browse files

EDAC: mpc85xx: Use static attribute groups for sysfs entries 



... instead of manual device_create_file() and device_remove_file()
calls.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Cc: Johannes Thumshirn <johannes.thumshirn@men.de>
Link: http://lkml.kernel.org/r/1423046938-18111-7-git-send-email-tiwai@suse.de


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

drivers/edac/mpc85xx_edac.c

+8 −30
Original line number Diff line number Diff line
@@ -134,29 +134,14 @@ DEVICE_ATTR(inject_data_lo, S_IRUGO | S_IWUSR, 
DEVICE_ATTR(inject_ctrl, S_IRUGO | S_IWUSR,

	    mpc85xx_mc_inject_ctrl_show, mpc85xx_mc_inject_ctrl_store);



static int mpc85xx_create_sysfs_attributes(struct mem_ctl_info *mci)

{

	int rc;



	rc = device_create_file(&mci->dev, &dev_attr_inject_data_hi);

	if (rc < 0)

		return rc;

	rc = device_create_file(&mci->dev, &dev_attr_inject_data_lo);

	if (rc < 0)

		return rc;

	rc = device_create_file(&mci->dev, &dev_attr_inject_ctrl);

	if (rc < 0)

		return rc;

static struct attribute *mpc85xx_dev_attrs[] = {

	&dev_attr_inject_data_hi.attr,

	&dev_attr_inject_data_lo.attr,

	&dev_attr_inject_ctrl.attr,

	NULL

};



	return 0;

}



static void mpc85xx_remove_sysfs_attributes(struct mem_ctl_info *mci)

{

	device_remove_file(&mci->dev, &dev_attr_inject_data_hi);

	device_remove_file(&mci->dev, &dev_attr_inject_data_lo);

	device_remove_file(&mci->dev, &dev_attr_inject_ctrl);

}

ATTRIBUTE_GROUPS(mpc85xx_dev);



/**************************** PCI Err device ***************************/

#ifdef CONFIG_PCI
@@ -1106,13 +1091,7 @@ static int mpc85xx_mc_err_probe(struct platform_device *op) 
	/* clear all error bits */

	out_be32(pdata->mc_vbase + MPC85XX_MC_ERR_DETECT, ~0);



	if (edac_mc_add_mc(mci)) {

		edac_dbg(3, "failed edac_mc_add_mc()\n");

		goto err;

	}



	if (mpc85xx_create_sysfs_attributes(mci)) {

		edac_mc_del_mc(mci->pdev);

	if (edac_mc_add_mc_with_groups(mci, mpc85xx_dev_groups)) {

		edac_dbg(3, "failed edac_mc_add_mc()\n");

		goto err;

	}
@@ -1176,7 +1155,6 @@ static int mpc85xx_mc_err_remove(struct platform_device *op) 
		 orig_ddr_err_disable);

	out_be32(pdata->mc_vbase + MPC85XX_MC_ERR_SBE, orig_ddr_err_sbe);



	mpc85xx_remove_sysfs_attributes(mci);

	edac_mc_del_mc(&op->dev);

	edac_mc_free(mci);

	return 0;