netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: netdev@vger.kernel.org, virtualization@lists.linux-foundation.org
Subject: [PATCH 11/16] virtio_net: minor cleanup
Date: Sun, 5 Oct 2014 19:07:21 +0300	[thread overview]
Message-ID: <1412525038-15871-12-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1412525038-15871-1-git-send-email-mst@redhat.com>

	goto done;
done:
	return;
is ugly, it was put there to make diff review easier.
replace by open-coded return.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 drivers/net/virtio_net.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index d80fef4..4c8c314 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1403,7 +1403,7 @@ static void virtnet_config_changed_work(struct work_struct *work)
 
 	if (virtio_cread_feature(vi->vdev, VIRTIO_NET_F_STATUS,
 				 struct virtio_net_config, status, &v) < 0)
-		goto done;
+		return;
 
 	if (v & VIRTIO_NET_S_ANNOUNCE) {
 		netdev_notify_peers(vi->dev);
@@ -1414,7 +1414,7 @@ static void virtnet_config_changed_work(struct work_struct *work)
 	v &= VIRTIO_NET_S_LINK_UP;
 
 	if (vi->status == v)
-		goto done;
+		return;
 
 	vi->status = v;
 
@@ -1425,8 +1425,6 @@ static void virtnet_config_changed_work(struct work_struct *work)
 		netif_carrier_off(vi->dev);
 		netif_tx_stop_all_queues(vi->dev);
 	}
-done:
-	return;
 }
 
 static void virtnet_config_changed(struct virtio_device *vdev)
-- 
MST

  parent reply	other threads:[~2014-10-05 16:07 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1412525038-15871-1-git-send-email-mst@redhat.com>
2014-10-05 16:07 ` [PATCH 08/16] virtio_net: drop config_enable Michael S. Tsirkin
2014-10-06 11:50   ` Cornelia Huck
2014-10-06 12:10     ` Michael S. Tsirkin
2014-10-06 19:02   ` David Miller
2014-10-07  6:49     ` Michael S. Tsirkin
2014-10-07 15:36       ` David Miller
2014-10-07 15:42         ` Michael S. Tsirkin
2014-10-05 16:07 ` [PATCH 09/16] virtio-net: drop config_mutex Michael S. Tsirkin
2014-10-06 11:46   ` Sergei Shtylyov
2014-10-06 11:56     ` Michael S. Tsirkin
2014-10-06 12:07       ` Sergei Shtylyov
2014-10-06 12:22         ` Michael S. Tsirkin
2014-10-06 12:31           ` Sergei Shtylyov
2014-10-06 11:56   ` Cornelia Huck
2014-10-06 12:01     ` Michael S. Tsirkin
2014-10-05 16:07 ` Michael S. Tsirkin [this message]
2014-10-06 12:06   ` [PATCH 11/16] virtio_net: minor cleanup Cornelia Huck
2014-10-05 16:07 ` [PATCH 12/16] virtio_net: enable VQs early Michael S. Tsirkin
2014-10-05 16:07 ` [PATCH 15/16] 9p/trans_virtio: " Michael S. Tsirkin
2014-10-05 16:07 ` [PATCH 16/16] virtio_net: fix use after free on allocation failure Michael S. Tsirkin
2014-10-06 14:17   ` Cornelia Huck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1412525038-15871-12-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=virtualization@lists.linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).