diff options
| author | Thor Thayer <tthayer@opensource.altera.com> | 2016-03-21 11:01:40 -0500 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2016-03-29 10:14:21 +0200 |
| commit | 328ca7ae81dd842ff56b35f1e8422e6af1c80c14 (patch) | |
| tree | a9d2e132583103e4643ed46ddf53f66e7933b3a5 /drivers/edac | |
| parent | 05b088b6f8f21ed6a451c9a5fc8ec23cec665f12 (diff) | |
| download | linux-328ca7ae81dd842ff56b35f1e8422e6af1c80c14.tar.bz2 | |
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>
Diffstat (limited to 'drivers/edac')
| -rw-r--r-- | drivers/edac/altera_edac.c | 10 | ||||
| -rw-r--r-- | drivers/edac/altera_edac.h | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c index eee7a395666e..e20a045cbf20 100644 --- 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 993bb0a7a372..32c798a6f980 100644 --- 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]; |