diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2015-09-13 12:15:32 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-04 09:38:33 (GMT) |
commit | a4c1f0c2a959f2aa05f86e64f7d83b9fb18e2cdd (patch) | |
tree | 02f30373d983966dd478ab72bdef98fcd203531d | |
parent | 395f5409ca4336ee6ad461d3e0436bcc2d7c6309 (diff) | |
download | linux-a4c1f0c2a959f2aa05f86e64f7d83b9fb18e2cdd.tar.xz |
usb: host: drop null test before destroy functions
Remove unneeded NULL test.
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
expression x;
@@
-if (x != NULL)
\(kmem_cache_destroy\|mempool_destroy\|dma_pool_destroy\)(x);
@@
expression x;
@@
-if (x != NULL) {
\(kmem_cache_destroy\|mempool_destroy\|dma_pool_destroy\)(x);
x = NULL;
-}
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/host/fotg210-hcd.c | 12 | ||||
-rw-r--r-- | drivers/usb/host/fusbh200-hcd.c | 12 |
2 files changed, 8 insertions, 16 deletions
diff --git a/drivers/usb/host/fotg210-hcd.c b/drivers/usb/host/fotg210-hcd.c index 000ed80..287d595 100644 --- a/drivers/usb/host/fotg210-hcd.c +++ b/drivers/usb/host/fotg210-hcd.c @@ -1976,17 +1976,13 @@ static void fotg210_mem_cleanup(struct fotg210_hcd *fotg210) fotg210->dummy = NULL; /* DMA consistent memory and pools */ - if (fotg210->qtd_pool) - dma_pool_destroy(fotg210->qtd_pool); + dma_pool_destroy(fotg210->qtd_pool); fotg210->qtd_pool = NULL; - if (fotg210->qh_pool) { - dma_pool_destroy(fotg210->qh_pool); - fotg210->qh_pool = NULL; - } + dma_pool_destroy(fotg210->qh_pool); + fotg210->qh_pool = NULL; - if (fotg210->itd_pool) - dma_pool_destroy(fotg210->itd_pool); + dma_pool_destroy(fotg210->itd_pool); fotg210->itd_pool = NULL; if (fotg210->periodic) diff --git a/drivers/usb/host/fusbh200-hcd.c b/drivers/usb/host/fusbh200-hcd.c index 1fd8718..b247d71 100644 --- a/drivers/usb/host/fusbh200-hcd.c +++ b/drivers/usb/host/fusbh200-hcd.c @@ -1927,17 +1927,13 @@ static void fusbh200_mem_cleanup (struct fusbh200_hcd *fusbh200) fusbh200->dummy = NULL; /* DMA consistent memory and pools */ - if (fusbh200->qtd_pool) - dma_pool_destroy (fusbh200->qtd_pool); + dma_pool_destroy(fusbh200->qtd_pool); fusbh200->qtd_pool = NULL; - if (fusbh200->qh_pool) { - dma_pool_destroy (fusbh200->qh_pool); - fusbh200->qh_pool = NULL; - } + dma_pool_destroy(fusbh200->qh_pool); + fusbh200->qh_pool = NULL; - if (fusbh200->itd_pool) - dma_pool_destroy (fusbh200->itd_pool); + dma_pool_destroy(fusbh200->itd_pool); fusbh200->itd_pool = NULL; if (fusbh200->periodic) |