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
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.
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>
15 drivers/spi/spi-qup.c | 61 ++++++++-----------------------------------------
16 1 file changed, 9 insertions(+), 52 deletions(-)
18 --- a/drivers/spi/spi-qup.c
19 +++ b/drivers/spi/spi-qup.c
21 #define SPI_DELAY_THRESHOLD 1
22 #define SPI_DELAY_RETRY 10
24 -struct spi_qup_device {
32 @@ -338,14 +333,13 @@ static irqreturn_t spi_qup_qup_irq(int i
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)
41 + struct spi_qup *controller = spi_master_get_devdata(spi->master);
42 u32 config, iomode, mode;
43 int ret, n_words, w_size;
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);
50 @@ -399,12 +393,12 @@ static int spi_qup_io_config(struct spi_
52 config = readl_relaxed(controller->base + SPI_CONFIG);
54 - if (chip->mode & SPI_LOOP)
55 + if (spi->mode & SPI_LOOP)
56 config |= SPI_CONFIG_LOOPBACK;
58 config &= ~SPI_CONFIG_LOOPBACK;
60 - if (chip->mode & SPI_CPHA)
61 + if (spi->mode & SPI_CPHA)
62 config &= ~SPI_CONFIG_INPUT_FIRST;
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.
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;
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)
77 struct spi_qup *controller = spi_master_get_devdata(spi->master);
78 - struct spi_qup_device *chip = spi_get_ctldata(spi);
82 @@ -444,9 +437,9 @@ static void spi_qup_set_cs(struct spi_de
83 iocontol |= SPI_IO_C_FORCE_CS;
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);
89 - mask = SPI_IO_C_CS_N_POLARITY_0 << chip->select;
90 + mask = SPI_IO_C_CS_N_POLARITY_0 << spi->chip_select;
94 @@ -461,11 +454,10 @@ static int spi_qup_transfer_one(struct s
95 struct spi_transfer *xfer)
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;
102 - ret = spi_qup_io_config(controller, chip, xfer);
103 + ret = spi_qup_io_config(spi, xfer);
107 @@ -511,38 +503,6 @@ exit:
111 -static int spi_qup_setup(struct spi_device *spi)
113 - struct spi_qup *controller = spi_master_get_devdata(spi->master);
114 - struct spi_qup_device *chip = spi_get_ctldata(spi);
118 - chip = kzalloc(sizeof(*chip), GFP_KERNEL);
120 - dev_err(controller->dev, "no memory for chip data\n");
124 - chip->mode = spi->mode;
125 - chip->select = spi->chip_select;
126 - spi_set_ctldata(spi, chip);
132 -static void spi_qup_cleanup(struct spi_device *spi)
134 - struct spi_qup_device *chip = spi_get_ctldata(spi);
139 - spi_set_ctldata(spi, NULL);
143 static int spi_qup_probe(struct platform_device *pdev)
145 struct spi_master *master;
146 @@ -561,7 +521,6 @@ static int spi_qup_probe(struct platform
147 return PTR_ERR(base);
149 irq = platform_get_irq(pdev, 0);
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;