From: <tthayer@opensource.altera.com>
To: bp@alien8.de, dougthompson@xmission.com, m.chehab@samsung.com,
robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com,
ijc+devicetree@hellion.org.uk, galak@codeaurora.org,
linux@arm.linux.org.uk, dinguyen@opensource.altera.com,
grant.likely@linaro.org
Cc: devicetree@vger.kernel.org, linux-doc@vger.kernel.org,
linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, tthayer.linux@gmail.com,
tthayer@opensource.altera.com
Subject: [PATCHv3 3/9] EDAC, altera: Remove platform device from check_deps()
Date: Mon, 21 Mar 2016 11:01:40 -0500 [thread overview]
Message-ID: <1458576106-24505-4-git-send-email-tthayer@opensource.altera.com> (raw)
In-Reply-To: <1458576106-24505-1-git-send-email-tthayer@opensource.altera.com>
From: Thor Thayer <tthayer@opensource.altera.com>
In preparation for the Arria10 peripheral ECCs, the
platform device parameter is removed 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>
---
v3: This change added.
---
drivers/edac/altera_edac.c | 10 +++++-----
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 eee7a39..e20a045 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 993bb0a..32c798a 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];
--
1.7.9.5
next prev parent reply other threads:[~2016-03-21 16:01 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-21 16:01 Series adding Arria10 L2 Cache EDAC tthayer-yzvPICuk2ABMcg4IHK0kFoH6Mc4MB0Vx
2016-03-21 16:01 ` [PATCHv3 1/9] EDAC: Altera L2 Kconfig change from select to depends upon tthayer
2016-03-21 16:01 ` [PATCHv3 2/9] EDAC, altera: Move Device structs and defines to header file tthayer
2016-03-21 16:01 ` tthayer [this message]
2016-03-21 16:01 ` [PATCHv3 4/9] EDAC, altera: Abstract ECC Enable Mask in check_deps() tthayer
2016-03-21 16:01 ` [PATCHv3 5/9] EDAC, altera: Add register offset for ECC Error Inject tthayer
2016-03-21 16:01 ` [PATCHv3 6/9] Documentation: dt: socfpga: Add Altera Arria10 L2 cache binding tthayer
2016-03-23 14:24 ` Rob Herring
2016-03-21 16:01 ` [PATCHv3 7/9] EDAC, altera: Addition of Arria10 L2 Cache ECC tthayer
2016-03-21 16:01 ` [PATCHv3 8/9] ARM: socfpga: Enable Arria10 L2 cache ECC on startup tthayer
2016-03-21 16:01 ` [PATCHv3 9/9] ARM: dts: Add Altera Arria10 L2 Cache EDAC devicetree entry tthayer
2016-03-29 8:45 ` Borislav Petkov
2016-03-29 12:15 ` Dinh Nguyen
2016-03-29 14:00 ` Borislav Petkov
2016-03-29 15:48 ` Dinh Nguyen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1458576106-24505-4-git-send-email-tthayer@opensource.altera.com \
--to=tthayer@opensource.altera.com \
--cc=bp@alien8.de \
--cc=devicetree@vger.kernel.org \
--cc=dinguyen@opensource.altera.com \
--cc=dougthompson@xmission.com \
--cc=galak@codeaurora.org \
--cc=grant.likely@linaro.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=m.chehab@samsung.com \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=tthayer.linux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).