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

Commit d767d888 authored by Harvey Harrison's avatar Harvey Harrison Committed by Greg Kroah-Hartman
Browse files

USB: wusb: annotate association types withe proper endianness 



Also a trivial annotation in rh.c for:
drivers/usb/wusbcore/rh.c:366:9: warning: incorrect type in assignment (different base types)
drivers/usb/wusbcore/rh.c:366:9:    expected unsigned short [unsigned] [short] [usertype] <noident>
drivers/usb/wusbcore/rh.c:366:9:    got restricted __le16 [usertype] <noident>
drivers/usb/wusbcore/rh.c:367:9: warning: incorrect type in assignment (different base types)
drivers/usb/wusbcore/rh.c:367:9:    expected unsigned short [unsigned] [short] [usertype] <noident>
drivers/usb/wusbcore/rh.c:367:9:    got restricted __le16 [usertype] <noident>

Association types annotation fixes piles of warnings similar to:
drivers/usb/wusbcore/cbaf.c:238:30: warning: incorrect type in initializer (different base types)
drivers/usb/wusbcore/cbaf.c:238:30:    expected restricted __le16 [usertype] id
drivers/usb/wusbcore/cbaf.c:238:30:    got int
drivers/usb/wusbcore/cbaf.c:238:30: warning: incorrect type in initializer (different base types)
drivers/usb/wusbcore/cbaf.c:238:30:    expected restricted __le16 [usertype] len
drivers/usb/wusbcore/cbaf.c:238:30:    got int

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Cc: David Vrabel <david.vrabel@csr.com>
Cc: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d859bffc

drivers/usb/wusbcore/rh.c

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ static int wusbhc_rh_clear_port_feat(struct wusbhc *wusbhc, u16 feature, 
static int wusbhc_rh_get_port_status(struct wusbhc *wusbhc, u16 port_idx,

				     u32 *_buf, u16 wLength)

{

	u16 *buf = (u16 *) _buf;

	__le16 *buf = (__le16 *)_buf;



	if (port_idx > wusbhc->ports_max)

		return -EINVAL;

include/linux/usb/association.h

+11 −11
Original line number Diff line number Diff line
@@ -28,17 +28,17 @@ struct wusb_am_attr { 
};



/* Different fields defined by the spec */

#define WUSB_AR_AssociationTypeId	{ .id = 0x0000, .len =  2 }

#define WUSB_AR_AssociationSubTypeId	{ .id = 0x0001, .len =  2 }

#define WUSB_AR_Length			{ .id = 0x0002, .len =  4 }

#define WUSB_AR_AssociationStatus	{ .id = 0x0004, .len =  4 }

#define WUSB_AR_LangID			{ .id = 0x0008, .len =  2 }

#define WUSB_AR_DeviceFriendlyName	{ .id = 0x000b, .len = 64 } /* max */

#define WUSB_AR_HostFriendlyName	{ .id = 0x000c, .len = 64 } /* max */

#define WUSB_AR_CHID			{ .id = 0x1000, .len = 16 }

#define WUSB_AR_CDID			{ .id = 0x1001, .len = 16 }

#define WUSB_AR_ConnectionContext	{ .id = 0x1002, .len = 48 }

#define WUSB_AR_BandGroups		{ .id = 0x1004, .len =  2 }

#define WUSB_AR_AssociationTypeId	{ .id = cpu_to_le16(0x0000), .len = cpu_to_le16(2) }

#define WUSB_AR_AssociationSubTypeId	{ .id = cpu_to_le16(0x0001), .len = cpu_to_le16(2) }

#define WUSB_AR_Length			{ .id = cpu_to_le16(0x0002), .len = cpu_to_le16(4) }

#define WUSB_AR_AssociationStatus	{ .id = cpu_to_le16(0x0004), .len = cpu_to_le16(4) }

#define WUSB_AR_LangID			{ .id = cpu_to_le16(0x0008), .len = cpu_to_le16(2) }

#define WUSB_AR_DeviceFriendlyName	{ .id = cpu_to_le16(0x000b), .len = cpu_to_le16(64) } /* max */

#define WUSB_AR_HostFriendlyName	{ .id = cpu_to_le16(0x000c), .len = cpu_to_le16(64) } /* max */

#define WUSB_AR_CHID			{ .id = cpu_to_le16(0x1000), .len = cpu_to_le16(16) }

#define WUSB_AR_CDID			{ .id = cpu_to_le16(0x1001), .len = cpu_to_le16(16) }

#define WUSB_AR_ConnectionContext	{ .id = cpu_to_le16(0x1002), .len = cpu_to_le16(48) }

#define WUSB_AR_BandGroups		{ .id = cpu_to_le16(0x1004), .len = cpu_to_le16(2) }



/* CBAF Control Requests (AMS1.0[T4-1] */

enum {