diff options
Diffstat (limited to 'drivers/ide/ide-tape.c')
-rw-r--r-- | drivers/ide/ide-tape.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index 52c64dd1292a..6752d47db2f8 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c | |||
@@ -265,9 +265,7 @@ typedef struct ide_tape_obj { | |||
265 | * While polling for DSC we use postponed_rq to postpone the current | 265 | * While polling for DSC we use postponed_rq to postpone the current |
266 | * request so that ide.c will be able to service pending requests on the | 266 | * request so that ide.c will be able to service pending requests on the |
267 | * other device. Note that at most we will have only one DSC (usually | 267 | * other device. Note that at most we will have only one DSC (usually |
268 | * data transfer) request in the device request queue. Additional | 268 | * data transfer) request in the device request queue. |
269 | * requests can be queued in our internal pipeline, but they will be | ||
270 | * visible to ide.c only one at a time. | ||
271 | */ | 269 | */ |
272 | struct request *postponed_rq; | 270 | struct request *postponed_rq; |
273 | /* The time in which we started polling for DSC */ | 271 | /* The time in which we started polling for DSC */ |
@@ -608,10 +606,6 @@ static void __idetape_kfree_stage(idetape_stage_t *stage) | |||
608 | kfree(stage); | 606 | kfree(stage); |
609 | } | 607 | } |
610 | 608 | ||
611 | /* | ||
612 | * Finish servicing a request and insert a pending pipeline request into the | ||
613 | * main device queue. | ||
614 | */ | ||
615 | static int idetape_end_request(ide_drive_t *drive, int uptodate, int nr_sects) | 609 | static int idetape_end_request(ide_drive_t *drive, int uptodate, int nr_sects) |
616 | { | 610 | { |
617 | struct request *rq = HWGROUP(drive)->rq; | 611 | struct request *rq = HWGROUP(drive)->rq; |
@@ -1295,8 +1289,6 @@ out: | |||
1295 | return idetape_issue_pc(drive, pc); | 1289 | return idetape_issue_pc(drive, pc); |
1296 | } | 1290 | } |
1297 | 1291 | ||
1298 | /* Pipeline related functions */ | ||
1299 | |||
1300 | /* | 1292 | /* |
1301 | * The function below uses __get_free_page to allocate a pipeline stage, along | 1293 | * The function below uses __get_free_page to allocate a pipeline stage, along |
1302 | * with all the necessary small buffers which together make a buffer of size | 1294 | * with all the necessary small buffers which together make a buffer of size |
@@ -1305,9 +1297,6 @@ out: | |||
1305 | * | 1297 | * |
1306 | * It returns a pointer to the new allocated stage, or NULL if we can't (or | 1298 | * It returns a pointer to the new allocated stage, or NULL if we can't (or |
1307 | * don't want to) allocate a stage. | 1299 | * don't want to) allocate a stage. |
1308 | * | ||
1309 | * Pipeline stages are optional and are used to increase performance. If we | ||
1310 | * can't allocate them, we'll manage without them. | ||
1311 | */ | 1300 | */ |
1312 | static idetape_stage_t *__idetape_kmalloc_stage(idetape_tape_t *tape, int full, | 1301 | static idetape_stage_t *__idetape_kmalloc_stage(idetape_tape_t *tape, int full, |
1313 | int clear) | 1302 | int clear) |
@@ -1875,10 +1864,7 @@ static int idetape_init_read(ide_drive_t *drive) | |||
1875 | return 0; | 1864 | return 0; |
1876 | } | 1865 | } |
1877 | 1866 | ||
1878 | /* | 1867 | /* called from idetape_chrdev_read() to service a chrdev read request. */ |
1879 | * Called from idetape_chrdev_read() to service a character device read request | ||
1880 | * and add read-ahead requests to our pipeline. | ||
1881 | */ | ||
1882 | static int idetape_add_chrdev_read_request(ide_drive_t *drive, int blocks) | 1868 | static int idetape_add_chrdev_read_request(ide_drive_t *drive, int blocks) |
1883 | { | 1869 | { |
1884 | idetape_tape_t *tape = drive->driver_data; | 1870 | idetape_tape_t *tape = drive->driver_data; |
@@ -2216,8 +2202,7 @@ static int idetape_write_filemark(ide_drive_t *drive) | |||
2216 | * | 2202 | * |
2217 | * Note: MTBSF and MTBSFM are not supported when the tape doesn't support | 2203 | * Note: MTBSF and MTBSFM are not supported when the tape doesn't support |
2218 | * spacing over filemarks in the reverse direction. In this case, MTFSFM is also | 2204 | * spacing over filemarks in the reverse direction. In this case, MTFSFM is also |
2219 | * usually not supported (it is supported in the rare case in which we crossed | 2205 | * usually not supported. |
2220 | * the filemark during our read-ahead pipelined operation mode). | ||
2221 | * | 2206 | * |
2222 | * The following commands are currently not supported: | 2207 | * The following commands are currently not supported: |
2223 | * | 2208 | * |
@@ -2233,7 +2218,6 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count) | |||
2233 | debug_log(DBG_ERR, "Handling MTIOCTOP ioctl: mt_op=%d, mt_count=%d\n", | 2218 | debug_log(DBG_ERR, "Handling MTIOCTOP ioctl: mt_op=%d, mt_count=%d\n", |
2234 | mt_op, mt_count); | 2219 | mt_op, mt_count); |
2235 | 2220 | ||
2236 | /* Commands which need our pipelined read-ahead stages. */ | ||
2237 | switch (mt_op) { | 2221 | switch (mt_op) { |
2238 | case MTFSF: | 2222 | case MTFSF: |
2239 | case MTFSFM: | 2223 | case MTFSFM: |