aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/hardware/iop3xx-adma.h
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2008-11-11 13:12:33 -0700
committerDan Williams <dan.j.williams@intel.com>2008-11-11 13:12:33 -0700
commit65e503814dec83c7b2ac955e75919d009109c919 (patch)
tree6cd01ca32ae269760d864d3c1bae94fdb0e95a45 /arch/arm/include/asm/hardware/iop3xx-adma.h
parent137cb55c6dcd56cb367285adaf15f808a2a9fec7 (diff)
iop-adma: use iop_paranoia() for debug BUG_ONs
Now that the critical read back to flush the next descriptor address is fixed we can downgrade some BUG_ONs that need only be enabled when testing changes to the driver. Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'arch/arm/include/asm/hardware/iop3xx-adma.h')
-rw-r--r--arch/arm/include/asm/hardware/iop3xx-adma.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/include/asm/hardware/iop3xx-adma.h b/arch/arm/include/asm/hardware/iop3xx-adma.h
index 87bff09633a..83e6ba338e2 100644
--- a/arch/arm/include/asm/hardware/iop3xx-adma.h
+++ b/arch/arm/include/asm/hardware/iop3xx-adma.h
@@ -730,7 +730,8 @@ static inline void iop_desc_set_next_desc(struct iop_adma_desc_slot *desc,
{
/* hw_desc->next_desc is the same location for all channels */
union iop3xx_desc hw_desc = { .ptr = desc->hw_desc, };
- BUG_ON(hw_desc.dma->next_desc);
+
+ iop_paranoia(hw_desc.dma->next_desc);
hw_desc.dma->next_desc = next_desc_addr;
}
@@ -760,7 +761,7 @@ static inline int iop_desc_get_zero_result(struct iop_adma_desc_slot *desc)
struct iop3xx_desc_aau *hw_desc = desc->hw_desc;
struct iop3xx_aau_desc_ctrl desc_ctrl = hw_desc->desc_ctrl_field;
- BUG_ON(!(desc_ctrl.tx_complete && desc_ctrl.zero_result_en));
+ iop_paranoia(!(desc_ctrl.tx_complete && desc_ctrl.zero_result_en));
return desc_ctrl.zero_result_err;
}