From c315bea68b90552df1ccdb98c85cb267b1e12fa0 Mon Sep 17 00:00:00 2001 From: Mark Lord Date: Sat, 26 Jan 2008 18:31:00 -0500 Subject: [PATCH] --- yaml --- r: 82043 b: refs/heads/master c: f630d562829fcd8160a118f98c1e5b9cdb4e703e h: refs/heads/master i: 82041: 6b1dafd6f123e30c651ebff64781e29b3e219ee6 82039: 7e21eca4213716cd30558265f2063a627d7cb7c5 v: v3 --- [refs] | 2 +- trunk/drivers/ata/sata_mv.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 86777df37d9a..0a336ec0ba44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 646a4da514f2555298481cb00dc5b3eb02b21b72 +refs/heads/master: f630d562829fcd8160a118f98c1e5b9cdb4e703e diff --git a/trunk/drivers/ata/sata_mv.c b/trunk/drivers/ata/sata_mv.c index 576e0cc19e25..298f17d6e12c 100644 --- a/trunk/drivers/ata/sata_mv.c +++ b/trunk/drivers/ata/sata_mv.c @@ -834,19 +834,19 @@ static void mv_set_edma_ptrs(void __iomem *port_mmio, * LOCKING: * Inherited from caller. */ -static void mv_start_dma(void __iomem *base, struct mv_host_priv *hpriv, +static void mv_start_dma(void __iomem *port_mmio, struct mv_host_priv *hpriv, struct mv_port_priv *pp) { if (!(pp->pp_flags & MV_PP_FLAG_EDMA_EN)) { /* clear EDMA event indicators, if any */ - writelfl(0, base + EDMA_ERR_IRQ_CAUSE_OFS); + writelfl(0, port_mmio + EDMA_ERR_IRQ_CAUSE_OFS); - mv_set_edma_ptrs(base, hpriv, pp); + mv_set_edma_ptrs(port_mmio, hpriv, pp); - writelfl(EDMA_EN, base + EDMA_CMD_OFS); + writelfl(EDMA_EN, port_mmio + EDMA_CMD_OFS); pp->pp_flags |= MV_PP_FLAG_EDMA_EN; } - WARN_ON(!(EDMA_EN & readl(base + EDMA_CMD_OFS))); + WARN_ON(!(EDMA_EN & readl(port_mmio + EDMA_CMD_OFS))); } /**