target/linux/ipq806x/patches/0073-spi-qup-Get-rid-of-using-struct-spi_qup_device.patch

   1 From 3027505ab8c8cb17291e53bca1d7bd770539d468 Mon Sep 17 00:00:00 2001
   2 From: Axel Lin <axel.lin@ingics.com>
   3 Date: Mon, 24 Feb 2014 23:07:36 +0800
   4 Subject: [PATCH 073/182] spi: qup: Get rid of using struct spi_qup_device
   5
   6 Current code uses struct spi_qup_device to store spi->mode and spi->chip_select
   7 settings. We can get these settings in spi_qup_transfer_one and spi_qup_set_cs
   8 without using struct spi_qup_device. Refactor the code a bit to remove
   9 spi_qup_setup(), spi_qup_cleanup(), and struct spi_qup_device.
  10
  11 Signed-off-by: Axel Lin <axel.lin@ingics.com>
  12 Tested-by: Ivan T. Ivanov <iivanov@mm-sol.com>
  13 Signed-off-by: Mark Brown <broonie@linaro.org>
  14 ---
  15  drivers/spi/spi-qup.c |   61 ++++++++-----------------------------------------
  16  1 file changed, 9 insertions(+), 52 deletions(-)
  17
  18 --- a/drivers/spi/spi-qup.c
  19 +++ b/drivers/spi/spi-qup.c
  20 @@ -123,11 +123,6 @@
  21  #define SPI_DELAY_THRESHOLD            1
  22  #define SPI_DELAY_RETRY                        10
  23
  24 -struct spi_qup_device {
  25 -       int select;
  26 -       u16 mode;
  27 -};
  28 -
  29  struct spi_qup {
  30         void __iomem            *base;
  31         struct device           *dev;
  32 @@ -338,14 +333,13 @@ static irqreturn_t spi_qup_qup_irq(int i
  33
  34
  35  /* set clock freq ... bits per word */
  36 -static int spi_qup_io_config(struct spi_qup *controller,
  37 -                          struct spi_qup_device *chip,
  38 -                          struct spi_transfer *xfer)
  39 +static int spi_qup_io_config(struct spi_device *spi, struct spi_transfer *xfer)
  40  {
  41 +       struct spi_qup *controller = spi_master_get_devdata(spi->master);
  42         u32 config, iomode, mode;
  43         int ret, n_words, w_size;
  44
  45 -       if (chip->mode & SPI_LOOP && xfer->len > controller->in_fifo_sz) {
  46 +       if (spi->mode & SPI_LOOP && xfer->len > controller->in_fifo_sz) {
  47                 dev_err(controller->dev, "too big size for loopback %d > %d\n",
  48                         xfer->len, controller->in_fifo_sz);
  49                 return -EIO;
  50 @@ -399,12 +393,12 @@ static int spi_qup_io_config(struct spi_
  51
  52         config = readl_relaxed(controller->base + SPI_CONFIG);
  53
  54 -       if (chip->mode & SPI_LOOP)
  55 +       if (spi->mode & SPI_LOOP)
  56                 config |= SPI_CONFIG_LOOPBACK;
  57         else
  58                 config &= ~SPI_CONFIG_LOOPBACK;
  59
  60 -       if (chip->mode & SPI_CPHA)
  61 +       if (spi->mode & SPI_CPHA)
  62                 config &= ~SPI_CONFIG_INPUT_FIRST;
  63         else
  64                 config |= SPI_CONFIG_INPUT_FIRST;
  65 @@ -413,7 +407,7 @@ static int spi_qup_io_config(struct spi_
  66          * HS_MODE improves signal stability for spi-clk high rates,
  67          * but is invalid in loop back mode.
  68          */
  69 -       if ((xfer->speed_hz >= SPI_HS_MIN_RATE) && !(chip->mode & SPI_LOOP))
  70 +       if ((xfer->speed_hz >= SPI_HS_MIN_RATE) && !(spi->mode & SPI_LOOP))
  71                 config |= SPI_CONFIG_HS_MODE;
  72         else
  73                 config &= ~SPI_CONFIG_HS_MODE;
  74 @@ -433,7 +427,6 @@ static int spi_qup_io_config(struct spi_
  75  static void spi_qup_set_cs(struct spi_device *spi, bool enable)
  76  {
  77         struct spi_qup *controller = spi_master_get_devdata(spi->master);
  78 -       struct spi_qup_device *chip = spi_get_ctldata(spi);
  79
  80         u32 iocontol, mask;
  81
  82 @@ -444,9 +437,9 @@ static void spi_qup_set_cs(struct spi_de
  83         iocontol |= SPI_IO_C_FORCE_CS;
  84
  85         iocontol &= ~SPI_IO_C_CS_SELECT_MASK;
  86 -       iocontol |= SPI_IO_C_CS_SELECT(chip->select);
  87 +       iocontol |= SPI_IO_C_CS_SELECT(spi->chip_select);
  88
  89 -       mask = SPI_IO_C_CS_N_POLARITY_0 << chip->select;
  90 +       mask = SPI_IO_C_CS_N_POLARITY_0 << spi->chip_select;
  91
  92         if (enable)
  93                 iocontol |= mask;
  94 @@ -461,11 +454,10 @@ static int spi_qup_transfer_one(struct s
  95                               struct spi_transfer *xfer)
  96  {
  97         struct spi_qup *controller = spi_master_get_devdata(master);
  98 -       struct spi_qup_device *chip = spi_get_ctldata(spi);
  99         unsigned long timeout, flags;
 100         int ret = -EIO;
 101
 102 -       ret = spi_qup_io_config(controller, chip, xfer);
 103 +       ret = spi_qup_io_config(spi, xfer);
 104         if (ret)
 105                 return ret;
 106
 107 @@ -511,38 +503,6 @@ exit:
 108         return ret;
 109  }
 110
 111 -static int spi_qup_setup(struct spi_device *spi)
 112 -{
 113 -       struct spi_qup *controller = spi_master_get_devdata(spi->master);
 114 -       struct spi_qup_device *chip = spi_get_ctldata(spi);
 115 -
 116 -       if (!chip) {
 117 -               /* First setup */
 118 -               chip = kzalloc(sizeof(*chip), GFP_KERNEL);
 119 -               if (!chip) {
 120 -                       dev_err(controller->dev, "no memory for chip data\n");
 121 -                       return -ENOMEM;
 122 -               }
 123 -
 124 -               chip->mode = spi->mode;
 125 -               chip->select = spi->chip_select;
 126 -               spi_set_ctldata(spi, chip);
 127 -       }
 128 -
 129 -       return 0;
 130 -}
 131 -
 132 -static void spi_qup_cleanup(struct spi_device *spi)
 133 -{
 134 -       struct spi_qup_device *chip = spi_get_ctldata(spi);
 135 -
 136 -       if (!chip)
 137 -               return;
 138 -
 139 -       spi_set_ctldata(spi, NULL);
 140 -       kfree(chip);
 141 -}
 142 -
 143  static int spi_qup_probe(struct platform_device *pdev)
 144  {
 145         struct spi_master *master;
 146 @@ -561,7 +521,6 @@ static int spi_qup_probe(struct platform
 147                 return PTR_ERR(base);
 148
 149         irq = platform_get_irq(pdev, 0);
 150 -
 151         if (irq < 0)
 152                 return irq;
 153
 154 @@ -617,8 +576,6 @@ static int spi_qup_probe(struct platform
 155         master->num_chipselect = SPI_NUM_CHIPSELECTS;
 156         master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32);
 157         master->max_speed_hz = max_freq;
 158 -       master->setup = spi_qup_setup;
 159 -       master->cleanup = spi_qup_cleanup;
 160         master->set_cs = spi_qup_set_cs;
 161         master->transfer_one = spi_qup_transfer_one;
 162         master->dev.of_node = pdev->dev.of_node;