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

tty: atmel_serial: define macro for RX size 



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: default avatarJiri 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
Link: https://lore.kernel.org/r/20240405060826.2521-15-jirislaby@kernel.org


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

drivers/tty/serial/atmel_serial.c

+5 −5
Original line number Diff line number Diff line
@@ -97,6 +97,8 @@ struct atmel_uart_char { 
 * DMA mode.

 */

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