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

Commit 2427b8e3 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds
Browse files

tty.h: make tty_port_get() static inline 



I get a few dozen of these warnings when using
  gcc (GCC) 4.4.1 20090725 (Red Hat 4.4.1-2):

In file included from mmotm-2010-0113-1217/init/do_mounts.c:5:
mmotm-2010-0113-1217/include/linux/tty.h: In function 'tty_port_get':
mmotm-2010-0113-1217/include/linux/tty.h:469: warning: '______f' is static but declared in inline function 'tty_port_get' which is not static

so make the function static inline.

[akpm@linux-foundation.org: may as well convert tty_port_users() also]
Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 118f3e1a

include/linux/tty.h

+2 −2
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ extern int tty_port_alloc_xmit_buf(struct tty_port *port); 
extern void tty_port_free_xmit_buf(struct tty_port *port);

extern void tty_port_put(struct tty_port *port);



extern inline struct tty_port *tty_port_get(struct tty_port *port)

static inline struct tty_port *tty_port_get(struct tty_port *port)

{

	if (port)

		kref_get(&port->kref);
@@ -486,7 +486,7 @@ extern void tty_port_close(struct tty_port *port, 
				struct tty_struct *tty, struct file *filp);

extern int tty_port_open(struct tty_port *port,

				struct tty_struct *tty, struct file *filp);

extern inline int tty_port_users(struct tty_port *port)

static inline int tty_port_users(struct tty_port *port)

{

	return port->count + port->blocked_open;

}