Commit 4d827824 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Wolfram Sang

i2c: designware: Define software status flags with BIT()

Define software status flags with a BIT() macro. While at it remove
STATUS_IDLE and replace its use with zero initialization and status
flags clearing with a mask.
Suggested-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent dcf1bf64
...@@ -123,12 +123,12 @@ ...@@ -123,12 +123,12 @@
#define DW_IC_COMP_PARAM_1_SPEED_MODE_MASK GENMASK(3, 2) #define DW_IC_COMP_PARAM_1_SPEED_MODE_MASK GENMASK(3, 2)
/* /*
* status codes * Sofware status flags
*/ */
#define STATUS_IDLE 0x0 #define STATUS_ACTIVE BIT(0)
#define STATUS_ACTIVE 0x1 #define STATUS_WRITE_IN_PROGRESS BIT(1)
#define STATUS_WRITE_IN_PROGRESS 0x2 #define STATUS_READ_IN_PROGRESS BIT(2)
#define STATUS_READ_IN_PROGRESS 0x4 #define STATUS_MASK GENMASK(2, 0)
/* /*
* operation modes * operation modes
......
...@@ -574,7 +574,7 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) ...@@ -574,7 +574,7 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
dev->msg_write_idx = 0; dev->msg_write_idx = 0;
dev->msg_read_idx = 0; dev->msg_read_idx = 0;
dev->msg_err = 0; dev->msg_err = 0;
dev->status = STATUS_IDLE; dev->status = 0;
dev->abort_source = 0; dev->abort_source = 0;
dev->rx_outstanding = 0; dev->rx_outstanding = 0;
...@@ -731,7 +731,7 @@ static int i2c_dw_irq_handler_master(struct dw_i2c_dev *dev) ...@@ -731,7 +731,7 @@ static int i2c_dw_irq_handler_master(struct dw_i2c_dev *dev)
if (stat & DW_IC_INTR_TX_ABRT) { if (stat & DW_IC_INTR_TX_ABRT) {
dev->cmd_err |= DW_IC_ERR_TX_ABRT; dev->cmd_err |= DW_IC_ERR_TX_ABRT;
dev->status = STATUS_IDLE; dev->status &= ~STATUS_MASK;
dev->rx_outstanding = 0; dev->rx_outstanding = 0;
/* /*
......
...@@ -82,7 +82,7 @@ static int i2c_dw_reg_slave(struct i2c_client *slave) ...@@ -82,7 +82,7 @@ static int i2c_dw_reg_slave(struct i2c_client *slave)
dev->msg_write_idx = 0; dev->msg_write_idx = 0;
dev->msg_read_idx = 0; dev->msg_read_idx = 0;
dev->msg_err = 0; dev->msg_err = 0;
dev->status = STATUS_IDLE; dev->status = 0;
dev->abort_source = 0; dev->abort_source = 0;
dev->rx_outstanding = 0; dev->rx_outstanding = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment