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?

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Pawel Laszczak <pawell@cadence.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>

diff --git a/drivers/usb/cdns3/cdns3-ep0.c b/drivers/usb/cdns3/cdns3-ep0.c
index b0390fe..9a17802 100644 (file)
--- a/drivers/usb/cdns3/cdns3-ep0.c
+++ b/drivers/usb/cdns3/cdns3-ep0.c
@@ -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,

diff --git a/drivers/usb/cdns3/cdns3-gadget.c b/drivers/usb/cdns3/cdns3-gadget.c
index 9b8b0cd..582bfec 100644 (file)
--- a/drivers/usb/cdns3/cdns3-gadget.c
+++ b/drivers/usb/cdns3/cdns3-gadget.c
@@ -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);
                }