diff options
Diffstat (limited to 'drivers/edac/mpc85xx_edac.c')
-rw-r--r-- | drivers/edac/mpc85xx_edac.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c index 0db6f1e84656..e01c678cb6a7 100644 --- a/drivers/edac/mpc85xx_edac.c +++ b/drivers/edac/mpc85xx_edac.c | |||
@@ -280,7 +280,7 @@ static int __devinit mpc85xx_pci_err_probe(struct platform_device *op) | |||
280 | out_be32(pdata->pci_vbase + MPC85XX_PCI_ERR_DR, ~0); | 280 | out_be32(pdata->pci_vbase + MPC85XX_PCI_ERR_DR, ~0); |
281 | 281 | ||
282 | if (edac_pci_add_device(pci, pdata->edac_idx) > 0) { | 282 | if (edac_pci_add_device(pci, pdata->edac_idx) > 0) { |
283 | debugf3("%s(): failed edac_pci_add_device()\n", __func__); | 283 | debugf3("failed edac_pci_add_device()\n"); |
284 | goto err; | 284 | goto err; |
285 | } | 285 | } |
286 | 286 | ||
@@ -303,7 +303,7 @@ static int __devinit mpc85xx_pci_err_probe(struct platform_device *op) | |||
303 | } | 303 | } |
304 | 304 | ||
305 | devres_remove_group(&op->dev, mpc85xx_pci_err_probe); | 305 | devres_remove_group(&op->dev, mpc85xx_pci_err_probe); |
306 | debugf3("%s(): success\n", __func__); | 306 | debugf3("success\n"); |
307 | printk(KERN_INFO EDAC_MOD_STR " PCI err registered\n"); | 307 | printk(KERN_INFO EDAC_MOD_STR " PCI err registered\n"); |
308 | 308 | ||
309 | return 0; | 309 | return 0; |
@@ -321,7 +321,7 @@ static int mpc85xx_pci_err_remove(struct platform_device *op) | |||
321 | struct edac_pci_ctl_info *pci = dev_get_drvdata(&op->dev); | 321 | struct edac_pci_ctl_info *pci = dev_get_drvdata(&op->dev); |
322 | struct mpc85xx_pci_pdata *pdata = pci->pvt_info; | 322 | struct mpc85xx_pci_pdata *pdata = pci->pvt_info; |
323 | 323 | ||
324 | debugf0("%s()\n", __func__); | 324 | debugf0("\n"); |
325 | 325 | ||
326 | out_be32(pdata->pci_vbase + MPC85XX_PCI_ERR_CAP_DR, | 326 | out_be32(pdata->pci_vbase + MPC85XX_PCI_ERR_CAP_DR, |
327 | orig_pci_err_cap_dr); | 327 | orig_pci_err_cap_dr); |
@@ -582,7 +582,7 @@ static int __devinit mpc85xx_l2_err_probe(struct platform_device *op) | |||
582 | pdata->edac_idx = edac_dev_idx++; | 582 | pdata->edac_idx = edac_dev_idx++; |
583 | 583 | ||
584 | if (edac_device_add_device(edac_dev) > 0) { | 584 | if (edac_device_add_device(edac_dev) > 0) { |
585 | debugf3("%s(): failed edac_device_add_device()\n", __func__); | 585 | debugf3("failed edac_device_add_device()\n"); |
586 | goto err; | 586 | goto err; |
587 | } | 587 | } |
588 | 588 | ||
@@ -610,7 +610,7 @@ static int __devinit mpc85xx_l2_err_probe(struct platform_device *op) | |||
610 | 610 | ||
611 | devres_remove_group(&op->dev, mpc85xx_l2_err_probe); | 611 | devres_remove_group(&op->dev, mpc85xx_l2_err_probe); |
612 | 612 | ||
613 | debugf3("%s(): success\n", __func__); | 613 | debugf3("success\n"); |
614 | printk(KERN_INFO EDAC_MOD_STR " L2 err registered\n"); | 614 | printk(KERN_INFO EDAC_MOD_STR " L2 err registered\n"); |
615 | 615 | ||
616 | return 0; | 616 | return 0; |
@@ -628,7 +628,7 @@ static int mpc85xx_l2_err_remove(struct platform_device *op) | |||
628 | struct edac_device_ctl_info *edac_dev = dev_get_drvdata(&op->dev); | 628 | struct edac_device_ctl_info *edac_dev = dev_get_drvdata(&op->dev); |
629 | struct mpc85xx_l2_pdata *pdata = edac_dev->pvt_info; | 629 | struct mpc85xx_l2_pdata *pdata = edac_dev->pvt_info; |
630 | 630 | ||
631 | debugf0("%s()\n", __func__); | 631 | debugf0("\n"); |
632 | 632 | ||
633 | if (edac_op_state == EDAC_OPSTATE_INT) { | 633 | if (edac_op_state == EDAC_OPSTATE_INT) { |
634 | out_be32(pdata->l2_vbase + MPC85XX_L2_ERRINTEN, 0); | 634 | out_be32(pdata->l2_vbase + MPC85XX_L2_ERRINTEN, 0); |
@@ -1037,7 +1037,7 @@ static int __devinit mpc85xx_mc_err_probe(struct platform_device *op) | |||
1037 | goto err; | 1037 | goto err; |
1038 | } | 1038 | } |
1039 | 1039 | ||
1040 | debugf3("%s(): init mci\n", __func__); | 1040 | debugf3("init mci\n"); |
1041 | mci->mtype_cap = MEM_FLAG_RDDR | MEM_FLAG_RDDR2 | | 1041 | mci->mtype_cap = MEM_FLAG_RDDR | MEM_FLAG_RDDR2 | |
1042 | MEM_FLAG_DDR | MEM_FLAG_DDR2; | 1042 | MEM_FLAG_DDR | MEM_FLAG_DDR2; |
1043 | mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; | 1043 | mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; |
@@ -1063,13 +1063,13 @@ static int __devinit mpc85xx_mc_err_probe(struct platform_device *op) | |||
1063 | out_be32(pdata->mc_vbase + MPC85XX_MC_ERR_DETECT, ~0); | 1063 | out_be32(pdata->mc_vbase + MPC85XX_MC_ERR_DETECT, ~0); |
1064 | 1064 | ||
1065 | if (edac_mc_add_mc(mci)) { | 1065 | if (edac_mc_add_mc(mci)) { |
1066 | debugf3("%s(): failed edac_mc_add_mc()\n", __func__); | 1066 | debugf3("failed edac_mc_add_mc()\n"); |
1067 | goto err; | 1067 | goto err; |
1068 | } | 1068 | } |
1069 | 1069 | ||
1070 | if (mpc85xx_create_sysfs_attributes(mci)) { | 1070 | if (mpc85xx_create_sysfs_attributes(mci)) { |
1071 | edac_mc_del_mc(mci->pdev); | 1071 | edac_mc_del_mc(mci->pdev); |
1072 | debugf3("%s(): failed edac_mc_add_mc()\n", __func__); | 1072 | debugf3("failed edac_mc_add_mc()\n"); |
1073 | goto err; | 1073 | goto err; |
1074 | } | 1074 | } |
1075 | 1075 | ||
@@ -1103,7 +1103,7 @@ static int __devinit mpc85xx_mc_err_probe(struct platform_device *op) | |||
1103 | } | 1103 | } |
1104 | 1104 | ||
1105 | devres_remove_group(&op->dev, mpc85xx_mc_err_probe); | 1105 | devres_remove_group(&op->dev, mpc85xx_mc_err_probe); |
1106 | debugf3("%s(): success\n", __func__); | 1106 | debugf3("success\n"); |
1107 | printk(KERN_INFO EDAC_MOD_STR " MC err registered\n"); | 1107 | printk(KERN_INFO EDAC_MOD_STR " MC err registered\n"); |
1108 | 1108 | ||
1109 | return 0; | 1109 | return 0; |
@@ -1121,7 +1121,7 @@ static int mpc85xx_mc_err_remove(struct platform_device *op) | |||
1121 | struct mem_ctl_info *mci = dev_get_drvdata(&op->dev); | 1121 | struct mem_ctl_info *mci = dev_get_drvdata(&op->dev); |
1122 | struct mpc85xx_mc_pdata *pdata = mci->pvt_info; | 1122 | struct mpc85xx_mc_pdata *pdata = mci->pvt_info; |
1123 | 1123 | ||
1124 | debugf0("%s()\n", __func__); | 1124 | debugf0("\n"); |
1125 | 1125 | ||
1126 | if (edac_op_state == EDAC_OPSTATE_INT) { | 1126 | if (edac_op_state == EDAC_OPSTATE_INT) { |
1127 | out_be32(pdata->mc_vbase + MPC85XX_MC_ERR_INT_EN, 0); | 1127 | out_be32(pdata->mc_vbase + MPC85XX_MC_ERR_INT_EN, 0); |