diff options
author | Joe Perches <joe@perches.com> | 2012-02-20 04:52:38 +0100 |
---|---|---|
committer | Joe Perches <joe@perches.com> | 2012-02-21 18:04:01 +0100 |
commit | 475be4d85a274d0961593db41cf85689db1d583c (patch) | |
tree | b2b8931eb747794730522c3cf1898e46948527b9 /drivers/isdn/sc/packet.c | |
parent | bnx2x: update driver version to 1.72.10-0 (diff) | |
download | linux-475be4d85a274d0961593db41cf85689db1d583c.tar.xz linux-475be4d85a274d0961593db41cf85689db1d583c.zip |
isdn: whitespace coding style cleanup
isdn source code uses a not-current coding style.
Update the coding style used on a per-line basis
so that git diff -w shows only elided blank lines
at EOF.
Done with emacs and some scripts and some typing.
Built x86 allyesconfig.
No detected change in objdump -d or size.
Signed-off-by: Joe Perches <joe@perches.com>
Diffstat (limited to 'drivers/isdn/sc/packet.c')
-rw-r--r-- | drivers/isdn/sc/packet.c | 129 |
1 files changed, 64 insertions, 65 deletions
diff --git a/drivers/isdn/sc/packet.c b/drivers/isdn/sc/packet.c index 5ff6ae868440..2446957085e0 100644 --- a/drivers/isdn/sc/packet.c +++ b/drivers/isdn/sc/packet.c @@ -29,27 +29,27 @@ int sndpkt(int devId, int channel, int ack, struct sk_buff *data) card = get_card_from_id(devId); - if(!IS_VALID_CARD(card)) { + if (!IS_VALID_CARD(card)) { pr_debug("invalid param: %d is not a valid card id\n", card); return -ENODEV; } pr_debug("%s: sndpkt: frst = 0x%lx nxt = %d f = %d n = %d\n", - sc_adapter[card]->devicename, - sc_adapter[card]->channel[channel].first_sendbuf, - sc_adapter[card]->channel[channel].next_sendbuf, - sc_adapter[card]->channel[channel].free_sendbufs, - sc_adapter[card]->channel[channel].num_sendbufs); + sc_adapter[card]->devicename, + sc_adapter[card]->channel[channel].first_sendbuf, + sc_adapter[card]->channel[channel].next_sendbuf, + sc_adapter[card]->channel[channel].free_sendbufs, + sc_adapter[card]->channel[channel].num_sendbufs); - if(!sc_adapter[card]->channel[channel].free_sendbufs) { + if (!sc_adapter[card]->channel[channel].free_sendbufs) { pr_debug("%s: out of TX buffers\n", - sc_adapter[card]->devicename); + sc_adapter[card]->devicename); return -EINVAL; } - if(data->len > BUFFER_SIZE) { + if (data->len > BUFFER_SIZE) { pr_debug("%s: data overflows buffer size (data > buffer)\n", - sc_adapter[card]->devicename); + sc_adapter[card]->devicename); return -EINVAL; } @@ -57,24 +57,24 @@ int sndpkt(int devId, int channel, int ack, struct sk_buff *data) BUFFER_SIZE + sc_adapter[card]->channel[channel].first_sendbuf; ReqLnkWrite.msg_len = data->len; /* sk_buff size */ pr_debug("%s: writing %d bytes to buffer offset 0x%lx\n", - sc_adapter[card]->devicename, - ReqLnkWrite.msg_len, ReqLnkWrite.buff_offset); + sc_adapter[card]->devicename, + ReqLnkWrite.msg_len, ReqLnkWrite.buff_offset); memcpy_toshmem(card, (char *)ReqLnkWrite.buff_offset, data->data, ReqLnkWrite.msg_len); /* * sendmessage */ pr_debug("%s: sndpkt size=%d, buf_offset=0x%lx buf_indx=%d\n", - sc_adapter[card]->devicename, - ReqLnkWrite.msg_len, ReqLnkWrite.buff_offset, - sc_adapter[card]->channel[channel].next_sendbuf); + sc_adapter[card]->devicename, + ReqLnkWrite.msg_len, ReqLnkWrite.buff_offset, + sc_adapter[card]->channel[channel].next_sendbuf); status = sendmessage(card, CEPID, ceReqTypeLnk, ceReqClass1, ceReqLnkWrite, - channel+1, sizeof(LLData), (unsigned int*)&ReqLnkWrite); + channel + 1, sizeof(LLData), (unsigned int *)&ReqLnkWrite); len = data->len; - if(status) { + if (status) { pr_debug("%s: failed to send packet, status = %d\n", - sc_adapter[card]->devicename, status); + sc_adapter[card]->devicename, status); return -1; } else { @@ -83,9 +83,9 @@ int sndpkt(int devId, int channel, int ack, struct sk_buff *data) ++sc_adapter[card]->channel[channel].next_sendbuf == sc_adapter[card]->channel[channel].num_sendbufs ? 0 : sc_adapter[card]->channel[channel].next_sendbuf; - pr_debug("%s: packet sent successfully\n", sc_adapter[card]->devicename); + pr_debug("%s: packet sent successfully\n", sc_adapter[card]->devicename); dev_kfree_skb(data); - indicate_status(card,ISDN_STAT_BSENT,channel, (char *)&len); + indicate_status(card, ISDN_STAT_BSENT, channel, (char *)&len); } return len; } @@ -95,49 +95,49 @@ void rcvpkt(int card, RspMessage *rcvmsg) LLData newll; struct sk_buff *skb; - if(!IS_VALID_CARD(card)) { + if (!IS_VALID_CARD(card)) { pr_debug("invalid param: %d is not a valid card id\n", card); return; } - switch(rcvmsg->rsp_status){ + switch (rcvmsg->rsp_status) { case 0x01: case 0x02: case 0x70: pr_debug("%s: error status code: 0x%x\n", - sc_adapter[card]->devicename, rcvmsg->rsp_status); + sc_adapter[card]->devicename, rcvmsg->rsp_status); return; - case 0x00: - if (!(skb = dev_alloc_skb(rcvmsg->msg_data.response.msg_len))) { + case 0x00: + if (!(skb = dev_alloc_skb(rcvmsg->msg_data.response.msg_len))) { printk(KERN_WARNING "%s: rcvpkt out of memory, dropping packet\n", - sc_adapter[card]->devicename); + sc_adapter[card]->devicename); return; } skb_put(skb, rcvmsg->msg_data.response.msg_len); pr_debug("%s: getting data from offset: 0x%lx\n", - sc_adapter[card]->devicename, - rcvmsg->msg_data.response.buff_offset); + sc_adapter[card]->devicename, + rcvmsg->msg_data.response.buff_offset); memcpy_fromshmem(card, - skb_put(skb, rcvmsg->msg_data.response.msg_len), - (char *)rcvmsg->msg_data.response.buff_offset, - rcvmsg->msg_data.response.msg_len); + skb_put(skb, rcvmsg->msg_data.response.msg_len), + (char *)rcvmsg->msg_data.response.buff_offset, + rcvmsg->msg_data.response.msg_len); sc_adapter[card]->card->rcvcallb_skb(sc_adapter[card]->driverId, - rcvmsg->phy_link_no-1, skb); + rcvmsg->phy_link_no - 1, skb); case 0x03: /* - * Recycle the buffer - */ + * Recycle the buffer + */ pr_debug("%s: buffer size : %d\n", - sc_adapter[card]->devicename, BUFFER_SIZE); + sc_adapter[card]->devicename, BUFFER_SIZE); /* memset_shmem(card, rcvmsg->msg_data.response.buff_offset, 0, BUFFER_SIZE); */ newll.buff_offset = rcvmsg->msg_data.response.buff_offset; newll.msg_len = BUFFER_SIZE; pr_debug("%s: recycled buffer at offset 0x%lx size %d\n", - sc_adapter[card]->devicename, - newll.buff_offset, newll.msg_len); + sc_adapter[card]->devicename, + newll.buff_offset, newll.msg_len); sendmessage(card, CEPID, ceReqTypeLnk, ceReqClass1, ceReqLnkRead, - rcvmsg->phy_link_no, sizeof(LLData), (unsigned int *)&newll); + rcvmsg->phy_link_no, sizeof(LLData), (unsigned int *)&newll); } } @@ -148,7 +148,7 @@ int setup_buffers(int card, int c) unsigned int buffer_size; LLData RcvBuffOffset; - if(!IS_VALID_CARD(card)) { + if (!IS_VALID_CARD(card)) { pr_debug("invalid param: %d is not a valid card id\n", card); return -ENODEV; } @@ -157,49 +157,48 @@ int setup_buffers(int card, int c) * Calculate the buffer offsets (send/recv/send/recv) */ pr_debug("%s: setting up channel buffer space in shared RAM\n", - sc_adapter[card]->devicename); + sc_adapter[card]->devicename); buffer_size = BUFFER_SIZE; nBuffers = ((sc_adapter[card]->ramsize - BUFFER_BASE) / buffer_size) / 2; nBuffers = nBuffers > BUFFERS_MAX ? BUFFERS_MAX : nBuffers; pr_debug("%s: calculating buffer space: %d buffers, %d big\n", - sc_adapter[card]->devicename, - nBuffers, buffer_size); - if(nBuffers < 2) { + sc_adapter[card]->devicename, + nBuffers, buffer_size); + if (nBuffers < 2) { pr_debug("%s: not enough buffer space\n", - sc_adapter[card]->devicename); + sc_adapter[card]->devicename); return -1; } cBase = (nBuffers * buffer_size) * (c - 1); pr_debug("%s: channel buffer offset from shared RAM: 0x%x\n", - sc_adapter[card]->devicename, cBase); - sc_adapter[card]->channel[c-1].first_sendbuf = BUFFER_BASE + cBase; - sc_adapter[card]->channel[c-1].num_sendbufs = nBuffers / 2; - sc_adapter[card]->channel[c-1].free_sendbufs = nBuffers / 2; - sc_adapter[card]->channel[c-1].next_sendbuf = 0; + sc_adapter[card]->devicename, cBase); + sc_adapter[card]->channel[c - 1].first_sendbuf = BUFFER_BASE + cBase; + sc_adapter[card]->channel[c - 1].num_sendbufs = nBuffers / 2; + sc_adapter[card]->channel[c - 1].free_sendbufs = nBuffers / 2; + sc_adapter[card]->channel[c - 1].next_sendbuf = 0; pr_debug("%s: send buffer setup complete: first=0x%lx n=%d f=%d, nxt=%d\n", - sc_adapter[card]->devicename, - sc_adapter[card]->channel[c-1].first_sendbuf, - sc_adapter[card]->channel[c-1].num_sendbufs, - sc_adapter[card]->channel[c-1].free_sendbufs, - sc_adapter[card]->channel[c-1].next_sendbuf); + sc_adapter[card]->devicename, + sc_adapter[card]->channel[c - 1].first_sendbuf, + sc_adapter[card]->channel[c - 1].num_sendbufs, + sc_adapter[card]->channel[c - 1].free_sendbufs, + sc_adapter[card]->channel[c - 1].next_sendbuf); /* * Prep the receive buffers */ pr_debug("%s: adding %d RecvBuffers:\n", - sc_adapter[card]->devicename, nBuffers /2); - for (i = 0 ; i < nBuffers / 2; i++) { - RcvBuffOffset.buff_offset = - ((sc_adapter[card]->channel[c-1].first_sendbuf + - (nBuffers / 2) * buffer_size) + (buffer_size * i)); + sc_adapter[card]->devicename, nBuffers / 2); + for (i = 0; i < nBuffers / 2; i++) { + RcvBuffOffset.buff_offset = + ((sc_adapter[card]->channel[c - 1].first_sendbuf + + (nBuffers / 2) * buffer_size) + (buffer_size * i)); RcvBuffOffset.msg_len = buffer_size; pr_debug("%s: adding RcvBuffer #%d offset=0x%lx sz=%d bufsz:%d\n", - sc_adapter[card]->devicename, - i + 1, RcvBuffOffset.buff_offset, - RcvBuffOffset.msg_len,buffer_size); + sc_adapter[card]->devicename, + i + 1, RcvBuffOffset.buff_offset, + RcvBuffOffset.msg_len, buffer_size); sendmessage(card, CEPID, ceReqTypeLnk, ceReqClass1, ceReqLnkRead, - c, sizeof(LLData), (unsigned int *)&RcvBuffOffset); - } + c, sizeof(LLData), (unsigned int *)&RcvBuffOffset); + } return 0; } - |