aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-08-27 09:33:25 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-08-30 13:56:56 -0400
commitf42774224860d7c3f7c06559f98b681197999f9e (patch)
tree2cf0eb983fdc7f0f337f0e160e7a162681dacda8
parente43276050927c7dfc45b1e2f090b94f72f87c052 (diff)
i7300_edac: Cleanup: remove get_error_info logic
As the error logic in this driver came from i5400 driver, it were using one function to get errors, and another to display. Let's make it simpler and avoid doing it into two steps. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/edac/i7300_edac.c42
1 files changed, 6 insertions, 36 deletions
diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c
index 3b6da20de4e5..3ae8fae74e5e 100644
--- a/drivers/edac/i7300_edac.c
+++ b/drivers/edac/i7300_edac.c
@@ -315,10 +315,6 @@ static struct edac_pci_ctl_info *i7300_pci;
315 * i7300 Functions related to error detection 315 * i7300 Functions related to error detection
316 ********************************************/ 316 ********************************************/
317 317
318struct i7300_error_info {
319 int dummy; /* FIXME */
320};
321
322const char *get_err_from_table(const char *table[], int size, int pos) 318const char *get_err_from_table(const char *table[], int size, int pos)
323{ 319{
324 if (pos >= size) 320 if (pos >= size)
@@ -331,22 +327,11 @@ const char *get_err_from_table(const char *table[], int size, int pos)
331 get_err_from_table(table, ARRAY_SIZE(table), pos) 327 get_err_from_table(table, ARRAY_SIZE(table), pos)
332 328
333/* 329/*
334 * i7300_get_error_info Retrieve the hardware error information from
335 * the hardware and cache it in the 'info'
336 * structure
337 */
338static void i7300_get_error_info(struct mem_ctl_info *mci,
339 struct i7300_error_info *info)
340{
341}
342
343/*
344 * i7300_process_error_global Retrieve the hardware error information from 330 * i7300_process_error_global Retrieve the hardware error information from
345 * the hardware and cache it in the 'info' 331 * the hardware and cache it in the 'info'
346 * structure 332 * structure
347 */ 333 */
348static void i7300_process_error_global(struct mem_ctl_info *mci, 334static void i7300_process_error_global(struct mem_ctl_info *mci)
349 struct i7300_error_info *info)
350{ 335{
351 struct i7300_pvt *pvt; 336 struct i7300_pvt *pvt;
352 u32 errnum, value; 337 u32 errnum, value;
@@ -400,8 +385,7 @@ error_global:
400 * the hardware and cache it in the 'info' 385 * the hardware and cache it in the 'info'
401 * structure 386 * structure
402 */ 387 */
403static void i7300_process_fbd_error(struct mem_ctl_info *mci, 388static void i7300_process_fbd_error(struct mem_ctl_info *mci)
404 struct i7300_error_info *info)
405{ 389{
406 struct i7300_pvt *pvt; 390 struct i7300_pvt *pvt;
407 u32 errnum, value; 391 u32 errnum, value;
@@ -451,15 +435,14 @@ error_fbd:
451} 435}
452 436
453/* 437/*
454 * i7300_process_error_info Retrieve the hardware error information from 438 * i7300_check_error Retrieve the hardware error information from
455 * the hardware and cache it in the 'info' 439 * the hardware and cache it in the 'info'
456 * structure 440 * structure
457 */ 441 */
458static void i7300_process_error_info(struct mem_ctl_info *mci, 442static void i7300_check_error(struct mem_ctl_info *mci)
459 struct i7300_error_info *info)
460{ 443{
461 i7300_process_error_global(mci, info); 444 i7300_process_error_global(mci);
462 i7300_process_fbd_error(mci, info); 445 i7300_process_fbd_error(mci);
463}; 446};
464 447
465/* 448/*
@@ -501,19 +484,6 @@ static void i7300_clear_error(struct mem_ctl_info *mci)
501} 484}
502 485
503/* 486/*
504 * i7300_check_error Retrieve and process errors reported by the
505 * hardware. Called by the Core module.
506 */
507static void i7300_check_error(struct mem_ctl_info *mci)
508{
509 struct i7300_error_info info;
510 debugf4("MC%d: " __FILE__ ": %s()\n", mci->mc_idx, __func__);
511
512 i7300_get_error_info(mci, &info);
513 i7300_process_error_info(mci, &info);
514}
515
516/*
517 * i7300_enable_error_reporting 487 * i7300_enable_error_reporting
518 * Turn on the memory reporting features of the hardware 488 * Turn on the memory reporting features of the hardware
519 */ 489 */