From: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
To: gregkh@linuxfoundation.org
Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
"Jiri Slaby (SUSE)" <jirislaby@kernel.org>,
Richard Genoud <richard.genoud@gmail.com>,
Nicolas Ferre <nicolas.ferre@microchip.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Claudiu Beznea <claudiu.beznea@tuxon.dev>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 14/15] tty: atmel_serial: define macro for RX size
Date: Fri, 5 Apr 2024 08:08:25 +0200 [thread overview]
Message-ID: <20240405060826.2521-15-jirislaby@kernel.org> (raw)
In-Reply-To: <20240405060826.2521-1-jirislaby@kernel.org>
It is repeated in the code and there is also a big warning by
ATMEL_SERIAL_RINGSIZE. So define ATMEL_SERIAL_RX_SIZE and use it
appropriatelly.
The macro uses array_size() and kmalloc_array() is switched to
kmalloc().
Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Cc: Richard Genoud <richard.genoud@gmail.com>
Cc: Nicolas Ferre <nicolas.ferre@microchip.com>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Claudiu Beznea <claudiu.beznea@tuxon.dev>
Cc: linux-arm-kernel@lists.infradead.org
---
drivers/tty/serial/atmel_serial.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index 69ec80ffc97b..5cde5077c429 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -96,7 +96,9 @@ struct atmel_uart_char {
* can contain up to 1024 characters in PIO mode and up to 4096 characters in
* DMA mode.
*/
-#define ATMEL_SERIAL_RINGSIZE 1024
+#define ATMEL_SERIAL_RINGSIZE 1024
+#define ATMEL_SERIAL_RX_SIZE array_size(sizeof(struct atmel_uart_char), \
+ ATMEL_SERIAL_RINGSIZE)
/*
* at91: 6 USARTs and one DBGU port (SAM9260)
@@ -1208,7 +1210,7 @@ static int atmel_prepare_rx_dma(struct uart_port *port)
BUG_ON(!PAGE_ALIGNED(ring->buf));
sg_set_page(&atmel_port->sg_rx,
virt_to_page(ring->buf),
- sizeof(struct atmel_uart_char) * ATMEL_SERIAL_RINGSIZE,
+ ATMEL_SERIAL_RX_SIZE,
offset_in_page(ring->buf));
nent = dma_map_sg(port->dev,
&atmel_port->sg_rx,
@@ -2947,9 +2949,7 @@ static int atmel_serial_probe(struct platform_device *pdev)
if (!atmel_use_pdc_rx(&atmel_port->uart)) {
ret = -ENOMEM;
- data = kmalloc_array(ATMEL_SERIAL_RINGSIZE,
- sizeof(struct atmel_uart_char),
- GFP_KERNEL);
+ data = kmalloc(ATMEL_SERIAL_RX_SIZE, GFP_KERNEL);
if (!data)
goto err_clk_disable_unprepare;
atmel_port->rx_ring.buf = data;
--
2.44.0
next prev parent reply other threads:[~2024-04-05 6:09 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-05 6:08 [PATCH 00/15] tty: serial: switch from circ_buf to kfifo Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 01/15] kfifo: drop __kfifo_dma_out_finish_r() Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 02/15] kfifo: introduce and use kfifo_skip_count() Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 03/15] kfifo: add kfifo_out_linear{,_ptr}() Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 04/15] kfifo: remove support for physically non-contiguous memory Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 05/15] kfifo: rename l to len_to_end in setup_sgl() Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 06/15] kfifo: pass offset to setup_sgl_buf() instead of a pointer Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 07/15] kfifo: add kfifo_dma_out_prepare_mapped() Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 08/15] kfifo: fix typos in kernel-doc Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 09/15] tty: 8250_dma: use dmaengine_prep_slave_sg() Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 10/15] tty: 8250_omap: " Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 11/15] tty: msm_serial: " Jiri Slaby (SUSE)
2024-04-15 21:17 ` Marek Szyprowski
2024-04-16 10:23 ` Jiri Slaby
2024-04-17 10:15 ` Marek Szyprowski
2024-04-17 10:50 ` Jiri Slaby
2024-04-17 12:45 ` Marek Szyprowski
2024-04-19 7:17 ` Jiri Slaby
2024-04-19 7:43 ` Jiri Slaby
2024-04-19 7:53 ` Jiri Slaby
2024-04-19 8:00 ` Marek Szyprowski
2024-04-19 8:09 ` Jiri Slaby
2024-04-19 8:09 ` [PATCH] serial: msm: check dma_map_sg() return value properly Jiri Slaby (SUSE)
2024-04-19 9:03 ` Marek Szyprowski
2024-04-05 6:08 ` [PATCH 12/15] tty: serial: switch from circ_buf to kfifo Jiri Slaby (SUSE)
2024-04-15 12:58 ` Marek Szyprowski
2024-04-15 13:28 ` Jiri Slaby
2024-04-15 14:17 ` Marek Szyprowski
2024-04-16 5:48 ` [PATCH] serial: meson+qcom: don't advance the kfifo twice Jiri Slaby (SUSE)
2024-04-17 10:08 ` [PATCH 12/15] tty: serial: switch from circ_buf to kfifo Anders Roxell
2024-04-17 10:20 ` Marek Szyprowski
2024-04-17 11:19 ` Anders Roxell
2024-04-22 6:45 ` Jiri Slaby
2024-04-22 10:05 ` Anders Roxell
2024-04-16 3:24 ` Pengfei Xu
2024-04-16 7:04 ` Jiri Slaby
2024-04-16 7:19 ` [PATCH] serial: drop debugging WARN_ON_ONCE() from uart_put_char() Jiri Slaby (SUSE)
2024-05-28 15:05 ` [PATCH] serial: drop debugging WARN_ON_ONCE() from uart_write() Tetsuo Handa
2024-06-03 7:10 ` Jiri Slaby
2024-04-05 6:08 ` [PATCH 13/15] tty: atmel_serial: use single DMA mapping for TX Jiri Slaby (SUSE)
2024-04-05 6:08 ` Jiri Slaby (SUSE) [this message]
2024-04-05 6:08 ` [PATCH 15/15] tty: atmel_serial: use single DMA mapping for RX Jiri Slaby (SUSE)
2024-04-19 15:12 ` [PATCH 00/15] tty: serial: switch from circ_buf to kfifo Neil Armstrong
2024-04-20 5:42 ` Greg KH
2024-04-22 7:50 ` Neil Armstrong
2024-04-22 5:51 ` Jiri Slaby
2024-04-22 7:43 ` neil.armstrong
2024-06-07 20:32 ` Ferry Toth
2024-06-10 20:16 ` Ferry Toth
2024-06-11 7:36 ` Jiri Slaby
2024-06-12 13:13 ` Ilpo Järvinen
2024-06-16 20:55 ` Ferry Toth
2024-06-17 6:23 ` Ilpo Järvinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240405060826.2521-15-jirislaby@kernel.org \
--to=jirislaby@kernel.org \
--cc=alexandre.belloni@bootlin.com \
--cc=claudiu.beznea@tuxon.dev \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=nicolas.ferre@microchip.com \
--cc=richard.genoud@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).