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

Commit 80359a9c authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

whiteheat: coding style 



Bring ezusb and whiteheat into line with the coding style

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 95da310e

drivers/usb/serial/ezusb.c

+12 −10
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
/* EZ-USB Control and Status Register.  Bit 0 controls 8051 reset */

#define CPUCS_REG    0x7F92



int ezusb_writememory (struct usb_serial *serial, int address, unsigned char *data, int length, __u8 bRequest)

int ezusb_writememory(struct usb_serial *serial, int address,

				unsigned char *data, int length, __u8 request)

{

	int result;

	unsigned char *transfer_buffer;
@@ -33,13 +34,16 @@ int ezusb_writememory (struct usb_serial *serial, int address, unsigned char *da 


	transfer_buffer = kmemdup(data, length, GFP_KERNEL);

	if (!transfer_buffer) {

		dev_err(&serial->dev->dev, "%s - kmalloc(%d) failed.\n", __func__, length);

		dev_err(&serial->dev->dev, "%s - kmalloc(%d) failed.\n",

							__func__, length);

		return -ENOMEM;

	}

	result = usb_control_msg (serial->dev, usb_sndctrlpipe(serial->dev, 0), bRequest, 0x40, address, 0, transfer_buffer, length, 3000);

	result = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),

		     request, 0x40, address, 0, transfer_buffer, length, 3000);

	kfree(transfer_buffer);

	return result;

}

EXPORT_SYMBOL_GPL(ezusb_writememory);



int ezusb_set_reset(struct usb_serial *serial, unsigned char reset_bit)

{
@@ -48,11 +52,9 @@ int ezusb_set_reset (struct usb_serial *serial, unsigned char reset_bit) 
	/* dbg("%s - %d", __func__, reset_bit); */

	response = ezusb_writememory(serial, CPUCS_REG, &reset_bit, 1, 0xa0);

	if (response < 0)

		dev_err(&serial->dev->dev, "%s- %d failed\n", __func__, reset_bit);

		dev_err(&serial->dev->dev, "%s- %d failed\n",

						__func__, reset_bit);

	return response;

}





EXPORT_SYMBOL_GPL(ezusb_writememory);

EXPORT_SYMBOL_GPL(ezusb_set_reset);

drivers/usb/serial/whiteheat.c

+217 −169

File changed.

Preview size limit exceeded, changes collapsed.

drivers/usb/serial/whiteheat.h

+51 −27

File changed.

Preview size limit exceeded, changes collapsed.