From nobody Fri Dec 19 17:15:21 2025 Received: from mail-io1-f54.google.com (mail-io1-f54.google.com [209.85.166.54]) (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 2A4AE84DF8 for ; Thu, 11 Apr 2024 15:37:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712849876; cv=none; b=k4PZHp0E7b0FXmT68yaGwcASwHmbDtQVAePwo9J2VtGx9jJ4klA+/lxHaeoZ81peMcdmPcgBORQSQ8Vy6Jk6+51dBz1l5baTlzZD5RsklxmZ6zNC2GjkUKksURwMFTRxKLhCElfJch+i5MD5TwMwPO0ii+WQwIxHlP/d5KIXZf4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712849876; c=relaxed/simple; bh=2b+wmRTPa43GlgcQRxpKllSYOoAfs4n74u6WABWCQoI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pRM+m7szQmPPa8TSM6uWKuH3vhdui4h0W4T1KJvqoslZMYyH+GYBFgUiMEkorsMqiDXoe01QnNo9BGQDj7SPp4FwaNvMzRdkCYvdL1Yq7ANRCJ/UThN3dg+f9VIveQWQeqMb1fxK+dG1CFqQB4afo7bqRQkTaCNk/oSW2c/Mni4= 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=f7cZ+6n4; arc=none smtp.client-ip=209.85.166.54 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 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="f7cZ+6n4" Received: by mail-io1-f54.google.com with SMTP id ca18e2360f4ac-7d67d1073easo9828139f.0 for ; Thu, 11 Apr 2024 08:37:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1712849874; x=1713454674; 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=gMcAzrEZJ/ituJuEchEklnEamqivJ8zTrCNfYMwWS1g=; b=f7cZ+6n49Le4VTGXUfWqbG1cDzS1KEUwXH1dfuuPxoAtNfAzEqsdaqyErowjKF/V2u PkdIIInVhaKsw3/r7VCKSylUwDCTgXa5Ld5ZOuKupvV3bzPZDhn7dBS2aAyZz7CCC+S4 nC+Hde56F+DI9Z1Q+Ri6uheFlnS6hXjBsxg0OpAtHb9gcSkKUiMztVPIdC351sRekuyz 7nNGGLFtD2fxMKeD09yFY78eabd1kEiTYppmreRkHiD+vDjhwxBs8eq2PaBXZ5n1JC7z 2oDq7h54bPD/spOKXa3FjUUHdY8kNziBjsAh6vusLW9Nb/wS4xXza3+wH43oM0PUWca/ StTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712849874; x=1713454674; 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=gMcAzrEZJ/ituJuEchEklnEamqivJ8zTrCNfYMwWS1g=; b=KMSsr6GEUDbMKh58ZB0Km0jr4GC/tuoxKYnDQ8bTRT5627Q7yWGEWqZQnR7xmd4sO2 jrMoDNy4RNnO6DxpVLSnE73ras++M7eoXiHqZTDglTfaexaDjWYMD657ZKzPZcLUaz/R LtrRzGZtggR3hk44xyfm1FTRAzFrMrTsFBvllYETKRKFcHFhbam7+em8bWX1p1/7LcQK rs/rJcx11I4aNZ3+FdQynr9f25A/Nb1byVvyVv+oqwsA/mj1jgXkQGIguJV+ozkWYSoL ATEC072bf52WM3mBsE0B1CgLRGykN7M2zrkg8/fQWmaZeNxDOifivPv9SeCfEmFw5vjX 52XA== X-Gm-Message-State: AOJu0Yy0gCFMx/WLf1aXqR0+e9ZnASP+Old1GFG/SDnUH7xP+HoIthIU UPgSmOzM0VZZZZCC8glcoAttZ4N0cT40PsQvG14RgeGiW0/8ueXsQ1kaMZhFiE3Srwgtuh+PNmy Z X-Google-Smtp-Source: AGHT+IEwi6vJuKt9dpmAhSXAkYuOH2Zxw0c5i3O3wYHyS8ooLuWOsOeMVVGldgROJjwAutjJBm2/Xg== X-Received: by 2002:a92:2c10:0:b0:36a:2d25:3d82 with SMTP id t16-20020a922c10000000b0036a2d253d82mr6166719ile.0.1712849874001; Thu, 11 Apr 2024 08:37:54 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id jc25-20020a056638891900b0047f14b7f6c0sm457056jab.5.2024.04.11.08.37.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Apr 2024 08:37:52 -0700 (PDT) From: Jens Axboe To: linux-kernel@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 223/437] drivers/leds: convert to read/write iterators Date: Thu, 11 Apr 2024 09:16:03 -0600 Message-ID: <20240411153126.16201-224-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: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Jens Axboe --- drivers/leds/uleds.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/drivers/leds/uleds.c b/drivers/leds/uleds.c index 3d361c920030..b1fa00407364 100644 --- a/drivers/leds/uleds.c +++ b/drivers/leds/uleds.c @@ -70,10 +70,10 @@ static int uleds_open(struct inode *inode, struct file = *file) return 0; } =20 -static ssize_t uleds_write(struct file *file, const char __user *buffer, - size_t count, loff_t *ppos) +static ssize_t uleds_write(struct kiocb *iocb, struct iov_iter *from) { - struct uleds_device *udev =3D file->private_data; + struct uleds_device *udev =3D iocb->ki_filp->private_data; + size_t count =3D iov_iter_count(from); const char *name; int ret; =20 @@ -94,8 +94,8 @@ static ssize_t uleds_write(struct file *file, const char = __user *buffer, goto out; } =20 - if (copy_from_user(&udev->user_dev, buffer, - sizeof(struct uleds_user_dev))) { + if (!copy_from_iter_full(&udev->user_dev, sizeof(struct uleds_user_dev), + from)) { ret =3D -EFAULT; goto out; } @@ -128,10 +128,10 @@ static ssize_t uleds_write(struct file *file, const c= har __user *buffer, return ret; } =20 -static ssize_t uleds_read(struct file *file, char __user *buffer, size_t c= ount, - loff_t *ppos) +static ssize_t uleds_read(struct kiocb *iocb, struct iov_iter *to) { - struct uleds_device *udev =3D file->private_data; + struct uleds_device *udev =3D iocb->ki_filp->private_data; + size_t count =3D iov_iter_count(to); ssize_t retval; =20 if (count < sizeof(udev->brightness)) @@ -144,13 +144,16 @@ static ssize_t uleds_read(struct file *file, char __u= ser *buffer, size_t count, =20 if (udev->state !=3D ULEDS_STATE_REGISTERED) { retval =3D -ENODEV; - } else if (!udev->new_data && (file->f_flags & O_NONBLOCK)) { + } else if (!udev->new_data && (iocb->ki_filp->f_flags & O_NONBLOCK)) { retval =3D -EAGAIN; } else if (udev->new_data) { - retval =3D copy_to_user(buffer, &udev->brightness, - sizeof(udev->brightness)); + retval =3D !copy_to_iter_full(&udev->brightness, + sizeof(udev->brightness), to); udev->new_data =3D false; - retval =3D sizeof(udev->brightness); + if (retval) + retval =3D -EFAULT; + else + retval =3D sizeof(udev->brightness); } =20 mutex_unlock(&udev->mutex); @@ -158,7 +161,7 @@ static ssize_t uleds_read(struct file *file, char __use= r *buffer, size_t count, if (retval) break; =20 - if (!(file->f_flags & O_NONBLOCK)) + if (!(iocb->ki_filp->f_flags & O_NONBLOCK)) retval =3D wait_event_interruptible(udev->waitq, udev->new_data || udev->state !=3D ULEDS_STATE_REGISTERED); @@ -197,8 +200,8 @@ static const struct file_operations uleds_fops =3D { .owner =3D THIS_MODULE, .open =3D uleds_open, .release =3D uleds_release, - .read =3D uleds_read, - .write =3D uleds_write, + .read_iter =3D uleds_read, + .write_iter =3D uleds_write, .poll =3D uleds_poll, .llseek =3D no_llseek, }; --=20 2.43.0