projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[deliverable/linux.git]
/
drivers
/
dma
/
ppc4xx
/
adma.c
diff --git
a/drivers/dma/ppc4xx/adma.c
b/drivers/dma/ppc4xx/adma.c
index 3b0247e74cc4871cb703938ef82f3146011d077f..fc457a7e8832dc8f29ed4055cc781369de4ef7aa 100644
(file)
--- a/
drivers/dma/ppc4xx/adma.c
+++ b/
drivers/dma/ppc4xx/adma.c
@@
-2313,7
+2313,7
@@
static struct dma_async_tx_descriptor *ppc440spe_adma_prep_dma_memcpy(
if (unlikely(!len))
return NULL;
if (unlikely(!len))
return NULL;
- BUG_ON(
unlikely(len > PPC440SPE_ADMA_DMA_MAX_BYTE_COUNT)
);
+ BUG_ON(
len > PPC440SPE_ADMA_DMA_MAX_BYTE_COUNT
);
spin_lock_bh(&ppc440spe_chan->lock);
spin_lock_bh(&ppc440spe_chan->lock);
@@
-2354,7
+2354,7
@@
static struct dma_async_tx_descriptor *ppc440spe_adma_prep_dma_memset(
if (unlikely(!len))
return NULL;
if (unlikely(!len))
return NULL;
- BUG_ON(
unlikely(len > PPC440SPE_ADMA_DMA_MAX_BYTE_COUNT)
);
+ BUG_ON(
len > PPC440SPE_ADMA_DMA_MAX_BYTE_COUNT
);
spin_lock_bh(&ppc440spe_chan->lock);
spin_lock_bh(&ppc440spe_chan->lock);
@@
-2397,7
+2397,7
@@
static struct dma_async_tx_descriptor *ppc440spe_adma_prep_dma_xor(
dma_dest, dma_src, src_cnt));
if (unlikely(!len))
return NULL;
dma_dest, dma_src, src_cnt));
if (unlikely(!len))
return NULL;
- BUG_ON(
unlikely(len > PPC440SPE_ADMA_XOR_MAX_BYTE_COUNT)
);
+ BUG_ON(
len > PPC440SPE_ADMA_XOR_MAX_BYTE_COUNT
);
dev_dbg(ppc440spe_chan->device->common.dev,
"ppc440spe adma%d: %s src_cnt: %d len: %u int_en: %d\n",
dev_dbg(ppc440spe_chan->device->common.dev,
"ppc440spe adma%d: %s src_cnt: %d len: %u int_en: %d\n",
@@
-2887,7
+2887,7
@@
static struct dma_async_tx_descriptor *ppc440spe_adma_prep_dma_pq(
ADMA_LL_DBG(prep_dma_pq_dbg(ppc440spe_chan->device->id,
dst, src, src_cnt));
BUG_ON(!len);
ADMA_LL_DBG(prep_dma_pq_dbg(ppc440spe_chan->device->id,
dst, src, src_cnt));
BUG_ON(!len);
- BUG_ON(
unlikely(len > PPC440SPE_ADMA_XOR_MAX_BYTE_COUNT)
);
+ BUG_ON(
len > PPC440SPE_ADMA_XOR_MAX_BYTE_COUNT
);
BUG_ON(!src_cnt);
if (src_cnt == 1 && dst[1] == src[0]) {
BUG_ON(!src_cnt);
if (src_cnt == 1 && dst[1] == src[0]) {
This page took
0.026295 seconds
and
5
git commands to generate.