Received: by 2002:ab2:7988:0:b0:1f4:b336:87c4 with SMTP id g8csp54166lqj; Thu, 11 Apr 2024 09:38:29 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVigm4i+e4GrkEDy/iW92tK3T9lSxmPta//wRk2ilfL50XL5OwDeYN5YYNSCbv6Gm+fGK1eczWqQnpBFJy6qWU495GExgtrORh3KM6LVg== X-Google-Smtp-Source: AGHT+IF0w0G+pelqJKDsVEJFT+ee+jlVoFPNQfCqP/81eaPY9gGS2nP25RxJiBPcXaTWR8ghCSSr X-Received: by 2002:a50:d519:0:b0:56d:f405:9a42 with SMTP id u25-20020a50d519000000b0056df4059a42mr259015edi.2.1712853508893; Thu, 11 Apr 2024 09:38:28 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712853508; cv=pass; d=google.com; s=arc-20160816; b=jqRxxCy/+6L8cZUF0LA9wndz+JFeOVu895kV/84XacN1SO/7tBDKZPrEgljz8tIGGx N8gZ62Ua9yOVoXjTTPwvN3BXHfbJtejY1NpfJWX8iAO/8w2WvRNniR8YXC6LVOrRUrLE DA0buJHkES/hGzB98Iglz9pdtEJS9ptxK9tXAZAMxpcQo3RCyIBuHfXiYwZSOt62DXM6 ozuw0Nz3CYRU7mOG4A7cULjS6LDeKiWI1S6xUaygDXF97XZ8AWis6tRbA8AoA4mW8Dcj iQsqFl2UQDMOMFFDgOQ+am3j9ioAjzREJl/sr2D++FrfeTlO+Fq1PEV/dp2DB7uXrr2y Ccog== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=53JvdJjKxSCyz+n3tel8rdHfSTpWXYjnOnA3jputiX4=; fh=2FInBIgEh7xt9W7JS1z2wQ7fUhvLHtwfAfkXluU3JoI=; b=TNmiP+uqn8ByZJU5YLnz0dXOhQUdJf5m+IHUrbJjK+RLdlKd5n839FqCFWhyH/wxi6 jiS+RnC2DxczxToF7RAq4f6TXjcIvMB7Qqd/yVYkuEf92SRcSA7MRM6OUCKHNMuDeOx5 jYb2ltJS2AdAvfCNhToHdV3tHu0d1//HrjfURdIcVohFmHeVsm/sURti4o+/KpPjVzMy ToEJkWpgIilyUHEGSTJrXkTXRPNqUE1gnzNo8MW6w8MEErzyhsrgmLrNBFPSKmTtNPhU 3EmfF+iEN/E61yxMgoksC8P3gH2y0wyfOcLC/yUZurJkzC2cINrhldnLNJVH1PvgeW4R LdHQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel-dk.20230601.gappssmtp.com header.s=20230601 header.b=CYtWoUu5; arc=pass (i=1 spf=pass spfdomain=kernel.dk dkim=pass dkdomain=kernel-dk.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-141024-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-141024-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id 30-20020a508e1e000000b0056c1cc96ba0si904672edw.642.2024.04.11.09.38.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Apr 2024 09:38:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-141024-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel-dk.20230601.gappssmtp.com header.s=20230601 header.b=CYtWoUu5; arc=pass (i=1 spf=pass spfdomain=kernel.dk dkim=pass dkdomain=kernel-dk.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-141024-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-141024-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id C58901F25A11 for ; Thu, 11 Apr 2024 16:37:29 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E51CD17D151; Thu, 11 Apr 2024 15:38:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="CYtWoUu5" Received: from mail-il1-f182.google.com (mail-il1-f182.google.com [209.85.166.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 69C7D1C8235 for ; Thu, 11 Apr 2024 15:38:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712849920; cv=none; b=boiDDyo5CDtItsd8fCjzCZSsiDY0CMI8XXfgCUSbDlburrvSTX+LABs3rtWjKzqlMqnYfbUEystBsQR6XKmMwHTZD4vVOHhBqL8Ctm9XaCGEtrmA8qPy8Ks/ed19MWaHNsMiB90E0TqYPoMGmAvhGIOED3OU/S873/KmkMsV8xA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712849920; c=relaxed/simple; bh=F83XvFrx76isF/dT0LWcQ3VyyodAlP/DQbr4dsQvEmA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s8v2soJNDCqhiCtibLI63ioO8K64/5I6lF2i34/30DOp/qWUbnB3UkTw/uFxmpjAjcXkwVMmYkA6t4WhAeDyPbJq3T7gNBsoJ21osWiMxu9E6nIp9uDA+m0COS6K2iO7letpP8MwwgqiQHx1Lw/Jf83E/3t7ZJXStrnVz5lTV50= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=CYtWoUu5; arc=none smtp.client-ip=209.85.166.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Received: by mail-il1-f182.google.com with SMTP id e9e14a558f8ab-36a224d7414so187805ab.1 for ; Thu, 11 Apr 2024 08:38:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1712849917; x=1713454717; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=53JvdJjKxSCyz+n3tel8rdHfSTpWXYjnOnA3jputiX4=; b=CYtWoUu5Vdu82iify3aGoCaO6DNSJH77WXN9CH0MfeoBFjnvQUp6kz6TDsO7YcdTQ9 blKZxBfVrhLIylD7I5juUiMZ4tB/Z3jaicOqvDQSx4jMYoasOKwQPwowbhh/nc+l0T4s 5/AfbnkFTuIBuPxFnULaYmKwm6muf0lN4ZoiHS2rS62tKhlSVL5aR6uKnK/1NWr4ZYIz oAno4guJTb4J/IinM/2jdPxIZ+JBbApKHz8yhWVREvetSMDVVHiwGtEjkBH5vj57mLKg ulWAz1WWqT0VSUcRdeEfF8HUlgUnFDvzVL3NiB036idNkPCmZCmOsV/CI7WwkuWNh/5U dwBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712849917; x=1713454717; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=53JvdJjKxSCyz+n3tel8rdHfSTpWXYjnOnA3jputiX4=; b=c/MFo1V7BexI6aMZHc1/gK8eT+Hp1WwWZxfCmESjfKZ8HqxWqXgmPy4zOYJdHidhhw ozzg2rVPn46GkCNrk6QbzwC74q8m+8VzhcCFWJ0GpVmt4/g6v3/gSbPeQxhblfZSGAWO kAGWQTF4qL8qYa0eG+7CU6UzoN1uDWd6xuejjmQHATgdcLReZbh7MKhUBvivyZhxnPjB DgG9Ff1y5v8evpufIXn/LJmYxvZKZy6JWGlj9Ylw0D83rWmXeiofMkMWhRFJSKlhYveo 1BoOnCz0fzMC90ecVDHHwGn1f0UfGjsVgdYjhdbcT83AE3s861lekG79mZt7uZwLOMpK SMfQ== X-Gm-Message-State: AOJu0YzSPAoykUaSCpc711/EB+vp4XGsV7zkQC538Anbfckf2B/9ILvm OKnh8fav3bHtZEOybLLyKKllQ1XZivI5lASSt2+mQhanYj9frlTskTUCcr1EijlH6k0FyRdhOgv v X-Received: by 2002:a6b:4e14:0:b0:7d6:631d:7b0 with SMTP id c20-20020a6b4e14000000b007d6631d07b0mr194501iob.1.1712849917254; Thu, 11 Apr 2024 08:38:37 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id jc25-20020a056638891900b0047f14b7f6c0sm457056jab.5.2024.04.11.08.38.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Apr 2024 08:38:35 -0700 (PDT) From: Jens Axboe To: linux-kernel@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 251/437] watchdog: sa1100_wdt: convert to read/write iterators Date: Thu, 11 Apr 2024 09:16:31 -0600 Message-ID: <20240411153126.16201-252-axboe@kernel.dk> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240411153126.16201-1-axboe@kernel.dk> References: <20240411153126.16201-1-axboe@kernel.dk> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Signed-off-by: Jens Axboe --- drivers/watchdog/sa1100_wdt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c index 5d2df008b92a..f994b52565ec 100644 --- a/drivers/watchdog/sa1100_wdt.c +++ b/drivers/watchdog/sa1100_wdt.c @@ -98,9 +98,9 @@ static int sa1100dog_release(struct inode *inode, struct file *file) return 0; } -static ssize_t sa1100dog_write(struct file *file, const char __user *data, - size_t len, loff_t *ppos) +static ssize_t sa1100dog_write(struct kiocb *iocb, struct iov_iter *from) { + size_t len = iov_iter_count(from); if (len) /* Refresh OSMR3 timer. */ sa1100_wr(sa1100_rd(REG_OSCR) + pre_margin, REG_OSMR3); @@ -165,7 +165,7 @@ static long sa1100dog_ioctl(struct file *file, unsigned int cmd, static const struct file_operations sa1100dog_fops = { .owner = THIS_MODULE, .llseek = no_llseek, - .write = sa1100dog_write, + .write_iter = sa1100dog_write, .unlocked_ioctl = sa1100dog_ioctl, .compat_ioctl = compat_ptr_ioctl, .open = sa1100dog_open, -- 2.43.0