diff mbox

e1000: Removing unnecessary if statement

Message ID 1464503845-29545-1-git-send-email-sameeh@daynix.com
State New
Headers show

Commit Message

Sameeh Jubran May 29, 2016, 6:37 a.m. UTC 
Since mit_delay can never be 0 this if statement is
superfluous.

Signed-off-by: Sameeh Jubran <sameeh@daynix.com>
---
 hw/net/e1000.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Comments

Stefan Weil May 29, 2016, 6:44 a.m. UTC | #1 
Am 29.05.2016 um 08:37 schrieb Sameeh Jubran:
> Since mit_delay can never be 0 this if statement is
> superfluous.
>
> Signed-off-by: Sameeh Jubran <sameeh@daynix.com>
> ---
>  hw/net/e1000.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/hw/net/e1000.c b/hw/net/e1000.c
> index 8e79b55..eb903a9 100644
> --- a/hw/net/e1000.c
> +++ b/hw/net/e1000.c
> @@ -365,11 +365,9 @@ set_interrupt_cause(E1000State *s, int index, uint32_t val)
>               */
>              mit_delay = (mit_delay < 500) ? 500 : mit_delay;
>  
> -            if (mit_delay) {
> -                s->mit_timer_on = 1;
> -                timer_mod(s->mit_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) +
> -                          mit_delay * 256);
> -            }
> +            s->mit_timer_on = 1;
> +            timer_mod(s->mit_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) +
> +                      mit_delay * 256);
>              s->mit_ide = 0;
>          }
>      }

Reviewed-by: Stefan Weil <sw@weilnetz.de>

CC'ing qemu-trivial
Michael Tokarev May 29, 2016, 8:42 a.m. UTC | #2 
Applied to -trivial, thanks!

/mjt
diff mbox

Patch

diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index 8e79b55..eb903a9 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -365,11 +365,9 @@  set_interrupt_cause(E1000State *s, int index, uint32_t val)
              */
             mit_delay = (mit_delay < 500) ? 500 : mit_delay;
 
-            if (mit_delay) {
-                s->mit_timer_on = 1;
-                timer_mod(s->mit_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) +
-                          mit_delay * 256);
-            }
+            s->mit_timer_on = 1;
+            timer_mod(s->mit_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) +
+                      mit_delay * 256);
             s->mit_ide = 0;
         }
     }