[PATCH] EDAC: PCI device to DEVICE cleanup

Change MC drivers from using CVS revision strings for their version number,
Now each driver has its own local string.

Remove some PCI dependencies from the core EDAC module.  Made the code 'struct
device' centric instead of 'struct pci_dev' Most of the code changes here are
from a patch by Dave Jiang.  It may be best to eventually move the
PCI-specific code into a separate source file.

Signed-off-by: Doug Thompson <norsk5@xmission.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 9 insertions, 7 deletions

diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c
index a9518d3e4be4..d601d53b9920 100644
--- a/drivers/edac/e7xxx_edac.c
+++ b/drivers/edac/e7xxx_edac.c
@@ -30,6 +30,8 @@
 #include <linux/slab.h>
 #include "edac_mc.h"
 
+#define E7XXX_REVISION " Ver: 2.0.0 " __DATE__
+
 #define e7xxx_printk(level, fmt, arg...) \
         edac_printk(level, "e7xxx", fmt, ##arg)
 
@@ -373,8 +375,8 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
                         EDAC_FLAG_S4ECD4ED;
         /* FIXME - what if different memory types are in different csrows? */
         mci->mod_name = EDAC_MOD_STR;
-        mci->mod_ver = "$Revision: 1.5.2.9 $";
-        mci->pdev = pdev;
+        mci->mod_ver = E7XXX_REVISION;
+        mci->dev = &pdev->dev;
 
         debugf3("%s(): init pvt\n", __func__);
         pvt = (struct e7xxx_pvt *) mci->pvt_info;
@@ -411,7 +413,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
                 int mem_dev = (dra >> (index * 4 + 3)) & 0x1;
                 struct csrow_info *csrow = &mci->csrows[index];
 
-                pci_read_config_byte(mci->pdev, E7XXX_DRB + index, &value);
+                pci_read_config_byte(pdev, E7XXX_DRB + index, &value);
                 /* convert a 64 or 32 MiB DRB to a page size. */
                 cumul_size = value << (25 + drc_drbg - PAGE_SHIFT);
                 debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index,
@@ -448,11 +450,11 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
 
         debugf3("%s(): tolm, remapbase, remaplimit\n", __func__);
         /* load the top of low memory, remap base, and remap limit vars */
-        pci_read_config_word(mci->pdev, E7XXX_TOLM, &pci_data);
+        pci_read_config_word(pdev, E7XXX_TOLM, &pci_data);
         pvt->tolm = ((u32) pci_data) << 4;
-        pci_read_config_word(mci->pdev, E7XXX_REMAPBASE, &pci_data);
+        pci_read_config_word(pdev, E7XXX_REMAPBASE, &pci_data);
         pvt->remapbase = ((u32) pci_data) << 14;
-        pci_read_config_word(mci->pdev, E7XXX_REMAPLIMIT, &pci_data);
+        pci_read_config_word(pdev, E7XXX_REMAPLIMIT, &pci_data);
         pvt->remaplimit = ((u32) pci_data) << 14;
         e7xxx_printk(KERN_INFO,
                 "tolm = %x, remapbase = %x, remaplimit = %x\n", pvt->tolm,
@@ -498,7 +500,7 @@ static void __devexit e7xxx_remove_one(struct pci_dev *pdev)
 
         debugf0("%s()\n", __func__);
 
-        if ((mci = edac_mc_del_mc(pdev)) == NULL)
+        if ((mci = edac_mc_del_mc(&pdev->dev)) == NULL)
                 return;
 
         pvt = (struct e7xxx_pvt *) mci->pvt_info;