Skip to content

Commit

Permalink
i2c: nvidia-gpu: refactor master_xfer
Browse files Browse the repository at this point in the history
Added a local variable "send_stop" to simplify "goto" statements.

The "send_stop" handles below two case
1) When first i2c start fails and so i2c stop is not sent before
exiting

2) When i2c stop failed after all transfers and we do not need to
send another stop before exiting.

Signed-off-by: Ajay Gupta <ajayg@nvidia.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  • Loading branch information
Ajay Gupta authored and Wolfram Sang committed Jun 7, 2019
1 parent 5213d7e commit cb7302f
Showing 1 changed file with 16 additions and 12 deletions.
28 changes: 16 additions & 12 deletions drivers/i2c/busses/i2c-nvidia-gpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ static int gpu_i2c_master_xfer(struct i2c_adapter *adap,
{
struct gpu_i2c_dev *i2cd = i2c_get_adapdata(adap);
int status, status2;
bool send_stop = true;
int i, j;

/*
Expand All @@ -182,37 +183,40 @@ static int gpu_i2c_master_xfer(struct i2c_adapter *adap,
/* gpu_i2c_read has implicit start */
status = gpu_i2c_read(i2cd, msgs[i].buf, msgs[i].len);
if (status < 0)
goto stop;
goto exit;
} else {
u8 addr = i2c_8bit_addr_from_msg(msgs + i);

status = gpu_i2c_start(i2cd);
if (status < 0) {
if (i == 0)
return status;
goto stop;
send_stop = false;
goto exit;
}

status = gpu_i2c_write(i2cd, addr);
if (status < 0)
goto stop;
goto exit;

for (j = 0; j < msgs[i].len; j++) {
status = gpu_i2c_write(i2cd, msgs[i].buf[j]);
if (status < 0)
goto stop;
goto exit;
}
}
}
send_stop = false;
status = gpu_i2c_stop(i2cd);
if (status < 0)
return status;

return i;
stop:
status2 = gpu_i2c_stop(i2cd);
if (status2 < 0)
dev_err(i2cd->dev, "i2c stop failed %d\n", status2);
goto exit;

status = i;
exit:
if (send_stop) {
status2 = gpu_i2c_stop(i2cd);
if (status2 < 0)
dev_err(i2cd->dev, "i2c stop failed %d\n", status2);
}
return status;
}

Expand Down

0 comments on commit cb7302f

Please sign in to comment.