Merge branch 'for-rafael' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx...

[karo-tx-linux.git] / arch / frv / kernel / dma.c

diff --git a/arch/frv/kernel/dma.c b/arch/frv/kernel/dma.c
index 156184e17e57d0b74483b6c47b30e8cde814a92a..370dc9fa0b11916b97bc918d6f639d380bbbd62d 100644 (file)
--- a/arch/frv/kernel/dma.c
+++ b/arch/frv/kernel/dma.c
@@ -109,13 +109,13 @@ static struct frv_dma_channel frv_dma_channels[FRV_DMA_NCHANS] = {
 
 static DEFINE_RWLOCK(frv_dma_channels_lock);
 
-unsigned long frv_dma_inprogress;
+unsigned int frv_dma_inprogress;
 
 #define frv_clear_dma_inprogress(channel) \
-       atomic_clear_mask(1 << (channel), &frv_dma_inprogress);
+       (void)__atomic32_fetch_and(~(1 << (channel)), &frv_dma_inprogress);
 
 #define frv_set_dma_inprogress(channel) \
-       atomic_set_mask(1 << (channel), &frv_dma_inprogress);
+       (void)__atomic32_fetch_or(1 << (channel), &frv_dma_inprogress);
 
 /*****************************************************************************/
 /*