Skip to content

Commit

Permalink
mtd: nand: denali: squash denali_enable_dma() helper into caller
Browse files Browse the repository at this point in the history
This helper just sets/clears a flag of DMA_ENABLE register (with
register read-back, I do not know why it is necessary).

Move the register write code to the caller, and remove the helper.
It works for me without the register read-back.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
  • Loading branch information
Masahiro Yamada authored and Boris Brezillon committed Sep 22, 2017
1 parent da4734b commit 586a2c5
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions drivers/mtd/nand/denali.c
Original file line number Diff line number Diff line change
Expand Up @@ -465,13 +465,6 @@ static int denali_sw_ecc_fixup(struct mtd_info *mtd,
return max_bitflips;
}

/* programs the controller to either enable/disable DMA transfers */
static void denali_enable_dma(struct denali_nand_info *denali, bool en)
{
iowrite32(en ? DMA_ENABLE__FLAG : 0, denali->reg + DMA_ENABLE);
ioread32(denali->reg + DMA_ENABLE);
}

static void denali_setup_dma64(struct denali_nand_info *denali,
dma_addr_t dma_addr, int page, int write)
{
Expand Down Expand Up @@ -619,7 +612,7 @@ static int denali_dma_xfer(struct denali_nand_info *denali, void *buf,
ecc_err_mask = INTR__ECC_ERR;
}

denali_enable_dma(denali, true);
iowrite32(DMA_ENABLE__FLAG, denali->reg + DMA_ENABLE);

denali_reset_irq(denali);
denali_setup_dma(denali, dma_addr, page, write);
Expand All @@ -631,7 +624,8 @@ static int denali_dma_xfer(struct denali_nand_info *denali, void *buf,
else if (irq_status & ecc_err_mask)
ret = -EBADMSG;

denali_enable_dma(denali, false);
iowrite32(0, denali->reg + DMA_ENABLE);

dma_unmap_single(denali->dev, dma_addr, size, dir);

if (irq_status & INTR__ERASED_PAGE)
Expand Down

0 comments on commit 586a2c5

Please sign in to comment.