michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: npcx: Drop DRV_CONFIG/DRV_DATA usage

Browse source 
Stop using DRV_CONFIG/DRV_DATA macros and use dev->data and dev->config
instead.

Signed-off-by: Wealian Liao <WHLIAO@nuvoton.com>
This commit is contained in:
Wealian Liao 2022-01-21 15:24:08 +08:00 • committed by Carles Cufí
commit 6d6c5e1155
15 changed files with 146 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

20
drivers/watchdog/wdt_npcx.c
View file

@ -82,9 +82,7 @@ struct wdt_npcx_data {
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 *)((const struct wdt_npcx_config *)(dev)->config)->base)
/* WDT local inline functions */
static inline int wdt_t0out_reload(const struct device *dev)
@ -133,7 +131,7 @@ static inline int wdt_wait_stopped(const struct device *dev)
/* WDT local functions */
static void wdt_t0out_isr(const struct device *dev, struct npcx_wui *wui)
{
struct wdt_npcx_data *const data = DRV_DATA(dev);
struct wdt_npcx_data *const data = dev->data;
ARG_UNUSED(wui);
LOG_DBG("WDT reset will issue after %d delay cycle! WUI(%d %d %d)",
@ -147,7 +145,7 @@ static void wdt_t0out_isr(const struct device *dev, struct npcx_wui *wui)
static void wdt_config_t0out_interrupt(const struct device *dev)
{
const struct wdt_npcx_config *const config = DRV_CONFIG(dev);
const struct wdt_npcx_config *const config = dev->config;
/* Initialize a miwu device input and its callback function */
npcx_miwu_init_dev_callback(&miwu_cb, &config->t0out, wdt_t0out_isr,
@ -166,7 +164,7 @@ static void wdt_config_t0out_interrupt(const struct device *dev)
static int wdt_npcx_install_timeout(const struct device *dev,
const struct wdt_timeout_cfg *cfg)
{
struct wdt_npcx_data *const data = DRV_DATA(dev);
struct wdt_npcx_data *const data = dev->data;
struct twd_reg *const inst = HAL_INSTANCE(dev);
/* If watchdog is already running */
@ -204,8 +202,8 @@ static int wdt_npcx_install_timeout(const struct device *dev,
static int wdt_npcx_setup(const struct device *dev, uint8_t options)
{
struct twd_reg *const inst = HAL_INSTANCE(dev);
const struct wdt_npcx_config *const config = DRV_CONFIG(dev);
struct wdt_npcx_data *const data = DRV_DATA(dev);
const struct wdt_npcx_config *const config = dev->config;
struct wdt_npcx_data *const data = dev->data;
int rv;
/* Disable irq of t0-out expired event first */
@ -258,8 +256,8 @@ static int wdt_npcx_setup(const struct device *dev, uint8_t options)
static int wdt_npcx_disable(const struct device *dev)
{
const struct wdt_npcx_config *const config = DRV_CONFIG(dev);
struct wdt_npcx_data *const data = DRV_DATA(dev);
const struct wdt_npcx_config *const config = dev->config;
struct wdt_npcx_data *const data = dev->data;
struct twd_reg *const inst = HAL_INSTANCE(dev);
/*
@ -289,7 +287,7 @@ static int wdt_npcx_disable(const struct device *dev)
static int wdt_npcx_feed(const struct device *dev, int channel_id)
{
ARG_UNUSED(channel_id);
struct wdt_npcx_data *const data = DRV_DATA(dev);
struct wdt_npcx_data *const data = dev->data;
struct twd_reg *const inst = HAL_INSTANCE(dev);
/* Feed watchdog by writing 5Ch to WDSDM */