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/pasemi_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/pasemi_edac.c')
-rw-r--r-- | drivers/edac/pasemi_edac.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/edac/pasemi_edac.c b/drivers/edac/pasemi_edac.c index 4fcf23b61d8e..e66cdd42a392 100644 --- a/drivers/edac/pasemi_edac.c +++ b/drivers/edac/pasemi_edac.c | |||
@@ -205,7 +205,8 @@ static int __devinit pasemi_edac_probe(struct pci_dev *pdev, | |||
205 | MCDEBUG_ERRCTL1_RFL_LOG_EN; | 205 | MCDEBUG_ERRCTL1_RFL_LOG_EN; |
206 | pci_write_config_dword(pdev, MCDEBUG_ERRCTL1, errctl1); | 206 | pci_write_config_dword(pdev, MCDEBUG_ERRCTL1, errctl1); |
207 | 207 | ||
208 | mci = edac_mc_alloc(0, PASEMI_EDAC_NR_CSROWS, PASEMI_EDAC_NR_CHANS); | 208 | mci = edac_mc_alloc(0, PASEMI_EDAC_NR_CSROWS, PASEMI_EDAC_NR_CHANS, |
209 | system_mmc_id++); | ||
209 | 210 | ||
210 | if (mci == NULL) | 211 | if (mci == NULL) |
211 | return -ENOMEM; | 212 | return -ENOMEM; |
@@ -245,7 +246,7 @@ static int __devinit pasemi_edac_probe(struct pci_dev *pdev, | |||
245 | */ | 246 | */ |
246 | pasemi_edac_get_error_info(mci); | 247 | pasemi_edac_get_error_info(mci); |
247 | 248 | ||
248 | if (edac_mc_add_mc(mci, system_mmc_id++)) | 249 | if (edac_mc_add_mc(mci)) |
249 | goto fail; | 250 | goto fail; |
250 | 251 | ||
251 | /* get this far and it's successful */ | 252 | /* get this far and it's successful */ |