Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 38140
b: refs/heads/master
c: 20f4353
h: refs/heads/master
v: v3
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Oct 3, 2006
1 parent 7289d19 commit 18ea9ae
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 42d3fb5a8771b840e0bd6dbcd0c734883dd90b6f
refs/heads/master: 20f43535694bb19e1bb45917b73b7e5cd5d74818
22 changes: 7 additions & 15 deletions trunk/drivers/isdn/sc/command.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,6 @@ int command(isdn_ctrl *cmd)
return -ENODEV;
}

pr_debug("%s: Received %s command from Link Layer\n",
sc_adapter[card]->devicename, commands[cmd->command]);

/*
* Dispatch the command
*/
Expand All @@ -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))) {
pr_debug("%s: Failed to verify user space 0x%x\n",
pr_debug("%s: Failed to verify user space 0x%lx\n",
sc_adapter[card]->devicename, cmdptr);
return -EFAULT;
}
Expand Down Expand Up @@ -195,7 +192,7 @@ static int dial(int card, unsigned long channel, setup_parm setup)
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;
Expand All @@ -217,7 +214,7 @@ static int answer(int card, unsigned long channel)
}

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;
}
Expand All @@ -240,7 +237,7 @@ static int hangup(int card, unsigned long channel)
(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;
}
Expand All @@ -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;
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
Expand Down Expand Up @@ -293,8 +287,6 @@ static int setl3(int card, unsigned long channel)
}

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;
}

Expand All @@ -311,7 +303,7 @@ static int acceptb(int card, unsigned long channel)
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;
Expand All @@ -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;
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;
}
Expand All @@ -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;
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;
Expand Down

0 comments on commit 18ea9ae

Please sign in to comment.