Skip to contentSkip to conversation

usb: cdns3: Fixes for sparse warnings

PATCH In review Pawel Laszczak 3 participants 3 messages Dec 14, 2020

Subsystems (2)
lore
Share & tools
lore

Pawel Laszczak

author maintainer
#0 lore raw

PATCH 1/1 usb: cdns3: Fixes for sparse warnings

Patch fixes the following warnings:
cdns3-gadget.c:1203: sparse: warning: incorrect type
in assignment (different base types)
cdns3-gadget.c:1203: sparse: expected restricted __le32 [usertype] length cdns3-gadget.c:1203: sparse: got unsigned long cdns3-gadget.c:1250: sparse: warning: invalid assignment: |= cdns3-gadget.c:1250: sparse: left side has type restricted __le32 cdns3-gadget.c:1250: sparse: right side has type unsigned long cdns3-gadget.c:1253: sparse: warning: invalid assignment: |= cdns3-gadget.c:1253: sparse: left side has type restricted __le32 cdns3-gadget.c:1253: sparse: right side has type unsigned long cdns3-ep0.c:367: sparse: warning: restricted __le16 degrades to integer cdns3-ep0.c:792: sparse: warning: symbol 'cdns3_gadget_ep0_ops' was not
declared. Should it be static?

---
 drivers/usb/cdns3/cdns3-ep0.c    | 4 ++--
 drivers/usb/cdns3/cdns3-gadget.c | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/usb/cdns3/cdns3-ep0.c +2 -2
index b0390fe9a396..9a17802275d5 100644
@@ -364,7 +364,7 @@ static int cdns3_ep0_feature_handle_endpoint(struct cdns3_device *priv_dev,
 	if (le16_to_cpu(ctrl->wValue) != USB_ENDPOINT_HALT)
 		return -EINVAL;
 
-	if (!(ctrl->wIndex & ~USB_DIR_IN))
+	if (!(le16_to_cpu(ctrl->wIndex) & ~USB_DIR_IN))
 		return 0;
 
 	index = cdns3_ep_addr_to_index(le16_to_cpu(ctrl->wIndex));
@@ -789,7 +789,7 @@ int cdns3_gadget_ep_set_wedge(struct usb_ep *ep)
 	return 0;
 }
 
-const struct usb_ep_ops cdns3_gadget_ep0_ops = {
+static const struct usb_ep_ops cdns3_gadget_ep0_ops = {
 	.enable = cdns3_gadget_ep0_enable,
 	.disable = cdns3_gadget_ep0_disable,
 	.alloc_request = cdns3_gadget_ep_alloc_request,
drivers/usb/cdns3/cdns3-gadget.c +3 -3
index 9b8b0cd3d2c2..582bfeceedb4 100644
@@ -1200,7 +1200,7 @@ static int cdns3_ep_run_transfer(struct cdns3_endpoint *priv_ep,
 		td_size = DIV_ROUND_UP(request->length,
 				       priv_ep->endpoint.maxpacket);
 		if (priv_dev->gadget.speed == USB_SPEED_SUPER)
-			trb->length = TRB_TDL_SS_SIZE(td_size);
+			trb->length = cpu_to_le32(TRB_TDL_SS_SIZE(td_size));
 		else
 			control |= TRB_TDL_HS_SIZE(td_size);
 	}
@@ -1247,10 +1247,10 @@ static int cdns3_ep_run_transfer(struct cdns3_endpoint *priv_ep,
 			priv_req->trb->control = cpu_to_le32(control);
 
 		if (sg_supported) {
-			trb->control |= TRB_ISP;
+			trb->control |= cpu_to_le32(TRB_ISP);
 			/* Don't set chain bit for last TRB */
 			if (sg_iter < num_trb - 1)
-				trb->control |= TRB_CHAIN;
+				trb->control |= cpu_to_le32(TRB_CHAIN);
 
 			s = sg_next(s);
 		}
Signature · 1 line
2.17.1
#1 lore raw

From: Pawel Laszczak

Quoted 3 lines

Sent: 14 December 2020 11:05

Patch fixes the following warnings:

...

Quoted 1 line

cdns3-ep0.c:367: sparse: warning: restricted __le16 degrades to integer

...

drivers/usb/cdns3/cdns3-ep0.c static int cdns3_ep0_feature_handle_endpoint(struct cdns3_device *priv_dev, · line 368

Quoted 11 lines
drivers/usb/cdns3/cdns3-ep0.c +1 -1
index b0390fe9a396..9a17802275d5 100644
@@ -364,7 +364,7 @@ static int cdns3_ep0_feature_handle_endpoint(struct cdns3_device *priv_dev,
 	if (le16_to_cpu(ctrl->wValue) != USB_ENDPOINT_HALT)
 		return -EINVAL;
 
-	if (!(ctrl->wIndex & ~USB_DIR_IN))
+	if (!(le16_to_cpu(ctrl->wIndex) & ~USB_DIR_IN))
 		return 0;

It's generally best to byteswap the constant.

David

-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)

#2 lore raw
Quoted 15 lines · David Laight

From: Pawel Laszczak

Quoted 3 lines

Sent: 14 December 2020 11:05

Patch fixes the following warnings:

...

Quoted 1 line

cdns3-ep0.c:367: sparse: warning: restricted __le16 degrades to integer

...

Quoted 8 lines
drivers/usb/cdns3/cdns3-ep0.c +0 -0
index b0390fe9a396..9a17802275d5 100644
@@ -364,7 +364,7 @@ static int cdns3_ep0_feature_handle_endpoint(struct cdns3_device *priv_dev,
 	if (le16_to_cpu(ctrl->wValue) != USB_ENDPOINT_HALT)
 		return -EINVAL;
 
Quoted 5 lines

drivers/usb/cdns3/cdns3-ep0.c static int cdns3_ep0_feature_handle_endpoint(struct cdns3_device *priv_dev, · line 368

Quoted 3 lines
drivers/usb/cdns3/cdns3-ep0.c +1 -1
-	if (!(ctrl->wIndex & ~USB_DIR_IN))
+	if (!(le16_to_cpu(ctrl->wIndex) & ~USB_DIR_IN))
 		return 0;

It's generally best to byteswap the constant.

Why? This is fine, it's better to operate on the value that needs to be operated on.

greg k-h