Message ID | 20181102141427.17109-1-cgxu519@gmx.com (mailing list archive) |
---|---|
State | Mainlined |
Commit | 1d3e773ae0a65a1b6b5d2aa21250c96f3e975aba |
Headers | show |
Series | usb: host: remove unnecessary condition check | expand |
On Fri, 2 Nov 2018, Chengguang Xu wrote: > dma_pool_destroy() can handle NULL pointer correctly, so there is > no need to check NULL pointer before calling dma_pool_destroy(). > > Signed-off-by: Chengguang Xu <cgxu519@gmx.com> > --- > drivers/usb/host/ohci-mem.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/drivers/usb/host/ohci-mem.c b/drivers/usb/host/ohci-mem.c > index b3da3f12e5b1..3965ac0341eb 100644 > --- a/drivers/usb/host/ohci-mem.c > +++ b/drivers/usb/host/ohci-mem.c > @@ -57,14 +57,10 @@ static int ohci_mem_init (struct ohci_hcd *ohci) > > static void ohci_mem_cleanup (struct ohci_hcd *ohci) > { > - if (ohci->td_cache) { > - dma_pool_destroy (ohci->td_cache); > - ohci->td_cache = NULL; > - } > - if (ohci->ed_cache) { > - dma_pool_destroy (ohci->ed_cache); > - ohci->ed_cache = NULL; > - } > + dma_pool_destroy(ohci->td_cache); > + ohci->td_cache = NULL; > + dma_pool_destroy(ohci->ed_cache); > + ohci->ed_cache = NULL; > } > > /*-------------------------------------------------------------------------*/ Acked-by: Alan Stern <stern@rowland.harvard.edu>
diff --git a/drivers/usb/host/ohci-mem.c b/drivers/usb/host/ohci-mem.c index b3da3f12e5b1..3965ac0341eb 100644 --- a/drivers/usb/host/ohci-mem.c +++ b/drivers/usb/host/ohci-mem.c @@ -57,14 +57,10 @@ static int ohci_mem_init (struct ohci_hcd *ohci) static void ohci_mem_cleanup (struct ohci_hcd *ohci) { - if (ohci->td_cache) { - dma_pool_destroy (ohci->td_cache); - ohci->td_cache = NULL; - } - if (ohci->ed_cache) { - dma_pool_destroy (ohci->ed_cache); - ohci->ed_cache = NULL; - } + dma_pool_destroy(ohci->td_cache); + ohci->td_cache = NULL; + dma_pool_destroy(ohci->ed_cache); + ohci->ed_cache = NULL; } /*-------------------------------------------------------------------------*/
dma_pool_destroy() can handle NULL pointer correctly, so there is no need to check NULL pointer before calling dma_pool_destroy(). Signed-off-by: Chengguang Xu <cgxu519@gmx.com> --- drivers/usb/host/ohci-mem.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)