net/rocker: Cleanup the useless return value check
authorMao Zhongyi <maozy.fnst@cn.fujitsu.com>
Wed, 24 May 2017 02:57:18 +0000 (10:57 +0800)
committerJason Wang <jasowang@redhat.com>
Wed, 7 Jun 2017 02:58:31 +0000 (10:58 +0800)
None of pci_dma_read()'s callers check the return value except
rocker. There is no need to check it because it always return
0. So the check work is useless. Remove it entirely.

Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
hw/net/rocker/rocker.c
hw/net/rocker/rocker_desc.c

index 6e70fddee36b180906cbb2265d830c1543d0f3bf..4f0f6d71e54fafba1fc9bc14817e0584bfd69423 100644 (file)
@@ -244,11 +244,9 @@ static int tx_consume(Rocker *r, DescInfo *info)
             goto err_no_mem;
         }
 
-        if (pci_dma_read(dev, frag_addr, iov[iovcnt].iov_base,
-                     iov[iovcnt].iov_len)) {
-            err = -ROCKER_ENXIO;
-            goto err_bad_io;
-        }
+        pci_dma_read(dev, frag_addr, iov[iovcnt].iov_base,
+                     iov[iovcnt].iov_len);
+
         iovcnt++;
     }
 
@@ -261,7 +259,6 @@ static int tx_consume(Rocker *r, DescInfo *info)
     err = fp_port_eg(r->fp_port[port], iov, iovcnt);
 
 err_too_many_frags:
-err_bad_io:
 err_no_mem:
 err_bad_attr:
     for (i = 0; i < ROCKER_TX_FRAGS_MAX; i++) {
index ac02797b7ee27d197c7715e0e43fa5f3083a757b..6184c40f7253a734ee14cfe23599977985ef66b0 100644 (file)
@@ -69,9 +69,7 @@ char *desc_get_buf(DescInfo *info, bool read_only)
         return NULL;
     }
 
-    if (pci_dma_read(dev, le64_to_cpu(info->desc.buf_addr), info->buf, size)) {
-        return NULL;
-    }
+    pci_dma_read(dev, le64_to_cpu(info->desc.buf_addr), info->buf, size);
 
     return info->buf;
 }