From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Stephen Biggs" Date: Mon, 14 Feb 2005 22:02:53 +0000 Subject: [KJ] [PATCH][RESUBMIT][14/21] drivers/telephony/* - compile warning Message-Id: <42113C2D.22902.52C0B1@localhost> MIME-Version: 1 Content-Type: multipart/mixed; boundary="===============24746517853613037==" List-Id: To: kernel-janitors@vger.kernel.org --===============24746517853613037== Content-type: text/plain; charset=US-ASCII Content-transfer-encoding: 7BIT Content-description: Mail message body Description: compile warning cleanup - remove unmaintained rcs char strings from source and handle the occurrences of their use Signed-off-by: Stephen Biggs diff -Nurdp -X dontdiff-osdl linux-2.6.11-rc3-mm2-original/drivers/telephony/ixj.c linux-2.6.11-rc3-mm2/drivers/telephony/ixj.c --- linux-2.6.11-rc3-mm2-original/drivers/telephony/ixj.c 2005-02-12 12:06:25.000000000 +0200 +++ linux-2.6.11-rc3-mm2/drivers/telephony/ixj.c 2005-02-12 22:30:08.000000000 +0200 @@ -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,7 @@ static int ixj_ioctl(struct inode *inode retval = j->serial; break; case IXJCTL_VERSION: - if (copy_to_user(argp, ixj_c_revision, strlen(ixj_c_revision))) - retval = -EFAULT; + sprintf(argp, "\nDriver version %i.%i.%i", IXJ_VER_MAJOR, IXJ_VER_MINOR, IXJ_BLD_VER); break; case PHONE_RING_CADENCE: j->ring_cadence = arg; @@ -7168,9 +7164,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 +7783,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 -Nurdp -X dontdiff-osdl linux-2.6.11-rc3-mm2-original/drivers/telephony/ixj.h linux-2.6.11-rc3-mm2/drivers/telephony/ixj.h --- linux-2.6.11-rc3-mm2-original/drivers/telephony/ixj.h 2004-12-24 23:35:40.000000000 +0200 +++ linux-2.6.11-rc3-mm2/drivers/telephony/ixj.h 2005-02-12 22:11:46.000000000 +0200 @@ -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 --===============24746517853613037== Content-Type: text/plain; charset="iso-8859-1" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline _______________________________________________ Kernel-janitors mailing list Kernel-janitors@lists.osdl.org http://lists.osdl.org/mailman/listinfo/kernel-janitors --===============24746517853613037==--