i2c: stm32f7: simplify status messages in case of errors

[ Upstream commit 33a00d919253022aabafecae6bc88a6fad446589 ]

Avoid usage of __func__ when reporting an error message
since dev_err/dev_dbg are already providing enough details
to identify the source of the message.

Signed-off-by: Alain Volmat <alain.volmat@foss.st.com>
Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Stable-dep-of: 6aae87fe7f18 ("i2c: stm32f7: unmap DMA mapped buffer")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c
index 74fef11fd18a2901f846c517e0eda2fe304251b5..cc76c71666e5d1f679f5e6b0dc7e75b2851e339a 100644 (file)
--- a/drivers/i2c/busses/i2c-stm32f7.c
+++ b/drivers/i2c/busses/i2c-stm32f7.c
@@ -1601,6 +1601,7 @@ static irqreturn_t stm32f7_i2c_isr_error_thread(int irq, void *data)
 {
        struct stm32f7_i2c_dev *i2c_dev = data;
        struct stm32f7_i2c_msg *f7_msg = &i2c_dev->f7_msg;
+       u16 addr = f7_msg->addr;
        void __iomem *base = i2c_dev->base;
        struct device *dev = i2c_dev->dev;
        struct stm32_i2c_dma *dma = i2c_dev->dma;
@@ -1610,8 +1611,7 @@ static irqreturn_t stm32f7_i2c_isr_error_thread(int irq, void *data)
 
        /* Bus error */
        if (status & STM32F7_I2C_ISR_BERR) {
-               dev_err(dev, "<%s>: Bus error accessing addr 0x%x\n",
-                       __func__, f7_msg->addr);
+               dev_err(dev, "Bus error accessing addr 0x%x\n", addr);
                writel_relaxed(STM32F7_I2C_ICR_BERRCF, base + STM32F7_I2C_ICR);
                stm32f7_i2c_release_bus(&i2c_dev->adap);
                f7_msg->result = -EIO;
@@ -1619,21 +1619,19 @@ static irqreturn_t stm32f7_i2c_isr_error_thread(int irq, void *data)
 
        /* Arbitration loss */
        if (status & STM32F7_I2C_ISR_ARLO) {
-               dev_dbg(dev, "<%s>: Arbitration loss accessing addr 0x%x\n",
-                       __func__, f7_msg->addr);
+               dev_dbg(dev, "Arbitration loss accessing addr 0x%x\n", addr);
                writel_relaxed(STM32F7_I2C_ICR_ARLOCF, base + STM32F7_I2C_ICR);
                f7_msg->result = -EAGAIN;
        }
 
        if (status & STM32F7_I2C_ISR_PECERR) {
-               dev_err(dev, "<%s>: PEC error in reception accessing addr 0x%x\n",
-                       __func__, f7_msg->addr);
+               dev_err(dev, "PEC error in reception accessing addr 0x%x\n", addr);
                writel_relaxed(STM32F7_I2C_ICR_PECCF, base + STM32F7_I2C_ICR);
                f7_msg->result = -EINVAL;
        }
 
        if (status & STM32F7_I2C_ISR_ALERT) {
-               dev_dbg(dev, "<%s>: SMBus alert received\n", __func__);
+               dev_dbg(dev, "SMBus alert received\n");
                writel_relaxed(STM32F7_I2C_ICR_ALERTCF, base + STM32F7_I2C_ICR);
                i2c_handle_smbus_alert(i2c_dev->alert->ara);
                return IRQ_HANDLED;