[PATCH 326/437] drivers/net/ethernet/huawei: convert to read/write iterators

Jens Axboe posted 437 patches 1 year, 8 months ago
[PATCH 326/437] drivers/net/ethernet/huawei: convert to read/write iterators
Posted by Jens Axboe 1 year, 8 months ago
From: Bui Quang Minh <minhquangbui99@gmail.com>

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
 drivers/net/ethernet/huawei/hinic/hinic_debugfs.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/huawei/hinic/hinic_debugfs.c b/drivers/net/ethernet/huawei/hinic/hinic_debugfs.c
index 061952c6c21a..411d005a4a95 100644
--- a/drivers/net/ethernet/huawei/hinic/hinic_debugfs.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_debugfs.c
@@ -133,8 +133,7 @@ static int hinic_dbg_get_func_table(struct hinic_dev *nic_dev, int idx)
 	return ret;
 }
 
-static ssize_t hinic_dbg_cmd_read(struct file *filp, char __user *buffer, size_t count,
-				  loff_t *ppos)
+static ssize_t hinic_dbg_cmd_read_iter(struct kiocb *iocb, struct iov_iter *to)
 {
 	struct hinic_debug_priv *dbg;
 	char ret_buf[20];
@@ -142,7 +141,7 @@ static ssize_t hinic_dbg_cmd_read(struct file *filp, char __user *buffer, size_t
 	u64 out;
 	int ret;
 
-	desc = filp->private_data;
+	desc = iocb->ki_filp->private_data;
 	dbg = container_of(desc, struct hinic_debug_priv, field_id[*desc]);
 
 	switch (dbg->type) {
@@ -166,13 +165,13 @@ static ssize_t hinic_dbg_cmd_read(struct file *filp, char __user *buffer, size_t
 
 	ret = snprintf(ret_buf, sizeof(ret_buf), "0x%llx\n", out);
 
-	return simple_read_from_buffer(buffer, count, ppos, ret_buf, ret);
+	return simple_copy_to_iter(ret_buf, &iocb->ki_pos, ret, to);
 }
 
 static const struct file_operations hinic_dbg_cmd_fops = {
-	.owner = THIS_MODULE,
-	.open  = simple_open,
-	.read  = hinic_dbg_cmd_read,
+	.owner      = THIS_MODULE,
+	.open       = simple_open,
+	.read_iter  = hinic_dbg_cmd_read_iter,
 };
 
 static int create_dbg_files(struct hinic_dev *dev, enum hinic_dbg_type type, void *data,
-- 
2.43.0