| .. | .. |
|---|
| 27 | 27 | spin_unlock_irq(&hwif->lock); |
|---|
| 28 | 28 | |
|---|
| 29 | 29 | if (start_queue) |
|---|
| 30 | | - blk_run_queue(q); |
|---|
| 30 | + blk_mq_run_hw_queues(q, true); |
|---|
| 31 | 31 | return; |
|---|
| 32 | 32 | } |
|---|
| 33 | 33 | spin_unlock_irq(&hwif->lock); |
|---|
| .. | .. |
|---|
| 36 | 36 | scsi_req(rq)->cmd[0] = REQ_PARK_HEADS; |
|---|
| 37 | 37 | scsi_req(rq)->cmd_len = 1; |
|---|
| 38 | 38 | ide_req(rq)->type = ATA_PRIV_MISC; |
|---|
| 39 | | - rq->special = &timeout; |
|---|
| 39 | + ide_req(rq)->special = &timeout; |
|---|
| 40 | 40 | blk_execute_rq(q, NULL, rq, 1); |
|---|
| 41 | 41 | rc = scsi_req(rq)->result ? -EIO : 0; |
|---|
| 42 | 42 | blk_put_request(rq); |
|---|
| .. | .. |
|---|
| 54 | 54 | scsi_req(rq)->cmd[0] = REQ_UNPARK_HEADS; |
|---|
| 55 | 55 | scsi_req(rq)->cmd_len = 1; |
|---|
| 56 | 56 | ide_req(rq)->type = ATA_PRIV_MISC; |
|---|
| 57 | | - elv_add_request(q, rq, ELEVATOR_INSERT_FRONT); |
|---|
| 57 | + spin_lock_irq(&hwif->lock); |
|---|
| 58 | + ide_insert_request_head(drive, rq); |
|---|
| 59 | + spin_unlock_irq(&hwif->lock); |
|---|
| 58 | 60 | |
|---|
| 59 | 61 | out: |
|---|
| 60 | 62 | return; |
|---|
| .. | .. |
|---|
| 67 | 69 | |
|---|
| 68 | 70 | memset(&cmd, 0, sizeof(cmd)); |
|---|
| 69 | 71 | if (scsi_req(rq)->cmd[0] == REQ_PARK_HEADS) { |
|---|
| 70 | | - drive->sleep = *(unsigned long *)rq->special; |
|---|
| 72 | + drive->sleep = *(unsigned long *)ide_req(rq)->special; |
|---|
| 71 | 73 | drive->dev_flags |= IDE_DFLAG_SLEEPING; |
|---|
| 72 | 74 | tf->command = ATA_CMD_IDLEIMMEDIATE; |
|---|
| 73 | 75 | tf->feature = 0x44; |
|---|