aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/edac/i82860_edac.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/edac/i82860_edac.c')
-rw-r--r--drivers/edac/i82860_edac.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c
index db8a864f16f6..9fdd76e157f8 100644
--- a/drivers/edac/i82860_edac.c
+++ b/drivers/edac/i82860_edac.c
@@ -54,7 +54,7 @@ struct i82860_error_info {
54 54
55static const struct i82860_dev_info i82860_devs[] = { 55static const struct i82860_dev_info i82860_devs[] = {
56 [I82860] = { 56 [I82860] = {
57 .ctl_name = "i82860"}, 57 .ctl_name = "i82860"},
58}; 58};
59 59
60static struct pci_dev *mci_pdev = NULL; /* init dev: in case that AGP code 60static struct pci_dev *mci_pdev = NULL; /* init dev: in case that AGP code
@@ -63,7 +63,7 @@ static struct pci_dev *mci_pdev = NULL; /* init dev: in case that AGP code
63static struct edac_pci_ctl_info *i82860_pci; 63static struct edac_pci_ctl_info *i82860_pci;
64 64
65static void i82860_get_error_info(struct mem_ctl_info *mci, 65static void i82860_get_error_info(struct mem_ctl_info *mci,
66 struct i82860_error_info *info) 66 struct i82860_error_info *info)
67{ 67{
68 struct pci_dev *pdev; 68 struct pci_dev *pdev;
69 69
@@ -96,8 +96,8 @@ static void i82860_get_error_info(struct mem_ctl_info *mci,
96} 96}
97 97
98static int i82860_process_error_info(struct mem_ctl_info *mci, 98static int i82860_process_error_info(struct mem_ctl_info *mci,
99 struct i82860_error_info *info, 99 struct i82860_error_info *info,
100 int handle_errors) 100 int handle_errors)
101{ 101{
102 int row; 102 int row;
103 103
@@ -119,7 +119,7 @@ static int i82860_process_error_info(struct mem_ctl_info *mci,
119 edac_mc_handle_ue(mci, info->eap, 0, row, "i82860 UE"); 119 edac_mc_handle_ue(mci, info->eap, 0, row, "i82860 UE");
120 else 120 else
121 edac_mc_handle_ce(mci, info->eap, 0, info->derrsyn, row, 0, 121 edac_mc_handle_ce(mci, info->eap, 0, info->derrsyn, row, 0,
122 "i82860 UE"); 122 "i82860 UE");
123 123
124 return 1; 124 return 1;
125} 125}
@@ -155,7 +155,7 @@ static void i82860_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev)
155 csrow = &mci->csrows[index]; 155 csrow = &mci->csrows[index];
156 pci_read_config_word(pdev, I82860_GBA + index * 2, &value); 156 pci_read_config_word(pdev, I82860_GBA + index * 2, &value);
157 cumul_size = (value & I82860_GBA_MASK) << 157 cumul_size = (value & I82860_GBA_MASK) <<
158 (I82860_GBA_SHIFT - PAGE_SHIFT); 158 (I82860_GBA_SHIFT - PAGE_SHIFT);
159 debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index, 159 debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index,
160 cumul_size); 160 cumul_size);
161 161
@@ -230,14 +230,14 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx)
230 230
231 return 0; 231 return 0;
232 232
233 fail: 233fail:
234 edac_mc_free(mci); 234 edac_mc_free(mci);
235 return -ENODEV; 235 return -ENODEV;
236} 236}
237 237
238/* returns count (>= 0), or negative on error */ 238/* returns count (>= 0), or negative on error */
239static int __devinit i82860_init_one(struct pci_dev *pdev, 239static int __devinit i82860_init_one(struct pci_dev *pdev,
240 const struct pci_device_id *ent) 240 const struct pci_device_id *ent)
241{ 241{
242 int rc; 242 int rc;
243 243
@@ -299,7 +299,7 @@ static int __init i82860_init(void)
299 299
300 if (!mci_pdev) { 300 if (!mci_pdev) {
301 mci_pdev = pci_get_device(PCI_VENDOR_ID_INTEL, 301 mci_pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
302 PCI_DEVICE_ID_INTEL_82860_0, NULL); 302 PCI_DEVICE_ID_INTEL_82860_0, NULL);
303 303
304 if (mci_pdev == NULL) { 304 if (mci_pdev == NULL) {
305 debugf0("860 pci_get_device fail\n"); 305 debugf0("860 pci_get_device fail\n");
@@ -318,10 +318,10 @@ static int __init i82860_init(void)
318 318
319 return 0; 319 return 0;
320 320
321 fail1: 321fail1:
322 pci_unregister_driver(&i82860_driver); 322 pci_unregister_driver(&i82860_driver);
323 323
324 fail0: 324fail0:
325 if (mci_pdev != NULL) 325 if (mci_pdev != NULL)
326 pci_dev_put(mci_pdev); 326 pci_dev_put(mci_pdev);
327 327
@@ -343,5 +343,5 @@ module_exit(i82860_exit);
343 343
344MODULE_LICENSE("GPL"); 344MODULE_LICENSE("GPL");
345MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com) " 345MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com) "
346 "Ben Woodard <woodard@redhat.com>"); 346 "Ben Woodard <woodard@redhat.com>");
347MODULE_DESCRIPTION("ECC support for Intel 82860 memory hub controllers"); 347MODULE_DESCRIPTION("ECC support for Intel 82860 memory hub controllers");