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 273/437] watchdog: rc32434_wdt: convert to read/write iterators
    Date
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    ---
    drivers/watchdog/rc32434_wdt.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
    index 417f9b75679c..76c046c9beb9 100644
    --- a/drivers/watchdog/rc32434_wdt.c
    +++ b/drivers/watchdog/rc32434_wdt.c
    @@ -161,9 +161,9 @@ static int rc32434_wdt_release(struct inode *inode, struct file *file)
    return 0;
    }

    -static ssize_t rc32434_wdt_write(struct file *file, const char *data,
    - size_t len, loff_t *ppos)
    +static ssize_t rc32434_wdt_write(struct kiocb *iocb, struct iov_iter *from)
    {
    + size_t len = iov_iter_count(from);
    if (len) {
    if (!nowayout) {
    size_t i;
    @@ -173,7 +173,7 @@ static ssize_t rc32434_wdt_write(struct file *file, const char *data,

    for (i = 0; i != len; i++) {
    char c;
    - if (get_user(c, data + i))
    + if (get_iter(c, from))
    return -EFAULT;
    if (c == 'V')
    expect_close = 42;
    @@ -243,7 +243,7 @@ static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd,
    static const struct file_operations rc32434_wdt_fops = {
    .owner = THIS_MODULE,
    .llseek = no_llseek,
    - .write = rc32434_wdt_write,
    + .write_iter = rc32434_wdt_write,
    .unlocked_ioctl = rc32434_wdt_ioctl,
    .compat_ioctl = compat_ptr_ioctl,
    .open = rc32434_wdt_open,
    --
    2.43.0

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