From 3d963b90b44a88a3e75fbefd77167a051de3f8ce Mon Sep 17 00:00:00 2001 From: Mark Lord Date: Wed, 16 Apr 2008 15:00:17 -0400 Subject: [PATCH] --- yaml --- r: 89295 b: refs/heads/master c: 8a74f1a4680614dfb77fc5dfd37d0ece13b2b357 h: refs/heads/master i: 89293: 4bfe863a6512d6664b0dbb3406a3ed1b346adc56 89291: 29b61dbfc81ac1498801ddf4d098ae3046f50bfd 89287: 6b9bd149e06e1dbb9510de4af27e72d027d051ad 89279: ec46b249990d5607d8f67c9e82940ed0eb4b5a3e v: v3 --- [refs] | 2 +- trunk/drivers/ata/sata_mv.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/[refs] b/[refs] index bb5f47ab25d7..d104a9f2c52b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e49856d82a887ce365637176f9f99ab68076eae8 +refs/heads/master: 8a74f1a4680614dfb77fc5dfd37d0ece13b2b357 diff --git a/trunk/drivers/ata/sata_mv.c b/trunk/drivers/ata/sata_mv.c index b822b8a40c65..82632e7e34f0 100644 --- a/trunk/drivers/ata/sata_mv.c +++ b/trunk/drivers/ata/sata_mv.c @@ -1144,8 +1144,6 @@ static int mv_port_start(struct ata_port *ap) struct device *dev = ap->host->dev; struct mv_host_priv *hpriv = ap->host->private_data; struct mv_port_priv *pp; - void __iomem *port_mmio = mv_ap_base(ap); - unsigned long flags; int tag; pp = devm_kzalloc(dev, sizeof(*pp), GFP_KERNEL); @@ -1178,18 +1176,6 @@ static int mv_port_start(struct ata_port *ap) pp->sg_tbl_dma[tag] = pp->sg_tbl_dma[0]; } } - - spin_lock_irqsave(&ap->host->lock, flags); - - mv_edma_cfg(ap, 0); - mv_set_edma_ptrs(port_mmio, hpriv, pp); - - spin_unlock_irqrestore(&ap->host->lock, flags); - - /* Don't turn on EDMA here...do it before DMA commands only. Else - * we'll be unable to send non-data, PIO, etc due to restricted access - * to shadow regs. - */ return 0; out_port_free_dma_mem: