mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 08/11] ARM: i.MX: iim: move static variables into driver struct
Date: Fri, 16 May 2014 12:30:55 +0200	[thread overview]
Message-ID: <1400236258-17924-8-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1400236258-17924-1-git-send-email-s.hauer@pengutronix.de>

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/mach-imx/iim.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-imx/iim.c b/arch/arm/mach-imx/iim.c
index 4a94a68..decf735 100644
--- a/arch/arm/mach-imx/iim.c
+++ b/arch/arm/mach-imx/iim.c
@@ -32,9 +32,6 @@
 #define DRIVERNAME	"imx_iim"
 #define IIM_NUM_BANKS	8
 
-static int iim_write_enable;
-static int iim_sense_enable;
-
 struct iim_priv;
 
 struct iim_bank {
@@ -50,6 +47,8 @@ struct iim_priv {
 	void __iomem *base;
 	void __iomem *bankbase;
 	struct iim_bank *bank[IIM_NUM_BANKS];
+	int write_enable;
+	int sense_enable;
 };
 
 static int imx_iim_fuse_sense(struct iim_bank *bank, unsigned int row)
@@ -97,7 +96,7 @@ static ssize_t imx_iim_cdev_read(struct cdev *cdev, void *buf, size_t count,
 	struct iim_bank *bank = container_of(cdev, struct iim_bank, cdev);
 
 	size = min((loff_t)count, 32 - offset);
-	if (iim_sense_enable) {
+	if (bank->iim->sense_enable) {
 		for (i = 0; i < size; i++) {
 			int row_val;
 
@@ -178,7 +177,7 @@ static ssize_t imx_iim_cdev_write(struct cdev *cdev, const void *buf, size_t cou
 
 	size = min((loff_t)count, 32 - offset);
 
-	if (IS_ENABLED(CONFIG_IMX_IIM_FUSE_BLOW) && iim_write_enable) {
+	if (IS_ENABLED(CONFIG_IMX_IIM_FUSE_BLOW) && bank->iim->write_enable) {
 		for (i = 0; i < size; i++) {
 			int ret;
 
@@ -298,10 +297,10 @@ static int imx_iim_probe(struct device_d *dev)
 
 	if (IS_ENABLED(CONFIG_IMX_IIM_FUSE_BLOW))
 		dev_add_param_bool(&iim->dev, "permanent_write_enable",
-			NULL, NULL, &iim_write_enable, NULL);
+			NULL, NULL, &iim->write_enable, NULL);
 
 	dev_add_param_bool(&iim->dev, "explicit_sense_enable",
-			NULL, NULL, &iim_sense_enable, NULL);
+			NULL, NULL, &iim->sense_enable, NULL);
 
 	return 0;
 }
-- 
2.0.0.rc0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2014-05-16 10:31 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-16 10:30 [PATCH 01/11] ARM: i.MX: iim: Check result of dev_request_mem_region Sascha Hauer
2014-05-16 10:30 ` [PATCH 02/11] ARM: i.MX: iim: introduce private data struct Sascha Hauer
2014-05-16 10:30 ` [PATCH 03/11] ARM: i.MX: iim: Add namespace to functions Sascha Hauer
2014-05-16 10:30 ` [PATCH 04/11] ARM: i.MX: iim: register iim device Sascha Hauer
2014-05-16 10:30 ` [PATCH 05/11] ARM: i.MX: iim: pass private data struct to imx_iim_fuse_blow Sascha Hauer
2014-05-16 10:30 ` [PATCH 06/11] ARM: i.MX: iim: pass private data struct to imx_iim_fuse_sense Sascha Hauer
2014-05-16 10:30 ` [PATCH 07/11] ARM: i.MX: iim: use dev_* for messages Sascha Hauer
2014-05-16 10:30 ` Sascha Hauer [this message]
2014-05-16 10:30 ` [PATCH 09/11] ARM: i.MX: iim: don't make detour over cdev API Sascha Hauer
2014-05-16 10:30 ` [PATCH 10/11] ARM: i.MX: iim: make fuse blowing work on i.MX5 Sascha Hauer
2014-05-16 10:30 ` [PATCH 11/11] ARM: i.MX: iim: provide a MAC address convenience variable Sascha Hauer

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=1400236258-17924-8-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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