hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Mans Rullgard 2016-04-26 12:03:21 +03:00 committed by Tejun Heo
parent ee81d6cc8e
commit af50f3a8b6
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/ata/sata_dwc_460ex.c
View File

@ -729,15 +729,14 @@ DONE:
static void sata_dwc_clear_dmacr(struct sata_dwc_device_port *hsdevp, u8 tag) static void sata_dwc_clear_dmacr(struct sata_dwc_device_port *hsdevp, u8 tag)
{ {
struct sata_dwc_device *hsdev = HSDEV_FROM_HSDEVP(hsdevp); 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) { if (hsdevp->dma_pending[tag] == SATA_DWC_DMA_PENDING_RX) {
sata_dwc_writel(&hsdev->sata_dwc_regs->dmacr, dmacr = SATA_DWC_DMACR_RX_CLEAR(dmacr);
SATA_DWC_DMACR_RX_CLEAR( sata_dwc_writel(&hsdev->sata_dwc_regs->dmacr, dmacr);
sata_dwc_readl(&hsdev->sata_dwc_regs->dmacr)));
} else if (hsdevp->dma_pending[tag] == SATA_DWC_DMA_PENDING_TX) { } else if (hsdevp->dma_pending[tag] == SATA_DWC_DMA_PENDING_TX) {
sata_dwc_writel(&hsdev->sata_dwc_regs->dmacr, dmacr = SATA_DWC_DMACR_TX_CLEAR(dmacr);
SATA_DWC_DMACR_TX_CLEAR( sata_dwc_writel(&hsdev->sata_dwc_regs->dmacr, dmacr);
sata_dwc_readl(&hsdev->sata_dwc_regs->dmacr)));
} else { } else {
/* /*
* This should not happen, it indicates the driver is out of * 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, dev_err(hsdev->dev,
"%s DMA protocol RX and TX DMA not pending tag=0x%02x pending=%d dmacr: 0x%08x\n", "%s DMA protocol RX and TX DMA not pending tag=0x%02x pending=%d dmacr: 0x%08x\n",
__func__, tag, hsdevp->dma_pending[tag], __func__, tag, hsdevp->dma_pending[tag], dmacr);
sata_dwc_readl(&hsdev->sata_dwc_regs->dmacr));
sata_dwc_writel(&hsdev->sata_dwc_regs->dmacr, sata_dwc_writel(&hsdev->sata_dwc_regs->dmacr,
SATA_DWC_DMACR_TXRXCH_CLEAR); SATA_DWC_DMACR_TXRXCH_CLEAR);
} }