git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
isdn
/
hardware
/
eicon
/
mntfunc.c
diff --git
a/drivers/isdn/hardware/eicon/mntfunc.c
b/drivers/isdn/hardware/eicon/mntfunc.c
index
c942299
..
00ef979
100644
(file)
--- a/
drivers/isdn/hardware/eicon/mntfunc.c
+++ b/
drivers/isdn/hardware/eicon/mntfunc.c
@@
-34,10
+34,10
@@
static DESCRIPTOR MaintDescriptor =
extern void *diva_os_malloc_tbuffer(unsigned long flags,
unsigned long size);
extern void diva_os_free_tbuffer(unsigned long flags, void *ptr);
extern void *diva_os_malloc_tbuffer(unsigned long flags,
unsigned long size);
extern void diva_os_free_tbuffer(unsigned long flags, void *ptr);
-extern int diva_os_copy_to_user(void *os_handle, void
__user
*dst,
+extern int diva_os_copy_to_user(void *os_handle, void *dst,
const void *src, int length);
extern int diva_os_copy_from_user(void *os_handle, void *dst,
const void *src, int length);
extern int diva_os_copy_from_user(void *os_handle, void *dst,
- const void
__user
*src, int length);
+ const void *src, int length);
static void no_printf(unsigned char *x, ...)
{
static void no_printf(unsigned char *x, ...)
{
@@
-102,7
+102,7
@@
static int DIVA_INIT_FUNCTION connect_didd(void)
req.didd_notify.e.Rc =
IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY;
req.didd_notify.info.callback = (void *)didd_callback;
req.didd_notify.e.Rc =
IDI_SYNC_REQ_DIDD_REGISTER_ADAPTER_NOTIFY;
req.didd_notify.info.callback = (void *)didd_callback;
- req.didd_notify.info.context =
NULL
;
+ req.didd_notify.info.context =
0
;
DAdapter.request((ENTITY *) & req);
if (req.didd_notify.e.Rc != 0xff)
return (0);
DAdapter.request((ENTITY *) & req);
if (req.didd_notify.e.Rc != 0xff)
return (0);
@@
-148,7
+148,7
@@
static void DIVA_EXIT_FUNCTION disconnect_didd(void)
/*
* read/write maint
*/
/*
* read/write maint
*/
-int maint_read_write(void
__user
*buf, int count)
+int maint_read_write(void *buf, int count)
{
byte data[128];
dword cmd, id, mask;
{
byte data[128];
dword cmd, id, mask;
@@
-228,7
+228,7
@@
int maint_read_write(void __user *buf, int count)
diva_os_spin_lock_magic_t old_irql;
word size;
diva_dbg_entry_head_t *pmsg;
diva_os_spin_lock_magic_t old_irql;
word size;
diva_dbg_entry_head_t *pmsg;
- byte *pbuf =
NULL
;
+ byte *pbuf =
0
;
int written = 0;
if (mask < 4096) {
int written = 0;
if (mask < 4096) {