Commit 6f991850 authored by Vignesh Raghavendra's avatar Vignesh Raghavendra Committed by Greg Kroah-Hartman
Browse files

serial: 8250: 8250_omap: Fix unused variable warning 



With commit 439c7183 ("serial: 8250: 8250_omap: Disable RX interrupt after DMA enable"),
below warning is seen with W=1 and CONFIG_SERIAL_8250_DMA is disabled:

   drivers/tty/serial/8250/8250_omap.c:1199:42: warning: unused variable 'k3_soc_devices' [-Wunused-const-variable]

Fix this by moving the code using k3_soc_devices array to
omap_serial_fill_features_erratas() that handles other errata flags as
well.

Fixes: 439c7183 ("serial: 8250: 8250_omap: Disable RX interrupt after DMA enable")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarVignesh Raghavendra <vigneshr@ti.com>
Link: https://lore.kernel.org/r/20201111112653.2710-2-vigneshr@ti.com


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

drivers/tty/serial/8250/8250_omap.c

+13 −13
Original line number Diff line number Diff line
@@ -539,6 +539,11 @@ static void omap_8250_pm(struct uart_port *port, unsigned int state, 
static void omap_serial_fill_features_erratas(struct uart_8250_port *up,

					      struct omap8250_priv *priv)

{

	const struct soc_device_attribute k3_soc_devices[] = {

		{ .family = "AM65X",  },

		{ .family = "J721E", .revision = "SR1.0" },

		{ /* sentinel */ }

	};

	u32 mvr, scheme;

	u16 revision, major, minor;
@@ -586,6 +591,14 @@ static void omap_serial_fill_features_erratas(struct uart_8250_port *up, 
	default:

		break;

	}



	/*

	 * AM65x SR1.0, AM65x SR2.0 and J721e SR1.0 don't

	 * don't have RHR_IT_DIS bit in IER2 register. So drop to flag

	 * to enable errata workaround.

	 */

	if (soc_device_match(k3_soc_devices))

		priv->habit &= ~UART_HAS_RHR_IT_DIS;

}



static void omap8250_uart_qos_work(struct work_struct *work)
@@ -1196,12 +1209,6 @@ static int omap8250_no_handle_irq(struct uart_port *port) 
	return 0;

}



static const struct soc_device_attribute k3_soc_devices[] = {

	{ .family = "AM65X",  },

	{ .family = "J721E", .revision = "SR1.0" },

	{ /* sentinel */ }

};



static struct omap8250_dma_params am654_dma = {

	.rx_size = SZ_2K,

	.rx_trigger = 1,
@@ -1406,13 +1413,6 @@ static int omap8250_probe(struct platform_device *pdev) 
			up.dma->rxconf.src_maxburst = RX_TRIGGER;

			up.dma->txconf.dst_maxburst = TX_TRIGGER;

		}



		/*

		 * AM65x SR1.0, AM65x SR2.0 and J721e SR1.0 don't

		 * don't have RHR_IT_DIS bit in IER2 register

		 */

		if (soc_device_match(k3_soc_devices))

			priv->habit &= ~UART_HAS_RHR_IT_DIS;

	}

#endif

	ret = serial8250_register_8250_port(&up);