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

Commit fd05e720 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

drivers/usb annotations and fixes 



* endianness annotations
* endianness fixes
* missing get_unaligned/put_unaligned

It's pretty much all over the place, changes to different files are independent.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Serial-parts-Acked-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 01d7b369

drivers/usb/atm/cxacru.c

+7 −5
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <linux/device.h>

#include <linux/firmware.h>

#include <linux/mutex.h>

#include <asm/unaligned.h>



#include "usbatm.h"
@@ -573,7 +574,7 @@ static int cxacru_cm_get_array(struct cxacru_data *instance, enum cxacru_cm_requ 
			       u32 *data, int size)

{

	int ret, len;

	u32 *buf;

	__le32 *buf;

	int offb, offd;

	const int stride = CMD_PACKET_SIZE / (4 * 2) - 1;

	int buflen =  ((size - 1) / stride + 1 + size * 2) * 4;
@@ -837,7 +838,7 @@ static int cxacru_fw(struct usb_device *usb_dev, enum cxacru_fw_request fw, 
		buf[offb++] = l;

		buf[offb++] = code1;

		buf[offb++] = code2;

		*((u32 *) (buf + offb)) = cpu_to_le32(addr);

		put_unaligned(cpu_to_le32(addr), (__le32 *)(buf + offb));

		offb += 4;

		addr += l;

		if(l)
@@ -874,8 +875,9 @@ static void cxacru_upload_firmware(struct cxacru_data *instance, 
	int off;

	struct usbatm_data *usbatm = instance->usbatm;

	struct usb_device *usb_dev = usbatm->usb_dev;

	u16 signature[] = { usb_dev->descriptor.idVendor, usb_dev->descriptor.idProduct };

	u32 val;

	__le16 signature[] = { usb_dev->descriptor.idVendor,

			       usb_dev->descriptor.idProduct };

	__le32 val;



	dbg("cxacru_upload_firmware");
@@ -955,7 +957,7 @@ static void cxacru_upload_firmware(struct cxacru_data *instance, 
	/* Load config data (le32), doing one packet at a time */

	if (cf)

		for (off = 0; off < cf->size / 4; ) {

			u32 buf[CMD_PACKET_SIZE / 4 - 1];

			__le32 buf[CMD_PACKET_SIZE / 4 - 1];

			int i, len = min_t(int, cf->size / 4 - off, CMD_PACKET_SIZE / 4 / 2 - 1);

			buf[0] = cpu_to_le32(len);

			for (i = 0; i < len; i++, off++) {

drivers/usb/atm/ueagle-atm.c

+3 −3
Original line number Diff line number Diff line
@@ -996,7 +996,7 @@ static void __uea_load_page_e4(struct uea_softc *sc, u8 pageno, int boot) 
		blockoffset = sc->dsp_firm->data + le32_to_cpu(blockidx->PageOffset);



		bi.dwSize = cpu_to_be32(blocksize);

		bi.dwAddress = swab32(blockidx->PageAddress);

		bi.dwAddress = cpu_to_be32(le32_to_cpu(blockidx->PageAddress));



		uea_dbg(INS_TO_USBDEV(sc),

		       "sending block %u for DSP page %u size %u address %x\n",
@@ -1040,7 +1040,7 @@ static void uea_load_page_e4(struct work_struct *work) 
		return;



	p = (struct l1_code *) sc->dsp_firm->data;

	if (pageno >= p->page_header[0].PageNumber) {

	if (pageno >= le16_to_cpu(p->page_header[0].PageNumber)) {

		uea_err(INS_TO_USBDEV(sc), "invalid DSP page %u requested\n", pageno);

		return;

	}
@@ -1065,7 +1065,7 @@ static void uea_load_page_e4(struct work_struct *work) 
	bi.bPageNumber = 0xff;

	bi.wReserved = cpu_to_be16(UEA_RESERVED);

	bi.dwSize = cpu_to_be32(E4_PAGE_BYTES(p->page_header[0].PageSize));

	bi.dwAddress = swab32(p->page_header[0].PageAddress);

	bi.dwAddress = cpu_to_be32(le32_to_cpu(p->page_header[0].PageAddress));



	/* send block info through the IDMA pipe */

	if (uea_idma_write(sc, &bi, E4_BLOCK_INFO_SIZE))

drivers/usb/gadget/amd5536udc.c

+11 −9
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ udc_ep_enable(struct usb_ep *usbep, const struct usb_endpoint_descriptor *desc) 
	u32			tmp;

	unsigned long		iflags;

	u8 udc_csr_epix;

	unsigned		maxpacket;



	if (!usbep

			|| usbep->name == ep0_string
@@ -354,9 +355,10 @@ udc_ep_enable(struct usb_ep *usbep, const struct usb_endpoint_descriptor *desc) 
	writel(tmp, &dev->ep[ep->num].regs->ctl);



	/* set max packet size */

	maxpacket = le16_to_cpu(desc->wMaxPacketSize);

	tmp = readl(&dev->ep[ep->num].regs->bufout_maxpkt);

	tmp = AMD_ADDBITS(tmp, desc->wMaxPacketSize, UDC_EP_MAX_PKT_SIZE);

	ep->ep.maxpacket = desc->wMaxPacketSize;

	tmp = AMD_ADDBITS(tmp, maxpacket, UDC_EP_MAX_PKT_SIZE);

	ep->ep.maxpacket = maxpacket;

	writel(tmp, &dev->ep[ep->num].regs->bufout_maxpkt);



	/* IN ep */
@@ -370,7 +372,7 @@ udc_ep_enable(struct usb_ep *usbep, const struct usb_endpoint_descriptor *desc) 
		/* double buffering: fifo size = 2 x max packet size */

		tmp = AMD_ADDBITS(

				tmp,

				desc->wMaxPacketSize * UDC_EPIN_BUFF_SIZE_MULT

				maxpacket * UDC_EPIN_BUFF_SIZE_MULT

					  / UDC_DWORD_BYTES,

				UDC_EPIN_BUFF_SIZE);

		writel(tmp, &dev->ep[ep->num].regs->bufin_framenum);
@@ -390,7 +392,7 @@ udc_ep_enable(struct usb_ep *usbep, const struct usb_endpoint_descriptor *desc) 


		/* set max packet size UDC CSR	*/

		tmp = readl(&dev->csr->ne[ep->num - UDC_CSR_EP_OUT_IX_OFS]);

		tmp = AMD_ADDBITS(tmp, desc->wMaxPacketSize,

		tmp = AMD_ADDBITS(tmp, maxpacket,

					UDC_CSR_NE_MAX_PKT);

		writel(tmp, &dev->csr->ne[ep->num - UDC_CSR_EP_OUT_IX_OFS]);
@@ -407,7 +409,7 @@ udc_ep_enable(struct usb_ep *usbep, const struct usb_endpoint_descriptor *desc) 
	/* set ep values */

	tmp = readl(&dev->csr->ne[udc_csr_epix]);

	/* max packet */

	tmp = AMD_ADDBITS(tmp, desc->wMaxPacketSize, UDC_CSR_NE_MAX_PKT);

	tmp = AMD_ADDBITS(tmp, maxpacket, UDC_CSR_NE_MAX_PKT);

	/* ep number */

	tmp = AMD_ADDBITS(tmp, desc->bEndpointAddress, UDC_CSR_NE_NUM);

	/* ep direction */
@@ -2832,7 +2834,7 @@ __acquires(dev->lock) 
		/* make usb request for gadget driver */

		memset(&setup_data, 0 , sizeof(union udc_setup_data));

		setup_data.request.bRequest = USB_REQ_SET_CONFIGURATION;

		setup_data.request.wValue = dev->cur_config;

		setup_data.request.wValue = cpu_to_le16(dev->cur_config);



		/* programm the NE registers */

		for (i = 0; i < UDC_EP_NUM; i++) {
@@ -2881,8 +2883,8 @@ __acquires(dev->lock) 
		memset(&setup_data, 0 , sizeof(union udc_setup_data));

		setup_data.request.bRequest = USB_REQ_SET_INTERFACE;

		setup_data.request.bRequestType = USB_RECIP_INTERFACE;

		setup_data.request.wValue = dev->cur_alt;

		setup_data.request.wIndex = dev->cur_intf;

		setup_data.request.wValue = cpu_to_le16(dev->cur_alt);

		setup_data.request.wIndex = cpu_to_le16(dev->cur_intf);



		DBG(dev, "SET_INTERFACE interrupt: alt=%d intf=%d\n",

				dev->cur_alt, dev->cur_intf);

drivers/usb/gadget/dummy_hcd.c

+1 −2
Original line number Diff line number Diff line
@@ -1555,8 +1555,7 @@ hub_descriptor (struct usb_hub_descriptor *desc) 
	memset (desc, 0, sizeof *desc);

	desc->bDescriptorType = 0x29;

	desc->bDescLength = 9;

	desc->wHubCharacteristics = (__force __u16)

			(__constant_cpu_to_le16 (0x0001));

	desc->wHubCharacteristics = cpu_to_le16(0x0001);

	desc->bNbrPorts = 1;

	desc->bitmap [0] = 0xff;

	desc->bitmap [1] = 0xff;

drivers/usb/gadget/gmidi.c

+3 −3
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static const struct usb_ac_header_descriptor_1 ac_header_desc = { 
	.bDescriptorType =	USB_DT_CS_INTERFACE,

	.bDescriptorSubtype =	USB_MS_HEADER,

	.bcdADC =		__constant_cpu_to_le16(0x0100),

	.wTotalLength =		USB_DT_AC_HEADER_SIZE(1),

	.wTotalLength =		__constant_cpu_to_le16(USB_DT_AC_HEADER_SIZE(1)),

	.bInCollection =	1,

	.baInterfaceNr = {

		[0] =		GMIDI_MS_INTERFACE,
@@ -253,9 +253,9 @@ static const struct usb_ms_header_descriptor ms_header_desc = { 
	.bDescriptorType =	USB_DT_CS_INTERFACE,

	.bDescriptorSubtype =	USB_MS_HEADER,

	.bcdMSC =		__constant_cpu_to_le16(0x0100),

	.wTotalLength =		USB_DT_MS_HEADER_SIZE

	.wTotalLength =		__constant_cpu_to_le16(USB_DT_MS_HEADER_SIZE

				+ 2*USB_DT_MIDI_IN_SIZE

				+ 2*USB_DT_MIDI_OUT_SIZE(1),

				+ 2*USB_DT_MIDI_OUT_SIZE(1)),

};



#define JACK_IN_EMB	1