hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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>
This commit is contained in:
Domen Puncer 2005-05-05 16:16:13 -07:00 committed by Linus Torvalds
parent 3d67554895
commit fba478b171
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/telephony/ixj.c
View File

@ -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 $ * $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; retval = j->serial;
break; break;
case IXJCTL_VERSION: case IXJCTL_VERSION:
if (copy_to_user(argp, ixj_c_revision, strlen(ixj_c_revision))) {
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; retval = -EFAULT;
}
break; break;
case PHONE_RING_CADENCE: case PHONE_RING_CADENCE:
j->ring_cadence = arg; j->ring_cadence = arg;
@ -7168,9 +7171,6 @@ static int ixj_get_status_proc(char *buf)
int cnt; int cnt;
IXJ *j; IXJ *j;
len = 0; 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, "\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 IXJ struct %Zd bytes", sizeof(IXJ));
len += sprintf(buf + len, "\nsizeof DAA struct %Zd bytes", sizeof(DAA_REGS)); 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) { if ((probe = ixj_probe_pci(&cnt)) < 0) {
return probe; 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); create_proc_read_entry ("ixj", 0, NULL, ixj_read_proc, NULL);
return probe; return probe;
} }

2
drivers/telephony/ixj.h
View File

@ -38,8 +38,6 @@
* TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. * 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 #define IXJ_VERSION 3031
#include <linux/version.h> #include <linux/version.h>

2
include/linux/ixjuser.h
View File

@ -42,8 +42,6 @@
* *
*****************************************************************************/ *****************************************************************************/
static char ixjuser_h_rcsid[] = "$Id: ixjuser.h,v 4.1 2001/08/05 00:17:37 craigs Exp $";
#include <linux/telephony.h> #include <linux/telephony.h>