diff options
| author | Mans Rullgard <mans@mansr.com> | 2016-04-26 12:03:21 +0300 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2016-05-12 10:53:20 -0400 |
| commit | af50f3a8b61cfdfcf4a01b01ec2759200d362605 (patch) | |
| tree | 90cd1f34ebf9deb660d805437ff54a52eea2721d /drivers/ata | |
| parent | ee81d6cc8e8aa667aabce72f39a4b806419e1d55 (diff) | |
| download | linux-af50f3a8b61cfdfcf4a01b01ec2759200d362605.tar.bz2 | |
ata: sata_dwc_460ex: tidy up sata_dwc_clear_dmacr()
This consolidates the reads from each of the if/else branches
to one place making the code a lot nicer to look at.
Tested-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/sata_dwc_460ex.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c index b7828c702112..b4459fd6cd37 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); } |