aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2007-05-14 14:28:16 -0400
committerJeff Garzik <jeff@garzik.org>2007-07-09 12:17:31 -0400
commite5fa24dfdb522b642dbe9b8b1b692f68dce89835 (patch)
tree97dd6c0e43a77ac3012f7aad154a31746bc3e79a
parent6746544c3b143ca7071d144f1882ccbe1f47b08d (diff)
libata-acpi: remove redundant checks
Remove remaining unnecessary feature and status checks. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/ata/libata-acpi.c23
1 files changed, 0 insertions, 23 deletions
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index e09df442a52f..78db2e67d7c7 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -134,22 +134,10 @@ static int ata_dev_get_GTF(struct ata_device *dev, struct ata_acpi_gtf **gtf,
134 output.length = ACPI_ALLOCATE_BUFFER; 134 output.length = ACPI_ALLOCATE_BUFFER;
135 output.pointer = NULL; /* ACPI-CA sets this; save/free it later */ 135 output.pointer = NULL; /* ACPI-CA sets this; save/free it later */
136 136
137 if (!dev->acpi_handle)
138 goto out_free;
139
140 if (ata_msg_probe(ap)) 137 if (ata_msg_probe(ap))
141 ata_dev_printk(dev, KERN_DEBUG, "%s: ENTER: port#: %d\n", 138 ata_dev_printk(dev, KERN_DEBUG, "%s: ENTER: port#: %d\n",
142 __FUNCTION__, ap->port_no); 139 __FUNCTION__, ap->port_no);
143 140
144 if (!ata_dev_enabled(dev) || (ap->flags & ATA_FLAG_DISABLED)) {
145 if (ata_msg_probe(ap))
146 ata_dev_printk(dev, KERN_DEBUG, "%s: ERR: "
147 "ata_dev_present: %d, PORT_DISABLED: %lu\n",
148 __FUNCTION__, ata_dev_enabled(dev),
149 ap->flags & ATA_FLAG_DISABLED);
150 goto out_free;
151 }
152
153 /* _GTF has no input parameters */ 141 /* _GTF has no input parameters */
154 status = acpi_evaluate_object(dev->acpi_handle, "_GTF", NULL, &output); 142 status = acpi_evaluate_object(dev->acpi_handle, "_GTF", NULL, &output);
155 143
@@ -340,21 +328,10 @@ static int ata_acpi_push_id(struct ata_device *dev)
340 struct acpi_object_list input; 328 struct acpi_object_list input;
341 union acpi_object in_params[1]; 329 union acpi_object in_params[1];
342 330
343 if (!dev->acpi_handle)
344 return 0;
345
346 if (ata_msg_probe(ap)) 331 if (ata_msg_probe(ap))
347 ata_dev_printk(dev, KERN_DEBUG, "%s: ix = %d, port#: %d\n", 332 ata_dev_printk(dev, KERN_DEBUG, "%s: ix = %d, port#: %d\n",
348 __FUNCTION__, dev->devno, ap->port_no); 333 __FUNCTION__, dev->devno, ap->port_no);
349 334
350 /* Don't continue if not a SATA device. */
351 if (!(ap->flags & ATA_FLAG_ACPI_SATA)) {
352 if (ata_msg_probe(ap))
353 ata_dev_printk(dev, KERN_DEBUG,
354 "%s: Not a SATA device\n", __FUNCTION__);
355 return 0;
356 }
357
358 /* Give the drive Identify data to the drive via the _SDD method */ 335 /* Give the drive Identify data to the drive via the _SDD method */
359 /* _SDD: set up input parameters */ 336 /* _SDD: set up input parameters */
360 input.count = 1; 337 input.count = 1;