ide: use queue lock instead of ide_lock when possible

[safe/jmp/linux-2.6] / drivers / ide / ide-lib.c

diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index ed426dd..1932119 100644 (file)
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -277,14 +277,9 @@ int ide_set_xfer_rate(ide_drive_t *drive, u8 rate)
 
 static void ide_dump_opcode(ide_drive_t *drive)
 {
-       struct request *rq;
+       struct request *rq = drive->hwif->hwgroup->rq;
        ide_task_t *task = NULL;
 
-       spin_lock(&ide_lock);
-       rq = NULL;
-       if (HWGROUP(drive))
-               rq = HWGROUP(drive)->rq;
-       spin_unlock(&ide_lock);
        if (!rq)
                return;
 
@@ -317,7 +312,7 @@ static void ide_dump_sector(ide_drive_t *drive)
 {
        ide_task_t task;
        struct ide_taskfile *tf = &task.tf;
-       int lba48 = (drive->addressing == 1) ? 1 : 0;
+       u8 lba48 = !!(drive->dev_flags & IDE_DFLAG_LBA48);
 
        memset(&task, 0, sizeof(task));
        if (lba48)