From 3565f71a727e67296bd645714ae6139b6dff0410 Mon Sep 17 00:00:00 2001 From: Wealian Liao Date: Fri, 21 Jan 2022 14:51:52 +0800 Subject: [PATCH] drivers: npcx: Correct the macro parentheses This corrects the following: 1. The priority of type cast is lower than member access. So don't need the redundant parentheses. 2. The macro should be added to the parentheses. Signed-off-by: Wealian Liao --- drivers/adc/adc_npcx.c | 2 +- drivers/clock_control/clock_control_npcx.c | 4 ++-- drivers/espi/espi_npcx.c | 2 +- drivers/gpio/gpio_npcx.c | 2 +- drivers/i2c/i2c_npcx_controller.c | 4 ++-- drivers/ps2/ps2_npcx_controller.c | 2 +- drivers/pwm/pwm_npcx.c | 2 +- drivers/sensor/nuvoton_tach_npcx/tach_nuvoton_npcx.c | 2 +- drivers/serial/uart_npcx.c | 2 +- drivers/spi/spi_npcx_fiu.c | 2 +- drivers/watchdog/wdt_npcx.c | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/adc/adc_npcx.c b/drivers/adc/adc_npcx.c index a6764085945..5dac0c72322 100644 --- a/drivers/adc/adc_npcx.c +++ b/drivers/adc/adc_npcx.c @@ -71,7 +71,7 @@ struct adc_npcx_data { #define DRV_DATA(dev) ((struct adc_npcx_data *)(dev)->data) -#define HAL_INSTANCE(dev) (struct adc_reg *)(DRV_CONFIG(dev)->base) +#define HAL_INSTANCE(dev) ((struct adc_reg *)DRV_CONFIG(dev)->base) /* ADC local functions */ static void adc_npcx_isr(void *arg) diff --git a/drivers/clock_control/clock_control_npcx.c b/drivers/clock_control/clock_control_npcx.c index 92e94a21da6..3e27549a6f2 100644 --- a/drivers/clock_control/clock_control_npcx.c +++ b/drivers/clock_control/clock_control_npcx.c @@ -26,10 +26,10 @@ struct npcx_pcc_config { ((const struct npcx_pcc_config *)(dev)->config) #define HAL_CDCG_INST(dev) \ - (struct cdcg_reg *)(DRV_CONFIG(dev)->base_cdcg) + ((struct cdcg_reg *)DRV_CONFIG(dev)->base_cdcg) #define HAL_PMC_INST(dev) \ - (struct pmc_reg *)(DRV_CONFIG(dev)->base_pmc) + ((struct pmc_reg *)DRV_CONFIG(dev)->base_pmc) /* Clock controller local functions */ static inline int npcx_clock_control_on(const struct device *dev, diff --git a/drivers/espi/espi_npcx.c b/drivers/espi/espi_npcx.c index d373ae8ee25..386abf9bb70 100644 --- a/drivers/espi/espi_npcx.c +++ b/drivers/espi/espi_npcx.c @@ -46,7 +46,7 @@ struct espi_npcx_data { #define DRV_DATA(dev) ((struct espi_npcx_data *)(dev)->data) -#define HAL_INSTANCE(dev) (struct espi_reg *)(DRV_CONFIG(dev)->base) +#define HAL_INSTANCE(dev) ((struct espi_reg *)DRV_CONFIG(dev)->base) /* eSPI channels */ #define NPCX_ESPI_CH_PC 0 diff --git a/drivers/gpio/gpio_npcx.c b/drivers/gpio/gpio_npcx.c index e3117901ad2..c15fb13d748 100644 --- a/drivers/gpio/gpio_npcx.c +++ b/drivers/gpio/gpio_npcx.c @@ -47,7 +47,7 @@ struct gpio_npcx_data { #define DRV_DATA(dev) ((struct gpio_npcx_data *)(dev)->data) -#define HAL_INSTANCE(dev) (struct gpio_reg *)(DRV_CONFIG(dev)->base) +#define HAL_INSTANCE(dev) ((struct gpio_reg *)DRV_CONFIG(dev)->base) /* Platform specific GPIO functions */ const struct device *npcx_get_gpio_dev(int port) diff --git a/drivers/i2c/i2c_npcx_controller.c b/drivers/i2c/i2c_npcx_controller.c index 54fc5b98c97..6a139acd63a 100644 --- a/drivers/i2c/i2c_npcx_controller.c +++ b/drivers/i2c/i2c_npcx_controller.c @@ -154,10 +154,10 @@ struct i2c_ctrl_data { #define DRV_DATA(dev) ((struct i2c_ctrl_data *)(dev)->data) -#define HAL_I2C_INSTANCE(dev) (struct smb_reg *)(DRV_CONFIG(dev)->base) +#define HAL_I2C_INSTANCE(dev) ((struct smb_reg *)DRV_CONFIG(dev)->base) #define HAL_I2C_FIFO_INSTANCE(dev) \ - (struct smb_fifo_reg *)(DRV_CONFIG(dev)->base) + ((struct smb_fifo_reg *)DRV_CONFIG(dev)->base) /* Recommended I2C timing values are based on 15 MHz */ static const struct npcx_i2c_timing_cfg npcx_15m_speed_confs[] = { diff --git a/drivers/ps2/ps2_npcx_controller.c b/drivers/ps2/ps2_npcx_controller.c index 7e496b9b650..1823c116ec1 100644 --- a/drivers/ps2/ps2_npcx_controller.c +++ b/drivers/ps2/ps2_npcx_controller.c @@ -69,7 +69,7 @@ struct ps2_npcx_ctrl_data { #define DRV_DATA(dev) ((struct ps2_npcx_ctrl_data *)(dev)->data) -#define HAL_PS2_INSTANCE(dev) (struct ps2_reg *)(DRV_CONFIG(dev)->base) +#define HAL_PS2_INSTANCE(dev) ((struct ps2_reg *)DRV_CONFIG(dev)->base) static uint8_t ps2_npcx_ctrl_get_ch_clk_mask(uint8_t channel_id) { diff --git a/drivers/pwm/pwm_npcx.c b/drivers/pwm/pwm_npcx.c index 233a4354fb8..dd8b1f53ab0 100644 --- a/drivers/pwm/pwm_npcx.c +++ b/drivers/pwm/pwm_npcx.c @@ -56,7 +56,7 @@ struct pwm_npcx_data { #define DRV_DATA(dev) ((struct pwm_npcx_data *)(dev)->data) -#define HAL_INSTANCE(dev) (struct pwm_reg *)(DRV_CONFIG(dev)->base) +#define HAL_INSTANCE(dev) ((struct pwm_reg *)DRV_CONFIG(dev)->base) /* PWM local functions */ static void pwm_npcx_configure(const struct device *dev, int clk_bus) diff --git a/drivers/sensor/nuvoton_tach_npcx/tach_nuvoton_npcx.c b/drivers/sensor/nuvoton_tach_npcx/tach_nuvoton_npcx.c index 7ffe12bc502..3cb4fb5a822 100644 --- a/drivers/sensor/nuvoton_tach_npcx/tach_nuvoton_npcx.c +++ b/drivers/sensor/nuvoton_tach_npcx/tach_nuvoton_npcx.c @@ -79,7 +79,7 @@ struct tach_npcx_data { #define DRV_DATA(dev) ((struct tach_npcx_data *)(dev)->data) -#define HAL_INSTANCE(dev) (struct tach_reg *)(DRV_CONFIG(dev)->base) +#define HAL_INSTANCE(dev) ((struct tach_reg *)DRV_CONFIG(dev)->base) /* Maximum count of prescaler */ #define NPCX_TACHO_PRSC_MAX 0xff diff --git a/drivers/serial/uart_npcx.c b/drivers/serial/uart_npcx.c index 18adbcb79a2..41cdb20d708 100644 --- a/drivers/serial/uart_npcx.c +++ b/drivers/serial/uart_npcx.c @@ -61,7 +61,7 @@ struct uart_npcx_data { #define DRV_DATA(dev) ((struct uart_npcx_data *)(dev)->data) -#define HAL_INSTANCE(dev) (struct uart_reg *)(DRV_CONFIG(dev)->uconf.base) +#define HAL_INSTANCE(dev) ((struct uart_reg *)DRV_CONFIG(dev)->uconf.base) #if defined(CONFIG_PM) && defined(CONFIG_UART_INTERRUPT_DRIVEN) static void uart_npcx_pm_constraint_set(struct uart_npcx_data *data, diff --git a/drivers/spi/spi_npcx_fiu.c b/drivers/spi/spi_npcx_fiu.c index 88e2f5bb19a..f1f4675812d 100644 --- a/drivers/spi/spi_npcx_fiu.c +++ b/drivers/spi/spi_npcx_fiu.c @@ -31,7 +31,7 @@ struct npcx_spi_fiu_data { /* Driver convenience defines */ #define DRV_CONFIG(dev) ((const struct npcx_spi_fiu_config *)(dev)->config) #define DRV_DATA(dev) ((struct npcx_spi_fiu_data *)(dev)->data) -#define HAL_INSTANCE(dev) (struct fiu_reg *)(DRV_CONFIG(dev)->base) +#define HAL_INSTANCE(dev) ((struct fiu_reg *)DRV_CONFIG(dev)->base) static inline void spi_npcx_fiu_cs_level(const struct device *dev, int level) { diff --git a/drivers/watchdog/wdt_npcx.c b/drivers/watchdog/wdt_npcx.c index cf408d42184..46cb96ba609 100644 --- a/drivers/watchdog/wdt_npcx.c +++ b/drivers/watchdog/wdt_npcx.c @@ -84,7 +84,7 @@ struct miwu_dev_callback miwu_cb; /* Driver convenience defines */ #define DRV_CONFIG(dev) ((const struct wdt_npcx_config *)(dev)->config) #define DRV_DATA(dev) ((struct wdt_npcx_data *)(dev)->data) -#define HAL_INSTANCE(dev) (struct twd_reg *)(DRV_CONFIG(dev)->base) +#define HAL_INSTANCE(dev) ((struct twd_reg *)DRV_CONFIG(dev)->base) /* WDT local inline functions */ static inline int wdt_t0out_reload(const struct device *dev)