Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Domen Puncer and committed by
Linus Torvalds
fba478b1 3d675548

+9 -13
+9 -9
drivers/telephony/ixj.c
··· 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 45 * $Log: ixj.c,v $ 49 46 * ··· 6169 6172 retval = j->serial; 6170 6173 break; 6171 6174 case IXJCTL_VERSION: 6172 - if (copy_to_user(argp, ixj_c_revision, strlen(ixj_c_revision))) 6173 - retval = -EFAULT; 6175 + { 6176 + char arg_str[100]; 6177 + snprintf(arg_str, sizeof(arg_str), 6178 + "\nDriver version %i.%i.%i", IXJ_VER_MAJOR, 6179 + IXJ_VER_MINOR, IXJ_BLD_VER); 6180 + if (copy_to_user(argp, arg_str, strlen(arg_str))) 6181 + retval = -EFAULT; 6182 + } 6174 6183 break; 6175 6184 case PHONE_RING_CADENCE: 6176 6185 j->ring_cadence = arg; ··· 7171 7168 int cnt; 7172 7169 IXJ *j; 7173 7170 len = 0; 7174 - len += sprintf(buf + len, "%s", ixj_c_rcsid); 7175 - len += sprintf(buf + len, "\n%s", ixj_h_rcsid); 7176 - len += sprintf(buf + len, "\n%s", ixjuser_h_rcsid); 7177 7171 len += sprintf(buf + len, "\nDriver version %i.%i.%i", IXJ_VER_MAJOR, IXJ_VER_MINOR, IXJ_BLD_VER); 7178 7172 len += sprintf(buf + len, "\nsizeof IXJ struct %Zd bytes", sizeof(IXJ)); 7179 7173 len += sprintf(buf + len, "\nsizeof DAA struct %Zd bytes", sizeof(DAA_REGS)); ··· 7790 7790 if ((probe = ixj_probe_pci(&cnt)) < 0) { 7791 7791 return probe; 7792 7792 } 7793 - printk("%s\n", ixj_c_rcsid); 7793 + printk(KERN_INFO "ixj driver initialized.\n"); 7794 7794 create_proc_read_entry ("ixj", 0, NULL, ixj_read_proc, NULL); 7795 7795 return probe; 7796 7796 }
-2
drivers/telephony/ixj.h
··· 38 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 41 #define IXJ_VERSION 3031 44 42 45 43 #include <linux/version.h>
-2
include/linux/ixjuser.h
··· 42 42 * 43 43 *****************************************************************************/ 44 44 45 - static char ixjuser_h_rcsid[] = "$Id: ixjuser.h,v 4.1 2001/08/05 00:17:37 craigs Exp $"; 46 - 47 45 #include <linux/telephony.h> 48 46 49 47