Commit d825f0be authored by Stephen Boyd's avatar Stephen Boyd Committed by Rob Herring
Browse files

serial: stm32: Use of_device_get_match_data() 



This driver casts away the constness of struct stm32_usart_info that is
pointed to by the of match table. Use of_device_get_match_data() instead
of of_match_device() here and push the const throughout the code so that
we don't cast away const. This nicely avoids referencing the match table
when it is undefined with configurations where CONFIG_OF=n and fixes the
const issues.

Signed-off-by: default avatarStephen Boyd <swboyd@chromium.org>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Frank Rowand <frowand.list@gmail.com>
Cc: <linux-serial@vger.kernel.org>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20210123034428.2841052-4-swboyd@chromium.org
parent 0e658fdd

drivers/tty/serial/stm32-usart.c

+34 −37
Original line number Diff line number Diff line
@@ -99,8 +99,8 @@ static int stm32_config_rs485(struct uart_port *port, 
			      struct serial_rs485 *rs485conf)

{

	struct stm32_port *stm32_port = to_stm32_port(port);

	struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	struct stm32_usart_config *cfg = &stm32_port->info->cfg;

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	const struct stm32_usart_config *cfg = &stm32_port->info->cfg;

	u32 usartdiv, baud, cr1, cr3;

	bool over8;
@@ -166,7 +166,7 @@ static int stm32_pending_rx(struct uart_port *port, u32 *sr, int *last_res, 
			    bool threaded)

{

	struct stm32_port *stm32_port = to_stm32_port(port);

	struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	enum dma_status status;

	struct dma_tx_state state;
@@ -191,7 +191,7 @@ static unsigned long stm32_get_char(struct uart_port *port, u32 *sr, 
				    int *last_res)

{

	struct stm32_port *stm32_port = to_stm32_port(port);

	struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	unsigned long c;



	if (stm32_port->rx_ch) {
@@ -211,7 +211,7 @@ static void stm32_receive_chars(struct uart_port *port, bool threaded) 
{

	struct tty_port *tport = &port->state->port;

	struct stm32_port *stm32_port = to_stm32_port(port);

	struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	unsigned long c;

	u32 sr;

	char flag;
@@ -282,7 +282,7 @@ static void stm32_tx_dma_complete(void *arg) 
{

	struct uart_port *port = arg;

	struct stm32_port *stm32port = to_stm32_port(port);

	struct stm32_usart_offsets *ofs = &stm32port->info->ofs;

	const struct stm32_usart_offsets *ofs = &stm32port->info->ofs;



	stm32_clr_bits(port, ofs->cr3, USART_CR3_DMAT);

	stm32port->tx_dma_busy = false;
@@ -294,7 +294,7 @@ static void stm32_tx_dma_complete(void *arg) 
static void stm32_tx_interrupt_enable(struct uart_port *port)

{

	struct stm32_port *stm32_port = to_stm32_port(port);

	struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;



	/*

	 * Enables TX FIFO threashold irq when FIFO is enabled,
@@ -309,7 +309,7 @@ static void stm32_tx_interrupt_enable(struct uart_port *port) 
static void stm32_tx_interrupt_disable(struct uart_port *port)

{

	struct stm32_port *stm32_port = to_stm32_port(port);

	struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;



	if (stm32_port->fifoen)

		stm32_clr_bits(port, ofs->cr3, USART_CR3_TXFTIE);
@@ -320,7 +320,7 @@ static void stm32_tx_interrupt_disable(struct uart_port *port) 
static void stm32_transmit_chars_pio(struct uart_port *port)

{

	struct stm32_port *stm32_port = to_stm32_port(port);

	struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	struct circ_buf *xmit = &port->state->xmit;



	if (stm32_port->tx_dma_busy) {
@@ -347,7 +347,7 @@ static void stm32_transmit_chars_pio(struct uart_port *port) 
static void stm32_transmit_chars_dma(struct uart_port *port)

{

	struct stm32_port *stm32port = to_stm32_port(port);

	struct stm32_usart_offsets *ofs = &stm32port->info->ofs;

	const struct stm32_usart_offsets *ofs = &stm32port->info->ofs;

	struct circ_buf *xmit = &port->state->xmit;

	struct dma_async_tx_descriptor *desc = NULL;

	unsigned int count, i;
@@ -407,7 +407,7 @@ static void stm32_transmit_chars_dma(struct uart_port *port) 
static void stm32_transmit_chars(struct uart_port *port)

{

	struct stm32_port *stm32_port = to_stm32_port(port);

	struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	struct circ_buf *xmit = &port->state->xmit;



	if (port->x_char) {
@@ -447,7 +447,7 @@ static irqreturn_t stm32_interrupt(int irq, void *ptr) 
{

	struct uart_port *port = ptr;

	struct stm32_port *stm32_port = to_stm32_port(port);

	struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	u32 sr;



	spin_lock(&port->lock);
@@ -494,7 +494,7 @@ static irqreturn_t stm32_threaded_interrupt(int irq, void *ptr) 
static unsigned int stm32_tx_empty(struct uart_port *port)

{

	struct stm32_port *stm32_port = to_stm32_port(port);

	struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;



	return readl_relaxed(port->membase + ofs->isr) & USART_SR_TXE;

}
@@ -502,7 +502,7 @@ static unsigned int stm32_tx_empty(struct uart_port *port) 
static void stm32_set_mctrl(struct uart_port *port, unsigned int mctrl)

{

	struct stm32_port *stm32_port = to_stm32_port(port);

	struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;



	if ((mctrl & TIOCM_RTS) && (port->status & UPSTAT_AUTORTS))

		stm32_set_bits(port, ofs->cr3, USART_CR3_RTSE);
@@ -579,7 +579,7 @@ static void stm32_start_tx(struct uart_port *port) 
static void stm32_throttle(struct uart_port *port)

{

	struct stm32_port *stm32_port = to_stm32_port(port);

	struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	unsigned long flags;



	spin_lock_irqsave(&port->lock, flags);
@@ -594,7 +594,7 @@ static void stm32_throttle(struct uart_port *port) 
static void stm32_unthrottle(struct uart_port *port)

{

	struct stm32_port *stm32_port = to_stm32_port(port);

	struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	unsigned long flags;



	spin_lock_irqsave(&port->lock, flags);
@@ -609,7 +609,7 @@ static void stm32_unthrottle(struct uart_port *port) 
static void stm32_stop_rx(struct uart_port *port)

{

	struct stm32_port *stm32_port = to_stm32_port(port);

	struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;



	stm32_clr_bits(port, ofs->cr1, stm32_port->cr1_irq);

	if (stm32_port->cr3_irq)
@@ -625,7 +625,7 @@ static void stm32_break_ctl(struct uart_port *port, int break_state) 
static int stm32_startup(struct uart_port *port)

{

	struct stm32_port *stm32_port = to_stm32_port(port);

	struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	const char *name = to_platform_device(port->dev)->name;

	u32 val;

	int ret;
@@ -661,8 +661,8 @@ static int stm32_startup(struct uart_port *port) 
static void stm32_shutdown(struct uart_port *port)

{

	struct stm32_port *stm32_port = to_stm32_port(port);

	struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	struct stm32_usart_config *cfg = &stm32_port->info->cfg;

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	const struct stm32_usart_config *cfg = &stm32_port->info->cfg;

	u32 val, isr;

	int ret;
@@ -721,8 +721,8 @@ static void stm32_set_termios(struct uart_port *port, struct ktermios *termios, 
			    struct ktermios *old)

{

	struct stm32_port *stm32_port = to_stm32_port(port);

	struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	struct stm32_usart_config *cfg = &stm32_port->info->cfg;

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	const struct stm32_usart_config *cfg = &stm32_port->info->cfg;

	struct serial_rs485 *rs485conf = &port->rs485;

	unsigned int baud, bits;

	u32 usartdiv, mantissa, fraction, oversampling;
@@ -921,8 +921,8 @@ static void stm32_pm(struct uart_port *port, unsigned int state, 
{

	struct stm32_port *stm32port = container_of(port,

			struct stm32_port, port);

	struct stm32_usart_offsets *ofs = &stm32port->info->ofs;

	struct stm32_usart_config *cfg = &stm32port->info->cfg;

	const struct stm32_usart_offsets *ofs = &stm32port->info->ofs;

	const struct stm32_usart_config *cfg = &stm32port->info->cfg;

	unsigned long flags = 0;



	switch (state) {
@@ -1081,7 +1081,7 @@ MODULE_DEVICE_TABLE(of, stm32_match); 
static int stm32_of_dma_rx_probe(struct stm32_port *stm32port,

				 struct platform_device *pdev)

{

	struct stm32_usart_offsets *ofs = &stm32port->info->ofs;

	const struct stm32_usart_offsets *ofs = &stm32port->info->ofs;

	struct uart_port *port = &stm32port->port;

	struct device *dev = &pdev->dev;

	struct dma_slave_config config;
@@ -1152,7 +1152,7 @@ static int stm32_of_dma_rx_probe(struct stm32_port *stm32port, 
static int stm32_of_dma_tx_probe(struct stm32_port *stm32port,

				 struct platform_device *pdev)

{

	struct stm32_usart_offsets *ofs = &stm32port->info->ofs;

	const struct stm32_usart_offsets *ofs = &stm32port->info->ofs;

	struct uart_port *port = &stm32port->port;

	struct device *dev = &pdev->dev;

	struct dma_slave_config config;
@@ -1202,7 +1202,6 @@ static int stm32_of_dma_tx_probe(struct stm32_port *stm32port, 


static int stm32_serial_probe(struct platform_device *pdev)

{

	const struct of_device_id *match;

	struct stm32_port *stm32port;

	int ret;
@@ -1210,10 +1209,8 @@ static int stm32_serial_probe(struct platform_device *pdev) 
	if (!stm32port)

		return -ENODEV;



	match = of_match_device(stm32_match, &pdev->dev);

	if (match && match->data)

		stm32port->info = (struct stm32_usart_info *)match->data;

	else

	stm32port->info = of_device_get_match_data(&pdev->dev);

	if (!stm32port->info)

		return -EINVAL;



	ret = stm32_init_port(stm32port, pdev);
@@ -1272,7 +1269,7 @@ static int stm32_serial_remove(struct platform_device *pdev) 
{

	struct uart_port *port = platform_get_drvdata(pdev);

	struct stm32_port *stm32_port = to_stm32_port(port);

	struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	int err;



	pm_runtime_get_sync(&pdev->dev);
@@ -1317,7 +1314,7 @@ static int stm32_serial_remove(struct platform_device *pdev) 
static void stm32_console_putchar(struct uart_port *port, int ch)

{

	struct stm32_port *stm32_port = to_stm32_port(port);

	struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;



	while (!(readl_relaxed(port->membase + ofs->isr) & USART_SR_TXE))

		cpu_relax();
@@ -1329,8 +1326,8 @@ static void stm32_console_write(struct console *co, const char *s, unsigned cnt) 
{

	struct uart_port *port = &stm32_ports[co->index].port;

	struct stm32_port *stm32_port = to_stm32_port(port);

	struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	struct stm32_usart_config *cfg = &stm32_port->info->cfg;

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	const struct stm32_usart_config *cfg = &stm32_port->info->cfg;

	unsigned long flags;

	u32 old_cr1, new_cr1;

	int locked = 1;
@@ -1416,8 +1413,8 @@ static void __maybe_unused stm32_serial_enable_wakeup(struct uart_port *port, 
						      bool enable)

{

	struct stm32_port *stm32_port = to_stm32_port(port);

	struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	struct stm32_usart_config *cfg = &stm32_port->info->cfg;

	const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs;

	const struct stm32_usart_config *cfg = &stm32_port->info->cfg;

	u32 val;



	if (stm32_port->wakeirq <= 0)

drivers/tty/serial/stm32-usart.h

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ struct stm32_usart_info stm32h7_info = { 
struct stm32_port {

	struct uart_port port;

	struct clk *clk;

	struct stm32_usart_info *info;

	const struct stm32_usart_info *info;

	struct dma_chan *rx_ch;  /* dma rx channel            */

	dma_addr_t rx_dma_buf;   /* dma rx buffer bus address */

	unsigned char *rx_buf;   /* dma rx buffer cpu address */