From 5debfd3c343523c567631f906ac5cf9bbb635cc2 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Sat, 19 Nov 2005 22:01:35 +0100 Subject: [PATCH] --- yaml --- r: 14519 b: refs/heads/master c: 071ffcc0f7dd8df871f443be3f5059f05da528e2 h: refs/heads/master i: 14517: 546592d3134a1be977e55f396915fb9767eb40a6 14515: a8c5127003c44839048631c663147de7879128d6 14511: d07738a88c7710827471cff98fecfc0f0f367498 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-io.c | 6 ------ trunk/include/linux/ide.h | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 9c22a7a78253..dd8ec05cd66f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84e7b9e94b474d40582090b7e09139f0029cff2c +refs/heads/master: 071ffcc0f7dd8df871f443be3f5059f05da528e2 diff --git a/trunk/drivers/ide/ide-io.c b/trunk/drivers/ide/ide-io.c index 5275cbb1afe9..ecfafcdafea4 100644 --- a/trunk/drivers/ide/ide-io.c +++ b/trunk/drivers/ide/ide-io.c @@ -1629,12 +1629,6 @@ EXPORT_SYMBOL(ide_init_drive_cmd); * for the new rq to be completed. This is VERY DANGEROUS, and is * intended for careful use by the ATAPI tape/cdrom driver code. * - * If action is ide_next, then the rq is queued immediately after - * the currently-being-processed-request (if any), and the function - * returns without waiting for the new rq to be completed. As above, - * This is VERY DANGEROUS, and is intended for careful use by the - * ATAPI tape/cdrom driver code. - * * If action is ide_end, then the rq is queued at the end of the * request queue, and the function returns immediately without waiting * for the new rq to be completed. This is again intended for careful diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h index e74ee4f7fcdc..a39c3c59789d 100644 --- a/trunk/include/linux/ide.h +++ b/trunk/include/linux/ide.h @@ -1201,7 +1201,6 @@ extern u64 ide_get_error_location(ide_drive_t *, char *); */ typedef enum { ide_wait, /* insert rq at end of list, and wait for it */ - ide_next, /* insert rq immediately after current request */ ide_preempt, /* insert rq in front of current request */ ide_head_wait, /* insert rq in front of current request and wait for it */ ide_end /* insert rq at end of list, but don't wait for it */