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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
isdn
/
sc
/
command.c
diff --git
a/drivers/isdn/sc/command.c
b/drivers/isdn/sc/command.c
index
b4b2433
..
04b8a58
100644
(file)
--- a/
drivers/isdn/sc/command.c
+++ b/
drivers/isdn/sc/command.c
@@
-103,9
+103,6
@@
int command(isdn_ctrl *cmd)
return -ENODEV;
}
return -ENODEV;
}
- pr_debug("%s: Received %s command from Link Layer\n",
- sc_adapter[card]->devicename, commands[cmd->command]);
-
/*
* Dispatch the command
*/
/*
* Dispatch the command
*/
@@
-118,7
+115,7
@@
int command(isdn_ctrl *cmd)
memcpy(&cmdptr, cmd->parm.num, sizeof(unsigned long));
if (copy_from_user(&ioc, (scs_ioctl __user *)cmdptr,
sizeof(scs_ioctl))) {
memcpy(&cmdptr, cmd->parm.num, sizeof(unsigned long));
if (copy_from_user(&ioc, (scs_ioctl __user *)cmdptr,
sizeof(scs_ioctl))) {
- pr_debug("%s: Failed to verify user space 0x%x\n",
+ pr_debug("%s: Failed to verify user space 0x%
l
x\n",
sc_adapter[card]->devicename, cmdptr);
return -EFAULT;
}
sc_adapter[card]->devicename, cmdptr);
return -EFAULT;
}
@@
-195,7
+192,7
@@
static int dial(int card, unsigned long channel, setup_parm setup)
strlen(Phone),
(unsigned int *) Phone);
strlen(Phone),
(unsigned int *) Phone);
- pr_debug("%s: Dialing %s on channel %
d
\n",
+ pr_debug("%s: Dialing %s on channel %
lu
\n",
sc_adapter[card]->devicename, Phone, channel+1);
return status;
sc_adapter[card]->devicename, Phone, channel+1);
return status;
@@
-217,7
+214,7
@@
static int answer(int card, unsigned long channel)
}
indicate_status(card, ISDN_STAT_BCONN,channel,NULL);
}
indicate_status(card, ISDN_STAT_BCONN,channel,NULL);
- pr_debug("%s: Answered incoming call on channel %
s
\n",
+ pr_debug("%s: Answered incoming call on channel %
lu
\n",
sc_adapter[card]->devicename, channel+1);
return 0;
}
sc_adapter[card]->devicename, channel+1);
return 0;
}
@@
-240,7
+237,7
@@
static int hangup(int card, unsigned long channel)
(unsigned char) channel+1,
0,
NULL);
(unsigned char) channel+1,
0,
NULL);
- pr_debug("%s: Sent HANGUP message to channel %
d
\n",
+ pr_debug("%s: Sent HANGUP message to channel %
lu
\n",
sc_adapter[card]->devicename, channel+1);
return status;
}
sc_adapter[card]->devicename, channel+1);
return status;
}
@@
-260,9
+257,6
@@
static int setl2(int card, unsigned long arg)
protocol = arg >> 8;
channel = arg & 0xff;
sc_adapter[card]->channel[channel].l2_proto = protocol;
protocol = arg >> 8;
channel = arg & 0xff;
sc_adapter[card]->channel[channel].l2_proto = protocol;
- pr_debug("%s: Level 2 protocol for channel %d set to %s from %d\n",
- sc_adapter[card]->devicename, channel+1,
- l2protos[sc_adapter[card]->channel[channel].l2_proto],protocol);
/*
* check that the adapter is also set to the correct protocol
/*
* check that the adapter is also set to the correct protocol
@@
-293,8
+287,6
@@
static int setl3(int card, unsigned long channel)
}
sc_adapter[card]->channel[channel].l3_proto = protocol;
}
sc_adapter[card]->channel[channel].l3_proto = protocol;
- pr_debug("%s: Level 3 protocol for channel %d set to %s\n",
- sc_adapter[card]->devicename, channel+1, l3protos[protocol]);
return 0;
}
return 0;
}
@@
-311,7
+303,7
@@
static int acceptb(int card, unsigned long channel)
return -ENOBUFS;
}
return -ENOBUFS;
}
- pr_debug("%s: B-Channel connection accepted on channel %
d
\n",
+ pr_debug("%s: B-Channel connection accepted on channel %
lu
\n",
sc_adapter[card]->devicename, channel+1);
indicate_status(card, ISDN_STAT_BCONN, channel, NULL);
return 0;
sc_adapter[card]->devicename, channel+1);
indicate_status(card, ISDN_STAT_BCONN, channel, NULL);
return 0;
@@
-326,7
+318,7
@@
static int clreaz(int card, unsigned long arg)
strcpy(sc_adapter[card]->channel[arg].eazlist, "");
sc_adapter[card]->channel[arg].eazclear = 1;
strcpy(sc_adapter[card]->channel[arg].eazlist, "");
sc_adapter[card]->channel[arg].eazclear = 1;
- pr_debug("%s: EAZ List cleared for channel %
d
\n",
+ pr_debug("%s: EAZ List cleared for channel %
lu
\n",
sc_adapter[card]->devicename, arg+1);
return 0;
}
sc_adapter[card]->devicename, arg+1);
return 0;
}
@@
-340,7
+332,7
@@
static int seteaz(int card, unsigned long arg, char *num)
strcpy(sc_adapter[card]->channel[arg].eazlist, num);
sc_adapter[card]->channel[arg].eazclear = 0;
strcpy(sc_adapter[card]->channel[arg].eazlist, num);
sc_adapter[card]->channel[arg].eazclear = 0;
- pr_debug("%s: EAZ list for channel %
d
set to: %s\n",
+ pr_debug("%s: EAZ list for channel %
lu
set to: %s\n",
sc_adapter[card]->devicename, arg+1,
sc_adapter[card]->channel[arg].eazlist);
return 0;
sc_adapter[card]->devicename, arg+1,
sc_adapter[card]->channel[arg].eazlist);
return 0;