diff options
author | Joe Perches <joe@perches.com> | 2012-04-29 16:08:39 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-06-11 12:23:49 -0400 |
commit | 956b9ba156dbfdb9cede2b2927ddf8be2233b3a7 (patch) | |
tree | 6ece471eee029a1ca83ce649f7dc23020ebef182 /drivers/edac/i3200_edac.c | |
parent | 7e881856eee8b889b76cd1d8e04ce2fc79b72099 (diff) |
edac: Convert debugfX to edac_dbg(X,
Use a more common debugging style.
Remove __FILE__ uses, add missing newlines,
coalesce formats and align arguments.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/edac/i3200_edac.c')
-rw-r--r-- | drivers/edac/i3200_edac.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c index 9698ca39e38a..dfd843a0481b 100644 --- a/drivers/edac/i3200_edac.c +++ b/drivers/edac/i3200_edac.c | |||
@@ -110,10 +110,10 @@ static int how_many_channels(struct pci_dev *pdev) | |||
110 | 110 | ||
111 | pci_read_config_byte(pdev, I3200_CAPID0 + 8, &capid0_8b); | 111 | pci_read_config_byte(pdev, I3200_CAPID0 + 8, &capid0_8b); |
112 | if (capid0_8b & 0x20) { /* check DCD: Dual Channel Disable */ | 112 | if (capid0_8b & 0x20) { /* check DCD: Dual Channel Disable */ |
113 | debugf0("In single channel mode.\n"); | 113 | edac_dbg(0, "In single channel mode\n"); |
114 | return 1; | 114 | return 1; |
115 | } else { | 115 | } else { |
116 | debugf0("In dual channel mode.\n"); | 116 | edac_dbg(0, "In dual channel mode\n"); |
117 | return 2; | 117 | return 2; |
118 | } | 118 | } |
119 | } | 119 | } |
@@ -245,7 +245,7 @@ static void i3200_check(struct mem_ctl_info *mci) | |||
245 | { | 245 | { |
246 | struct i3200_error_info info; | 246 | struct i3200_error_info info; |
247 | 247 | ||
248 | debugf1("MC%d\n", mci->mc_idx); | 248 | edac_dbg(1, "MC%d\n", mci->mc_idx); |
249 | i3200_get_and_clear_error_info(mci, &info); | 249 | i3200_get_and_clear_error_info(mci, &info); |
250 | i3200_process_error_info(mci, &info); | 250 | i3200_process_error_info(mci, &info); |
251 | } | 251 | } |
@@ -332,7 +332,7 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx) | |||
332 | void __iomem *window; | 332 | void __iomem *window; |
333 | struct i3200_priv *priv; | 333 | struct i3200_priv *priv; |
334 | 334 | ||
335 | debugf0("MC:\n"); | 335 | edac_dbg(0, "MC:\n"); |
336 | 336 | ||
337 | window = i3200_map_mchbar(pdev); | 337 | window = i3200_map_mchbar(pdev); |
338 | if (!window) | 338 | if (!window) |
@@ -352,7 +352,7 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx) | |||
352 | if (!mci) | 352 | if (!mci) |
353 | return -ENOMEM; | 353 | return -ENOMEM; |
354 | 354 | ||
355 | debugf3("MC: init mci\n"); | 355 | edac_dbg(3, "MC: init mci\n"); |
356 | 356 | ||
357 | mci->pdev = &pdev->dev; | 357 | mci->pdev = &pdev->dev; |
358 | mci->mtype_cap = MEM_FLAG_DDR2; | 358 | mci->mtype_cap = MEM_FLAG_DDR2; |
@@ -403,12 +403,12 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx) | |||
403 | 403 | ||
404 | rc = -ENODEV; | 404 | rc = -ENODEV; |
405 | if (edac_mc_add_mc(mci)) { | 405 | if (edac_mc_add_mc(mci)) { |
406 | debugf3("MC: failed edac_mc_add_mc()\n"); | 406 | edac_dbg(3, "MC: failed edac_mc_add_mc()\n"); |
407 | goto fail; | 407 | goto fail; |
408 | } | 408 | } |
409 | 409 | ||
410 | /* get this far and it's successful */ | 410 | /* get this far and it's successful */ |
411 | debugf3("MC: success\n"); | 411 | edac_dbg(3, "MC: success\n"); |
412 | return 0; | 412 | return 0; |
413 | 413 | ||
414 | fail: | 414 | fail: |
@@ -424,7 +424,7 @@ static int __devinit i3200_init_one(struct pci_dev *pdev, | |||
424 | { | 424 | { |
425 | int rc; | 425 | int rc; |
426 | 426 | ||
427 | debugf0("MC:\n"); | 427 | edac_dbg(0, "MC:\n"); |
428 | 428 | ||
429 | if (pci_enable_device(pdev) < 0) | 429 | if (pci_enable_device(pdev) < 0) |
430 | return -EIO; | 430 | return -EIO; |
@@ -441,7 +441,7 @@ static void __devexit i3200_remove_one(struct pci_dev *pdev) | |||
441 | struct mem_ctl_info *mci; | 441 | struct mem_ctl_info *mci; |
442 | struct i3200_priv *priv; | 442 | struct i3200_priv *priv; |
443 | 443 | ||
444 | debugf0("\n"); | 444 | edac_dbg(0, "\n"); |
445 | 445 | ||
446 | mci = edac_mc_del_mc(&pdev->dev); | 446 | mci = edac_mc_del_mc(&pdev->dev); |
447 | if (!mci) | 447 | if (!mci) |
@@ -475,7 +475,7 @@ static int __init i3200_init(void) | |||
475 | { | 475 | { |
476 | int pci_rc; | 476 | int pci_rc; |
477 | 477 | ||
478 | debugf3("MC:\n"); | 478 | edac_dbg(3, "MC:\n"); |
479 | 479 | ||
480 | /* Ensure that the OPSTATE is set correctly for POLL or NMI */ | 480 | /* Ensure that the OPSTATE is set correctly for POLL or NMI */ |
481 | opstate_init(); | 481 | opstate_init(); |
@@ -489,14 +489,14 @@ static int __init i3200_init(void) | |||
489 | mci_pdev = pci_get_device(PCI_VENDOR_ID_INTEL, | 489 | mci_pdev = pci_get_device(PCI_VENDOR_ID_INTEL, |
490 | PCI_DEVICE_ID_INTEL_3200_HB, NULL); | 490 | PCI_DEVICE_ID_INTEL_3200_HB, NULL); |
491 | if (!mci_pdev) { | 491 | if (!mci_pdev) { |
492 | debugf0("i3200 pci_get_device fail\n"); | 492 | edac_dbg(0, "i3200 pci_get_device fail\n"); |
493 | pci_rc = -ENODEV; | 493 | pci_rc = -ENODEV; |
494 | goto fail1; | 494 | goto fail1; |
495 | } | 495 | } |
496 | 496 | ||
497 | pci_rc = i3200_init_one(mci_pdev, i3200_pci_tbl); | 497 | pci_rc = i3200_init_one(mci_pdev, i3200_pci_tbl); |
498 | if (pci_rc < 0) { | 498 | if (pci_rc < 0) { |
499 | debugf0("i3200 init fail\n"); | 499 | edac_dbg(0, "i3200 init fail\n"); |
500 | pci_rc = -ENODEV; | 500 | pci_rc = -ENODEV; |
501 | goto fail1; | 501 | goto fail1; |
502 | } | 502 | } |
@@ -516,7 +516,7 @@ fail0: | |||
516 | 516 | ||
517 | static void __exit i3200_exit(void) | 517 | static void __exit i3200_exit(void) |
518 | { | 518 | { |
519 | debugf3("MC:\n"); | 519 | edac_dbg(3, "MC:\n"); |
520 | 520 | ||
521 | pci_unregister_driver(&i3200_driver); | 521 | pci_unregister_driver(&i3200_driver); |
522 | if (!i3200_registered) { | 522 | if (!i3200_registered) { |