[PATCH] mtd: rawnand: qcom: don't include dma-direct.h

[PATCH] mtd: rawnand: qcom: don't include dma-direct.h

[Christoph Hellwig]

A recent commit removed the incorrect use of phys_to_dma from this
driver, but failed to remove the dma-direct.h include, so do that
now.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/mtd/nand/raw/qcom_nandc.c | 1 -
 include/linux/dma-mapping.h       | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/raw/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c
index d1d470bb32e4..d2831b0b28fb 100644
--- a/drivers/mtd/nand/raw/qcom_nandc.c
+++ b/drivers/mtd/nand/raw/qcom_nandc.c
@@ -23,7 +23,6 @@
 #include <linux/of_device.h>
 #include <linux/delay.h>
 #include <linux/dma/qcom_bam_dma.h>
-#include <linux/dma-direct.h> /* XXX: drivers shall never use this directly! */
 
 /* NANDc reg offsets */
 #define	NAND_FLASH_CMD			0x00

Re: [PATCH] mtd: rawnand: qcom: don't include dma-direct.h

[Richard Weinberger]

On Mon, Aug 27, 2018 at 10:59 AM Christoph Hellwig <hch@lst.de> wrote:
>
> A recent commit removed the incorrect use of phys_to_dma from this
> driver, but failed to remove the dma-direct.h include, so do that
> now.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  drivers/mtd/nand/raw/qcom_nandc.c | 1 -
>  include/linux/dma-mapping.h       | 6 ++++++
>  2 files changed, 6 insertions(+), 1 deletion(-)

Hmm, the diffstat does not match the diff itself.

> diff --git a/drivers/mtd/nand/raw/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c
> index d1d470bb32e4..d2831b0b28fb 100644
> --- a/drivers/mtd/nand/raw/qcom_nandc.c
> +++ b/drivers/mtd/nand/raw/qcom_nandc.c
> @@ -23,7 +23,6 @@
>  #include <linux/of_device.h>
>  #include <linux/delay.h>
>  #include <linux/dma/qcom_bam_dma.h>
> -#include <linux/dma-direct.h> /* XXX: drivers shall never use this directly! */
>
>  /* NANDc reg offsets */
>  #define        NAND_FLASH_CMD                  0x00
>
> ______________________________________________________
> Linux MTD discussion mailing list
> http://lists.infradead.org/mailman/listinfo/linux-mtd/



-- 
Thanks,
//richard

Re: [PATCH] mtd: rawnand: qcom: don't include dma-direct.h

[Christoph Hellwig]

On Mon, Aug 27, 2018 at 11:51:29AM +0200, Richard Weinberger wrote:
> On Mon, Aug 27, 2018 at 10:59 AM Christoph Hellwig <hch@lst.de> wrote:
> >
> > A recent commit removed the incorrect use of phys_to_dma from this
> > driver, but failed to remove the dma-direct.h include, so do that
> > now.
> >
> > Signed-off-by: Christoph Hellwig <hch@lst.de>
> > ---
> >  drivers/mtd/nand/raw/qcom_nandc.c | 1 -
> >  include/linux/dma-mapping.h       | 6 ++++++
> >  2 files changed, 6 insertions(+), 1 deletion(-)
> 
> Hmm, the diffstat does not match the diff itself.

Tha's because it had an accidental hunk in my tree I removed when
sending.  I think you can trust the diff, but if you really want
I can resend.

Re: [PATCH] mtd: rawnand: qcom: don't include dma-direct.h

[Miquel Raynal]

Hi Christoph,

Christoph Hellwig <hch@lst.de> wrote on Mon, 27 Aug 2018 14:31:07 +0200:

> On Mon, Aug 27, 2018 at 11:51:29AM +0200, Richard Weinberger wrote:
> > On Mon, Aug 27, 2018 at 10:59 AM Christoph Hellwig <hch@lst.de> wrote:  
> > >
> > > A recent commit removed the incorrect use of phys_to_dma from this
> > > driver, but failed to remove the dma-direct.h include, so do that
> > > now.
> > >
> > > Signed-off-by: Christoph Hellwig <hch@lst.de>
> > > ---
> > >  drivers/mtd/nand/raw/qcom_nandc.c | 1 -
> > >  include/linux/dma-mapping.h       | 6 ++++++
> > >  2 files changed, 6 insertions(+), 1 deletion(-)  
> > 
> > Hmm, the diffstat does not match the diff itself.  
> 
> Tha's because it had an accidental hunk in my tree I removed when
> sending.  I think you can trust the diff, but if you really want
> I can resend.

Applied to nand/next.

Thanks,
Miquèl