diff options
| author |   Domen Puncer <domen@coderock.org> | 2005-05-05 16:16:13 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-05 16:36:48 -0700 |
| commit | fba478b1719c39ea67f15c6158ff4993933e9d18 (patch) | |
| tree | a00475b38a3f3b1e00a5f781cd668cbda72a1a5a /drivers | |
| parent | [PATCH] fix up a comment still refering to verify_area (diff) | |
| download | linux-dev-fba478b1719c39ea67f15c6158ff4993933e9d18.tar.xz linux-dev-fba478b1719c39ea67f15c6158ff4993933e9d18.zip | |
[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 @@ * ***************************************************************************/ -static char ixj_c_rcsid[] = "$Id: ixj.c,v 4.7 2001/08/13 06:19:33 craigs Exp $"; -static char ixj_c_revision[] = "$Revision: 4.7 $"; - /* * $Log: ixj.c,v $ * @@ -6172,8 +6169,14 @@ static int ixj_ioctl(struct inode *inode, struct file *file_p, unsigned int cmd, retval = j->serial; break; case IXJCTL_VERSION: - if (copy_to_user(argp, ixj_c_revision, strlen(ixj_c_revision))) - retval = -EFAULT; + { + char arg_str[100]; + snprintf(arg_str, sizeof(arg_str), + "\nDriver version %i.%i.%i", IXJ_VER_MAJOR, + IXJ_VER_MINOR, IXJ_BLD_VER); + if (copy_to_user(argp, arg_str, strlen(arg_str))) + retval = -EFAULT; + } break; case PHONE_RING_CADENCE: j->ring_cadence = arg; @@ -7168,9 +7171,6 @@ static int ixj_get_status_proc(char *buf) int cnt; IXJ *j; len = 0; - len += sprintf(buf + len, "%s", ixj_c_rcsid); - len += sprintf(buf + len, "\n%s", ixj_h_rcsid); - len += sprintf(buf + len, "\n%s", ixjuser_h_rcsid); len += sprintf(buf + len, "\nDriver version %i.%i.%i", IXJ_VER_MAJOR, IXJ_VER_MINOR, IXJ_BLD_VER); len += sprintf(buf + len, "\nsizeof IXJ struct %Zd bytes", sizeof(IXJ)); len += sprintf(buf + len, "\nsizeof DAA struct %Zd bytes", sizeof(DAA_REGS)); @@ -7790,7 +7790,7 @@ static int __init ixj_init(void) if ((probe = ixj_probe_pci(&cnt)) < 0) { return probe; } - printk("%s\n", ixj_c_rcsid); + printk(KERN_INFO "ixj driver initialized.\n"); create_proc_read_entry ("ixj", 0, NULL, ixj_read_proc, NULL); return probe; } 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 @@ * TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. * *****************************************************************************/ -static char ixj_h_rcsid[] = "$Id: ixj.h,v 4.1 2001/08/04 14:49:27 craigs Exp $"; - #define IXJ_VERSION 3031 #include <linux/version.h> |