From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: "Tejun Heo" <tj@kernel.org>,
linux-ide@vger.kernel.org, "Rob Herring" <robh+dt@kernel.org>,
linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
"Christian Lamparter" <chunkeey@googlemail.com>,
"Måns Rullgård" <mans@mansr.com>,
"Julian Margetson" <runaway@candw.ms>
Subject: [PATCH v1 20/23] ata: sata_dwc_460ex: tidy up sata_dwc_clear_dmacr()
Date: Thu, 21 Apr 2016 21:15:41 +0300 [thread overview]
Message-ID: <1461262544-115408-21-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1461262544-115408-1-git-send-email-andriy.shevchenko@linux.intel.com>
From: Mans Rullgard <mans@mansr.com>
This consolidates the reads from each of the if/else branches
to one place making the code a lot nicer to look at.
Signed-off-by: Mans Rullgard <mans@mansr.com>
---
drivers/ata/sata_dwc_460ex.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c
index 2029f43..0ef72e4 100644
--- a/drivers/ata/sata_dwc_460ex.c
+++ b/drivers/ata/sata_dwc_460ex.c
@@ -729,15 +729,14 @@ DONE:
static void sata_dwc_clear_dmacr(struct sata_dwc_device_port *hsdevp, u8 tag)
{
struct sata_dwc_device *hsdev = HSDEV_FROM_HSDEVP(hsdevp);
+ u32 dmacr = sata_dwc_readl(&hsdev->sata_dwc_regs->dmacr);
if (hsdevp->dma_pending[tag] == SATA_DWC_DMA_PENDING_RX) {
- sata_dwc_writel(&hsdev->sata_dwc_regs->dmacr,
- SATA_DWC_DMACR_RX_CLEAR(
- sata_dwc_readl(&hsdev->sata_dwc_regs->dmacr)));
+ dmacr = SATA_DWC_DMACR_RX_CLEAR(dmacr);
+ sata_dwc_writel(&hsdev->sata_dwc_regs->dmacr, dmacr);
} else if (hsdevp->dma_pending[tag] == SATA_DWC_DMA_PENDING_TX) {
- sata_dwc_writel(&hsdev->sata_dwc_regs->dmacr,
- SATA_DWC_DMACR_TX_CLEAR(
- sata_dwc_readl(&hsdev->sata_dwc_regs->dmacr)));
+ dmacr = SATA_DWC_DMACR_TX_CLEAR(dmacr);
+ sata_dwc_writel(&hsdev->sata_dwc_regs->dmacr, dmacr);
} else {
/*
* This should not happen, it indicates the driver is out of
@@ -745,8 +744,7 @@ static void sata_dwc_clear_dmacr(struct sata_dwc_device_port *hsdevp, u8 tag)
*/
dev_err(hsdev->dev,
"%s DMA protocol RX and TX DMA not pending tag=0x%02x pending=%d dmacr: 0x%08x\n",
- __func__, tag, hsdevp->dma_pending[tag],
- sata_dwc_readl(&hsdev->sata_dwc_regs->dmacr));
+ __func__, tag, hsdevp->dma_pending[tag], dmacr);
sata_dwc_writel(&hsdev->sata_dwc_regs->dmacr,
SATA_DWC_DMACR_TXRXCH_CLEAR);
}
--
2.8.0.rc3
next prev parent reply other threads:[~2016-04-21 18:15 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-21 18:15 [PATCH v1 00/23] ata: sata_dwc_460ex: make it working again Andy Shevchenko
2016-04-21 18:15 ` [PATCH v1 01/23] ata: sata_dwc_460ex: remove incorrect locking Andy Shevchenko
2016-04-21 18:15 ` [PATCH v1 02/23] ata: sata_dwc_460ex: fix crash on offline links without an attached drive Andy Shevchenko
2016-04-21 18:15 ` [PATCH v1 03/23] ata: sata_dwc_460ex: set dma_boundary to 0x1fff Andy Shevchenko
2016-04-22 13:13 ` Sergei Shtylyov
2016-04-21 18:15 ` [PATCH v1 04/23] ata: sata_dwc_460ex: burst size must be in items not bytes Andy Shevchenko
2016-04-21 18:15 ` [PATCH v1 05/23] ata: sata_dwc_460ex: DMA is always a flow controller Andy Shevchenko
2016-04-21 18:15 ` [PATCH v1 06/23] ata: sata_dwc_460ex: select only core part of DMA driver Andy Shevchenko
2016-04-21 18:15 ` [PATCH v1 07/23] ata: sata_dwc_460ex: skip dma setup for non-dma commands Andy Shevchenko
2016-04-21 18:15 ` [PATCH v1 08/23] ata: sata_dwc_460ex: don't call ata_sff_qc_issue() on DMA commands Andy Shevchenko
2016-04-22 11:32 ` David Laight
2016-04-22 11:44 ` Christian Lamparter
2016-04-21 18:15 ` [PATCH v1 09/23] ata: sata_dwc_460ex: use "dmas" DT property to find dma channel Andy Shevchenko
2016-04-21 18:15 ` [PATCH v1 10/23] ata: sata_dwc_460ex: add phy support Andy Shevchenko
2016-04-21 18:15 ` [PATCH v1 11/23] ata: sata_dwc_460ex: get rid of global data Andy Shevchenko
2016-04-21 18:15 ` [PATCH v1 12/23] ata: sata_dwc_460ex: correct HOSTDEV{P}_FROM_*() macros Andy Shevchenko
2016-04-21 18:15 ` [PATCH v1 13/23] ata: sata_dwc_460ex: remove empty libata callback Andy Shevchenko
2016-04-21 18:15 ` [PATCH v1 14/23] ata: sata_dwc_460ex: get rid of some pointless casts Andy Shevchenko
2016-04-21 18:15 ` [PATCH v1 15/23] ata: sata_dwc_460ex: get rid of incorrect cast Andy Shevchenko
2016-04-21 18:15 ` [PATCH v1 16/23] ata: sata_dwc_460ex: add __iomem to register base pointer Andy Shevchenko
2016-04-21 18:15 ` [PATCH v1 17/23] ata: sata_dwc_460ex: supply physical address of FIFO to DMA Andy Shevchenko
2016-04-21 18:15 ` [PATCH v1 18/23] ata: sata_dwc_460ex: switch to new dmaengine_terminate_* API Andy Shevchenko
2016-04-21 18:15 ` [PATCH v1 19/23] ata: sata_dwc_460ex: use readl/writel_relaxed() Andy Shevchenko
2016-04-21 18:15 ` Andy Shevchenko [this message]
2016-04-21 18:15 ` [PATCH v1 21/23] ata: sata_dwc_460ex: use devm_ioremap Andy Shevchenko
2016-04-21 18:15 ` [PATCH v1 22/23] ata: sata_dwc_460ex: make debug messages neat Andy Shevchenko
2016-04-21 18:15 ` [PATCH v1 23/23] powerpc/4xx: Device tree update for the 460ex DWC SATA Andy Shevchenko
2016-04-21 19:59 ` Rob Herring
2016-04-21 20:25 ` [PATCH v1 00/23] ata: sata_dwc_460ex: make it working again Christian Lamparter
2016-04-22 10:50 ` Julian Margetson
2016-04-22 11:06 ` Christian Lamparter
2016-04-23 12:02 ` Julian Margetson
2016-04-23 15:44 ` Julian Margetson
2016-04-23 19:41 ` Christian Lamparter
2016-04-24 13:05 ` Julian Margetson
2016-04-24 15:21 ` Christian Lamparter
2016-04-24 17:51 ` Julian Margetson
2016-04-23 15:44 ` Julian Margetson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461262544-115408-21-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=chunkeey@googlemail.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mans@mansr.com \
--cc=robh+dt@kernel.org \
--cc=runaway@candw.ms \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).