EDAC, altera: Remove platform device from check_deps()

In preparation for the Arria10 peripheral ECCs, remove the platform
device parameter from the check_deps() functions because it is not
needed and makes the Arria10 check_deps() cleaner.

Signed-off-by: Thor Thayer <tthayer@opensource.altera.com>
Cc: devicetree@vger.kernel.org
Cc: dinguyen@opensource.altera.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux@arm.linux.org.uk
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/1458576106-24505-4-git-send-email-tthayer@opensource.altera.com
Signed-off-by: Borislav Petkov <bp@suse.de>

diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c
index eee7a395666e710db438f06b82b4c2c2e86fda8b..e20a045cbf209b3c73121aa53ca55a216515537e 100644 (file)
--- a/drivers/edac/altera_edac.c
+++ b/drivers/edac/altera_edac.c
@@ -746,7 +746,7 @@ static int altr_edac_device_probe(struct platform_device *pdev)
 
        /* Check specific dependencies for the module */
        if (drvdata->data->setup) {
-               res = drvdata->data->setup(pdev, drvdata->base);
+               res = drvdata->data->setup(drvdata);
                if (res)
                        goto fail1;
        }
@@ -856,9 +856,9 @@ static void ocram_free_mem(void *p, size_t size, void *other)
  *     Can't turn on ECC here because accessing un-initialized
  *     memory will cause CE/UE errors possibly causing an ABORT.
  */
-static int altr_ocram_check_deps(struct platform_device *pdev,
-                                void __iomem *base)
+static int altr_ocram_check_deps(struct altr_edac_device_dev *device)
 {
+       void __iomem  *base = device->base;
        if (readl(base) & ALTR_OCR_ECC_EN)
                return 0;
 
@@ -923,9 +923,9 @@ static void l2_free_mem(void *p, size_t size, void *other)
  *     Bail if ECC is not enabled.
  *     Note that L2 Cache Enable is forced at build time.
  */
-static int altr_l2_check_deps(struct platform_device *pdev,
-                             void __iomem *base)
+static int altr_l2_check_deps(struct altr_edac_device_dev *device)
 {
+       void __iomem *base = device->base;
        if (readl(base) & ALTR_L2_ECC_EN)
                return 0;
 

diff --git a/drivers/edac/altera_edac.h b/drivers/edac/altera_edac.h
index 993bb0a7a3721b9b6086be5f5df5ccebb776d520..32c798a6f980495c1a68db66bd3956404797a0e5 100644 (file)
--- a/drivers/edac/altera_edac.h
+++ b/drivers/edac/altera_edac.h
@@ -217,8 +217,10 @@ struct altr_sdram_mc_data {
 #define ALTR_L2_ECC_INJS                BIT(1)
 #define ALTR_L2_ECC_INJD                BIT(2)
 
+struct altr_edac_device_dev;
+
 struct edac_device_prv_data {
-       int (*setup)(struct platform_device *pdev, void __iomem *base);
+       int (*setup)(struct altr_edac_device_dev *device);
        int ce_clear_mask;
        int ue_clear_mask;
        char dbgfs_name[20];