lkml.org 
[lkml]   [2024]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 343/437] s390: hmcdrv: convert to read/write iterators
    Date
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    ---
    drivers/s390/char/hmcdrv_dev.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/drivers/s390/char/hmcdrv_dev.c b/drivers/s390/char/hmcdrv_dev.c
    index 8d50c894711f..df793008a390 100644
    --- a/drivers/s390/char/hmcdrv_dev.c
    +++ b/drivers/s390/char/hmcdrv_dev.c
    @@ -56,10 +56,8 @@ struct hmcdrv_dev_node {
    static int hmcdrv_dev_open(struct inode *inode, struct file *fp);
    static int hmcdrv_dev_release(struct inode *inode, struct file *fp);
    static loff_t hmcdrv_dev_seek(struct file *fp, loff_t pos, int whence);
    -static ssize_t hmcdrv_dev_read(struct file *fp, char __user *ubuf,
    - size_t len, loff_t *pos);
    -static ssize_t hmcdrv_dev_write(struct file *fp, const char __user *ubuf,
    - size_t len, loff_t *pos);
    +static ssize_t hmcdrv_dev_read_iter(struct kiocb *iocb, struct iov_iter *to);
    +static ssize_t hmcdrv_dev_write_iter(struct kiocb *iocb, struct iov_iter *from);
    static ssize_t hmcdrv_dev_transfer(char __kernel *cmd, loff_t offset,
    char __user *buf, size_t len);

    @@ -70,8 +68,8 @@ static const struct file_operations hmcdrv_dev_fops = {
    .open = hmcdrv_dev_open,
    .llseek = hmcdrv_dev_seek,
    .release = hmcdrv_dev_release,
    - .read = hmcdrv_dev_read,
    - .write = hmcdrv_dev_write,
    + .read_iter = hmcdrv_dev_read_iter,
    + .write_iter = hmcdrv_dev_write_iter,
    };

    static struct hmcdrv_dev_node hmcdrv_dev; /* HMC device struct (static) */
    @@ -239,6 +237,7 @@ static ssize_t hmcdrv_dev_read(struct file *fp, char __user *ubuf,

    return retlen;
    }
    +FOPS_READ_ITER_HELPER(hmcdrv_dev_read);

    /*
    * write()
    @@ -276,6 +275,7 @@ static ssize_t hmcdrv_dev_write(struct file *fp, const char __user *ubuf,

    return retlen;
    }
    +FOPS_WRITE_ITER_HELPER(hmcdrv_dev_write);

    /**
    * hmcdrv_dev_init() - creates a HMC drive CD/DVD device
    --
    2.43.0

    \
     
     \ /
      Last update: 2024-05-27 16:36    [W:2.431 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site