hw/block/onenand: Remove dead code block

[Qemu-devel] [PATCH] hw/block/onenand: Remove dead code block

Posted by Thomas Huth 6 years, 6 months ago

The condition of the for-loop makes sure that b is always smaller
than s->blocks, so the "if (b >= s->blocks)" statement is completely
superfluous here.

Buglink: https://bugs.launchpad.net/qemu/+bug/1715007
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 hw/block/onenand.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/hw/block/onenand.c b/hw/block/onenand.c
index 30e40f3..de65c9e 100644
--- a/hw/block/onenand.c
+++ b/hw/block/onenand.c
@@ -520,10 +520,6 @@ static void onenand_command(OneNANDState *s)
         s->intstatus |= ONEN_INT;
 
         for (b = 0; b < s->blocks; b ++) {
-            if (b >= s->blocks) {
-                s->status |= ONEN_ERR_CMD;
-                break;
-            }
             if (s->blockwp[b] == ONEN_LOCK_LOCKTIGHTEN)
                 break;
 
-- 
1.8.3.1

Re: [Qemu-devel] [Qemu-trivial] [PATCH] hw/block/onenand: Remove dead code block

Posted by Laurent Vivier 6 years, 6 months ago

On 03/10/2017 11:57, Thomas Huth wrote:
> The condition of the for-loop makes sure that b is always smaller
> than s->blocks, so the "if (b >= s->blocks)" statement is completely
> superfluous here.
> 
> Buglink: https://bugs.launchpad.net/qemu/+bug/1715007
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  hw/block/onenand.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/hw/block/onenand.c b/hw/block/onenand.c
> index 30e40f3..de65c9e 100644
> --- a/hw/block/onenand.c
> +++ b/hw/block/onenand.c
> @@ -520,10 +520,6 @@ static void onenand_command(OneNANDState *s)
>          s->intstatus |= ONEN_INT;
>  
>          for (b = 0; b < s->blocks; b ++) {
> -            if (b >= s->blocks) {
> -                s->status |= ONEN_ERR_CMD;
> -                break;
> -            }
>              if (s->blockwp[b] == ONEN_LOCK_LOCKTIGHTEN)
>                  break;
>  
> 

Looks like a bad cut'n'paste from case 0x23.

Reviewed-by: Laurent Vivier <lvivier@redhat.com>

Re: [Qemu-devel] [Qemu-trivial] [PATCH] hw/block/onenand: Remove dead code block

Posted by Kevin Wolf 6 years, 6 months ago

Am 03.10.2017 um 12:25 hat Laurent Vivier geschrieben:
> On 03/10/2017 11:57, Thomas Huth wrote:
> > The condition of the for-loop makes sure that b is always smaller
> > than s->blocks, so the "if (b >= s->blocks)" statement is completely
> > superfluous here.
> > 
> > Buglink: https://bugs.launchpad.net/qemu/+bug/1715007
> > Signed-off-by: Thomas Huth <thuth@redhat.com>
> > ---
> >  hw/block/onenand.c | 4 ----
> >  1 file changed, 4 deletions(-)
> > 
> > diff --git a/hw/block/onenand.c b/hw/block/onenand.c
> > index 30e40f3..de65c9e 100644
> > --- a/hw/block/onenand.c
> > +++ b/hw/block/onenand.c
> > @@ -520,10 +520,6 @@ static void onenand_command(OneNANDState *s)
> >          s->intstatus |= ONEN_INT;
> >  
> >          for (b = 0; b < s->blocks; b ++) {
> > -            if (b >= s->blocks) {
> > -                s->status |= ONEN_ERR_CMD;
> > -                break;
> > -            }
> >              if (s->blockwp[b] == ONEN_LOCK_LOCKTIGHTEN)
> >                  break;
> >  
> > 
> 
> Looks like a bad cut'n'paste from case 0x23.
> 
> Reviewed-by: Laurent Vivier <lvivier@redhat.com>

Thanks, applied to the block branch.

Kevin