On 08/09/14 20:10, Leonid Yegoshin wrote: > diff --git a/arch/mips/include/asm/mach-generic/dma-coherence.h b/arch/mips/include/asm/mach-generic/dma-coherence.h > index 7629c35..b4563df 100644 > --- a/arch/mips/include/asm/mach-generic/dma-coherence.h > +++ b/arch/mips/include/asm/mach-generic/dma-coherence.h > @@ -49,7 +49,12 @@ static inline int plat_dma_supported(struct device *dev, u64 mask) > > static inline int plat_device_is_coherent(struct device *dev) > { > - return coherentio; > +#ifdef CONFIG_DMA_COHERENT > + return 1; if DMA_COHERENT=y (which seems to imply DMA_MAYBE_COHERENT=n), coherentio is already defined as 1 in arch/mips/include/asm/dma-coherent.h, so I don't think you need this case. > +#else > + return (coherentio > 0); > +#endif > + No need for a new blank line here > } ... > diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c > index 44b6dff..42c819a 100644 > --- a/arch/mips/mm/dma-default.c > +++ b/arch/mips/mm/dma-default.c > @@ -24,7 +24,7 @@ > #include <dma-coherence.h> > > #ifdef CONFIG_DMA_MAYBE_COHERENT > -int coherentio = 0; /* User defined DMA coherency from command line. */ > +int coherentio = -1; /* User defined DMA coherency is not defined yet. */ Please avoid unnecessarily turned tabs into spaces. It makes files inconsistent. Other than that and Markos' style comment it looks reasonable to me. Cheers James