aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/edac/i82875p_edac.c
diff options
context:
space:
mode:
authorDouglas Thompson <dougthompson@xmission.com>2007-07-19 04:50:13 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 13:04:55 -0400
commit052dfb45ccb5ea354a426b52556bcfee75b9d2f5 (patch)
tree3f85586625b25f7eaf0471c99fc296bdd4ada4eb /drivers/edac/i82875p_edac.c
parent6bc7840411b8c7fe11e1879d882c88119d1c033e (diff)
drivers/edac: cleanup spaces-gotos after Lindent messup
This patch fixes some remnant spaces inserted by the use of Lindent. Seems Lindent adds some spaces when it shoulded. These have been fixed. In addition, goto targets have issues, these have been fixed in this patch. 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>
Diffstat (limited to 'drivers/edac/i82875p_edac.c')
-rw-r--r--drivers/edac/i82875p_edac.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
index 214112b5e52a..c9aed70fec8e 100644
--- a/drivers/edac/i82875p_edac.c
+++ b/drivers/edac/i82875p_edac.c
@@ -174,7 +174,7 @@ struct i82875p_error_info {
174 174
175static const struct i82875p_dev_info i82875p_devs[] = { 175static const struct i82875p_dev_info i82875p_devs[] = {
176 [I82875P] = { 176 [I82875P] = {
177 .ctl_name = "i82875p"}, 177 .ctl_name = "i82875p"},
178}; 178};
179 179
180static struct pci_dev *mci_pdev = NULL; /* init dev: in case that AGP code has 180static struct pci_dev *mci_pdev = NULL; /* init dev: in case that AGP code has
@@ -186,7 +186,7 @@ static int i82875p_registered = 1;
186static struct edac_pci_ctl_info *i82875p_pci; 186static struct edac_pci_ctl_info *i82875p_pci;
187 187
188static void i82875p_get_error_info(struct mem_ctl_info *mci, 188static void i82875p_get_error_info(struct mem_ctl_info *mci,
189 struct i82875p_error_info *info) 189 struct i82875p_error_info *info)
190{ 190{
191 struct pci_dev *pdev; 191 struct pci_dev *pdev;
192 192
@@ -222,8 +222,8 @@ static void i82875p_get_error_info(struct mem_ctl_info *mci,
222} 222}
223 223
224static int i82875p_process_error_info(struct mem_ctl_info *mci, 224static int i82875p_process_error_info(struct mem_ctl_info *mci,
225 struct i82875p_error_info *info, 225 struct i82875p_error_info *info,
226 int handle_errors) 226 int handle_errors)
227{ 227{
228 int row, multi_chan; 228 int row, multi_chan;
229 229
@@ -247,8 +247,8 @@ static int i82875p_process_error_info(struct mem_ctl_info *mci,
247 edac_mc_handle_ue(mci, info->eap, 0, row, "i82875p UE"); 247 edac_mc_handle_ue(mci, info->eap, 0, row, "i82875p UE");
248 else 248 else
249 edac_mc_handle_ce(mci, info->eap, 0, info->derrsyn, row, 249 edac_mc_handle_ce(mci, info->eap, 0, info->derrsyn, row,
250 multi_chan ? (info->des & 0x1) : 0, 250 multi_chan ? (info->des & 0x1) : 0,
251 "i82875p CE"); 251 "i82875p CE");
252 252
253 return 1; 253 return 1;
254} 254}
@@ -264,8 +264,8 @@ static void i82875p_check(struct mem_ctl_info *mci)
264 264
265/* Return 0 on success or 1 on failure. */ 265/* Return 0 on success or 1 on failure. */
266static int i82875p_setup_overfl_dev(struct pci_dev *pdev, 266static int i82875p_setup_overfl_dev(struct pci_dev *pdev,
267 struct pci_dev **ovrfl_pdev, 267 struct pci_dev **ovrfl_pdev,
268 void __iomem ** ovrfl_window) 268 void __iomem **ovrfl_window)
269{ 269{
270 struct pci_dev *dev; 270 struct pci_dev *dev;
271 void __iomem *window; 271 void __iomem *window;
@@ -293,7 +293,7 @@ static int i82875p_setup_overfl_dev(struct pci_dev *pdev,
293 293
294 if (pci_enable_device(dev)) { 294 if (pci_enable_device(dev)) {
295 i82875p_printk(KERN_ERR, "%s(): Failed to enable overflow " 295 i82875p_printk(KERN_ERR, "%s(): Failed to enable overflow "
296 "device\n", __func__); 296 "device\n", __func__);
297 return 1; 297 return 1;
298 } 298 }
299 299
@@ -309,18 +309,18 @@ static int i82875p_setup_overfl_dev(struct pci_dev *pdev,
309 309
310 if (window == NULL) { 310 if (window == NULL) {
311 i82875p_printk(KERN_ERR, "%s(): Failed to ioremap bar6\n", 311 i82875p_printk(KERN_ERR, "%s(): Failed to ioremap bar6\n",
312 __func__); 312 __func__);
313 goto fail1; 313 goto fail1;
314 } 314 }
315 315
316 *ovrfl_window = window; 316 *ovrfl_window = window;
317 return 0; 317 return 0;
318 318
319 fail1: 319fail1:
320 pci_release_regions(dev); 320 pci_release_regions(dev);
321 321
322#ifdef CORRECT_BIOS 322#ifdef CORRECT_BIOS
323 fail0: 323fail0:
324 pci_disable_device(dev); 324 pci_disable_device(dev);
325#endif 325#endif
326 /* NOTE: the ovrfl proc entry and pci_dev are intentionally left */ 326 /* NOTE: the ovrfl proc entry and pci_dev are intentionally left */
@@ -393,7 +393,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
393 drc = readl(ovrfl_window + I82875P_DRC); 393 drc = readl(ovrfl_window + I82875P_DRC);
394 nr_chans = dual_channel_active(drc) + 1; 394 nr_chans = dual_channel_active(drc) + 1;
395 mci = edac_mc_alloc(sizeof(*pvt), I82875P_NR_CSROWS(nr_chans), 395 mci = edac_mc_alloc(sizeof(*pvt), I82875P_NR_CSROWS(nr_chans),
396 nr_chans); 396 nr_chans);
397 397
398 if (!mci) { 398 if (!mci) {
399 rc = -ENOMEM; 399 rc = -ENOMEM;
@@ -441,10 +441,10 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
441 debugf3("%s(): success\n", __func__); 441 debugf3("%s(): success\n", __func__);
442 return 0; 442 return 0;
443 443
444 fail1: 444fail1:
445 edac_mc_free(mci); 445 edac_mc_free(mci);
446 446
447 fail0: 447fail0:
448 iounmap(ovrfl_window); 448 iounmap(ovrfl_window);
449 pci_release_regions(ovrfl_pdev); 449 pci_release_regions(ovrfl_pdev);
450 450
@@ -455,7 +455,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
455 455
456/* returns count (>= 0), or negative on error */ 456/* returns count (>= 0), or negative on error */
457static int __devinit i82875p_init_one(struct pci_dev *pdev, 457static int __devinit i82875p_init_one(struct pci_dev *pdev,
458 const struct pci_device_id *ent) 458 const struct pci_device_id *ent)
459{ 459{
460 int rc; 460 int rc;
461 461
@@ -532,7 +532,7 @@ static int __init i82875p_init(void)
532 532
533 if (mci_pdev == NULL) { 533 if (mci_pdev == NULL) {
534 mci_pdev = pci_get_device(PCI_VENDOR_ID_INTEL, 534 mci_pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
535 PCI_DEVICE_ID_INTEL_82875_0, NULL); 535 PCI_DEVICE_ID_INTEL_82875_0, NULL);
536 536
537 if (!mci_pdev) { 537 if (!mci_pdev) {
538 debugf0("875p pci_get_device fail\n"); 538 debugf0("875p pci_get_device fail\n");
@@ -551,10 +551,10 @@ static int __init i82875p_init(void)
551 551
552 return 0; 552 return 0;
553 553
554 fail1: 554fail1:
555 pci_unregister_driver(&i82875p_driver); 555 pci_unregister_driver(&i82875p_driver);
556 556
557 fail0: 557fail0:
558 if (mci_pdev != NULL) 558 if (mci_pdev != NULL)
559 pci_dev_put(mci_pdev); 559 pci_dev_put(mci_pdev);
560 560