lkml.org 
[lkml]   [2023]   [Oct]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v1 01/10] xhci: dbc: Drop duplicate checks for dma_free_coherent()
    Date
    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>
    ---
    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.40.0.1.gaa8946217a0b
    \
     
     \ /
      Last update: 2023-10-02 18:19    [W:3.657 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site