diff options
Diffstat (limited to 'drivers/scsi/aacraid')
-rw-r--r-- | drivers/scsi/aacraid/rkt.c | 6 | ||||
-rw-r--r-- | drivers/scsi/aacraid/rx.c | 6 | ||||
-rw-r--r-- | drivers/scsi/aacraid/sa.c | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/drivers/scsi/aacraid/rkt.c b/drivers/scsi/aacraid/rkt.c index fc4c73c2a6a9..e9b775d6bec9 100644 --- a/drivers/scsi/aacraid/rkt.c +++ b/drivers/scsi/aacraid/rkt.c | |||
@@ -183,8 +183,7 @@ static int rkt_sync_cmd(struct aac_dev *dev, u32 command, | |||
183 | /* | 183 | /* |
184 | * Yield the processor in case we are slow | 184 | * Yield the processor in case we are slow |
185 | */ | 185 | */ |
186 | set_current_state(TASK_UNINTERRUPTIBLE); | 186 | schedule_timeout_uninterruptible(1); |
187 | schedule_timeout(1); | ||
188 | } | 187 | } |
189 | if (ok != 1) { | 188 | if (ok != 1) { |
190 | /* | 189 | /* |
@@ -452,8 +451,7 @@ int aac_rkt_init(struct aac_dev *dev) | |||
452 | dev->name, instance, status); | 451 | dev->name, instance, status); |
453 | goto error_iounmap; | 452 | goto error_iounmap; |
454 | } | 453 | } |
455 | set_current_state(TASK_UNINTERRUPTIBLE); | 454 | schedule_timeout_uninterruptible(1); |
456 | schedule_timeout(1); | ||
457 | } | 455 | } |
458 | if (request_irq(dev->scsi_host_ptr->irq, aac_rkt_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev)<0) | 456 | if (request_irq(dev->scsi_host_ptr->irq, aac_rkt_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev)<0) |
459 | { | 457 | { |
diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c index da99046e5393..6998bc877dd6 100644 --- a/drivers/scsi/aacraid/rx.c +++ b/drivers/scsi/aacraid/rx.c | |||
@@ -183,8 +183,7 @@ static int rx_sync_cmd(struct aac_dev *dev, u32 command, | |||
183 | /* | 183 | /* |
184 | * Yield the processor in case we are slow | 184 | * Yield the processor in case we are slow |
185 | */ | 185 | */ |
186 | set_current_state(TASK_UNINTERRUPTIBLE); | 186 | schedule_timeout_uninterruptible(1); |
187 | schedule_timeout(1); | ||
188 | } | 187 | } |
189 | if (ok != 1) { | 188 | if (ok != 1) { |
190 | /* | 189 | /* |
@@ -452,8 +451,7 @@ int aac_rx_init(struct aac_dev *dev) | |||
452 | dev->name, instance, status); | 451 | dev->name, instance, status); |
453 | goto error_iounmap; | 452 | goto error_iounmap; |
454 | } | 453 | } |
455 | set_current_state(TASK_UNINTERRUPTIBLE); | 454 | schedule_timeout_uninterruptible(1); |
456 | schedule_timeout(1); | ||
457 | } | 455 | } |
458 | if (request_irq(dev->scsi_host_ptr->irq, aac_rx_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev)<0) | 456 | if (request_irq(dev->scsi_host_ptr->irq, aac_rx_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev)<0) |
459 | { | 457 | { |
diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c index 8b9596209164..466f05cfbf0c 100644 --- a/drivers/scsi/aacraid/sa.c +++ b/drivers/scsi/aacraid/sa.c | |||
@@ -189,8 +189,7 @@ static int sa_sync_cmd(struct aac_dev *dev, u32 command, | |||
189 | ok = 1; | 189 | ok = 1; |
190 | break; | 190 | break; |
191 | } | 191 | } |
192 | set_current_state(TASK_UNINTERRUPTIBLE); | 192 | schedule_timeout_uninterruptible(1); |
193 | schedule_timeout(1); | ||
194 | } | 193 | } |
195 | 194 | ||
196 | if (ok != 1) | 195 | if (ok != 1) |
@@ -325,8 +324,7 @@ int aac_sa_init(struct aac_dev *dev) | |||
325 | name, instance, status); | 324 | name, instance, status); |
326 | goto error_iounmap; | 325 | goto error_iounmap; |
327 | } | 326 | } |
328 | set_current_state(TASK_UNINTERRUPTIBLE); | 327 | schedule_timeout_uninterruptible(1); |
329 | schedule_timeout(1); | ||
330 | } | 328 | } |
331 | 329 | ||
332 | if (request_irq(dev->scsi_host_ptr->irq, aac_sa_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev ) < 0) { | 330 | if (request_irq(dev->scsi_host_ptr->irq, aac_sa_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev ) < 0) { |