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/e7xxx_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/e7xxx_edac.c')
-rw-r--r-- | drivers/edac/e7xxx_edac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c index 0601958421fb..96ecc4926641 100644 --- a/drivers/edac/e7xxx_edac.c +++ b/drivers/edac/e7xxx_edac.c | |||
@@ -427,7 +427,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx) | |||
427 | pci_read_config_dword(pdev, E7XXX_DRC, &drc); | 427 | pci_read_config_dword(pdev, E7XXX_DRC, &drc); |
428 | 428 | ||
429 | drc_chan = dual_channel_active(drc, dev_idx); | 429 | drc_chan = dual_channel_active(drc, dev_idx); |
430 | mci = edac_mc_alloc(sizeof(*pvt), E7XXX_NR_CSROWS, drc_chan + 1); | 430 | mci = edac_mc_alloc(sizeof(*pvt), E7XXX_NR_CSROWS, drc_chan + 1, 0); |
431 | 431 | ||
432 | if (mci == NULL) | 432 | if (mci == NULL) |
433 | return -ENOMEM; | 433 | return -ENOMEM; |
@@ -478,7 +478,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx) | |||
478 | /* Here we assume that we will never see multiple instances of this | 478 | /* Here we assume that we will never see multiple instances of this |
479 | * type of memory controller. The ID is therefore hardcoded to 0. | 479 | * type of memory controller. The ID is therefore hardcoded to 0. |
480 | */ | 480 | */ |
481 | if (edac_mc_add_mc(mci, 0)) { | 481 | if (edac_mc_add_mc(mci)) { |
482 | debugf3("%s(): failed edac_mc_add_mc()\n", __func__); | 482 | debugf3("%s(): failed edac_mc_add_mc()\n", __func__); |
483 | goto fail1; | 483 | goto fail1; |
484 | } | 484 | } |