Skip to contentSkip to conversation

greybus: es2: drop short control-transfer checks

PATCH In review Johan Hovold 2 participants 2 messages Jan 18, 2021 – Jan 19, 2021 Greybus

lore
Share & tools
lore

Johan Hovold

author maintainer
#0 lore raw

PATCH 1/1 greybus: es2: drop short control-transfer checks

There's no need to check for short USB control transfers when sending data using so remove the redundant sanity checks.

---
 drivers/greybus/es2.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/greybus/es2.c +2 -7
index 1df6ab5d339d..48ad154df3a7 100644
@@ -567,12 +567,9 @@ static int cport_enable(struct gb_host_device *hd, u16 cport_id,
 			      USB_DIR_OUT | USB_TYPE_VENDOR |
 			      USB_RECIP_INTERFACE, cport_id, 0,
 			      req, sizeof(*req), ES2_USB_CTRL_TIMEOUT);
-	if (ret != sizeof(*req)) {
+	if (ret < 0) {
 		dev_err(&udev->dev, "failed to set cport flags for port %d\n",
 			cport_id);
-		if (ret >= 0)
-			ret = -EIO;
-
 		goto out;
 	}
 
@@ -961,12 +958,10 @@ static int arpc_send(struct es2_ap_dev *es2, struct arpc *rpc, int timeout)
 				 0, 0,
 				 rpc->req, le16_to_cpu(rpc->req->size),
 				 ES2_USB_CTRL_TIMEOUT);
-	if (retval != le16_to_cpu(rpc->req->size)) {
+	if (retval < 0) {
 		dev_err(&udev->dev,
 			"failed to send ARPC request %d: %d\n",
 			rpc->req->type, retval);
-		if (retval > 0)
-			retval = -EIO;
 		return retval;
 	}
 
Signature · 1 line
2.26.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 29 lines · Johan Hovold

There's no need to check for short USB control transfers when sending data using so remove the redundant sanity checks.

---
 drivers/greybus/es2.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/greybus/es2.c +1 -4
index 1df6ab5d339d..48ad154df3a7 100644
@@ -567,12 +567,9 @@ static int cport_enable(struct gb_host_device *hd, u16 cport_id,
 			      USB_DIR_OUT | USB_TYPE_VENDOR |
 			      USB_RECIP_INTERFACE, cport_id, 0,
 			      req, sizeof(*req), ES2_USB_CTRL_TIMEOUT);
-	if (ret != sizeof(*req)) {
+	if (ret < 0) {
 		dev_err(&udev->dev, "failed to set cport flags for port %d\n",
 			cport_id);
-		if (ret >= 0)
-			ret = -EIO;
-
 		goto out;
 	}
 
@@ -961,12 +958,10 @@ static int arpc_send(struct es2_ap_dev *es2, struct arpc *rpc, int timeout)
 				 0, 0,
 				 rpc->req, le16_to_cpu(rpc->req->size),

drivers/greybus/es2.c static int arpc_send(struct es2_ap_dev *es2, struct arpc *rpc, int timeout) · line 966

Quoted 10 lines
drivers/greybus/es2.c +1 -3
 				 ES2_USB_CTRL_TIMEOUT);
-	if (retval != le16_to_cpu(rpc->req->size)) {
+	if (retval < 0) {
 		dev_err(&udev->dev,
 			"failed to send ARPC request %d: %d\n",
 			rpc->req->type, retval);
-		if (retval > 0)
-			retval = -EIO;
 		return retval;
 	}
Signature · 1 line
viresh