aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-tape.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:33 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:33 -0400
commitbfdb0b3beb0618dd03e7aa49e2fd3ac360aef370 (patch)
tree50243449b9e06d71eb3c419f7db5f6e4fd02fbd2 /drivers/ide/ide-tape.c
parentcc495557dfaeca552595cda8cd4427d67aa0142e (diff)
ide-tape: remove superfluous tape->lock
tape->lock is not needed (->queue_lock protects queue). Acked-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-tape.c')
-rw-r--r--drivers/ide/ide-tape.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index de2d926e66c2..72b4350bfeb6 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -245,9 +245,6 @@ typedef struct ide_tape_obj {
245 /* Wasted space in each stage */ 245 /* Wasted space in each stage */
246 int excess_bh_size; 246 int excess_bh_size;
247 247
248 /* protects the ide-tape queue */
249 spinlock_t lock;
250
251 /* Measures average tape speed */ 248 /* Measures average tape speed */
252 unsigned long avg_time; 249 unsigned long avg_time;
253 int avg_size; 250 int avg_size;
@@ -481,7 +478,6 @@ static int idetape_end_request(ide_drive_t *drive, int uptodate, int nr_sects)
481{ 478{
482 struct request *rq = drive->hwif->rq; 479 struct request *rq = drive->hwif->rq;
483 idetape_tape_t *tape = drive->driver_data; 480 idetape_tape_t *tape = drive->driver_data;
484 unsigned long flags;
485 int error; 481 int error;
486 482
487 debug_log(DBG_PROCS, "Enter %s\n", __func__); 483 debug_log(DBG_PROCS, "Enter %s\n", __func__);
@@ -500,11 +496,8 @@ static int idetape_end_request(ide_drive_t *drive, int uptodate, int nr_sects)
500 return 0; 496 return 0;
501 } 497 }
502 498
503 spin_lock_irqsave(&tape->lock, flags);
504
505 ide_complete_rq(drive, 0); 499 ide_complete_rq(drive, 0);
506 500
507 spin_unlock_irqrestore(&tape->lock, flags);
508 return 0; 501 return 0;
509} 502}
510 503
@@ -2192,8 +2185,6 @@ static void idetape_setup(ide_drive_t *drive, idetape_tape_t *tape, int minor)
2192 drive->pc_update_buffers = idetape_update_buffers; 2185 drive->pc_update_buffers = idetape_update_buffers;
2193 drive->pc_io_buffers = ide_tape_io_buffers; 2186 drive->pc_io_buffers = ide_tape_io_buffers;
2194 2187
2195 spin_lock_init(&tape->lock);
2196
2197 drive->dev_flags |= IDE_DFLAG_DSC_OVERLAP; 2188 drive->dev_flags |= IDE_DFLAG_DSC_OVERLAP;
2198 2189
2199 if (drive->hwif->host_flags & IDE_HFLAG_NO_DSC) { 2190 if (drive->hwif->host_flags & IDE_HFLAG_NO_DSC) {