Received-SPF: pass (google.com: domain of linux-kernel+bounces-140984-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: Jens Axboe <axboe@kernel.dk>
To: linux-kernel@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>
Subject: [PATCH 214/437] misc: eeprom/idt_89hpesx: convert to read/write iterators
Date: Thu, 11 Apr 2024 09:15:54 -0600
Message-ID: <20240411153126.16201-215-axboe@kernel.dk>
In-Reply-To: <20240411153126.16201-1-axboe@kernel.dk>
References: <20240411153126.16201-1-axboe@kernel.dk>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
 drivers/misc/eeprom/idt_89hpesx.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/drivers/misc/eeprom/idt_89hpesx.c b/drivers/misc/eeprom/idt_89hpesx.c
index 327afb866b21..dfb68c0cc999 100644
--- a/drivers/misc/eeprom/idt_89hpesx.c
+++ b/drivers/misc/eeprom/idt_89hpesx.c
@@ -900,20 +900,20 @@ static ssize_t eeprom_read(struct file *filp, struct kobject *kobj,
  * "<reg addr>:<value>". Register address must be aligned within 4 bytes
  * (one DWORD).
  */
-static ssize_t idt_dbgfs_csr_write(struct file *filep, const char __user *ubuf,
-				   size_t count, loff_t *offp)
+static ssize_t idt_dbgfs_csr_write(struct kiocb *iocb, struct iov_iter *from)
 {
-	struct idt_89hpesx_dev *pdev = filep->private_data;
+	struct idt_89hpesx_dev *pdev = iocb->ki_filp->private_data;
 	char *colon_ch, *csraddr_str, *csrval_str;
+	size_t count = iov_iter_count(from);
 	int ret;
 	u32 csraddr, csrval;
 	char *buf;
 
-	if (*offp)
+	if (iocb->ki_pos)
 		return 0;
 
 	/* Copy data from User-space */
-	buf = memdup_user_nul(ubuf, count);
+	buf = iterdup(from, count);
 	if (IS_ERR(buf))
 		return PTR_ERR(buf);
 
@@ -987,10 +987,9 @@ static ssize_t idt_dbgfs_csr_write(struct file *filep, const char __user *ubuf,
  * It just prints the pair "0x<reg addr>:0x<value>" to passed buffer.
  */
 #define CSRBUF_SIZE	((size_t)32)
-static ssize_t idt_dbgfs_csr_read(struct file *filep, char __user *ubuf,
-				  size_t count, loff_t *offp)
+static ssize_t idt_dbgfs_csr_read(struct kiocb *iocb, struct iov_iter *to)
 {
-	struct idt_89hpesx_dev *pdev = filep->private_data;
+	struct idt_89hpesx_dev *pdev = iocb->ki_filp->private_data;
 	u32 csraddr, csrval;
 	char buf[CSRBUF_SIZE];
 	int ret, size;
@@ -1008,7 +1007,7 @@ static ssize_t idt_dbgfs_csr_read(struct file *filep, char __user *ubuf,
 		(unsigned int)csraddr, (unsigned int)csrval);
 
 	/* Copy data to User-space */
-	return simple_read_from_buffer(ubuf, count, offp, buf, size);
+	return simple_copy_to_iter(buf, &iocb->ki_pos, size, to);
 }
 
 /*
@@ -1025,8 +1024,8 @@ static BIN_ATTR_RW(eeprom, EEPROM_DEF_SIZE);
 static const struct file_operations csr_dbgfs_ops = {
 	.owner = THIS_MODULE,
 	.open = simple_open,
-	.write = idt_dbgfs_csr_write,
-	.read = idt_dbgfs_csr_read
+	.write_iter = idt_dbgfs_csr_write,
+	.read_iter = idt_dbgfs_csr_read
 };
 
 /*===========================================================================
-- 
2.43.0