diff options
author | Mark Lord <liml@rtr.ca> | 2008-04-16 15:00:17 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-17 15:56:21 -0400 |
commit | 8a74f1a4680614dfb77fc5dfd37d0ece13b2b357 (patch) | |
tree | fe934145b3be41b7e9c61e26ad6d09db6d961f74 /drivers/ata | |
parent | e49856d82a887ce365637176f9f99ab68076eae8 (diff) |
sata_mv remove redundant edma init code
Remove unnecessary edma init code from port_start.
This sequence gets done later on the first I/O to the port.
Signed-off-by: Mark Lord <mlord@pobox.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/sata_mv.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index b822b8a40c65..82632e7e34f0 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
@@ -1144,8 +1144,6 @@ static int mv_port_start(struct ata_port *ap) | |||
1144 | struct device *dev = ap->host->dev; | 1144 | struct device *dev = ap->host->dev; |
1145 | struct mv_host_priv *hpriv = ap->host->private_data; | 1145 | struct mv_host_priv *hpriv = ap->host->private_data; |
1146 | struct mv_port_priv *pp; | 1146 | struct mv_port_priv *pp; |
1147 | void __iomem *port_mmio = mv_ap_base(ap); | ||
1148 | unsigned long flags; | ||
1149 | int tag; | 1147 | int tag; |
1150 | 1148 | ||
1151 | pp = devm_kzalloc(dev, sizeof(*pp), GFP_KERNEL); | 1149 | pp = devm_kzalloc(dev, sizeof(*pp), GFP_KERNEL); |
@@ -1178,18 +1176,6 @@ static int mv_port_start(struct ata_port *ap) | |||
1178 | pp->sg_tbl_dma[tag] = pp->sg_tbl_dma[0]; | 1176 | pp->sg_tbl_dma[tag] = pp->sg_tbl_dma[0]; |
1179 | } | 1177 | } |
1180 | } | 1178 | } |
1181 | |||
1182 | spin_lock_irqsave(&ap->host->lock, flags); | ||
1183 | |||
1184 | mv_edma_cfg(ap, 0); | ||
1185 | mv_set_edma_ptrs(port_mmio, hpriv, pp); | ||
1186 | |||
1187 | spin_unlock_irqrestore(&ap->host->lock, flags); | ||
1188 | |||
1189 | /* Don't turn on EDMA here...do it before DMA commands only. Else | ||
1190 | * we'll be unable to send non-data, PIO, etc due to restricted access | ||
1191 | * to shadow regs. | ||
1192 | */ | ||
1193 | return 0; | 1179 | return 0; |
1194 | 1180 | ||
1195 | out_port_free_dma_mem: | 1181 | out_port_free_dma_mem: |