uart: renames shadow variables (7c208be1) · Commits · Wenxi XU / zephyr

drivers/serial/uart_cc13xx_cc26xx.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -495,10 +495,10 @@ static const struct uart_driver_api uart_cc13xx_cc26xx_driver_api = {
		#ifdef CONFIG_PM
		#define UART_CC13XX_CC26XX_POWER_UART(n) \
		do { \
		struct uart_cc13xx_cc26xx_data *data = dev->data; \
		struct uart_cc13xx_cc26xx_data *dev_data = dev->data; \
		\
		data->rx_constrained = false; \
		data->tx_constrained = false; \
		dev_data->rx_constrained = false; \
		dev_data->tx_constrained = false; \
		\
		/* Set Power dependencies */ \
		if (DT_INST_REG_ADDR(n) == 0x40001000) { \
		@@ -508,7 +508,7 @@ static const struct uart_driver_api uart_cc13xx_cc26xx_driver_api = {
		} \
		\
		/* Register notification function */ \
		Power_registerNotify(&data->postNotify, \
		Power_registerNotify(&dev_data->postNotify, \
		PowerCC26XX_AWAKE_STANDBY, \
		postNotifyFxn, (uintptr_t)dev); \
		} while (false)

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@
		#include <zephyr/logging/log.h>
		LOG_MODULE_REGISTER(uart_hvc_xen, CONFIG_UART_LOG_LEVEL);

		static struct hvc_xen_data hvc_data = {0};
		static struct hvc_xen_data xen_hvc_data = {0};

		#ifdef CONFIG_UART_INTERRUPT_DRIVEN
		static void hvc_uart_evtchn_cb(void *priv);
		@@ -262,7 +262,7 @@ int xen_console_init(const struct device *dev)
		return 0;
		}

		DEVICE_DT_DEFINE(DT_NODELABEL(xen_hvc), xen_console_init, NULL, &hvc_data,
		DEVICE_DT_DEFINE(DT_NODELABEL(xen_hvc), xen_console_init, NULL, &xen_hvc_data,
		NULL, PRE_KERNEL_1, CONFIG_XEN_HVC_INIT_PRIORITY,
		&xen_hvc_api);