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

Commit 429b4749 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Greg Kroah-Hartman
Browse files

tty: remove buf parameter from tty_name() 



tty_name no longer uses the buf parameter, so remove it along with all
the 64 byte stack buffers that used to be passed in.

Mostly generated by the coccinelle script

@depends on patch@
identifier buf;
constant C;
expression tty;
@@
- char buf[C];
  <+...
- tty_name(tty, buf)
+ tty_name(tty)
  ...+>

allmodconfig compiles, so I'm fairly confident the stack buffers
weren't used for other purposes as well.

Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Reviewed-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Acked-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 917162c9

drivers/input/serio/serport.c

+2 −3
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ static ssize_t serport_ldisc_read(struct tty_struct * tty, struct file * file, u 
{

	struct serport *serport = (struct serport*) tty->disc_data;

	struct serio *serio;

	char name[64];



	if (test_and_set_bit(SERPORT_BUSY, &serport->flags))

		return -EBUSY;
@@ -177,7 +176,7 @@ static ssize_t serport_ldisc_read(struct tty_struct * tty, struct file * file, u 
		return -ENOMEM;



	strlcpy(serio->name, "Serial port", sizeof(serio->name));

	snprintf(serio->phys, sizeof(serio->phys), "%s/serio0", tty_name(tty, name));

	snprintf(serio->phys, sizeof(serio->phys), "%s/serio0", tty_name(tty));

	serio->id = serport->id;

	serio->id.type = SERIO_RS232;

	serio->write = serport_serio_write;
@@ -187,7 +186,7 @@ static ssize_t serport_ldisc_read(struct tty_struct * tty, struct file * file, u 
	serio->dev.parent = tty->dev;



	serio_register_port(serport->serio);

	printk(KERN_INFO "serio: Serial port %s\n", tty_name(tty, name));

	printk(KERN_INFO "serio: Serial port %s\n", tty_name(tty));



	wait_event_interruptible(serport->wait, test_bit(SERPORT_DEAD, &serport->flags));

	serio_unregister_port(serport->serio);

drivers/tty/amiserial.c

+2 −6
Original line number Diff line number Diff line
@@ -966,9 +966,7 @@ static void rs_throttle(struct tty_struct * tty) 
	struct serial_state *info = tty->driver_data;

	unsigned long flags;

#ifdef SERIAL_DEBUG_THROTTLE

	char	buf[64];



	printk("throttle %s: %d....\n", tty_name(tty, buf),

	printk("throttle %s: %d....\n", tty_name(tty),

	       tty->ldisc.chars_in_buffer(tty));

#endif
@@ -991,9 +989,7 @@ static void rs_unthrottle(struct tty_struct * tty) 
	struct serial_state *info = tty->driver_data;

	unsigned long flags;

#ifdef SERIAL_DEBUG_THROTTLE

	char	buf[64];



	printk("unthrottle %s: %d....\n", tty_name(tty, buf),

	printk("unthrottle %s: %d....\n", tty_name(tty),

	       tty->ldisc.chars_in_buffer(tty));

#endif

drivers/tty/cyclades.c

+2 −6
Original line number Diff line number Diff line
@@ -2861,9 +2861,7 @@ static void cy_throttle(struct tty_struct *tty) 
	unsigned long flags;



#ifdef CY_DEBUG_THROTTLE

	char buf[64];



	printk(KERN_DEBUG "cyc:throttle %s: %ld...ttyC%d\n", tty_name(tty, buf),

	printk(KERN_DEBUG "cyc:throttle %s: %ld...ttyC%d\n", tty_name(tty),

			tty->ldisc.chars_in_buffer(tty), info->line);

#endif
@@ -2902,10 +2900,8 @@ static void cy_unthrottle(struct tty_struct *tty) 
	unsigned long flags;



#ifdef CY_DEBUG_THROTTLE

	char buf[64];



	printk(KERN_DEBUG "cyc:unthrottle %s: %ld...ttyC%d\n",

		tty_name(tty, buf), tty_chars_in_buffer(tty), info->line);

		tty_name(tty), tty_chars_in_buffer(tty), info->line);

#endif



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

drivers/tty/n_gsm.c

+1 −2
Original line number Diff line number Diff line
@@ -2274,7 +2274,6 @@ static void gsmld_receive_buf(struct tty_struct *tty, const unsigned char *cp, 
	const unsigned char *dp;

	char *f;

	int i;

	char buf[64];

	char flags = TTY_NORMAL;



	if (debug & 4)
@@ -2296,7 +2295,7 @@ static void gsmld_receive_buf(struct tty_struct *tty, const unsigned char *cp, 
			break;

		default:

			WARN_ONCE(1, "%s: unknown flag %d\n",

			       tty_name(tty, buf), flags);

			       tty_name(tty), flags);

			break;

		}

	}

drivers/tty/n_tty.c

+2 −5
Original line number Diff line number Diff line
@@ -1179,13 +1179,12 @@ static void n_tty_receive_break(struct tty_struct *tty) 
static void n_tty_receive_overrun(struct tty_struct *tty)

{

	struct n_tty_data *ldata = tty->disc_data;

	char buf[64];



	ldata->num_overrun++;

	if (time_after(jiffies, ldata->overrun_time + HZ) ||

			time_after(ldata->overrun_time, jiffies)) {

		printk(KERN_WARNING "%s: %d input overrun(s)\n",

			tty_name(tty, buf),

			tty_name(tty),

			ldata->num_overrun);

		ldata->overrun_time = jiffies;

		ldata->num_overrun = 0;
@@ -1460,8 +1459,6 @@ static void n_tty_receive_char_closing(struct tty_struct *tty, unsigned char c) 
static void

n_tty_receive_char_flagged(struct tty_struct *tty, unsigned char c, char flag)

{

	char buf[64];



	switch (flag) {

	case TTY_BREAK:

		n_tty_receive_break(tty);
@@ -1475,7 +1472,7 @@ n_tty_receive_char_flagged(struct tty_struct *tty, unsigned char c, char flag) 
		break;

	default:

		printk(KERN_ERR "%s: unknown flag %d\n",

		       tty_name(tty, buf), flag);

		       tty_name(tty), flag);

		break;

	}

}