[PATCH 08/16] ncr710: simplify ncr710_clear_pending_irq

Paolo Bonzini posted 16 patches 5 days, 16 hours ago
Maintainers: Paolo Bonzini <pbonzini@redhat.com>, Fam Zheng <fam@euphon.net>, Richard Henderson <richard.henderson@linaro.org>, Helge Deller <deller@gmx.de>
[PATCH 08/16] ncr710: simplify ncr710_clear_pending_irq
Posted by Paolo Bonzini 5 days, 16 hours ago
The same checks are done in ncr710_request_free.  If req->hba_private is
anything, it is the NCR710Request that points to req, so it would be
cleared.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/scsi/ncr53c710.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/hw/scsi/ncr53c710.c b/hw/scsi/ncr53c710.c
index 7113ce2d8a9..9832d833b37 100644
--- a/hw/scsi/ncr53c710.c
+++ b/hw/scsi/ncr53c710.c
@@ -316,11 +316,7 @@ static inline int ncr710_irq_on_rsl(NCR710State *s)
 static void ncr710_clear_pending_irq(NCR710State *s)
 {
     if (s->current) {
-        if (s->current->req) {
-            s->current->req->hba_private = NULL;
-        }
         ncr710_request_free(s, s->current);
-        s->current = NULL;
     }
 }
 
@@ -739,9 +735,6 @@ static void ncr710_add_msg_byte(NCR710State *s, uint8_t data)
 
 static void ncr710_request_free(NCR710State *s, NCR710Request *p)
 {
-    if (!p) {
-        return;
-    }
     if (p->req && p->req->hba_private == p) {
         p->req->hba_private = NULL;
     }
-- 
2.53.0