Commit 06856269 authored by Barry Song's avatar Barry Song Committed by Wolfram Sang

i2c: busses: replace spin_lock_irqsave by spin_lock in hard IRQ

The code has been in a irq-disabled context since it is hard IRQ. There
is no necessity to do it again.
Signed-off-by: default avatarBarry Song <song.bao.hua@hisilicon.com>
Reviewed-by: default avatarAkash Asthana <akashast@codeaurora.org>
Reviewed-by: default avatarMukesh Kumar Savaliya <msavaliy@codeaurora.org>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 795ee9b8
...@@ -496,11 +496,10 @@ static irqreturn_t ...@@ -496,11 +496,10 @@ static irqreturn_t
mv64xxx_i2c_intr(int irq, void *dev_id) mv64xxx_i2c_intr(int irq, void *dev_id)
{ {
struct mv64xxx_i2c_data *drv_data = dev_id; struct mv64xxx_i2c_data *drv_data = dev_id;
unsigned long flags;
u32 status; u32 status;
irqreturn_t rc = IRQ_NONE; irqreturn_t rc = IRQ_NONE;
spin_lock_irqsave(&drv_data->lock, flags); spin_lock(&drv_data->lock);
if (drv_data->offload_enabled) if (drv_data->offload_enabled)
rc = mv64xxx_i2c_intr_offload(drv_data); rc = mv64xxx_i2c_intr_offload(drv_data);
...@@ -517,7 +516,7 @@ mv64xxx_i2c_intr(int irq, void *dev_id) ...@@ -517,7 +516,7 @@ mv64xxx_i2c_intr(int irq, void *dev_id)
rc = IRQ_HANDLED; rc = IRQ_HANDLED;
} }
spin_unlock_irqrestore(&drv_data->lock, flags); spin_unlock(&drv_data->lock);
return rc; return rc;
} }
......
...@@ -165,10 +165,9 @@ static irqreturn_t owl_i2c_interrupt(int irq, void *_dev) ...@@ -165,10 +165,9 @@ static irqreturn_t owl_i2c_interrupt(int irq, void *_dev)
{ {
struct owl_i2c_dev *i2c_dev = _dev; struct owl_i2c_dev *i2c_dev = _dev;
struct i2c_msg *msg = i2c_dev->msg; struct i2c_msg *msg = i2c_dev->msg;
unsigned long flags;
unsigned int stat, fifostat; unsigned int stat, fifostat;
spin_lock_irqsave(&i2c_dev->lock, flags); spin_lock(&i2c_dev->lock);
i2c_dev->err = 0; i2c_dev->err = 0;
...@@ -208,7 +207,7 @@ static irqreturn_t owl_i2c_interrupt(int irq, void *_dev) ...@@ -208,7 +207,7 @@ static irqreturn_t owl_i2c_interrupt(int irq, void *_dev)
OWL_I2C_STAT_IRQP, true); OWL_I2C_STAT_IRQP, true);
complete_all(&i2c_dev->msg_complete); complete_all(&i2c_dev->msg_complete);
spin_unlock_irqrestore(&i2c_dev->lock, flags); spin_unlock(&i2c_dev->lock);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
......
...@@ -210,9 +210,8 @@ static irqreturn_t geni_i2c_irq(int irq, void *dev) ...@@ -210,9 +210,8 @@ static irqreturn_t geni_i2c_irq(int irq, void *dev)
u32 dma; u32 dma;
u32 val; u32 val;
struct i2c_msg *cur; struct i2c_msg *cur;
unsigned long flags;
spin_lock_irqsave(&gi2c->lock, flags); spin_lock(&gi2c->lock);
m_stat = readl_relaxed(base + SE_GENI_M_IRQ_STATUS); m_stat = readl_relaxed(base + SE_GENI_M_IRQ_STATUS);
rx_st = readl_relaxed(base + SE_GENI_RX_FIFO_STATUS); rx_st = readl_relaxed(base + SE_GENI_RX_FIFO_STATUS);
dm_tx_st = readl_relaxed(base + SE_DMA_TX_IRQ_STAT); dm_tx_st = readl_relaxed(base + SE_DMA_TX_IRQ_STAT);
...@@ -294,7 +293,7 @@ static irqreturn_t geni_i2c_irq(int irq, void *dev) ...@@ -294,7 +293,7 @@ static irqreturn_t geni_i2c_irq(int irq, void *dev)
dm_rx_st & RX_DMA_DONE || dm_rx_st & RX_RESET_DONE) dm_rx_st & RX_DMA_DONE || dm_rx_st & RX_RESET_DONE)
complete(&gi2c->done); complete(&gi2c->done);
spin_unlock_irqrestore(&gi2c->lock, flags); spin_unlock(&gi2c->lock);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
......
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