Author: sephe
Date: Mon Apr 11 06:59:13 2016
New Revision: 297811
URL: https://svnweb.freebsd.org/changeset/base/297811

Log:
  hyperv/hn: Remove unnecessary NULL checks
  
  Submitted by: Jun Su <junsu microsoft com>
  Reviewed by:  sephe
  MFC after:    1 week
  Sponsored by: Microsoft OSTC
  Differential Revision:        https://reviews.freebsd.org/D5905

Modified:
  head/sys/dev/hyperv/netvsc/hv_net_vsc.c
  head/sys/dev/hyperv/netvsc/hv_rndis_filter.c

Modified: head/sys/dev/hyperv/netvsc/hv_net_vsc.c
==============================================================================
--- head/sys/dev/hyperv/netvsc/hv_net_vsc.c     Mon Apr 11 06:37:50 2016        
(r297810)
+++ head/sys/dev/hyperv/netvsc/hv_net_vsc.c     Mon Apr 11 06:59:13 2016        
(r297811)
@@ -742,10 +742,8 @@ cleanup:
         * Free the packet buffers on the netvsc device packet queue.
         * Release other resources.
         */
-       if (net_dev) {
-               sema_destroy(&net_dev->channel_init_sema);
-               free(net_dev, M_NETVSC);
-       }
+       sema_destroy(&net_dev->channel_init_sema);
+       free(net_dev, M_NETVSC);
 
        return (NULL);
 }

Modified: head/sys/dev/hyperv/netvsc/hv_rndis_filter.c
==============================================================================
--- head/sys/dev/hyperv/netvsc/hv_rndis_filter.c        Mon Apr 11 06:37:50 
2016        (r297810)
+++ head/sys/dev/hyperv/netvsc/hv_rndis_filter.c        Mon Apr 11 06:59:13 
2016        (r297811)
@@ -405,8 +405,7 @@ hv_rf_send_offload_request(struct hv_dev
        }
 
 cleanup:
-       if (request)
-               hv_put_rndis_request(rndis_dev, request);
+       hv_put_rndis_request(rndis_dev, request);
 
        return (ret);
 }
@@ -907,10 +906,8 @@ hv_rf_halt_device(rndis_device *device)
        }
 
        device->state = RNDIS_DEV_UNINITIALIZED;
-       
-       if (request != NULL) {
-               hv_put_rndis_request(device, request);
-       }
+
+       hv_put_rndis_request(device, request);
 
        return (0);
 }
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to