summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Dietsche <Gregory.Dietsche@cuw.edu>2011-06-16 11:39:21 -0500
committerJeff Garzik <jgarzik@pobox.com>2011-07-23 18:07:27 -0400
commit47db477e46fa12eec40597b365ef1fad1cf17842 (patch)
treed510ac9056b18bcbd3fd227dff8c286079cb130d
parentd4d8eaff78b1b0043e7674bead7018e4db8b03ba (diff)
downloadlinux-3.10-47db477e46fa12eec40597b365ef1fad1cf17842.tar.gz
linux-3.10-47db477e46fa12eec40597b365ef1fad1cf17842.tar.bz2
linux-3.10-47db477e46fa12eec40597b365ef1fad1cf17842.zip
ata: remove unnecessary code
Compile tested. remove unnecessary code that matches this coccinelle pattern if (...) return ret; return ret; Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r--drivers/ata/pata_acpi.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c
index 91949d99755..54145edf50e 100644
--- a/drivers/ata/pata_acpi.c
+++ b/drivers/ata/pata_acpi.c
@@ -195,8 +195,6 @@ static int pacpi_port_start(struct ata_port *ap)
struct pci_dev *pdev = to_pci_dev(ap->host->dev);
struct pata_acpi *acpi;
- int ret;
-
if (ap->acpi_handle == NULL)
return -ENODEV;
@@ -205,11 +203,7 @@ static int pacpi_port_start(struct ata_port *ap)
return -ENOMEM;
acpi->mask[0] = pacpi_discover_modes(ap, &ap->link.device[0]);
acpi->mask[1] = pacpi_discover_modes(ap, &ap->link.device[1]);
- ret = ata_bmdma_port_start(ap);
- if (ret < 0)
- return ret;
-
- return ret;
+ return ata_bmdma_port_start(ap);
}
static struct scsi_host_template pacpi_sht = {