Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
ide
/
ide-io.c
diff --git
a/kernel/drivers/ide/ide-io.c
b/kernel/drivers/ide/ide-io.c
index
079ae6b
..
e12e43e
100644
(file)
--- a/
kernel/drivers/ide/ide-io.c
+++ b/
kernel/drivers/ide/ide-io.c
@@
-135,7
+135,7
@@
EXPORT_SYMBOL(ide_complete_rq);
void ide_kill_rq(ide_drive_t *drive, struct request *rq)
{
void ide_kill_rq(ide_drive_t *drive, struct request *rq)
{
- u8 drv_req = (rq->cmd_type == REQ_TYPE_
SPECIAL
) && rq->rq_disk;
+ u8 drv_req = (rq->cmd_type == REQ_TYPE_
DRV_PRIV
) && rq->rq_disk;
u8 media = drive->media;
drive->failed_pc = NULL;
u8 media = drive->media;
drive->failed_pc = NULL;
@@
-320,7
+320,7
@@
static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)
goto kill_rq;
}
goto kill_rq;
}
- if (
blk
_pm_request(rq))
+ if (
ata
_pm_request(rq))
ide_check_pm_state(drive, rq);
drive->hwif->tp_ops->dev_select(drive);
ide_check_pm_state(drive, rq);
drive->hwif->tp_ops->dev_select(drive);
@@
-342,8
+342,8
@@
static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)
if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE)
return execute_drive_cmd(drive, rq);
if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE)
return execute_drive_cmd(drive, rq);
- else if (
blk
_pm_request(rq)) {
- struct
request
_pm_state *pm = rq->special;
+ else if (
ata
_pm_request(rq)) {
+ struct
ide
_pm_state *pm = rq->special;
#ifdef DEBUG_PM
printk("%s: start_power_step(step: %d)\n",
drive->name, pm->pm_step);
#ifdef DEBUG_PM
printk("%s: start_power_step(step: %d)\n",
drive->name, pm->pm_step);
@@
-353,7
+353,7
@@
static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)
pm->pm_step == IDE_PM_COMPLETED)
ide_complete_pm_rq(drive, rq);
return startstop;
pm->pm_step == IDE_PM_COMPLETED)
ide_complete_pm_rq(drive, rq);
return startstop;
- } else if (!rq->rq_disk && rq->cmd_type == REQ_TYPE_
SPECIAL
)
+ } else if (!rq->rq_disk && rq->cmd_type == REQ_TYPE_
DRV_PRIV
)
/*
* TODO: Once all ULDs have been modified to
* check for specific op codes rather than
/*
* TODO: Once all ULDs have been modified to
* check for specific op codes rather than
@@
-538,7
+538,7
@@
repeat:
* state machine.
*/
if ((drive->dev_flags & IDE_DFLAG_BLOCKED) &&
* state machine.
*/
if ((drive->dev_flags & IDE_DFLAG_BLOCKED) &&
-
blk
_pm_request(rq) == 0 &&
+
ata
_pm_request(rq) == 0 &&
(rq->cmd_flags & REQ_PREEMPT) == 0) {
/* there should be no pending command at this point */
ide_unlock_port(hwif);
(rq->cmd_flags & REQ_PREEMPT) == 0) {
/* there should be no pending command at this point */
ide_unlock_port(hwif);