[PATCH 3/3] i2c: xiic: Replace spinlock with mutex

[Lars-Peter Clausen]

All protected sections are only called from sleep-able context, so there is
no need to use a spinlock.

Signed-off-by: Lars-Peter Clausen 
---
 drivers/i2c/busses/i2c-xiic.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c
index 0b20449..6efd200 100644
--- a/drivers/i2c/busses/i2c-xiic.c
+++ b/drivers/i2c/busses/i2c-xiic.c
@@ -70,7 +70,7 @@ struct xiic_i2c {
wait_queue_head_t   wait;
struct i2c_adapter  adap;
struct i2c_msg  *tx_msg;
-   spinlock_t  lock;
+   struct mutexlock;
unsigned inttx_pos;
unsigned intnmsgs;
enum xilinx_i2c_state   state;
@@ -369,7 +369,7 @@ static irqreturn_t xiic_process(int irq, void *dev_id)
 * To find which interrupts are pending; AND interrupts pending with
 * interrupts masked.
 */
-   spin_lock(>lock);
+   mutex_lock(>lock);
isr = xiic_getreg32(i2c, XIIC_IISR_OFFSET);
ier = xiic_getreg32(i2c, XIIC_IIER_OFFSET);
pend = isr & ier;
@@ -497,7 +497,7 @@ out:
dev_dbg(i2c->adap.dev.parent, "%s clr: 0x%x\n", __func__, clr);
 
xiic_setreg32(i2c, XIIC_IISR_OFFSET, clr);
-   spin_unlock(>lock);
+   mutex_unlock(>lock);
return IRQ_HANDLED;
 }
 
@@ -662,10 +662,10 @@ static void __xiic_start_xfer(struct xiic_i2c *i2c)
 
 static void xiic_start_xfer(struct xiic_i2c *i2c)
 {
-   spin_lock(>lock);
+   mutex_lock(>lock);
xiic_reinit(i2c);
__xiic_start_xfer(i2c);
-   spin_unlock(>lock);
+   mutex_unlock(>lock);
 }
 
 static int xiic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
@@ -745,7 +745,7 @@ static int xiic_i2c_probe(struct platform_device *pdev)
i2c->adap.dev.parent = >dev;
i2c->adap.dev.of_node = pdev->dev.of_node;
 
-   spin_lock_init(>lock);
+   mutex_init(>lock);
init_waitqueue_head(>wait);
 
ret = devm_request_threaded_irq(>dev, irq, xiic_isr,
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 3/3] i2c: xiic: Replace spinlock with mutex

[Shubhrajyoti Datta]

On Mon, Nov 16, 2015 at 7:12 PM, Lars-Peter Clausen  wrote:
> All protected sections are only called from sleep-able context, so there is
> no need to use a spinlock.

Looks good to me. Feel free to add my reviewed by.
>
> Signed-off-by: Lars-Peter Clausen 
> ---
>  drivers/i2c/busses/i2c-xiic.c | 12 ++--
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c
> index 0b20449..6efd200 100644
> --- a/drivers/i2c/busses/i2c-xiic.c
> +++ b/drivers/i2c/busses/i2c-xiic.c
> @@ -70,7 +70,7 @@ struct xiic_i2c {
> wait_queue_head_t   wait;
> struct i2c_adapter  adap;
> struct i2c_msg  *tx_msg;
> -   spinlock_t  lock;
> +   struct mutexlock;
> unsigned inttx_pos;
> unsigned intnmsgs;
> enum xilinx_i2c_state   state;
> @@ -369,7 +369,7 @@ static irqreturn_t xiic_process(int irq, void *dev_id)
>  * To find which interrupts are pending; AND interrupts pending with
>  * interrupts masked.
>  */
> -   spin_lock(>lock);
> +   mutex_lock(>lock);
> isr = xiic_getreg32(i2c, XIIC_IISR_OFFSET);
> ier = xiic_getreg32(i2c, XIIC_IIER_OFFSET);
> pend = isr & ier;
> @@ -497,7 +497,7 @@ out:
> dev_dbg(i2c->adap.dev.parent, "%s clr: 0x%x\n", __func__, clr);
>
> xiic_setreg32(i2c, XIIC_IISR_OFFSET, clr);
> -   spin_unlock(>lock);
> +   mutex_unlock(>lock);
> return IRQ_HANDLED;
>  }
>
> @@ -662,10 +662,10 @@ static void __xiic_start_xfer(struct xiic_i2c *i2c)
>
>  static void xiic_start_xfer(struct xiic_i2c *i2c)
>  {
> -   spin_lock(>lock);
> +   mutex_lock(>lock);
> xiic_reinit(i2c);
> __xiic_start_xfer(i2c);
> -   spin_unlock(>lock);
> +   mutex_unlock(>lock);
>  }
>
>  static int xiic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
> @@ -745,7 +745,7 @@ static int xiic_i2c_probe(struct platform_device *pdev)
> i2c->adap.dev.parent = >dev;
> i2c->adap.dev.of_node = pdev->dev.of_node;
>
> -   spin_lock_init(>lock);
> +   mutex_init(>lock);
> init_waitqueue_head(>wait);
>
> ret = devm_request_threaded_irq(>dev, irq, xiic_isr,
> --
> 2.1.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 3/3] i2c: xiic: Replace spinlock with mutex

[Shubhrajyoti Datta]

On Tue, Nov 17, 2015 at 10:48 AM, Shubhrajyoti Datta
 wrote:
> On Mon, Nov 16, 2015 at 7:12 PM, Lars-Peter Clausen  wrote:
>> All protected sections are only called from sleep-able context, so there is
>> no need to use a spinlock.
>
> Looks good to me. Feel free to add my reviewed by.

Reviewed-by: Shubhrajyoti Datta 
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html