45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
|
From 31d5393ea4defd3872dc07264912f60ad627782b Mon Sep 17 00:00:00 2001
|
|||
|
From: Yunhui Cui <yunhui.cui@nxp.com>
|
|||
|
Date: Tue, 12 Jul 2016 11:29:52 +0800
|
|||
|
Subject: [PATCH 72/93] driver: spi: fsl-qspi: remove compile Warnings
|
|||
|
MIME-Version: 1.0
|
|||
|
Content-Type: text/plain; charset=UTF-8
|
|||
|
Content-Transfer-Encoding: 8bit
|
|||
|
|
|||
|
Warnins log:
|
|||
|
drivers/spi/fsl_qspi.c: In function ‘qspi_ahb_read’:
|
|||
|
drivers/spi/fsl_qspi.c:400:16: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
|
|||
|
memcpy(rxbuf, (u8 *)(priv->cur_amba_base + priv->sf_addr), len);
|
|||
|
|
|||
|
Signed-off-by: Yunhui Cui <yunhui.cui@nxp.com>
|
|||
|
---
|
|||
|
drivers/spi/fsl_qspi.c | 4 +++-
|
|||
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|||
|
|
|||
|
diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c
|
|||
|
index f1c87f5..f521fe2 100644
|
|||
|
--- a/drivers/spi/fsl_qspi.c
|
|||
|
+++ b/drivers/spi/fsl_qspi.c
|
|||
|
@@ -389,6 +389,7 @@ static inline void qspi_ahb_read(struct fsl_qspi_priv *priv, u8 *rxbuf, int len)
|
|||
|
{
|
|||
|
struct fsl_qspi_regs *regs = priv->regs;
|
|||
|
u32 mcr_reg;
|
|||
|
+ void *rx_addr = NULL;
|
|||
|
|
|||
|
mcr_reg = qspi_read32(priv->flags, ®s->mcr);
|
|||
|
|
|||
|
@@ -396,8 +397,9 @@ static inline void qspi_ahb_read(struct fsl_qspi_priv *priv, u8 *rxbuf, int len)
|
|||
|
QSPI_MCR_CLR_RXF_MASK | QSPI_MCR_CLR_TXF_MASK |
|
|||
|
QSPI_MCR_RESERVED_MASK | QSPI_MCR_END_CFD_LE);
|
|||
|
|
|||
|
+ rx_addr += priv->cur_amba_base + priv->sf_addr;
|
|||
|
/* Read out the data directly from the AHB buffer. */
|
|||
|
- memcpy(rxbuf, (u8 *)(priv->cur_amba_base + priv->sf_addr), len);
|
|||
|
+ memcpy(rxbuf, rx_addr, len);
|
|||
|
|
|||
|
qspi_write32(priv->flags, ®s->mcr, mcr_reg);
|
|||
|
}
|
|||
|
--
|
|||
|
1.7.9.5
|
|||
|
|