From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-ppc@nongnu.org,
"Dmitry Fleytman" <dmitry.fleytman@gmail.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Andrew Jeffery" <andrew@aj.id.au>,
"Jason Wang" <jasowang@redhat.com>,
"Alistair Francis" <alistair@alistair23.me>,
"Joel Stanley" <joel@jms.id.au>,
"Beniamino Galvani" <b.galvani@gmail.com>,
"Max Filippov" <jcmvbkbc@gmail.com>,
qemu-arm@nongnu.org, "Peter Chubb" <peter.chubb@nicta.com.au>,
"Cédric Le Goater" <clg@kaod.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Richard Henderson" <rth@twiddle.net>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"David Gibson" <david@gibson.dropbear.id.au>
Subject: [PATCH 3/6] hw/net/rtl8139: Simplify if/else statement
Date: Thu, 5 Mar 2020 18:56:47 +0100 [thread overview]
Message-ID: <20200305175651.4563-4-philmd@redhat.com> (raw)
In-Reply-To: <20200305175651.4563-1-philmd@redhat.com>
Rewrite:
if (E) {
return A;
} else {
return B;
}
/* EOF */
}
as:
if (E) {
return A;
}
return B;
}
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/net/rtl8139.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
index ae4739bc09..ef3211537f 100644
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -808,11 +808,11 @@ static int rtl8139_can_receive(NetClientState *nc)
/* ??? Flow control not implemented in c+ mode.
This is a hack to work around slirp deficiencies anyway. */
return 1;
- } else {
- avail = MOD2(s->RxBufferSize + s->RxBufPtr - s->RxBufAddr,
- s->RxBufferSize);
- return (avail == 0 || avail >= 1514 || (s->IntrMask & RxOverflow));
}
+
+ avail = MOD2(s->RxBufferSize + s->RxBufPtr - s->RxBufAddr,
+ s->RxBufferSize);
+ return avail == 0 || avail >= 1514 || (s->IntrMask & RxOverflow);
}
static ssize_t rtl8139_do_receive(NetClientState *nc, const uint8_t *buf, size_t size_, int do_interrupt)
--
2.21.1
WARNING: multiple messages have this Message-ID (diff)
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-ppc@nongnu.org,
"Dmitry Fleytman" <dmitry.fleytman@gmail.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Andrew Jeffery" <andrew@aj.id.au>,
"Jason Wang" <jasowang@redhat.com>,
"Alistair Francis" <alistair@alistair23.me>,
"Joel Stanley" <joel@jms.id.au>,
"Beniamino Galvani" <b.galvani@gmail.com>,
"Max Filippov" <jcmvbkbc@gmail.com>,
qemu-arm@nongnu.org, "Peter Chubb" <peter.chubb@nicta.com.au>,
"Cédric Le Goater" <clg@kaod.org>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Richard Henderson" <rth@twiddle.net>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"David Gibson" <david@gibson.dropbear.id.au>
Subject: [PATCH 3/6] hw/net/rtl8139: Simplify if/else statement
Date: Thu, 5 Mar 2020 18:56:47 +0100 [thread overview]
Message-ID: <20200305175651.4563-4-philmd@redhat.com> (raw)
In-Reply-To: <20200305175651.4563-1-philmd@redhat.com>
Rewrite:
if (E) {
return A;
} else {
return B;
}
/* EOF */
}
as:
if (E) {
return A;
}
return B;
}
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/net/rtl8139.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
index ae4739bc09..ef3211537f 100644
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -808,11 +808,11 @@ static int rtl8139_can_receive(NetClientState *nc)
/* ??? Flow control not implemented in c+ mode.
This is a hack to work around slirp deficiencies anyway. */
return 1;
- } else {
- avail = MOD2(s->RxBufferSize + s->RxBufPtr - s->RxBufAddr,
- s->RxBufferSize);
- return (avail == 0 || avail >= 1514 || (s->IntrMask & RxOverflow));
}
+
+ avail = MOD2(s->RxBufferSize + s->RxBufPtr - s->RxBufAddr,
+ s->RxBufferSize);
+ return avail == 0 || avail >= 1514 || (s->IntrMask & RxOverflow);
}
static ssize_t rtl8139_do_receive(NetClientState *nc, const uint8_t *buf, size_t size_, int do_interrupt)
--
2.21.1
next prev parent reply other threads:[~2020-03-05 17:59 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-05 17:56 [PATCH 0/6] hw/net: Make Net/CanBus can_receive() handlers return a boolean Philippe Mathieu-Daudé
2020-03-05 17:56 ` Philippe Mathieu-Daudé
2020-03-05 17:56 ` [PATCH 1/6] hw/net/e1000e_core: Let e1000e_can_receive() " Philippe Mathieu-Daudé
2020-03-05 17:56 ` Philippe Mathieu-Daudé
2020-03-05 18:46 ` Alistair Francis
2020-03-05 18:46 ` Alistair Francis
2020-03-06 8:37 ` Paolo Bonzini
2020-03-06 8:37 ` Paolo Bonzini
2020-03-06 15:25 ` Cédric Le Goater
2020-03-05 17:56 ` [PATCH 2/6] hw/net/smc91c111: Let smc91c111_can_receive() " Philippe Mathieu-Daudé
2020-03-05 17:56 ` Philippe Mathieu-Daudé
2020-03-05 18:46 ` Alistair Francis
2020-03-06 15:26 ` Cédric Le Goater
2020-03-06 15:26 ` Cédric Le Goater
2020-03-05 17:56 ` Philippe Mathieu-Daudé [this message]
2020-03-05 17:56 ` [PATCH 3/6] hw/net/rtl8139: Simplify if/else statement Philippe Mathieu-Daudé
2020-03-05 18:49 ` Alistair Francis
2020-03-05 18:49 ` Alistair Francis
2020-03-06 15:26 ` Cédric Le Goater
2020-03-06 15:26 ` Cédric Le Goater
2020-03-05 17:56 ` [PATCH 4/6] hw/net/rtl8139: Update coding style to make checkpatch.pl happy Philippe Mathieu-Daudé
2020-03-05 17:56 ` Philippe Mathieu-Daudé
2020-03-05 18:51 ` Alistair Francis
2020-03-05 18:51 ` Alistair Francis
2020-03-06 15:26 ` Cédric Le Goater
2020-03-06 15:26 ` Cédric Le Goater
2020-03-05 17:56 ` [PATCH 5/6] hw/net: Make NetCanReceive() return a boolean Philippe Mathieu-Daudé
2020-03-05 22:54 ` David Gibson
2020-03-05 22:54 ` David Gibson
2020-03-05 23:10 ` Alistair Francis
2020-03-06 15:09 ` Cédric Le Goater
2020-03-06 15:09 ` Cédric Le Goater
2020-03-05 17:56 ` [PATCH 6/6] hw/net/can: Make CanBusClientInfo::can_receive() " Philippe Mathieu-Daudé
2020-03-05 23:10 ` Alistair Francis
2020-03-06 15:27 ` Cédric Le Goater
2020-03-17 10:47 ` [PATCH 0/6] hw/net: Make Net/CanBus can_receive() handlers " Philippe Mathieu-Daudé
2020-03-17 10:47 ` Philippe Mathieu-Daudé
2020-03-18 2:31 ` Jason Wang
2020-03-18 2:31 ` Jason Wang
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=20200305175651.4563-4-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=alistair@alistair23.me \
--cc=andrew@aj.id.au \
--cc=b.galvani@gmail.com \
--cc=clg@kaod.org \
--cc=david@gibson.dropbear.id.au \
--cc=dmitry.fleytman@gmail.com \
--cc=jasowang@redhat.com \
--cc=jcmvbkbc@gmail.com \
--cc=joel@jms.id.au \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.chubb@nicta.com.au \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=rth@twiddle.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.