The following commit has been merged in the master branch: commit f81c62242045fb7be0a124d8c2540af96d842fad Author: Joe Perches joe@perches.com Date: Fri Jun 3 11:51:19 2011 +0000
net: Remove unnecessary semicolons
Semicolons are not necessary after switch/while/for/if braces so remove them.
Signed-off-by: Joe Perches joe@perches.com Signed-off-by: David S. Miller davem@davemloft.net
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index a3fbfb5..5719087 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -568,7 +568,7 @@ static int hard_if_event(struct notifier_block *this, break; default: break; - }; + }
hardif_put: hardif_free_ref(hard_iface); diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 815269b..e937adab 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -1519,7 +1519,7 @@ int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count)
data += (count - rem); count = rem; - }; + }
return rem; } @@ -1554,7 +1554,7 @@ int hci_recv_stream_fragment(struct hci_dev *hdev, void *data, int count)
data += (count - rem); count = rem; - }; + }
return rem; } diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c index cd6e4aa..727e506 100644 --- a/net/sunrpc/auth.c +++ b/net/sunrpc/auth.c @@ -626,7 +626,7 @@ rpcauth_refreshcred(struct rpc_task *task) if (err < 0) goto out; cred = task->tk_rqstp->rq_cred; - }; + } dprintk("RPC: %5u refreshing %s cred %p\n", task->tk_pid, cred->cr_auth->au_ops->au_name, cred);
linux-merge@lists.open-mesh.org