| Message ID | 20220517053452.1526862-1-shubhrajyoti.datta@xilinx.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] i2c: xiic: Correct the datatype for rx_watermark | expand |
On 5/17/22 07:34, Shubhrajyoti Datta wrote: > The message length data type should be u16 as per the i2c_msg structure. > > Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com> > --- > v2: > Typecast xiic_setreg > > drivers/i2c/busses/i2c-xiic.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c > index aa6e37a9f275..9a1c3f8b7048 100644 > --- a/drivers/i2c/busses/i2c-xiic.c > +++ b/drivers/i2c/busses/i2c-xiic.c > @@ -578,7 +578,7 @@ static int xiic_busy(struct xiic_i2c *i2c) > > static void xiic_start_recv(struct xiic_i2c *i2c) > { > - u8 rx_watermark; > + u16 rx_watermark; > struct i2c_msg *msg = i2c->rx_msg = i2c->tx_msg; > > /* Clear and enable Rx full interrupt. */ > @@ -593,7 +593,7 @@ static void xiic_start_recv(struct xiic_i2c *i2c) > rx_watermark = msg->len; > if (rx_watermark > IIC_RX_FIFO_DEPTH) > rx_watermark = IIC_RX_FIFO_DEPTH; > - xiic_setreg8(i2c, XIIC_RFD_REG_OFFSET, rx_watermark - 1); > + xiic_setreg8(i2c, XIIC_RFD_REG_OFFSET, (u8)(rx_watermark - 1)); > > if (!(msg->flags & I2C_M_NOSTART)) > /* write the address */ Acked-by: Michal Simek <michal.simek@amd.com> Thanks, Michal
On Tue, May 17, 2022 at 11:04:52AM +0530, Shubhrajyoti Datta wrote: > The message length data type should be u16 as per the i2c_msg structure. > > Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com> Applied to for-next, thanks!
diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c index aa6e37a9f275..9a1c3f8b7048 100644 --- a/drivers/i2c/busses/i2c-xiic.c +++ b/drivers/i2c/busses/i2c-xiic.c @@ -578,7 +578,7 @@ static int xiic_busy(struct xiic_i2c *i2c) static void xiic_start_recv(struct xiic_i2c *i2c) { - u8 rx_watermark; + u16 rx_watermark; struct i2c_msg *msg = i2c->rx_msg = i2c->tx_msg; /* Clear and enable Rx full interrupt. */ @@ -593,7 +593,7 @@ static void xiic_start_recv(struct xiic_i2c *i2c) rx_watermark = msg->len; if (rx_watermark > IIC_RX_FIFO_DEPTH) rx_watermark = IIC_RX_FIFO_DEPTH; - xiic_setreg8(i2c, XIIC_RFD_REG_OFFSET, rx_watermark - 1); + xiic_setreg8(i2c, XIIC_RFD_REG_OFFSET, (u8)(rx_watermark - 1)); if (!(msg->flags & I2C_M_NOSTART)) /* write the address */
The message length data type should be u16 as per the i2c_msg structure. Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com> --- v2: Typecast xiic_setreg drivers/i2c/busses/i2c-xiic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)