aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2012-04-29 10:59:14 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-06-11 12:23:47 -0400
commitdd23cd6eb1f59ba722a6e6aa228adff7c01404de (patch)
tree32c45fb296293af1309f926b8c109eef329f4f22
parent2639c3ee298401881cc560c5e3987f8b222b9f7c (diff)
edac: Don't add __func__ or __FILE__ for debugf[0-9] msgs
The debug macro already adds that. Most of the work here was made by this small script: $f .=$_ while (<>); $f =~ s/(debugf[0-9]\s*\(\s*)__FILE__\s*": /\1"/g; $f =~ s/(debugf[0-9]\s*\(\s*)__FILE__\s*/\1/g; $f =~ s/(debugf[0-9]\s*\(\s*)__FILE__\s*"MC: /\1"/g; $f =~ s/(debugf[0-9]\s*\(\")\%s[\:\,\(\)]*\s*([^\"]*\s*[^\)]+)__func__\s*\,\s*/\1\2/g; $f =~ s/(debugf[0-9]\s*\(\")\%s[\:\,\(\)]*\s*([^\"]*\s*[^\)]+),\s*__func__\s*\)/\1\2)/g; $f =~ s/(debugf[0-9]\s*\(\"MC\:\s*)\%s[\:\,\(\)]*\s*([^\"]*\s*[^\)]+)__func__\s*\,\s*/\1\2/g; $f =~ s/(debugf[0-9]\s*\(\"MC\:\s*)\%s[\:\,\(\)]*\s*([^\"]*\s*[^\)]+),\s*__func__\s*\)/\1\2)/g; $f =~ s/\"MC\: \\n\"/"MC:\\n"/g; print $f; After running the script, manual cleanups were done to fix it the remaining places. While here, removed the __LINE__ on most places, as it doesn't actually give useful info on most places. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat
-rw-r--r--drivers/edac/amd76x_edac.c14
-rw-r--r--drivers/edac/cpc925_edac.c24
-rw-r--r--drivers/edac/e752x_edac.c34
-rw-r--r--drivers/edac/e7xxx_edac.c34
-rw-r--r--drivers/edac/edac_device.c28
-rw-r--r--drivers/edac/edac_device_sysfs.c71
-rw-r--r--drivers/edac/edac_mc.c44
-rw-r--r--drivers/edac/edac_mc_sysfs.c24
-rw-r--r--drivers/edac/edac_module.c2
-rw-r--r--drivers/edac/edac_pci.c26
-rw-r--r--drivers/edac/edac_pci_sysfs.c37
-rw-r--r--drivers/edac/i3000_edac.c22
-rw-r--r--drivers/edac/i3200_edac.c18
-rw-r--r--drivers/edac/i5000_edac.c25
-rw-r--r--drivers/edac/i5400_edac.c24
-rw-r--r--drivers/edac/i7300_edac.c14
-rw-r--r--drivers/edac/i7core_edac.c37
-rw-r--r--drivers/edac/i82443bxgx_edac.c26
-rw-r--r--drivers/edac/i82860_edac.c18
-rw-r--r--drivers/edac/i82875p_edac.c22
-rw-r--r--drivers/edac/i82975x_edac.c24
-rw-r--r--drivers/edac/mpc85xx_edac.c22
-rw-r--r--drivers/edac/mv64x60_edac.c26
-rw-r--r--drivers/edac/r82600_edac.c32
-rw-r--r--drivers/edac/sb_edac.c22
-rw-r--r--drivers/edac/x38_edac.c18
26 files changed, 331 insertions, 357 deletions
diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c
index a0c9f82875cd..b6e94ae4bf6f 100644
--- a/drivers/edac/amd76x_edac.c
+++ b/drivers/edac/amd76x_edac.c
@@ -180,7 +180,7 @@ static int amd76x_process_error_info(struct mem_ctl_info *mci,
180static void amd76x_check(struct mem_ctl_info *mci) 180static void amd76x_check(struct mem_ctl_info *mci)
181{ 181{
182 struct amd76x_error_info info; 182 struct amd76x_error_info info;
183 debugf3("%s()\n", __func__); 183 debugf3("\n");
184 amd76x_get_error_info(mci, &info); 184 amd76x_get_error_info(mci, &info);
185 amd76x_process_error_info(mci, &info, 1); 185 amd76x_process_error_info(mci, &info, 1);
186} 186}
@@ -241,7 +241,7 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)
241 u32 ems_mode; 241 u32 ems_mode;
242 struct amd76x_error_info discard; 242 struct amd76x_error_info discard;
243 243
244 debugf0("%s()\n", __func__); 244 debugf0("\n");
245 pci_read_config_dword(pdev, AMD76X_ECC_MODE_STATUS, &ems); 245 pci_read_config_dword(pdev, AMD76X_ECC_MODE_STATUS, &ems);
246 ems_mode = (ems >> 10) & 0x3; 246 ems_mode = (ems >> 10) & 0x3;
247 247
@@ -256,7 +256,7 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)
256 if (mci == NULL) 256 if (mci == NULL)
257 return -ENOMEM; 257 return -ENOMEM;
258 258
259 debugf0("%s(): mci = %p\n", __func__, mci); 259 debugf0("mci = %p\n", mci);
260 mci->pdev = &pdev->dev; 260 mci->pdev = &pdev->dev;
261 mci->mtype_cap = MEM_FLAG_RDDR; 261 mci->mtype_cap = MEM_FLAG_RDDR;
262 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED; 262 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;
@@ -276,7 +276,7 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)
276 * type of memory controller. The ID is therefore hardcoded to 0. 276 * type of memory controller. The ID is therefore hardcoded to 0.
277 */ 277 */
278 if (edac_mc_add_mc(mci)) { 278 if (edac_mc_add_mc(mci)) {
279 debugf3("%s(): failed edac_mc_add_mc()\n", __func__); 279 debugf3("failed edac_mc_add_mc()\n");
280 goto fail; 280 goto fail;
281 } 281 }
282 282
@@ -292,7 +292,7 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)
292 } 292 }
293 293
294 /* get this far and it's successful */ 294 /* get this far and it's successful */
295 debugf3("%s(): success\n", __func__); 295 debugf3("success\n");
296 return 0; 296 return 0;
297 297
298fail: 298fail:
@@ -304,7 +304,7 @@ fail:
304static int __devinit amd76x_init_one(struct pci_dev *pdev, 304static int __devinit amd76x_init_one(struct pci_dev *pdev,
305 const struct pci_device_id *ent) 305 const struct pci_device_id *ent)
306{ 306{
307 debugf0("%s()\n", __func__); 307 debugf0("\n");
308 308
309 /* don't need to call pci_enable_device() */ 309 /* don't need to call pci_enable_device() */
310 return amd76x_probe1(pdev, ent->driver_data); 310 return amd76x_probe1(pdev, ent->driver_data);
@@ -322,7 +322,7 @@ static void __devexit amd76x_remove_one(struct pci_dev *pdev)
322{ 322{
323 struct mem_ctl_info *mci; 323 struct mem_ctl_info *mci;
324 324
325 debugf0("%s()\n", __func__); 325 debugf0("\n");
326 326
327 if (amd76x_pci) 327 if (amd76x_pci)
328 edac_pci_release_generic_ctl(amd76x_pci); 328 edac_pci_release_generic_ctl(amd76x_pci);
diff --git a/drivers/edac/cpc925_edac.c b/drivers/edac/cpc925_edac.c
index 534491d67159..fa39a7840e28 100644
--- a/drivers/edac/cpc925_edac.c
+++ b/drivers/edac/cpc925_edac.c
@@ -316,13 +316,12 @@ static void get_total_mem(struct cpc925_mc_pdata *pdata)
316 reg += aw; 316 reg += aw;
317 size = of_read_number(reg, sw); 317 size = of_read_number(reg, sw);
318 reg += sw; 318 reg += sw;
319 debugf1("%s: start 0x%lx, size 0x%lx\n", __func__, 319 debugf1("start 0x%lx, size 0x%lx\n", start, size);
320 start, size);
321 pdata->total_mem += size; 320 pdata->total_mem += size;
322 } while (reg < reg_end); 321 } while (reg < reg_end);
323 322
324 of_node_put(np); 323 of_node_put(np);
325 debugf0("%s: total_mem 0x%lx\n", __func__, pdata->total_mem); 324 debugf0("total_mem 0x%lx\n", pdata->total_mem);
326} 325}
327 326
328static void cpc925_init_csrows(struct mem_ctl_info *mci) 327static void cpc925_init_csrows(struct mem_ctl_info *mci)
@@ -512,7 +511,7 @@ static void cpc925_mc_get_pfn(struct mem_ctl_info *mci, u32 mear,
512 *offset = pa & (PAGE_SIZE - 1); 511 *offset = pa & (PAGE_SIZE - 1);
513 *pfn = pa >> PAGE_SHIFT; 512 *pfn = pa >> PAGE_SHIFT;
514 513
515 debugf0("%s: ECC physical address 0x%lx\n", __func__, pa); 514 debugf0("ECC physical address 0x%lx\n", pa);
516} 515}
517 516
518static int cpc925_mc_find_channel(struct mem_ctl_info *mci, u16 syndrome) 517static int cpc925_mc_find_channel(struct mem_ctl_info *mci, u16 syndrome)
@@ -852,8 +851,8 @@ static void cpc925_add_edac_devices(void __iomem *vbase)
852 goto err2; 851 goto err2;
853 } 852 }
854 853
855 debugf0("%s: Successfully added edac device for %s\n", 854 debugf0("Successfully added edac device for %s\n",
856 __func__, dev_info->ctl_name); 855 dev_info->ctl_name);
857 856
858 continue; 857 continue;
859 858
@@ -884,8 +883,8 @@ static void cpc925_del_edac_devices(void)
884 if (dev_info->exit) 883 if (dev_info->exit)
885 dev_info->exit(dev_info); 884 dev_info->exit(dev_info);
886 885
887 debugf0("%s: Successfully deleted edac device for %s\n", 886 debugf0("Successfully deleted edac device for %s\n",
888 __func__, dev_info->ctl_name); 887 dev_info->ctl_name);
889 } 888 }
890} 889}
891 890
@@ -900,7 +899,7 @@ static int cpc925_get_sdram_scrub_rate(struct mem_ctl_info *mci)
900 mscr = __raw_readl(pdata->vbase + REG_MSCR_OFFSET); 899 mscr = __raw_readl(pdata->vbase + REG_MSCR_OFFSET);
901 si = (mscr & MSCR_SI_MASK) >> MSCR_SI_SHIFT; 900 si = (mscr & MSCR_SI_MASK) >> MSCR_SI_SHIFT;
902 901
903 debugf0("%s, Mem Scrub Ctrl Register 0x%x\n", __func__, mscr); 902 debugf0("Mem Scrub Ctrl Register 0x%x\n", mscr);
904 903
905 if (((mscr & MSCR_SCRUB_MOD_MASK) != MSCR_BACKGR_SCRUB) || 904 if (((mscr & MSCR_SCRUB_MOD_MASK) != MSCR_BACKGR_SCRUB) ||
906 (si == 0)) { 905 (si == 0)) {
@@ -928,8 +927,7 @@ static int cpc925_mc_get_channels(void __iomem *vbase)
928 ((mbcr & MBCR_64BITBUS_MASK) == 0)) 927 ((mbcr & MBCR_64BITBUS_MASK) == 0))
929 dual = 1; 928 dual = 1;
930 929
931 debugf0("%s: %s channel\n", __func__, 930 debugf0("%s channel\n", (dual > 0) ? "Dual" : "Single");
932 (dual > 0) ? "Dual" : "Single");
933 931
934 return dual; 932 return dual;
935} 933}
@@ -944,7 +942,7 @@ static int __devinit cpc925_probe(struct platform_device *pdev)
944 struct resource *r; 942 struct resource *r;
945 int res = 0, nr_channels; 943 int res = 0, nr_channels;
946 944
947 debugf0("%s: %s platform device found!\n", __func__, pdev->name); 945 debugf0("%s platform device found!\n", pdev->name);
948 946
949 if (!devres_open_group(&pdev->dev, cpc925_probe, GFP_KERNEL)) { 947 if (!devres_open_group(&pdev->dev, cpc925_probe, GFP_KERNEL)) {
950 res = -ENOMEM; 948 res = -ENOMEM;
@@ -1026,7 +1024,7 @@ static int __devinit cpc925_probe(struct platform_device *pdev)
1026 cpc925_add_edac_devices(vbase); 1024 cpc925_add_edac_devices(vbase);
1027 1025
1028 /* get this far and it's successful */ 1026 /* get this far and it's successful */
1029 debugf0("%s: success\n", __func__); 1027 debugf0("success\n");
1030 1028
1031 res = 0; 1029 res = 0;
1032 goto out; 1030 goto out;
diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c
index 7cde7f1aafb7..39c8997b2162 100644
--- a/drivers/edac/e752x_edac.c
+++ b/drivers/edac/e752x_edac.c
@@ -309,7 +309,7 @@ static unsigned long ctl_page_to_phys(struct mem_ctl_info *mci,
309 u32 remap; 309 u32 remap;
310 struct e752x_pvt *pvt = (struct e752x_pvt *)mci->pvt_info; 310 struct e752x_pvt *pvt = (struct e752x_pvt *)mci->pvt_info;
311 311
312 debugf3("%s()\n", __func__); 312 debugf3("\n");
313 313
314 if (page < pvt->tolm) 314 if (page < pvt->tolm)
315 return page; 315 return page;
@@ -335,7 +335,7 @@ static void do_process_ce(struct mem_ctl_info *mci, u16 error_one,
335 int i; 335 int i;
336 struct e752x_pvt *pvt = (struct e752x_pvt *)mci->pvt_info; 336 struct e752x_pvt *pvt = (struct e752x_pvt *)mci->pvt_info;
337 337
338 debugf3("%s()\n", __func__); 338 debugf3("\n");
339 339
340 /* convert the addr to 4k page */ 340 /* convert the addr to 4k page */
341 page = sec1_add >> (PAGE_SHIFT - 4); 341 page = sec1_add >> (PAGE_SHIFT - 4);
@@ -394,7 +394,7 @@ static void do_process_ue(struct mem_ctl_info *mci, u16 error_one,
394 int row; 394 int row;
395 struct e752x_pvt *pvt = (struct e752x_pvt *)mci->pvt_info; 395 struct e752x_pvt *pvt = (struct e752x_pvt *)mci->pvt_info;
396 396
397 debugf3("%s()\n", __func__); 397 debugf3("\n");
398 398
399 if (error_one & 0x0202) { 399 if (error_one & 0x0202) {
400 error_2b = ded_add; 400 error_2b = ded_add;
@@ -453,7 +453,7 @@ static inline void process_ue_no_info_wr(struct mem_ctl_info *mci,
453 if (!handle_error) 453 if (!handle_error)
454 return; 454 return;
455 455
456 debugf3("%s()\n", __func__); 456 debugf3("\n");
457 edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0, 457 edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0,
458 -1, -1, -1, 458 -1, -1, -1,
459 "e752x UE log memory write", "", NULL); 459 "e752x UE log memory write", "", NULL);
@@ -982,7 +982,7 @@ static void e752x_check(struct mem_ctl_info *mci)
982{ 982{
983 struct e752x_error_info info; 983 struct e752x_error_info info;
984 984
985 debugf3("%s()\n", __func__); 985 debugf3("\n");
986 e752x_get_error_info(mci, &info); 986 e752x_get_error_info(mci, &info);
987 e752x_process_error_info(mci, &info, 1); 987 e752x_process_error_info(mci, &info, 1);
988} 988}
@@ -1102,7 +1102,7 @@ static void e752x_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev,
1102 pci_read_config_byte(pdev, E752X_DRB + index, &value); 1102 pci_read_config_byte(pdev, E752X_DRB + index, &value);
1103 /* convert a 128 or 64 MiB DRB to a page size. */ 1103 /* convert a 128 or 64 MiB DRB to a page size. */
1104 cumul_size = value << (25 + drc_drbg - PAGE_SHIFT); 1104 cumul_size = value << (25 + drc_drbg - PAGE_SHIFT);
1105 debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index, 1105 debugf3("(%d) cumul_size 0x%x\n", index,
1106 cumul_size); 1106 cumul_size);
1107 if (cumul_size == last_cumul_size) 1107 if (cumul_size == last_cumul_size)
1108 continue; /* not populated */ 1108 continue; /* not populated */
@@ -1270,7 +1270,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
1270 int drc_chan; /* Number of channels 0=1chan,1=2chan */ 1270 int drc_chan; /* Number of channels 0=1chan,1=2chan */
1271 struct e752x_error_info discard; 1271 struct e752x_error_info discard;
1272 1272
1273 debugf0("%s(): mci\n", __func__); 1273 debugf0("mci\n");
1274 debugf0("Starting Probe1\n"); 1274 debugf0("Starting Probe1\n");
1275 1275
1276 /* check to see if device 0 function 1 is enabled; if it isn't, we 1276 /* check to see if device 0 function 1 is enabled; if it isn't, we
@@ -1301,7 +1301,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
1301 if (mci == NULL) 1301 if (mci == NULL)
1302 return -ENOMEM; 1302 return -ENOMEM;
1303 1303
1304 debugf3("%s(): init mci\n", __func__); 1304 debugf3("init mci\n");
1305 mci->mtype_cap = MEM_FLAG_RDDR; 1305 mci->mtype_cap = MEM_FLAG_RDDR;
1306 /* 3100 IMCH supports SECDEC only */ 1306 /* 3100 IMCH supports SECDEC only */
1307 mci->edac_ctl_cap = (dev_idx == I3100) ? EDAC_FLAG_SECDED : 1307 mci->edac_ctl_cap = (dev_idx == I3100) ? EDAC_FLAG_SECDED :
@@ -1311,7 +1311,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
1311 mci->mod_ver = E752X_REVISION; 1311 mci->mod_ver = E752X_REVISION;
1312 mci->pdev = &pdev->dev; 1312 mci->pdev = &pdev->dev;
1313 1313
1314 debugf3("%s(): init pvt\n", __func__); 1314 debugf3("init pvt\n");
1315 pvt = (struct e752x_pvt *)mci->pvt_info; 1315 pvt = (struct e752x_pvt *)mci->pvt_info;
1316 pvt->dev_info = &e752x_devs[dev_idx]; 1316 pvt->dev_info = &e752x_devs[dev_idx];
1317 pvt->mc_symmetric = ((ddrcsr & 0x10) != 0); 1317 pvt->mc_symmetric = ((ddrcsr & 0x10) != 0);
@@ -1321,7 +1321,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
1321 return -ENODEV; 1321 return -ENODEV;
1322 } 1322 }
1323 1323
1324 debugf3("%s(): more mci init\n", __func__); 1324 debugf3("more mci init\n");
1325 mci->ctl_name = pvt->dev_info->ctl_name; 1325 mci->ctl_name = pvt->dev_info->ctl_name;
1326 mci->dev_name = pci_name(pdev); 1326 mci->dev_name = pci_name(pdev);
1327 mci->edac_check = e752x_check; 1327 mci->edac_check = e752x_check;
@@ -1343,7 +1343,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
1343 mci->edac_cap = EDAC_FLAG_SECDED; /* the only mode supported */ 1343 mci->edac_cap = EDAC_FLAG_SECDED; /* the only mode supported */
1344 else 1344 else
1345 mci->edac_cap |= EDAC_FLAG_NONE; 1345 mci->edac_cap |= EDAC_FLAG_NONE;
1346 debugf3("%s(): tolm, remapbase, remaplimit\n", __func__); 1346 debugf3("tolm, remapbase, remaplimit\n");
1347 1347
1348 /* load the top of low memory, remap base, and remap limit vars */ 1348 /* load the top of low memory, remap base, and remap limit vars */
1349 pci_read_config_word(pdev, E752X_TOLM, &pci_data); 1349 pci_read_config_word(pdev, E752X_TOLM, &pci_data);
@@ -1360,7 +1360,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
1360 * type of memory controller. The ID is therefore hardcoded to 0. 1360 * type of memory controller. The ID is therefore hardcoded to 0.
1361 */ 1361 */
1362 if (edac_mc_add_mc(mci)) { 1362 if (edac_mc_add_mc(mci)) {
1363 debugf3("%s(): failed edac_mc_add_mc()\n", __func__); 1363 debugf3("failed edac_mc_add_mc()\n");
1364 goto fail; 1364 goto fail;
1365 } 1365 }
1366 1366
@@ -1378,7 +1378,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
1378 } 1378 }
1379 1379
1380 /* get this far and it's successful */ 1380 /* get this far and it's successful */
1381 debugf3("%s(): success\n", __func__); 1381 debugf3("success\n");
1382 return 0; 1382 return 0;
1383 1383
1384fail: 1384fail:
@@ -1394,7 +1394,7 @@ fail:
1394static int __devinit e752x_init_one(struct pci_dev *pdev, 1394static int __devinit e752x_init_one(struct pci_dev *pdev,
1395 const struct pci_device_id *ent) 1395 const struct pci_device_id *ent)
1396{ 1396{
1397 debugf0("%s()\n", __func__); 1397 debugf0("\n");
1398 1398
1399 /* wake up and enable device */ 1399 /* wake up and enable device */
1400 if (pci_enable_device(pdev) < 0) 1400 if (pci_enable_device(pdev) < 0)
@@ -1408,7 +1408,7 @@ static void __devexit e752x_remove_one(struct pci_dev *pdev)
1408 struct mem_ctl_info *mci; 1408 struct mem_ctl_info *mci;
1409 struct e752x_pvt *pvt; 1409 struct e752x_pvt *pvt;
1410 1410
1411 debugf0("%s()\n", __func__); 1411 debugf0("\n");
1412 1412
1413 if (e752x_pci) 1413 if (e752x_pci)
1414 edac_pci_release_generic_ctl(e752x_pci); 1414 edac_pci_release_generic_ctl(e752x_pci);
@@ -1454,7 +1454,7 @@ static int __init e752x_init(void)
1454{ 1454{
1455 int pci_rc; 1455 int pci_rc;
1456 1456
1457 debugf3("%s()\n", __func__); 1457 debugf3("\n");
1458 1458
1459 /* Ensure that the OPSTATE is set correctly for POLL or NMI */ 1459 /* Ensure that the OPSTATE is set correctly for POLL or NMI */
1460 opstate_init(); 1460 opstate_init();
@@ -1465,7 +1465,7 @@ static int __init e752x_init(void)
1465 1465
1466static void __exit e752x_exit(void) 1466static void __exit e752x_exit(void)
1467{ 1467{
1468 debugf3("%s()\n", __func__); 1468 debugf3("\n");
1469 pci_unregister_driver(&e752x_driver); 1469 pci_unregister_driver(&e752x_driver);
1470} 1470}
1471 1471
diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c
index c6c0ebaca371..691d7067a141 100644
--- a/drivers/edac/e7xxx_edac.c
+++ b/drivers/edac/e7xxx_edac.c
@@ -166,7 +166,7 @@ static const struct e7xxx_dev_info e7xxx_devs[] = {
166/* FIXME - is this valid for both SECDED and S4ECD4ED? */ 166/* FIXME - is this valid for both SECDED and S4ECD4ED? */
167static inline int e7xxx_find_channel(u16 syndrome) 167static inline int e7xxx_find_channel(u16 syndrome)
168{ 168{
169 debugf3("%s()\n", __func__); 169 debugf3("\n");
170 170
171 if ((syndrome & 0xff00) == 0) 171 if ((syndrome & 0xff00) == 0)
172 return 0; 172 return 0;
@@ -186,7 +186,7 @@ static unsigned long ctl_page_to_phys(struct mem_ctl_info *mci,
186 u32 remap; 186 u32 remap;
187 struct e7xxx_pvt *pvt = (struct e7xxx_pvt *)mci->pvt_info; 187 struct e7xxx_pvt *pvt = (struct e7xxx_pvt *)mci->pvt_info;
188 188
189 debugf3("%s()\n", __func__); 189 debugf3("\n");
190 190
191 if ((page < pvt->tolm) || 191 if ((page < pvt->tolm) ||
192 ((page >= 0x100000) && (page < pvt->remapbase))) 192 ((page >= 0x100000) && (page < pvt->remapbase)))
@@ -208,7 +208,7 @@ static void process_ce(struct mem_ctl_info *mci, struct e7xxx_error_info *info)
208 int row; 208 int row;
209 int channel; 209 int channel;
210 210
211 debugf3("%s()\n", __func__); 211 debugf3("\n");
212 /* read the error address */ 212 /* read the error address */
213 error_1b = info->dram_celog_add; 213 error_1b = info->dram_celog_add;
214 /* FIXME - should use PAGE_SHIFT */ 214 /* FIXME - should use PAGE_SHIFT */
@@ -225,7 +225,7 @@ static void process_ce(struct mem_ctl_info *mci, struct e7xxx_error_info *info)
225 225
226static void process_ce_no_info(struct mem_ctl_info *mci) 226static void process_ce_no_info(struct mem_ctl_info *mci)
227{ 227{
228 debugf3("%s()\n", __func__); 228 debugf3("\n");
229 edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0, -1, -1, -1, 229 edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0, -1, -1, -1,
230 "e7xxx CE log register overflow", "", NULL); 230 "e7xxx CE log register overflow", "", NULL);
231} 231}
@@ -235,7 +235,7 @@ static void process_ue(struct mem_ctl_info *mci, struct e7xxx_error_info *info)
235 u32 error_2b, block_page; 235 u32 error_2b, block_page;
236 int row; 236 int row;
237 237
238 debugf3("%s()\n", __func__); 238 debugf3("\n");
239 /* read the error address */ 239 /* read the error address */
240 error_2b = info->dram_uelog_add; 240 error_2b = info->dram_uelog_add;
241 /* FIXME - should use PAGE_SHIFT */ 241 /* FIXME - should use PAGE_SHIFT */
@@ -248,7 +248,7 @@ static void process_ue(struct mem_ctl_info *mci, struct e7xxx_error_info *info)
248 248
249static void process_ue_no_info(struct mem_ctl_info *mci) 249static void process_ue_no_info(struct mem_ctl_info *mci)
250{ 250{
251 debugf3("%s()\n", __func__); 251 debugf3("\n");
252 252
253 edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0, -1, -1, -1, 253 edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0, -1, -1, -1,
254 "e7xxx UE log register overflow", "", NULL); 254 "e7xxx UE log register overflow", "", NULL);
@@ -334,7 +334,7 @@ static void e7xxx_check(struct mem_ctl_info *mci)
334{ 334{
335 struct e7xxx_error_info info; 335 struct e7xxx_error_info info;
336 336
337 debugf3("%s()\n", __func__); 337 debugf3("\n");
338 e7xxx_get_error_info(mci, &info); 338 e7xxx_get_error_info(mci, &info);
339 e7xxx_process_error_info(mci, &info, 1); 339 e7xxx_process_error_info(mci, &info, 1);
340} 340}
@@ -383,7 +383,7 @@ static void e7xxx_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev,
383 pci_read_config_byte(pdev, E7XXX_DRB + index, &value); 383 pci_read_config_byte(pdev, E7XXX_DRB + index, &value);
384 /* convert a 64 or 32 MiB DRB to a page size. */ 384 /* convert a 64 or 32 MiB DRB to a page size. */
385 cumul_size = value << (25 + drc_drbg - PAGE_SHIFT); 385 cumul_size = value << (25 + drc_drbg - PAGE_SHIFT);
386 debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index, 386 debugf3("(%d) cumul_size 0x%x\n", index,
387 cumul_size); 387 cumul_size);
388 if (cumul_size == last_cumul_size) 388 if (cumul_size == last_cumul_size)
389 continue; /* not populated */ 389 continue; /* not populated */
@@ -430,7 +430,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
430 int drc_chan; 430 int drc_chan;
431 struct e7xxx_error_info discard; 431 struct e7xxx_error_info discard;
432 432
433 debugf0("%s(): mci\n", __func__); 433 debugf0("mci\n");
434 434
435 pci_read_config_dword(pdev, E7XXX_DRC, &drc); 435 pci_read_config_dword(pdev, E7XXX_DRC, &drc);
436 436
@@ -453,7 +453,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
453 if (mci == NULL) 453 if (mci == NULL)
454 return -ENOMEM; 454 return -ENOMEM;
455 455
456 debugf3("%s(): init mci\n", __func__); 456 debugf3("init mci\n");
457 mci->mtype_cap = MEM_FLAG_RDDR; 457 mci->mtype_cap = MEM_FLAG_RDDR;
458 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED | 458 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED |
459 EDAC_FLAG_S4ECD4ED; 459 EDAC_FLAG_S4ECD4ED;
@@ -461,7 +461,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
461 mci->mod_name = EDAC_MOD_STR; 461 mci->mod_name = EDAC_MOD_STR;
462 mci->mod_ver = E7XXX_REVISION; 462 mci->mod_ver = E7XXX_REVISION;
463 mci->pdev = &pdev->dev; 463 mci->pdev = &pdev->dev;
464 debugf3("%s(): init pvt\n", __func__); 464 debugf3("init pvt\n");
465 pvt = (struct e7xxx_pvt *)mci->pvt_info; 465 pvt = (struct e7xxx_pvt *)mci->pvt_info;
466 pvt->dev_info = &e7xxx_devs[dev_idx]; 466 pvt->dev_info = &e7xxx_devs[dev_idx];
467 pvt->bridge_ck = pci_get_device(PCI_VENDOR_ID_INTEL, 467 pvt->bridge_ck = pci_get_device(PCI_VENDOR_ID_INTEL,
@@ -474,14 +474,14 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
474 goto fail0; 474 goto fail0;
475 } 475 }
476 476
477 debugf3("%s(): more mci init\n", __func__); 477 debugf3("more mci init\n");
478 mci->ctl_name = pvt->dev_info->ctl_name; 478 mci->ctl_name = pvt->dev_info->ctl_name;
479 mci->dev_name = pci_name(pdev); 479 mci->dev_name = pci_name(pdev);
480 mci->edac_check = e7xxx_check; 480 mci->edac_check = e7xxx_check;
481 mci->ctl_page_to_phys = ctl_page_to_phys; 481 mci->ctl_page_to_phys = ctl_page_to_phys;
482 e7xxx_init_csrows(mci, pdev, dev_idx, drc); 482 e7xxx_init_csrows(mci, pdev, dev_idx, drc);
483 mci->edac_cap |= EDAC_FLAG_NONE; 483 mci->edac_cap |= EDAC_FLAG_NONE;
484 debugf3("%s(): tolm, remapbase, remaplimit\n", __func__); 484 debugf3("tolm, remapbase, remaplimit\n");
485 /* load the top of low memory, remap base, and remap limit vars */ 485 /* load the top of low memory, remap base, and remap limit vars */
486 pci_read_config_word(pdev, E7XXX_TOLM, &pci_data); 486 pci_read_config_word(pdev, E7XXX_TOLM, &pci_data);
487 pvt->tolm = ((u32) pci_data) << 4; 487 pvt->tolm = ((u32) pci_data) << 4;
@@ -500,7 +500,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
500 * type of memory controller. The ID is therefore hardcoded to 0. 500 * type of memory controller. The ID is therefore hardcoded to 0.
501 */ 501 */
502 if (edac_mc_add_mc(mci)) { 502 if (edac_mc_add_mc(mci)) {
503 debugf3("%s(): failed edac_mc_add_mc()\n", __func__); 503 debugf3("failed edac_mc_add_mc()\n");
504 goto fail1; 504 goto fail1;
505 } 505 }
506 506
@@ -516,7 +516,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
516 } 516 }
517 517
518 /* get this far and it's successful */ 518 /* get this far and it's successful */
519 debugf3("%s(): success\n", __func__); 519 debugf3("success\n");
520 return 0; 520 return 0;
521 521
522fail1: 522fail1:
@@ -532,7 +532,7 @@ fail0:
532static int __devinit e7xxx_init_one(struct pci_dev *pdev, 532static int __devinit e7xxx_init_one(struct pci_dev *pdev,
533 const struct pci_device_id *ent) 533 const struct pci_device_id *ent)
534{ 534{
535 debugf0("%s()\n", __func__); 535 debugf0("\n");
536 536
537 /* wake up and enable device */ 537 /* wake up and enable device */
538 return pci_enable_device(pdev) ? 538 return pci_enable_device(pdev) ?
@@ -544,7 +544,7 @@ static void __devexit e7xxx_remove_one(struct pci_dev *pdev)
544 struct mem_ctl_info *mci; 544 struct mem_ctl_info *mci;
545 struct e7xxx_pvt *pvt; 545 struct e7xxx_pvt *pvt;
546 546
547 debugf0("%s()\n", __func__); 547 debugf0("\n");
548 548
549 if (e7xxx_pci) 549 if (e7xxx_pci)
550 edac_pci_release_generic_ctl(e7xxx_pci); 550 edac_pci_release_generic_ctl(e7xxx_pci);
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
index cb397d9437d1..ed46949f25cf 100644
--- a/drivers/edac/edac_device.c
+++ b/drivers/edac/edac_device.c
@@ -82,8 +82,8 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info(
82 void *pvt, *p; 82 void *pvt, *p;
83 int err; 83 int err;
84 84
85 debugf4("%s() instances=%d blocks=%d\n", 85 debugf4("instances=%d blocks=%d\n",
86 __func__, nr_instances, nr_blocks); 86 nr_instances, nr_blocks);
87 87
88 /* Calculate the size of memory we need to allocate AND 88 /* Calculate the size of memory we need to allocate AND
89 * determine the offsets of the various item arrays 89 * determine the offsets of the various item arrays
@@ -156,8 +156,8 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info(
156 /* Name of this edac device */ 156 /* Name of this edac device */
157 snprintf(dev_ctl->name,sizeof(dev_ctl->name),"%s",edac_device_name); 157 snprintf(dev_ctl->name,sizeof(dev_ctl->name),"%s",edac_device_name);
158 158
159 debugf4("%s() edac_dev=%p next after end=%p\n", 159 debugf4("edac_dev=%p next after end=%p\n",
160 __func__, dev_ctl, pvt + sz_private ); 160 dev_ctl, pvt + sz_private );
161 161
162 /* Initialize every Instance */ 162 /* Initialize every Instance */
163 for (instance = 0; instance < nr_instances; instance++) { 163 for (instance = 0; instance < nr_instances; instance++) {
@@ -178,9 +178,9 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info(
178 snprintf(blk->name, sizeof(blk->name), 178 snprintf(blk->name, sizeof(blk->name),
179 "%s%d", edac_block_name, block+offset_value); 179 "%s%d", edac_block_name, block+offset_value);
180 180
181 debugf4("%s() instance=%d inst_p=%p block=#%d " 181 debugf4("instance=%d inst_p=%p block=#%d "
182 "block_p=%p name='%s'\n", 182 "block_p=%p name='%s'\n",
183 __func__, instance, inst, block, 183 instance, inst, block,
184 blk, blk->name); 184 blk, blk->name);
185 185
186 /* if there are NO attributes OR no attribute pointer 186 /* if there are NO attributes OR no attribute pointer
@@ -194,8 +194,8 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info(
194 attrib_p = &dev_attrib[block*nr_instances*nr_attrib]; 194 attrib_p = &dev_attrib[block*nr_instances*nr_attrib];
195 blk->block_attributes = attrib_p; 195 blk->block_attributes = attrib_p;
196 196
197 debugf4("%s() THIS BLOCK_ATTRIB=%p\n", 197 debugf4("THIS BLOCK_ATTRIB=%p\n",
198 __func__, blk->block_attributes); 198 blk->block_attributes);
199 199
200 /* Initialize every user specified attribute in this 200 /* Initialize every user specified attribute in this
201 * block with the data the caller passed in 201 * block with the data the caller passed in
@@ -214,9 +214,9 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info(
214 214
215 attrib->block = blk; /* up link */ 215 attrib->block = blk; /* up link */
216 216
217 debugf4("%s() alloc-attrib=%p attrib_name='%s' " 217 debugf4("alloc-attrib=%p attrib_name='%s' "
218 "attrib-spec=%p spec-name=%s\n", 218 "attrib-spec=%p spec-name=%s\n",
219 __func__, attrib, attrib->attr.name, 219 attrib, attrib->attr.name,
220 &attrib_spec[attr], 220 &attrib_spec[attr],
221 attrib_spec[attr].attr.name 221 attrib_spec[attr].attr.name
222 ); 222 );
@@ -273,7 +273,7 @@ static struct edac_device_ctl_info *find_edac_device_by_dev(struct device *dev)
273 struct edac_device_ctl_info *edac_dev; 273 struct edac_device_ctl_info *edac_dev;
274 struct list_head *item; 274 struct list_head *item;
275 275
276 debugf0("%s()\n", __func__); 276 debugf0("\n");
277 277
278 list_for_each(item, &edac_device_list) { 278 list_for_each(item, &edac_device_list) {
279 edac_dev = list_entry(item, struct edac_device_ctl_info, link); 279 edac_dev = list_entry(item, struct edac_device_ctl_info, link);
@@ -408,7 +408,7 @@ static void edac_device_workq_function(struct work_struct *work_req)
408void edac_device_workq_setup(struct edac_device_ctl_info *edac_dev, 408void edac_device_workq_setup(struct edac_device_ctl_info *edac_dev,
409 unsigned msec) 409 unsigned msec)
410{ 410{
411 debugf0("%s()\n", __func__); 411 debugf0("\n");
412 412
413 /* take the arg 'msec' and set it into the control structure 413 /* take the arg 'msec' and set it into the control structure
414 * to used in the time period calculation 414 * to used in the time period calculation
@@ -496,7 +496,7 @@ EXPORT_SYMBOL_GPL(edac_device_alloc_index);
496 */ 496 */
497int edac_device_add_device(struct edac_device_ctl_info *edac_dev) 497int edac_device_add_device(struct edac_device_ctl_info *edac_dev)
498{ 498{
499 debugf0("%s()\n", __func__); 499 debugf0("\n");
500 500
501#ifdef CONFIG_EDAC_DEBUG 501#ifdef CONFIG_EDAC_DEBUG
502 if (edac_debug_level >= 3) 502 if (edac_debug_level >= 3)
@@ -570,7 +570,7 @@ struct edac_device_ctl_info *edac_device_del_device(struct device *dev)
570{ 570{
571 struct edac_device_ctl_info *edac_dev; 571 struct edac_device_ctl_info *edac_dev;
572 572
573 debugf0("%s()\n", __func__); 573 debugf0("\n");
574 574
575 mutex_lock(&device_ctls_mutex); 575 mutex_lock(&device_ctls_mutex);
576 576
diff --git a/drivers/edac/edac_device_sysfs.c b/drivers/edac/edac_device_sysfs.c
index b4ea185ccebf..1cee83ec35fe 100644
--- a/drivers/edac/edac_device_sysfs.c
+++ b/drivers/edac/edac_device_sysfs.c
@@ -202,7 +202,7 @@ static void edac_device_ctrl_master_release(struct kobject *kobj)
202{ 202{
203 struct edac_device_ctl_info *edac_dev = to_edacdev(kobj); 203 struct edac_device_ctl_info *edac_dev = to_edacdev(kobj);
204 204
205 debugf4("%s() control index=%d\n", __func__, edac_dev->dev_idx); 205 debugf4("control index=%d\n", edac_dev->dev_idx);
206 206
207 /* decrement the EDAC CORE module ref count */ 207 /* decrement the EDAC CORE module ref count */
208 module_put(edac_dev->owner); 208 module_put(edac_dev->owner);
@@ -233,12 +233,12 @@ int edac_device_register_sysfs_main_kobj(struct edac_device_ctl_info *edac_dev)
233 struct bus_type *edac_subsys; 233 struct bus_type *edac_subsys;
234 int err; 234 int err;
235 235
236 debugf1("%s()\n", __func__); 236 debugf1("\n");
237 237
238 /* get the /sys/devices/system/edac reference */ 238 /* get the /sys/devices/system/edac reference */
239 edac_subsys = edac_get_sysfs_subsys(); 239 edac_subsys = edac_get_sysfs_subsys();
240 if (edac_subsys == NULL) { 240 if (edac_subsys == NULL) {
241 debugf1("%s() no edac_subsys error\n", __func__); 241 debugf1("no edac_subsys error\n");
242 err = -ENODEV; 242 err = -ENODEV;
243 goto err_out; 243 goto err_out;
244 } 244 }
@@ -264,8 +264,8 @@ int edac_device_register_sysfs_main_kobj(struct edac_device_ctl_info *edac_dev)
264 &edac_subsys->dev_root->kobj, 264 &edac_subsys->dev_root->kobj,
265 "%s", edac_dev->name); 265 "%s", edac_dev->name);
266 if (err) { 266 if (err) {
267 debugf1("%s()Failed to register '.../edac/%s'\n", 267 debugf1("Failed to register '.../edac/%s'\n",
268 __func__, edac_dev->name); 268 edac_dev->name);
269 goto err_kobj_reg; 269 goto err_kobj_reg;
270 } 270 }
271 kobject_uevent(&edac_dev->kobj, KOBJ_ADD); 271 kobject_uevent(&edac_dev->kobj, KOBJ_ADD);
@@ -274,8 +274,8 @@ int edac_device_register_sysfs_main_kobj(struct edac_device_ctl_info *edac_dev)
274 * edac_device_unregister_sysfs_main_kobj() must be used 274 * edac_device_unregister_sysfs_main_kobj() must be used
275 */ 275 */
276 276
277 debugf4("%s() Registered '.../edac/%s' kobject\n", 277 debugf4("Registered '.../edac/%s' kobject\n",
278 __func__, edac_dev->name); 278 edac_dev->name);
279 279
280 return 0; 280 return 0;
281 281
@@ -296,9 +296,9 @@ err_out:
296 */ 296 */
297void edac_device_unregister_sysfs_main_kobj(struct edac_device_ctl_info *dev) 297void edac_device_unregister_sysfs_main_kobj(struct edac_device_ctl_info *dev)
298{ 298{
299 debugf0("%s()\n", __func__); 299 debugf0("\n");
300 debugf4("%s() name of kobject is: %s\n", 300 debugf4("name of kobject is: %s\n",
301 __func__, kobject_name(&dev->kobj)); 301 kobject_name(&dev->kobj));
302 302
303 /* 303 /*
304 * Unregister the edac device's kobject and 304 * Unregister the edac device's kobject and
@@ -336,7 +336,7 @@ static void edac_device_ctrl_instance_release(struct kobject *kobj)
336{ 336{
337 struct edac_device_instance *instance; 337 struct edac_device_instance *instance;
338 338
339 debugf1("%s()\n", __func__); 339 debugf1("\n");
340 340
341 /* map from this kobj to the main control struct 341 /* map from this kobj to the main control struct
342 * and then dec the main kobj count 342 * and then dec the main kobj count
@@ -442,7 +442,7 @@ static void edac_device_ctrl_block_release(struct kobject *kobj)
442{ 442{
443 struct edac_device_block *block; 443 struct edac_device_block *block;
444 444
445 debugf1("%s()\n", __func__); 445 debugf1("\n");
446 446
447 /* get the container of the kobj */ 447 /* get the container of the kobj */
448 block = to_block(kobj); 448 block = to_block(kobj);
@@ -524,10 +524,10 @@ static int edac_device_create_block(struct edac_device_ctl_info *edac_dev,
524 struct edac_dev_sysfs_block_attribute *sysfs_attrib; 524 struct edac_dev_sysfs_block_attribute *sysfs_attrib;
525 struct kobject *main_kobj; 525 struct kobject *main_kobj;
526 526
527 debugf4("%s() Instance '%s' inst_p=%p block '%s' block_p=%p\n", 527 debugf4("Instance '%s' inst_p=%p block '%s' block_p=%p\n",
528 __func__, instance->name, instance, block->name, block); 528 instance->name, instance, block->name, block);
529 debugf4("%s() block kobj=%p block kobj->parent=%p\n", 529 debugf4("block kobj=%p block kobj->parent=%p\n",
530 __func__, &block->kobj, &block->kobj.parent); 530 &block->kobj, &block->kobj.parent);
531 531
532 /* init this block's kobject */ 532 /* init this block's kobject */
533 memset(&block->kobj, 0, sizeof(struct kobject)); 533 memset(&block->kobj, 0, sizeof(struct kobject));
@@ -546,8 +546,8 @@ static int edac_device_create_block(struct edac_device_ctl_info *edac_dev,
546 &instance->kobj, 546 &instance->kobj,
547 "%s", block->name); 547 "%s", block->name);
548 if (err) { 548 if (err) {
549 debugf1("%s() Failed to register instance '%s'\n", 549 debugf1("Failed to register instance '%s'\n",
550 __func__, block->name); 550 block->name);
551 kobject_put(main_kobj); 551 kobject_put(main_kobj);
552 err = -ENODEV; 552 err = -ENODEV;
553 goto err_out; 553 goto err_out;
@@ -560,9 +560,8 @@ static int edac_device_create_block(struct edac_device_ctl_info *edac_dev,
560 if (sysfs_attrib && block->nr_attribs) { 560 if (sysfs_attrib && block->nr_attribs) {
561 for (i = 0; i < block->nr_attribs; i++, sysfs_attrib++) { 561 for (i = 0; i < block->nr_attribs; i++, sysfs_attrib++) {
562 562
563 debugf4("%s() creating block attrib='%s' " 563 debugf4("creating block attrib='%s' "
564 "attrib->%p to kobj=%p\n", 564 "attrib->%p to kobj=%p\n",
565 __func__,
566 sysfs_attrib->attr.name, 565 sysfs_attrib->attr.name,
567 sysfs_attrib, &block->kobj); 566 sysfs_attrib, &block->kobj);
568 567
@@ -647,14 +646,14 @@ static int edac_device_create_instance(struct edac_device_ctl_info *edac_dev,
647 err = kobject_init_and_add(&instance->kobj, &ktype_instance_ctrl, 646 err = kobject_init_and_add(&instance->kobj, &ktype_instance_ctrl,
648 &edac_dev->kobj, "%s", instance->name); 647 &edac_dev->kobj, "%s", instance->name);
649 if (err != 0) { 648 if (err != 0) {
650 debugf2("%s() Failed to register instance '%s'\n", 649 debugf2("Failed to register instance '%s'\n",
651 __func__, instance->name); 650 instance->name);
652 kobject_put(main_kobj); 651 kobject_put(main_kobj);
653 goto err_out; 652 goto err_out;
654 } 653 }
655 654
656 debugf4("%s() now register '%d' blocks for instance %d\n", 655 debugf4("now register '%d' blocks for instance %d\n",
657 __func__, instance->nr_blocks, idx); 656 instance->nr_blocks, idx);
658 657
659 /* register all blocks of this instance */ 658 /* register all blocks of this instance */
660 for (i = 0; i < instance->nr_blocks; i++) { 659 for (i = 0; i < instance->nr_blocks; i++) {
@@ -670,8 +669,8 @@ static int edac_device_create_instance(struct edac_device_ctl_info *edac_dev,
670 } 669 }
671 kobject_uevent(&instance->kobj, KOBJ_ADD); 670 kobject_uevent(&instance->kobj, KOBJ_ADD);
672 671
673 debugf4("%s() Registered instance %d '%s' kobject\n", 672 debugf4("Registered instance %d '%s' kobject\n",
674 __func__, idx, instance->name); 673 idx, instance->name);
675 674
676 return 0; 675 return 0;
677 676
@@ -715,7 +714,7 @@ static int edac_device_create_instances(struct edac_device_ctl_info *edac_dev)
715 int i, j; 714 int i, j;
716 int err; 715 int err;
717 716
718 debugf0("%s()\n", __func__); 717 debugf0("\n");
719 718
720 /* iterate over creation of the instances */ 719 /* iterate over creation of the instances */
721 for (i = 0; i < edac_dev->nr_instances; i++) { 720 for (i = 0; i < edac_dev->nr_instances; i++) {
@@ -817,12 +816,12 @@ int edac_device_create_sysfs(struct edac_device_ctl_info *edac_dev)
817 int err; 816 int err;
818 struct kobject *edac_kobj = &edac_dev->kobj; 817 struct kobject *edac_kobj = &edac_dev->kobj;
819 818
820 debugf0("%s() idx=%d\n", __func__, edac_dev->dev_idx); 819 debugf0("idx=%d\n", edac_dev->dev_idx);
821 820
822 /* go create any main attributes callers wants */ 821 /* go create any main attributes callers wants */
823 err = edac_device_add_main_sysfs_attributes(edac_dev); 822 err = edac_device_add_main_sysfs_attributes(edac_dev);
824 if (err) { 823 if (err) {
825 debugf0("%s() failed to add sysfs attribs\n", __func__); 824 debugf0("failed to add sysfs attribs\n");
826 goto err_out; 825 goto err_out;
827 } 826 }
828 827
@@ -832,8 +831,8 @@ int edac_device_create_sysfs(struct edac_device_ctl_info *edac_dev)
832 err = sysfs_create_link(edac_kobj, 831 err = sysfs_create_link(edac_kobj,
833 &edac_dev->dev->kobj, EDAC_DEVICE_SYMLINK); 832 &edac_dev->dev->kobj, EDAC_DEVICE_SYMLINK);
834 if (err) { 833 if (err) {
835 debugf0("%s() sysfs_create_link() returned err= %d\n", 834 debugf0("sysfs_create_link() returned err= %d\n",
836 __func__, err); 835 err);
837 goto err_remove_main_attribs; 836 goto err_remove_main_attribs;
838 } 837 }
839 838
@@ -843,14 +842,14 @@ int edac_device_create_sysfs(struct edac_device_ctl_info *edac_dev)
843 */ 842 */
844 err = edac_device_create_instances(edac_dev); 843 err = edac_device_create_instances(edac_dev);
845 if (err) { 844 if (err) {
846 debugf0("%s() edac_device_create_instances() " 845 debugf0("edac_device_create_instances() "
847 "returned err= %d\n", __func__, err); 846 "returned err= %d\n", err);
848 goto err_remove_link; 847 goto err_remove_link;
849 } 848 }
850 849
851 850
852 debugf4("%s() create-instances done, idx=%d\n", 851 debugf4("create-instances done, idx=%d\n",
853 __func__, edac_dev->dev_idx); 852 edac_dev->dev_idx);
854 853
855 return 0; 854 return 0;
856 855
@@ -873,7 +872,7 @@ err_out:
873 */ 872 */
874void edac_device_remove_sysfs(struct edac_device_ctl_info *edac_dev) 873void edac_device_remove_sysfs(struct edac_device_ctl_info *edac_dev)
875{ 874{
876 debugf0("%s()\n", __func__); 875 debugf0("\n");
877 876
878 /* remove any main attributes for this device */ 877 /* remove any main attributes for this device */
879 edac_device_remove_main_sysfs_attributes(edac_dev); 878 edac_device_remove_main_sysfs_attributes(edac_dev);
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index db2ba31ba2b1..4df9c4ac63c3 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -246,18 +246,18 @@ struct mem_ctl_info *edac_mc_alloc(unsigned mc_num,
246 layer = edac_align_ptr(&ptr, sizeof(*layer), n_layers); 246 layer = edac_align_ptr(&ptr, sizeof(*layer), n_layers);
247 for (i = 0; i < n_layers; i++) { 247 for (i = 0; i < n_layers; i++) {
248 count *= layers[i].size; 248 count *= layers[i].size;
249 debugf4("%s: errcount layer %d size %d\n", __func__, i, count); 249 debugf4("errcount layer %d size %d\n", i, count);
250 ce_per_layer[i] = edac_align_ptr(&ptr, sizeof(u32), count); 250 ce_per_layer[i] = edac_align_ptr(&ptr, sizeof(u32), count);
251 ue_per_layer[i] = edac_align_ptr(&ptr, sizeof(u32), count); 251 ue_per_layer[i] = edac_align_ptr(&ptr, sizeof(u32), count);
252 tot_errcount += 2 * count; 252 tot_errcount += 2 * count;
253 } 253 }
254 254
255 debugf4("%s: allocating %d error counters\n", __func__, tot_errcount); 255 debugf4("allocating %d error counters\n", tot_errcount);
256 pvt = edac_align_ptr(&ptr, sz_pvt, 1); 256 pvt = edac_align_ptr(&ptr, sz_pvt, 1);
257 size = ((unsigned long)pvt) + sz_pvt; 257 size = ((unsigned long)pvt) + sz_pvt;
258 258
259 debugf1("%s(): allocating %u bytes for mci data (%d %s, %d csrows/channels)\n", 259 debugf1("allocating %u bytes for mci data (%d %s, %d csrows/channels)\n",
260 __func__, size, 260 size,
261 tot_dimms, 261 tot_dimms,
262 per_rank ? "ranks" : "dimms", 262 per_rank ? "ranks" : "dimms",
263 tot_csrows * tot_channels); 263 tot_csrows * tot_channels);
@@ -326,7 +326,7 @@ struct mem_ctl_info *edac_mc_alloc(unsigned mc_num,
326 memset(&pos, 0, sizeof(pos)); 326 memset(&pos, 0, sizeof(pos));
327 row = 0; 327 row = 0;
328 chn = 0; 328 chn = 0;
329 debugf4("%s: initializing %d %s\n", __func__, tot_dimms, 329 debugf4("initializing %d %s\n", tot_dimms,
330 per_rank ? "ranks" : "dimms"); 330 per_rank ? "ranks" : "dimms");
331 for (i = 0; i < tot_dimms; i++) { 331 for (i = 0; i < tot_dimms; i++) {
332 chan = mci->csrows[row]->channels[chn]; 332 chan = mci->csrows[row]->channels[chn];
@@ -340,8 +340,8 @@ struct mem_ctl_info *edac_mc_alloc(unsigned mc_num,
340 mci->dimms[off] = dimm; 340 mci->dimms[off] = dimm;
341 dimm->mci = mci; 341 dimm->mci = mci;
342 342
343 debugf2("%s: %d: %s%i (%d:%d:%d): row %d, chan %d\n", __func__, 343 debugf2("%d: %s%i (%d:%d:%d): row %d, chan %d\n", i,
344 i, per_rank ? "rank" : "dimm", off, 344 per_rank ? "rank" : "dimm", off,
345 pos[0], pos[1], pos[2], row, chn); 345 pos[0], pos[1], pos[2], row, chn);
346 346
347 /* 347 /*
@@ -427,7 +427,7 @@ EXPORT_SYMBOL_GPL(edac_mc_alloc);
427 */ 427 */
428void edac_mc_free(struct mem_ctl_info *mci) 428void edac_mc_free(struct mem_ctl_info *mci)
429{ 429{
430 debugf1("%s()\n", __func__); 430 debugf1("\n");
431 431
432 /* the mci instance is freed here, when the sysfs object is dropped */ 432 /* the mci instance is freed here, when the sysfs object is dropped */
433 edac_unregister_sysfs(mci); 433 edac_unregister_sysfs(mci);
@@ -447,7 +447,7 @@ struct mem_ctl_info *find_mci_by_dev(struct device *dev)
447 struct mem_ctl_info *mci; 447 struct mem_ctl_info *mci;
448 struct list_head *item; 448 struct list_head *item;
449 449
450 debugf3("%s()\n", __func__); 450 debugf3("\n");
451 451
452 list_for_each(item, &mc_devices) { 452 list_for_each(item, &mc_devices) {
453 mci = list_entry(item, struct mem_ctl_info, link); 453 mci = list_entry(item, struct mem_ctl_info, link);
@@ -515,7 +515,7 @@ static void edac_mc_workq_function(struct work_struct *work_req)
515 */ 515 */
516static void edac_mc_workq_setup(struct mem_ctl_info *mci, unsigned msec) 516static void edac_mc_workq_setup(struct mem_ctl_info *mci, unsigned msec)
517{ 517{
518 debugf0("%s()\n", __func__); 518 debugf0("\n");
519 519
520 /* if this instance is not in the POLL state, then simply return */ 520 /* if this instance is not in the POLL state, then simply return */
521 if (mci->op_state != OP_RUNNING_POLL) 521 if (mci->op_state != OP_RUNNING_POLL)
@@ -542,8 +542,7 @@ static void edac_mc_workq_teardown(struct mem_ctl_info *mci)
542 542
543 status = cancel_delayed_work(&mci->work); 543 status = cancel_delayed_work(&mci->work);
544 if (status == 0) { 544 if (status == 0) {
545 debugf0("%s() not canceled, flush the queue\n", 545 debugf0("not canceled, flush the queue\n");
546 __func__);
547 546
548 /* workq instance might be running, wait for it */ 547 /* workq instance might be running, wait for it */
549 flush_workqueue(edac_workqueue); 548 flush_workqueue(edac_workqueue);
@@ -690,7 +689,7 @@ EXPORT_SYMBOL(edac_mc_find);
690/* FIXME - should a warning be printed if no error detection? correction? */ 689/* FIXME - should a warning be printed if no error detection? correction? */
691int edac_mc_add_mc(struct mem_ctl_info *mci) 690int edac_mc_add_mc(struct mem_ctl_info *mci)
692{ 691{
693 debugf0("%s()\n", __func__); 692 debugf0("\n");
694 693
695#ifdef CONFIG_EDAC_DEBUG 694#ifdef CONFIG_EDAC_DEBUG
696 if (edac_debug_level >= 3) 695 if (edac_debug_level >= 3)
@@ -761,7 +760,7 @@ struct mem_ctl_info *edac_mc_del_mc(struct device *dev)
761{ 760{
762 struct mem_ctl_info *mci; 761 struct mem_ctl_info *mci;
763 762
764 debugf0("%s()\n", __func__); 763 debugf0("\n");
765 764
766 mutex_lock(&mem_ctls_mutex); 765 mutex_lock(&mem_ctls_mutex);
767 766
@@ -799,7 +798,7 @@ static void edac_mc_scrub_block(unsigned long page, unsigned long offset,
799 void *virt_addr; 798 void *virt_addr;
800 unsigned long flags = 0; 799 unsigned long flags = 0;
801 800
802 debugf3("%s()\n", __func__); 801 debugf3("\n");
803 802
804 /* ECC error page was not in our memory. Ignore it. */ 803 /* ECC error page was not in our memory. Ignore it. */
805 if (!pfn_valid(page)) 804 if (!pfn_valid(page))
@@ -829,7 +828,7 @@ int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci, unsigned long page)
829 struct csrow_info **csrows = mci->csrows; 828 struct csrow_info **csrows = mci->csrows;
830 int row, i, j, n; 829 int row, i, j, n;
831 830
832 debugf1("MC%d: %s(): 0x%lx\n", mci->mc_idx, __func__, page); 831 debugf1("MC%d: 0x%lx\n", mci->mc_idx, page);
833 row = -1; 832 row = -1;
834 833
835 for (i = 0; i < mci->nr_csrows; i++) { 834 for (i = 0; i < mci->nr_csrows; i++) {
@@ -842,8 +841,8 @@ int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci, unsigned long page)
842 if (n == 0) 841 if (n == 0)
843 continue; 842 continue;
844 843
845 debugf3("MC%d: %s(): first(0x%lx) page(0x%lx) last(0x%lx) " 844 debugf3("MC%d: first(0x%lx) page(0x%lx) last(0x%lx) "
846 "mask(0x%lx)\n", mci->mc_idx, __func__, 845 "mask(0x%lx)\n", mci->mc_idx,
847 csrow->first_page, page, csrow->last_page, 846 csrow->first_page, page, csrow->last_page,
848 csrow->page_mask); 847 csrow->page_mask);
849 848
@@ -1049,7 +1048,7 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type,
1049 u16 error_count; /* FIXME: make it a parameter */ 1048 u16 error_count; /* FIXME: make it a parameter */
1050 u8 grain_bits; 1049 u8 grain_bits;
1051 1050
1052 debugf3("MC%d: %s()\n", mci->mc_idx, __func__); 1051 debugf3("MC%d\n", mci->mc_idx);
1053 1052
1054 /* 1053 /*
1055 * Check if the event report is consistent and if the memory 1054 * Check if the event report is consistent and if the memory
@@ -1127,8 +1126,7 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type,
1127 * get csrow/channel of the DIMM, in order to allow 1126 * get csrow/channel of the DIMM, in order to allow
1128 * incrementing the compat API counters 1127 * incrementing the compat API counters
1129 */ 1128 */
1130 debugf4("%s: %s csrows map: (%d,%d)\n", 1129 debugf4("%s csrows map: (%d,%d)\n",
1131 __func__,
1132 mci->mem_is_per_rank ? "rank" : "dimm", 1130 mci->mem_is_per_rank ? "rank" : "dimm",
1133 dimm->csrow, dimm->cschannel); 1131 dimm->csrow, dimm->cschannel);
1134 1132
@@ -1147,8 +1145,8 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type,
1147 if (!enable_per_layer_report) { 1145 if (!enable_per_layer_report) {
1148 strcpy(label, "any memory"); 1146 strcpy(label, "any memory");
1149 } else { 1147 } else {
1150 debugf4("%s: csrow/channel to increment: (%d,%d)\n", 1148 debugf4("csrow/channel to increment: (%d,%d)\n",
1151 __func__, row, chan); 1149 row, chan);
1152 if (p == label) 1150 if (p == label)
1153 strcpy(label, "unknown memory"); 1151 strcpy(label, "unknown memory");
1154 if (type == HW_EVENT_ERR_CORRECTED) { 1152 if (type == HW_EVENT_ERR_CORRECTED) {
diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index 87b8d7d6385f..f72de8ba6a3b 100644
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -376,8 +376,7 @@ static int edac_create_csrow_object(struct mem_ctl_info *mci,
376 dev_set_name(&csrow->dev, "csrow%d", index); 376 dev_set_name(&csrow->dev, "csrow%d", index);
377 dev_set_drvdata(&csrow->dev, csrow); 377 dev_set_drvdata(&csrow->dev, csrow);
378 378
379 debugf0("%s(): creating (virtual) csrow node %s\n", __func__, 379 debugf0("creating (virtual) csrow node %s\n", dev_name(&csrow->dev));
380 dev_name(&csrow->dev));
381 380
382 err = device_add(&csrow->dev); 381 err = device_add(&csrow->dev);
383 if (err < 0) 382 if (err < 0)
@@ -623,8 +622,7 @@ static int edac_create_dimm_object(struct mem_ctl_info *mci,
623 622
624 err = device_add(&dimm->dev); 623 err = device_add(&dimm->dev);
625 624
626 debugf0("%s(): creating rank/dimm device %s\n", __func__, 625 debugf0("creating rank/dimm device %s\n", dev_name(&dimm->dev));
627 dev_name(&dimm->dev));
628 626
629 return err; 627 return err;
630} 628}
@@ -981,8 +979,7 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
981 dev_set_drvdata(&mci->dev, mci); 979 dev_set_drvdata(&mci->dev, mci);
982 pm_runtime_forbid(&mci->dev); 980 pm_runtime_forbid(&mci->dev);
983 981
984 debugf0("%s(): creating device %s\n", __func__, 982 debugf0("creating device %s\n", dev_name(&mci->dev));
985 dev_name(&mci->dev));
986 err = device_add(&mci->dev); 983 err = device_add(&mci->dev);
987 if (err < 0) { 984 if (err < 0) {
988 bus_unregister(&mci->bus); 985 bus_unregister(&mci->bus);
@@ -999,8 +996,8 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
999 if (dimm->nr_pages == 0) 996 if (dimm->nr_pages == 0)
1000 continue; 997 continue;
1001#ifdef CONFIG_EDAC_DEBUG 998#ifdef CONFIG_EDAC_DEBUG
1002 debugf1("%s creating dimm%d, located at ", 999 debugf1("creating dimm%d, located at ",
1003 __func__, i); 1000 i);
1004 if (edac_debug_level >= 1) { 1001 if (edac_debug_level >= 1) {
1005 int lay; 1002 int lay;
1006 for (lay = 0; lay < mci->n_layers; lay++) 1003 for (lay = 0; lay < mci->n_layers; lay++)
@@ -1012,8 +1009,8 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
1012#endif 1009#endif
1013 err = edac_create_dimm_object(mci, dimm, i); 1010 err = edac_create_dimm_object(mci, dimm, i);
1014 if (err) { 1011 if (err) {
1015 debugf1("%s() failure: create dimm %d obj\n", 1012 debugf1("failure: create dimm %d obj\n",
1016 __func__, i); 1013 i);
1017 goto fail; 1014 goto fail;
1018 } 1015 }
1019 } 1016 }
@@ -1051,7 +1048,7 @@ void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci)
1051{ 1048{
1052 int i; 1049 int i;
1053 1050
1054 debugf0("%s()\n", __func__); 1051 debugf0("\n");
1055 1052
1056#ifdef CONFIG_EDAC_DEBUG 1053#ifdef CONFIG_EDAC_DEBUG
1057 debugfs_remove(mci->debugfs); 1054 debugfs_remove(mci->debugfs);
@@ -1064,8 +1061,7 @@ void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci)
1064 struct dimm_info *dimm = mci->dimms[i]; 1061 struct dimm_info *dimm = mci->dimms[i];
1065 if (dimm->nr_pages == 0) 1062 if (dimm->nr_pages == 0)
1066 continue; 1063 continue;
1067 debugf0("%s(): removing device %s\n", __func__, 1064 debugf0("removing device %s\n", dev_name(&dimm->dev));
1068 dev_name(&dimm->dev));
1069 put_device(&dimm->dev); 1065 put_device(&dimm->dev);
1070 device_del(&dimm->dev); 1066 device_del(&dimm->dev);
1071 } 1067 }
@@ -1105,7 +1101,7 @@ int __init edac_mc_sysfs_init(void)
1105 /* get the /sys/devices/system/edac subsys reference */ 1101 /* get the /sys/devices/system/edac subsys reference */
1106 edac_subsys = edac_get_sysfs_subsys(); 1102 edac_subsys = edac_get_sysfs_subsys();
1107 if (edac_subsys == NULL) { 1103 if (edac_subsys == NULL) {
1108 debugf1("%s() no edac_subsys\n", __func__); 1104 debugf1("no edac_subsys\n");
1109 return -EINVAL; 1105 return -EINVAL;
1110 } 1106 }
1111 1107
diff --git a/drivers/edac/edac_module.c b/drivers/edac/edac_module.c
index 8735a0d3ed0c..9de248492908 100644
--- a/drivers/edac/edac_module.c
+++ b/drivers/edac/edac_module.c
@@ -113,7 +113,7 @@ error:
113 */ 113 */
114static void __exit edac_exit(void) 114static void __exit edac_exit(void)
115{ 115{
116 debugf0("%s()\n", __func__); 116 debugf0("\n");
117 117
118 /* tear down the various subsystems */ 118 /* tear down the various subsystems */
119 edac_workqueue_teardown(); 119 edac_workqueue_teardown();
diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
index f1ac86649886..51dd4e05a76f 100644
--- a/drivers/edac/edac_pci.c
+++ b/drivers/edac/edac_pci.c
@@ -45,7 +45,7 @@ struct edac_pci_ctl_info *edac_pci_alloc_ctl_info(unsigned int sz_pvt,
45 void *p = NULL, *pvt; 45 void *p = NULL, *pvt;
46 unsigned int size; 46 unsigned int size;
47 47
48 debugf1("%s()\n", __func__); 48 debugf1("\n");
49 49
50 pci = edac_align_ptr(&p, sizeof(*pci), 1); 50 pci = edac_align_ptr(&p, sizeof(*pci), 1);
51 pvt = edac_align_ptr(&p, 1, sz_pvt); 51 pvt = edac_align_ptr(&p, 1, sz_pvt);
@@ -80,7 +80,7 @@ EXPORT_SYMBOL_GPL(edac_pci_alloc_ctl_info);
80 */ 80 */
81void edac_pci_free_ctl_info(struct edac_pci_ctl_info *pci) 81void edac_pci_free_ctl_info(struct edac_pci_ctl_info *pci)
82{ 82{
83 debugf1("%s()\n", __func__); 83 debugf1("\n");
84 84
85 edac_pci_remove_sysfs(pci); 85 edac_pci_remove_sysfs(pci);
86} 86}
@@ -97,7 +97,7 @@ static struct edac_pci_ctl_info *find_edac_pci_by_dev(struct device *dev)
97 struct edac_pci_ctl_info *pci; 97 struct edac_pci_ctl_info *pci;
98 struct list_head *item; 98 struct list_head *item;
99 99
100 debugf1("%s()\n", __func__); 100 debugf1("\n");
101 101
102 list_for_each(item, &edac_pci_list) { 102 list_for_each(item, &edac_pci_list) {
103 pci = list_entry(item, struct edac_pci_ctl_info, link); 103 pci = list_entry(item, struct edac_pci_ctl_info, link);
@@ -122,7 +122,7 @@ static int add_edac_pci_to_global_list(struct edac_pci_ctl_info *pci)
122 struct list_head *item, *insert_before; 122 struct list_head *item, *insert_before;
123 struct edac_pci_ctl_info *rover; 123 struct edac_pci_ctl_info *rover;
124 124
125 debugf1("%s()\n", __func__); 125 debugf1("\n");
126 126
127 insert_before = &edac_pci_list; 127 insert_before = &edac_pci_list;
128 128
@@ -226,7 +226,7 @@ static void edac_pci_workq_function(struct work_struct *work_req)
226 int msec; 226 int msec;
227 unsigned long delay; 227 unsigned long delay;
228 228
229 debugf3("%s() checking\n", __func__); 229 debugf3("checking\n");
230 230
231 mutex_lock(&edac_pci_ctls_mutex); 231 mutex_lock(&edac_pci_ctls_mutex);
232 232
@@ -261,7 +261,7 @@ static void edac_pci_workq_function(struct work_struct *work_req)
261static void edac_pci_workq_setup(struct edac_pci_ctl_info *pci, 261static void edac_pci_workq_setup(struct edac_pci_ctl_info *pci,
262 unsigned int msec) 262 unsigned int msec)
263{ 263{
264 debugf0("%s()\n", __func__); 264 debugf0("\n");
265 265
266 INIT_DELAYED_WORK(&pci->work, edac_pci_workq_function); 266 INIT_DELAYED_WORK(&pci->work, edac_pci_workq_function);
267 queue_delayed_work(edac_workqueue, &pci->work, 267 queue_delayed_work(edac_workqueue, &pci->work,
@@ -276,7 +276,7 @@ static void edac_pci_workq_teardown(struct edac_pci_ctl_info *pci)
276{ 276{
277 int status; 277 int status;
278 278
279 debugf0("%s()\n", __func__); 279 debugf0("\n");
280 280
281 status = cancel_delayed_work(&pci->work); 281 status = cancel_delayed_work(&pci->work);
282 if (status == 0) 282 if (status == 0)
@@ -293,7 +293,7 @@ static void edac_pci_workq_teardown(struct edac_pci_ctl_info *pci)
293void edac_pci_reset_delay_period(struct edac_pci_ctl_info *pci, 293void edac_pci_reset_delay_period(struct edac_pci_ctl_info *pci,
294 unsigned long value) 294 unsigned long value)
295{ 295{
296 debugf0("%s()\n", __func__); 296 debugf0("\n");
297 297
298 edac_pci_workq_teardown(pci); 298 edac_pci_workq_teardown(pci);
299 299
@@ -333,7 +333,7 @@ EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
333 */ 333 */
334int edac_pci_add_device(struct edac_pci_ctl_info *pci, int edac_idx) 334int edac_pci_add_device(struct edac_pci_ctl_info *pci, int edac_idx)
335{ 335{
336 debugf0("%s()\n", __func__); 336 debugf0("\n");
337 337
338 pci->pci_idx = edac_idx; 338 pci->pci_idx = edac_idx;
339 pci->start_time = jiffies; 339 pci->start_time = jiffies;
@@ -393,7 +393,7 @@ struct edac_pci_ctl_info *edac_pci_del_device(struct device *dev)
393{ 393{
394 struct edac_pci_ctl_info *pci; 394 struct edac_pci_ctl_info *pci;
395 395
396 debugf0("%s()\n", __func__); 396 debugf0("\n");
397 397
398 mutex_lock(&edac_pci_ctls_mutex); 398 mutex_lock(&edac_pci_ctls_mutex);
399 399
@@ -430,7 +430,7 @@ EXPORT_SYMBOL_GPL(edac_pci_del_device);
430 */ 430 */
431static void edac_pci_generic_check(struct edac_pci_ctl_info *pci) 431static void edac_pci_generic_check(struct edac_pci_ctl_info *pci)
432{ 432{
433 debugf4("%s()\n", __func__); 433 debugf4("\n");
434 edac_pci_do_parity_check(); 434 edac_pci_do_parity_check();
435} 435}
436 436
@@ -475,7 +475,7 @@ struct edac_pci_ctl_info *edac_pci_create_generic_ctl(struct device *dev,
475 pdata->edac_idx = edac_pci_idx++; 475 pdata->edac_idx = edac_pci_idx++;
476 476
477 if (edac_pci_add_device(pci, pdata->edac_idx) > 0) { 477 if (edac_pci_add_device(pci, pdata->edac_idx) > 0) {
478 debugf3("%s(): failed edac_pci_add_device()\n", __func__); 478 debugf3("failed edac_pci_add_device()\n");
479 edac_pci_free_ctl_info(pci); 479 edac_pci_free_ctl_info(pci);
480 return NULL; 480 return NULL;
481 } 481 }
@@ -491,7 +491,7 @@ EXPORT_SYMBOL_GPL(edac_pci_create_generic_ctl);
491 */ 491 */
492void edac_pci_release_generic_ctl(struct edac_pci_ctl_info *pci) 492void edac_pci_release_generic_ctl(struct edac_pci_ctl_info *pci)
493{ 493{
494 debugf0("%s() pci mod=%s\n", __func__, pci->mod_name); 494 debugf0("pci mod=%s\n", pci->mod_name);
495 495
496 edac_pci_del_device(pci->dev); 496 edac_pci_del_device(pci->dev);
497 edac_pci_free_ctl_info(pci); 497 edac_pci_free_ctl_info(pci);
diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
index 97f5064e3992..6678216a7cbc 100644
--- a/drivers/edac/edac_pci_sysfs.c
+++ b/drivers/edac/edac_pci_sysfs.c
@@ -78,7 +78,7 @@ static void edac_pci_instance_release(struct kobject *kobj)
78{ 78{
79 struct edac_pci_ctl_info *pci; 79 struct edac_pci_ctl_info *pci;
80 80
81 debugf0("%s()\n", __func__); 81 debugf0("\n");
82 82
83 /* Form pointer to containing struct, the pci control struct */ 83 /* Form pointer to containing struct, the pci control struct */
84 pci = to_instance(kobj); 84 pci = to_instance(kobj);
@@ -161,7 +161,7 @@ static int edac_pci_create_instance_kobj(struct edac_pci_ctl_info *pci, int idx)
161 struct kobject *main_kobj; 161 struct kobject *main_kobj;
162 int err; 162 int err;
163 163
164 debugf0("%s()\n", __func__); 164 debugf0("\n");
165 165
166 /* First bump the ref count on the top main kobj, which will 166 /* First bump the ref count on the top main kobj, which will
167 * track the number of PCI instances we have, and thus nest 167 * track the number of PCI instances we have, and thus nest
@@ -177,14 +177,14 @@ static int edac_pci_create_instance_kobj(struct edac_pci_ctl_info *pci, int idx)
177 err = kobject_init_and_add(&pci->kobj, &ktype_pci_instance, 177 err = kobject_init_and_add(&pci->kobj, &ktype_pci_instance,
178 edac_pci_top_main_kobj, "pci%d", idx); 178 edac_pci_top_main_kobj, "pci%d", idx);
179 if (err != 0) { 179 if (err != 0) {
180 debugf2("%s() failed to register instance pci%d\n", 180 debugf2("failed to register instance pci%d\n",
181 __func__, idx); 181 idx);
182 kobject_put(edac_pci_top_main_kobj); 182 kobject_put(edac_pci_top_main_kobj);
183 goto error_out; 183 goto error_out;
184 } 184 }
185 185
186 kobject_uevent(&pci->kobj, KOBJ_ADD); 186 kobject_uevent(&pci->kobj, KOBJ_ADD);
187 debugf1("%s() Register instance 'pci%d' kobject\n", __func__, idx); 187 debugf1("Register instance 'pci%d' kobject\n", idx);
188 188
189 return 0; 189 return 0;
190 190
@@ -201,7 +201,7 @@ error_out:
201static void edac_pci_unregister_sysfs_instance_kobj( 201static void edac_pci_unregister_sysfs_instance_kobj(
202 struct edac_pci_ctl_info *pci) 202 struct edac_pci_ctl_info *pci)
203{ 203{
204 debugf0("%s()\n", __func__); 204 debugf0("\n");
205 205
206 /* Unregister the instance kobject and allow its release 206 /* Unregister the instance kobject and allow its release
207 * function release the main reference count and then 207 * function release the main reference count and then
@@ -317,7 +317,7 @@ static struct edac_pci_dev_attribute *edac_pci_attr[] = {
317 */ 317 */
318static void edac_pci_release_main_kobj(struct kobject *kobj) 318static void edac_pci_release_main_kobj(struct kobject *kobj)
319{ 319{
320 debugf0("%s() here to module_put(THIS_MODULE)\n", __func__); 320 debugf0("here to module_put(THIS_MODULE)\n");
321 321
322 kfree(kobj); 322 kfree(kobj);
323 323
@@ -345,7 +345,7 @@ static int edac_pci_main_kobj_setup(void)
345 int err; 345 int err;
346 struct bus_type *edac_subsys; 346 struct bus_type *edac_subsys;
347 347
348 debugf0("%s()\n", __func__); 348 debugf0("\n");
349 349
350 /* check and count if we have already created the main kobject */ 350 /* check and count if we have already created the main kobject */
351 if (atomic_inc_return(&edac_pci_sysfs_refcount) != 1) 351 if (atomic_inc_return(&edac_pci_sysfs_refcount) != 1)
@@ -356,7 +356,7 @@ static int edac_pci_main_kobj_setup(void)
356 */ 356 */
357 edac_subsys = edac_get_sysfs_subsys(); 357 edac_subsys = edac_get_sysfs_subsys();
358 if (edac_subsys == NULL) { 358 if (edac_subsys == NULL) {
359 debugf1("%s() no edac_subsys\n", __func__); 359 debugf1("no edac_subsys\n");
360 err = -ENODEV; 360 err = -ENODEV;
361 goto decrement_count_fail; 361 goto decrement_count_fail;
362 } 362 }
@@ -366,7 +366,7 @@ static int edac_pci_main_kobj_setup(void)
366 * level main kobj for EDAC PCI 366 * level main kobj for EDAC PCI
367 */ 367 */
368 if (!try_module_get(THIS_MODULE)) { 368 if (!try_module_get(THIS_MODULE)) {
369 debugf1("%s() try_module_get() failed\n", __func__); 369 debugf1("try_module_get() failed\n");
370 err = -ENODEV; 370 err = -ENODEV;
371 goto mod_get_fail; 371 goto mod_get_fail;
372 } 372 }
@@ -421,15 +421,14 @@ decrement_count_fail:
421 */ 421 */
422static void edac_pci_main_kobj_teardown(void) 422static void edac_pci_main_kobj_teardown(void)
423{ 423{
424 debugf0("%s()\n", __func__); 424 debugf0("\n");
425 425
426 /* Decrement the count and only if no more controller instances 426 /* Decrement the count and only if no more controller instances
427 * are connected perform the unregisteration of the top level 427 * are connected perform the unregisteration of the top level
428 * main kobj 428 * main kobj
429 */ 429 */
430 if (atomic_dec_return(&edac_pci_sysfs_refcount) == 0) { 430 if (atomic_dec_return(&edac_pci_sysfs_refcount) == 0) {
431 debugf0("%s() called kobject_put on main kobj\n", 431 debugf0("called kobject_put on main kobj\n");
432 __func__);
433 kobject_put(edac_pci_top_main_kobj); 432 kobject_put(edac_pci_top_main_kobj);
434 } 433 }
435 edac_put_sysfs_subsys(); 434 edac_put_sysfs_subsys();
@@ -446,7 +445,7 @@ int edac_pci_create_sysfs(struct edac_pci_ctl_info *pci)
446 int err; 445 int err;
447 struct kobject *edac_kobj = &pci->kobj; 446 struct kobject *edac_kobj = &pci->kobj;
448 447
449 debugf0("%s() idx=%d\n", __func__, pci->pci_idx); 448 debugf0("idx=%d\n", pci->pci_idx);
450 449
451 /* create the top main EDAC PCI kobject, IF needed */ 450 /* create the top main EDAC PCI kobject, IF needed */
452 err = edac_pci_main_kobj_setup(); 451 err = edac_pci_main_kobj_setup();
@@ -460,8 +459,8 @@ int edac_pci_create_sysfs(struct edac_pci_ctl_info *pci)
460 459
461 err = sysfs_create_link(edac_kobj, &pci->dev->kobj, EDAC_PCI_SYMLINK); 460 err = sysfs_create_link(edac_kobj, &pci->dev->kobj, EDAC_PCI_SYMLINK);
462 if (err) { 461 if (err) {
463 debugf0("%s() sysfs_create_link() returned err= %d\n", 462 debugf0("sysfs_create_link() returned err= %d\n",
464 __func__, err); 463 err);
465 goto symlink_fail; 464 goto symlink_fail;
466 } 465 }
467 466
@@ -484,7 +483,7 @@ unregister_cleanup:
484 */ 483 */
485void edac_pci_remove_sysfs(struct edac_pci_ctl_info *pci) 484void edac_pci_remove_sysfs(struct edac_pci_ctl_info *pci)
486{ 485{
487 debugf0("%s() index=%d\n", __func__, pci->pci_idx); 486 debugf0("index=%d\n", pci->pci_idx);
488 487
489 /* Remove the symlink */ 488 /* Remove the symlink */
490 sysfs_remove_link(&pci->kobj, EDAC_PCI_SYMLINK); 489 sysfs_remove_link(&pci->kobj, EDAC_PCI_SYMLINK);
@@ -496,7 +495,7 @@ void edac_pci_remove_sysfs(struct edac_pci_ctl_info *pci)
496 * if this 'pci' is the last instance. 495 * if this 'pci' is the last instance.
497 * If it is, the main kobject will be unregistered as a result 496 * If it is, the main kobject will be unregistered as a result
498 */ 497 */
499 debugf0("%s() calling edac_pci_main_kobj_teardown()\n", __func__); 498 debugf0("calling edac_pci_main_kobj_teardown()\n");
500 edac_pci_main_kobj_teardown(); 499 edac_pci_main_kobj_teardown();
501} 500}
502 501
@@ -671,7 +670,7 @@ void edac_pci_do_parity_check(void)
671{ 670{
672 int before_count; 671 int before_count;
673 672
674 debugf3("%s()\n", __func__); 673 debugf3("\n");
675 674
676 /* if policy has PCI check off, leave now */ 675 /* if policy has PCI check off, leave now */
677 if (!check_pci_errors) 676 if (!check_pci_errors)
diff --git a/drivers/edac/i3000_edac.c b/drivers/edac/i3000_edac.c
index 812213da7f91..67975ba252fa 100644
--- a/drivers/edac/i3000_edac.c
+++ b/drivers/edac/i3000_edac.c
@@ -275,7 +275,7 @@ static void i3000_check(struct mem_ctl_info *mci)
275{ 275{
276 struct i3000_error_info info; 276 struct i3000_error_info info;
277 277
278 debugf1("MC%d: %s()\n", mci->mc_idx, __func__); 278 debugf1("MC%d\n", mci->mc_idx);
279 i3000_get_error_info(mci, &info); 279 i3000_get_error_info(mci, &info);
280 i3000_process_error_info(mci, &info, 1); 280 i3000_process_error_info(mci, &info, 1);
281} 281}
@@ -322,7 +322,7 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx)
322 unsigned long mchbar; 322 unsigned long mchbar;
323 void __iomem *window; 323 void __iomem *window;
324 324
325 debugf0("MC: %s()\n", __func__); 325 debugf0("MC:\n");
326 326
327 pci_read_config_dword(pdev, I3000_MCHBAR, (u32 *) & mchbar); 327 pci_read_config_dword(pdev, I3000_MCHBAR, (u32 *) & mchbar);
328 mchbar &= I3000_MCHBAR_MASK; 328 mchbar &= I3000_MCHBAR_MASK;
@@ -366,7 +366,7 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx)
366 if (!mci) 366 if (!mci)
367 return -ENOMEM; 367 return -ENOMEM;
368 368
369 debugf3("MC: %s(): init mci\n", __func__); 369 debugf3("MC: init mci\n");
370 370
371 mci->pdev = &pdev->dev; 371 mci->pdev = &pdev->dev;
372 mci->mtype_cap = MEM_FLAG_DDR2; 372 mci->mtype_cap = MEM_FLAG_DDR2;
@@ -399,8 +399,8 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx)
399 cumul_size = value << (I3000_DRB_SHIFT - PAGE_SHIFT); 399 cumul_size = value << (I3000_DRB_SHIFT - PAGE_SHIFT);
400 if (interleaved) 400 if (interleaved)
401 cumul_size <<= 1; 401 cumul_size <<= 1;
402 debugf3("MC: %s(): (%d) cumul_size 0x%x\n", 402 debugf3("MC: (%d) cumul_size 0x%x\n",
403 __func__, i, cumul_size); 403 i, cumul_size);
404 if (cumul_size == last_cumul_size) 404 if (cumul_size == last_cumul_size)
405 continue; 405 continue;
406 406
@@ -429,7 +429,7 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx)
429 429
430 rc = -ENODEV; 430 rc = -ENODEV;
431 if (edac_mc_add_mc(mci)) { 431 if (edac_mc_add_mc(mci)) {
432 debugf3("MC: %s(): failed edac_mc_add_mc()\n", __func__); 432 debugf3("MC: failed edac_mc_add_mc()\n");
433 goto fail; 433 goto fail;
434 } 434 }
435 435
@@ -445,7 +445,7 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx)
445 } 445 }
446 446
447 /* get this far and it's successful */ 447 /* get this far and it's successful */
448 debugf3("MC: %s(): success\n", __func__); 448 debugf3("MC: success\n");
449 return 0; 449 return 0;
450 450
451fail: 451fail:
@@ -461,7 +461,7 @@ static int __devinit i3000_init_one(struct pci_dev *pdev,
461{ 461{
462 int rc; 462 int rc;
463 463
464 debugf0("MC: %s()\n", __func__); 464 debugf0("MC:\n");
465 465
466 if (pci_enable_device(pdev) < 0) 466 if (pci_enable_device(pdev) < 0)
467 return -EIO; 467 return -EIO;
@@ -477,7 +477,7 @@ static void __devexit i3000_remove_one(struct pci_dev *pdev)
477{ 477{
478 struct mem_ctl_info *mci; 478 struct mem_ctl_info *mci;
479 479
480 debugf0("%s()\n", __func__); 480 debugf0("\n");
481 481
482 if (i3000_pci) 482 if (i3000_pci)
483 edac_pci_release_generic_ctl(i3000_pci); 483 edac_pci_release_generic_ctl(i3000_pci);
@@ -511,7 +511,7 @@ static int __init i3000_init(void)
511{ 511{
512 int pci_rc; 512 int pci_rc;
513 513
514 debugf3("MC: %s()\n", __func__); 514 debugf3("MC:\n");
515 515
516 /* Ensure that the OPSTATE is set correctly for POLL or NMI */ 516 /* Ensure that the OPSTATE is set correctly for POLL or NMI */
517 opstate_init(); 517 opstate_init();
@@ -552,7 +552,7 @@ fail0:
552 552
553static void __exit i3000_exit(void) 553static void __exit i3000_exit(void)
554{ 554{
555 debugf3("MC: %s()\n", __func__); 555 debugf3("MC:\n");
556 556
557 pci_unregister_driver(&i3000_driver); 557 pci_unregister_driver(&i3000_driver);
558 if (!i3000_registered) { 558 if (!i3000_registered) {
diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c
index c5f0fb31d5e0..9698ca39e38a 100644
--- a/drivers/edac/i3200_edac.c
+++ b/drivers/edac/i3200_edac.c
@@ -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: %s()\n", mci->mc_idx, __func__); 248 debugf1("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: %s()\n", __func__); 335 debugf0("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: %s(): init mci\n", __func__); 355 debugf3("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: %s(): failed edac_mc_add_mc()\n", __func__); 406 debugf3("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: %s(): success\n", __func__); 411 debugf3("MC: success\n");
412 return 0; 412 return 0;
413 413
414fail: 414fail:
@@ -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: %s()\n", __func__); 427 debugf0("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("%s()\n", __func__); 444 debugf0("\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: %s()\n", __func__); 478 debugf3("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();
@@ -516,7 +516,7 @@ fail0:
516 516
517static void __exit i3200_exit(void) 517static void __exit i3200_exit(void)
518{ 518{
519 debugf3("MC: %s()\n", __func__); 519 debugf3("MC:\n");
520 520
521 pci_unregister_driver(&i3200_driver); 521 pci_unregister_driver(&i3200_driver);
522 if (!i3200_registered) { 522 if (!i3200_registered) {
diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
index a7da4c7ad7fa..4a5ca5229d5f 100644
--- a/drivers/edac/i5000_edac.c
+++ b/drivers/edac/i5000_edac.c
@@ -779,7 +779,7 @@ static void i5000_clear_error(struct mem_ctl_info *mci)
779static void i5000_check_error(struct mem_ctl_info *mci) 779static void i5000_check_error(struct mem_ctl_info *mci)
780{ 780{
781 struct i5000_error_info info; 781 struct i5000_error_info info;
782 debugf4("MC%d: %s: %s()\n", mci->mc_idx, __FILE__, __func__); 782 debugf4("MC%d\n", mci->mc_idx);
783 i5000_get_error_info(mci, &info); 783 i5000_get_error_info(mci, &info);
784 i5000_process_error_info(mci, &info, 1); 784 i5000_process_error_info(mci, &info, 1);
785} 785}
@@ -1363,9 +1363,8 @@ static int i5000_probe1(struct pci_dev *pdev, int dev_idx)
1363 int num_channels; 1363 int num_channels;
1364 int num_dimms_per_channel; 1364 int num_dimms_per_channel;
1365 1365
1366 debugf0("MC: %s: %s(), pdev bus %u dev=0x%x fn=0x%x\n", 1366 debugf0("MC: %s(), pdev bus %u dev=0x%x fn=0x%x\n",
1367 __FILE__, __func__, 1367 __FILE__, pdev->bus->number,
1368 pdev->bus->number,
1369 PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn)); 1368 PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn));
1370 1369
1371 /* We only are looking for func 0 of the set */ 1370 /* We only are looking for func 0 of the set */
@@ -1388,8 +1387,8 @@ static int i5000_probe1(struct pci_dev *pdev, int dev_idx)
1388 i5000_get_dimm_and_channel_counts(pdev, &num_dimms_per_channel, 1387 i5000_get_dimm_and_channel_counts(pdev, &num_dimms_per_channel,
1389 &num_channels); 1388 &num_channels);
1390 1389
1391 debugf0("MC: %s(): Number of Branches=2 Channels= %d DIMMS= %d\n", 1390 debugf0("MC: Number of Branches=2 Channels= %d DIMMS= %d\n",
1392 __func__, num_channels, num_dimms_per_channel); 1391 num_channels, num_dimms_per_channel);
1393 1392
1394 /* allocate a new MC control structure */ 1393 /* allocate a new MC control structure */
1395 1394
@@ -1406,7 +1405,7 @@ static int i5000_probe1(struct pci_dev *pdev, int dev_idx)
1406 if (mci == NULL) 1405 if (mci == NULL)
1407 return -ENOMEM; 1406 return -ENOMEM;
1408 1407
1409 debugf0("MC: %s: %s(): mci = %p\n", __FILE__, __func__, mci); 1408 debugf0("MC: %s(): mci = %p\n", __FILE__, mci);
1410 1409
1411 mci->pdev = &pdev->dev; /* record ptr to the generic device */ 1410 mci->pdev = &pdev->dev; /* record ptr to the generic device */
1412 1411
@@ -1449,8 +1448,8 @@ static int i5000_probe1(struct pci_dev *pdev, int dev_idx)
1449 1448
1450 /* add this new MC control structure to EDAC's list of MCs */ 1449 /* add this new MC control structure to EDAC's list of MCs */
1451 if (edac_mc_add_mc(mci)) { 1450 if (edac_mc_add_mc(mci)) {
1452 debugf0("MC: %s: %s(): failed edac_mc_add_mc()\n", 1451 debugf0("MC: %s(): failed edac_mc_add_mc()\n",
1453 __FILE__, __func__); 1452 __FILE__);
1454 /* FIXME: perhaps some code should go here that disables error 1453 /* FIXME: perhaps some code should go here that disables error
1455 * reporting if we just enabled it 1454 * reporting if we just enabled it
1456 */ 1455 */
@@ -1494,7 +1493,7 @@ static int __devinit i5000_init_one(struct pci_dev *pdev,
1494{ 1493{
1495 int rc; 1494 int rc;
1496 1495
1497 debugf0("MC: %s: %s()\n", __FILE__, __func__); 1496 debugf0("MC: %s()\n", __FILE__);
1498 1497
1499 /* wake up device */ 1498 /* wake up device */
1500 rc = pci_enable_device(pdev); 1499 rc = pci_enable_device(pdev);
@@ -1513,7 +1512,7 @@ static void __devexit i5000_remove_one(struct pci_dev *pdev)
1513{ 1512{
1514 struct mem_ctl_info *mci; 1513 struct mem_ctl_info *mci;
1515 1514
1516 debugf0("%s: %s()\n", __FILE__, __func__); 1515 debugf0("%s()\n", __FILE__);
1517 1516
1518 if (i5000_pci) 1517 if (i5000_pci)
1519 edac_pci_release_generic_ctl(i5000_pci); 1518 edac_pci_release_generic_ctl(i5000_pci);
@@ -1559,7 +1558,7 @@ static int __init i5000_init(void)
1559{ 1558{
1560 int pci_rc; 1559 int pci_rc;
1561 1560
1562 debugf2("MC: %s: %s()\n", __FILE__, __func__); 1561 debugf2("MC: %s()\n", __FILE__);
1563 1562
1564 /* Ensure that the OPSTATE is set correctly for POLL or NMI */ 1563 /* Ensure that the OPSTATE is set correctly for POLL or NMI */
1565 opstate_init(); 1564 opstate_init();
@@ -1575,7 +1574,7 @@ static int __init i5000_init(void)
1575 */ 1574 */
1576static void __exit i5000_exit(void) 1575static void __exit i5000_exit(void)
1577{ 1576{
1578 debugf2("MC: %s: %s()\n", __FILE__, __func__); 1577 debugf2("MC: %s()\n", __FILE__);
1579 pci_unregister_driver(&i5000_driver); 1578 pci_unregister_driver(&i5000_driver);
1580} 1579}
1581 1580
diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c
index 0570cf3d2563..be1880de33a6 100644
--- a/drivers/edac/i5400_edac.c
+++ b/drivers/edac/i5400_edac.c
@@ -700,7 +700,7 @@ static void i5400_clear_error(struct mem_ctl_info *mci)
700static void i5400_check_error(struct mem_ctl_info *mci) 700static void i5400_check_error(struct mem_ctl_info *mci)
701{ 701{
702 struct i5400_error_info info; 702 struct i5400_error_info info;
703 debugf4("MC%d: %s: %s()\n", mci->mc_idx, __FILE__, __func__); 703 debugf4("MC%d\n", mci->mc_idx);
704 i5400_get_error_info(mci, &info); 704 i5400_get_error_info(mci, &info);
705 i5400_process_error_info(mci, &info); 705 i5400_process_error_info(mci, &info);
706} 706}
@@ -1203,8 +1203,7 @@ static int i5400_init_dimms(struct mem_ctl_info *mci)
1203 1203
1204 size_mb = pvt->dimm_info[slot][channel].megabytes; 1204 size_mb = pvt->dimm_info[slot][channel].megabytes;
1205 1205
1206 debugf2("%s: dimm (branch %d channel %d slot %d): %d.%03d GB\n", 1206 debugf2("dimm (branch %d channel %d slot %d): %d.%03d GB\n",
1207 __func__,
1208 channel / 2, channel % 2, slot, 1207 channel / 2, channel % 2, slot,
1209 size_mb / 1000, size_mb % 1000); 1208 size_mb / 1000, size_mb % 1000);
1210 1209
@@ -1270,9 +1269,8 @@ static int i5400_probe1(struct pci_dev *pdev, int dev_idx)
1270 if (dev_idx >= ARRAY_SIZE(i5400_devs)) 1269 if (dev_idx >= ARRAY_SIZE(i5400_devs))
1271 return -EINVAL; 1270 return -EINVAL;
1272 1271
1273 debugf0("MC: %s: %s(), pdev bus %u dev=0x%x fn=0x%x\n", 1272 debugf0("MC: %s(), pdev bus %u dev=0x%x fn=0x%x\n",
1274 __FILE__, __func__, 1273 __FILE__, pdev->bus->number,
1275 pdev->bus->number,
1276 PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn)); 1274 PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn));
1277 1275
1278 /* We only are looking for func 0 of the set */ 1276 /* We only are looking for func 0 of the set */
@@ -1297,7 +1295,7 @@ static int i5400_probe1(struct pci_dev *pdev, int dev_idx)
1297 if (mci == NULL) 1295 if (mci == NULL)
1298 return -ENOMEM; 1296 return -ENOMEM;
1299 1297
1300 debugf0("MC: %s: %s(): mci = %p\n", __FILE__, __func__, mci); 1298 debugf0("MC: %s(): mci = %p\n", __FILE__, mci);
1301 1299
1302 mci->pdev = &pdev->dev; /* record ptr to the generic device */ 1300 mci->pdev = &pdev->dev; /* record ptr to the generic device */
1303 1301
@@ -1340,8 +1338,8 @@ static int i5400_probe1(struct pci_dev *pdev, int dev_idx)
1340 1338
1341 /* add this new MC control structure to EDAC's list of MCs */ 1339 /* add this new MC control structure to EDAC's list of MCs */
1342 if (edac_mc_add_mc(mci)) { 1340 if (edac_mc_add_mc(mci)) {
1343 debugf0("MC: %s: %s(): failed edac_mc_add_mc()\n", 1341 debugf0("MC: %s(): failed edac_mc_add_mc()\n",
1344 __FILE__, __func__); 1342 __FILE__);
1345 /* FIXME: perhaps some code should go here that disables error 1343 /* FIXME: perhaps some code should go here that disables error
1346 * reporting if we just enabled it 1344 * reporting if we just enabled it
1347 */ 1345 */
@@ -1385,7 +1383,7 @@ static int __devinit i5400_init_one(struct pci_dev *pdev,
1385{ 1383{
1386 int rc; 1384 int rc;
1387 1385
1388 debugf0("MC: %s: %s()\n", __FILE__, __func__); 1386 debugf0("MC: %s()\n", __FILE__);
1389 1387
1390 /* wake up device */ 1388 /* wake up device */
1391 rc = pci_enable_device(pdev); 1389 rc = pci_enable_device(pdev);
@@ -1404,7 +1402,7 @@ static void __devexit i5400_remove_one(struct pci_dev *pdev)
1404{ 1402{
1405 struct mem_ctl_info *mci; 1403 struct mem_ctl_info *mci;
1406 1404
1407 debugf0("%s: %s()\n", __FILE__, __func__); 1405 debugf0("%s()\n", __FILE__);
1408 1406
1409 if (i5400_pci) 1407 if (i5400_pci)
1410 edac_pci_release_generic_ctl(i5400_pci); 1408 edac_pci_release_generic_ctl(i5400_pci);
@@ -1450,7 +1448,7 @@ static int __init i5400_init(void)
1450{ 1448{
1451 int pci_rc; 1449 int pci_rc;
1452 1450
1453 debugf2("MC: %s: %s()\n", __FILE__, __func__); 1451 debugf2("MC: %s()\n", __FILE__);
1454 1452
1455 /* Ensure that the OPSTATE is set correctly for POLL or NMI */ 1453 /* Ensure that the OPSTATE is set correctly for POLL or NMI */
1456 opstate_init(); 1454 opstate_init();
@@ -1466,7 +1464,7 @@ static int __init i5400_init(void)
1466 */ 1464 */
1467static void __exit i5400_exit(void) 1465static void __exit i5400_exit(void)
1468{ 1466{
1469 debugf2("MC: %s: %s()\n", __FILE__, __func__); 1467 debugf2("MC: %s()\n", __FILE__);
1470 pci_unregister_driver(&i5400_driver); 1468 pci_unregister_driver(&i5400_driver);
1471} 1469}
1472 1470
diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c
index db84456e65d9..20435ee47077 100644
--- a/drivers/edac/i7300_edac.c
+++ b/drivers/edac/i7300_edac.c
@@ -1032,8 +1032,7 @@ static int __devinit i7300_init_one(struct pci_dev *pdev,
1032 if (rc == -EIO) 1032 if (rc == -EIO)
1033 return rc; 1033 return rc;
1034 1034
1035 debugf0("MC: " __FILE__ ": %s(), pdev bus %u dev=0x%x fn=0x%x\n", 1035 debugf0("MC: pdev bus %u dev=0x%x fn=0x%x\n",
1036 __func__,
1037 pdev->bus->number, 1036 pdev->bus->number,
1038 PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn)); 1037 PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn));
1039 1038
@@ -1055,7 +1054,7 @@ static int __devinit i7300_init_one(struct pci_dev *pdev,
1055 if (mci == NULL) 1054 if (mci == NULL)
1056 return -ENOMEM; 1055 return -ENOMEM;
1057 1056
1058 debugf0("MC: " __FILE__ ": %s(): mci = %p\n", __func__, mci); 1057 debugf0("MC: mci = %p\n", mci);
1059 1058
1060 mci->pdev = &pdev->dev; /* record ptr to the generic device */ 1059 mci->pdev = &pdev->dev; /* record ptr to the generic device */
1061 1060
@@ -1099,8 +1098,7 @@ static int __devinit i7300_init_one(struct pci_dev *pdev,
1099 1098
1100 /* add this new MC control structure to EDAC's list of MCs */ 1099 /* add this new MC control structure to EDAC's list of MCs */
1101 if (edac_mc_add_mc(mci)) { 1100 if (edac_mc_add_mc(mci)) {
1102 debugf0("MC: " __FILE__ 1101 debugf0("MC: failed edac_mc_add_mc()\n");
1103 ": %s(): failed edac_mc_add_mc()\n", __func__);
1104 /* FIXME: perhaps some code should go here that disables error 1102 /* FIXME: perhaps some code should go here that disables error
1105 * reporting if we just enabled it 1103 * reporting if we just enabled it
1106 */ 1104 */
@@ -1142,7 +1140,7 @@ static void __devexit i7300_remove_one(struct pci_dev *pdev)
1142 struct mem_ctl_info *mci; 1140 struct mem_ctl_info *mci;
1143 char *tmp; 1141 char *tmp;
1144 1142
1145 debugf0(__FILE__ ": %s()\n", __func__); 1143 debugf0("\n");
1146 1144
1147 if (i7300_pci) 1145 if (i7300_pci)
1148 edac_pci_release_generic_ctl(i7300_pci); 1146 edac_pci_release_generic_ctl(i7300_pci);
@@ -1189,7 +1187,7 @@ static int __init i7300_init(void)
1189{ 1187{
1190 int pci_rc; 1188 int pci_rc;
1191 1189
1192 debugf2("MC: " __FILE__ ": %s()\n", __func__); 1190 debugf2("\n");
1193 1191
1194 /* Ensure that the OPSTATE is set correctly for POLL or NMI */ 1192 /* Ensure that the OPSTATE is set correctly for POLL or NMI */
1195 opstate_init(); 1193 opstate_init();
@@ -1204,7 +1202,7 @@ static int __init i7300_init(void)
1204 */ 1202 */
1205static void __exit i7300_exit(void) 1203static void __exit i7300_exit(void)
1206{ 1204{
1207 debugf2("MC: " __FILE__ ": %s()\n", __func__); 1205 debugf2("\n");
1208 pci_unregister_driver(&i7300_driver); 1206 pci_unregister_driver(&i7300_driver);
1209} 1207}
1210 1208
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index c29944fbb7d8..f851a433d620 100644
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -824,7 +824,7 @@ static ssize_t i7core_inject_store_##param( \
824 long value; \ 824 long value; \
825 int rc; \ 825 int rc; \
826 \ 826 \
827 debugf1("%s()\n", __func__); \ 827 debugf1("\n"); \
828 pvt = mci->pvt_info; \ 828 pvt = mci->pvt_info; \
829 \ 829 \
830 if (pvt->inject.enable) \ 830 if (pvt->inject.enable) \
@@ -852,7 +852,7 @@ static ssize_t i7core_inject_show_##param( \
852 struct i7core_pvt *pvt; \ 852 struct i7core_pvt *pvt; \
853 \ 853 \
854 pvt = mci->pvt_info; \ 854 pvt = mci->pvt_info; \
855 debugf1("%s() pvt=%p\n", __func__, pvt); \ 855 debugf1("pvt=%p\n", pvt); \
856 if (pvt->inject.param < 0) \ 856 if (pvt->inject.param < 0) \
857 return sprintf(data, "any\n"); \ 857 return sprintf(data, "any\n"); \
858 else \ 858 else \
@@ -1059,7 +1059,7 @@ static ssize_t i7core_show_counter_##param( \
1059 struct mem_ctl_info *mci = to_mci(dev); \ 1059 struct mem_ctl_info *mci = to_mci(dev); \
1060 struct i7core_pvt *pvt = mci->pvt_info; \ 1060 struct i7core_pvt *pvt = mci->pvt_info; \
1061 \ 1061 \
1062 debugf1("%s()\n", __func__); \ 1062 debugf1("\n"); \
1063 if (!pvt->ce_count_available || (pvt->is_registered)) \ 1063 if (!pvt->ce_count_available || (pvt->is_registered)) \
1064 return sprintf(data, "data unavailable\n"); \ 1064 return sprintf(data, "data unavailable\n"); \
1065 return sprintf(data, "%lu\n", \ 1065 return sprintf(data, "%lu\n", \
@@ -1190,8 +1190,7 @@ static int i7core_create_sysfs_devices(struct mem_ctl_info *mci)
1190 dev_set_name(pvt->addrmatch_dev, "inject_addrmatch"); 1190 dev_set_name(pvt->addrmatch_dev, "inject_addrmatch");
1191 dev_set_drvdata(pvt->addrmatch_dev, mci); 1191 dev_set_drvdata(pvt->addrmatch_dev, mci);
1192 1192
1193 debugf1("%s(): creating %s\n", __func__, 1193 debugf1("creating %s\n", dev_name(pvt->addrmatch_dev));
1194 dev_name(pvt->addrmatch_dev));
1195 1194
1196 rc = device_add(pvt->addrmatch_dev); 1195 rc = device_add(pvt->addrmatch_dev);
1197 if (rc < 0) 1196 if (rc < 0)
@@ -1213,8 +1212,7 @@ static int i7core_create_sysfs_devices(struct mem_ctl_info *mci)
1213 dev_set_name(pvt->chancounts_dev, "all_channel_counts"); 1212 dev_set_name(pvt->chancounts_dev, "all_channel_counts");
1214 dev_set_drvdata(pvt->chancounts_dev, mci); 1213 dev_set_drvdata(pvt->chancounts_dev, mci);
1215 1214
1216 debugf1("%s(): creating %s\n", __func__, 1215 debugf1("creating %s\n", dev_name(pvt->chancounts_dev));
1217 dev_name(pvt->chancounts_dev));
1218 1216
1219 rc = device_add(pvt->chancounts_dev); 1217 rc = device_add(pvt->chancounts_dev);
1220 if (rc < 0) 1218 if (rc < 0)
@@ -1254,7 +1252,7 @@ static void i7core_put_devices(struct i7core_dev *i7core_dev)
1254{ 1252{
1255 int i; 1253 int i;
1256 1254
1257 debugf0(__FILE__ ": %s()\n", __func__); 1255 debugf0("\n");
1258 for (i = 0; i < i7core_dev->n_devs; i++) { 1256 for (i = 0; i < i7core_dev->n_devs; i++) {
1259 struct pci_dev *pdev = i7core_dev->pdev[i]; 1257 struct pci_dev *pdev = i7core_dev->pdev[i];
1260 if (!pdev) 1258 if (!pdev)
@@ -1652,7 +1650,7 @@ static void i7core_udimm_check_mc_ecc_err(struct mem_ctl_info *mci)
1652 int new0, new1, new2; 1650 int new0, new1, new2;
1653 1651
1654 if (!pvt->pci_mcr[4]) { 1652 if (!pvt->pci_mcr[4]) {
1655 debugf0("%s MCR registers not found\n", __func__); 1653 debugf0("MCR registers not found\n");
1656 return; 1654 return;
1657 } 1655 }
1658 1656
@@ -2190,8 +2188,7 @@ static void i7core_unregister_mci(struct i7core_dev *i7core_dev)
2190 struct i7core_pvt *pvt; 2188 struct i7core_pvt *pvt;
2191 2189
2192 if (unlikely(!mci || !mci->pvt_info)) { 2190 if (unlikely(!mci || !mci->pvt_info)) {
2193 debugf0("MC: " __FILE__ ": %s(): dev = %p\n", 2191 debugf0("MC: dev = %p\n", &i7core_dev->pdev[0]->dev);
2194 __func__, &i7core_dev->pdev[0]->dev);
2195 2192
2196 i7core_printk(KERN_ERR, "Couldn't find mci handler\n"); 2193 i7core_printk(KERN_ERR, "Couldn't find mci handler\n");
2197 return; 2194 return;
@@ -2199,8 +2196,7 @@ static void i7core_unregister_mci(struct i7core_dev *i7core_dev)
2199 2196
2200 pvt = mci->pvt_info; 2197 pvt = mci->pvt_info;
2201 2198
2202 debugf0("MC: " __FILE__ ": %s(): mci = %p, dev = %p\n", 2199 debugf0("MC: mci = %p, dev = %p\n", mci, &i7core_dev->pdev[0]->dev);
2203 __func__, mci, &i7core_dev->pdev[0]->dev);
2204 2200
2205 /* Disable scrubrate setting */ 2201 /* Disable scrubrate setting */
2206 if (pvt->enable_scrub) 2202 if (pvt->enable_scrub)
@@ -2241,8 +2237,7 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev)
2241 if (unlikely(!mci)) 2237 if (unlikely(!mci))
2242 return -ENOMEM; 2238 return -ENOMEM;
2243 2239
2244 debugf0("MC: " __FILE__ ": %s(): mci = %p, dev = %p\n", 2240 debugf0("MC: mci = %p, dev = %p\n", mci, &i7core_dev->pdev[0]->dev);
2245 __func__, mci, &i7core_dev->pdev[0]->dev);
2246 2241
2247 pvt = mci->pvt_info; 2242 pvt = mci->pvt_info;
2248 memset(pvt, 0, sizeof(*pvt)); 2243 memset(pvt, 0, sizeof(*pvt));
@@ -2285,8 +2280,7 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev)
2285 2280
2286 /* add this new MC control structure to EDAC's list of MCs */ 2281 /* add this new MC control structure to EDAC's list of MCs */
2287 if (unlikely(edac_mc_add_mc(mci))) { 2282 if (unlikely(edac_mc_add_mc(mci))) {
2288 debugf0("MC: " __FILE__ 2283 debugf0("MC: failed edac_mc_add_mc()\n");
2289 ": %s(): failed edac_mc_add_mc()\n", __func__);
2290 /* FIXME: perhaps some code should go here that disables error 2284 /* FIXME: perhaps some code should go here that disables error
2291 * reporting if we just enabled it 2285 * reporting if we just enabled it
2292 */ 2286 */
@@ -2295,8 +2289,7 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev)
2295 goto fail0; 2289 goto fail0;
2296 } 2290 }
2297 if (i7core_create_sysfs_devices(mci)) { 2291 if (i7core_create_sysfs_devices(mci)) {
2298 debugf0("MC: " __FILE__ 2292 debugf0("MC: failed to create sysfs nodes\n");
2299 ": %s(): failed to create sysfs nodes\n", __func__);
2300 edac_mc_del_mc(mci->pdev); 2293 edac_mc_del_mc(mci->pdev);
2301 rc = -EINVAL; 2294 rc = -EINVAL;
2302 goto fail0; 2295 goto fail0;
@@ -2402,7 +2395,7 @@ static void __devexit i7core_remove(struct pci_dev *pdev)
2402{ 2395{
2403 struct i7core_dev *i7core_dev; 2396 struct i7core_dev *i7core_dev;
2404 2397
2405 debugf0(__FILE__ ": %s()\n", __func__); 2398 debugf0("\n");
2406 2399
2407 /* 2400 /*
2408 * we have a trouble here: pdev value for removal will be wrong, since 2401 * we have a trouble here: pdev value for removal will be wrong, since
@@ -2451,7 +2444,7 @@ static int __init i7core_init(void)
2451{ 2444{
2452 int pci_rc; 2445 int pci_rc;
2453 2446
2454 debugf2("MC: " __FILE__ ": %s()\n", __func__); 2447 debugf2("\n");
2455 2448
2456 /* Ensure that the OPSTATE is set correctly for POLL or NMI */ 2449 /* Ensure that the OPSTATE is set correctly for POLL or NMI */
2457 opstate_init(); 2450 opstate_init();
@@ -2476,7 +2469,7 @@ static int __init i7core_init(void)
2476 */ 2469 */
2477static void __exit i7core_exit(void) 2470static void __exit i7core_exit(void)
2478{ 2471{
2479 debugf2("MC: " __FILE__ ": %s()\n", __func__); 2472 debugf2("\n");
2480 pci_unregister_driver(&i7core_driver); 2473 pci_unregister_driver(&i7core_driver);
2481} 2474}
2482 2475
diff --git a/drivers/edac/i82443bxgx_edac.c b/drivers/edac/i82443bxgx_edac.c
index 0f2751bf3ffe..c43214fdf2d8 100644
--- a/drivers/edac/i82443bxgx_edac.c
+++ b/drivers/edac/i82443bxgx_edac.c
@@ -178,7 +178,7 @@ static void i82443bxgx_edacmc_check(struct mem_ctl_info *mci)
178{ 178{
179 struct i82443bxgx_edacmc_error_info info; 179 struct i82443bxgx_edacmc_error_info info;
180 180
181 debugf1("MC%d: %s: %s()\n", mci->mc_idx, __FILE__, __func__); 181 debugf1("MC%d\n", mci->mc_idx);
182 i82443bxgx_edacmc_get_error_info(mci, &info); 182 i82443bxgx_edacmc_get_error_info(mci, &info);
183 i82443bxgx_edacmc_process_error_info(mci, &info, 1); 183 i82443bxgx_edacmc_process_error_info(mci, &info, 1);
184} 184}
@@ -201,13 +201,13 @@ static void i82443bxgx_init_csrows(struct mem_ctl_info *mci,
201 dimm = csrow->channels[0]->dimm; 201 dimm = csrow->channels[0]->dimm;
202 202
203 pci_read_config_byte(pdev, I82443BXGX_DRB + index, &drbar); 203 pci_read_config_byte(pdev, I82443BXGX_DRB + index, &drbar);
204 debugf1("MC%d: %s: %s() Row=%d DRB = %#0x\n", 204 debugf1("MC%d: Row=%d DRB = %#0x\n",
205 mci->mc_idx, __FILE__, __func__, index, drbar); 205 mci->mc_idx,index, drbar);
206 row_high_limit = ((u32) drbar << 23); 206 row_high_limit = ((u32) drbar << 23);
207 /* find the DRAM Chip Select Base address and mask */ 207 /* find the DRAM Chip Select Base address and mask */
208 debugf1("MC%d: %s: %s() Row=%d, " 208 debugf1("MC%d: Row=%d, "
209 "Boundary Address=%#0x, Last = %#0x\n", 209 "Boundary Address=%#0x, Last = %#0x\n",
210 mci->mc_idx, __FILE__, __func__, index, row_high_limit, 210 mci->mc_idx, index, row_high_limit,
211 row_high_limit_last); 211 row_high_limit_last);
212 212
213 /* 440GX goes to 2GB, represented with a DRB of 0. */ 213 /* 440GX goes to 2GB, represented with a DRB of 0. */
@@ -241,7 +241,7 @@ static int i82443bxgx_edacmc_probe1(struct pci_dev *pdev, int dev_idx)
241 enum mem_type mtype; 241 enum mem_type mtype;
242 enum edac_type edac_mode; 242 enum edac_type edac_mode;
243 243
244 debugf0("MC: %s: %s()\n", __FILE__, __func__); 244 debugf0("MC: %s()\n", __FILE__);
245 245
246 /* Something is really hosed if PCI config space reads from 246 /* Something is really hosed if PCI config space reads from
247 * the MC aren't working. 247 * the MC aren't working.
@@ -259,7 +259,7 @@ static int i82443bxgx_edacmc_probe1(struct pci_dev *pdev, int dev_idx)
259 if (mci == NULL) 259 if (mci == NULL)
260 return -ENOMEM; 260 return -ENOMEM;
261 261
262 debugf0("MC: %s: %s(): mci = %p\n", __FILE__, __func__, mci); 262 debugf0("MC: %s(): mci = %p\n", __FILE__, mci);
263 mci->pdev = &pdev->dev; 263 mci->pdev = &pdev->dev;
264 mci->mtype_cap = MEM_FLAG_EDO | MEM_FLAG_SDR | MEM_FLAG_RDR; 264 mci->mtype_cap = MEM_FLAG_EDO | MEM_FLAG_SDR | MEM_FLAG_RDR;
265 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED; 265 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;
@@ -305,8 +305,8 @@ static int i82443bxgx_edacmc_probe1(struct pci_dev *pdev, int dev_idx)
305 edac_mode = EDAC_SECDED; 305 edac_mode = EDAC_SECDED;
306 break; 306 break;
307 default: 307 default:
308 debugf0("%s(): Unknown/reserved ECC state " 308 debugf0("Unknown/reserved ECC state "
309 "in NBXCFG register!\n", __func__); 309 "in NBXCFG register!\n");
310 edac_mode = EDAC_UNKNOWN; 310 edac_mode = EDAC_UNKNOWN;
311 break; 311 break;
312 } 312 }
@@ -330,7 +330,7 @@ static int i82443bxgx_edacmc_probe1(struct pci_dev *pdev, int dev_idx)
330 mci->ctl_page_to_phys = NULL; 330 mci->ctl_page_to_phys = NULL;
331 331
332 if (edac_mc_add_mc(mci)) { 332 if (edac_mc_add_mc(mci)) {
333 debugf3("%s(): failed edac_mc_add_mc()\n", __func__); 333 debugf3("failed edac_mc_add_mc()\n");
334 goto fail; 334 goto fail;
335 } 335 }
336 336
@@ -345,7 +345,7 @@ static int i82443bxgx_edacmc_probe1(struct pci_dev *pdev, int dev_idx)
345 __func__); 345 __func__);
346 } 346 }
347 347
348 debugf3("MC: %s: %s(): success\n", __FILE__, __func__); 348 debugf3("MC: %s(): success\n", __FILE__);
349 return 0; 349 return 0;
350 350
351fail: 351fail:
@@ -361,7 +361,7 @@ static int __devinit i82443bxgx_edacmc_init_one(struct pci_dev *pdev,
361{ 361{
362 int rc; 362 int rc;
363 363
364 debugf0("MC: %s: %s()\n", __FILE__, __func__); 364 debugf0("MC: %s()\n", __FILE__);
365 365
366 /* don't need to call pci_enable_device() */ 366 /* don't need to call pci_enable_device() */
367 rc = i82443bxgx_edacmc_probe1(pdev, ent->driver_data); 367 rc = i82443bxgx_edacmc_probe1(pdev, ent->driver_data);
@@ -376,7 +376,7 @@ static void __devexit i82443bxgx_edacmc_remove_one(struct pci_dev *pdev)
376{ 376{
377 struct mem_ctl_info *mci; 377 struct mem_ctl_info *mci;
378 378
379 debugf0("%s: %s()\n", __FILE__, __func__); 379 debugf0("%s()\n", __FILE__);
380 380
381 if (i82443bxgx_pci) 381 if (i82443bxgx_pci)
382 edac_pci_release_generic_ctl(i82443bxgx_pci); 382 edac_pci_release_generic_ctl(i82443bxgx_pci);
diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c
index 06a3c8d26d19..d4ec21db22ba 100644
--- a/drivers/edac/i82860_edac.c
+++ b/drivers/edac/i82860_edac.c
@@ -136,7 +136,7 @@ static void i82860_check(struct mem_ctl_info *mci)
136{ 136{
137 struct i82860_error_info info; 137 struct i82860_error_info info;
138 138
139 debugf1("MC%d: %s()\n", mci->mc_idx, __func__); 139 debugf1("MC%d\n", mci->mc_idx);
140 i82860_get_error_info(mci, &info); 140 i82860_get_error_info(mci, &info);
141 i82860_process_error_info(mci, &info, 1); 141 i82860_process_error_info(mci, &info, 1);
142} 142}
@@ -167,7 +167,7 @@ static void i82860_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev)
167 pci_read_config_word(pdev, I82860_GBA + index * 2, &value); 167 pci_read_config_word(pdev, I82860_GBA + index * 2, &value);
168 cumul_size = (value & I82860_GBA_MASK) << 168 cumul_size = (value & I82860_GBA_MASK) <<
169 (I82860_GBA_SHIFT - PAGE_SHIFT); 169 (I82860_GBA_SHIFT - PAGE_SHIFT);
170 debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index, 170 debugf3("(%d) cumul_size 0x%x\n", index,
171 cumul_size); 171 cumul_size);
172 172
173 if (cumul_size == last_cumul_size) 173 if (cumul_size == last_cumul_size)
@@ -210,7 +210,7 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx)
210 if (!mci) 210 if (!mci)
211 return -ENOMEM; 211 return -ENOMEM;
212 212
213 debugf3("%s(): init mci\n", __func__); 213 debugf3("init mci\n");
214 mci->pdev = &pdev->dev; 214 mci->pdev = &pdev->dev;
215 mci->mtype_cap = MEM_FLAG_DDR; 215 mci->mtype_cap = MEM_FLAG_DDR;
216 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; 216 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;
@@ -229,7 +229,7 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx)
229 * type of memory controller. The ID is therefore hardcoded to 0. 229 * type of memory controller. The ID is therefore hardcoded to 0.
230 */ 230 */
231 if (edac_mc_add_mc(mci)) { 231 if (edac_mc_add_mc(mci)) {
232 debugf3("%s(): failed edac_mc_add_mc()\n", __func__); 232 debugf3("failed edac_mc_add_mc()\n");
233 goto fail; 233 goto fail;
234 } 234 }
235 235
@@ -245,7 +245,7 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx)
245 } 245 }
246 246
247 /* get this far and it's successful */ 247 /* get this far and it's successful */
248 debugf3("%s(): success\n", __func__); 248 debugf3("success\n");
249 249
250 return 0; 250 return 0;
251 251
@@ -260,7 +260,7 @@ static int __devinit i82860_init_one(struct pci_dev *pdev,
260{ 260{
261 int rc; 261 int rc;
262 262
263 debugf0("%s()\n", __func__); 263 debugf0("\n");
264 i82860_printk(KERN_INFO, "i82860 init one\n"); 264 i82860_printk(KERN_INFO, "i82860 init one\n");
265 265
266 if (pci_enable_device(pdev) < 0) 266 if (pci_enable_device(pdev) < 0)
@@ -278,7 +278,7 @@ static void __devexit i82860_remove_one(struct pci_dev *pdev)
278{ 278{
279 struct mem_ctl_info *mci; 279 struct mem_ctl_info *mci;
280 280
281 debugf0("%s()\n", __func__); 281 debugf0("\n");
282 282
283 if (i82860_pci) 283 if (i82860_pci)
284 edac_pci_release_generic_ctl(i82860_pci); 284 edac_pci_release_generic_ctl(i82860_pci);
@@ -311,7 +311,7 @@ static int __init i82860_init(void)
311{ 311{
312 int pci_rc; 312 int pci_rc;
313 313
314 debugf3("%s()\n", __func__); 314 debugf3("\n");
315 315
316 /* Ensure that the OPSTATE is set correctly for POLL or NMI */ 316 /* Ensure that the OPSTATE is set correctly for POLL or NMI */
317 opstate_init(); 317 opstate_init();
@@ -352,7 +352,7 @@ fail0:
352 352
353static void __exit i82860_exit(void) 353static void __exit i82860_exit(void)
354{ 354{
355 debugf3("%s()\n", __func__); 355 debugf3("\n");
356 356
357 pci_unregister_driver(&i82860_driver); 357 pci_unregister_driver(&i82860_driver);
358 358
diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
index 97fd6b769c84..4ded498047f7 100644
--- a/drivers/edac/i82875p_edac.c
+++ b/drivers/edac/i82875p_edac.c
@@ -263,7 +263,7 @@ static void i82875p_check(struct mem_ctl_info *mci)
263{ 263{
264 struct i82875p_error_info info; 264 struct i82875p_error_info info;
265 265
266 debugf1("MC%d: %s()\n", mci->mc_idx, __func__); 266 debugf1("MC%d\n", mci->mc_idx);
267 i82875p_get_error_info(mci, &info); 267 i82875p_get_error_info(mci, &info);
268 i82875p_process_error_info(mci, &info, 1); 268 i82875p_process_error_info(mci, &info, 1);
269} 269}
@@ -371,7 +371,7 @@ static void i82875p_init_csrows(struct mem_ctl_info *mci,
371 371
372 value = readb(ovrfl_window + I82875P_DRB + index); 372 value = readb(ovrfl_window + I82875P_DRB + index);
373 cumul_size = value << (I82875P_DRB_SHIFT - PAGE_SHIFT); 373 cumul_size = value << (I82875P_DRB_SHIFT - PAGE_SHIFT);
374 debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index, 374 debugf3("(%d) cumul_size 0x%x\n", index,
375 cumul_size); 375 cumul_size);
376 if (cumul_size == last_cumul_size) 376 if (cumul_size == last_cumul_size)
377 continue; /* not populated */ 377 continue; /* not populated */
@@ -405,7 +405,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
405 u32 nr_chans; 405 u32 nr_chans;
406 struct i82875p_error_info discard; 406 struct i82875p_error_info discard;
407 407
408 debugf0("%s()\n", __func__); 408 debugf0("\n");
409 409
410 ovrfl_pdev = pci_get_device(PCI_VEND_DEV(INTEL, 82875_6), NULL); 410 ovrfl_pdev = pci_get_device(PCI_VEND_DEV(INTEL, 82875_6), NULL);
411 411
@@ -426,7 +426,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
426 goto fail0; 426 goto fail0;
427 } 427 }
428 428
429 debugf3("%s(): init mci\n", __func__); 429 debugf3("init mci\n");
430 mci->pdev = &pdev->dev; 430 mci->pdev = &pdev->dev;
431 mci->mtype_cap = MEM_FLAG_DDR; 431 mci->mtype_cap = MEM_FLAG_DDR;
432 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; 432 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;
@@ -437,7 +437,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
437 mci->dev_name = pci_name(pdev); 437 mci->dev_name = pci_name(pdev);
438 mci->edac_check = i82875p_check; 438 mci->edac_check = i82875p_check;
439 mci->ctl_page_to_phys = NULL; 439 mci->ctl_page_to_phys = NULL;
440 debugf3("%s(): init pvt\n", __func__); 440 debugf3("init pvt\n");
441 pvt = (struct i82875p_pvt *)mci->pvt_info; 441 pvt = (struct i82875p_pvt *)mci->pvt_info;
442 pvt->ovrfl_pdev = ovrfl_pdev; 442 pvt->ovrfl_pdev = ovrfl_pdev;
443 pvt->ovrfl_window = ovrfl_window; 443 pvt->ovrfl_window = ovrfl_window;
@@ -448,7 +448,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
448 * type of memory controller. The ID is therefore hardcoded to 0. 448 * type of memory controller. The ID is therefore hardcoded to 0.
449 */ 449 */
450 if (edac_mc_add_mc(mci)) { 450 if (edac_mc_add_mc(mci)) {
451 debugf3("%s(): failed edac_mc_add_mc()\n", __func__); 451 debugf3("failed edac_mc_add_mc()\n");
452 goto fail1; 452 goto fail1;
453 } 453 }
454 454
@@ -464,7 +464,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
464 } 464 }
465 465
466 /* get this far and it's successful */ 466 /* get this far and it's successful */
467 debugf3("%s(): success\n", __func__); 467 debugf3("success\n");
468 return 0; 468 return 0;
469 469
470fail1: 470fail1:
@@ -485,7 +485,7 @@ static int __devinit i82875p_init_one(struct pci_dev *pdev,
485{ 485{
486 int rc; 486 int rc;
487 487
488 debugf0("%s()\n", __func__); 488 debugf0("\n");
489 i82875p_printk(KERN_INFO, "i82875p init one\n"); 489 i82875p_printk(KERN_INFO, "i82875p init one\n");
490 490
491 if (pci_enable_device(pdev) < 0) 491 if (pci_enable_device(pdev) < 0)
@@ -504,7 +504,7 @@ static void __devexit i82875p_remove_one(struct pci_dev *pdev)
504 struct mem_ctl_info *mci; 504 struct mem_ctl_info *mci;
505 struct i82875p_pvt *pvt = NULL; 505 struct i82875p_pvt *pvt = NULL;
506 506
507 debugf0("%s()\n", __func__); 507 debugf0("\n");
508 508
509 if (i82875p_pci) 509 if (i82875p_pci)
510 edac_pci_release_generic_ctl(i82875p_pci); 510 edac_pci_release_generic_ctl(i82875p_pci);
@@ -550,7 +550,7 @@ static int __init i82875p_init(void)
550{ 550{
551 int pci_rc; 551 int pci_rc;
552 552
553 debugf3("%s()\n", __func__); 553 debugf3("\n");
554 554
555 /* Ensure that the OPSTATE is set correctly for POLL or NMI */ 555 /* Ensure that the OPSTATE is set correctly for POLL or NMI */
556 opstate_init(); 556 opstate_init();
@@ -593,7 +593,7 @@ fail0:
593 593
594static void __exit i82875p_exit(void) 594static void __exit i82875p_exit(void)
595{ 595{
596 debugf3("%s()\n", __func__); 596 debugf3("\n");
597 597
598 i82875p_remove_one(mci_pdev); 598 i82875p_remove_one(mci_pdev);
599 pci_dev_put(mci_pdev); 599 pci_dev_put(mci_pdev);
diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c
index 4d239ab31e34..91b9e33fff27 100644
--- a/drivers/edac/i82975x_edac.c
+++ b/drivers/edac/i82975x_edac.c
@@ -331,7 +331,7 @@ static void i82975x_check(struct mem_ctl_info *mci)
331{ 331{
332 struct i82975x_error_info info; 332 struct i82975x_error_info info;
333 333
334 debugf1("MC%d: %s()\n", mci->mc_idx, __func__); 334 debugf1("MC%d\n", mci->mc_idx);
335 i82975x_get_error_info(mci, &info); 335 i82975x_get_error_info(mci, &info);
336 i82975x_process_error_info(mci, &info, 1); 336 i82975x_process_error_info(mci, &info, 1);
337} 337}
@@ -406,7 +406,7 @@ static void i82975x_init_csrows(struct mem_ctl_info *mci,
406 */ 406 */
407 if (csrow->nr_channels > 1) 407 if (csrow->nr_channels > 1)
408 cumul_size <<= 1; 408 cumul_size <<= 1;
409 debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index, 409 debugf3("(%d) cumul_size 0x%x\n", index,
410 cumul_size); 410 cumul_size);
411 411
412 nr_pages = cumul_size - last_cumul_size; 412 nr_pages = cumul_size - last_cumul_size;
@@ -489,11 +489,11 @@ static int i82975x_probe1(struct pci_dev *pdev, int dev_idx)
489 u8 c1drb[4]; 489 u8 c1drb[4];
490#endif 490#endif
491 491
492 debugf0("%s()\n", __func__); 492 debugf0("\n");
493 493
494 pci_read_config_dword(pdev, I82975X_MCHBAR, &mchbar); 494 pci_read_config_dword(pdev, I82975X_MCHBAR, &mchbar);
495 if (!(mchbar & 1)) { 495 if (!(mchbar & 1)) {
496 debugf3("%s(): failed, MCHBAR disabled!\n", __func__); 496 debugf3("failed, MCHBAR disabled!\n");
497 goto fail0; 497 goto fail0;
498 } 498 }
499 mchbar &= 0xffffc000; /* bits 31:14 used for 16K window */ 499 mchbar &= 0xffffc000; /* bits 31:14 used for 16K window */
@@ -558,7 +558,7 @@ static int i82975x_probe1(struct pci_dev *pdev, int dev_idx)
558 goto fail1; 558 goto fail1;
559 } 559 }
560 560
561 debugf3("%s(): init mci\n", __func__); 561 debugf3("init mci\n");
562 mci->pdev = &pdev->dev; 562 mci->pdev = &pdev->dev;
563 mci->mtype_cap = MEM_FLAG_DDR2; 563 mci->mtype_cap = MEM_FLAG_DDR2;
564 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; 564 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;
@@ -569,7 +569,7 @@ static int i82975x_probe1(struct pci_dev *pdev, int dev_idx)
569 mci->dev_name = pci_name(pdev); 569 mci->dev_name = pci_name(pdev);
570 mci->edac_check = i82975x_check; 570 mci->edac_check = i82975x_check;
571 mci->ctl_page_to_phys = NULL; 571 mci->ctl_page_to_phys = NULL;
572 debugf3("%s(): init pvt\n", __func__); 572 debugf3("init pvt\n");
573 pvt = (struct i82975x_pvt *) mci->pvt_info; 573 pvt = (struct i82975x_pvt *) mci->pvt_info;
574 pvt->mch_window = mch_window; 574 pvt->mch_window = mch_window;
575 i82975x_init_csrows(mci, pdev, mch_window); 575 i82975x_init_csrows(mci, pdev, mch_window);
@@ -578,12 +578,12 @@ static int i82975x_probe1(struct pci_dev *pdev, int dev_idx)
578 578
579 /* finalize this instance of memory controller with edac core */ 579 /* finalize this instance of memory controller with edac core */
580 if (edac_mc_add_mc(mci)) { 580 if (edac_mc_add_mc(mci)) {
581 debugf3("%s(): failed edac_mc_add_mc()\n", __func__); 581 debugf3("failed edac_mc_add_mc()\n");
582 goto fail2; 582 goto fail2;
583 } 583 }
584 584
585 /* get this far and it's successful */ 585 /* get this far and it's successful */
586 debugf3("%s(): success\n", __func__); 586 debugf3("success\n");
587 return 0; 587 return 0;
588 588
589fail2: 589fail2:
@@ -601,7 +601,7 @@ static int __devinit i82975x_init_one(struct pci_dev *pdev,
601{ 601{
602 int rc; 602 int rc;
603 603
604 debugf0("%s()\n", __func__); 604 debugf0("\n");
605 605
606 if (pci_enable_device(pdev) < 0) 606 if (pci_enable_device(pdev) < 0)
607 return -EIO; 607 return -EIO;
@@ -619,7 +619,7 @@ static void __devexit i82975x_remove_one(struct pci_dev *pdev)
619 struct mem_ctl_info *mci; 619 struct mem_ctl_info *mci;
620 struct i82975x_pvt *pvt; 620 struct i82975x_pvt *pvt;
621 621
622 debugf0("%s()\n", __func__); 622 debugf0("\n");
623 623
624 mci = edac_mc_del_mc(&pdev->dev); 624 mci = edac_mc_del_mc(&pdev->dev);
625 if (mci == NULL) 625 if (mci == NULL)
@@ -655,7 +655,7 @@ static int __init i82975x_init(void)
655{ 655{
656 int pci_rc; 656 int pci_rc;
657 657
658 debugf3("%s()\n", __func__); 658 debugf3("\n");
659 659
660 /* Ensure that the OPSTATE is set correctly for POLL or NMI */ 660 /* Ensure that the OPSTATE is set correctly for POLL or NMI */
661 opstate_init(); 661 opstate_init();
@@ -697,7 +697,7 @@ fail0:
697 697
698static void __exit i82975x_exit(void) 698static void __exit i82975x_exit(void)
699{ 699{
700 debugf3("%s()\n", __func__); 700 debugf3("\n");
701 701
702 pci_unregister_driver(&i82975x_driver); 702 pci_unregister_driver(&i82975x_driver);
703 703
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);
diff --git a/drivers/edac/mv64x60_edac.c b/drivers/edac/mv64x60_edac.c
index 3a58ba9158db..25851ef56b5b 100644
--- a/drivers/edac/mv64x60_edac.c
+++ b/drivers/edac/mv64x60_edac.c
@@ -169,7 +169,7 @@ static int __devinit mv64x60_pci_err_probe(struct platform_device *pdev)
169 MV64X60_PCIx_ERR_MASK_VAL); 169 MV64X60_PCIx_ERR_MASK_VAL);
170 170
171 if (edac_pci_add_device(pci, pdata->edac_idx) > 0) { 171 if (edac_pci_add_device(pci, pdata->edac_idx) > 0) {
172 debugf3("%s(): failed edac_pci_add_device()\n", __func__); 172 debugf3("failed edac_pci_add_device()\n");
173 goto err; 173 goto err;
174 } 174 }
175 175
@@ -194,7 +194,7 @@ static int __devinit mv64x60_pci_err_probe(struct platform_device *pdev)
194 devres_remove_group(&pdev->dev, mv64x60_pci_err_probe); 194 devres_remove_group(&pdev->dev, mv64x60_pci_err_probe);
195 195
196 /* get this far and it's successful */ 196 /* get this far and it's successful */
197 debugf3("%s(): success\n", __func__); 197 debugf3("success\n");
198 198
199 return 0; 199 return 0;
200 200
@@ -210,7 +210,7 @@ static int mv64x60_pci_err_remove(struct platform_device *pdev)
210{ 210{
211 struct edac_pci_ctl_info *pci = platform_get_drvdata(pdev); 211 struct edac_pci_ctl_info *pci = platform_get_drvdata(pdev);
212 212
213 debugf0("%s()\n", __func__); 213 debugf0("\n");
214 214
215 edac_pci_del_device(&pdev->dev); 215 edac_pci_del_device(&pdev->dev);
216 216
@@ -336,7 +336,7 @@ static int __devinit mv64x60_sram_err_probe(struct platform_device *pdev)
336 pdata->edac_idx = edac_dev_idx++; 336 pdata->edac_idx = edac_dev_idx++;
337 337
338 if (edac_device_add_device(edac_dev) > 0) { 338 if (edac_device_add_device(edac_dev) > 0) {
339 debugf3("%s(): failed edac_device_add_device()\n", __func__); 339 debugf3("failed edac_device_add_device()\n");
340 goto err; 340 goto err;
341 } 341 }
342 342
@@ -363,7 +363,7 @@ static int __devinit mv64x60_sram_err_probe(struct platform_device *pdev)
363 devres_remove_group(&pdev->dev, mv64x60_sram_err_probe); 363 devres_remove_group(&pdev->dev, mv64x60_sram_err_probe);
364 364
365 /* get this far and it's successful */ 365 /* get this far and it's successful */
366 debugf3("%s(): success\n", __func__); 366 debugf3("success\n");
367 367
368 return 0; 368 return 0;
369 369
@@ -379,7 +379,7 @@ static int mv64x60_sram_err_remove(struct platform_device *pdev)
379{ 379{
380 struct edac_device_ctl_info *edac_dev = platform_get_drvdata(pdev); 380 struct edac_device_ctl_info *edac_dev = platform_get_drvdata(pdev);
381 381
382 debugf0("%s()\n", __func__); 382 debugf0("\n");
383 383
384 edac_device_del_device(&pdev->dev); 384 edac_device_del_device(&pdev->dev);
385 edac_device_free_ctl_info(edac_dev); 385 edac_device_free_ctl_info(edac_dev);
@@ -531,7 +531,7 @@ static int __devinit mv64x60_cpu_err_probe(struct platform_device *pdev)
531 pdata->edac_idx = edac_dev_idx++; 531 pdata->edac_idx = edac_dev_idx++;
532 532
533 if (edac_device_add_device(edac_dev) > 0) { 533 if (edac_device_add_device(edac_dev) > 0) {
534 debugf3("%s(): failed edac_device_add_device()\n", __func__); 534 debugf3("failed edac_device_add_device()\n");
535 goto err; 535 goto err;
536 } 536 }
537 537
@@ -558,7 +558,7 @@ static int __devinit mv64x60_cpu_err_probe(struct platform_device *pdev)
558 devres_remove_group(&pdev->dev, mv64x60_cpu_err_probe); 558 devres_remove_group(&pdev->dev, mv64x60_cpu_err_probe);
559 559
560 /* get this far and it's successful */ 560 /* get this far and it's successful */
561 debugf3("%s(): success\n", __func__); 561 debugf3("success\n");
562 562
563 return 0; 563 return 0;
564 564
@@ -574,7 +574,7 @@ static int mv64x60_cpu_err_remove(struct platform_device *pdev)
574{ 574{
575 struct edac_device_ctl_info *edac_dev = platform_get_drvdata(pdev); 575 struct edac_device_ctl_info *edac_dev = platform_get_drvdata(pdev);
576 576
577 debugf0("%s()\n", __func__); 577 debugf0("\n");
578 578
579 edac_device_del_device(&pdev->dev); 579 edac_device_del_device(&pdev->dev);
580 edac_device_free_ctl_info(edac_dev); 580 edac_device_free_ctl_info(edac_dev);
@@ -766,7 +766,7 @@ static int __devinit mv64x60_mc_err_probe(struct platform_device *pdev)
766 goto err2; 766 goto err2;
767 } 767 }
768 768
769 debugf3("%s(): init mci\n", __func__); 769 debugf3("init mci\n");
770 mci->mtype_cap = MEM_FLAG_RDDR | MEM_FLAG_DDR; 770 mci->mtype_cap = MEM_FLAG_RDDR | MEM_FLAG_DDR;
771 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; 771 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;
772 mci->edac_cap = EDAC_FLAG_SECDED; 772 mci->edac_cap = EDAC_FLAG_SECDED;
@@ -790,7 +790,7 @@ static int __devinit mv64x60_mc_err_probe(struct platform_device *pdev)
790 out_le32(pdata->mc_vbase + MV64X60_SDRAM_ERR_ECC_CNTL, ctl); 790 out_le32(pdata->mc_vbase + MV64X60_SDRAM_ERR_ECC_CNTL, ctl);
791 791
792 if (edac_mc_add_mc(mci)) { 792 if (edac_mc_add_mc(mci)) {
793 debugf3("%s(): failed edac_mc_add_mc()\n", __func__); 793 debugf3("failed edac_mc_add_mc()\n");
794 goto err; 794 goto err;
795 } 795 }
796 796
@@ -815,7 +815,7 @@ static int __devinit mv64x60_mc_err_probe(struct platform_device *pdev)
815 } 815 }
816 816
817 /* get this far and it's successful */ 817 /* get this far and it's successful */
818 debugf3("%s(): success\n", __func__); 818 debugf3("success\n");
819 819
820 return 0; 820 return 0;
821 821
@@ -831,7 +831,7 @@ static int mv64x60_mc_err_remove(struct platform_device *pdev)
831{ 831{
832 struct mem_ctl_info *mci = platform_get_drvdata(pdev); 832 struct mem_ctl_info *mci = platform_get_drvdata(pdev);
833 833
834 debugf0("%s()\n", __func__); 834 debugf0("\n");
835 835
836 edac_mc_del_mc(&pdev->dev); 836 edac_mc_del_mc(&pdev->dev);
837 edac_mc_free(mci); 837 edac_mc_free(mci);
diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c
index 445c9ff27b88..872c3b928035 100644
--- a/drivers/edac/r82600_edac.c
+++ b/drivers/edac/r82600_edac.c
@@ -205,7 +205,7 @@ static void r82600_check(struct mem_ctl_info *mci)
205{ 205{
206 struct r82600_error_info info; 206 struct r82600_error_info info;
207 207
208 debugf1("MC%d: %s()\n", mci->mc_idx, __func__); 208 debugf1("MC%d\n", mci->mc_idx);
209 r82600_get_error_info(mci, &info); 209 r82600_get_error_info(mci, &info);
210 r82600_process_error_info(mci, &info, 1); 210 r82600_process_error_info(mci, &info, 1);
211} 211}
@@ -236,13 +236,13 @@ static void r82600_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev,
236 /* find the DRAM Chip Select Base address and mask */ 236 /* find the DRAM Chip Select Base address and mask */
237 pci_read_config_byte(pdev, R82600_DRBA + index, &drbar); 237 pci_read_config_byte(pdev, R82600_DRBA + index, &drbar);
238 238
239 debugf1("%s() Row=%d DRBA = %#0x\n", __func__, index, drbar); 239 debugf1("Row=%d DRBA = %#0x\n", index, drbar);
240 240
241 row_high_limit = ((u32) drbar << 24); 241 row_high_limit = ((u32) drbar << 24);
242/* row_high_limit = ((u32)drbar << 24) | 0xffffffUL; */ 242/* row_high_limit = ((u32)drbar << 24) | 0xffffffUL; */
243 243
244 debugf1("%s() Row=%d, Boundary Address=%#0x, Last = %#0x\n", 244 debugf1("Row=%d, Boundary Address=%#0x, Last = %#0x\n",
245 __func__, index, row_high_limit, row_high_limit_last); 245 index, row_high_limit, row_high_limit_last);
246 246
247 /* Empty row [p.57] */ 247 /* Empty row [p.57] */
248 if (row_high_limit == row_high_limit_last) 248 if (row_high_limit == row_high_limit_last)
@@ -277,14 +277,13 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)
277 u32 sdram_refresh_rate; 277 u32 sdram_refresh_rate;
278 struct r82600_error_info discard; 278 struct r82600_error_info discard;
279 279
280 debugf0("%s()\n", __func__); 280 debugf0("\n");
281 pci_read_config_byte(pdev, R82600_DRAMC, &dramcr); 281 pci_read_config_byte(pdev, R82600_DRAMC, &dramcr);
282 pci_read_config_dword(pdev, R82600_EAP, &eapr); 282 pci_read_config_dword(pdev, R82600_EAP, &eapr);
283 scrub_disabled = eapr & BIT(31); 283 scrub_disabled = eapr & BIT(31);
284 sdram_refresh_rate = dramcr & (BIT(0) | BIT(1)); 284 sdram_refresh_rate = dramcr & (BIT(0) | BIT(1));
285 debugf2("%s(): sdram refresh rate = %#0x\n", __func__, 285 debugf2("sdram refresh rate = %#0x\n", sdram_refresh_rate);
286 sdram_refresh_rate); 286 debugf2("DRAMC register = %#0x\n", dramcr);
287 debugf2("%s(): DRAMC register = %#0x\n", __func__, dramcr);
288 layers[0].type = EDAC_MC_LAYER_CHIP_SELECT; 287 layers[0].type = EDAC_MC_LAYER_CHIP_SELECT;
289 layers[0].size = R82600_NR_CSROWS; 288 layers[0].size = R82600_NR_CSROWS;
290 layers[0].is_virt_csrow = true; 289 layers[0].is_virt_csrow = true;
@@ -295,7 +294,7 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)
295 if (mci == NULL) 294 if (mci == NULL)
296 return -ENOMEM; 295 return -ENOMEM;
297 296
298 debugf0("%s(): mci = %p\n", __func__, mci); 297 debugf0("mci = %p\n", mci);
299 mci->pdev = &pdev->dev; 298 mci->pdev = &pdev->dev;
300 mci->mtype_cap = MEM_FLAG_RDDR | MEM_FLAG_DDR; 299 mci->mtype_cap = MEM_FLAG_RDDR | MEM_FLAG_DDR;
301 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED; 300 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;
@@ -311,8 +310,8 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)
311 310
312 if (ecc_enabled(dramcr)) { 311 if (ecc_enabled(dramcr)) {
313 if (scrub_disabled) 312 if (scrub_disabled)
314 debugf3("%s(): mci = %p - Scrubbing disabled! EAP: " 313 debugf3("mci = %p - Scrubbing disabled! EAP: "
315 "%#0x\n", __func__, mci, eapr); 314 "%#0x\n", mci, eapr);
316 } else 315 } else
317 mci->edac_cap = EDAC_FLAG_NONE; 316 mci->edac_cap = EDAC_FLAG_NONE;
318 317
@@ -329,15 +328,14 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)
329 * type of memory controller. The ID is therefore hardcoded to 0. 328 * type of memory controller. The ID is therefore hardcoded to 0.
330 */ 329 */
331 if (edac_mc_add_mc(mci)) { 330 if (edac_mc_add_mc(mci)) {
332 debugf3("%s(): failed edac_mc_add_mc()\n", __func__); 331 debugf3("failed edac_mc_add_mc()\n");
333 goto fail; 332 goto fail;
334 } 333 }
335 334
336 /* get this far and it's successful */ 335 /* get this far and it's successful */
337 336
338 if (disable_hardware_scrub) { 337 if (disable_hardware_scrub) {
339 debugf3("%s(): Disabling Hardware Scrub (scrub on error)\n", 338 debugf3("Disabling Hardware Scrub (scrub on error)\n");
340 __func__);
341 pci_write_bits32(pdev, R82600_EAP, BIT(31), BIT(31)); 339 pci_write_bits32(pdev, R82600_EAP, BIT(31), BIT(31));
342 } 340 }
343 341
@@ -352,7 +350,7 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)
352 __func__); 350 __func__);
353 } 351 }
354 352
355 debugf3("%s(): success\n", __func__); 353 debugf3("success\n");
356 return 0; 354 return 0;
357 355
358fail: 356fail:
@@ -364,7 +362,7 @@ fail:
364static int __devinit r82600_init_one(struct pci_dev *pdev, 362static int __devinit r82600_init_one(struct pci_dev *pdev,
365 const struct pci_device_id *ent) 363 const struct pci_device_id *ent)
366{ 364{
367 debugf0("%s()\n", __func__); 365 debugf0("\n");
368 366
369 /* don't need to call pci_enable_device() */ 367 /* don't need to call pci_enable_device() */
370 return r82600_probe1(pdev, ent->driver_data); 368 return r82600_probe1(pdev, ent->driver_data);
@@ -374,7 +372,7 @@ static void __devexit r82600_remove_one(struct pci_dev *pdev)
374{ 372{
375 struct mem_ctl_info *mci; 373 struct mem_ctl_info *mci;
376 374
377 debugf0("%s()\n", __func__); 375 debugf0("\n");
378 376
379 if (r82600_pci) 377 if (r82600_pci)
380 edac_pci_release_generic_ctl(r82600_pci); 378 edac_pci_release_generic_ctl(r82600_pci);
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index efa488357ae6..96efa496db5a 100644
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -1064,7 +1064,7 @@ static void sbridge_put_devices(struct sbridge_dev *sbridge_dev)
1064{ 1064{
1065 int i; 1065 int i;
1066 1066
1067 debugf0(__FILE__ ": %s()\n", __func__); 1067 debugf0("\n");
1068 for (i = 0; i < sbridge_dev->n_devs; i++) { 1068 for (i = 0; i < sbridge_dev->n_devs; i++) {
1069 struct pci_dev *pdev = sbridge_dev->pdev[i]; 1069 struct pci_dev *pdev = sbridge_dev->pdev[i];
1070 if (!pdev) 1070 if (!pdev)
@@ -1592,8 +1592,7 @@ static void sbridge_unregister_mci(struct sbridge_dev *sbridge_dev)
1592 struct sbridge_pvt *pvt; 1592 struct sbridge_pvt *pvt;
1593 1593
1594 if (unlikely(!mci || !mci->pvt_info)) { 1594 if (unlikely(!mci || !mci->pvt_info)) {
1595 debugf0("MC: " __FILE__ ": %s(): dev = %p\n", 1595 debugf0("MC: dev = %p\n", &sbridge_dev->pdev[0]->dev);
1596 __func__, &sbridge_dev->pdev[0]->dev);
1597 1596
1598 sbridge_printk(KERN_ERR, "Couldn't find mci handler\n"); 1597 sbridge_printk(KERN_ERR, "Couldn't find mci handler\n");
1599 return; 1598 return;
@@ -1601,8 +1600,8 @@ static void sbridge_unregister_mci(struct sbridge_dev *sbridge_dev)
1601 1600
1602 pvt = mci->pvt_info; 1601 pvt = mci->pvt_info;
1603 1602
1604 debugf0("MC: " __FILE__ ": %s(): mci = %p, dev = %p\n", 1603 debugf0("MC: mci = %p, dev = %p\n",
1605 __func__, mci, &sbridge_dev->pdev[0]->dev); 1604 mci, &sbridge_dev->pdev[0]->dev);
1606 1605
1607 mce_unregister_decode_chain(&sbridge_mce_dec); 1606 mce_unregister_decode_chain(&sbridge_mce_dec);
1608 1607
@@ -1640,8 +1639,8 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev)
1640 if (unlikely(!mci)) 1639 if (unlikely(!mci))
1641 return -ENOMEM; 1640 return -ENOMEM;
1642 1641
1643 debugf0("MC: " __FILE__ ": %s(): mci = %p, dev = %p\n", 1642 debugf0("MC: mci = %p, dev = %p\n",
1644 __func__, mci, &sbridge_dev->pdev[0]->dev); 1643 mci, &sbridge_dev->pdev[0]->dev);
1645 1644
1646 pvt = mci->pvt_info; 1645 pvt = mci->pvt_info;
1647 memset(pvt, 0, sizeof(*pvt)); 1646 memset(pvt, 0, sizeof(*pvt));
@@ -1676,8 +1675,7 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev)
1676 1675
1677 /* add this new MC control structure to EDAC's list of MCs */ 1676 /* add this new MC control structure to EDAC's list of MCs */
1678 if (unlikely(edac_mc_add_mc(mci))) { 1677 if (unlikely(edac_mc_add_mc(mci))) {
1679 debugf0("MC: " __FILE__ 1678 debugf0("MC: failed edac_mc_add_mc()\n");
1680 ": %s(): failed edac_mc_add_mc()\n", __func__);
1681 rc = -EINVAL; 1679 rc = -EINVAL;
1682 goto fail0; 1680 goto fail0;
1683 } 1681 }
@@ -1755,7 +1753,7 @@ static void __devexit sbridge_remove(struct pci_dev *pdev)
1755{ 1753{
1756 struct sbridge_dev *sbridge_dev; 1754 struct sbridge_dev *sbridge_dev;
1757 1755
1758 debugf0(__FILE__ ": %s()\n", __func__); 1756 debugf0("\n");
1759 1757
1760 /* 1758 /*
1761 * we have a trouble here: pdev value for removal will be wrong, since 1759 * we have a trouble here: pdev value for removal will be wrong, since
@@ -1804,7 +1802,7 @@ static int __init sbridge_init(void)
1804{ 1802{
1805 int pci_rc; 1803 int pci_rc;
1806 1804
1807 debugf2("MC: " __FILE__ ": %s()\n", __func__); 1805 debugf2("\n");
1808 1806
1809 /* Ensure that the OPSTATE is set correctly for POLL or NMI */ 1807 /* Ensure that the OPSTATE is set correctly for POLL or NMI */
1810 opstate_init(); 1808 opstate_init();
@@ -1826,7 +1824,7 @@ static int __init sbridge_init(void)
1826 */ 1824 */
1827static void __exit sbridge_exit(void) 1825static void __exit sbridge_exit(void)
1828{ 1826{
1829 debugf2("MC: " __FILE__ ": %s()\n", __func__); 1827 debugf2("\n");
1830 pci_unregister_driver(&sbridge_driver); 1828 pci_unregister_driver(&sbridge_driver);
1831} 1829}
1832 1830
diff --git a/drivers/edac/x38_edac.c b/drivers/edac/x38_edac.c
index ae699be78b24..70c745422fca 100644
--- a/drivers/edac/x38_edac.c
+++ b/drivers/edac/x38_edac.c
@@ -243,7 +243,7 @@ static void x38_check(struct mem_ctl_info *mci)
243{ 243{
244 struct x38_error_info info; 244 struct x38_error_info info;
245 245
246 debugf1("MC%d: %s()\n", mci->mc_idx, __func__); 246 debugf1("MC%d\n", mci->mc_idx);
247 x38_get_and_clear_error_info(mci, &info); 247 x38_get_and_clear_error_info(mci, &info);
248 x38_process_error_info(mci, &info); 248 x38_process_error_info(mci, &info);
249} 249}
@@ -331,7 +331,7 @@ static int x38_probe1(struct pci_dev *pdev, int dev_idx)
331 bool stacked; 331 bool stacked;
332 void __iomem *window; 332 void __iomem *window;
333 333
334 debugf0("MC: %s()\n", __func__); 334 debugf0("MC:\n");
335 335
336 window = x38_map_mchbar(pdev); 336 window = x38_map_mchbar(pdev);
337 if (!window) 337 if (!window)
@@ -352,7 +352,7 @@ static int x38_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: %s(): init mci\n", __func__); 355 debugf3("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;
@@ -402,12 +402,12 @@ static int x38_probe1(struct pci_dev *pdev, int dev_idx)
402 402
403 rc = -ENODEV; 403 rc = -ENODEV;
404 if (edac_mc_add_mc(mci)) { 404 if (edac_mc_add_mc(mci)) {
405 debugf3("MC: %s(): failed edac_mc_add_mc()\n", __func__); 405 debugf3("MC: failed edac_mc_add_mc()\n");
406 goto fail; 406 goto fail;
407 } 407 }
408 408
409 /* get this far and it's successful */ 409 /* get this far and it's successful */
410 debugf3("MC: %s(): success\n", __func__); 410 debugf3("MC: success\n");
411 return 0; 411 return 0;
412 412
413fail: 413fail:
@@ -423,7 +423,7 @@ static int __devinit x38_init_one(struct pci_dev *pdev,
423{ 423{
424 int rc; 424 int rc;
425 425
426 debugf0("MC: %s()\n", __func__); 426 debugf0("MC:\n");
427 427
428 if (pci_enable_device(pdev) < 0) 428 if (pci_enable_device(pdev) < 0)
429 return -EIO; 429 return -EIO;
@@ -439,7 +439,7 @@ static void __devexit x38_remove_one(struct pci_dev *pdev)
439{ 439{
440 struct mem_ctl_info *mci; 440 struct mem_ctl_info *mci;
441 441
442 debugf0("%s()\n", __func__); 442 debugf0("\n");
443 443
444 mci = edac_mc_del_mc(&pdev->dev); 444 mci = edac_mc_del_mc(&pdev->dev);
445 if (!mci) 445 if (!mci)
@@ -472,7 +472,7 @@ static int __init x38_init(void)
472{ 472{
473 int pci_rc; 473 int pci_rc;
474 474
475 debugf3("MC: %s()\n", __func__); 475 debugf3("MC:\n");
476 476
477 /* Ensure that the OPSTATE is set correctly for POLL or NMI */ 477 /* Ensure that the OPSTATE is set correctly for POLL or NMI */
478 opstate_init(); 478 opstate_init();
@@ -513,7 +513,7 @@ fail0:
513 513
514static void __exit x38_exit(void) 514static void __exit x38_exit(void)
515{ 515{
516 debugf3("MC: %s()\n", __func__); 516 debugf3("MC:\n");
517 517
518 pci_unregister_driver(&x38_driver); 518 pci_unregister_driver(&x38_driver);
519 if (!x38_registered) { 519 if (!x38_registered) {
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-15 12:20:34 -0500