target/linux/oxnas/patches-4.4/0074-mtd-nand-import-nand_hw_control_init.patch

   1 From d45bc58dd3bdcaabc1d7d8d9b0b8dee826635cc6 Mon Sep 17 00:00:00 2001
   2 From: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
   3 Date: Wed, 27 Jul 2016 11:23:52 +0200
   4 Subject: [PATCH] mtd: nand: import nand_hw_control_init()
   5
   6 The code to initialize a struct nand_hw_control is duplicated across
   7 several drivers. Factorize it using an inline function.
   8
   9 Signed-off-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
  10 Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
  11 ---
  12  drivers/mtd/nand/bf5xx_nand.c        | 3 +--
  13  drivers/mtd/nand/brcmnand/brcmnand.c | 3 +--
  14  drivers/mtd/nand/docg4.c             | 3 +--
  15  drivers/mtd/nand/fsl_elbc_nand.c     | 3 +--
  16  drivers/mtd/nand/fsl_ifc_nand.c      | 3 +--
  17  drivers/mtd/nand/jz4780_nand.c       | 3 +--
  18  drivers/mtd/nand/nand_base.c         | 3 +--
  19  drivers/mtd/nand/ndfc.c              | 3 +--
  20  drivers/mtd/nand/pxa3xx_nand.c       | 3 +--
  21  drivers/mtd/nand/qcom_nandc.c        | 3 +--
  22  drivers/mtd/nand/s3c2410.c           | 3 +--
  23  drivers/mtd/nand/sunxi_nand.c        | 3 +--
  24  drivers/mtd/nand/txx9ndfmc.c         | 3 +--
  25  include/linux/mtd/nand.h             | 7 +++++++
  26  14 files changed, 20 insertions(+), 26 deletions(-)
  27
  28 diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c
  29 index 37da423..3962f55 100644
  30 --- a/drivers/mtd/nand/bf5xx_nand.c
  31 +++ b/drivers/mtd/nand/bf5xx_nand.c
  32 @@ -761,8 +761,7 @@ static int bf5xx_nand_probe(struct platform_device *pdev)
  33
  34         platform_set_drvdata(pdev, info);
  35
  36 -       spin_lock_init(&info->controller.lock);
  37 -       init_waitqueue_head(&info->controller.wq);
  38 +       nand_hw_control_init(&info->controller);
  39
  40         info->device     = &pdev->dev;
  41         info->platform   = plat;
  42 diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c
  43 index 8eb2c64..82ec36b 100644
  44 --- a/drivers/mtd/nand/brcmnand/brcmnand.c
  45 +++ b/drivers/mtd/nand/brcmnand/brcmnand.c
  46 @@ -2370,8 +2370,7 @@ int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc)
  47
  48         init_completion(&ctrl->done);
  49         init_completion(&ctrl->dma_done);
  50 -       spin_lock_init(&ctrl->controller.lock);
  51 -       init_waitqueue_head(&ctrl->controller.wq);
  52 +       nand_hw_control_init(&ctrl->controller);
  53         INIT_LIST_HEAD(&ctrl->host_list);
  54
  55         /* NAND register range */
  56 diff --git a/drivers/mtd/nand/docg4.c b/drivers/mtd/nand/docg4.c
  57 index 4731699..7af2a3c 100644
  58 --- a/drivers/mtd/nand/docg4.c
  59 +++ b/drivers/mtd/nand/docg4.c
  60 @@ -1249,8 +1249,7 @@ static void __init init_mtd_structs(struct mtd_info *mtd)
  61         nand->options = NAND_BUSWIDTH_16 | NAND_NO_SUBPAGE_WRITE;
  62         nand->IO_ADDR_R = nand->IO_ADDR_W = doc->virtadr + DOC_IOSPACE_DATA;
  63         nand->controller = &nand->hwcontrol;
  64 -       spin_lock_init(&nand->controller->lock);
  65 -       init_waitqueue_head(&nand->controller->wq);
  66 +       nand_hw_control_init(nand->controller);
  67
  68         /* methods */
  69         nand->cmdfunc = docg4_command;
  70 diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
  71 index 60a88f2..113f76e 100644
  72 --- a/drivers/mtd/nand/fsl_elbc_nand.c
  73 +++ b/drivers/mtd/nand/fsl_elbc_nand.c
  74 @@ -879,8 +879,7 @@ static int fsl_elbc_nand_probe(struct platform_device *pdev)
  75                 }
  76                 elbc_fcm_ctrl->counter++;
  77
  78 -               spin_lock_init(&elbc_fcm_ctrl->controller.lock);
  79 -               init_waitqueue_head(&elbc_fcm_ctrl->controller.wq);
  80 +               nand_hw_control_init(&elbc_fcm_ctrl->controller);
  81                 fsl_lbc_ctrl_dev->nand = elbc_fcm_ctrl;
  82         } else {
  83                 elbc_fcm_ctrl = fsl_lbc_ctrl_dev->nand;
  84 diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c
  85 index 4e9e5fd..0a177b1 100644
  86 --- a/drivers/mtd/nand/fsl_ifc_nand.c
  87 +++ b/drivers/mtd/nand/fsl_ifc_nand.c
  88 @@ -987,8 +987,7 @@ static int fsl_ifc_nand_probe(struct platform_device *dev)
  89                 ifc_nand_ctrl->addr = NULL;
  90                 fsl_ifc_ctrl_dev->nand = ifc_nand_ctrl;
  91
  92 -               spin_lock_init(&ifc_nand_ctrl->controller.lock);
  93 -               init_waitqueue_head(&ifc_nand_ctrl->controller.wq);
  94 +               nand_hw_control_init(&ifc_nand_ctrl->controller);
  95         } else {
  96                 ifc_nand_ctrl = fsl_ifc_ctrl_dev->nand;
  97         }
  98 diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
  99 index 77533f7..53ea796 100644
 100 --- a/drivers/mtd/nand/nand_base.c
 101 +++ b/drivers/mtd/nand/nand_base.c
 102 @@ -3191,8 +3191,7 @@ static void nand_set_defaults(struct nand_chip *chip, int busw)
 103
 104         if (!chip->controller) {
 105                 chip->controller = &chip->hwcontrol;
 106 -               spin_lock_init(&chip->controller->lock);
 107 -               init_waitqueue_head(&chip->controller->wq);
 108 +               nand_hw_control_init(chip->controller);
 109         }
 110
 111  }
 112 diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
 113 index 218c789..28e6118 100644
 114 --- a/drivers/mtd/nand/ndfc.c
 115 +++ b/drivers/mtd/nand/ndfc.c
 116 @@ -218,8 +218,7 @@ static int ndfc_probe(struct platform_device *ofdev)
 117         ndfc = &ndfc_ctrl[cs];
 118         ndfc->chip_select = cs;
 119
 120 -       spin_lock_init(&ndfc->ndfc_control.lock);
 121 -       init_waitqueue_head(&ndfc->ndfc_control.wq);
 122 +       nand_hw_control_init(&ndfc->ndfc_control);
 123         ndfc->ofdev = ofdev;
 124         dev_set_drvdata(&ofdev->dev, ndfc);
 125
 126 diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
 127 index 436dd6d..b121bf4 100644
 128 --- a/drivers/mtd/nand/pxa3xx_nand.c
 129 +++ b/drivers/mtd/nand/pxa3xx_nand.c
 130 @@ -1810,8 +1810,7 @@ static int alloc_nand_resource(struct platform_device *pdev)
 131                 chip->cmdfunc           = nand_cmdfunc;
 132         }
 133
 134 -       spin_lock_init(&chip->controller->lock);
 135 -       init_waitqueue_head(&chip->controller->wq);
 136 +       nand_hw_control_init(chip->controller);
 137         info->clk = devm_clk_get(&pdev->dev, NULL);
 138         if (IS_ERR(info->clk)) {
 139                 dev_err(&pdev->dev, "failed to get nand clock\n");
 140 diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
 141 index d9309cf..b1734d7 100644
 142 --- a/drivers/mtd/nand/s3c2410.c
 143 +++ b/drivers/mtd/nand/s3c2410.c
 144 @@ -977,8 +977,7 @@ static int s3c24xx_nand_probe(struct platform_device *pdev)
 145
 146         platform_set_drvdata(pdev, info);
 147
 148 -       spin_lock_init(&info->controller.lock);
 149 -       init_waitqueue_head(&info->controller.wq);
 150 +       nand_hw_control_init(&info->controller);
 151
 152         /* get the clock source and enable it */
 153
 154 diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c
 155 index e414b31..8b5dadc 100644
 156 --- a/drivers/mtd/nand/sunxi_nand.c
 157 +++ b/drivers/mtd/nand/sunxi_nand.c
 158 @@ -2175,8 +2175,7 @@ static int sunxi_nfc_probe(struct platform_device *pdev)
 159                 return -ENOMEM;
 160
 161         nfc->dev = dev;
 162 -       spin_lock_init(&nfc->controller.lock);
 163 -       init_waitqueue_head(&nfc->controller.wq);
 164 +       nand_hw_control_init(&nfc->controller);
 165         INIT_LIST_HEAD(&nfc->chips);
 166
 167         r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 168 diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c
 169 index 04d63f5..0a14fda 100644
 170 --- a/drivers/mtd/nand/txx9ndfmc.c
 171 +++ b/drivers/mtd/nand/txx9ndfmc.c
 172 @@ -303,8 +303,7 @@ static int __init txx9ndfmc_probe(struct platform_device *dev)
 173         dev_info(&dev->dev, "CLK:%ldMHz HOLD:%d SPW:%d\n",
 174                  (gbusclk + 500000) / 1000000, hold, spw);
 175
 176 -       spin_lock_init(&drvdata->hw_control.lock);
 177 -       init_waitqueue_head(&drvdata->hw_control.wq);
 178 +       nand_hw_control_init(&drvdata->hw_control);
 179
 180         platform_set_drvdata(dev, drvdata);
 181         txx9ndfmc_initialize(dev);
 182 diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
 183 index 8dd6e01..f6a2d5e 100644
 184 --- a/include/linux/mtd/nand.h
 185 +++ b/include/linux/mtd/nand.h
 186 @@ -460,6 +460,13 @@ struct nand_hw_control {
 187         wait_queue_head_t wq;
 188  };
 189
 190 +static inline void nand_hw_control_init(struct nand_hw_control *nfc)
 191 +{
 192 +       nfc->active = NULL;
 193 +       spin_lock_init(&nfc->lock);
 194 +       init_waitqueue_head(&nfc->wq);
 195 +}
 196 +
 197  /**
 198   * struct nand_ecc_ctrl - Control structure for ECC
 199   * @mode:      ECC mode
 200 --
 201 2.10.2
 202