From nobody Fri Dec 19 17:16:15 2025 Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) (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 4729B7829B for ; Thu, 11 Apr 2024 15:33:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712849597; cv=none; b=k1ZC5lQJH+lQIS1nr9BFaTPdcQnYeb2Csi+KdAdpgxOOR0QHhMsS8r9RuikaWQgOUdg6EF3UtQsy5Z2v4LsURyE6Fah7uhUsIu43RndcKxK4jo3kfphK9U2gGSG1HPSn3a7T0PIczxZdfpEqMbwOOGOue1dZC9rEEpdJQUNzCfo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712849597; c=relaxed/simple; bh=8K4iFByLNkEJg0ZtGD/zZ1ImWA2HssKe9G+FnNpX9so=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=in3o9u3kvP3uLt/M15nk06YnKplbDaSAm/nKrD/lwMGPutTWZueVY6M/sVP9Shk0yMQYJlVC8/zGb33a/1zM8FF1h/oFHR7oUNCy2pKqFhiItM0/c0z/rCYsQtonDntQu9GIZD9azKL3WSIRd4XfOgJVIpyYBho/UOGwzB8KQPE= 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=LPsPlZfk; arc=none smtp.client-ip=209.85.166.49 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="LPsPlZfk" Received: by mail-io1-f49.google.com with SMTP id ca18e2360f4ac-7d6812b37a6so8878239f.0 for ; Thu, 11 Apr 2024 08:33:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1712849595; x=1713454395; 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=uvmWkjrTymk6TvKQAkDar3sgVevVFpz9szIkUav/6CQ=; b=LPsPlZfk5ywn73XvgonzCSh1AJfVCOtEZTB51vT1O/2Bs3Y6BqqSeMkfRRWCI8YFUS iZJFNeVo6AAhFBuKgcFyTem80YNM4/+4Pgd8ni5iMi08DEdM8sJ7Fh9oWChgZErH33zA AYl/halzXacyr+wlr3szsYJ+N8qT3HktAEpaKSR65hKBMLbUlt2WHxXrP+Vvb6o+u7Ir RdhiXNzdShne9bMEmrw5O7XTG/+KRfrqufJ8GcjAfr8p1Qx7MIwTbo/PoTh8/8toegYn RvdtswSShwCM/LFNLG1JIEfXWjBx+ZGYpWTG4U/mohpv6FFHrrP3X+uQFG6U+1lRAaH0 GSmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712849595; x=1713454395; 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=uvmWkjrTymk6TvKQAkDar3sgVevVFpz9szIkUav/6CQ=; b=gbE8Knzymodj/a6SU2vMR+prC/seWu1vj/mvumRXyIewM28pqCDZPfdGiurkxCLe75 XfjIiuSRri6hpqC0h6FBI/JSdKuPP13Rk3Vp+D2qp6DBAeTscuzKNp4etzyDvXPLzSG8 VjgbnM7vRYlZvQ62sWgj8a5b+8aET/RAysnhBMS47ZoBdQ3cbC5Jf2u0PXolpRzPOezo YxueJwKhEHpJxE4mM696DFUgYyk0nSjplp/+bZoXhlWsSBfO9JzAANlCtfgELxkyjYyT +T5SPE2Xc3j6k73CMp93f2XACfyBhhE091dxhUuekg+regO1Skpea1HnWGWoDuPdOedm MJSg== X-Gm-Message-State: AOJu0YxsRHgvd7Bd+6k+drOYS8vmK7Dul3o0Kpl1zEjZnYhYeXVaQA5W /aazkPZvQ6hgIKB3juuGa78TahwKWnr+dVhRp7aT53lWB6XppiG9JCbwybQz3tXVi7NeDKi5nMn i X-Google-Smtp-Source: AGHT+IHeEJih2Bol0NMGj7Zi6DBozwcad9GW7KCufZs1lijQ748DynHFcHwgvnvtGQUpYilBjjprzw== X-Received: by 2002:a5e:9907:0:b0:7d6:751f:192 with SMTP id t7-20020a5e9907000000b007d6751f0192mr172554ioj.2.1712849595003; Thu, 11 Apr 2024 08:33:15 -0700 (PDT) Received: from localhost.localdomain ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id jc25-20020a056638891900b0047f14b7f6c0sm457056jab.5.2024.04.11.08.33.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Apr 2024 08:33:13 -0700 (PDT) From: Jens Axboe To: linux-kernel@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 055/437] net: wireless: convert to read/write iterators Date: Thu, 11 Apr 2024 09:13:15 -0600 Message-ID: <20240411153126.16201-56-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 --- net/wireless/debugfs.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/net/wireless/debugfs.c b/net/wireless/debugfs.c index fd4509acec37..014bacd8f6a5 100644 --- a/net/wireless/debugfs.c +++ b/net/wireless/debugfs.c @@ -12,19 +12,18 @@ #include "debugfs.h" =20 #define DEBUGFS_READONLY_FILE(name, buflen, fmt, value...) \ -static ssize_t name## _read(struct file *file, char __user *userbuf, \ - size_t count, loff_t *ppos) \ +static ssize_t name## _read(struct kiocb *iocb, struct iov_iter *to) \ { \ - struct wiphy *wiphy =3D file->private_data; \ + struct wiphy *wiphy =3D iocb->ki_filp->private_data; \ char buf[buflen]; \ int res; \ \ res =3D scnprintf(buf, buflen, fmt "\n", ##value); \ - return simple_read_from_buffer(userbuf, count, ppos, buf, res); \ + return simple_copy_to_iter(buf, &iocb->ki_pos, res, to); \ } \ \ static const struct file_operations name## _ops =3D { \ - .read =3D name## _read, \ + .read_iter =3D name## _read, \ .open =3D simple_open, \ .llseek =3D generic_file_llseek, \ } @@ -60,11 +59,9 @@ static int ht_print_chan(struct ieee80211_channel *chan, ' ' : '+'); } =20 -static ssize_t ht40allow_map_read(struct file *file, - char __user *user_buf, - size_t count, loff_t *ppos) +static ssize_t ht40allow_map_read_iter(struct kiocb *iocb, struct iov_iter= *to) { - struct wiphy *wiphy =3D file->private_data; + struct wiphy *wiphy =3D iocb->ki_filp->private_data; char *buf; unsigned int offset =3D 0, buf_size =3D PAGE_SIZE, i; enum nl80211_band band; @@ -84,15 +81,13 @@ static ssize_t ht40allow_map_read(struct file *file, buf, buf_size, offset); } =20 - r =3D simple_read_from_buffer(user_buf, count, ppos, buf, offset); - + r =3D simple_copy_to_iter(buf, &iocb->ki_pos, offset, to); kfree(buf); - return r; } =20 static const struct file_operations ht40allow_map_ops =3D { - .read =3D ht40allow_map_read, + .read_iter =3D ht40allow_map_read_iter, .open =3D simple_open, .llseek =3D default_llseek, }; --=20 2.43.0