| Message ID | 20181109170216.15071-1-wsa@the-dreams.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | i2c: nvidia-gpu: adhere to I2C fault codes | expand |
Hi Wolfram, > Subject: [PATCH] i2c: nvidia-gpu: adhere to I2C fault codes > > As described in Documentation/i2c/fault-codes. Thanks for fixing it. > Signed-off-by: Wolfram Sang <wsa@the-dreams.de> Acked-by: Ajay Gupta <ajayg@nvidia.com> Tested-by: Ajay Gupta <ajayg@nvidia.com> > nvpublic > --- > drivers/i2c/busses/i2c-nvidia-gpu.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-nvidia-gpu.c b/drivers/i2c/busses/i2c-nvidia- > gpu.c > index 8822357bca0c..4307b42901a1 100644 > --- a/drivers/i2c/busses/i2c-nvidia-gpu.c > +++ b/drivers/i2c/busses/i2c-nvidia-gpu.c > @@ -89,7 +89,7 @@ static int gpu_i2c_check_status(struct gpu_i2c_dev > *i2cd) > > if (time_is_before_jiffies(target)) { > dev_err(i2cd->dev, "i2c timeout error %x\n", val); > - return -ETIME; > + return -ETIMEDOUT; > } > > val = readl(i2cd->regs + I2C_MST_CNTL); @@ -97,9 +97,9 @@ static > int gpu_i2c_check_status(struct gpu_i2c_dev *i2cd) > case I2C_MST_CNTL_STATUS_OKAY: > return 0; > case I2C_MST_CNTL_STATUS_NO_ACK: > - return -EIO; > + return -ENXIO; > case I2C_MST_CNTL_STATUS_TIMEOUT: > - return -ETIME; > + return -ETIMEDOUT; > default: > return 0; > } > -- > 2.19.1
On Fri, Nov 09, 2018 at 06:02:16PM +0100, Wolfram Sang wrote: > As described in Documentation/i2c/fault-codes. > > Signed-off-by: Wolfram Sang <wsa@the-dreams.de> Applied to for-current, thanks!
diff --git a/drivers/i2c/busses/i2c-nvidia-gpu.c b/drivers/i2c/busses/i2c-nvidia-gpu.c index 8822357bca0c..4307b42901a1 100644 --- a/drivers/i2c/busses/i2c-nvidia-gpu.c +++ b/drivers/i2c/busses/i2c-nvidia-gpu.c @@ -89,7 +89,7 @@ static int gpu_i2c_check_status(struct gpu_i2c_dev *i2cd) if (time_is_before_jiffies(target)) { dev_err(i2cd->dev, "i2c timeout error %x\n", val); - return -ETIME; + return -ETIMEDOUT; } val = readl(i2cd->regs + I2C_MST_CNTL); @@ -97,9 +97,9 @@ static int gpu_i2c_check_status(struct gpu_i2c_dev *i2cd) case I2C_MST_CNTL_STATUS_OKAY: return 0; case I2C_MST_CNTL_STATUS_NO_ACK: - return -EIO; + return -ENXIO; case I2C_MST_CNTL_STATUS_TIMEOUT: - return -ETIME; + return -ETIMEDOUT; default: return 0; }
As described in Documentation/i2c/fault-codes. Signed-off-by: Wolfram Sang <wsa@the-dreams.de> --- drivers/i2c/busses/i2c-nvidia-gpu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)