diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-04-29 10:59:14 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-06-11 12:23:47 -0400 |
commit | dd23cd6eb1f59ba722a6e6aa228adff7c01404de (patch) | |
tree | 32c45fb296293af1309f926b8c109eef329f4f22 /drivers/edac/amd76x_edac.c | |
parent | 2639c3ee298401881cc560c5e3987f8b222b9f7c (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 (limited to 'drivers/edac/amd76x_edac.c')
-rw-r--r-- | drivers/edac/amd76x_edac.c | 14 |
1 files changed, 7 insertions, 7 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, | |||
180 | static void amd76x_check(struct mem_ctl_info *mci) | 180 | static 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 | ||
298 | fail: | 298 | fail: |
@@ -304,7 +304,7 @@ fail: | |||
304 | static int __devinit amd76x_init_one(struct pci_dev *pdev, | 304 | static 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); |