tty: Re-declare tty_driver_remove_tty() file scope

peterhurley · gregkh · commit 05de87ed9531 · 2016-01-27T14:28:20.000-08:00
tty_driver_remove_tty() is only local-scope; declare as static.

Signed-off-by: Peter Hurley &lt;peter@hurleysoftware.com&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
@@ -1437,7 +1437,7 @@ static int tty_driver_install_tty(struct tty_driver *driver,
  *
  *	Locking: tty_mutex for now
  */
-void tty_driver_remove_tty(struct tty_driver *driver, struct tty_struct *tty)
+static void tty_driver_remove_tty(struct tty_driver *driver, struct tty_struct *tty)
 {
 	if (driver->ops->remove)
 		driver->ops->remove(driver, tty);
diff --git a/include/linux/tty.h b/include/linux/tty.h
@@ -446,8 +446,6 @@ extern void tty_unthrottle(struct tty_struct *tty);
 extern int tty_throttle_safe(struct tty_struct *tty);
 extern int tty_unthrottle_safe(struct tty_struct *tty);
 extern int tty_do_resize(struct tty_struct *tty, struct winsize *ws);
-extern void tty_driver_remove_tty(struct tty_driver *driver,
-				  struct tty_struct *tty);
 extern int is_current_pgrp_orphaned(void);
 extern int is_ignored(int sig);
 extern int tty_signal(int sig, struct tty_struct *tty);

Original file line number	Diff line number	Diff line change
`@@ -1437,7 +1437,7 @@ static int tty_driver_install_tty(struct tty_driver *driver,`
`1437`	`1437`	`*`
`1438`	`1438`	`* Locking: tty_mutex for now`
`1439`	`1439`	`*/`
`1440`		`-void tty_driver_remove_tty(struct tty_driver driver, struct tty_struct tty)`
	`1440`	`+static void tty_driver_remove_tty(struct tty_driver driver, struct tty_struct tty)`
`1441`	`1441`	`{`
`1442`	`1442`	`if (driver->ops->remove)`
`1443`	`1443`	`driver->ops->remove(driver, tty);`