Commit 4167b891 authored by Adrian Hunter's avatar Adrian Hunter Committed by Alexandre Belloni
Browse files

i3c: mipi-i3c-hci: Use ETIMEDOUT instead of ETIME for timeout errors 



The MIPI I3C HCI driver currently returns -ETIME for various timeout
conditions, while other I3C master drivers consistently use -ETIMEDOUT
for the same class of errors.  Align the HCI driver with the rest of the
subsystem by replacing all uses of -ETIME with -ETIMEDOUT.

Fixes: 9ad9a52c ("i3c/master: introduce the mipi-i3c-hci driver")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Reviewed-by: default avatarFrank Li <Frank.Li@nxp.com>
Link: https://patch.msgid.link/20260306072451.11131-2-adrian.hunter@intel.com


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 663eb876

drivers/i3c/master/mipi-i3c-hci/cmd_v1.c

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ static int hci_cmd_v1_daa(struct i3c_hci *hci) 
		hci->io->queue_xfer(hci, xfer, 1);

		if (!wait_for_completion_timeout(&done, HZ) &&

		    hci->io->dequeue_xfer(hci, xfer, 1)) {

			ret = -ETIME;

			ret = -ETIMEDOUT;

			break;

		}

		if ((RESP_STATUS(xfer->response) == RESP_ERR_ADDR_HEADER ||

drivers/i3c/master/mipi-i3c-hci/cmd_v2.c

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static int hci_cmd_v2_daa(struct i3c_hci *hci) 
		hci->io->queue_xfer(hci, xfer, 2);

		if (!wait_for_completion_timeout(&done, HZ) &&

		    hci->io->dequeue_xfer(hci, xfer, 2)) {

			ret = -ETIME;

			ret = -ETIMEDOUT;

			break;

		}

		if (RESP_STATUS(xfer[0].response) != RESP_SUCCESS) {

drivers/i3c/master/mipi-i3c-hci/core.c

+3 −3
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static int i3c_hci_send_ccc_cmd(struct i3c_master_controller *m, 
		goto out;

	if (!wait_for_completion_timeout(&done, HZ) &&

	    hci->io->dequeue_xfer(hci, xfer, nxfers)) {

		ret = -ETIME;

		ret = -ETIMEDOUT;

		goto out;

	}

	for (i = prefixed; i < nxfers; i++) {
@@ -340,7 +340,7 @@ static int i3c_hci_i3c_xfers(struct i3c_dev_desc *dev, 
		goto out;

	if (!wait_for_completion_timeout(&done, HZ) &&

	    hci->io->dequeue_xfer(hci, xfer, nxfers)) {

		ret = -ETIME;

		ret = -ETIMEDOUT;

		goto out;

	}

	for (i = 0; i < nxfers; i++) {
@@ -388,7 +388,7 @@ static int i3c_hci_i2c_xfers(struct i2c_dev_desc *dev, 
		goto out;

	if (!wait_for_completion_timeout(&done, m->i2c.timeout) &&

	    hci->io->dequeue_xfer(hci, xfer, nxfers)) {

		ret = -ETIME;

		ret = -ETIMEDOUT;

		goto out;

	}

	for (i = 0; i < nxfers; i++) {