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

tty-usb-omninet: 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 19e58fae

drivers/usb/serial/omninet.c

+87 −73
Original line number Diff line number Diff line
@@ -5,12 +5,14 @@ 
 *	modify it under the terms of the GNU General Public License version

 *	2 as published by the Free Software Foundation.

 *

 * See Documentation/usb/usb-serial.txt for more information on using this driver

 * See Documentation/usb/usb-serial.txt for more information on using this

 * driver

 *

 * Please report both successes and troubles to the author at omninet@kroah.com

 *

 * (05/30/2001) gkh

 *	switched from using spinlock to a semaphore, which fixes lots of problems.

 *	switched from using spinlock to a semaphore, which fixes lots of

 *	problems.

 *

 * (04/08/2001) gb

 *	Identify version on module load.
@@ -43,7 +45,7 @@ 
#include <linux/tty_flip.h>

#include <linux/module.h>

#include <linux/spinlock.h>

#include <asm/uaccess.h>

#include <linux/uaccess.h>

#include <linux/usb.h>

#include <linux/usb/serial.h>
@@ -58,14 +60,18 @@ static int debug; 


#define ZYXEL_VENDOR_ID		0x0586

#define ZYXEL_OMNINET_ID	0x1000

#define BT_IGNITIONPRO_ID	0x2000  /* This one seems to be a re-branded ZyXEL device */

/* This one seems to be a re-branded ZyXEL device */

#define BT_IGNITIONPRO_ID	0x2000



/* function prototypes */

static int  omninet_open		(struct tty_struct *tty, struct usb_serial_port *port, struct file *filp);

static void omninet_close		(struct tty_struct *tty, struct usb_serial_port *port, struct file *filp);

static int  omninet_open(struct tty_struct *tty, struct usb_serial_port *port,

							struct file *filp);

static void omninet_close(struct tty_struct *tty, struct usb_serial_port *port,

							struct file *filp);

static void omninet_read_bulk_callback(struct urb *urb);

static void omninet_write_bulk_callback(struct urb *urb);

static int  omninet_write		(struct tty_struct *tty, struct usb_serial_port *port, const unsigned char *buf, int count);

static int  omninet_write(struct tty_struct *tty, struct usb_serial_port *port,

				const unsigned char *buf, int count);

static int  omninet_write_room(struct tty_struct *tty);

static void omninet_shutdown(struct usb_serial *serial);

static int omninet_attach(struct usb_serial *serial);
@@ -130,17 +136,15 @@ static struct usb_serial_driver zyxel_omninet_device = { 
 *

 */



struct omninet_header

{

struct omninet_header {

	__u8	oh_seq;

	__u8	oh_len;

	__u8	oh_xxx;

	__u8	oh_pad;

};



struct omninet_data

{

	__u8	od_outseq;	// Sequence number for bulk_out URBs

struct omninet_data {

	__u8	od_outseq;	/* Sequence number for bulk_out URBs */

};



static int omninet_attach(struct usb_serial *serial)
@@ -150,7 +154,8 @@ static int omninet_attach (struct usb_serial *serial) 


	od = kmalloc(sizeof(struct omninet_data), GFP_KERNEL);

	if (!od) {

		err("%s- kmalloc(%Zd) failed.", __func__, sizeof(struct omninet_data));

		err("%s- kmalloc(%Zd) failed.",

				__func__, sizeof(struct omninet_data));

		return -ENOMEM;

	}

	usb_set_serial_port_data(port, od);
@@ -171,14 +176,15 @@ static int omninet_open(struct tty_struct *tty, 


	/* Start reading from the device */

	usb_fill_bulk_urb(port->read_urb, serial->dev,

		      usb_rcvbulkpipe(serial->dev, port->bulk_in_endpointAddress),

		      port->read_urb->transfer_buffer, port->read_urb->transfer_buffer_length,

			usb_rcvbulkpipe(serial->dev,

				port->bulk_in_endpointAddress),

			port->read_urb->transfer_buffer,

			port->read_urb->transfer_buffer_length,

			omninet_read_bulk_callback, port);

	result = usb_submit_urb(port->read_urb, GFP_KERNEL);

	if (result) {

		err("%s - failed submitting read urb, error %d", __func__, result);

	}



	if (result)

		err("%s - failed submitting read urb, error %d",

							__func__, result);

	return result;

}
@@ -211,31 +217,34 @@ static void omninet_read_bulk_callback (struct urb *urb) 
		return;

	}



	if ((debug) && (header->oh_xxx != 0x30)) {

	if (debug && header->oh_xxx != 0x30) {

		if (urb->actual_length) {

			printk (KERN_DEBUG __FILE__ ": omninet_read %d: ", header->oh_len);

			for (i = 0; i < (header->oh_len + OMNINET_HEADERLEN); i++) {

			printk(KERN_DEBUG __FILE__

					": omninet_read %d: ", header->oh_len);

			for (i = 0; i < (header->oh_len +

						OMNINET_HEADERLEN); i++)

				printk("%.2x ", data[i]);

			}

			printk("\n");

		}

	}



	if (urb->actual_length && header->oh_len) {

		for (i = 0; i < header->oh_len; i++) {

			 tty_insert_flip_char(port->port.tty, data[OMNINET_DATAOFFSET + i], 0);

	  	}

		for (i = 0; i < header->oh_len; i++)

			 tty_insert_flip_char(port->port.tty,

					data[OMNINET_DATAOFFSET + i], 0);

		tty_flip_buffer_push(port->port.tty);

	}



	/* Continue trying to always read  */

	usb_fill_bulk_urb(urb, port->serial->dev,

		      usb_rcvbulkpipe(port->serial->dev, port->bulk_in_endpointAddress),

			usb_rcvbulkpipe(port->serial->dev,

					port->bulk_in_endpointAddress),

			urb->transfer_buffer, urb->transfer_buffer_length,

			omninet_read_bulk_callback, port);

	result = usb_submit_urb(urb, GFP_ATOMIC);

	if (result)

		err("%s - failed resubmitting read urb, error %d", __func__, result);

		err("%s - failed resubmitting read urb, error %d",

						__func__, result);



	return;

}
@@ -247,7 +256,8 @@ static int omninet_write(struct tty_struct *tty, struct usb_serial_port *port, 
	struct usb_serial_port *wport = serial->port[1];



	struct omninet_data *od = usb_get_serial_port_data(port);

	struct omninet_header	*header = (struct omninet_header *) wport->write_urb->transfer_buffer;

	struct omninet_header *header = (struct omninet_header *)

					wport->write_urb->transfer_buffer;



	int			result;
@@ -255,7 +265,7 @@ static int omninet_write(struct tty_struct *tty, struct usb_serial_port *port, 


	if (count == 0) {

		dbg("%s - write request of 0 bytes", __func__);

		return (0);

		return 0;

	}



	spin_lock_bh(&wport->lock);
@@ -269,9 +279,11 @@ static int omninet_write(struct tty_struct *tty, struct usb_serial_port *port, 


	count = (count > OMNINET_BULKOUTSIZE) ? OMNINET_BULKOUTSIZE : count;



	memcpy (wport->write_urb->transfer_buffer + OMNINET_DATAOFFSET, buf, count);

	memcpy(wport->write_urb->transfer_buffer + OMNINET_DATAOFFSET,

								buf, count);



	usb_serial_debug_data(debug, &port->dev, __func__, count, wport->write_urb->transfer_buffer);

	usb_serial_debug_data(debug, &port->dev, __func__, count,

					wport->write_urb->transfer_buffer);



	header->oh_seq 	= od->od_outseq++;

	header->oh_len 	= count;
@@ -285,7 +297,8 @@ static int omninet_write(struct tty_struct *tty, struct usb_serial_port *port, 
	result = usb_submit_urb(wport->write_urb, GFP_ATOMIC);

	if (result) {

		wport->write_urb_busy = 0;

		err("%s - failed submitting write urb, error %d", __func__, result);

		err("%s - failed submitting write urb, error %d",

							__func__, result);

	} else

		result = count;
@@ -307,12 +320,13 @@ static int omninet_write_room (struct tty_struct *tty) 


	dbg("%s - returns %d", __func__, room);



	return (room);

	return room;

}



static void omninet_write_bulk_callback(struct urb *urb)

{

/*	struct omninet_header	*header = (struct omninet_header  *) urb->transfer_buffer; */

/*	struct omninet_header	*header = (struct omninet_header  *)

						urb->transfer_buffer; */

	struct usb_serial_port 	*port   =  urb->context;

	int status = urb->status;