Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 12f00caf61677aca8f390651546f203575e20643

Authored by Axel Lin
Committed by Jagannadha Sutradharudu Teki
1 parent d1f22d4bdf
Exists in master and in 50 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

spi: sh_spi: Use sh_spi_clear_bit() instead of open-coded 

We have a sh_spi_clear_bit() function, there's no reason not to use it.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Reviewed-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>

Showing 1 changed file with 2 additions and 8 deletions Side-by-side Diff

drivers/spi/sh_spi.c
Diff comments   View file @ 12f00ca
... ... @@ -151,7 +151,6 @@
151 151 {
152 152 int i, cur_len, ret = 0;
153 153 int remain = (int)len;
154   - unsigned long tmp;
155 154  
156 155 if (len >= SH_SPI_FIFO_SIZE)
157 156 sh_spi_set_bit(SH_SPI_SSA, &ss->regs->cr1);
... ... @@ -183,9 +182,7 @@
183 182 }
184 183  
185 184 if (flags & SPI_XFER_END) {
186   - tmp = sh_spi_read(&ss->regs->cr1);
187   - tmp = tmp & ~(SH_SPI_SSD | SH_SPI_SSDB);
188   - sh_spi_write(tmp, &ss->regs->cr1);
  185 + sh_spi_clear_bit(SH_SPI_SSD | SH_SPI_SSDB, &ss->regs->cr1);
189 186 sh_spi_set_bit(SH_SPI_SSA, &ss->regs->cr1);
190 187 udelay(100);
191 188 write_fifo_empty_wait(ss);
192 189  
... ... @@ -198,16 +195,13 @@
198 195 unsigned int len, unsigned long flags)
199 196 {
200 197 int i;
201   - unsigned long tmp;
202 198  
203 199 if (len > SH_SPI_MAX_BYTE)
204 200 sh_spi_write(SH_SPI_MAX_BYTE, &ss->regs->cr3);
205 201 else
206 202 sh_spi_write(len, &ss->regs->cr3);
207 203  
208   - tmp = sh_spi_read(&ss->regs->cr1);
209   - tmp = tmp & ~(SH_SPI_SSD | SH_SPI_SSDB);
210   - sh_spi_write(tmp, &ss->regs->cr1);
  204 + sh_spi_clear_bit(SH_SPI_SSD | SH_SPI_SSDB, &ss->regs->cr1);
211 205 sh_spi_set_bit(SH_SPI_SSA, &ss->regs->cr1);
212 206  
213 207 for (i = 0; i < len; i++) {