Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef48aacf authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Felipe Balbi
Browse files

usb: gadget: udc: renesas_usb3: Fix __le16 warnings 



This patch fixes the following sparse warnings by using
a macro and a suitable variable type.

drivers/usb/gadget/udc/renesas_usb3.c:1547:17: warning: restricted __le16 degrades to integer
drivers/usb/gadget/udc/renesas_usb3.c:1550:43: warning: incorrect type in argument 2 (different base types)
drivers/usb/gadget/udc/renesas_usb3.c:1550:43:    expected unsigned short [usertype] addr
drivers/usb/gadget/udc/renesas_usb3.c:1550:43:    got restricted __le16 [usertype] wValue
drivers/usb/gadget/udc/renesas_usb3.c:1607:24: warning: incorrect type in assignment (different base types)
drivers/usb/gadget/udc/renesas_usb3.c:1607:24:    expected unsigned short [assigned] [usertype] status
drivers/usb/gadget/udc/renesas_usb3.c:1607:24:    got restricted __le16 [usertype]
drivers/usb/gadget/udc/renesas_usb3.c:1775:17: warning: restricted __le16 degrades to integer

Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 2457b2c1

drivers/usb/gadget/udc/renesas_usb3.c

+6 −5
Original line number Diff line number Diff line
@@ -1544,10 +1544,10 @@ static void usb3_set_device_address(struct renesas_usb3 *usb3, u16 addr) 
static bool usb3_std_req_set_address(struct renesas_usb3 *usb3,

				     struct usb_ctrlrequest *ctrl)

{

	if (ctrl->wValue >= 128)

	if (le16_to_cpu(ctrl->wValue) >= 128)

		return true;	/* stall */



	usb3_set_device_address(usb3, ctrl->wValue);

	usb3_set_device_address(usb3, le16_to_cpu(ctrl->wValue));

	usb3_set_p0_con_for_no_data(usb3);



	return false;
@@ -1582,6 +1582,7 @@ static bool usb3_std_req_get_status(struct renesas_usb3 *usb3, 
	struct renesas_usb3_ep *usb3_ep;

	int num;

	u16 status = 0;

	__le16 tx_data;



	switch (ctrl->bRequestType & USB_RECIP_MASK) {

	case USB_RECIP_DEVICE:
@@ -1604,10 +1605,10 @@ static bool usb3_std_req_get_status(struct renesas_usb3 *usb3, 
	}



	if (!stall) {

		status = cpu_to_le16(status);

		tx_data = cpu_to_le16(status);

		dev_dbg(usb3_to_dev(usb3), "get_status: req = %p\n",

			usb_req_to_usb3_req(usb3->ep0_req));

		usb3_pipe0_internal_xfer(usb3, &status, sizeof(status),

		usb3_pipe0_internal_xfer(usb3, &tx_data, sizeof(tx_data),

					 usb3_pipe0_get_status_completion);

	}
@@ -1772,7 +1773,7 @@ static bool usb3_std_req_set_sel(struct renesas_usb3 *usb3, 
static bool usb3_std_req_set_configuration(struct renesas_usb3 *usb3,

					   struct usb_ctrlrequest *ctrl)

{

	if (ctrl->wValue > 0)

	if (le16_to_cpu(ctrl->wValue) > 0)

		usb3_set_bit(usb3, USB_COM_CON_CONF, USB3_USB_COM_CON);

	else

		usb3_clear_bit(usb3, USB_COM_CON_CONF, USB3_USB_COM_CON);