edac: Remove the legacy EDAC ABI

Now that all drivers got converted to use the new ABI, we can
drop the old one.

Acked-by: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index ede3895050135c5084a315eebe886664219def51..60479f914375eba2e47b82aacc000b9947db0b4d 100644 (file)
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -2567,7 +2567,7 @@ static int amd64_init_one_instance(struct pci_dev *F2)
        layers[1].type = EDAC_MC_LAYER_CHANNEL;
        layers[1].size = pvt->channel_count;
        layers[1].is_virt_csrow = false;
-       mci = new_edac_mc_alloc(nid, ARRAY_SIZE(layers), layers, 0);
+       mci = edac_mc_alloc(nid, ARRAY_SIZE(layers), layers, 0);
        if (!mci)
                goto err_siblings;
 

diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c
index 90b2e1d8bab0d64d8ce3ca83db1fb7b9b65fec70..7d77736211ee0c947e12fbf7757d9abfe3c37f50 100644 (file)
--- a/drivers/edac/amd76x_edac.c
+++ b/drivers/edac/amd76x_edac.c
@@ -251,7 +251,7 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)
        layers[1].type = EDAC_MC_LAYER_CHANNEL;
        layers[1].size = 1;
        layers[1].is_virt_csrow = false;
-       mci = new_edac_mc_alloc(0, ARRAY_SIZE(layers), layers, 0);
+       mci = edac_mc_alloc(0, ARRAY_SIZE(layers), 0);
 
        if (mci == NULL)
                return -ENOMEM;

diff --git a/drivers/edac/cell_edac.c b/drivers/edac/cell_edac.c
index 14aa17492757314524cc7f1ac4285ffd2fd1cd7f..69ee6aab5c716fefd0b919a5da4b46ef5c7c4a64 100644 (file)
--- a/drivers/edac/cell_edac.c
+++ b/drivers/edac/cell_edac.c
@@ -204,7 +204,7 @@ static int __devinit cell_edac_probe(struct platform_device *pdev)
        layers[1].type = EDAC_MC_LAYER_CHANNEL;
        layers[1].size = num_chans;
        layers[1].is_virt_csrow = false;
-       mci = new_edac_mc_alloc(pdev->id, ARRAY_SIZE(layers), layers,
+       mci = edac_mc_alloc(pdev->id, ARRAY_SIZE(layers), layers,
                            sizeof(struct cell_edac_priv));
        if (mci == NULL)
                return -ENOMEM;

diff --git a/drivers/edac/cpc925_edac.c b/drivers/edac/cpc925_edac.c
index 2d94fa91c746f2fea00ac7b36e3bab3e8185b94b..e22030a9de66fbc0c38fd2d0b274b1464dda7a2f 100644 (file)
--- a/drivers/edac/cpc925_edac.c
+++ b/drivers/edac/cpc925_edac.c
@@ -982,7 +982,7 @@ static int __devinit cpc925_probe(struct platform_device *pdev)
        layers[1].type = EDAC_MC_LAYER_CHANNEL;
        layers[1].size = nr_channels;
        layers[1].is_virt_csrow = false;
-       mci = new_edac_mc_alloc(edac_mc_idx, ARRAY_SIZE(layers), layers,
+       mci = edac_mc_alloc(edac_mc_idx, ARRAY_SIZE(layers), layers,
                            sizeof(struct cpc925_mc_pdata));
        if (!mci) {
                cpc925_printk(KERN_ERR, "No memory for mem_ctl_info\n");

diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c
index bd92170a79e0462a7d64a87f981c01e0b15f8b9d..0f34d7342785b2099e761c5ed48b147765a1dcd2 100644 (file)
--- a/drivers/edac/e752x_edac.c
+++ b/drivers/edac/e752x_edac.c
@@ -1278,8 +1278,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
        layers[1].type = EDAC_MC_LAYER_CHANNEL;
        layers[1].size = drc_chan + 1;
        layers[1].is_virt_csrow = false;
-       mci = new_edac_mc_alloc(0, ARRAY_SIZE(layers), layers,
-                           sizeof(*pvt));
+       mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers, sizeof(*pvt));
        if (mci == NULL)
                return -ENOMEM;
 

diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c
index 6335022d97f5cd75ccb1904d4768bd0db6c8e960..a6c868344cf0365583c6e732c509325e41b43d47 100644 (file)
--- a/drivers/edac/e7xxx_edac.c
+++ b/drivers/edac/e7xxx_edac.c
@@ -447,7 +447,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
        layers[1].type = EDAC_MC_LAYER_CHANNEL;
        layers[1].size = drc_chan + 1;
        layers[1].is_virt_csrow = false;
-       mci = new_edac_mc_alloc(0, ARRAY_SIZE(layers), layers, sizeof(*pvt));
+       mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers, sizeof(*pvt));
        if (mci == NULL)
                return -ENOMEM;
 

diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
index 1286c5e1bdc01b1fad31fc477df11a4469f2d727..f06ce9ab692c38eb09f6203d9fc44747b7c6d720 100644 (file)
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
@@ -447,9 +447,7 @@ static inline void pci_write_bits32(struct pci_dev *pdev, int offset,
 
 #endif                         /* CONFIG_PCI */
 
-struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,
-                                  unsigned nr_chans, int edac_index);
-struct mem_ctl_info *new_edac_mc_alloc(unsigned edac_index,
+struct mem_ctl_info *edac_mc_alloc(unsigned mc_num,
                                   unsigned n_layers,
                                   struct edac_mc_layer *layers,
                                   unsigned sz_pvt);
@@ -460,18 +458,6 @@ extern struct mem_ctl_info *find_mci_by_dev(struct device *dev);
 extern struct mem_ctl_info *edac_mc_del_mc(struct device *dev);
 extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,
                                      unsigned long page);
-
-/*
- * The no info errors are used when error overflows are reported.
- * There are a limited number of error logging registers that can
- * be exausted.  When all registers are exhausted and an additional
- * error occurs then an error overflow register records that an
- * error occurred and the type of error, but doesn't have any
- * further information.  The ce/ue versions make for cleaner
- * reporting logic and function interface - reduces conditional
- * statement clutter and extra function arguments.
- */
-
 void edac_mc_handle_error(const enum hw_event_mc_err_type type,
                          struct mem_ctl_info *mci,
                          const unsigned long page_frame_number,
@@ -484,66 +470,6 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type,
                          const char *other_detail,
                          const void *mcelog);
 
-static inline void edac_mc_handle_ce(struct mem_ctl_info *mci,
-                                    unsigned long page_frame_number,
-                                    unsigned long offset_in_page,
-                                    unsigned long syndrome, int row, int channel,
-                                    const char *msg)
-{
-        edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,
-                             page_frame_number, offset_in_page, syndrome,
-                             row, channel, -1, msg, NULL, NULL);
-}
-
-static inline void edac_mc_handle_ce_no_info(struct mem_ctl_info *mci,
-                                            const char *msg)
-{
-        edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,
-                             0, 0, 0, -1, -1, -1, msg, NULL, NULL);
-}
-
-static inline void edac_mc_handle_ue(struct mem_ctl_info *mci,
-                                    unsigned long page_frame_number,
-                                    unsigned long offset_in_page, int row,
-                                    const char *msg)
-{
-        edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci,
-                             page_frame_number, offset_in_page, 0,
-                             row, -1, -1, msg, NULL, NULL);
-}
-
-static inline void edac_mc_handle_ue_no_info(struct mem_ctl_info *mci,
-                                            const char *msg)
-{
-        edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci,
-                             0, 0, 0, -1, -1, -1, msg, NULL, NULL);
-}
-
-static inline void edac_mc_handle_fbd_ue(struct mem_ctl_info *mci,
-                                        unsigned int csrow,
-                                        unsigned int channel0,
-                                        unsigned int channel1,
-                                        char *msg)
-{
-       /*
-        *FIXME: The error can also be at channel1 (e. g. at the second
-        *        channel of the same branch). The fix is to push
-        *        edac_mc_handle_error() call into each driver
-        */
-        edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci,
-                             0, 0, 0,
-                             csrow, channel0, -1, msg, NULL, NULL);
-}
-
-static inline void edac_mc_handle_fbd_ce(struct mem_ctl_info *mci,
-                                        unsigned int csrow,
-                                        unsigned int channel, char *msg)
-{
-        edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,
-                             0, 0, 0,
-                             csrow, channel, -1, msg, NULL, NULL);
-}
-
 /*
  * edac_device APIs
  */

diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 26146580499070fc6a8742f11b9ca2e8b16afba5..03f8fb2e5a6c7d0cc48e90ad7db8552b63b9411d 100644 (file)
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -195,13 +195,13 @@ void *edac_align_ptr(void **p, unsigned size, int n_elems)
  * on such scenarios, as grouping the multiple ranks require drivers change.
  *
  * Returns:
- *     NULL allocation failed
- *     struct mem_ctl_info pointer
+ *     On failure: NULL
+ *     On success: struct mem_ctl_info pointer
  */
-struct mem_ctl_info *new_edac_mc_alloc(unsigned mc_num,
-                                      unsigned n_layers,
-                                      struct edac_mc_layer *layers,
-                                      unsigned sz_pvt)
+struct mem_ctl_info *edac_mc_alloc(unsigned mc_num,
+                                  unsigned n_layers,
+                                  struct edac_mc_layer *layers,
+                                  unsigned sz_pvt)
 {
        struct mem_ctl_info *mci;
        struct edac_mc_layer *layer;
@@ -370,46 +370,6 @@ struct mem_ctl_info *new_edac_mc_alloc(unsigned mc_num,
         */
        return mci;
 }
-EXPORT_SYMBOL_GPL(new_edac_mc_alloc);
-
-/**
- * edac_mc_alloc: Allocate and partially fill a struct mem_ctl_info structure
- * @mc_num:            Memory controller number
- * @n_layers:          Number of layers at the MC hierarchy
- * layers:             Describes each layer as seen by the Memory Controller
- * @size_pvt:          Size of private storage needed
- *
- *
- * FIXME: drivers handle multi-rank memories in different ways: some
- * drivers map multi-ranked DIMMs as one DIMM while others
- * as several DIMMs.
- *
- * Everything is kmalloc'ed as one big chunk - more efficient.
- * It can only be used if all structures have the same lifetime - otherwise
- * you have to allocate and initialize your own structures.
- *
- * Use edac_mc_free() to free mc structures allocated by this function.
- *
- * Returns:
- *     On failure: NULL
- *     On success: struct mem_ctl_info pointer
- */
-
-struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,
-                                  unsigned nr_chans, int mc_num)
-{
-       unsigned n_layers = 2;
-       struct edac_mc_layer layers[n_layers];
-
-       layers[0].type = EDAC_MC_LAYER_CHIP_SELECT;
-       layers[0].size = nr_csrows;
-       layers[0].is_virt_csrow = true;
-       layers[1].type = EDAC_MC_LAYER_CHANNEL;
-       layers[1].size = nr_chans;
-       layers[1].is_virt_csrow = false;
-
-       return new_edac_mc_alloc(mc_num, ARRAY_SIZE(layers), layers, sz_pvt);
-}
 EXPORT_SYMBOL_GPL(edac_mc_alloc);
 
 /**

diff --git a/drivers/edac/i3000_edac.c b/drivers/edac/i3000_edac.c
index 3389cc5c641706cab83f38e9bd4a47d435f46b0c..d884afdb71279f56ca6ffa5eb79f9acf1751afc8 100644 (file)
--- a/drivers/edac/i3000_edac.c
+++ b/drivers/edac/i3000_edac.c
@@ -362,7 +362,7 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx)
        layers[1].type = EDAC_MC_LAYER_CHANNEL;
        layers[1].size = nr_channels;
        layers[1].is_virt_csrow = false;
-       mci = new_edac_mc_alloc(0, ARRAY_SIZE(layers), layers, 0);
+       mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers, 0);
        if (!mci)
                return -ENOMEM;
 

diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c
index f5ee35b85347941b9ef468394d9f1683524f52eb..56681ac0397aee1b05b24ba3e7a835e9037fceb4 100644 (file)
--- a/drivers/edac/i3200_edac.c
+++ b/drivers/edac/i3200_edac.c
@@ -347,7 +347,7 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx)
        layers[1].type = EDAC_MC_LAYER_CHANNEL;
        layers[1].size = nr_channels;
        layers[1].is_virt_csrow = false;
-       mci = new_edac_mc_alloc(0, ARRAY_SIZE(layers), layers,
+       mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers,
                            sizeof(struct i3200_priv));
        if (!mci)
                return -ENOMEM;

diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
index cfa64bc8aaa5d9b18193acb7a34533769568672b..bdd74bd4a9981185e2755de2e1db5fd37af6618f 100644 (file)
--- a/drivers/edac/i5000_edac.c
+++ b/drivers/edac/i5000_edac.c
@@ -1396,8 +1396,7 @@ static int i5000_probe1(struct pci_dev *pdev, int dev_idx)
        layers[2].type = EDAC_MC_LAYER_SLOT;
        layers[2].size = num_dimms_per_channel;
        layers[2].is_virt_csrow = true;
-       mci = new_edac_mc_alloc(0, ARRAY_SIZE(layers), layers, sizeof(*pvt));
-
+       mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers, sizeof(*pvt));
        if (mci == NULL)
                return -ENOMEM;
 

diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
index aa1ea4025477fc318f49913f6c2fd370d9a3857a..7e97901c0724f793bffcc5db8a2ee86e789c04ff 100644 (file)
--- a/drivers/edac/i5100_edac.c
+++ b/drivers/edac/i5100_edac.c
@@ -936,7 +936,7 @@ static int __devinit i5100_init_one(struct pci_dev *pdev,
        layers[1].type = EDAC_MC_LAYER_SLOT;
        layers[1].size = ranksperch;
        layers[1].is_virt_csrow = true;
-       mci = new_edac_mc_alloc(0, ARRAY_SIZE(layers), layers,
+       mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers,
                            sizeof(*priv));
        if (!mci) {
                ret = -ENOMEM;

diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c
index f14dad0cd2834477a08b8dd87fb32112c0c6f6b9..63dbbdedc1265f3b111fa360b6b5105071749f1a 100644 (file)
--- a/drivers/edac/i5400_edac.c
+++ b/drivers/edac/i5400_edac.c
@@ -1280,8 +1280,7 @@ static int i5400_probe1(struct pci_dev *pdev, int dev_idx)
        layers[2].type = EDAC_MC_LAYER_SLOT;
        layers[2].size = DIMMS_PER_CHANNEL;
        layers[2].is_virt_csrow = true;
-       mci = new_edac_mc_alloc(0, ARRAY_SIZE(layers), layers, sizeof(*pvt));
-
+       mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers, sizeof(*pvt));
        if (mci == NULL)
                return -ENOMEM;
 

diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c
index 4bd452f4eb543d9e56e003546b73b9e7775f9a2a..54042a992e089d4c355a6870b590e032ea67ea70 100644 (file)
--- a/drivers/edac/i7300_edac.c
+++ b/drivers/edac/i7300_edac.c
@@ -1054,8 +1054,7 @@ static int __devinit i7300_init_one(struct pci_dev *pdev,
        layers[2].type = EDAC_MC_LAYER_SLOT;
        layers[2].size = MAX_SLOTS;
        layers[2].is_virt_csrow = true;
-       mci = new_edac_mc_alloc(0, ARRAY_SIZE(layers), layers, sizeof(*pvt));
-
+       mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers, sizeof(*pvt));
        if (mci == NULL)
                return -ENOMEM;
 

diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index 8cebcf6425b520c8d3588c6b61e037dbbc9ed9ab..52a359df264d9eb04193055487a01fe0bb91892c 100644 (file)
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -2147,7 +2147,7 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev)
        layers[1].type = EDAC_MC_LAYER_SLOT;
        layers[1].size = MAX_DIMMS;
        layers[1].is_virt_csrow = true;
-       mci = new_edac_mc_alloc(i7core_dev->socket, ARRAY_SIZE(layers), layers,
+       mci = edac_mc_alloc(i7core_dev->socket, ARRAY_SIZE(layers), layers,
                            sizeof(*pvt));
        if (unlikely(!mci))
                return -ENOMEM;

diff --git a/drivers/edac/i82443bxgx_edac.c b/drivers/edac/i82443bxgx_edac.c
index 07336435685c78bcfd45072ca948f05b95f59074..8ed477c035501a5b1c8db6a13ac49a2c470e07c6 100644 (file)
--- a/drivers/edac/i82443bxgx_edac.c
+++ b/drivers/edac/i82443bxgx_edac.c
@@ -255,7 +255,7 @@ static int i82443bxgx_edacmc_probe1(struct pci_dev *pdev, int dev_idx)
        layers[1].type = EDAC_MC_LAYER_CHANNEL;
        layers[1].size = I82443BXGX_NR_CHANS;
        layers[1].is_virt_csrow = false;
-       mci = new_edac_mc_alloc(0, ARRAY_SIZE(layers), layers, 0);
+       mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers, 0);
        if (mci == NULL)
                return -ENOMEM;
 

diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c
index 6d855c9f9f1f6ab4e03844bb436d44b743cebaeb..8cdbd84325643247dc8807b0b018a653717b9344 100644 (file)
--- a/drivers/edac/i82860_edac.c
+++ b/drivers/edac/i82860_edac.c
@@ -206,7 +206,7 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx)
        layers[1].type = EDAC_MC_LAYER_SLOT;
        layers[1].size = 8;
        layers[1].is_virt_csrow = true;
-       mci = new_edac_mc_alloc(0, ARRAY_SIZE(layers), layers, 0);
+       mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers, 0);
        if (!mci)
                return -ENOMEM;
 

diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
index 85b96d199f8012a10ab2c66f2fbf16a443936d3e..c5cf0e0b0cd367971e647201ea30b2f826193442 100644 (file)
--- a/drivers/edac/i82875p_edac.c
+++ b/drivers/edac/i82875p_edac.c
@@ -420,8 +420,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
        layers[1].type = EDAC_MC_LAYER_CHANNEL;
        layers[1].size = nr_chans;
        layers[1].is_virt_csrow = false;
-       mci = new_edac_mc_alloc(0, ARRAY_SIZE(layers), layers, sizeof(*pvt));
-       if (!mci) {
+       mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers, sizeof(*pvt));
                rc = -ENOMEM;
                goto fail0;
        }

diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c
index 70e0171828f7c34b932ae051c98189f1c4f0c5c5..4ea61535eb60f3b06d8b41b86a82f25ff58b90b9 100644 (file)
--- a/drivers/edac/i82975x_edac.c
+++ b/drivers/edac/i82975x_edac.c
@@ -555,7 +555,7 @@ static int i82975x_probe1(struct pci_dev *pdev, int dev_idx)
        layers[1].type = EDAC_MC_LAYER_CHANNEL;
        layers[1].size = I82975X_NR_CSROWS(chans);
        layers[1].is_virt_csrow = false;
-       mci = new_edac_mc_alloc(0, ARRAY_SIZE(layers), layers, sizeof(*pvt));
+       mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers, sizeof(*pvt));
        if (!mci) {
                rc = -ENOMEM;
                goto fail1;

diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
index a15141025a94816ac42a1836a8662ee5088e0ecd..4c402353ba98d9aeceb5bbd8062eeec916f39d9d 100644 (file)
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c
@@ -980,8 +980,7 @@ static int __devinit mpc85xx_mc_err_probe(struct platform_device *op)
        layers[1].type = EDAC_MC_LAYER_CHANNEL;
        layers[1].size = 1;
        layers[1].is_virt_csrow = false;
-       mci = new_edac_mc_alloc(edac_mc_idx, ARRAY_SIZE(layers), layers,
-                           sizeof(*pdata));
+       mci = edac_mc_alloc(edac_mc_idx, ARRAY_SIZE(layers), sizeof(*pdata));
        if (!mci) {
                devres_release_group(&op->dev, mpc85xx_mc_err_probe);
                return -ENOMEM;

diff --git a/drivers/edac/mv64x60_edac.c b/drivers/edac/mv64x60_edac.c
index 289a6cc859b424b94305505fac776909fa1f3549..b0bb5a3d2527698c1f4659997fc6950526e5e215 100644 (file)
--- a/drivers/edac/mv64x60_edac.c
+++ b/drivers/edac/mv64x60_edac.c
@@ -715,7 +715,7 @@ static int __devinit mv64x60_mc_err_probe(struct platform_device *pdev)
        layers[1].type = EDAC_MC_LAYER_CHANNEL;
        layers[1].size = 1;
        layers[1].is_virt_csrow = false;
-       mci = new_edac_mc_alloc(edac_mc_idx, ARRAY_SIZE(layers), layers,
+       mci = edac_mc_alloc(edac_mc_idx, ARRAY_SIZE(layers), layers,
                            sizeof(struct mv64x60_mc_pdata));
        if (!mci) {
                printk(KERN_ERR "%s: No memory for CPU err\n", __func__);

diff --git a/drivers/edac/pasemi_edac.c b/drivers/edac/pasemi_edac.c
index 46aed62436b59021cd55d44fdfcc1426aeb4cbfb..b095a906a994bc7b092362f21ed9f31eecf8d288 100644 (file)
--- a/drivers/edac/pasemi_edac.c
+++ b/drivers/edac/pasemi_edac.c
@@ -215,7 +215,7 @@ static int __devinit pasemi_edac_probe(struct pci_dev *pdev,
        layers[1].type = EDAC_MC_LAYER_CHANNEL;
        layers[1].size = PASEMI_EDAC_NR_CHANS;
        layers[1].is_virt_csrow = false;
-       mci = new_edac_mc_alloc(system_mmc_id++, ARRAY_SIZE(layers), layers,
+       mci = edac_mc_alloc(system_mmc_id++, ARRAY_SIZE(layers), layers,
                            0);
        if (mci == NULL)
                return -ENOMEM;

diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c
index 59f50b6f21d31a1398fd1ea03e71a9e2a108ec43..f3f9fed06ad7d34ec8e3607f8141da6256e88e49 100644 (file)
--- a/drivers/edac/ppc4xx_edac.c
+++ b/drivers/edac/ppc4xx_edac.c
@@ -1291,7 +1291,7 @@ static int __devinit ppc4xx_edac_probe(struct platform_device *op)
        layers[1].type = EDAC_MC_LAYER_CHANNEL;
        layers[1].size = ppc4xx_edac_nr_chans;
        layers[1].is_virt_csrow = false;
-       mci = new_edac_mc_alloc(ppc4xx_edac_instance, ARRAY_SIZE(layers), layers,
+       mci = edac_mc_alloc(ppc4xx_edac_instance, ARRAY_SIZE(layers), layers,
                            sizeof(struct ppc4xx_edac_pdata));
        if (mci == NULL) {
                ppc4xx_edac_printk(KERN_ERR, "%s: "

diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c
index e405107638507e4716318e296f07ed0a02cdf820..c1cf750aceba3d834518fe9e306c46dd6cd21fa1 100644 (file)
--- a/drivers/edac/r82600_edac.c
+++ b/drivers/edac/r82600_edac.c
@@ -291,7 +291,7 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)
        layers[1].type = EDAC_MC_LAYER_CHANNEL;
        layers[1].size = R82600_NR_CHANS;
        layers[1].is_virt_csrow = false;
-       mci = new_edac_mc_alloc(0, ARRAY_SIZE(layers), layers, 0);
+       mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers, 0);
        if (mci == NULL)
                return -ENOMEM;
 

diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index 3cf772bcb6dee7d5e975d19ffeadadb8e5e96486..9e11091fcbd01a3cd1e2b178065d1b0f92b44940 100644 (file)
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -1640,7 +1640,7 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev)
        layers[1].type = EDAC_MC_LAYER_SLOT;
        layers[1].size = MAX_DIMMS;
        layers[1].is_virt_csrow = true;
-       mci = new_edac_mc_alloc(sbridge_dev->mc, ARRAY_SIZE(layers), layers,
+       mci = edac_mc_alloc(sbridge_dev->mc, ARRAY_SIZE(layers), layers,
                            sizeof(*pvt));
 
        if (unlikely(!mci))

diff --git a/drivers/edac/tile_edac.c b/drivers/edac/tile_edac.c
index e01433fcd090b2745ad4a8af44baccdfd41ef29b..bb80fbcdb5672263ce1f7da59efbdf02abde2da3 100644 (file)
--- a/drivers/edac/tile_edac.c
+++ b/drivers/edac/tile_edac.c
@@ -141,7 +141,7 @@ static int __devinit tile_edac_mc_probe(struct platform_device *pdev)
        layers[1].type = EDAC_MC_LAYER_CHANNEL;
        layers[1].size = TILE_EDAC_NR_CHANS;
        layers[1].is_virt_csrow = false;
-       mci = new_edac_mc_alloc(pdev->id, ARRAY_SIZE(layers), layers,
+       mci = edac_mc_alloc(pdev->id, ARRAY_SIZE(layers), layers,
                            sizeof(struct tile_edac_priv));
        if (mci == NULL)
                return -ENOMEM;

diff --git a/drivers/edac/x38_edac.c b/drivers/edac/x38_edac.c
index 8785218832a203712241cf7a6f1d7836a5ec4abe..269becd9a31ad61f44a21f8f8a4537e5b38cea5b 100644 (file)
--- a/drivers/edac/x38_edac.c
+++ b/drivers/edac/x38_edac.c
@@ -348,7 +348,7 @@ static int x38_probe1(struct pci_dev *pdev, int dev_idx)
        layers[1].type = EDAC_MC_LAYER_CHANNEL;
        layers[1].size = x38_channel_num;
        layers[1].is_virt_csrow = false;
-       mci = new_edac_mc_alloc(0, ARRAY_SIZE(layers), layers, 0);
+       mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers, 0);
        if (!mci)
                return -ENOMEM;