From: Mathias Nyman <mathias.nyman@linux.intel.com>
To: <gregkh@linuxfoundation.org>
Cc: <linux-usb@vger.kernel.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Mathias Nyman <mathias.nyman@linux.intel.com>
Subject: [PATCH 01/19] xhci: dbc: Drop duplicate checks for dma_free_coherent()
Date: Fri, 1 Dec 2023 17:06:29 +0200 [thread overview]
Message-ID: <20231201150647.1307406-2-mathias.nyman@linux.intel.com> (raw)
In-Reply-To: <20231201150647.1307406-1-mathias.nyman@linux.intel.com>
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
dma_free_coherent() is NULL-aware, not necessary to check for
the parameter twice. Drop duplicate conditionals in the caller.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
---
drivers/usb/host/xhci-dbgcap.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/usb/host/xhci-dbgcap.c b/drivers/usb/host/xhci-dbgcap.c
index b40d9238d447..9e9ce3711813 100644
--- a/drivers/usb/host/xhci-dbgcap.c
+++ b/drivers/usb/host/xhci-dbgcap.c
@@ -28,7 +28,7 @@ static void dbc_ring_free(struct device *dev, struct xhci_ring *ring)
if (!ring)
return;
- if (ring->first_seg && ring->first_seg->trbs) {
+ if (ring->first_seg) {
dma_free_coherent(dev, TRB_SEGMENT_SIZE,
ring->first_seg->trbs,
ring->first_seg->dma);
@@ -394,9 +394,8 @@ static int dbc_erst_alloc(struct device *dev, struct xhci_ring *evt_ring,
static void dbc_erst_free(struct device *dev, struct xhci_erst *erst)
{
- if (erst->entries)
- dma_free_coherent(dev, sizeof(struct xhci_erst_entry),
- erst->entries, erst->erst_dma_addr);
+ dma_free_coherent(dev, sizeof(struct xhci_erst_entry), erst->entries,
+ erst->erst_dma_addr);
erst->entries = NULL;
}
@@ -543,11 +542,8 @@ static void xhci_dbc_mem_cleanup(struct xhci_dbc *dbc)
xhci_dbc_eps_exit(dbc);
- if (dbc->string) {
- dma_free_coherent(dbc->dev, dbc->string_size,
- dbc->string, dbc->string_dma);
- dbc->string = NULL;
- }
+ dma_free_coherent(dbc->dev, dbc->string_size, dbc->string, dbc->string_dma);
+ dbc->string = NULL;
dbc_free_ctx(dbc->dev, dbc->ctx);
dbc->ctx = NULL;
--
2.25.1
next prev parent reply other threads:[~2023-12-01 15:05 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-01 15:06 [PATCH 00/19] xhci features for usb-next Mathias Nyman
2023-12-01 15:06 ` Mathias Nyman [this message]
2023-12-01 15:06 ` [PATCH 02/19] xhci: dbc: Convert to use sysfs_streq() Mathias Nyman
2023-12-01 15:06 ` [PATCH 03/19] xhci: dbc: Use sysfs_emit() to instead of scnprintf() Mathias Nyman
2023-12-01 15:06 ` [PATCH 04/19] xhci: dbc: Use ATTRIBUTE_GROUPS() Mathias Nyman
2023-12-01 15:06 ` [PATCH 05/19] xhci: dbc: Check for errors first in xhci_dbc_stop() Mathias Nyman
2023-12-01 15:06 ` [PATCH 06/19] xhci: dbc: Don't shadow error codes in store() functions Mathias Nyman
2023-12-01 15:06 ` [PATCH 07/19] xhci: dbc: Replace custom return value with proper Linux error code Mathias Nyman
2023-12-01 15:06 ` [PATCH 08/19] xhci: dbc: Use sizeof_field() where it makes sense Mathias Nyman
2023-12-01 17:31 ` David Laight
2023-12-01 19:08 ` Andy Shevchenko
2023-12-02 15:50 ` David Laight
2023-12-04 10:23 ` Mathias Nyman
2023-12-04 10:45 ` David Laight
2023-12-01 15:06 ` [PATCH 09/19] xhci: dbc: Use sizeof(*pointer) instead of sizeof(type) Mathias Nyman
2023-12-01 15:06 ` [PATCH 10/19] xhci: dbc: Add missing headers Mathias Nyman
2023-12-01 15:06 ` [PATCH 11/19] xhci: check if legacy irq is available before using it as fallback Mathias Nyman
2023-12-01 15:06 ` [PATCH 12/19] xhci: add handler for only one interrupt line Mathias Nyman
2023-12-01 15:06 ` [PATCH 13/19] xhci: refactor static MSI-X function Mathias Nyman
2023-12-01 15:06 ` [PATCH 14/19] xhci: refactor static MSI function Mathias Nyman
2023-12-01 15:06 ` [PATCH 15/19] xhci: change 'msix_count' to encompass MSI or MSI-X vectors Mathias Nyman
2023-12-01 15:06 ` [PATCH 16/19] xhci: rework 'xhci_try_enable_msi()' MSI and MSI-X setup code Mathias Nyman
2023-12-01 15:06 ` [PATCH 17/19] xhci: minor coding style cleanup in 'xhci_try_enable_msi()' Mathias Nyman
2023-12-01 15:06 ` [PATCH 18/19] xhci: Reconfigure endpoint 0 max packet size only during endpoint reset Mathias Nyman
2023-12-01 15:06 ` [PATCH 19/19] xhci: fix possible null pointer deref during xhci urb enqueue Mathias Nyman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231201150647.1307406-2-mathias.nyman@linux.intel.com \
--to=mathias.nyman@linux.intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.