drivers/edac: updated PCI monitoring

Moving PCI to a per-instance device model

This should include the correct sysfs setup as well. Please review.

Signed-off-by: Dave Jiang <djiang@mvista.com>
Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 1 insertions, 22 deletions

diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
index 3f4c8a28154a..3db8effa1fd0 100644
--- a/drivers/edac/edac_device.c
+++ b/drivers/edac/edac_device.c
@@ -418,27 +418,6 @@ void edac_device_reset_delay_period(
         unlock_device_list();
 }
 
-/*
- * edac_op_state_toString(edac_dev)
- */
-static char *edac_op_state_toString(struct edac_device_ctl_info *edac_dev)
-{
-        int opstate = edac_dev->op_state;
-
-        if (opstate == OP_RUNNING_POLL)
-                return "POLLED";
-        else if (opstate == OP_RUNNING_INTERRUPT)
-                return "INTERRUPT";
-        else if (opstate == OP_RUNNING_POLL_INTR)
-                return "POLL-INTR";
-        else if (opstate == OP_ALLOC)
-                return "ALLOC";
-        else if (opstate == OP_OFFLINE)
-                return "OFFLINE";
-
-        return "UNKNOWN";
-}
-
 /**
  * edac_device_add_device: Insert the 'edac_dev' structure into the
  * edac_device global list and create sysfs entries associated with
@@ -496,7 +475,7 @@ int edac_device_add_device(struct edac_device_ctl_info *edac_dev, int edac_idx)
                 edac_dev->mod_name,
                 edac_dev->ctl_name,
                 dev_name(edac_dev),
-                edac_op_state_toString(edac_dev)
+                edac_op_state_toString(edac_dev->op_state)
                 );
 
         unlock_device_list();