Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 17:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

mpc85xx_edac: convert sysfs logic to use struct device

Browse Source 
Now that the EDAC core supports struct device, there's no sense on
having any logic at the EDAC core to simulate it. So, instead of adding
such logic there, change the logic at mpc85xx_edac to use it

compile-tested only.

Reviewed-by: Aristeu Rozanski <arozansk@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Shaohui Xie <Shaohui.Xie@freescale.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2012-03-21 15:16:20 -03:00
parent 7a623c0390
commit ba004239e0
1 changed files with 56 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
drivers/edac/mpc85xx_edac.c
View File

@ -49,34 +49,45 @@ static u32 orig_hid1[2];
/************************ MC SYSFS parts ***********************************/ /************************ MC SYSFS parts ***********************************/
static ssize_t mpc85xx_mc_inject_data_hi_show(struct mem_ctl_info *mci, #define to_mci(k) container_of(k, struct mem_ctl_info, dev)
static ssize_t mpc85xx_mc_inject_data_hi_show(struct device *dev,
struct device_attribute *mattr,
char *data) char *data)
{ {
struct mem_ctl_info *mci = to_mci(dev);
struct mpc85xx_mc_pdata *pdata = mci->pvt_info; struct mpc85xx_mc_pdata *pdata = mci->pvt_info;
return sprintf(data, "0x%08x", return sprintf(data, "0x%08x",
in_be32(pdata->mc_vbase + in_be32(pdata->mc_vbase +
MPC85XX_MC_DATA_ERR_INJECT_HI)); MPC85XX_MC_DATA_ERR_INJECT_HI));
} }
static ssize_t mpc85xx_mc_inject_data_lo_show(struct mem_ctl_info *mci, static ssize_t mpc85xx_mc_inject_data_lo_show(struct device *dev,
struct device_attribute *mattr,
char *data) char *data)
{ {
struct mem_ctl_info *mci = to_mci(dev);
struct mpc85xx_mc_pdata *pdata = mci->pvt_info; struct mpc85xx_mc_pdata *pdata = mci->pvt_info;
return sprintf(data, "0x%08x", return sprintf(data, "0x%08x",
in_be32(pdata->mc_vbase + in_be32(pdata->mc_vbase +
MPC85XX_MC_DATA_ERR_INJECT_LO)); MPC85XX_MC_DATA_ERR_INJECT_LO));
} }
static ssize_t mpc85xx_mc_inject_ctrl_show(struct mem_ctl_info *mci, char *data) static ssize_t mpc85xx_mc_inject_ctrl_show(struct device *dev,
struct device_attribute *mattr,
char *data)
{ {
struct mem_ctl_info *mci = to_mci(dev);
struct mpc85xx_mc_pdata *pdata = mci->pvt_info; struct mpc85xx_mc_pdata *pdata = mci->pvt_info;
return sprintf(data, "0x%08x", return sprintf(data, "0x%08x",
in_be32(pdata->mc_vbase + MPC85XX_MC_ECC_ERR_INJECT)); in_be32(pdata->mc_vbase + MPC85XX_MC_ECC_ERR_INJECT));
} }
static ssize_t mpc85xx_mc_inject_data_hi_store(struct mem_ctl_info *mci, static ssize_t mpc85xx_mc_inject_data_hi_store(struct device *dev,
struct device_attribute *mattr,
const char *data, size_t count) const char *data, size_t count)
{ {
struct mem_ctl_info *mci = to_mci(dev);
struct mpc85xx_mc_pdata *pdata = mci->pvt_info; struct mpc85xx_mc_pdata *pdata = mci->pvt_info;
if (isdigit(*data)) { if (isdigit(*data)) {
out_be32(pdata->mc_vbase + MPC85XX_MC_DATA_ERR_INJECT_HI, out_be32(pdata->mc_vbase + MPC85XX_MC_DATA_ERR_INJECT_HI,
@ -86,9 +97,11 @@ static ssize_t mpc85xx_mc_inject_data_hi_store(struct mem_ctl_info *mci,
return 0; return 0;
} }
static ssize_t mpc85xx_mc_inject_data_lo_store(struct mem_ctl_info *mci, static ssize_t mpc85xx_mc_inject_data_lo_store(struct device *dev,
struct device_attribute *mattr,
const char *data, size_t count) const char *data, size_t count)
{ {
struct mem_ctl_info *mci = to_mci(dev);
struct mpc85xx_mc_pdata *pdata = mci->pvt_info; struct mpc85xx_mc_pdata *pdata = mci->pvt_info;
if (isdigit(*data)) { if (isdigit(*data)) {
out_be32(pdata->mc_vbase + MPC85XX_MC_DATA_ERR_INJECT_LO, out_be32(pdata->mc_vbase + MPC85XX_MC_DATA_ERR_INJECT_LO,
@ -98,9 +111,11 @@ static ssize_t mpc85xx_mc_inject_data_lo_store(struct mem_ctl_info *mci,
return 0; return 0;
} }
static ssize_t mpc85xx_mc_inject_ctrl_store(struct mem_ctl_info *mci, static ssize_t mpc85xx_mc_inject_ctrl_store(struct device *dev,
const char *data, size_t count) struct device_attribute *mattr,
const char *data, size_t count)
{ {
struct mem_ctl_info *mci = to_mci(dev);
struct mpc85xx_mc_pdata *pdata = mci->pvt_info; struct mpc85xx_mc_pdata *pdata = mci->pvt_info;
if (isdigit(*data)) { if (isdigit(*data)) {
out_be32(pdata->mc_vbase + MPC85XX_MC_ECC_ERR_INJECT, out_be32(pdata->mc_vbase + MPC85XX_MC_ECC_ERR_INJECT,
@ -110,38 +125,35 @@ static ssize_t mpc85xx_mc_inject_ctrl_store(struct mem_ctl_info *mci,
return 0; return 0;
} }
static struct mcidev_sysfs_attribute mpc85xx_mc_sysfs_attributes[] = { DEVICE_ATTR(inject_data_hi, S_IRUGO | S_IWUSR,
{ mpc85xx_mc_inject_data_hi_show, mpc85xx_mc_inject_data_hi_store);
.attr = { DEVICE_ATTR(inject_data_lo, S_IRUGO | S_IWUSR,
.name = "inject_data_hi", mpc85xx_mc_inject_data_lo_show, mpc85xx_mc_inject_data_lo_store);
.mode = (S_IRUGO | S_IWUSR) DEVICE_ATTR(inject_ctrl, S_IRUGO | S_IWUSR,
}, mpc85xx_mc_inject_ctrl_show, mpc85xx_mc_inject_ctrl_store);
.show = mpc85xx_mc_inject_data_hi_show,
.store = mpc85xx_mc_inject_data_hi_store},
{
.attr = {
.name = "inject_data_lo",
.mode = (S_IRUGO | S_IWUSR)
},
.show = mpc85xx_mc_inject_data_lo_show,
.store = mpc85xx_mc_inject_data_lo_store},
{
.attr = {
.name = "inject_ctrl",
.mode = (S_IRUGO | S_IWUSR)
},
.show = mpc85xx_mc_inject_ctrl_show,
.store = mpc85xx_mc_inject_ctrl_store},
/* End of list */ static int mpc85xx_create_sysfs_attributes(struct mem_ctl_info *mci)
{
.attr = {.name = NULL}
}
};
static void mpc85xx_set_mc_sysfs_attributes(struct mem_ctl_info *mci)
{ {
mci->mc_driver_sysfs_attributes = mpc85xx_mc_sysfs_attributes; 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;
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);
} }
/**************************** PCI Err device ***************************/ /**************************** PCI Err device ***************************/
@ -1040,8 +1052,6 @@ static int __devinit mpc85xx_mc_err_probe(struct platform_device *op)
mci->scrub_mode = SCRUB_SW_SRC; mci->scrub_mode = SCRUB_SW_SRC;
mpc85xx_set_mc_sysfs_attributes(mci);
mpc85xx_init_csrows(mci); mpc85xx_init_csrows(mci);
/* store the original error disable bits */ /* store the original error disable bits */
@ -1057,6 +1067,12 @@ static int __devinit mpc85xx_mc_err_probe(struct platform_device *op)
goto err; goto err;
} }
if (mpc85xx_create_sysfs_attributes(mci)) {
edac_mc_del_mc(mci->pdev);
debugf3("%s(): failed edac_mc_add_mc()\n", __func__);
goto err;
}
if (edac_op_state == EDAC_OPSTATE_INT) { if (edac_op_state == EDAC_OPSTATE_INT) {
out_be32(pdata->mc_vbase + MPC85XX_MC_ERR_INT_EN, out_be32(pdata->mc_vbase + MPC85XX_MC_ERR_INT_EN,
DDR_EIE_MBEE | DDR_EIE_SBEE); DDR_EIE_MBEE | DDR_EIE_SBEE);
@ -1116,6 +1132,7 @@ static int mpc85xx_mc_err_remove(struct platform_device *op)
orig_ddr_err_disable); orig_ddr_err_disable);
out_be32(pdata->mc_vbase + MPC85XX_MC_ERR_SBE, orig_ddr_err_sbe); 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_del_mc(&op->dev);
edac_mc_free(mci); edac_mc_free(mci);
return 0; return 0;