diff options
-rw-r--r-- | drivers/ata/libata-acpi.c | 8 | ||||
-rw-r--r-- | drivers/ata/pata_sl82c105.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c index 865a552c91e6..dbf6ca781f66 100644 --- a/drivers/ata/libata-acpi.c +++ b/drivers/ata/libata-acpi.c | |||
@@ -118,7 +118,7 @@ static void ata_acpi_associate_ide_port(struct ata_port *ap) | |||
118 | ap->pflags |= ATA_PFLAG_INIT_GTM_VALID; | 118 | ap->pflags |= ATA_PFLAG_INIT_GTM_VALID; |
119 | } | 119 | } |
120 | 120 | ||
121 | static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device | 121 | static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device |
122 | *dev, u32 event) | 122 | *dev, u32 event) |
123 | { | 123 | { |
124 | char event_string[12]; | 124 | char event_string[12]; |
@@ -130,7 +130,7 @@ static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device | |||
130 | acpi_handle handle, tmphandle; | 130 | acpi_handle handle, tmphandle; |
131 | unsigned long sta; | 131 | unsigned long sta; |
132 | acpi_status status; | 132 | acpi_status status; |
133 | 133 | ||
134 | if (!ap) | 134 | if (!ap) |
135 | ap = dev->link->ap; | 135 | ap = dev->link->ap; |
136 | ehi = &ap->link.eh_info; | 136 | ehi = &ap->link.eh_info; |
@@ -167,10 +167,10 @@ static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device | |||
167 | else { | 167 | else { |
168 | struct ata_link *tlink; | 168 | struct ata_link *tlink; |
169 | struct ata_device *tdev; | 169 | struct ata_device *tdev; |
170 | 170 | ||
171 | ata_port_for_each_link(tlink, ap) { | 171 | ata_port_for_each_link(tlink, ap) { |
172 | ata_link_for_each_dev(tdev, tlink) { | 172 | ata_link_for_each_dev(tdev, tlink) { |
173 | tdev->flags |= | 173 | tdev->flags |= |
174 | ATA_DFLAG_DETACH; | 174 | ATA_DFLAG_DETACH; |
175 | } | 175 | } |
176 | } | 176 | } |
diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c index 70d94fb28a5f..69877bd81815 100644 --- a/drivers/ata/pata_sl82c105.c +++ b/drivers/ata/pata_sl82c105.c | |||
@@ -216,7 +216,7 @@ static int sl82c105_qc_defer(struct ata_queued_cmd *qc) | |||
216 | struct ata_port *alt = host->ports[1 ^ qc->ap->port_no]; | 216 | struct ata_port *alt = host->ports[1 ^ qc->ap->port_no]; |
217 | int rc; | 217 | int rc; |
218 | 218 | ||
219 | /* First apply the usual rules */ | 219 | /* First apply the usual rules */ |
220 | rc = ata_std_qc_defer(qc); | 220 | rc = ata_std_qc_defer(qc); |
221 | if (rc != 0) | 221 | if (rc != 0) |
222 | return rc; | 222 | return rc; |