leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/edac: Lindent i82875p

Browse Source 
Lindent cleanup of i82875p_edac driver

Signed-off-by: Dave Jiang <djiang@mvista.com>
Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Dave Jiang
2007-07-19 01:50:05 -07:00
committed by Linus Torvalds
parent b4e8b37201
commit 466b71d584
1 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/edac/i82875p_edac.c
View File

@@ -174,8 +174,7 @@ struct i82875p_error_info {
static const struct i82875p_dev_info i82875p_devs[] = { static const struct i82875p_dev_info i82875p_devs[] = {
[I82875P] = { [I82875P] = {
.ctl_name = "i82875p" .ctl_name = "i82875p"},
},
}; };
static struct pci_dev *mci_pdev = NULL; /* init dev: in case that AGP code has static struct pci_dev *mci_pdev = NULL; /* init dev: in case that AGP code has
@@ -216,13 +215,13 @@ static void i82875p_get_error_info(struct mem_ctl_info *mci,
if ((info->errsts ^ info->errsts2) & 0x0081) { if ((info->errsts ^ info->errsts2) & 0x0081) {
pci_read_config_dword(pdev, I82875P_EAP, &info->eap); pci_read_config_dword(pdev, I82875P_EAP, &info->eap);
pci_read_config_byte(pdev, I82875P_DES, &info->des); pci_read_config_byte(pdev, I82875P_DES, &info->des);
pci_read_config_byte(pdev, I82875P_DERRSYN, pci_read_config_byte(pdev, I82875P_DERRSYN, &info->derrsyn);
&info->derrsyn);
} }
} }
static int i82875p_process_error_info(struct mem_ctl_info *mci, static int i82875p_process_error_info(struct mem_ctl_info *mci,
struct i82875p_error_info *info, int handle_errors) struct i82875p_error_info *info,
int handle_errors)
{ {
int row, multi_chan; int row, multi_chan;
@@ -263,7 +262,8 @@ static void i82875p_check(struct mem_ctl_info *mci)
/* Return 0 on success or 1 on failure. */ /* Return 0 on success or 1 on failure. */
static int i82875p_setup_overfl_dev(struct pci_dev *pdev, static int i82875p_setup_overfl_dev(struct pci_dev *pdev,
struct pci_dev **ovrfl_pdev, void __iomem **ovrfl_window) struct pci_dev **ovrfl_pdev,
void __iomem ** ovrfl_window)
{ {
struct pci_dev *dev; struct pci_dev *dev;
void __iomem *window; void __iomem *window;
@@ -314,27 +314,26 @@ static int i82875p_setup_overfl_dev(struct pci_dev *pdev,
*ovrfl_window = window; *ovrfl_window = window;
return 0; return 0;
fail1: fail1:
pci_release_regions(dev); pci_release_regions(dev);
#ifdef CORRECT_BIOS #ifdef CORRECT_BIOS
fail0: fail0:
pci_disable_device(dev); pci_disable_device(dev);
#endif #endif
/* NOTE: the ovrfl proc entry and pci_dev are intentionally left */ /* NOTE: the ovrfl proc entry and pci_dev are intentionally left */
return 1; return 1;
} }
/* Return 1 if dual channel mode is active. Else return 0. */ /* Return 1 if dual channel mode is active. Else return 0. */
static inline int dual_channel_active(u32 drc) static inline int dual_channel_active(u32 drc)
{ {
return (drc >> 21) & 0x1; return (drc >> 21) & 0x1;
} }
static void i82875p_init_csrows(struct mem_ctl_info *mci, static void i82875p_init_csrows(struct mem_ctl_info *mci,
struct pci_dev *pdev, void __iomem *ovrfl_window, u32 drc) struct pci_dev *pdev,
void __iomem * ovrfl_window, u32 drc)
{ {
struct csrow_info *csrow; struct csrow_info *csrow;
unsigned long last_cumul_size; unsigned long last_cumul_size;
@@ -411,7 +410,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
mci->edac_check = i82875p_check; mci->edac_check = i82875p_check;
mci->ctl_page_to_phys = NULL; mci->ctl_page_to_phys = NULL;
debugf3("%s(): init pvt\n", __func__); debugf3("%s(): init pvt\n", __func__);
pvt = (struct i82875p_pvt *) mci->pvt_info; pvt = (struct i82875p_pvt *)mci->pvt_info;
pvt->ovrfl_pdev = ovrfl_pdev; pvt->ovrfl_pdev = ovrfl_pdev;
pvt->ovrfl_window = ovrfl_window; pvt->ovrfl_window = ovrfl_window;
i82875p_init_csrows(mci, pdev, ovrfl_window, drc); i82875p_init_csrows(mci, pdev, ovrfl_window, drc);
@@ -420,7 +419,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
/* Here we assume that we will never see multiple instances of this /* Here we assume that we will never see multiple instances of this
* type of memory controller. The ID is therefore hardcoded to 0. * type of memory controller. The ID is therefore hardcoded to 0.
*/ */
if (edac_mc_add_mc(mci,0)) { if (edac_mc_add_mc(mci, 0)) {
debugf3("%s(): failed edac_mc_add_mc()\n", __func__); debugf3("%s(): failed edac_mc_add_mc()\n", __func__);
goto fail1; goto fail1;
} }
@@ -429,10 +428,10 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
debugf3("%s(): success\n", __func__); debugf3("%s(): success\n", __func__);
return 0; return 0;
fail1: fail1:
edac_mc_free(mci); edac_mc_free(mci);
fail0: fail0:
iounmap(ovrfl_window); iounmap(ovrfl_window);
pci_release_regions(ovrfl_pdev); pci_release_regions(ovrfl_pdev);
@@ -471,7 +470,7 @@ static void __devexit i82875p_remove_one(struct pci_dev *pdev)
if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL) if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL)
return; return;
pvt = (struct i82875p_pvt *) mci->pvt_info; pvt = (struct i82875p_pvt *)mci->pvt_info;
if (pvt->ovrfl_window) if (pvt->ovrfl_window)
iounmap(pvt->ovrfl_window); iounmap(pvt->ovrfl_window);
@@ -490,8 +489,7 @@ static void __devexit i82875p_remove_one(struct pci_dev *pdev)
static const struct pci_device_id i82875p_pci_tbl[] __devinitdata = { static const struct pci_device_id i82875p_pci_tbl[] __devinitdata = {
{ {
PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
I82875P I82875P},
},
{ {
0, 0,
} /* 0 terminated list. */ } /* 0 terminated list. */
@@ -537,10 +535,10 @@ static int __init i82875p_init(void)
return 0; return 0;
fail1: fail1:
pci_unregister_driver(&i82875p_driver); pci_unregister_driver(&i82875p_driver);
fail0: fail0:
if (mci_pdev != NULL) if (mci_pdev != NULL)
pci_dev_put(mci_pdev); pci_dev_put(mci_pdev);