From: Lan Tianyu Date: Mon, 15 Oct 2012 07:38:35 +0000 (+0800) Subject: usb/xhci: Remove (__force__ __u16) before assigning DeviceRemovable and assign directly. X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~12152^2~37^2~2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=27c411c95a8e9ed92be658abf1d63e22873a3a66;p=mirror_ubuntu-zesty-kernel.git usb/xhci: Remove (__force__ __u16) before assigning DeviceRemovable and assign directly. Struct usb_hub_descriptor.ss.DeviceRemovable has been defined as __le16 and (__force__ __u16) doesn't need. Signed-off-by: Lan Tianyu Signed-off-by: Sarah Sharp --- diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c index 65d416c08cef..a686cf4905bb 100644 --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c @@ -151,9 +151,8 @@ static void xhci_usb3_hub_descriptor(struct usb_hcd *hcd, struct xhci_hcd *xhci, if (portsc & PORT_DEV_REMOVE) port_removable |= 1 << (i + 1); } - memset(&desc->u.ss.DeviceRemovable, - (__force __u16) cpu_to_le16(port_removable), - sizeof(__u16)); + + desc->u.ss.DeviceRemovable = cpu_to_le16(port_removable); } static void xhci_hub_descriptor(struct usb_hcd *hcd, struct xhci_hcd *xhci,