diff options
author | Hannes Eder <hannes@hanneseder.net> | 2009-02-14 06:33:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-17 20:26:11 -0500 |
commit | eb33ae248682ecfdf44d693c72bc4f523f2fb6e3 (patch) | |
tree | 63bc93471541b8565a9b159b6d724ff1054b52ed /drivers/net/hamradio/mkiss.c | |
parent | f6370117958d67608225d5e3b55e3ad2080640e8 (diff) |
drivers/net/hamradio: fix warning: format not a string literal and no ...
Impact: Use 'static const char[]' instead of 'static char[]' and while
being at it fix an issue in 'mkiss_init_driver', where in case of an
error the status code was not passed to printk.
Fix this warnings:
drivers/net/hamradio/6pack.c: In function 'sixpack_init_driver':
drivers/net/hamradio/6pack.c:802: warning: format not a string literal and no format arguments
drivers/net/hamradio/bpqether.c: In function 'bpq_init_driver':
drivers/net/hamradio/bpqether.c:609: warning: format not a string literal and no format arguments
drivers/net/hamradio/mkiss.c: In function 'mkiss_init_driver':
drivers/net/hamradio/mkiss.c:988: warning: format not a string literal and no format arguments
drivers/net/hamradio/mkiss.c:991: warning: format not a string literal and no format arguments
drivers/net/hamradio/scc.c: In function 'scc_init_driver':
drivers/net/hamradio/scc.c:2109: warning: format not a string literal and no format arguments
drivers/net/hamradio/yam.c: In function 'yam_init_driver':
drivers/net/hamradio/yam.c:1094: warning: format not a string literal and no format arguments
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hamradio/mkiss.c')
-rw-r--r-- | drivers/net/hamradio/mkiss.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c index ed5b37d43334..032c0db4c410 100644 --- a/drivers/net/hamradio/mkiss.c +++ b/drivers/net/hamradio/mkiss.c | |||
@@ -976,9 +976,9 @@ static struct tty_ldisc_ops ax_ldisc = { | |||
976 | .write_wakeup = mkiss_write_wakeup | 976 | .write_wakeup = mkiss_write_wakeup |
977 | }; | 977 | }; |
978 | 978 | ||
979 | static char banner[] __initdata = KERN_INFO \ | 979 | static const char banner[] __initdata = KERN_INFO \ |
980 | "mkiss: AX.25 Multikiss, Hans Albas PE1AYX\n"; | 980 | "mkiss: AX.25 Multikiss, Hans Albas PE1AYX\n"; |
981 | static char msg_regfail[] __initdata = KERN_ERR \ | 981 | static const char msg_regfail[] __initdata = KERN_ERR \ |
982 | "mkiss: can't register line discipline (err = %d)\n"; | 982 | "mkiss: can't register line discipline (err = %d)\n"; |
983 | 983 | ||
984 | static int __init mkiss_init_driver(void) | 984 | static int __init mkiss_init_driver(void) |
@@ -987,8 +987,9 @@ static int __init mkiss_init_driver(void) | |||
987 | 987 | ||
988 | printk(banner); | 988 | printk(banner); |
989 | 989 | ||
990 | if ((status = tty_register_ldisc(N_AX25, &ax_ldisc)) != 0) | 990 | status = tty_register_ldisc(N_AX25, &ax_ldisc); |
991 | printk(msg_regfail); | 991 | if (status != 0) |
992 | printk(msg_regfail, status); | ||
992 | 993 | ||
993 | return status; | 994 | return status; |
994 | } | 995 | } |