Skip to content

Commit

Permalink
Coding style correction of some wan drivers
Browse files Browse the repository at this point in the history
Added a space separating some if/switch/while keywords from the following
parenthesis to conform to the CodingStyle.

Signed-off-by: Rudy Matela <rudy.matela@gmail.com>
Acked-by: Krzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
Rudy Matela authored and Jiri Kosina committed Feb 4, 2010
1 parent 7e2a108 commit 640462c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions drivers/net/wan/cosa.c
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,7 @@ static ssize_t cosa_read(struct file *file,
cosa_enable_rx(chan);
spin_lock_irqsave(&cosa->lock, flags);
add_wait_queue(&chan->rxwaitq, &wait);
while(!chan->rx_status) {
while (!chan->rx_status) {
current->state = TASK_INTERRUPTIBLE;
spin_unlock_irqrestore(&cosa->lock, flags);
schedule();
Expand Down Expand Up @@ -896,7 +896,7 @@ static ssize_t cosa_write(struct file *file,

spin_lock_irqsave(&cosa->lock, flags);
add_wait_queue(&chan->txwaitq, &wait);
while(!chan->tx_status) {
while (!chan->tx_status) {
current->state = TASK_INTERRUPTIBLE;
spin_unlock_irqrestore(&cosa->lock, flags);
schedule();
Expand Down Expand Up @@ -1153,7 +1153,7 @@ static int cosa_ioctl_common(struct cosa_data *cosa,
struct channel_data *channel, unsigned int cmd, unsigned long arg)
{
void __user *argp = (void __user *)arg;
switch(cmd) {
switch (cmd) {
case COSAIORSET: /* Reset the device */
if (!capable(CAP_NET_ADMIN))
return -EACCES;
Expand Down Expand Up @@ -1704,7 +1704,7 @@ static inline void tx_interrupt(struct cosa_data *cosa, int status)
spin_unlock_irqrestore(&cosa->lock, flags);
return;
}
while(1) {
while (1) {
cosa->txchan++;
i++;
if (cosa->txchan >= cosa->nchannels)
Expand Down Expand Up @@ -2010,7 +2010,7 @@ static irqreturn_t cosa_interrupt(int irq, void *cosa_)
static void debug_status_in(struct cosa_data *cosa, int status)
{
char *s;
switch(status & SR_CMD_FROM_SRP_MASK) {
switch (status & SR_CMD_FROM_SRP_MASK) {
case SR_UP_REQUEST:
s = "RX_REQ";
break;
Expand Down
8 changes: 4 additions & 4 deletions drivers/net/wan/hdlc_cisco.c
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ static __be16 cisco_type_trans(struct sk_buff *skb, struct net_device *dev)
data->address != CISCO_UNICAST)
return cpu_to_be16(ETH_P_HDLC);

switch(data->protocol) {
switch (data->protocol) {
case cpu_to_be16(ETH_P_IP):
case cpu_to_be16(ETH_P_IPX):
case cpu_to_be16(ETH_P_IPV6):
Expand Down Expand Up @@ -190,7 +190,7 @@ static int cisco_rx(struct sk_buff *skb)
cisco_data = (struct cisco_packet*)(skb->data + sizeof
(struct hdlc_header));

switch(ntohl (cisco_data->type)) {
switch (ntohl (cisco_data->type)) {
case CISCO_ADDR_REQ: /* Stolen from syncppp.c :-) */
in_dev = dev->ip_ptr;
addr = 0;
Expand Down Expand Up @@ -245,8 +245,8 @@ static int cisco_rx(struct sk_buff *skb)

dev_kfree_skb_any(skb);
return NET_RX_SUCCESS;
} /* switch(keepalive type) */
} /* switch(protocol) */
} /* switch (keepalive type) */
} /* switch (protocol) */

printk(KERN_INFO "%s: Unsupported protocol %x\n", dev->name,
ntohs(data->protocol));
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/wan/hdlc_x25.c
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,10 @@ static int x25_ioctl(struct net_device *dev, struct ifreq *ifr)
return 0; /* return protocol only, no settable parameters */

case IF_PROTO_X25:
if(!capable(CAP_NET_ADMIN))
if (!capable(CAP_NET_ADMIN))
return -EPERM;

if(dev->flags & IFF_UP)
if (dev->flags & IFF_UP)
return -EBUSY;

result=hdlc->attach(dev, ENCODING_NRZ,PARITY_CRC16_PR1_CCITT);
Expand Down

0 comments on commit 640462c

Please sign in to comment.