xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dmaengine: Use negative condition for better readability

Browse Source 
When negative condition is in use we may decrease indentation level
and make the main part of logic better visible.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Link: https://lore.kernel.org/r/20200226101842.29426-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Andy Shevchenko
2020-02-26 12:18:39 +02:00
committed by Vinod Koul
parent 88ac039cbe
commit 3a92063be1
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
include/linux/dmaengine.h
View File

@@ -618,10 +618,11 @@ static inline void dmaengine_unmap_put(struct dmaengine_unmap_data *unmap)
static inline void dma_descriptor_unmap(struct dma_async_tx_descriptor *tx) static inline void dma_descriptor_unmap(struct dma_async_tx_descriptor *tx)
{ {
if (tx->unmap) { if (!tx->unmap)
dmaengine_unmap_put(tx->unmap); return;
tx->unmap = NULL;
} dmaengine_unmap_put(tx->unmap);
tx->unmap = NULL;
} }
#ifndef CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH #ifndef CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH
@@ -1408,11 +1409,12 @@ static inline enum dma_status dma_async_is_complete(dma_cookie_t cookie,
static inline void static inline void
dma_set_tx_state(struct dma_tx_state *st, dma_cookie_t last, dma_cookie_t used, u32 residue) dma_set_tx_state(struct dma_tx_state *st, dma_cookie_t last, dma_cookie_t used, u32 residue)
{ {
if (st) { if (!st)
st->last = last; return;
st->used = used;
st->residue = residue; st->last = last;
} st->used = used;
st->residue = residue;
} }
#ifdef CONFIG_DMA_ENGINE #ifdef CONFIG_DMA_ENGINE
@@ -1489,12 +1491,11 @@ static inline int dmaengine_desc_set_reuse(struct dma_async_tx_descriptor *tx)
if (ret) if (ret)
return ret; return ret;
if (caps.descriptor_reuse) { if (!caps.descriptor_reuse)
tx->flags |= DMA_CTRL_REUSE;
return 0;
} else {
return -EPERM; return -EPERM;
}
tx->flags |= DMA_CTRL_REUSE;
return 0;
} }
static inline void dmaengine_desc_clear_reuse(struct dma_async_tx_descriptor *tx) static inline void dmaengine_desc_clear_reuse(struct dma_async_tx_descriptor *tx)
@@ -1510,10 +1511,10 @@ static inline bool dmaengine_desc_test_reuse(struct dma_async_tx_descriptor *tx)
static inline int dmaengine_desc_free(struct dma_async_tx_descriptor *desc) static inline int dmaengine_desc_free(struct dma_async_tx_descriptor *desc)
{ {
/* this is supported for reusable desc, so check that */ /* this is supported for reusable desc, so check that */
if (dmaengine_desc_test_reuse(desc)) if (!dmaengine_desc_test_reuse(desc))
return desc->desc_free(desc);
else
return -EPERM; return -EPERM;
return desc->desc_free(desc);
} }
/* --- DMA device --- */ /* --- DMA device --- */