Skip to content

Commit

Permalink
i7300_edac: Cleanup: remove get_error_info logic
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mauro Carvalho Chehab committed Aug 30, 2010
1 parent e432760 commit f427742
Showing 1 changed file with 6 additions and 36 deletions.
42 changes: 6 additions & 36 deletions drivers/edac/i7300_edac.c
Original file line number Diff line number Diff line change
Expand Up @@ -315,10 +315,6 @@ static struct edac_pci_ctl_info *i7300_pci;
* i7300 Functions related to error detection
********************************************/

struct i7300_error_info {
int dummy; /* FIXME */
};

const char *get_err_from_table(const char *table[], int size, int pos)
{
if (pos >= size)
Expand All @@ -330,23 +326,12 @@ const char *get_err_from_table(const char *table[], int size, int pos)
#define GET_ERR_FROM_TABLE(table, pos) \
get_err_from_table(table, ARRAY_SIZE(table), pos)

/*
* i7300_get_error_info Retrieve the hardware error information from
* the hardware and cache it in the 'info'
* structure
*/
static void i7300_get_error_info(struct mem_ctl_info *mci,
struct i7300_error_info *info)
{
}

/*
* i7300_process_error_global Retrieve the hardware error information from
* the hardware and cache it in the 'info'
* structure
*/
static void i7300_process_error_global(struct mem_ctl_info *mci,
struct i7300_error_info *info)
static void i7300_process_error_global(struct mem_ctl_info *mci)
{
struct i7300_pvt *pvt;
u32 errnum, value;
Expand Down Expand Up @@ -400,8 +385,7 @@ static void i7300_process_error_global(struct mem_ctl_info *mci,
* the hardware and cache it in the 'info'
* structure
*/
static void i7300_process_fbd_error(struct mem_ctl_info *mci,
struct i7300_error_info *info)
static void i7300_process_fbd_error(struct mem_ctl_info *mci)
{
struct i7300_pvt *pvt;
u32 errnum, value;
Expand Down Expand Up @@ -451,15 +435,14 @@ static void i7300_process_fbd_error(struct mem_ctl_info *mci,
}

/*
* i7300_process_error_info Retrieve the hardware error information from
* i7300_check_error Retrieve the hardware error information from
* the hardware and cache it in the 'info'
* structure
*/
static void i7300_process_error_info(struct mem_ctl_info *mci,
struct i7300_error_info *info)
static void i7300_check_error(struct mem_ctl_info *mci)
{
i7300_process_error_global(mci, info);
i7300_process_fbd_error(mci, info);
i7300_process_error_global(mci);
i7300_process_fbd_error(mci);
};

/*
Expand Down Expand Up @@ -500,19 +483,6 @@ static void i7300_clear_error(struct mem_ctl_info *mci)
FERR_NF_FBD, value);
}

/*
* i7300_check_error Retrieve and process errors reported by the
* hardware. Called by the Core module.
*/
static void i7300_check_error(struct mem_ctl_info *mci)
{
struct i7300_error_info info;
debugf4("MC%d: " __FILE__ ": %s()\n", mci->mc_idx, __func__);

i7300_get_error_info(mci, &info);
i7300_process_error_info(mci, &info);
}

/*
* i7300_enable_error_reporting
* Turn on the memory reporting features of the hardware
Expand Down

0 comments on commit f427742

Please sign in to comment.