Commit 779087fe authored by Jiri Slaby (SUSE)'s avatar Jiri Slaby (SUSE) Committed by Greg Kroah-Hartman
Browse files

kfifo: drop __kfifo_dma_out_finish_r() 



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: default avatarJiri Slaby (SUSE) <jirislaby@kernel.org>
Cc: Stefani Seibold <stefani@seibold.net>
Cc: Andrew Morton <akpm@linux-foundation.org>
Link: https://lore.kernel.org/r/20240405060826.2521-2-jirislaby@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fec50db7

include/linux/kfifo.h

+1 −3
Original line number Diff line number Diff line
@@ -797,7 +797,7 @@ __kfifo_int_must_check_helper( \ 
	const size_t __recsize = sizeof(*__tmp->rectype); \

	struct __kfifo *__kfifo = &__tmp->kfifo; \

	if (__recsize) \

		__kfifo_dma_out_finish_r(__kfifo, __recsize); \

		__kfifo_skip_r(__kfifo, __recsize); \

	else \

		__kfifo->out += __len / sizeof(*__tmp->type); \

})
@@ -879,8 +879,6 @@ extern void __kfifo_dma_in_finish_r(struct __kfifo *fifo, 
extern unsigned int __kfifo_dma_out_prepare_r(struct __kfifo *fifo,

	struct scatterlist *sgl, int nents, unsigned int len, size_t recsize);



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);



extern void __kfifo_skip_r(struct __kfifo *fifo, size_t recsize);

lib/kfifo.c

+0 −8
Original line number Diff line number Diff line
@@ -582,11 +582,3 @@ unsigned int __kfifo_dma_out_prepare_r(struct __kfifo *fifo, 
}

EXPORT_SYMBOL(__kfifo_dma_out_prepare_r);

void __kfifo_dma_out_finish_r(struct __kfifo *fifo, size_t recsize)

{

	unsigned int len;



	len = __kfifo_peek_n(fifo, recsize);

	fifo->out += len + recsize;

}

EXPORT_SYMBOL(__kfifo_dma_out_finish_r);