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/i3000_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/i3000_edac.c')
-rw-r--r-- | drivers/edac/i3000_edac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/edac/i3000_edac.c b/drivers/edac/i3000_edac.c index 02cd25a15fd4..0ecfdc432f87 100644 --- a/drivers/edac/i3000_edac.c +++ b/drivers/edac/i3000_edac.c | |||
@@ -309,7 +309,7 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx) | |||
309 | */ | 309 | */ |
310 | interleaved = i3000_is_interleaved(c0dra, c1dra, c0drb, c1drb); | 310 | interleaved = i3000_is_interleaved(c0dra, c1dra, c0drb, c1drb); |
311 | nr_channels = interleaved ? 2 : 1; | 311 | nr_channels = interleaved ? 2 : 1; |
312 | mci = edac_mc_alloc(0, I3000_RANKS / nr_channels, nr_channels); | 312 | mci = edac_mc_alloc(0, I3000_RANKS / nr_channels, nr_channels, 0); |
313 | if (!mci) | 313 | if (!mci) |
314 | return -ENOMEM; | 314 | return -ENOMEM; |
315 | 315 | ||
@@ -370,7 +370,7 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx) | |||
370 | I3000_ERRSTS_BITS); | 370 | I3000_ERRSTS_BITS); |
371 | 371 | ||
372 | rc = -ENODEV; | 372 | rc = -ENODEV; |
373 | if (edac_mc_add_mc(mci, 0)) { | 373 | if (edac_mc_add_mc(mci)) { |
374 | debugf3("MC: %s(): failed edac_mc_add_mc()\n", __func__); | 374 | debugf3("MC: %s(): failed edac_mc_add_mc()\n", __func__); |
375 | goto fail; | 375 | goto fail; |
376 | } | 376 | } |