Message ID | 1333951879-3230-1-git-send-email-santoshprasadnayak@gmail.com |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
On Mon, Apr 09, 2012 at 11:41:19AM +0530, santosh nayak wrote: > From: Santosh Nayak <santoshprasadnayak@gmail.com> > > kfree() checks for NULL before freeing the memory. > Remove redundant NULL check. > This is just a clean up and also looks good from performance point of view. I doubt it has any impact on performance. [snip] > static void qlcnic_free_lb_filters_mem(struct qlcnic_adapter *adapter) > { > - if (adapter->fhash.fmax && adapter->fhash.fhead) > - kfree(adapter->fhash.fhead); > - > + kfree(adapter->fhash.fhead); This changes how the code works. That's very sloppy to not notice that. If you did notice it, it should be justified in the changelog. :( > adapter->fhash.fhead = NULL; > adapter->fhash.fmax = 0; > } regards, dan carpenter -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index d30b9b8..75b202d 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c @@ -160,9 +160,7 @@ qlcnic_alloc_sds_rings(struct qlcnic_recv_context *recv_ctx, int count) static void qlcnic_free_sds_rings(struct qlcnic_recv_context *recv_ctx) { - if (recv_ctx->sds_rings != NULL) - kfree(recv_ctx->sds_rings); - + kfree(recv_ctx->sds_rings); recv_ctx->sds_rings = NULL; } @@ -1714,10 +1712,8 @@ static void __devexit qlcnic_remove(struct pci_dev *pdev) qlcnic_detach(adapter); - if (adapter->npars != NULL) - kfree(adapter->npars); - if (adapter->eswitch != NULL) - kfree(adapter->eswitch); + kfree(adapter->npars); + kfree(adapter->eswitch); qlcnic_clr_all_drv_state(adapter, 0); @@ -1887,9 +1883,7 @@ void qlcnic_alloc_lb_filters_mem(struct qlcnic_adapter *adapter) static void qlcnic_free_lb_filters_mem(struct qlcnic_adapter *adapter) { - if (adapter->fhash.fmax && adapter->fhash.fhead) - kfree(adapter->fhash.fhead); - + kfree(adapter->fhash.fhead); adapter->fhash.fhead = NULL; adapter->fhash.fmax = 0; }