|
@@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
|
/**
|
|
|
* ata_build_rw_tf - Build ATA taskfile for given read/write request
|
|
|
* @tf: Target ATA taskfile
|
|
|
-@@ -5163,6 +5176,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
|
|
|
+@@ -5176,6 +5189,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
|
|
|
if (tag < 0)
|
|
|
return NULL;
|
|
|
}
|
|
@@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
|
|
|
|
qc = __ata_qc_from_tag(ap, tag);
|
|
|
qc->tag = tag;
|
|
|
-@@ -6066,6 +6082,9 @@ struct ata_port *ata_port_alloc(struct a
|
|
|
+@@ -6079,6 +6095,9 @@ struct ata_port *ata_port_alloc(struct a
|
|
|
ap->stats.unhandled_irq = 1;
|
|
|
ap->stats.idle_irq = 1;
|
|
|
#endif
|
|
@@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
|
ata_sff_port_init(ap);
|
|
|
|
|
|
return ap;
|
|
|
-@@ -6087,6 +6106,12 @@ static void ata_host_release(struct devi
|
|
|
+@@ -6100,6 +6119,12 @@ static void ata_host_release(struct devi
|
|
|
|
|
|
kfree(ap->pmp_link);
|
|
|
kfree(ap->slave_link);
|
|
@@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
|
kfree(ap);
|
|
|
host->ports[i] = NULL;
|
|
|
}
|
|
|
-@@ -6533,7 +6558,23 @@ int ata_host_register(struct ata_host *h
|
|
|
+@@ -6546,7 +6571,23 @@ int ata_host_register(struct ata_host *h
|
|
|
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
|
|
|
host->ports[i]->local_port_no = i + 1;
|
|
|
}
|
|
@@ -134,7 +134,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
|
|
|
|
/*
|
|
|
* Define if arch has non-standard setup. This is a _PCI_ standard
|
|
|
-@@ -896,6 +899,12 @@ struct ata_port {
|
|
|
+@@ -900,6 +903,12 @@ struct ata_port {
|
|
|
#ifdef CONFIG_ATA_ACPI
|
|
|
struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */
|
|
|
#endif
|