Skip to content

Commit e7ccaaa

Browse files
committed
Fix Sparse warnings
Merge series from Hardevsinh Palaniya <[email protected]>: Fix casting warnings and other cleanups: - Use ioread32be instead of readl - Use iowrite32be instead of writel
2 parents eaa59db + f3a59ab commit e7ccaaa

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

drivers/spi/spi-fsl-dspi.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,25 +280,25 @@ static void dspi_native_dev_to_host(struct fsl_dspi *dspi, u32 rxdata)
280280

281281
static void dspi_8on32_host_to_dev(struct fsl_dspi *dspi, u32 *txdata)
282282
{
283-
*txdata = cpu_to_be32(*(u32 *)dspi->tx);
283+
*txdata = (__force u32)cpu_to_be32(*(u32 *)dspi->tx);
284284
dspi->tx += sizeof(u32);
285285
}
286286

287287
static void dspi_8on32_dev_to_host(struct fsl_dspi *dspi, u32 rxdata)
288288
{
289-
*(u32 *)dspi->rx = be32_to_cpu(rxdata);
289+
*(u32 *)dspi->rx = be32_to_cpu((__force __be32)rxdata);
290290
dspi->rx += sizeof(u32);
291291
}
292292

293293
static void dspi_8on16_host_to_dev(struct fsl_dspi *dspi, u32 *txdata)
294294
{
295-
*txdata = cpu_to_be16(*(u16 *)dspi->tx);
295+
*txdata = (__force u32)cpu_to_be16(*(u16 *)dspi->tx);
296296
dspi->tx += sizeof(u16);
297297
}
298298

299299
static void dspi_8on16_dev_to_host(struct fsl_dspi *dspi, u32 rxdata)
300300
{
301-
*(u16 *)dspi->rx = be16_to_cpu(rxdata);
301+
*(u16 *)dspi->rx = be16_to_cpu((__force __be16)rxdata);
302302
dspi->rx += sizeof(u16);
303303
}
304304

drivers/spi/spi-imx.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ static void spi_imx_buf_tx_swap(struct spi_imx_data *spi_imx)
407407

408408
static void mx53_ecspi_rx_target(struct spi_imx_data *spi_imx)
409409
{
410-
u32 val = be32_to_cpu(readl(spi_imx->base + MXC_CSPIRXDATA));
410+
u32 val = ioread32be(spi_imx->base + MXC_CSPIRXDATA);
411411

412412
if (spi_imx->rx_buf) {
413413
int n_bytes = spi_imx->target_burst % sizeof(val);
@@ -436,13 +436,12 @@ static void mx53_ecspi_tx_target(struct spi_imx_data *spi_imx)
436436
if (spi_imx->tx_buf) {
437437
memcpy(((u8 *)&val) + sizeof(val) - n_bytes,
438438
spi_imx->tx_buf, n_bytes);
439-
val = cpu_to_be32(val);
440439
spi_imx->tx_buf += n_bytes;
441440
}
442441

443442
spi_imx->count -= n_bytes;
444443

445-
writel(val, spi_imx->base + MXC_CSPITXDATA);
444+
iowrite32be(val, spi_imx->base + MXC_CSPITXDATA);
446445
}
447446

448447
/* MX51 eCSPI */

0 commit comments

Comments
 (0)