diff options
author | Domen Puncer <domen@coderock.org> | 2005-05-05 19:16:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-05 19:36:48 -0400 |
commit | fba478b1719c39ea67f15c6158ff4993933e9d18 (patch) | |
tree | a00475b38a3f3b1e00a5f781cd668cbda72a1a5a /drivers | |
parent | 3d67554895982f04d458e14c81b7b9843429719c (diff) |
[PATCH] ixj* - compile warning cleanup
compile warning cleanup - suggested by Adrian Bunk; remove unmaintained rcs
char strings from source and handle the occurrences of their use, make sure
kernel-userspace issues taken care of; break out into separate patch
Signed-off-by: Stephen Biggs <yrgrknmxpzlk@gawab.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/telephony/ixj.c | 18 | ||||
-rw-r--r-- | drivers/telephony/ixj.h | 2 |
2 files changed, 9 insertions, 11 deletions
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c index 5538756f13ba..d5863b8b56ee 100644 --- a/drivers/telephony/ixj.c +++ b/drivers/telephony/ixj.c | |||
@@ -41,9 +41,6 @@ | |||
41 | * | 41 | * |
42 | ***************************************************************************/ | 42 | ***************************************************************************/ |
43 | 43 | ||
44 | static char ixj_c_rcsid[] = "$Id: ixj.c,v 4.7 2001/08/13 06:19:33 craigs Exp $"; | ||
45 | static char ixj_c_revision[] = "$Revision: 4.7 $"; | ||
46 | |||
47 | /* | 44 | /* |
48 | * $Log: ixj.c,v $ | 45 | * $Log: ixj.c,v $ |
49 | * | 46 | * |
@@ -6172,8 +6169,14 @@ static int ixj_ioctl(struct inode *inode, struct file *file_p, unsigned int cmd, | |||
6172 | retval = j->serial; | 6169 | retval = j->serial; |
6173 | break; | 6170 | break; |
6174 | case IXJCTL_VERSION: | 6171 | case IXJCTL_VERSION: |
6175 | if (copy_to_user(argp, ixj_c_revision, strlen(ixj_c_revision))) | 6172 | { |
6176 | retval = -EFAULT; | 6173 | char arg_str[100]; |
6174 | snprintf(arg_str, sizeof(arg_str), | ||
6175 | "\nDriver version %i.%i.%i", IXJ_VER_MAJOR, | ||
6176 | IXJ_VER_MINOR, IXJ_BLD_VER); | ||
6177 | if (copy_to_user(argp, arg_str, strlen(arg_str))) | ||
6178 | retval = -EFAULT; | ||
6179 | } | ||
6177 | break; | 6180 | break; |
6178 | case PHONE_RING_CADENCE: | 6181 | case PHONE_RING_CADENCE: |
6179 | j->ring_cadence = arg; | 6182 | j->ring_cadence = arg; |
@@ -7168,9 +7171,6 @@ static int ixj_get_status_proc(char *buf) | |||
7168 | int cnt; | 7171 | int cnt; |
7169 | IXJ *j; | 7172 | IXJ *j; |
7170 | len = 0; | 7173 | len = 0; |
7171 | len += sprintf(buf + len, "%s", ixj_c_rcsid); | ||
7172 | len += sprintf(buf + len, "\n%s", ixj_h_rcsid); | ||
7173 | len += sprintf(buf + len, "\n%s", ixjuser_h_rcsid); | ||
7174 | len += sprintf(buf + len, "\nDriver version %i.%i.%i", IXJ_VER_MAJOR, IXJ_VER_MINOR, IXJ_BLD_VER); | 7174 | len += sprintf(buf + len, "\nDriver version %i.%i.%i", IXJ_VER_MAJOR, IXJ_VER_MINOR, IXJ_BLD_VER); |
7175 | len += sprintf(buf + len, "\nsizeof IXJ struct %Zd bytes", sizeof(IXJ)); | 7175 | len += sprintf(buf + len, "\nsizeof IXJ struct %Zd bytes", sizeof(IXJ)); |
7176 | len += sprintf(buf + len, "\nsizeof DAA struct %Zd bytes", sizeof(DAA_REGS)); | 7176 | len += sprintf(buf + len, "\nsizeof DAA struct %Zd bytes", sizeof(DAA_REGS)); |
@@ -7790,7 +7790,7 @@ static int __init ixj_init(void) | |||
7790 | if ((probe = ixj_probe_pci(&cnt)) < 0) { | 7790 | if ((probe = ixj_probe_pci(&cnt)) < 0) { |
7791 | return probe; | 7791 | return probe; |
7792 | } | 7792 | } |
7793 | printk("%s\n", ixj_c_rcsid); | 7793 | printk(KERN_INFO "ixj driver initialized.\n"); |
7794 | create_proc_read_entry ("ixj", 0, NULL, ixj_read_proc, NULL); | 7794 | create_proc_read_entry ("ixj", 0, NULL, ixj_read_proc, NULL); |
7795 | return probe; | 7795 | return probe; |
7796 | } | 7796 | } |
diff --git a/drivers/telephony/ixj.h b/drivers/telephony/ixj.h index 143818a56121..51e3f7f6597b 100644 --- a/drivers/telephony/ixj.h +++ b/drivers/telephony/ixj.h | |||
@@ -38,8 +38,6 @@ | |||
38 | * TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. | 38 | * TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. |
39 | * | 39 | * |
40 | *****************************************************************************/ | 40 | *****************************************************************************/ |
41 | static char ixj_h_rcsid[] = "$Id: ixj.h,v 4.1 2001/08/04 14:49:27 craigs Exp $"; | ||
42 | |||
43 | #define IXJ_VERSION 3031 | 41 | #define IXJ_VERSION 3031 |
44 | 42 | ||
45 | #include <linux/version.h> | 43 | #include <linux/version.h> |