michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: i2c: replace DEV_NAME macros

Browse source 
Similar to commit be32e33774, this
replaces the use of DEV_NAME macros with dev->name directly. This also
fixes #42996 for i2c_sam_twi.c in particular.

Signed-off-by: Ryan Armstrong <git@zerker.ca>
This commit is contained in:
Ryan Armstrong 2022-02-20 09:37:38 -05:00 • committed by Anas Nashif
commit c124f40f14
4 changed files with 18 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

26
drivers/i2c/i2c_sam0.c
View file

@ -56,8 +56,6 @@ struct i2c_sam0_dev_data {
uint8_t num_msgs; uint8_t num_msgs;
}; };
#define DEV_NAME(dev) ((dev)->name)
static void wait_synchronization(SercomI2cm *regs) static void wait_synchronization(SercomI2cm *regs)
{ {
#if defined(SERCOM_I2CM_SYNCBUSY_MASK) #if defined(SERCOM_I2CM_SYNCBUSY_MASK)
@ -209,7 +207,7 @@ static void i2c_sam0_dma_write_done(const struct device *dma_dev, void *arg,
} }
if (error_code < 0) { if (error_code < 0) {
LOG_ERR("DMA write error on %s: %d", DEV_NAME(dev), error_code); LOG_ERR("DMA write error on %s: %d", dev->name, error_code);
i2c->INTENCLR.reg = SERCOM_I2CM_INTENCLR_MASK; i2c->INTENCLR.reg = SERCOM_I2CM_INTENCLR_MASK;
irq_unlock(key); irq_unlock(key);
@ -267,14 +265,14 @@ static bool i2c_sam0_dma_write_start(const struct device *dev)
retval = dma_config(cfg->dma_dev, cfg->dma_channel, &dma_cfg); retval = dma_config(cfg->dma_dev, cfg->dma_channel, &dma_cfg);
if (retval != 0) { if (retval != 0) {
LOG_ERR("Write DMA configure on %s failed: %d", LOG_ERR("Write DMA configure on %s failed: %d",
DEV_NAME(dev), retval); dev->name, retval);
return false; return false;
} }
retval = dma_start(cfg->dma_dev, cfg->dma_channel); retval = dma_start(cfg->dma_dev, cfg->dma_channel);
if (retval != 0) { if (retval != 0) {
LOG_ERR("Write DMA start on %s failed: %d", LOG_ERR("Write DMA start on %s failed: %d",
DEV_NAME(dev), retval); dev->name, retval);
return false; return false;
} }
@ -300,7 +298,7 @@ static void i2c_sam0_dma_read_done(const struct device *dma_dev, void *arg,
} }
if (error_code < 0) { if (error_code < 0) {
LOG_ERR("DMA read error on %s: %d", DEV_NAME(dev), error_code); LOG_ERR("DMA read error on %s: %d", dev->name, error_code);
i2c->INTENCLR.reg = SERCOM_I2CM_INTENCLR_MASK; i2c->INTENCLR.reg = SERCOM_I2CM_INTENCLR_MASK;
irq_unlock(key); irq_unlock(key);
@ -360,14 +358,14 @@ static bool i2c_sam0_dma_read_start(const struct device *dev)
retval = dma_config(cfg->dma_dev, cfg->dma_channel, &dma_cfg); retval = dma_config(cfg->dma_dev, cfg->dma_channel, &dma_cfg);
if (retval != 0) { if (retval != 0) {
LOG_ERR("Read DMA configure on %s failed: %d", LOG_ERR("Read DMA configure on %s failed: %d",
DEV_NAME(dev), retval); dev->name, retval);
return false; return false;
} }
retval = dma_start(cfg->dma_dev, cfg->dma_channel); retval = dma_start(cfg->dma_dev, cfg->dma_channel);
if (retval != 0) { if (retval != 0) {
LOG_ERR("Read DMA start on %s failed: %d", LOG_ERR("Read DMA start on %s failed: %d",
DEV_NAME(dev), retval); dev->name, retval);
return false; return false;
} }
@ -482,12 +480,12 @@ static int i2c_sam0_transfer(const struct device *dev, struct i2c_msg *msgs,
if (data->msg.status & SERCOM_I2CM_STATUS_ARBLOST) { if (data->msg.status & SERCOM_I2CM_STATUS_ARBLOST) {
LOG_DBG("Arbitration lost on %s", LOG_DBG("Arbitration lost on %s",
DEV_NAME(dev)); dev->name);
return -EAGAIN; return -EAGAIN;
} }
LOG_ERR("Transaction error on %s: %08X", LOG_ERR("Transaction error on %s: %08X",
DEV_NAME(dev), data->msg.status); dev->name, data->msg.status);
return -EIO; return -EIO;
} }
@ -547,7 +545,7 @@ static int i2c_sam0_set_apply_bitrate(const struct device *dev,
} }
LOG_DBG("Setting %s to standard mode with divisor %u", LOG_DBG("Setting %s to standard mode with divisor %u",
DEV_NAME(dev), baud); dev->name, baud);
i2c->BAUD.reg = SERCOM_I2CM_BAUD_BAUD(baud); i2c->BAUD.reg = SERCOM_I2CM_BAUD_BAUD(baud);
break; break;
@ -564,7 +562,7 @@ static int i2c_sam0_set_apply_bitrate(const struct device *dev,
} }
LOG_DBG("Setting %s to fast mode with divisor %u", LOG_DBG("Setting %s to fast mode with divisor %u",
DEV_NAME(dev), baud); dev->name, baud);
i2c->BAUD.reg = SERCOM_I2CM_BAUD_BAUD(baud); i2c->BAUD.reg = SERCOM_I2CM_BAUD_BAUD(baud);
break; break;
@ -595,7 +593,7 @@ static int i2c_sam0_set_apply_bitrate(const struct device *dev,
} }
LOG_DBG("Setting %s to fast mode plus with divisors %u/%u", LOG_DBG("Setting %s to fast mode plus with divisors %u/%u",
DEV_NAME(dev), baud_high, baud_low); dev->name, baud_high, baud_low);
i2c->BAUD.reg = SERCOM_I2CM_BAUD_BAUD(baud_high) | i2c->BAUD.reg = SERCOM_I2CM_BAUD_BAUD(baud_high) |
SERCOM_I2CM_BAUD_BAUDLOW(baud_low); SERCOM_I2CM_BAUD_BAUDLOW(baud_low);
@ -627,7 +625,7 @@ static int i2c_sam0_set_apply_bitrate(const struct device *dev,
#ifdef SERCOM_I2CM_BAUD_HSBAUD #ifdef SERCOM_I2CM_BAUD_HSBAUD
LOG_DBG("Setting %s to high speed with divisors %u/%u", LOG_DBG("Setting %s to high speed with divisors %u/%u",
DEV_NAME(dev), baud_high, baud_low); dev->name, baud_high, baud_low);
/* /*
* 48 is just from the app notes, but the datasheet says * 48 is just from the app notes, but the datasheet says

6
drivers/i2c/i2c_sam4l_twim.c
View file

@ -102,8 +102,6 @@ struct i2c_sam_twim_dev_data {
bool cur_need_rs; bool cur_need_rs;
}; };
#define DEV_NAME(dev) ((dev)->name)
static int i2c_clk_set(const struct device *dev, uint32_t speed) static int i2c_clk_set(const struct device *dev, uint32_t speed)
{ {
const struct i2c_sam_twim_dev_cfg *const cfg = dev->config; const struct i2c_sam_twim_dev_cfg *const cfg = dev->config;
@ -572,14 +570,14 @@ static int i2c_sam_twim_initialize(const struct device *dev)
ret = i2c_sam_twim_configure(dev, I2C_MODE_MASTER | bitrate_cfg); ret = i2c_sam_twim_configure(dev, I2C_MODE_MASTER | bitrate_cfg);
if (ret < 0) { if (ret < 0) {
LOG_ERR("Failed to initialize %s device", DEV_NAME(dev)); LOG_ERR("Failed to initialize %s device", dev->name);
return ret; return ret;
} }
/* Enable module's IRQ */ /* Enable module's IRQ */
irq_enable(cfg->irq_id); irq_enable(cfg->irq_id);
LOG_INF("Device %s initialized", DEV_NAME(dev)); LOG_INF("Device %s initialized", dev->name);
return 0; return 0;
} }

4
drivers/i2c/i2c_sam_twi.c
View file

@ -315,14 +315,14 @@ static int i2c_sam_twi_initialize(const struct device *dev)
ret = i2c_sam_twi_configure(dev, I2C_MODE_MASTER | bitrate_cfg); ret = i2c_sam_twi_configure(dev, I2C_MODE_MASTER | bitrate_cfg);
if (ret < 0) { if (ret < 0) {
LOG_ERR("Failed to initialize %s device", DEV_NAME(dev)); LOG_ERR("Failed to initialize %s device", dev->name);
return ret; return ret;
} }
/* Enable module's IRQ */ /* Enable module's IRQ */
irq_enable(dev_cfg->irq_id); irq_enable(dev_cfg->irq_id);
LOG_INF("Device %s initialized", DEV_NAME(dev)); LOG_INF("Device %s initialized", dev->name);
return 0; return 0;
} }

6
drivers/i2c/i2c_sam_twihs.c
View file

@ -66,8 +66,6 @@ struct i2c_sam_twihs_dev_data {
struct twihs_msg msg; struct twihs_msg msg;
}; };
#define DEV_NAME(dev) ((dev)->name)
static int i2c_clk_set(Twihs *const twihs, uint32_t speed) static int i2c_clk_set(Twihs *const twihs, uint32_t speed)
{ {
uint32_t ck_div = 0U; uint32_t ck_div = 0U;
@ -304,14 +302,14 @@ static int i2c_sam_twihs_initialize(const struct device *dev)
ret = i2c_sam_twihs_configure(dev, I2C_MODE_MASTER | bitrate_cfg); ret = i2c_sam_twihs_configure(dev, I2C_MODE_MASTER | bitrate_cfg);
if (ret < 0) { if (ret < 0) {
LOG_ERR("Failed to initialize %s device", DEV_NAME(dev)); LOG_ERR("Failed to initialize %s device", dev->name);
return ret; return ret;
} }
/* Enable module's IRQ */ /* Enable module's IRQ */
irq_enable(dev_cfg->irq_id); irq_enable(dev_cfg->irq_id);
LOG_INF("Device %s initialized", DEV_NAME(dev)); LOG_INF("Device %s initialized", dev->name);
return 0; return 0;
} }