renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-20 03:24:03 +08:00
Code

EDAC: octeon: Use static attribute groups for sysfs entries

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

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: http://lkml.kernel.org/r/1423046938-18111-8-git-send-email-tiwai@suse.de
Signed-off-by: Borislav Petkov <bp@suse.de>
This commit is contained in:
Takashi Iwai 2015-02-04 11:48:57 +01:00 committed by Borislav Petkov
parent 917c85b545
commit 1bf06a0d55
1 changed files with 13 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
drivers/edac/octeon_edac-lmc.c
View File

@ -209,35 +209,18 @@ static DEVICE_ATTR(row, S_IRUGO | S_IWUSR,
static DEVICE_ATTR(col, S_IRUGO | S_IWUSR, static DEVICE_ATTR(col, S_IRUGO | S_IWUSR,
octeon_mc_inject_col_show, octeon_mc_inject_col_store); octeon_mc_inject_col_show, octeon_mc_inject_col_store);
static struct attribute *octeon_dev_attrs[] = {
&dev_attr_inject.attr,
&dev_attr_error_type.attr,
&dev_attr_dimm.attr,
&dev_attr_rank.attr,
&dev_attr_bank.attr,
&dev_attr_row.attr,
&dev_attr_col.attr,
NULL
};
static int octeon_set_mc_sysfs_attributes(struct mem_ctl_info *mci) ATTRIBUTE_GROUPS(octeon_dev);
{
int rc;
rc = device_create_file(&mci->dev, &dev_attr_inject);
if (rc < 0)
return rc;
rc = device_create_file(&mci->dev, &dev_attr_error_type);
if (rc < 0)
return rc;
rc = device_create_file(&mci->dev, &dev_attr_dimm);
if (rc < 0)
return rc;
rc = device_create_file(&mci->dev, &dev_attr_rank);
if (rc < 0)
return rc;
rc = device_create_file(&mci->dev, &dev_attr_bank);
if (rc < 0)
return rc;
rc = device_create_file(&mci->dev, &dev_attr_row);
if (rc < 0)
return rc;
rc = device_create_file(&mci->dev, &dev_attr_col);
if (rc < 0)
return rc;
return 0;
}
static int octeon_lmc_edac_probe(struct platform_device *pdev) static int octeon_lmc_edac_probe(struct platform_device *pdev)
{ {
@ -271,18 +254,12 @@ static int octeon_lmc_edac_probe(struct platform_device *pdev)
mci->ctl_name = "octeon-lmc-err"; mci->ctl_name = "octeon-lmc-err";
mci->edac_check = octeon_lmc_edac_poll; mci->edac_check = octeon_lmc_edac_poll;
if (edac_mc_add_mc(mci)) { if (edac_mc_add_mc_with_groups(mci, octeon_dev_groups)) {
dev_err(&pdev->dev, "edac_mc_add_mc() failed\n"); dev_err(&pdev->dev, "edac_mc_add_mc() failed\n");
edac_mc_free(mci); edac_mc_free(mci);
return -ENXIO; return -ENXIO;
} }
if (octeon_set_mc_sysfs_attributes(mci)) {
dev_err(&pdev->dev, "octeon_set_mc_sysfs_attributes() failed\n");
return -ENXIO;
}
cfg0.u64 = cvmx_read_csr(CVMX_LMCX_MEM_CFG0(mc)); cfg0.u64 = cvmx_read_csr(CVMX_LMCX_MEM_CFG0(mc));
cfg0.s.intr_ded_ena = 0; /* We poll */ cfg0.s.intr_ded_ena = 0; /* We poll */
cfg0.s.intr_sec_ena = 0; cfg0.s.intr_sec_ena = 0;
@ -309,18 +286,12 @@ static int octeon_lmc_edac_probe(struct platform_device *pdev)
mci->ctl_name = "co_lmc_err"; mci->ctl_name = "co_lmc_err";
mci->edac_check = octeon_lmc_edac_poll_o2; mci->edac_check = octeon_lmc_edac_poll_o2;
if (edac_mc_add_mc(mci)) { if (edac_mc_add_mc_with_groups(mci, octeon_dev_groups)) {
dev_err(&pdev->dev, "edac_mc_add_mc() failed\n"); dev_err(&pdev->dev, "edac_mc_add_mc() failed\n");
edac_mc_free(mci); edac_mc_free(mci);
return -ENXIO; return -ENXIO;
} }
if (octeon_set_mc_sysfs_attributes(mci)) {
dev_err(&pdev->dev, "octeon_set_mc_sysfs_attributes() failed\n");
return -ENXIO;
}
en.u64 = cvmx_read_csr(CVMX_LMCX_MEM_CFG0(mc)); en.u64 = cvmx_read_csr(CVMX_LMCX_MEM_CFG0(mc));
en.s.intr_ded_ena = 0; /* We poll */ en.s.intr_ded_ena = 0; /* We poll */
en.s.intr_sec_ena = 0; en.s.intr_sec_ena = 0;