From: Fabio Estevam <fabio.estevam@xxxxxxx>
When CONFIG_I2C_SLAVE is not selected the following build warning
is seen:
drivers/i2c/busses/i2c-aspeed.c:567:1: warning: label 'out' defined but not used [-Wunused-label]
Get rid of the 'out' label by replacing it with the corresponding
functions directly.
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxx>
---
Changes since v1:
- Remove the no longer needed 'ret' assignment (Shubhrajyoti Datta)
- Improve a bit the commit log.
drivers/i2c/busses/i2c-aspeed.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/i2c/busses/i2c-aspeed.c b/drivers/i2c/busses/i2c-aspeed.c
index a4f956c..2f33278 100644
--- a/drivers/i2c/busses/i2c-aspeed.c
+++ b/drivers/i2c/busses/i2c-aspeed.c
@@ -557,14 +557,12 @@ static irqreturn_t aspeed_i2c_bus_irq(int irq, void *dev_id)
#if IS_ENABLED(CONFIG_I2C_SLAVE)
if (aspeed_i2c_slave_irq(bus)) {
dev_dbg(bus->dev, "irq handled by slave.\n");
- ret = true;
- goto out;
+ spin_unlock(&bus->lock);
+ return IRQ_HANDLED;
}
#endif /* CONFIG_I2C_SLAVE */
ret = aspeed_i2c_master_irq(bus);
-
-out:
spin_unlock(&bus->lock);
return ret ? IRQ_HANDLED : IRQ_NONE;
}
--
2.7.4
