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

tty: Remove some pointless casts 



disc_data and driver_data are void *

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0ac6053c

drivers/char/amiserial.c

+17 −17
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static __inline__ void rtsdtr_ctrl(int bits) 
 */

static void rs_stop(struct tty_struct *tty)

{

	struct async_struct *info = (struct async_struct *)tty->driver_data;

	struct async_struct *info = tty->driver_data;

	unsigned long flags;



	if (serial_paranoia_check(info, tty->name, "rs_stop"))
@@ -190,7 +190,7 @@ static void rs_stop(struct tty_struct *tty) 


static void rs_start(struct tty_struct *tty)

{

	struct async_struct *info = (struct async_struct *)tty->driver_data;

	struct async_struct *info = tty->driver_data;

	unsigned long flags;



	if (serial_paranoia_check(info, tty->name, "rs_start"))
@@ -861,7 +861,7 @@ static int rs_put_char(struct tty_struct *tty, unsigned char ch) 


static void rs_flush_chars(struct tty_struct *tty)

{

	struct async_struct *info = (struct async_struct *)tty->driver_data;

	struct async_struct *info = tty->driver_data;

	unsigned long flags;



	if (serial_paranoia_check(info, tty->name, "rs_flush_chars"))
@@ -934,7 +934,7 @@ static int rs_write(struct tty_struct * tty, const unsigned char *buf, int count 


static int rs_write_room(struct tty_struct *tty)

{

	struct async_struct *info = (struct async_struct *)tty->driver_data;

	struct async_struct *info = tty->driver_data;



	if (serial_paranoia_check(info, tty->name, "rs_write_room"))

		return 0;
@@ -943,7 +943,7 @@ static int rs_write_room(struct tty_struct *tty) 


static int rs_chars_in_buffer(struct tty_struct *tty)

{

	struct async_struct *info = (struct async_struct *)tty->driver_data;

	struct async_struct *info = tty->driver_data;



	if (serial_paranoia_check(info, tty->name, "rs_chars_in_buffer"))

		return 0;
@@ -952,7 +952,7 @@ static int rs_chars_in_buffer(struct tty_struct *tty) 


static void rs_flush_buffer(struct tty_struct *tty)

{

	struct async_struct *info = (struct async_struct *)tty->driver_data;

	struct async_struct *info = tty->driver_data;

	unsigned long flags;



	if (serial_paranoia_check(info, tty->name, "rs_flush_buffer"))
@@ -969,7 +969,7 @@ static void rs_flush_buffer(struct tty_struct *tty) 
 */

static void rs_send_xchar(struct tty_struct *tty, char ch)

{

	struct async_struct *info = (struct async_struct *)tty->driver_data;

	struct async_struct *info = tty->driver_data;

        unsigned long flags;



	if (serial_paranoia_check(info, tty->name, "rs_send_char"))
@@ -1004,7 +1004,7 @@ static void rs_send_xchar(struct tty_struct *tty, char ch) 
 */

static void rs_throttle(struct tty_struct * tty)

{

	struct async_struct *info = (struct async_struct *)tty->driver_data;

	struct async_struct *info = tty->driver_data;

	unsigned long flags;

#ifdef SERIAL_DEBUG_THROTTLE

	char	buf[64];
@@ -1029,7 +1029,7 @@ static void rs_throttle(struct tty_struct * tty) 


static void rs_unthrottle(struct tty_struct * tty)

{

	struct async_struct *info = (struct async_struct *)tty->driver_data;

	struct async_struct *info = tty->driver_data;

	unsigned long flags;

#ifdef SERIAL_DEBUG_THROTTLE

	char	buf[64];
@@ -1194,7 +1194,7 @@ static int get_lsr_info(struct async_struct * info, unsigned int __user *value) 


static int rs_tiocmget(struct tty_struct *tty, struct file *file)

{

	struct async_struct * info = (struct async_struct *)tty->driver_data;

	struct async_struct * info = tty->driver_data;

	unsigned char control, status;

	unsigned long flags;
@@ -1217,7 +1217,7 @@ static int rs_tiocmget(struct tty_struct *tty, struct file *file) 
static int rs_tiocmset(struct tty_struct *tty, struct file *file,

		       unsigned int set, unsigned int clear)

{

	struct async_struct * info = (struct async_struct *)tty->driver_data;

	struct async_struct * info = tty->driver_data;

	unsigned long flags;



	if (serial_paranoia_check(info, tty->name, "rs_ioctl"))
@@ -1244,7 +1244,7 @@ static int rs_tiocmset(struct tty_struct *tty, struct file *file, 
 */

static int rs_break(struct tty_struct *tty, int break_state)

{

	struct async_struct * info = (struct async_struct *)tty->driver_data;

	struct async_struct * info = tty->driver_data;

	unsigned long flags;



	if (serial_paranoia_check(info, tty->name, "rs_break"))
@@ -1264,7 +1264,7 @@ static int rs_break(struct tty_struct *tty, int break_state) 
static int rs_ioctl(struct tty_struct *tty, struct file * file,

		    unsigned int cmd, unsigned long arg)

{

	struct async_struct * info = (struct async_struct *)tty->driver_data;

	struct async_struct * info = tty->driver_data;

	struct async_icount cprev, cnow;	/* kernel counter temps */

	struct serial_icounter_struct icount;

	void __user *argp = (void __user *)arg;
@@ -1368,7 +1368,7 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file, 


static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)

{

	struct async_struct *info = (struct async_struct *)tty->driver_data;

	struct async_struct *info = tty->driver_data;

	unsigned long flags;

	unsigned int cflag = tty->termios->c_cflag;
@@ -1428,7 +1428,7 @@ static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios) 
 */

static void rs_close(struct tty_struct *tty, struct file * filp)

{

	struct async_struct * info = (struct async_struct *)tty->driver_data;

	struct async_struct * info = tty->driver_data;

	struct serial_state *state;

	unsigned long flags;
@@ -1523,7 +1523,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp) 
 */

static void rs_wait_until_sent(struct tty_struct *tty, int timeout)

{

	struct async_struct * info = (struct async_struct *)tty->driver_data;

	struct async_struct * info = tty->driver_data;

	unsigned long orig_jiffies, char_time;

	int lsr;
@@ -1587,7 +1587,7 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout) 
 */

static void rs_hangup(struct tty_struct *tty)

{

	struct async_struct * info = (struct async_struct *)tty->driver_data;

	struct async_struct * info = tty->driver_data;

	struct serial_state *state = info->state;



	if (serial_paranoia_check(info, tty->name, "rs_hangup"))

drivers/char/epca.c

+5 −5
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static struct channel *verifyChannel(struct tty_struct *tty) 
	 * through tty->driver_data this should catch it.

	 */

	if (tty) {

		struct channel *ch = (struct channel *)tty->driver_data;

		struct channel *ch = tty->driver_data;

		if (ch >= &digi_channels[0] && ch < &digi_channels[nbdevs]) {

			if (ch->magic == EPCA_MAGIC)

				return ch;
@@ -2097,7 +2097,7 @@ static int info_ioctl(struct tty_struct *tty, struct file *file, 


static int pc_tiocmget(struct tty_struct *tty, struct file *file)

{

	struct channel *ch = (struct channel *) tty->driver_data;

	struct channel *ch = tty->driver_data;

	struct board_chan __iomem *bc;

	unsigned int mstat, mflag = 0;

	unsigned long flags;
@@ -2131,7 +2131,7 @@ static int pc_tiocmget(struct tty_struct *tty, struct file *file) 
static int pc_tiocmset(struct tty_struct *tty, struct file *file,

		       unsigned int set, unsigned int clear)

{

	struct channel *ch = (struct channel *) tty->driver_data;

	struct channel *ch = tty->driver_data;

	unsigned long flags;



	if (!ch)
@@ -2178,7 +2178,7 @@ static int pc_ioctl(struct tty_struct *tty, struct file *file, 
	unsigned int mflag, mstat;

	unsigned char startc, stopc;

	struct board_chan __iomem *bc;

	struct channel *ch = (struct channel *) tty->driver_data;

	struct channel *ch = tty->driver_data;

	void __user *argp = (void __user *)arg;



	if (ch)
@@ -2473,7 +2473,7 @@ static void pc_unthrottle(struct tty_struct *tty) 


static int pc_send_break(struct tty_struct *tty, int msec)

{

	struct channel *ch = (struct channel *) tty->driver_data;

	struct channel *ch = tty->driver_data;

	unsigned long flags;



	if (msec == -1)

drivers/char/generic_serial.c

+1 −1
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ void gs_close(struct tty_struct * tty, struct file * filp) 
	

	func_enter ();



	port = (struct gs_port *) tty->driver_data;

	port = tty->driver_data;



	if (!port) return;

drivers/char/hvsi.c

+6 −6
Original line number Diff line number Diff line
@@ -997,14 +997,14 @@ static void hvsi_write_worker(struct work_struct *work) 


static int hvsi_write_room(struct tty_struct *tty)

{

	struct hvsi_struct *hp = (struct hvsi_struct *)tty->driver_data;

	struct hvsi_struct *hp = tty->driver_data;



	return N_OUTBUF - hp->n_outbuf;

}



static int hvsi_chars_in_buffer(struct tty_struct *tty)

{

	struct hvsi_struct *hp = (struct hvsi_struct *)tty->driver_data;

	struct hvsi_struct *hp = tty->driver_data;



	return hp->n_outbuf;

}
@@ -1070,7 +1070,7 @@ static int hvsi_write(struct tty_struct *tty, 
 */

static void hvsi_throttle(struct tty_struct *tty)

{

	struct hvsi_struct *hp = (struct hvsi_struct *)tty->driver_data;

	struct hvsi_struct *hp = tty->driver_data;



	pr_debug("%s\n", __func__);
@@ -1079,7 +1079,7 @@ static void hvsi_throttle(struct tty_struct *tty) 


static void hvsi_unthrottle(struct tty_struct *tty)

{

	struct hvsi_struct *hp = (struct hvsi_struct *)tty->driver_data;

	struct hvsi_struct *hp = tty->driver_data;

	unsigned long flags;

	int shouldflip = 0;
@@ -1100,7 +1100,7 @@ static void hvsi_unthrottle(struct tty_struct *tty) 


static int hvsi_tiocmget(struct tty_struct *tty, struct file *file)

{

	struct hvsi_struct *hp = (struct hvsi_struct *)tty->driver_data;

	struct hvsi_struct *hp = tty->driver_data;



	hvsi_get_mctrl(hp);

	return hp->mctrl;
@@ -1109,7 +1109,7 @@ static int hvsi_tiocmget(struct tty_struct *tty, struct file *file) 
static int hvsi_tiocmset(struct tty_struct *tty, struct file *file,

		unsigned int set, unsigned int clear)

{

	struct hvsi_struct *hp = (struct hvsi_struct *)tty->driver_data;

	struct hvsi_struct *hp = tty->driver_data;

	unsigned long flags;

	uint16_t new_mctrl;

drivers/char/n_r3964.c

+6 −6
Original line number Diff line number Diff line
@@ -1003,7 +1003,7 @@ static int r3964_open(struct tty_struct *tty) 


static void r3964_close(struct tty_struct *tty)

{

	struct r3964_info *pInfo = (struct r3964_info *)tty->disc_data;

	struct r3964_info *pInfo = tty->disc_data;

	struct r3964_client_info *pClient, *pNext;

	struct r3964_message *pMsg;

	struct r3964_block_header *pHeader, *pNextHeader;
@@ -1058,7 +1058,7 @@ static void r3964_close(struct tty_struct *tty) 
static ssize_t r3964_read(struct tty_struct *tty, struct file *file,

			  unsigned char __user * buf, size_t nr)

{

	struct r3964_info *pInfo = (struct r3964_info *)tty->disc_data;

	struct r3964_info *pInfo = tty->disc_data;

	struct r3964_client_info *pClient;

	struct r3964_message *pMsg;

	struct r3964_client_message theMsg;
@@ -1113,7 +1113,7 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file, 
static ssize_t r3964_write(struct tty_struct *tty, struct file *file,

			   const unsigned char *data, size_t count)

{

	struct r3964_info *pInfo = (struct r3964_info *)tty->disc_data;

	struct r3964_info *pInfo = tty->disc_data;

	struct r3964_block_header *pHeader;

	struct r3964_client_info *pClient;

	unsigned char *new_data;
@@ -1182,7 +1182,7 @@ static ssize_t r3964_write(struct tty_struct *tty, struct file *file, 
static int r3964_ioctl(struct tty_struct *tty, struct file *file,

		unsigned int cmd, unsigned long arg)

{

	struct r3964_info *pInfo = (struct r3964_info *)tty->disc_data;

	struct r3964_info *pInfo = tty->disc_data;

	if (pInfo == NULL)

		return -EINVAL;

	switch (cmd) {
@@ -1216,7 +1216,7 @@ static void r3964_set_termios(struct tty_struct *tty, struct ktermios *old) 
static unsigned int r3964_poll(struct tty_struct *tty, struct file *file,

			struct poll_table_struct *wait)

{

	struct r3964_info *pInfo = (struct r3964_info *)tty->disc_data;

	struct r3964_info *pInfo = tty->disc_data;

	struct r3964_client_info *pClient;

	struct r3964_message *pMsg = NULL;

	unsigned long flags;
@@ -1241,7 +1241,7 @@ static unsigned int r3964_poll(struct tty_struct *tty, struct file *file, 
static void r3964_receive_buf(struct tty_struct *tty, const unsigned char *cp,

			char *fp, int count)

{

	struct r3964_info *pInfo = (struct r3964_info *)tty->disc_data;

	struct r3964_info *pInfo = tty->disc_data;

	const unsigned char *p;

	char *f, flags = 0;

	int i;