From b05fb671ffd98165437545dc40a6c8193bac8b11 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 11 Nov 2015 15:17:36 -0600 Subject: [PATCH] Trivial simplification to logic of last commit --- arch/arm/src/samv7/sam_qspi.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/arch/arm/src/samv7/sam_qspi.c b/arch/arm/src/samv7/sam_qspi.c index a13ae888765..e63a6ce22b1 100644 --- a/arch/arm/src/samv7/sam_qspi.c +++ b/arch/arm/src/samv7/sam_qspi.c @@ -1569,9 +1569,6 @@ static int qspi_memory(struct qspi_dev_s *dev, struct qspi_meminfo_s *meminfo) { struct sam_qspidev_s *priv = (struct sam_qspidev_s *)dev; -#ifdef CONFIG_SAMV7_QSPI_DMA - bool aligned; -#endif DEBUGASSERT(priv != NULL && meminfo != NULL); @@ -1584,16 +1581,12 @@ static int qspi_memory(struct qspi_dev_s *dev, qspivdbg(" buffer/length: %p/%d\n", meminfo->buffer, meminfo->buflen); #ifdef CONFIG_SAMV7_QSPI_DMA - /* Check for attempt to do unaligned read */ - - aligned = IS_ALIGNED((uintptr_t)meminfo->buffer) && - IS_ALIGNED(meminfo->buflen); - /* Can we perform DMA? Should we perform DMA? */ if (priv->candma && meminfo->buflen > CONFIG_SAMV7_QSPI_DMATHRESHOLD && - aligned) + IS_ALIGNED((uintptr_t)meminfo->buffer) && + IS_ALIGNED(meminfo->buflen)) { return qspi_memory_dma(priv, meminfo); }