On St 22-02-06 14:07:14, Randy Dunlap wrote:
> From: Randy Dunlap <randy_d_dunlap@xxxxxxxxxxxxxxx>
>
> Move 'noacpi' option handling to top of functions.
> Enable writing taskfiles for PATA drives.
Changes order of return and debug message. It does not seem too useful
to me.
Pavel
> Signed-off-by: Randy Dunlap <randy_d_dunlap@xxxxxxxxxxxxxxx>
> ---
> drivers/scsi/libata-acpi.c | 16 ++++++----------
> 1 file changed, 6 insertions(+), 10 deletions(-)
>
> --- linux-2616-rc4-ata.orig/drivers/scsi/libata-acpi.c
> +++ linux-2616-rc4-ata/drivers/scsi/libata-acpi.c
> @@ -303,13 +303,14 @@ int ata_acpi_push_id(struct ata_port *ap
> struct acpi_object_list input;
> union acpi_object in_params[1];
>
> + if (noacpi)
> + return 0;
> +
> if (ap->legacy_mode) {
> printk(KERN_DEBUG "%s: skipping for PATA mode\n",
> __FUNCTION__);
> return 0;
> }
> - if (noacpi)
> - return 0;
>
> if (ata_msg_probe(ap))
> printk(KERN_DEBUG
...
> @@ -707,12 +703,12 @@ int ata_acpi_exec_tfs(struct ata_port *a
> unsigned long gtf_address;
> unsigned long obj_loc;
>
> - if (ata_msg_probe(ap))
> - printk(KERN_DEBUG "%s: ENTER:\n", __FUNCTION__);
> -
> if (noacpi)
> return 0;
>
> + if (ata_msg_probe(ap))
> + printk(KERN_DEBUG "%s: ENTER:\n", __FUNCTION__);
> +
> for (ix = 0; ix < ATA_MAX_DEVICES; ix++) {
> if (ata_msg_probe(ap))
> printk(KERN_DEBUG "%s: call get_GTF, ix=%d\n",
--
Web maintainer for suspend.sf.net (www.sf.net/projects/suspend) wanted...
-
: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
