diff options
Diffstat (limited to 'drivers/usb/serial')
29 files changed, 130 insertions, 131 deletions
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c index 2ccd9ded52a..81227550913 100644 --- a/drivers/usb/serial/aircable.c +++ b/drivers/usb/serial/aircable.c @@ -403,7 +403,7 @@ static int aircable_write(struct usb_serial_port *port,  } -static void aircable_write_bulk_callback(struct urb *urb, struct pt_regs *regs) +static void aircable_write_bulk_callback(struct urb *urb)  {  	struct usb_serial_port *port = urb->context;  	int result; @@ -444,7 +444,7 @@ static void aircable_write_bulk_callback(struct urb *urb, struct pt_regs *regs)  	aircable_send(port);  } -static void aircable_read_bulk_callback(struct urb *urb, struct pt_regs *regs) +static void aircable_read_bulk_callback(struct urb *urb)  {  	struct usb_serial_port *port = urb->context;  	struct aircable_private *priv = usb_get_serial_port_data(port); diff --git a/drivers/usb/serial/airprime.c b/drivers/usb/serial/airprime.c index 6e1a84a858d..2c19f19b255 100644 --- a/drivers/usb/serial/airprime.c +++ b/drivers/usb/serial/airprime.c @@ -46,7 +46,7 @@ struct airprime_private {  	struct urb *read_urbp[NUM_READ_URBS];  }; -static void airprime_read_bulk_callback(struct urb *urb, struct pt_regs *regs) +static void airprime_read_bulk_callback(struct urb *urb)  {  	struct usb_serial_port *port = urb->context;  	unsigned char *data = urb->transfer_buffer; @@ -80,7 +80,7 @@ static void airprime_read_bulk_callback(struct urb *urb, struct pt_regs *regs)  	return;  } -static void airprime_write_bulk_callback(struct urb *urb, struct pt_regs *regs) +static void airprime_write_bulk_callback(struct urb *urb)  {  	struct usb_serial_port *port = urb->context;  	struct airprime_private *priv = usb_get_serial_port_data(port); diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c index 70ece9e01ce..8835bb58ca9 100644 --- a/drivers/usb/serial/belkin_sa.c +++ b/drivers/usb/serial/belkin_sa.c @@ -91,7 +91,7 @@ static int  belkin_sa_startup		(struct usb_serial *serial);  static void belkin_sa_shutdown		(struct usb_serial *serial);  static int  belkin_sa_open		(struct usb_serial_port *port, struct file *filp);  static void belkin_sa_close		(struct usb_serial_port *port, struct file *filp); -static void belkin_sa_read_int_callback (struct urb *urb, struct pt_regs *regs); +static void belkin_sa_read_int_callback (struct urb *urb);  static void belkin_sa_set_termios	(struct usb_serial_port *port, struct termios * old);  static int  belkin_sa_ioctl		(struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg);  static void belkin_sa_break_ctl		(struct usb_serial_port *port, int break_state ); @@ -248,7 +248,7 @@ static void belkin_sa_close (struct usb_serial_port *port, struct file *filp)  } /* belkin_sa_close */ -static void belkin_sa_read_int_callback (struct urb *urb, struct pt_regs *regs) +static void belkin_sa_read_int_callback (struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context;  	struct belkin_sa_private *priv; diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c index d954ec34b01..a63c3286caa 100644 --- a/drivers/usb/serial/cyberjack.c +++ b/drivers/usb/serial/cyberjack.c @@ -63,9 +63,9 @@ static int  cyberjack_open (struct usb_serial_port *port, struct file *filp);  static void cyberjack_close (struct usb_serial_port *port, struct file *filp);  static int cyberjack_write (struct usb_serial_port *port, const unsigned char *buf, int count);  static int cyberjack_write_room( struct usb_serial_port *port ); -static void cyberjack_read_int_callback (struct urb *urb, struct pt_regs *regs); -static void cyberjack_read_bulk_callback (struct urb *urb, struct pt_regs *regs); -static void cyberjack_write_bulk_callback (struct urb *urb, struct pt_regs *regs); +static void cyberjack_read_int_callback (struct urb *urb); +static void cyberjack_read_bulk_callback (struct urb *urb); +static void cyberjack_write_bulk_callback (struct urb *urb);  static struct usb_device_id id_table [] = {  	{ USB_DEVICE(CYBERJACK_VENDOR_ID, CYBERJACK_PRODUCT_ID) }, @@ -299,7 +299,7 @@ static int cyberjack_write_room( struct usb_serial_port *port )  	return CYBERJACK_LOCAL_BUF_SIZE;  } -static void cyberjack_read_int_callback( struct urb *urb, struct pt_regs *regs ) +static void cyberjack_read_int_callback( struct urb *urb )  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context;  	struct cyberjack_private *priv = usb_get_serial_port_data(port); @@ -356,7 +356,7 @@ resubmit:  	dbg("%s - usb_submit_urb(int urb)", __FUNCTION__);  } -static void cyberjack_read_bulk_callback (struct urb *urb, struct pt_regs *regs) +static void cyberjack_read_bulk_callback (struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context;  	struct cyberjack_private *priv = usb_get_serial_port_data(port); @@ -406,7 +406,7 @@ static void cyberjack_read_bulk_callback (struct urb *urb, struct pt_regs *regs)  	}  } -static void cyberjack_write_bulk_callback (struct urb *urb, struct pt_regs *regs) +static void cyberjack_write_bulk_callback (struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context;  	struct cyberjack_private *priv = usb_get_serial_port_data(port); diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c index e1173c1aee3..f2e89a08365 100644 --- a/drivers/usb/serial/cypress_m8.c +++ b/drivers/usb/serial/cypress_m8.c @@ -172,8 +172,8 @@ static int  cypress_chars_in_buffer	(struct usb_serial_port *port);  static void cypress_throttle		(struct usb_serial_port *port);  static void cypress_unthrottle		(struct usb_serial_port *port);  static void cypress_set_dead		(struct usb_serial_port *port); -static void cypress_read_int_callback	(struct urb *urb, struct pt_regs *regs); -static void cypress_write_int_callback	(struct urb *urb, struct pt_regs *regs); +static void cypress_read_int_callback	(struct urb *urb); +static void cypress_write_int_callback	(struct urb *urb);  /* baud helper functions */  static int	 mask_to_rate		(unsigned mask);  static unsigned  rate_to_mask		(int rate); @@ -1275,7 +1275,7 @@ static void cypress_unthrottle (struct usb_serial_port *port)  } -static void cypress_read_int_callback(struct urb *urb, struct pt_regs *regs) +static void cypress_read_int_callback(struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context;  	struct cypress_private *priv = usb_get_serial_port_data(port); @@ -1426,7 +1426,7 @@ continue_read:  } /* cypress_read_int_callback */ -static void cypress_write_int_callback(struct urb *urb, struct pt_regs *regs) +static void cypress_write_int_callback(struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context;  	struct cypress_private *priv = usb_get_serial_port_data(port); diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c index 9b225183fc7..bdb58100fc1 100644 --- a/drivers/usb/serial/digi_acceleport.c +++ b/drivers/usb/serial/digi_acceleport.c @@ -456,7 +456,7 @@ static int digi_tiocmget( struct usb_serial_port *port, struct file *file );  static int digi_tiocmset( struct usb_serial_port *port, struct file *file,  	unsigned int set, unsigned int clear );  static int digi_write( struct usb_serial_port *port, const unsigned char *buf, int count ); -static void digi_write_bulk_callback( struct urb *urb, struct pt_regs *regs ); +static void digi_write_bulk_callback( struct urb *urb );  static int digi_write_room( struct usb_serial_port *port );  static int digi_chars_in_buffer( struct usb_serial_port *port );  static int digi_open( struct usb_serial_port *port, struct file *filp ); @@ -464,7 +464,7 @@ static void digi_close( struct usb_serial_port *port, struct file *filp );  static int digi_startup_device( struct usb_serial *serial );  static int digi_startup( struct usb_serial *serial );  static void digi_shutdown( struct usb_serial *serial ); -static void digi_read_bulk_callback( struct urb *urb, struct pt_regs *regs ); +static void digi_read_bulk_callback( struct urb *urb );  static int digi_read_inb_callback( struct urb *urb );  static int digi_read_oob_callback( struct urb *urb ); @@ -1336,7 +1336,7 @@ dbg( "digi_write: returning %d", ret );  }  -static void digi_write_bulk_callback( struct urb *urb, struct pt_regs *regs ) +static void digi_write_bulk_callback( struct urb *urb )  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context; @@ -1754,7 +1754,7 @@ dbg( "digi_shutdown: TOP, in_interrupt()=%ld", in_interrupt() );  } -static void digi_read_bulk_callback( struct urb *urb, struct pt_regs *regs ) +static void digi_read_bulk_callback( struct urb *urb )  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context; diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c index daafe405d86..4ce10a83195 100644 --- a/drivers/usb/serial/empeg.c +++ b/drivers/usb/serial/empeg.c @@ -93,8 +93,8 @@ static int  empeg_ioctl			(struct usb_serial_port *port,  					unsigned int cmd,  					unsigned long arg);  static void empeg_set_termios		(struct usb_serial_port *port, struct termios *old_termios); -static void empeg_write_bulk_callback	(struct urb *urb, struct pt_regs *regs); -static void empeg_read_bulk_callback	(struct urb *urb, struct pt_regs *regs); +static void empeg_write_bulk_callback	(struct urb *urb); +static void empeg_read_bulk_callback	(struct urb *urb);  static struct usb_device_id id_table [] = {  	{ USB_DEVICE(EMPEG_VENDOR_ID, EMPEG_PRODUCT_ID) }, @@ -323,7 +323,7 @@ static int empeg_chars_in_buffer (struct usb_serial_port *port)  } -static void empeg_write_bulk_callback (struct urb *urb, struct pt_regs *regs) +static void empeg_write_bulk_callback (struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context; @@ -338,7 +338,7 @@ static void empeg_write_bulk_callback (struct urb *urb, struct pt_regs *regs)  } -static void empeg_read_bulk_callback (struct urb *urb, struct pt_regs *regs) +static void empeg_read_bulk_callback (struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context;  	struct tty_struct *tty; diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index e774a27c6c9..d3dc1a15ec6 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -589,8 +589,8 @@ static void ftdi_close			(struct usb_serial_port *port, struct file *filp);  static int  ftdi_write			(struct usb_serial_port *port, const unsigned char *buf, int count);  static int  ftdi_write_room		(struct usb_serial_port *port);  static int  ftdi_chars_in_buffer	(struct usb_serial_port *port); -static void ftdi_write_bulk_callback	(struct urb *urb, struct pt_regs *regs); -static void ftdi_read_bulk_callback	(struct urb *urb, struct pt_regs *regs); +static void ftdi_write_bulk_callback	(struct urb *urb); +static void ftdi_read_bulk_callback	(struct urb *urb);  static void ftdi_process_read		(void *param);  static void ftdi_set_termios		(struct usb_serial_port *port, struct termios * old);  static int  ftdi_tiocmget               (struct usb_serial_port *port, struct file *file); @@ -1508,7 +1508,7 @@ static int ftdi_write (struct usb_serial_port *port,  /* This function may get called when the device is closed */ -static void ftdi_write_bulk_callback (struct urb *urb, struct pt_regs *regs) +static void ftdi_write_bulk_callback (struct urb *urb)  {  	unsigned long flags;  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context; @@ -1591,7 +1591,7 @@ static int ftdi_chars_in_buffer (struct usb_serial_port *port) -static void ftdi_read_bulk_callback (struct urb *urb, struct pt_regs *regs) +static void ftdi_read_bulk_callback (struct urb *urb)  { /* ftdi_read_bulk_callback */  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context;  	struct tty_struct *tty; diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c index 4b1196a8b09..4543152a996 100644 --- a/drivers/usb/serial/garmin_gps.c +++ b/drivers/usb/serial/garmin_gps.c @@ -1031,7 +1031,7 @@ static void garmin_close (struct usb_serial_port *port, struct file * filp)  } -static void garmin_write_bulk_callback (struct urb *urb, struct pt_regs *regs) +static void garmin_write_bulk_callback (struct urb *urb)  {  	unsigned long flags;  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context; @@ -1274,7 +1274,7 @@ static void garmin_read_process(struct garmin_data * garmin_data_p,  } -static void garmin_read_bulk_callback (struct urb *urb, struct pt_regs *regs) +static void garmin_read_bulk_callback (struct urb *urb)  {  	unsigned long flags;  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context; @@ -1330,7 +1330,7 @@ static void garmin_read_bulk_callback (struct urb *urb, struct pt_regs *regs)  } -static void garmin_read_int_callback (struct urb *urb, struct pt_regs *regs) +static void garmin_read_int_callback (struct urb *urb)  {  	unsigned long flags;  	int status; diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c index 21cbaa0fb96..36042937e77 100644 --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c @@ -248,7 +248,7 @@ int usb_serial_generic_chars_in_buffer (struct usb_serial_port *port)  	return (chars);  } -void usb_serial_generic_read_bulk_callback (struct urb *urb, struct pt_regs *regs) +void usb_serial_generic_read_bulk_callback (struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context;  	struct usb_serial *serial = port->serial; @@ -287,7 +287,7 @@ void usb_serial_generic_read_bulk_callback (struct urb *urb, struct pt_regs *reg  }  EXPORT_SYMBOL_GPL(usb_serial_generic_read_bulk_callback); -void usb_serial_generic_write_bulk_callback (struct urb *urb, struct pt_regs *regs) +void usb_serial_generic_write_bulk_callback (struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context; diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c index c49976c3ad5..91bd3014ef1 100644 --- a/drivers/usb/serial/io_edgeport.c +++ b/drivers/usb/serial/io_edgeport.c @@ -216,10 +216,10 @@ static int CmdUrbs = 0;		/* Number of outstanding Command Write Urbs */  /* local function prototypes */  /* function prototypes for all URB callbacks */ -static void edge_interrupt_callback	(struct urb *urb, struct pt_regs *regs); -static void edge_bulk_in_callback	(struct urb *urb, struct pt_regs *regs); -static void edge_bulk_out_data_callback	(struct urb *urb, struct pt_regs *regs); -static void edge_bulk_out_cmd_callback	(struct urb *urb, struct pt_regs *regs); +static void edge_interrupt_callback	(struct urb *urb); +static void edge_bulk_in_callback	(struct urb *urb); +static void edge_bulk_out_data_callback	(struct urb *urb); +static void edge_bulk_out_cmd_callback	(struct urb *urb);  /* function prototypes for the usbserial callbacks */  static int  edge_open			(struct usb_serial_port *port, struct file *filp); @@ -534,7 +534,7 @@ static void get_product_info(struct edgeport_serial *edge_serial)   *	this is the callback function for when we have received data on the    *	interrupt endpoint.   *****************************************************************************/ -static void edge_interrupt_callback (struct urb *urb, struct pt_regs *regs) +static void edge_interrupt_callback (struct urb *urb)  {  	struct edgeport_serial	*edge_serial = (struct edgeport_serial *)urb->context;  	struct edgeport_port *edge_port; @@ -631,7 +631,7 @@ exit:   *	this is the callback function for when we have received data on the    *	bulk in endpoint.   *****************************************************************************/ -static void edge_bulk_in_callback (struct urb *urb, struct pt_regs *regs) +static void edge_bulk_in_callback (struct urb *urb)  {  	struct edgeport_serial	*edge_serial = (struct edgeport_serial *)urb->context;  	unsigned char		*data = urb->transfer_buffer; @@ -687,7 +687,7 @@ static void edge_bulk_in_callback (struct urb *urb, struct pt_regs *regs)   *	this is the callback function for when we have finished sending serial data   *	on the bulk out endpoint.   *****************************************************************************/ -static void edge_bulk_out_data_callback (struct urb *urb, struct pt_regs *regs) +static void edge_bulk_out_data_callback (struct urb *urb)  {  	struct edgeport_port *edge_port = (struct edgeport_port *)urb->context;  	struct tty_struct *tty; @@ -718,7 +718,7 @@ static void edge_bulk_out_data_callback (struct urb *urb, struct pt_regs *regs)   *	this is the callback function for when we have finished sending a command   *	on the bulk out endpoint.   *****************************************************************************/ -static void edge_bulk_out_cmd_callback (struct urb *urb, struct pt_regs *regs) +static void edge_bulk_out_cmd_callback (struct urb *urb)  {  	struct edgeport_port *edge_port = (struct edgeport_port *)urb->context;  	struct tty_struct *tty; diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c index 17c5b1d2311..ee0c921e152 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c @@ -1697,7 +1697,7 @@ static void handle_new_lsr (struct edgeport_port *edge_port, int lsr_data, __u8  } -static void edge_interrupt_callback (struct urb *urb, struct pt_regs *regs) +static void edge_interrupt_callback (struct urb *urb)  {  	struct edgeport_serial *edge_serial = (struct edgeport_serial *)urb->context;  	struct usb_serial_port *port; @@ -1787,7 +1787,7 @@ exit:  			 __FUNCTION__, status);  } -static void edge_bulk_in_callback (struct urb *urb, struct pt_regs *regs) +static void edge_bulk_in_callback (struct urb *urb)  {  	struct edgeport_port *edge_port = (struct edgeport_port *)urb->context;  	unsigned char *data = urb->transfer_buffer; @@ -1879,7 +1879,7 @@ static void edge_tty_recv(struct device *dev, struct tty_struct *tty, unsigned c  	tty_flip_buffer_push(tty);  } -static void edge_bulk_out_callback (struct urb *urb, struct pt_regs *regs) +static void edge_bulk_out_callback (struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context;  	struct edgeport_port *edge_port = usb_get_serial_port_data(port); diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c index cbc725a6c58..6238aff1e77 100644 --- a/drivers/usb/serial/ipaq.c +++ b/drivers/usb/serial/ipaq.c @@ -83,8 +83,8 @@ static int ipaq_write(struct usb_serial_port *port, const unsigned char *buf,  static int ipaq_write_bulk(struct usb_serial_port *port, const unsigned char *buf,  			   int count);  static void ipaq_write_gather(struct usb_serial_port *port); -static void ipaq_read_bulk_callback (struct urb *urb, struct pt_regs *regs); -static void ipaq_write_bulk_callback(struct urb *urb, struct pt_regs *regs); +static void ipaq_read_bulk_callback (struct urb *urb); +static void ipaq_write_bulk_callback(struct urb *urb);  static int ipaq_write_room(struct usb_serial_port *port);  static int ipaq_chars_in_buffer(struct usb_serial_port *port);  static void ipaq_destroy_lists(struct usb_serial_port *port); @@ -721,7 +721,7 @@ static void ipaq_close(struct usb_serial_port *port, struct file *filp)  	/* info ("Bytes In = %d  Bytes Out = %d", bytes_in, bytes_out); */  } -static void ipaq_read_bulk_callback(struct urb *urb, struct pt_regs *regs) +static void ipaq_read_bulk_callback(struct urb *urb)  {  	struct usb_serial_port	*port = (struct usb_serial_port *)urb->context;  	struct tty_struct	*tty; @@ -859,7 +859,7 @@ static void ipaq_write_gather(struct usb_serial_port *port)  	return;  } -static void ipaq_write_bulk_callback(struct urb *urb, struct pt_regs *regs) +static void ipaq_write_bulk_callback(struct urb *urb)  {  	struct usb_serial_port	*port = (struct usb_serial_port *)urb->context;  	struct ipaq_private	*priv = usb_get_serial_port_data(port); diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c index 812bc213a96..2a4bb66691a 100644 --- a/drivers/usb/serial/ipw.c +++ b/drivers/usb/serial/ipw.c @@ -161,7 +161,7 @@ static struct usb_driver usb_ipw_driver = {  static int debug; -static void ipw_read_bulk_callback(struct urb *urb, struct pt_regs *regs) +static void ipw_read_bulk_callback(struct urb *urb)  {  	struct usb_serial_port *port = urb->context;  	unsigned char *data = urb->transfer_buffer; @@ -367,7 +367,7 @@ static void ipw_close(struct usb_serial_port *port, struct file * filp)  	usb_kill_urb(port->write_urb);  } -static void ipw_write_bulk_callback(struct urb *urb, struct pt_regs *regs) +static void ipw_write_bulk_callback(struct urb *urb)  {  	struct usb_serial_port *port = urb->context; diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c index 1b348df388e..331bf81556f 100644 --- a/drivers/usb/serial/ir-usb.c +++ b/drivers/usb/serial/ir-usb.c @@ -105,8 +105,8 @@ static int  ir_startup (struct usb_serial *serial);  static int  ir_open (struct usb_serial_port *port, struct file *filep);  static void ir_close (struct usb_serial_port *port, struct file *filep);  static int  ir_write (struct usb_serial_port *port, const unsigned char *buf, int count); -static void ir_write_bulk_callback (struct urb *urb, struct pt_regs *regs); -static void ir_read_bulk_callback (struct urb *urb, struct pt_regs *regs); +static void ir_write_bulk_callback (struct urb *urb); +static void ir_read_bulk_callback (struct urb *urb);  static void ir_set_termios (struct usb_serial_port *port, struct termios *old_termios);  static u8 ir_baud = 0; @@ -388,7 +388,7 @@ static int ir_write (struct usb_serial_port *port, const unsigned char *buf, int  	return result;  } -static void ir_write_bulk_callback (struct urb *urb, struct pt_regs *regs) +static void ir_write_bulk_callback (struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context; @@ -410,7 +410,7 @@ static void ir_write_bulk_callback (struct urb *urb, struct pt_regs *regs)  	usb_serial_port_softint(port);  } -static void ir_read_bulk_callback (struct urb *urb, struct pt_regs *regs) +static void ir_read_bulk_callback (struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context;  	struct tty_struct *tty; diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c index 015ad6cc1bb..53be824eb1b 100644 --- a/drivers/usb/serial/keyspan.c +++ b/drivers/usb/serial/keyspan.c @@ -412,7 +412,7 @@ static int keyspan_write(struct usb_serial_port *port,  	return count - left;  } -static void	usa26_indat_callback(struct urb *urb, struct pt_regs *regs) +static void	usa26_indat_callback(struct urb *urb)  {  	int			i, err;  	int			endpoint; @@ -470,7 +470,7 @@ static void	usa26_indat_callback(struct urb *urb, struct pt_regs *regs)  }   	/* Outdat handling is common for all devices */ -static void	usa2x_outdat_callback(struct urb *urb, struct pt_regs *regs) +static void	usa2x_outdat_callback(struct urb *urb)  {  	struct usb_serial_port *port;  	struct keyspan_port_private *p_priv; @@ -483,13 +483,13 @@ static void	usa2x_outdat_callback(struct urb *urb, struct pt_regs *regs)  		usb_serial_port_softint(port);  } -static void	usa26_inack_callback(struct urb *urb, struct pt_regs *regs) +static void	usa26_inack_callback(struct urb *urb)  {  	dbg ("%s", __FUNCTION__);   } -static void	usa26_outcont_callback(struct urb *urb, struct pt_regs *regs) +static void	usa26_outcont_callback(struct urb *urb)  {  	struct usb_serial_port *port;  	struct keyspan_port_private *p_priv; @@ -503,7 +503,7 @@ static void	usa26_outcont_callback(struct urb *urb, struct pt_regs *regs)  	}  } -static void	usa26_instat_callback(struct urb *urb, struct pt_regs *regs) +static void	usa26_instat_callback(struct urb *urb)  {  	unsigned char 				*data = urb->transfer_buffer;  	struct keyspan_usa26_portStatusMessage	*msg; @@ -565,14 +565,14 @@ static void	usa26_instat_callback(struct urb *urb, struct pt_regs *regs)  exit: ;  } -static void	usa26_glocont_callback(struct urb *urb, struct pt_regs *regs) +static void	usa26_glocont_callback(struct urb *urb)  {  	dbg ("%s", __FUNCTION__);  } -static void usa28_indat_callback(struct urb *urb, struct pt_regs *regs) +static void usa28_indat_callback(struct urb *urb)  {  	int                     i, err;  	struct usb_serial_port  *port; @@ -620,12 +620,12 @@ static void usa28_indat_callback(struct urb *urb, struct pt_regs *regs)  	} while (urb->status != -EINPROGRESS);  } -static void	usa28_inack_callback(struct urb *urb, struct pt_regs *regs) +static void	usa28_inack_callback(struct urb *urb)  {  	dbg ("%s", __FUNCTION__);  } -static void	usa28_outcont_callback(struct urb *urb, struct pt_regs *regs) +static void	usa28_outcont_callback(struct urb *urb)  {  	struct usb_serial_port *port;  	struct keyspan_port_private *p_priv; @@ -639,7 +639,7 @@ static void	usa28_outcont_callback(struct urb *urb, struct pt_regs *regs)  	}  } -static void	usa28_instat_callback(struct urb *urb, struct pt_regs *regs) +static void	usa28_instat_callback(struct urb *urb)  {  	int					err;  	unsigned char 				*data = urb->transfer_buffer; @@ -700,13 +700,13 @@ static void	usa28_instat_callback(struct urb *urb, struct pt_regs *regs)  exit: ;  } -static void	usa28_glocont_callback(struct urb *urb, struct pt_regs *regs) +static void	usa28_glocont_callback(struct urb *urb)  {  	dbg ("%s", __FUNCTION__);  } -static void	usa49_glocont_callback(struct urb *urb, struct pt_regs *regs) +static void	usa49_glocont_callback(struct urb *urb)  {  	struct usb_serial *serial;  	struct usb_serial_port *port; @@ -730,7 +730,7 @@ static void	usa49_glocont_callback(struct urb *urb, struct pt_regs *regs)  	/* This is actually called glostat in the Keyspan  	   doco */ -static void	usa49_instat_callback(struct urb *urb, struct pt_regs *regs) +static void	usa49_instat_callback(struct urb *urb)  {  	int					err;  	unsigned char 				*data = urb->transfer_buffer; @@ -793,12 +793,12 @@ static void	usa49_instat_callback(struct urb *urb, struct pt_regs *regs)  exit:	;  } -static void	usa49_inack_callback(struct urb *urb, struct pt_regs *regs) +static void	usa49_inack_callback(struct urb *urb)  {  	dbg ("%s", __FUNCTION__);  } -static void	usa49_indat_callback(struct urb *urb, struct pt_regs *regs) +static void	usa49_indat_callback(struct urb *urb)  {  	int			i, err;  	int			endpoint; @@ -851,12 +851,12 @@ static void	usa49_indat_callback(struct urb *urb, struct pt_regs *regs)  }  /* not used, usa-49 doesn't have per-port control endpoints */ -static void	usa49_outcont_callback(struct urb *urb, struct pt_regs *regs) +static void	usa49_outcont_callback(struct urb *urb)  {  	dbg ("%s", __FUNCTION__);  } -static void	usa90_indat_callback(struct urb *urb, struct pt_regs *regs) +static void	usa90_indat_callback(struct urb *urb)  {  	int			i, err;  	int			endpoint; @@ -930,7 +930,7 @@ static void	usa90_indat_callback(struct urb *urb, struct pt_regs *regs)  } -static void	usa90_instat_callback(struct urb *urb, struct pt_regs *regs) +static void	usa90_instat_callback(struct urb *urb)  {  	unsigned char 				*data = urb->transfer_buffer;  	struct keyspan_usa90_portStatusMessage	*msg; @@ -981,7 +981,7 @@ exit:  	;  } -static void	usa90_outcont_callback(struct urb *urb, struct pt_regs *regs) +static void	usa90_outcont_callback(struct urb *urb)  {  	struct usb_serial_port *port;  	struct keyspan_port_private *p_priv; @@ -1277,7 +1277,7 @@ static int keyspan_fake_startup (struct usb_serial *serial)  /* Helper functions used by keyspan_setup_urbs */  static struct urb *keyspan_setup_urb (struct usb_serial *serial, int endpoint,  				      int dir, void *ctx, char *buf, int len, -				      void (*callback)(struct urb *, struct pt_regs *regs)) +				      void (*callback)(struct urb *))  {  	struct urb *urb; @@ -1300,12 +1300,12 @@ static struct urb *keyspan_setup_urb (struct usb_serial *serial, int endpoint,  }  static struct callbacks { -	void	(*instat_callback)(struct urb *, struct pt_regs *regs); -	void	(*glocont_callback)(struct urb *, struct pt_regs *regs); -	void	(*indat_callback)(struct urb *, struct pt_regs *regs); -	void	(*outdat_callback)(struct urb *, struct pt_regs *regs); -	void	(*inack_callback)(struct urb *, struct pt_regs *regs); -	void	(*outcont_callback)(struct urb *, struct pt_regs *regs); +	void	(*instat_callback)(struct urb *); +	void	(*glocont_callback)(struct urb *); +	void	(*indat_callback)(struct urb *); +	void	(*outdat_callback)(struct urb *); +	void	(*inack_callback)(struct urb *); +	void	(*outcont_callback)(struct urb *);  } keyspan_callbacks[] = {  	{  		/* msg_usa26 callbacks */ diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c index 59e777f1e8f..909005107ea 100644 --- a/drivers/usb/serial/keyspan_pda.c +++ b/drivers/usb/serial/keyspan_pda.c @@ -210,7 +210,7 @@ static void keyspan_pda_request_unthrottle( struct usb_serial *serial )  } -static void keyspan_pda_rx_interrupt (struct urb *urb, struct pt_regs *regs) +static void keyspan_pda_rx_interrupt (struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context;         	struct tty_struct *tty = port->tty; @@ -601,7 +601,7 @@ exit:  } -static void keyspan_pda_write_bulk_callback (struct urb *urb, struct pt_regs *regs) +static void keyspan_pda_write_bulk_callback (struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context;  	struct keyspan_pda_private *priv; diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c index 2a2f3e2da05..17e205699c2 100644 --- a/drivers/usb/serial/kl5kusb105.c +++ b/drivers/usb/serial/kl5kusb105.c @@ -80,11 +80,11 @@ static void klsi_105_close	         (struct usb_serial_port *port,  static int  klsi_105_write	         (struct usb_serial_port *port,  					  const unsigned char *buf,  					  int count); -static void klsi_105_write_bulk_callback (struct urb *urb, struct pt_regs *regs); +static void klsi_105_write_bulk_callback (struct urb *urb);  static int  klsi_105_chars_in_buffer     (struct usb_serial_port *port);  static int  klsi_105_write_room          (struct usb_serial_port *port); -static void klsi_105_read_bulk_callback  (struct urb *urb, struct pt_regs *regs); +static void klsi_105_read_bulk_callback  (struct urb *urb);  static void klsi_105_set_termios         (struct usb_serial_port *port,  					  struct termios * old);  static int  klsi_105_ioctl	         (struct usb_serial_port *port, @@ -556,7 +556,7 @@ exit:  	return bytes_sent;	/* that's how much we wrote */  } /* klsi_105_write */ -static void klsi_105_write_bulk_callback ( struct urb *urb, struct pt_regs *regs) +static void klsi_105_write_bulk_callback ( struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context; @@ -616,7 +616,7 @@ static int klsi_105_write_room (struct usb_serial_port *port) -static void klsi_105_read_bulk_callback (struct urb *urb, struct pt_regs *regs) +static void klsi_105_read_bulk_callback (struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context;  	struct klsi_105_private *priv = usb_get_serial_port_data(port); diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c index d50dce03495..ff03331e0bc 100644 --- a/drivers/usb/serial/kobil_sct.c +++ b/drivers/usb/serial/kobil_sct.c @@ -80,8 +80,8 @@ static int  kobil_ioctl(struct usb_serial_port *port, struct file *file,  static int  kobil_tiocmget(struct usb_serial_port *port, struct file *file);  static int  kobil_tiocmset(struct usb_serial_port *port, struct file *file,  			   unsigned int set, unsigned int clear); -static void kobil_read_int_callback( struct urb *urb, struct pt_regs *regs ); -static void kobil_write_callback( struct urb *purb, struct pt_regs *regs ); +static void kobil_read_int_callback( struct urb *urb ); +static void kobil_write_callback( struct urb *purb );  static struct usb_device_id id_table [] = { @@ -360,7 +360,7 @@ static void kobil_close (struct usb_serial_port *port, struct file *filp)  } -static void kobil_read_int_callback( struct urb *purb, struct pt_regs *regs) +static void kobil_read_int_callback( struct urb *purb)  {  	int result;  	struct usb_serial_port *port = (struct usb_serial_port *) purb->context; @@ -405,7 +405,7 @@ static void kobil_read_int_callback( struct urb *purb, struct pt_regs *regs)  } -static void kobil_write_callback( struct urb *purb, struct pt_regs *regs ) +static void kobil_write_callback( struct urb *purb )  {  } diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c index f4d4305c2c0..b7582cc496d 100644 --- a/drivers/usb/serial/mct_u232.c +++ b/drivers/usb/serial/mct_u232.c @@ -96,7 +96,7 @@ static int  mct_u232_open	         (struct usb_serial_port *port,  					  struct file *filp);  static void mct_u232_close	         (struct usb_serial_port *port,  					  struct file *filp); -static void mct_u232_read_int_callback   (struct urb *urb, struct pt_regs *regs); +static void mct_u232_read_int_callback   (struct urb *urb);  static void mct_u232_set_termios         (struct usb_serial_port *port,  					  struct termios * old);  static int  mct_u232_ioctl	         (struct usb_serial_port *port, @@ -466,7 +466,7 @@ static void mct_u232_close (struct usb_serial_port *port, struct file *filp)  } /* mct_u232_close */ -static void mct_u232_read_int_callback (struct urb *urb, struct pt_regs *regs) +static void mct_u232_read_int_callback (struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context;  	struct mct_u232_private *priv = usb_get_serial_port_data(port); diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index 95bf57166c5..2306d493e55 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c @@ -421,7 +421,7 @@ static int mos7840_handle_new_lsr(struct moschip_port *port, __u8 new_lsr)  /************************************************************************/  /************************************************************************/ -static void mos7840_control_callback(struct urb *urb, struct pt_regs *regs) +static void mos7840_control_callback(struct urb *urb)  {  	unsigned char *data;  	struct moschip_port *mos7840_port; @@ -497,7 +497,7 @@ static int mos7840_get_reg(struct moschip_port *mcs, __u16 Wval, __u16 reg,   *	interrupt endpoint.   *****************************************************************************/ -static void mos7840_interrupt_callback(struct urb *urb, struct pt_regs *regs) +static void mos7840_interrupt_callback(struct urb *urb)  {  	int result;  	int length; @@ -647,7 +647,7 @@ static struct usb_serial *mos7840_get_usb_serial(struct usb_serial_port *port,   *	bulk in endpoint.   *****************************************************************************/ -static void mos7840_bulk_in_callback(struct urb *urb, struct pt_regs *regs) +static void mos7840_bulk_in_callback(struct urb *urb)  {  	int status;  	unsigned char *data; @@ -726,8 +726,7 @@ static void mos7840_bulk_in_callback(struct urb *urb, struct pt_regs *regs)   *	on the bulk out endpoint.   *****************************************************************************/ -static void mos7840_bulk_out_data_callback(struct urb *urb, -					   struct pt_regs *regs) +static void mos7840_bulk_out_data_callback(struct urb *urb)  {  	struct moschip_port *mos7840_port;  	struct tty_struct *tty; diff --git a/drivers/usb/serial/navman.c b/drivers/usb/serial/navman.c index ac3f8b5d2c4..0610409a656 100644 --- a/drivers/usb/serial/navman.c +++ b/drivers/usb/serial/navman.c @@ -32,7 +32,7 @@ static struct usb_driver navman_driver = {  	.no_dynamic_id = 	1,  }; -static void navman_read_int_callback(struct urb *urb, struct pt_regs *regs) +static void navman_read_int_callback(struct urb *urb)  {  	struct usb_serial_port *port = urb->context;  	unsigned char *data = urb->transfer_buffer; diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c index a764ff4e326..bc91d3b726f 100644 --- a/drivers/usb/serial/omninet.c +++ b/drivers/usb/serial/omninet.c @@ -64,8 +64,8 @@ static int debug;  /* function prototypes */  static int  omninet_open		(struct usb_serial_port *port, struct file *filp);  static void omninet_close		(struct usb_serial_port *port, struct file *filp); -static void omninet_read_bulk_callback	(struct urb *urb, struct pt_regs *regs); -static void omninet_write_bulk_callback	(struct urb *urb, struct pt_regs *regs); +static void omninet_read_bulk_callback	(struct urb *urb); +static void omninet_write_bulk_callback	(struct urb *urb);  static int  omninet_write		(struct usb_serial_port *port, const unsigned char *buf, int count);  static int  omninet_write_room		(struct usb_serial_port *port);  static void omninet_shutdown		(struct usb_serial *serial); @@ -194,7 +194,7 @@ static void omninet_close (struct usb_serial_port *port, struct file * filp)  #define OMNINET_HEADERLEN	sizeof(struct omninet_header)  #define OMNINET_BULKOUTSIZE 	(64 - OMNINET_HEADERLEN) -static void omninet_read_bulk_callback (struct urb *urb, struct pt_regs *regs) +static void omninet_read_bulk_callback (struct urb *urb)  {  	struct usb_serial_port 	*port 	= (struct usb_serial_port *)urb->context;  	unsigned char 		*data 	= urb->transfer_buffer; @@ -306,7 +306,7 @@ static int omninet_write_room (struct usb_serial_port *port)  	return (room);  } -static void omninet_write_bulk_callback (struct urb *urb, struct pt_regs *regs) +static void omninet_write_bulk_callback (struct urb *urb)  {  /*	struct omninet_header	*header = (struct omninet_header  *) urb->transfer_buffer; */  	struct usb_serial_port 	*port   = (struct usb_serial_port *) urb->context; diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index c856e6f40e2..130afbbd3fc 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -50,7 +50,7 @@ static void option_rx_throttle(struct usb_serial_port *port);  static void option_rx_unthrottle(struct usb_serial_port *port);  static int  option_write_room(struct usb_serial_port *port); -static void option_instat_callback(struct urb *urb, struct pt_regs *regs); +static void option_instat_callback(struct urb *urb);  static int option_write(struct usb_serial_port *port,  			const unsigned char *buf, int count); @@ -337,7 +337,7 @@ static int option_write(struct usb_serial_port *port,  	return count;  } -static void option_indat_callback(struct urb *urb, struct pt_regs *regs) +static void option_indat_callback(struct urb *urb)  {  	int err;  	int endpoint; @@ -374,7 +374,7 @@ static void option_indat_callback(struct urb *urb, struct pt_regs *regs)  	return;  } -static void option_outdat_callback(struct urb *urb, struct pt_regs *regs) +static void option_outdat_callback(struct urb *urb)  {  	struct usb_serial_port *port; @@ -385,7 +385,7 @@ static void option_outdat_callback(struct urb *urb, struct pt_regs *regs)  	usb_serial_port_softint(port);  } -static void option_instat_callback(struct urb *urb, struct pt_regs *regs) +static void option_instat_callback(struct urb *urb)  {  	int err;  	struct usb_serial_port *port = (struct usb_serial_port *) urb->context; @@ -565,7 +565,7 @@ static void option_close(struct usb_serial_port *port, struct file *filp)  /* Helper functions used by option_setup_urbs */  static struct urb *option_setup_urb(struct usb_serial *serial, int endpoint,  		int dir, void *ctx, char *buf, int len, -		void (*callback)(struct urb *, struct pt_regs *regs)) +		void (*callback)(struct urb *))  {  	struct urb *urb; diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c index 9c18173e33f..bc800c8787a 100644 --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c @@ -948,7 +948,7 @@ static void pl2303_update_line_status(struct usb_serial_port *port,  	wake_up_interruptible(&priv->delta_msr_wait);  } -static void pl2303_read_int_callback(struct urb *urb, struct pt_regs *regs) +static void pl2303_read_int_callback(struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *) urb->context;  	unsigned char *data = urb->transfer_buffer; @@ -987,7 +987,7 @@ exit:  			__FUNCTION__, status);  } -static void pl2303_read_bulk_callback(struct urb *urb, struct pt_regs *regs) +static void pl2303_read_bulk_callback(struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *) urb->context;  	struct pl2303_private *priv = usb_get_serial_port_data(port); @@ -1070,7 +1070,7 @@ static void pl2303_read_bulk_callback(struct urb *urb, struct pt_regs *regs)  	return;  } -static void pl2303_write_bulk_callback(struct urb *urb, struct pt_regs *regs) +static void pl2303_write_bulk_callback(struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *) urb->context;  	struct pl2303_private *priv = usb_get_serial_port_data(port); diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c index 1e07dfad685..30b7ebc8d45 100644 --- a/drivers/usb/serial/safe_serial.c +++ b/drivers/usb/serial/safe_serial.c @@ -204,7 +204,7 @@ static __u16 __inline__ fcs_compute10 (unsigned char *sp, int len, __u16 fcs)  	return fcs;  } -static void safe_read_bulk_callback (struct urb *urb, struct pt_regs *regs) +static void safe_read_bulk_callback (struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *) urb->context;  	unsigned char *data = urb->transfer_buffer; diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c index ac9b8ee52d4..07400c0c8a8 100644 --- a/drivers/usb/serial/ti_usb_3410_5052.c +++ b/drivers/usb/serial/ti_usb_3410_5052.c @@ -166,9 +166,9 @@ static int ti_tiocmget(struct usb_serial_port *port, struct file *file);  static int ti_tiocmset(struct usb_serial_port *port, struct file *file,  	unsigned int set, unsigned int clear);  static void ti_break(struct usb_serial_port *port, int break_state); -static void ti_interrupt_callback(struct urb *urb, struct pt_regs *regs); -static void ti_bulk_in_callback(struct urb *urb, struct pt_regs *regs); -static void ti_bulk_out_callback(struct urb *urb, struct pt_regs *regs); +static void ti_interrupt_callback(struct urb *urb); +static void ti_bulk_in_callback(struct urb *urb); +static void ti_bulk_out_callback(struct urb *urb);  static void ti_recv(struct device *dev, struct tty_struct *tty,  	unsigned char *data, int length); @@ -1098,7 +1098,7 @@ static void ti_break(struct usb_serial_port *port, int break_state)  } -static void ti_interrupt_callback(struct urb *urb, struct pt_regs *regs) +static void ti_interrupt_callback(struct urb *urb)  {  	struct ti_device *tdev = (struct ti_device *)urb->context;  	struct usb_serial_port *port; @@ -1178,7 +1178,7 @@ exit:  } -static void ti_bulk_in_callback(struct urb *urb, struct pt_regs *regs) +static void ti_bulk_in_callback(struct urb *urb)  {  	struct ti_port *tport = (struct ti_port *)urb->context;  	struct usb_serial_port *port = tport->tp_port; @@ -1241,7 +1241,7 @@ exit:  } -static void ti_bulk_out_callback(struct urb *urb, struct pt_regs *regs) +static void ti_bulk_out_callback(struct urb *urb)  {  	struct ti_port *tport = (struct ti_port *)urb->context;  	struct usb_serial_port *port = tport->tp_port; diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c index 88949f7884c..befe2e11a04 100644 --- a/drivers/usb/serial/visor.c +++ b/drivers/usb/serial/visor.c @@ -47,9 +47,9 @@ static int  visor_calc_num_ports(struct usb_serial *serial);  static void visor_shutdown	(struct usb_serial *serial);  static int  visor_ioctl		(struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg);  static void visor_set_termios	(struct usb_serial_port *port, struct termios *old_termios); -static void visor_write_bulk_callback	(struct urb *urb, struct pt_regs *regs); -static void visor_read_bulk_callback	(struct urb *urb, struct pt_regs *regs); -static void visor_read_int_callback	(struct urb *urb, struct pt_regs *regs); +static void visor_write_bulk_callback	(struct urb *urb); +static void visor_read_bulk_callback	(struct urb *urb); +static void visor_read_int_callback	(struct urb *urb);  static int  clie_3_5_startup	(struct usb_serial *serial);  static int  treo_attach		(struct usb_serial *serial);  static int clie_5_attach (struct usb_serial *serial); @@ -471,7 +471,7 @@ static int visor_chars_in_buffer (struct usb_serial_port *port)  } -static void visor_write_bulk_callback (struct urb *urb, struct pt_regs *regs) +static void visor_write_bulk_callback (struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context;  	struct visor_private *priv = usb_get_serial_port_data(port); @@ -494,7 +494,7 @@ static void visor_write_bulk_callback (struct urb *urb, struct pt_regs *regs)  } -static void visor_read_bulk_callback (struct urb *urb, struct pt_regs *regs) +static void visor_read_bulk_callback (struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context;  	struct visor_private *priv = usb_get_serial_port_data(port); @@ -539,7 +539,7 @@ static void visor_read_bulk_callback (struct urb *urb, struct pt_regs *regs)  	return;  } -static void visor_read_int_callback (struct urb *urb, struct pt_regs *regs) +static void visor_read_int_callback (struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context;  	int result; diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c index 6e6c7934be3..4d1cd7aeccd 100644 --- a/drivers/usb/serial/whiteheat.c +++ b/drivers/usb/serial/whiteheat.c @@ -152,8 +152,8 @@ static void whiteheat_break_ctl		(struct usb_serial_port *port, int break_state)  static int  whiteheat_chars_in_buffer	(struct usb_serial_port *port);  static void whiteheat_throttle		(struct usb_serial_port *port);  static void whiteheat_unthrottle	(struct usb_serial_port *port); -static void whiteheat_read_callback	(struct urb *urb, struct pt_regs *regs); -static void whiteheat_write_callback	(struct urb *urb, struct pt_regs *regs); +static void whiteheat_read_callback	(struct urb *urb); +static void whiteheat_write_callback	(struct urb *urb);  static struct usb_serial_driver whiteheat_fake_device = {  	.driver = { @@ -235,8 +235,8 @@ struct whiteheat_private {  /* local function prototypes */  static int start_command_port(struct usb_serial *serial);  static void stop_command_port(struct usb_serial *serial); -static void command_port_write_callback(struct urb *urb, struct pt_regs *regs); -static void command_port_read_callback(struct urb *urb, struct pt_regs *regs); +static void command_port_write_callback(struct urb *urb); +static void command_port_read_callback(struct urb *urb);  static int start_port_read(struct usb_serial_port *port);  static struct whiteheat_urb_wrap *urb_to_wrap(struct urb *urb, struct list_head *head); @@ -958,7 +958,7 @@ static void whiteheat_unthrottle (struct usb_serial_port *port)  /*****************************************************************************   * Connect Tech's White Heat callback routines   *****************************************************************************/ -static void command_port_write_callback (struct urb *urb, struct pt_regs *regs) +static void command_port_write_callback (struct urb *urb)  {  	dbg("%s", __FUNCTION__); @@ -969,7 +969,7 @@ static void command_port_write_callback (struct urb *urb, struct pt_regs *regs)  } -static void command_port_read_callback (struct urb *urb, struct pt_regs *regs) +static void command_port_read_callback (struct urb *urb)  {  	struct usb_serial_port *command_port = (struct usb_serial_port *)urb->context;  	struct whiteheat_command_private *command_info; @@ -1019,7 +1019,7 @@ static void command_port_read_callback (struct urb *urb, struct pt_regs *regs)  } -static void whiteheat_read_callback(struct urb *urb, struct pt_regs *regs) +static void whiteheat_read_callback(struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context;  	struct whiteheat_urb_wrap *wrap; @@ -1061,7 +1061,7 @@ static void whiteheat_read_callback(struct urb *urb, struct pt_regs *regs)  } -static void whiteheat_write_callback(struct urb *urb, struct pt_regs *regs) +static void whiteheat_write_callback(struct urb *urb)  {  	struct usb_serial_port *port = (struct usb_serial_port *)urb->context;  	struct whiteheat_private *info = usb_get_serial_port_data(port);  |