i2c: npcm: Fix timeout calculation

[ Upstream commit 288b204492fddf28889cea6dc95a23976632c7a0 ]

Use adap.timeout for timeout calculation instead of hard-coded
value of 35ms.

Fixes: 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver")
Signed-off-by: Tali Perry <tali.perry1@gmail.com>
Signed-off-by: Tyrone Ting <kfting@nuvoton.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/i2c/busses/i2c-npcm7xx.c b/drivers/i2c/busses/i2c-npcm7xx.c
index 2ad1663..92fd88a 100644 (file)
--- a/drivers/i2c/busses/i2c-npcm7xx.c
+++ b/drivers/i2c/busses/i2c-npcm7xx.c
@@ -2047,7 +2047,7 @@ static int npcm_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
        u16 nwrite, nread;
        u8 *write_data, *read_data;
        u8 slave_addr;
-       int timeout;
+       unsigned long timeout;
        int ret = 0;
        bool read_block = false;
        bool read_PEC = false;
@@ -2099,13 +2099,13 @@ static int npcm_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
         * 9: bits per transaction (including the ack/nack)
         */
        timeout_usec = (2 * 9 * USEC_PER_SEC / bus->bus_freq) * (2 + nread + nwrite);
-       timeout = max(msecs_to_jiffies(35), usecs_to_jiffies(timeout_usec));
+       timeout = max_t(unsigned long, bus->adap.timeout, usecs_to_jiffies(timeout_usec));
        if (nwrite >= 32 * 1024 || nread >= 32 * 1024) {
                dev_err(bus->dev, "i2c%d buffer too big\n", bus->num);
                return -EINVAL;
        }
 
-       time_left = jiffies + msecs_to_jiffies(DEFAULT_STALL_COUNT) + 1;
+       time_left = jiffies + timeout + 1;
        do {
                /*
                 * we must clear slave address immediately when the bus is not
@@ -2269,7 +2269,7 @@ static int npcm_i2c_probe_bus(struct platform_device *pdev)
        adap = &bus->adap;
        adap->owner = THIS_MODULE;
        adap->retries = 3;
-       adap->timeout = HZ;
+       adap->timeout = msecs_to_jiffies(35);
        adap->algo = &npcm_i2c_algo;
        adap->quirks = &npcm_i2c_quirks;
        adap->algo_data = bus;