Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81d46c59 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Brian Norris
Browse files

mtd: onenand: fix build warning for dma type 



The samsung onenand driver passes around a dma address token
through a void pointer, which is incorrect and leads to
warnings like this one:

onenand/samsung.c:548:2: warning: passing argument 1 of '__fswab32' makes integer from pointer without a cast [enabled by default]
  writel(src, base + S5PC110_DMA_SRC_ADDR);
  ^

This patch makes it use dma_addr_t here, which is more appropriate.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: linux-mtd@lists.infradead.org
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent cb3346ac

drivers/mtd/onenand/samsung.c

+4 −4
Original line number Diff line number Diff line
@@ -537,9 +537,9 @@ static int onenand_write_bufferram(struct mtd_info *mtd, int area, 
	return 0;

}



static int (*s5pc110_dma_ops)(void *dst, void *src, size_t count, int direction);

static int (*s5pc110_dma_ops)(dma_addr_t dst, dma_addr_t src, size_t count, int direction);



static int s5pc110_dma_poll(void *dst, void *src, size_t count, int direction)

static int s5pc110_dma_poll(dma_addr_t dst, dma_addr_t src, size_t count, int direction)

{

	void __iomem *base = onenand->dma_addr;

	int status;
@@ -605,7 +605,7 @@ static irqreturn_t s5pc110_onenand_irq(int irq, void *data) 
	return IRQ_HANDLED;

}



static int s5pc110_dma_irq(void *dst, void *src, size_t count, int direction)

static int s5pc110_dma_irq(dma_addr_t dst, dma_addr_t src, size_t count, int direction)

{

	void __iomem *base = onenand->dma_addr;

	int status;
@@ -686,7 +686,7 @@ static int s5pc110_read_bufferram(struct mtd_info *mtd, int area, 
		dev_err(dev, "Couldn't map a %d byte buffer for DMA\n", count);

		goto normal;

	}

	err = s5pc110_dma_ops((void *) dma_dst, (void *) dma_src,

	err = s5pc110_dma_ops(dma_dst, dma_src,

			count, S5PC110_DMA_DIR_READ);



	if (page_dma)