lkml.org 
[lkml]   [2017]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 17/23] mtd: nand: denali: merge struct nand_buf into struct denali_nand_info
    Date
    Now struct nand_buf has only two members, so I see no reason for the
    separation.

    Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
    ---

    Changes in v5: None
    Changes in v4: None
    Changes in v3: None
    Changes in v2:
    - Newly added

    drivers/mtd/nand/denali.c | 29 ++++++++++++++---------------
    drivers/mtd/nand/denali.h | 8 ++------
    2 files changed, 16 insertions(+), 21 deletions(-)

    diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
    index 1a96942f62f9..d8d207125701 100644
    --- a/drivers/mtd/nand/denali.c
    +++ b/drivers/mtd/nand/denali.c
    @@ -640,7 +640,7 @@ static int write_page(struct mtd_info *mtd, struct nand_chip *chip,
    const uint8_t *buf, int page, bool raw_xfer)
    {
    struct denali_nand_info *denali = mtd_to_denali(mtd);
    - dma_addr_t addr = denali->buf.dma_buf;
    + dma_addr_t addr = denali->dma_addr;
    size_t size = mtd->writesize + mtd->oobsize;
    uint32_t irq_status;
    uint32_t irq_mask = INTR__DMA_CMD_COMP | INTR__PROGRAM_FAIL;
    @@ -654,11 +654,11 @@ static int write_page(struct mtd_info *mtd, struct nand_chip *chip,
    setup_ecc_for_xfer(denali, !raw_xfer, raw_xfer);

    /* copy buffer into DMA buffer */
    - memcpy(denali->buf.buf, buf, mtd->writesize);
    + memcpy(denali->buf, buf, mtd->writesize);

    if (raw_xfer) {
    /* transfer the data to the spare area */
    - memcpy(denali->buf.buf + mtd->writesize,
    + memcpy(denali->buf + mtd->writesize,
    chip->oob_poi,
    mtd->oobsize);
    }
    @@ -735,7 +735,7 @@ static int denali_read_page(struct mtd_info *mtd, struct nand_chip *chip,
    uint8_t *buf, int oob_required, int page)
    {
    struct denali_nand_info *denali = mtd_to_denali(mtd);
    - dma_addr_t addr = denali->buf.dma_buf;
    + dma_addr_t addr = denali->dma_addr;
    size_t size = mtd->writesize + mtd->oobsize;
    uint32_t irq_status;
    uint32_t irq_mask = denali->caps & DENALI_CAP_HW_ECC_FIXUP ?
    @@ -757,7 +757,7 @@ static int denali_read_page(struct mtd_info *mtd, struct nand_chip *chip,

    dma_sync_single_for_cpu(denali->dev, addr, size, DMA_FROM_DEVICE);

    - memcpy(buf, denali->buf.buf, mtd->writesize);
    + memcpy(buf, denali->buf, mtd->writesize);

    if (denali->caps & DENALI_CAP_HW_ECC_FIXUP)
    stat = denali_hw_ecc_fixup(mtd, denali, &uncor_ecc_flags);
    @@ -782,7 +782,7 @@ static int denali_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
    uint8_t *buf, int oob_required, int page)
    {
    struct denali_nand_info *denali = mtd_to_denali(mtd);
    - dma_addr_t addr = denali->buf.dma_buf;
    + dma_addr_t addr = denali->dma_addr;
    size_t size = mtd->writesize + mtd->oobsize;
    uint32_t irq_mask = INTR__DMA_CMD_COMP;
    uint32_t irq_status;
    @@ -804,8 +804,8 @@ static int denali_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,

    denali_enable_dma(denali, false);

    - memcpy(buf, denali->buf.buf, mtd->writesize);
    - memcpy(chip->oob_poi, denali->buf.buf + mtd->writesize, mtd->oobsize);
    + memcpy(buf, denali->buf, mtd->writesize);
    + memcpy(chip->oob_poi, denali->buf + mtd->writesize, mtd->oobsize);

    return 0;
    }
    @@ -1224,10 +1224,9 @@ int denali_init(struct denali_nand_info *denali)
    if (ret)
    goto disable_irq;

    - denali->buf.buf = devm_kzalloc(denali->dev,
    - mtd->writesize + mtd->oobsize,
    - GFP_KERNEL);
    - if (!denali->buf.buf) {
    + denali->buf = devm_kzalloc(denali->dev, mtd->writesize + mtd->oobsize,
    + GFP_KERNEL);
    + if (!denali->buf) {
    ret = -ENOMEM;
    goto disable_irq;
    }
    @@ -1240,10 +1239,10 @@ int denali_init(struct denali_nand_info *denali)
    goto disable_irq;
    }

    - denali->buf.dma_buf = dma_map_single(denali->dev, denali->buf.buf,
    + denali->dma_addr = dma_map_single(denali->dev, denali->buf,
    mtd->writesize + mtd->oobsize,
    DMA_BIDIRECTIONAL);
    - if (dma_mapping_error(denali->dev, denali->buf.dma_buf)) {
    + if (dma_mapping_error(denali->dev, denali->dma_addr)) {
    dev_err(denali->dev, "Failed to map DMA buffer\n");
    ret = -EIO;
    goto disable_irq;
    @@ -1337,7 +1336,7 @@ void denali_remove(struct denali_nand_info *denali)

    nand_release(mtd);
    denali_disable_irq(denali);
    - dma_unmap_single(denali->dev, denali->buf.dma_buf, bufsize,
    + dma_unmap_single(denali->dev, denali->dma_addr, bufsize,
    DMA_BIDIRECTIONAL);
    }
    EXPORT_SYMBOL(denali_remove);
    diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h
    index ad2223d179d0..1b991d3016f8 100644
    --- a/drivers/mtd/nand/denali.h
    +++ b/drivers/mtd/nand/denali.h
    @@ -305,16 +305,10 @@
    #define MODE_10 0x08000000
    #define MODE_11 0x0C000000

    -struct nand_buf {
    - uint8_t *buf;
    - dma_addr_t dma_buf;
    -};
    -
    struct denali_nand_info {
    struct nand_chip nand;
    unsigned long clk_x_rate; /* bus interface clock rate */
    int flash_bank; /* currently selected chip */
    - struct nand_buf buf;
    struct device *dev;
    void __iomem *flash_reg; /* Register Interface */
    void __iomem *flash_mem; /* Host Data/Command Interface */
    @@ -326,6 +320,8 @@ struct denali_nand_info {
    uint32_t irq_status;
    int irq;

    + void *buf;
    + dma_addr_t dma_addr;
    int devnum; /* represent how many nands connected */
    int bbtskipbytes;
    int max_banks;
    --
    2.7.4
    \
     
     \ /
      Last update: 2017-06-12 01:04    [W:3.360 / U:0.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site