diff options
author | Doug Thompson <dougthompson@xmission.com> | 2007-07-19 04:50:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 13:04:57 -0400 |
commit | b8f6f9755248026f21282e25cac49a1af698056c (patch) | |
tree | c133319ae70b99d60415aa833719911d47420297 /drivers/edac/i82875p_edac.c | |
parent | fd309a9d8e63e9176759d00630b65d772ae06e0c (diff) |
drivers/edac: fix edac_mc init apis
Refactoring of sysfs code necessitated the refactoring of the edac_mc_alloc()
and edac_mc_add_mc() apis, of moving the index value to the alloc() function.
This patch alters the in tree drivers to utilize this new api signature.
Having the index value performed later created a chicken-and-the-egg issue.
Moving it to the alloc() function allows for creating the necessary sysfs
entries with the proper index number
Cc: Alan Cox alan@lxorguk.ukuu.org.uk
Signed-off-by: Doug Thompson <dougthompson@xmission.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/edac/i82875p_edac.c')
-rw-r--r-- | drivers/edac/i82875p_edac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c index 73a173e25985..031abadc439a 100644 --- a/drivers/edac/i82875p_edac.c +++ b/drivers/edac/i82875p_edac.c | |||
@@ -400,7 +400,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx) | |||
400 | drc = readl(ovrfl_window + I82875P_DRC); | 400 | drc = readl(ovrfl_window + I82875P_DRC); |
401 | nr_chans = dual_channel_active(drc) + 1; | 401 | nr_chans = dual_channel_active(drc) + 1; |
402 | mci = edac_mc_alloc(sizeof(*pvt), I82875P_NR_CSROWS(nr_chans), | 402 | mci = edac_mc_alloc(sizeof(*pvt), I82875P_NR_CSROWS(nr_chans), |
403 | nr_chans); | 403 | nr_chans, 0); |
404 | 404 | ||
405 | if (!mci) { | 405 | if (!mci) { |
406 | rc = -ENOMEM; | 406 | rc = -ENOMEM; |
@@ -428,7 +428,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx) | |||
428 | /* Here we assume that we will never see multiple instances of this | 428 | /* Here we assume that we will never see multiple instances of this |
429 | * type of memory controller. The ID is therefore hardcoded to 0. | 429 | * type of memory controller. The ID is therefore hardcoded to 0. |
430 | */ | 430 | */ |
431 | if (edac_mc_add_mc(mci, 0)) { | 431 | if (edac_mc_add_mc(mci)) { |
432 | debugf3("%s(): failed edac_mc_add_mc()\n", __func__); | 432 | debugf3("%s(): failed edac_mc_add_mc()\n", __func__); |
433 | goto fail1; | 433 | goto fail1; |
434 | } | 434 | } |