michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: serial: rcar: drop DEV_DATA/DEV_CFG usage

Browse source 
Stop using redundant DEV_DATA/DEV_CFG macros and use dev->data and
dev->config instead.
Follows #41918.

Signed-off-by: Aymeric Aillet <aymeric.aillet@iot.bzh>
This commit is contained in:
Aymeric Aillet 2022-02-11 14:04:20 +01:00 • committed by Anas Nashif
commit e3621e6e00
1 changed files with 32 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

70
drivers/serial/uart_rcar.c
View file

@ -102,12 +102,6 @@ struct uart_rcar_data {
#define SCLSR_TO BIT(2) /* Timeout */ #define SCLSR_TO BIT(2) /* Timeout */
#define SCLSR_ORER BIT(0) /* Overrun Error */ #define SCLSR_ORER BIT(0) /* Overrun Error */
/* Helper macros for UART */
#define DEV_UART_CFG(dev) \
((const struct uart_rcar_cfg *)(dev)->config)
#define DEV_UART_DATA(dev) \
((struct uart_rcar_data *)(dev)->data)
static void uart_rcar_write_8(const struct uart_rcar_cfg *config, static void uart_rcar_write_8(const struct uart_rcar_cfg *config,
uint32_t offs, uint8_t value) uint32_t offs, uint8_t value)
{ {
@ -129,8 +123,8 @@ static void uart_rcar_write_16(const struct uart_rcar_cfg *config,
static void uart_rcar_set_baudrate(const struct device *dev, static void uart_rcar_set_baudrate(const struct device *dev,
uint32_t baud_rate) uint32_t baud_rate)
{ {
const struct uart_rcar_cfg *config = DEV_UART_CFG(dev); const struct uart_rcar_cfg *config = dev->config;
struct uart_rcar_data *data = DEV_UART_DATA(dev); struct uart_rcar_data *data = dev->data;
uint8_t reg_val; uint8_t reg_val;
reg_val = ((data->clk_rate + 16 * baud_rate) / (32 * baud_rate) - 1); reg_val = ((data->clk_rate + 16 * baud_rate) / (32 * baud_rate) - 1);
@ -139,8 +133,8 @@ static void uart_rcar_set_baudrate(const struct device *dev,
static int uart_rcar_poll_in(const struct device *dev, unsigned char *p_char) static int uart_rcar_poll_in(const struct device *dev, unsigned char *p_char)
{ {
const struct uart_rcar_cfg *config = DEV_UART_CFG(dev); const struct uart_rcar_cfg *config = dev->config;
struct uart_rcar_data *data = DEV_UART_DATA(dev); struct uart_rcar_data *data = dev->data;
uint16_t reg_val; uint16_t reg_val;
int ret = 0; int ret = 0;
@ -166,8 +160,8 @@ unlock:
static void uart_rcar_poll_out(const struct device *dev, unsigned char out_char) static void uart_rcar_poll_out(const struct device *dev, unsigned char out_char)
{ {
const struct uart_rcar_cfg *config = DEV_UART_CFG(dev); const struct uart_rcar_cfg *config = dev->config;
struct uart_rcar_data *data = DEV_UART_DATA(dev); struct uart_rcar_data *data = dev->data;
uint16_t reg_val; uint16_t reg_val;
k_spinlock_key_t key = k_spin_lock(&data->lock); k_spinlock_key_t key = k_spin_lock(&data->lock);
@ -187,8 +181,8 @@ static void uart_rcar_poll_out(const struct device *dev, unsigned char out_char)
static int uart_rcar_configure(const struct device *dev, static int uart_rcar_configure(const struct device *dev,
const struct uart_config *cfg) const struct uart_config *cfg)
{ {
const struct uart_rcar_cfg *config = DEV_UART_CFG(dev); const struct uart_rcar_cfg *config = dev->config;
struct uart_rcar_data *data = DEV_UART_DATA(dev); struct uart_rcar_data *data = dev->data;
uint16_t reg_val; uint16_t reg_val;
k_spinlock_key_t key; k_spinlock_key_t key;
@ -259,7 +253,7 @@ static int uart_rcar_configure(const struct device *dev,
static int uart_rcar_config_get(const struct device *dev, static int uart_rcar_config_get(const struct device *dev,
struct uart_config *cfg) struct uart_config *cfg)
{ {
struct uart_rcar_data *data = DEV_UART_DATA(dev); struct uart_rcar_data *data = dev->data;
*cfg = data->current_config; *cfg = data->current_config;
@ -269,8 +263,8 @@ static int uart_rcar_config_get(const struct device *dev,
static int uart_rcar_init(const struct device *dev) static int uart_rcar_init(const struct device *dev)
{ {
const struct uart_rcar_cfg *config = DEV_UART_CFG(dev); const struct uart_rcar_cfg *config = dev->config;
struct uart_rcar_data *data = DEV_UART_DATA(dev); struct uart_rcar_data *data = dev->data;
int ret; int ret;
/* Configure dt provided device signals when available */ /* Configure dt provided device signals when available */
@ -309,7 +303,7 @@ static int uart_rcar_init(const struct device *dev)
static bool uart_rcar_irq_is_enabled(const struct device *dev, static bool uart_rcar_irq_is_enabled(const struct device *dev,
uint32_t irq) uint32_t irq)
{ {
const struct uart_rcar_cfg *config = DEV_UART_CFG(dev); const struct uart_rcar_cfg *config = dev->config;
return !!(uart_rcar_read_16(config, SCSCR) & irq); return !!(uart_rcar_read_16(config, SCSCR) & irq);
} }
@ -318,8 +312,8 @@ static int uart_rcar_fifo_fill(const struct device *dev,
const uint8_t *tx_data, const uint8_t *tx_data,
int len) int len)
{ {
const struct uart_rcar_cfg *config = DEV_UART_CFG(dev); const struct uart_rcar_cfg *config = dev->config;
struct uart_rcar_data *data = DEV_UART_DATA(dev); struct uart_rcar_data *data = dev->data;
int num_tx = 0; int num_tx = 0;
uint16_t reg_val; uint16_t reg_val;
k_spinlock_key_t key = k_spin_lock(&data->lock); k_spinlock_key_t key = k_spin_lock(&data->lock);
@ -344,8 +338,8 @@ static int uart_rcar_fifo_fill(const struct device *dev,
static int uart_rcar_fifo_read(const struct device *dev, uint8_t *rx_data, static int uart_rcar_fifo_read(const struct device *dev, uint8_t *rx_data,
const int size) const int size)
{ {
const struct uart_rcar_cfg *config = DEV_UART_CFG(dev); const struct uart_rcar_cfg *config = dev->config;
struct uart_rcar_data *data = DEV_UART_DATA(dev); struct uart_rcar_data *data = dev->data;
int num_rx = 0; int num_rx = 0;
uint16_t reg_val; uint16_t reg_val;
k_spinlock_key_t key = k_spin_lock(&data->lock); k_spinlock_key_t key = k_spin_lock(&data->lock);
@ -368,8 +362,8 @@ static int uart_rcar_fifo_read(const struct device *dev, uint8_t *rx_data,
static void uart_rcar_irq_tx_enable(const struct device *dev) static void uart_rcar_irq_tx_enable(const struct device *dev)
{ {
const struct uart_rcar_cfg *config = DEV_UART_CFG(dev); const struct uart_rcar_cfg *config = dev->config;
struct uart_rcar_data *data = DEV_UART_DATA(dev); struct uart_rcar_data *data = dev->data;
uint16_t reg_val; uint16_t reg_val;
k_spinlock_key_t key = k_spin_lock(&data->lock); k_spinlock_key_t key = k_spin_lock(&data->lock);
@ -383,8 +377,8 @@ static void uart_rcar_irq_tx_enable(const struct device *dev)
static void uart_rcar_irq_tx_disable(const struct device *dev) static void uart_rcar_irq_tx_disable(const struct device *dev)
{ {
const struct uart_rcar_cfg *config = DEV_UART_CFG(dev); const struct uart_rcar_cfg *config = dev->config;
struct uart_rcar_data *data = DEV_UART_DATA(dev); struct uart_rcar_data *data = dev->data;
uint16_t reg_val; uint16_t reg_val;
k_spinlock_key_t key = k_spin_lock(&data->lock); k_spinlock_key_t key = k_spin_lock(&data->lock);
@ -398,15 +392,15 @@ static void uart_rcar_irq_tx_disable(const struct device *dev)
static int uart_rcar_irq_tx_ready(const struct device *dev) static int uart_rcar_irq_tx_ready(const struct device *dev)
{ {
const struct uart_rcar_cfg *config = DEV_UART_CFG(dev); const struct uart_rcar_cfg *config = dev->config;
return !!(uart_rcar_read_16(config, SCFSR) & SCFSR_TDFE); return !!(uart_rcar_read_16(config, SCFSR) & SCFSR_TDFE);
} }
static void uart_rcar_irq_rx_enable(const struct device *dev) static void uart_rcar_irq_rx_enable(const struct device *dev)
{ {
const struct uart_rcar_cfg *config = DEV_UART_CFG(dev); const struct uart_rcar_cfg *config = dev->config;
struct uart_rcar_data *data = DEV_UART_DATA(dev); struct uart_rcar_data *data = dev->data;
uint16_t reg_val; uint16_t reg_val;
k_spinlock_key_t key = k_spin_lock(&data->lock); k_spinlock_key_t key = k_spin_lock(&data->lock);
@ -420,8 +414,8 @@ static void uart_rcar_irq_rx_enable(const struct device *dev)
static void uart_rcar_irq_rx_disable(const struct device *dev) static void uart_rcar_irq_rx_disable(const struct device *dev)
{ {
const struct uart_rcar_cfg *config = DEV_UART_CFG(dev); const struct uart_rcar_cfg *config = dev->config;
struct uart_rcar_data *data = DEV_UART_DATA(dev); struct uart_rcar_data *data = dev->data;
uint16_t reg_val; uint16_t reg_val;
k_spinlock_key_t key = k_spin_lock(&data->lock); k_spinlock_key_t key = k_spin_lock(&data->lock);
@ -435,15 +429,15 @@ static void uart_rcar_irq_rx_disable(const struct device *dev)
static int uart_rcar_irq_rx_ready(const struct device *dev) static int uart_rcar_irq_rx_ready(const struct device *dev)
{ {
const struct uart_rcar_cfg *config = DEV_UART_CFG(dev); const struct uart_rcar_cfg *config = dev->config;
return !!(uart_rcar_read_16(config, SCFSR) & SCFSR_RDF); return !!(uart_rcar_read_16(config, SCFSR) & SCFSR_RDF);
} }
static void uart_rcar_irq_err_enable(const struct device *dev) static void uart_rcar_irq_err_enable(const struct device *dev)
{ {
const struct uart_rcar_cfg *config = DEV_UART_CFG(dev); const struct uart_rcar_cfg *config = dev->config;
struct uart_rcar_data *data = DEV_UART_DATA(dev); struct uart_rcar_data *data = dev->data;
uint16_t reg_val; uint16_t reg_val;
k_spinlock_key_t key = k_spin_lock(&data->lock); k_spinlock_key_t key = k_spin_lock(&data->lock);
@ -457,8 +451,8 @@ static void uart_rcar_irq_err_enable(const struct device *dev)
static void uart_rcar_irq_err_disable(const struct device *dev) static void uart_rcar_irq_err_disable(const struct device *dev)
{ {
const struct uart_rcar_cfg *config = DEV_UART_CFG(dev); const struct uart_rcar_cfg *config = dev->config;
struct uart_rcar_data *data = DEV_UART_DATA(dev); struct uart_rcar_data *data = dev->data;
uint16_t reg_val; uint16_t reg_val;
k_spinlock_key_t key = k_spin_lock(&data->lock); k_spinlock_key_t key = k_spin_lock(&data->lock);
@ -485,7 +479,7 @@ static void uart_rcar_irq_callback_set(const struct device *dev,
uart_irq_callback_user_data_t cb, uart_irq_callback_user_data_t cb,
void *cb_data) void *cb_data)
{ {
struct uart_rcar_data *data = DEV_UART_DATA(dev); struct uart_rcar_data *data = dev->data;
data->callback = cb; data->callback = cb;
data->cb_data = cb_data; data->cb_data = cb_data;
@ -500,7 +494,7 @@ static void uart_rcar_irq_callback_set(const struct device *dev,
*/ */
void uart_rcar_isr(const struct device *dev) void uart_rcar_isr(const struct device *dev)
{ {
struct uart_rcar_data *data = DEV_UART_DATA(dev); struct uart_rcar_data *data = dev->data;
if (data->callback) { if (data->callback) {
data->callback(dev, data->cb_data); data->callback(dev, data->cb_data);