mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 4/5] eeprom: at24: Drop at24_cdev_protect()
Date: Mon, 12 Aug 2019 13:19:14 -0700	[thread overview]
Message-ID: <20190812201915.12414-4-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190812201915.12414-1-andrew.smirnov@gmail.com>

Instead of exposing a dedictaed .protect() callback, mimic the
behaviour of corresponding driver in Linux and adjust the value of WP
pin in .write() callback as necessary. This is done in order to
convert this driver to NVMEM subsytem.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 drivers/eeprom/at24.c | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/drivers/eeprom/at24.c b/drivers/eeprom/at24.c
index 1fd4aeaba6..db452c1076 100644
--- a/drivers/eeprom/at24.c
+++ b/drivers/eeprom/at24.c
@@ -317,6 +317,19 @@ static ssize_t at24_eeprom_write(struct at24_data *at24, const char *buf,
 	return -ETIMEDOUT;
 }
 
+static void at24_protect(struct at24_data *at24, bool prot)
+{
+	if (gpio_is_valid(at24->wp_gpio)) {
+
+		if (at24->wp_active_low)
+			prot = !prot;
+
+		gpio_set_value(at24->wp_gpio, prot);
+
+		udelay(50);
+	}
+}
+
 static ssize_t at24_write(struct at24_data *at24, const char *buf, loff_t off,
 			  size_t count)
 {
@@ -325,6 +338,8 @@ static ssize_t at24_write(struct at24_data *at24, const char *buf, loff_t off,
 	if (unlikely(!count))
 		return count;
 
+	at24_protect(at24, false);
+
 	while (count) {
 		ssize_t	status;
 
@@ -340,6 +355,8 @@ static ssize_t at24_write(struct at24_data *at24, const char *buf, loff_t off,
 		retval += status;
 	}
 
+	at24_protect(at24, true);
+
 	return retval;
 }
 
@@ -351,25 +368,6 @@ static ssize_t at24_cdev_write(struct cdev *cdev, const void *buf, size_t count,
 	return at24_write(at24, buf, off, count);
 }
 
-static int at24_cdev_protect(struct cdev *cdev, size_t count, loff_t offset,
-		int prot)
-{
-	struct at24_data *at24 = cdev->priv;
-
-	if (!gpio_is_valid(at24->wp_gpio))
-		return -EOPNOTSUPP;
-
-	prot = !!prot;
-	if (at24->wp_active_low)
-		prot = !prot;
-
-	gpio_set_value(at24->wp_gpio, prot);
-
-	udelay(50);
-
-	return 0;
-}
-
 static int at24_probe(struct device_d *dev)
 {
 	struct i2c_client *client = to_i2c_client(dev);
@@ -448,7 +446,6 @@ static int at24_probe(struct device_d *dev)
 	at24->cdev.dev = dev;
 	at24->cdev.ops = &at24->fops;
 	at24->fops.read	= at24_cdev_read,
-	at24->fops.protect = at24_cdev_protect,
 	at24->cdev.size = chip.byte_len;
 
 	writable = !(chip.flags & AT24_FLAG_READONLY);
-- 
2.21.0


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

  parent reply	other threads:[~2019-08-12 20:19 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-12 20:19 [PATCH 1/5] nvmem: Use helper variable in nvmem_register_cdev() Andrey Smirnov
2019-08-12 20:19 ` [PATCH 2/5] nvmem: Use already existing dev pointer " Andrey Smirnov
2019-08-12 20:19 ` [PATCH 3/5] nvmem: Parse partitions information Andrey Smirnov
2019-08-12 20:19 ` Andrey Smirnov [this message]
2019-08-12 20:19 ` [PATCH 5/5] eeprom: at24: Convert the driver to NVMEM Andrey Smirnov
2019-09-05 22:38   ` Antony Pavlov
2019-09-06  5:23     ` Andrey Smirnov
2019-08-16 11:43 ` [PATCH 1/5] nvmem: Use helper variable in nvmem_register_cdev() 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=20190812201915.12414-4-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --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