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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
isdn
/
hisax
/
w6692.c
diff --git
a/drivers/isdn/hisax/w6692.c
b/drivers/isdn/hisax/w6692.c
index
36cfc4a
..
0352ee5
100644
(file)
--- a/
drivers/isdn/hisax/w6692.c
+++ b/
drivers/isdn/hisax/w6692.c
@@
-41,7
+41,7
@@
static const PCI_ENTRY id_list[] =
extern const char *CardType[];
extern const char *CardType[];
-const char *w6692_revision = "$Revision: 1.18.2.4 $";
+
static
const char *w6692_revision = "$Revision: 1.18.2.4 $";
#define DBUSY_TIMER_VALUE 80
#define DBUSY_TIMER_VALUE 80
@@
-49,7
+49,7
@@
static char *W6692Ver[] __initdata =
{"W6692 V00", "W6692 V01", "W6692 V10",
"W6692 V11"};
{"W6692 V00", "W6692 V01", "W6692 V10",
"W6692 V11"};
-static void
+static void
__init
W6692Version(struct IsdnCardState *cs, char *s)
{
int val;
W6692Version(struct IsdnCardState *cs, char *s)
{
int val;
@@
-819,14
+819,10
@@
close_w6692state(struct BCState *bcs)
{
W6692Bmode(bcs, 0, bcs->channel);
if (test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) {
{
W6692Bmode(bcs, 0, bcs->channel);
if (test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) {
- if (bcs->hw.w6692.rcvbuf) {
- kfree(bcs->hw.w6692.rcvbuf);
- bcs->hw.w6692.rcvbuf = NULL;
- }
- if (bcs->blog) {
- kfree(bcs->blog);
- bcs->blog = NULL;
- }
+ kfree(bcs->hw.w6692.rcvbuf);
+ bcs->hw.w6692.rcvbuf = NULL;
+ kfree(bcs->blog);
+ bcs->blog = NULL;
skb_queue_purge(&bcs->rqueue);
skb_queue_purge(&bcs->squeue);
if (bcs->tx_skb) {
skb_queue_purge(&bcs->rqueue);
skb_queue_purge(&bcs->squeue);
if (bcs->tx_skb) {
@@
-880,7
+876,7
@@
setstack_w6692(struct PStack *st, struct BCState *bcs)
return (0);
}
return (0);
}
-void resetW6692(struct IsdnCardState *cs)
+
static
void resetW6692(struct IsdnCardState *cs)
{
cs->writeW6692(cs, W_D_CTL, W_D_CTL_SRST);
mdelay(10);
{
cs->writeW6692(cs, W_D_CTL, W_D_CTL_SRST);
mdelay(10);
@@
-902,7
+898,7
@@
void resetW6692(struct IsdnCardState *cs)
}
}
}
}
-void __init initW6692(struct IsdnCardState *cs, int part)
+
static
void __init initW6692(struct IsdnCardState *cs, int part)
{
if (part & 1) {
cs->setstack_d = setstack_W6692;
{
if (part & 1) {
cs->setstack_d = setstack_W6692;