From nobody Fri Dec 19 20:33:56 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 882CA7AE72 for ; Fri, 23 Feb 2024 11:52:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708689120; cv=none; b=tWn96exIYox3qyUpKwxWoBXw1cHczMGTiVivmICUPTwJILrqxvJp5GHtKPwHA1tqfWTsepaxrQjEWc79gZh5ksKbe9WC8vMQaY058Ypyd+huGO4/hO0bJ9O/2DLDwoqqwUs31+XYaw5gYmRodAU8M+OabnRC1KnMaDIdSCwJ4BQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708689120; c=relaxed/simple; bh=VsACx/BCa3XtWDoMNVc71XrU2WWQ9BG6/Ja5X5GaJvs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OBa3MYzyCV7de1RWG+VSQbxm8/UZY7GJZTULqr5vZgJKyvCeEggGPj3e5t1VqzqxVAfcqEsNF5/nWNRIbMP+H2VhPW3TJBhsWfOC2t+ZqXde14KZ5mrpGT7oiIUb8Ge7YtdZkUpJgOlos3UUKw5ZGjYSRVC+L3g2bnaPs82VJmI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mCGeHbF9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mCGeHbF9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 082E3C433C7; Fri, 23 Feb 2024 11:51:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708689120; bh=VsACx/BCa3XtWDoMNVc71XrU2WWQ9BG6/Ja5X5GaJvs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mCGeHbF9fdejLLUoPOAvN3DkRK9WSq7b5ef7IjBHRCw/RVcFnkwSiPTO9OFdLvVKi y0r8sFvi5sKdLh292HbOFTl83c8gstQuBLhppb3rwIRoo/JqiL0E6z/ySnug0isgOM br/tLbAyxv8Aap/nrfYmemA1dICRHNQflaIKPYlVzc93/fbJLfLrv94DpCPY5x6N72 ln1feHpBE571k28UkXqTb9zQ24K1AQTCOiFQhF5s1VIX7Eyx29gDXFUXmEBU5wK67t FsPdd5VH/HUKPbsRBlAY0+WXDxUysjbkrb29f0z1soffdXUD6s8Ta9Y5IzZr3y9A/9 blNjrJ4Hnwm6A== From: "Jiri Slaby (SUSE)" To: stefani@seibold.net Cc: linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" , Andrew Morton Subject: [PATCH 1/4] kfifo: drop __kfifo_dma_out_finish_r() Date: Fri, 23 Feb 2024 12:51:52 +0100 Message-ID: <20240223115155.8806-2-jirislaby@kernel.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240223115155.8806-1-jirislaby@kernel.org> References: <20240223115155.8806-1-jirislaby@kernel.org> 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" It is the same as __kfifo_skip_r(), so: * drop __kfifo_dma_out_finish_r() completely, and * replace its (only) use by __kfifo_skip_r(). Signed-off-by: Jiri Slaby (SUSE) Cc: Stefani Seibold Cc: Andrew Morton --- include/linux/kfifo.h | 4 +--- lib/kfifo.c | 8 -------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h index 0b35a41440ff..bc7a1f5bb0ce 100644 --- a/include/linux/kfifo.h +++ b/include/linux/kfifo.h @@ -797,7 +797,7 @@ __kfifo_int_must_check_helper( \ const size_t __recsize =3D sizeof(*__tmp->rectype); \ struct __kfifo *__kfifo =3D &__tmp->kfifo; \ if (__recsize) \ - __kfifo_dma_out_finish_r(__kfifo, __recsize); \ + __kfifo_skip_r(__kfifo, __recsize); \ else \ __kfifo->out +=3D __len / sizeof(*__tmp->type); \ }) @@ -879,8 +879,6 @@ extern void __kfifo_dma_in_finish_r(struct __kfifo *fif= o, extern unsigned int __kfifo_dma_out_prepare_r(struct __kfifo *fifo, struct scatterlist *sgl, int nents, unsigned int len, size_t recsize); =20 -extern void __kfifo_dma_out_finish_r(struct __kfifo *fifo, size_t recsize); - extern unsigned int __kfifo_len_r(struct __kfifo *fifo, size_t recsize); =20 extern void __kfifo_skip_r(struct __kfifo *fifo, size_t recsize); diff --git a/lib/kfifo.c b/lib/kfifo.c index 12f5a347aa13..958099cc4914 100644 --- a/lib/kfifo.c +++ b/lib/kfifo.c @@ -582,11 +582,3 @@ unsigned int __kfifo_dma_out_prepare_r(struct __kfifo = *fifo, } EXPORT_SYMBOL(__kfifo_dma_out_prepare_r); =20 -void __kfifo_dma_out_finish_r(struct __kfifo *fifo, size_t recsize) -{ - unsigned int len; - - len =3D __kfifo_peek_n(fifo, recsize); - fifo->out +=3D len + recsize; -} -EXPORT_SYMBOL(__kfifo_dma_out_finish_r); --=20 2.43.2 From nobody Fri Dec 19 20:33:56 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0EFCC7BAEF for ; Fri, 23 Feb 2024 11:52:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708689122; cv=none; b=bTmHAmUARrJGY6vuqm9ZtZYOcAtS6m72pRKKDtemytVEaD4AeFSCnpvSZRSnU4gynOK2N0S8gukjdgkWvkZeQs2iteOeEbw8+o0O6qAXS/5CGSF7Y3hVDitBZX8IZBPN0B+byCoRW7kgyepxlLJS8z3X4puGNdt5+/SvceBqygs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708689122; c=relaxed/simple; bh=FNEmQ819X+4jzsi2LEQDgwiIxK1a6W9fcLNJsEFzcXo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GDMC0MfleAAtUXxcy8Xj0N9ACLW23QLtSfH1YP079naHHyXuteXwNqZiceN2qGFc7rcRFRLNGWoNDUvOitiLV38IfHb9IAb+ljoMwg05MdTTVcnul69BBXm+8OBcDsds8xy3aOG3rv1D1Ne7Mw7ZTD/4SUEcZjq6VqMkQ6Qta/s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jgjtbGYD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jgjtbGYD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87D13C43390; Fri, 23 Feb 2024 11:52:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708689121; bh=FNEmQ819X+4jzsi2LEQDgwiIxK1a6W9fcLNJsEFzcXo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jgjtbGYD7QTuXEz/tAsXFo0qynF8zdVuzsGr6cjWw9N1j+03d4f9L1AMdlb3rHNNw xVbSrZheauh+O0tka2zI2kgH66iabZOLWU0S61NcSFzbStTn0hAsEz3EgzoyRfuq0H 0Ii400wqnFm2owHwuxwKMLFKXVzr/mXsC8AsGb7m4htqpex+E2w5TuN2DEJ99SZcfi hit+GaowoEvv4mEoZbuwXm2I7IPC4XzJtF/G+YR6wFMCUF9Ev8oqR6N/tzxokDY13g jt7DZBJFGRdx0heCzq0tMr75+yXQVNRpGXxwwEXev/lv7GC2lES/PTusdqGms2MFPK l/jj7/KYLkUkg== From: "Jiri Slaby (SUSE)" To: stefani@seibold.net Cc: linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" , Andrew Morton Subject: [PATCH 2/4] kfifo: introduce and use kfifo_skip_count() Date: Fri, 23 Feb 2024 12:51:53 +0100 Message-ID: <20240223115155.8806-3-jirislaby@kernel.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240223115155.8806-1-jirislaby@kernel.org> References: <20240223115155.8806-1-jirislaby@kernel.org> 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" kfifo_skip_count() is an extended version of kfifo_skip(), accepting also count. This will be useful in the serial code later. Now, it can be used to implement both kfifo_skip() and kfifo_dma_out_finish(). In the latter, 'len' only needs to be divided by 'type' size (as it was until now). And stop using statement expressions when the return value is cast to 'void'. Use classic 'do {} while (0)' instead. Note: perhaps we should skip 'count' records for the 'recsize' case, but the original (kfifo_dma_out_finish()) used to skip only one record. So this is kept unchanged and 'count' is still ignored in the recsize case. Signed-off-by: Jiri Slaby (SUSE) Cc: Stefani Seibold Cc: Andrew Morton Signed-off-by: Jiri Slaby (SUSE) --- include/linux/kfifo.h | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h index bc7a1f5bb0ce..9e64eb03c535 100644 --- a/include/linux/kfifo.h +++ b/include/linux/kfifo.h @@ -304,19 +304,25 @@ __kfifo_uint_must_check_helper( \ ) =20 /** - * kfifo_skip - skip output data + * kfifo_skip_count - skip output data * @fifo: address of the fifo to be used + * @count: count of data to skip */ -#define kfifo_skip(fifo) \ -(void)({ \ +#define kfifo_skip_count(fifo, count) do { \ typeof((fifo) + 1) __tmp =3D (fifo); \ const size_t __recsize =3D sizeof(*__tmp->rectype); \ struct __kfifo *__kfifo =3D &__tmp->kfifo; \ if (__recsize) \ __kfifo_skip_r(__kfifo, __recsize); \ else \ - __kfifo->out++; \ -}) + __kfifo->out +=3D (count); \ +} while(0) + +/** + * kfifo_skip - skip output data + * @fifo: address of the fifo to be used + */ +#define kfifo_skip(fifo) kfifo_skip_count(fifo, 1) =20 /** * kfifo_peek_len - gets the size of the next fifo record @@ -790,17 +796,10 @@ __kfifo_int_must_check_helper( \ * Note that with only one concurrent reader and one concurrent * writer, you don't need extra locking to use these macros. */ -#define kfifo_dma_out_finish(fifo, len) \ -(void)({ \ +#define kfifo_dma_out_finish(fifo, len) do { \ typeof((fifo) + 1) __tmp =3D (fifo); \ - unsigned int __len =3D (len); \ - const size_t __recsize =3D sizeof(*__tmp->rectype); \ - struct __kfifo *__kfifo =3D &__tmp->kfifo; \ - if (__recsize) \ - __kfifo_skip_r(__kfifo, __recsize); \ - else \ - __kfifo->out +=3D __len / sizeof(*__tmp->type); \ -}) + kfifo_skip_count(__tmp, (len) / sizeof(*__tmp->type)); \ +} while (0) =20 /** * kfifo_out_peek - gets some data from the fifo --=20 2.43.2 From nobody Fri Dec 19 20:33:56 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 852AF7C6D4 for ; Fri, 23 Feb 2024 11:52:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708689123; cv=none; b=gitFHneDKf1+QgzLZVyHVEWz2G/Qq20ITataIJXr/4Af+0LdfMtL4QqutAiWPue7COOGvPzQONJzah7RMysiAIFOnIpzQcfoGfY60UPtzOv47zJftPR60v8NrW7PwBqpQ/RpJHh/8jPncLsIs4ToeWmicVnUNfv1w+UVrnLRAHM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708689123; c=relaxed/simple; bh=deFyJ8OYCh9my5qGUB1HBB8ENRS08AcwthOwt9dAcZE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FzmTdi77LsUY8EXKCBQ83x0BXRjjylwf6k47Ab7AJ72+QfG7JIS4UUoXKROHyqqIHGbgXnVoVX9duUVhBHyQwFp2P6D2fz8wHsIG0cfI3GGhc3itGAkK8KW41D7YODcFd5mdTqLBT6vpM6A+X1jknBzCEDBTLUn6S9GcnN2spuk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sLd5+eve; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="sLd5+eve" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1121EC433A6; Fri, 23 Feb 2024 11:52:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708689123; bh=deFyJ8OYCh9my5qGUB1HBB8ENRS08AcwthOwt9dAcZE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sLd5+eve5ubmzq9nTyF7ESHZMUlcMXxv05amHg2Rgc92mjiTnyQPPKHm7rPcYdj5e 87uRTDAp3Ts8f+3vRroeBLRPc7dfESbMBKq7T07EwVazD0zr3ulios1+BO9/7bJ+Xp tyhJZ9QZ8tuul99NMOLafsw0nURZ38ZqF6Kxzz7nHUyLqNFPkhw9eryeJwkrCAYXjX JvLqIYFaJTo41cZb5nr/ep6eENsSFNRFCB9eTZMwGS4bD07UlHMfTRKCJkyf+OjC5P OTCeDvJuWJw5gcBvX3EyNZfGGx9n8g7z3lEhEfRDVK5U+50AtGkE9Jf83s0wV8DUNS CcFuuJv3T0aYg== From: "Jiri Slaby (SUSE)" To: stefani@seibold.net Cc: linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" , Andrew Morton Subject: [PATCH 3/4] kfifo: add kfifo_out_linear{,_ptr}() Date: Fri, 23 Feb 2024 12:51:54 +0100 Message-ID: <20240223115155.8806-4-jirislaby@kernel.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240223115155.8806-1-jirislaby@kernel.org> References: <20240223115155.8806-1-jirislaby@kernel.org> 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" These are helpers which are going to be used in the serial layer. We need a wrapper around kfifo which provides us with a tail (sometimes "tail" offset, sometimes a pointer) to the kfifo data. And which returns count of available data -- but not larger than to the end of the buffer (hence _linear in the names). I.e. something like CIRC_CNT_TO_END() in the legacy circ_buf. This patch adds such two helpers. Signed-off-by: Jiri Slaby (SUSE) Cc: Stefani Seibold Cc: Andrew Morton --- include/linux/kfifo.h | 64 +++++++++++++++++++++++++++++++++++++++++++ lib/kfifo.c | 28 +++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h index 9e64eb03c535..0491bc526240 100644 --- a/include/linux/kfifo.h +++ b/include/linux/kfifo.h @@ -827,6 +827,64 @@ __kfifo_uint_must_check_helper( \ }) \ ) =20 +/** + * kfifo_out_linear - gets a tail of/offset to available data + * @fifo: address of the fifo to be used + * @tail: pointer to an unsigned int to store the value of tail + * @n: max. number of elements to point at + * + * This macro obtains the offset (tail) to the available data in the fifo + * buffer and returns the + * numbers of elements available. It returns the available count till the = end + * of data or till the end of the buffer. So that it can be used for linear + * data processing (like memcpy() of (@fifo->data + @tail) with count + * returned). + * + * Note that with only one concurrent reader and one concurrent + * writer, you don't need extra locking to use these macro. + */ +#define kfifo_out_linear(fifo, tail, n) \ +__kfifo_uint_must_check_helper( \ +({ \ + typeof((fifo) + 1) __tmp =3D (fifo); \ + unsigned int *__tail =3D (tail); \ + unsigned long __n =3D (n); \ + const size_t __recsize =3D sizeof(*__tmp->rectype); \ + struct __kfifo *__kfifo =3D &__tmp->kfifo; \ + (__recsize) ? \ + __kfifo_out_linear_r(__kfifo, __tail, __n, __recsize) : \ + __kfifo_out_linear(__kfifo, __tail, __n); \ +}) \ +) + +/** + * kfifo_out_linear_ptr - gets a pointer to the available data + * @fifo: address of the fifo to be used + * @ptr: pointer to data to store the pointer to tail + * @n: max. number of elements to point at + * + * Similarly to kfifo_out_linear(), this macro obtains the pointer to the + * available data in the fifo buffer and returns the numbers of elements + * available. It returns the available count till the end of available dat= a or + * till the end of the buffer. So that it can be used for linear data + * processing (like memcpy() of @ptr with count returned). + * + * Note that with only one concurrent reader and one concurrent + * writer, you don't need extra locking to use these macro. + */ +#define kfifo_out_linear_ptr(fifo, ptr, n) \ +__kfifo_uint_must_check_helper( \ +({ \ + typeof((fifo) + 1) ___tmp =3D (fifo); \ + unsigned int ___tail; \ + unsigned int ___n =3D kfifo_out_linear(___tmp, &___tail, (n)); \ + struct __kfifo *___kfifo =3D &___tmp->kfifo; \ + *(ptr) =3D ___kfifo->data + ___tail * kfifo_esize(___tmp); \ + ___n; \ +}) \ +) + + extern int __kfifo_alloc(struct __kfifo *fifo, unsigned int size, size_t esize, gfp_t gfp_mask); =20 @@ -856,6 +914,9 @@ extern unsigned int __kfifo_dma_out_prepare(struct __kf= ifo *fifo, extern unsigned int __kfifo_out_peek(struct __kfifo *fifo, void *buf, unsigned int len); =20 +extern unsigned int __kfifo_out_linear(struct __kfifo *fifo, + unsigned int *tail, unsigned int n); + extern unsigned int __kfifo_in_r(struct __kfifo *fifo, const void *buf, unsigned int len, size_t recsize); =20 @@ -885,6 +946,9 @@ extern void __kfifo_skip_r(struct __kfifo *fifo, size_t= recsize); extern unsigned int __kfifo_out_peek_r(struct __kfifo *fifo, void *buf, unsigned int len, size_t recsize); =20 +extern unsigned int __kfifo_out_linear_r(struct __kfifo *fifo, + unsigned int *tail, unsigned int n, size_t recsize); + extern unsigned int __kfifo_max_r(unsigned int len, size_t recsize); =20 #endif diff --git a/lib/kfifo.c b/lib/kfifo.c index 958099cc4914..9f1d8f68deb8 100644 --- a/lib/kfifo.c +++ b/lib/kfifo.c @@ -163,6 +163,21 @@ unsigned int __kfifo_out_peek(struct __kfifo *fifo, } EXPORT_SYMBOL(__kfifo_out_peek); =20 +unsigned int __kfifo_out_linear(struct __kfifo *fifo, + unsigned int *tail, unsigned int n) +{ + unsigned int size =3D fifo->mask + 1; + unsigned int off =3D fifo->out & fifo->mask; + + n =3D min3(n, fifo->in - fifo->out, size - off); + + if (tail) + *tail =3D off; + + return n; +} +EXPORT_SYMBOL(__kfifo_out_linear); + unsigned int __kfifo_out(struct __kfifo *fifo, void *buf, unsigned int len) { @@ -473,6 +488,19 @@ unsigned int __kfifo_out_peek_r(struct __kfifo *fifo, = void *buf, } EXPORT_SYMBOL(__kfifo_out_peek_r); =20 +unsigned int __kfifo_out_linear_r(struct __kfifo *fifo, + unsigned int *tail, unsigned int n, size_t recsize) +{ + if (fifo->in =3D=3D fifo->out) + return 0; + + if (tail) + *tail =3D fifo->out + recsize; + + return min(n, __kfifo_peek_n(fifo, recsize); +} +EXPORT_SYMBOL(__kfifo_out_linear_r); + unsigned int __kfifo_out_r(struct __kfifo *fifo, void *buf, unsigned int len, size_t recsize) { --=20 2.43.2 From nobody Fri Dec 19 20:33:56 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 159467D418 for ; Fri, 23 Feb 2024 11:52:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708689125; cv=none; b=YFUTi1fSdzKUN7Z+sdsxeUm/Jm1/cu+gETGeoYiH3z22lCf7bmsus8yrGb944xH2Ckrs7WCYnlepPsphrY/AwAzWql+ALZ5SpACKPPwNWl/gdVPonsvhCODPaArr6GAX+DOCUOBuLkZyCnfZ6GafsjErwJB2H74cCUTu1tYSenM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708689125; c=relaxed/simple; bh=mGgNsYPzZ25IdsQy+436tZTCd+Dedkm6W3A4qITGUiM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SZqjNOA3cr3Cn0fwHXoWVh49t9DDO6LTP0nzI+jl1qRiU1JdpeVflBUoyh8YJJj/Q5Frs8TKO+dw4W6FVva8ALziKmB8dtp00OsmxXOmrgMiGvwZNt74FuCYvfzRyS1m/myZD2aqaSQYQQehB7jpbLIg0g4jVM1aN3KUeEakPNE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=r7ut2uuV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="r7ut2uuV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8EE11C43399; Fri, 23 Feb 2024 11:52:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708689124; bh=mGgNsYPzZ25IdsQy+436tZTCd+Dedkm6W3A4qITGUiM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r7ut2uuVDj2VUFcFQJzZriprXKbw91IgHM8eAGM7mn4xoxeB/x+9/xY7Ui5aLNjSZ g2xQAh4q7/i019vO0wmF7aoYsd7Rqr7O2sbgEKP6jmokQMiF6/fWLb1wYRX80em5vR hKHSvifiuQuWzy+u9EB4W0I5Tn2C3xR51rEGkW/K1JWzn1CxRgM4cXFUO0XkbJC8zn cjB40UedVPVE8PHDYqgU9ZEtbbBmSdCt9/E4tPGZQzqVpymEnaVNI5FKenzZ3xbyCw pk2LZEfsKSAB90f73OQX2KwyWK37qpm+5AWYjBWTVg8CujLQwBbAzpPjXrqF492lVw WAZfyYR97htPA== From: "Jiri Slaby (SUSE)" To: stefani@seibold.net Cc: linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" , Andrew Morton Subject: [PATCH 4/4] kfifo: fix typos in kernel-doc Date: Fri, 23 Feb 2024 12:51:55 +0100 Message-ID: <20240223115155.8806-5-jirislaby@kernel.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240223115155.8806-1-jirislaby@kernel.org> References: <20240223115155.8806-1-jirislaby@kernel.org> 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" Obviously: "This macro finish" -> "This macro finishes" and similar. Signed-off-by: Jiri Slaby (SUSE) Cc: Stefani Seibold Cc: Andrew Morton --- include/linux/kfifo.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h index 0491bc526240..d8533e700bed 100644 --- a/include/linux/kfifo.h +++ b/include/linux/kfifo.h @@ -584,7 +584,7 @@ __kfifo_uint_must_check_helper( \ * @buf: pointer to the storage buffer * @n: max. number of elements to get * - * This macro get some data from the fifo and return the numbers of elemen= ts + * This macro gets some data from the fifo and returns the numbers of elem= ents * copied. * * Note that with only one concurrent reader and one concurrent @@ -611,7 +611,7 @@ __kfifo_uint_must_check_helper( \ * @n: max. number of elements to get * @lock: pointer to the spinlock to use for locking * - * This macro get the data from the fifo and return the numbers of elements + * This macro gets the data from the fifo and returns the numbers of eleme= nts * copied. */ #define kfifo_out_spinlocked(fifo, buf, n, lock) \ @@ -739,7 +739,7 @@ __kfifo_int_must_check_helper( \ * @fifo: address of the fifo to be used * @len: number of bytes to received * - * This macro finish a DMA IN operation. The in counter will be updated by + * This macro finishes a DMA IN operation. The in counter will be updated = by * the len parameter. No error checking will be done. * * Note that with only one concurrent reader and one concurrent @@ -790,7 +790,7 @@ __kfifo_int_must_check_helper( \ * @fifo: address of the fifo to be used * @len: number of bytes transferred * - * This macro finish a DMA OUT operation. The out counter will be updated = by + * This macro finishes a DMA OUT operation. The out counter will be update= d by * the len parameter. No error checking will be done. * * Note that with only one concurrent reader and one concurrent @@ -807,7 +807,7 @@ __kfifo_int_must_check_helper( \ * @buf: pointer to the storage buffer * @n: max. number of elements to get * - * This macro get the data from the fifo and return the numbers of elements + * This macro gets the data from the fifo and returns the numbers of eleme= nts * copied. The data is not removed from the fifo. * * Note that with only one concurrent reader and one concurrent --=20 2.43.2