mtd: nand: fsmc: create and use mtd_to_fsmc()

Create and use mtd_to_fsmc() to avoid duplication of
container_of(mtd, struct fsmc_nand_data, mtd) calls.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index 1c6c399496c2ff8cdfe7564b2eb3208e8abeef8a..499fc5925c23d44fbb2f464899d3899d0d0c076d 100644 (file)
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/fsmc_nand.c
@@ -326,13 +326,18 @@ struct fsmc_nand_data {
        void                    (*select_chip)(uint32_t bank, uint32_t busw);
 };
 
+static inline struct fsmc_nand_data *mtd_to_fsmc(struct mtd_info *mtd)
+{
+       return container_of(mtd, struct fsmc_nand_data, mtd);
+}
+
 /* Assert CS signal based on chipnr */
 static void fsmc_select_chip(struct mtd_info *mtd, int chipnr)
 {
        struct nand_chip *chip = mtd_to_nand(mtd);
        struct fsmc_nand_data *host;
 
-       host = container_of(mtd, struct fsmc_nand_data, mtd);
+       host = mtd_to_fsmc(mtd);
 
        switch (chipnr) {
        case -1:
@@ -359,8 +364,7 @@ static void fsmc_select_chip(struct mtd_info *mtd, int chipnr)
 static void fsmc_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
 {
        struct nand_chip *this = mtd_to_nand(mtd);
-       struct fsmc_nand_data *host = container_of(mtd,
-                                       struct fsmc_nand_data, mtd);
+       struct fsmc_nand_data *host = mtd_to_fsmc(mtd);
        void __iomem *regs = host->regs_va;
        unsigned int bank = host->bank;
 
@@ -445,8 +449,7 @@ static void fsmc_nand_setup(void __iomem *regs, uint32_t bank,
  */
 static void fsmc_enable_hwecc(struct mtd_info *mtd, int mode)
 {
-       struct fsmc_nand_data *host = container_of(mtd,
-                                       struct fsmc_nand_data, mtd);
+       struct fsmc_nand_data *host = mtd_to_fsmc(mtd);
        void __iomem *regs = host->regs_va;
        uint32_t bank = host->bank;
 
@@ -466,8 +469,7 @@ static void fsmc_enable_hwecc(struct mtd_info *mtd, int mode)
 static int fsmc_read_hwecc_ecc4(struct mtd_info *mtd, const uint8_t *data,
                                uint8_t *ecc)
 {
-       struct fsmc_nand_data *host = container_of(mtd,
-                                       struct fsmc_nand_data, mtd);
+       struct fsmc_nand_data *host = mtd_to_fsmc(mtd);
        void __iomem *regs = host->regs_va;
        uint32_t bank = host->bank;
        uint32_t ecc_tmp;
@@ -517,8 +519,7 @@ static int fsmc_read_hwecc_ecc4(struct mtd_info *mtd, const uint8_t *data,
 static int fsmc_read_hwecc_ecc1(struct mtd_info *mtd, const uint8_t *data,
                                uint8_t *ecc)
 {
-       struct fsmc_nand_data *host = container_of(mtd,
-                                       struct fsmc_nand_data, mtd);
+       struct fsmc_nand_data *host = mtd_to_fsmc(mtd);
        void __iomem *regs = host->regs_va;
        uint32_t bank = host->bank;
        uint32_t ecc_tmp;
@@ -674,9 +675,8 @@ static void fsmc_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
  */
 static void fsmc_read_buf_dma(struct mtd_info *mtd, uint8_t *buf, int len)
 {
-       struct fsmc_nand_data *host;
+       struct fsmc_nand_data *host  = mtd_to_fsmc(mtd);
 
-       host = container_of(mtd, struct fsmc_nand_data, mtd);
        dma_xfer(host, buf, len, DMA_FROM_DEVICE);
 }
 
@@ -689,9 +689,8 @@ static void fsmc_read_buf_dma(struct mtd_info *mtd, uint8_t *buf, int len)
 static void fsmc_write_buf_dma(struct mtd_info *mtd, const uint8_t *buf,
                int len)
 {
-       struct fsmc_nand_data *host;
+       struct fsmc_nand_data *host = mtd_to_fsmc(mtd);
 
-       host = container_of(mtd, struct fsmc_nand_data, mtd);
        dma_xfer(host, (void *)buf, len, DMA_TO_DEVICE);
 }
 
@@ -712,8 +711,7 @@ static void fsmc_write_buf_dma(struct mtd_info *mtd, const uint8_t *buf,
 static int fsmc_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
                                 uint8_t *buf, int oob_required, int page)
 {
-       struct fsmc_nand_data *host = container_of(mtd,
-                                       struct fsmc_nand_data, mtd);
+       struct fsmc_nand_data *host = mtd_to_fsmc(mtd);
        struct fsmc_eccplace *ecc_place = host->ecc_place;
        int i, j, s, stat, eccsize = chip->ecc.size;
        int eccbytes = chip->ecc.bytes;
@@ -782,9 +780,8 @@ static int fsmc_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
 static int fsmc_bch8_correct_data(struct mtd_info *mtd, uint8_t *dat,
                             uint8_t *read_ecc, uint8_t *calc_ecc)
 {
-       struct fsmc_nand_data *host = container_of(mtd,
-                                       struct fsmc_nand_data, mtd);
        struct nand_chip *chip = mtd_to_nand(mtd);
+       struct fsmc_nand_data *host = mtd_to_fsmc(mtd);
        void __iomem *regs = host->regs_va;
        unsigned int bank = host->bank;
        uint32_t err_idx[8];