Commit 2e9f093f authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Linus Torvalds

[PATCH] kill ide_init_drive() in ide-probe.c

also fix comment in init_irq()
parent 7e2f5c07
...@@ -947,15 +947,10 @@ static int ide_init_queue(ide_drive_t *drive) ...@@ -947,15 +947,10 @@ static int ide_init_queue(ide_drive_t *drive)
if (drive->disk) if (drive->disk)
drive->disk->queue = drive->queue; drive->disk->queue = drive->queue;
return 0; /* needs drive->queue to be set */
}
/*
* Setup the drive for request handling.
*/
static void ide_init_drive(ide_drive_t *drive)
{
ide_toggle_bounce(drive, 1); ide_toggle_bounce(drive, 1);
return 0;
} }
/* /*
...@@ -1070,10 +1065,9 @@ static int init_irq (ide_hwif_t *hwif) ...@@ -1070,10 +1065,9 @@ static int init_irq (ide_hwif_t *hwif)
} }
/* /*
* Link any new drives into the hwgroup, allocate * For any present drive:
* the block device queue and initialize the drive. * - allocate the block device queue
* Note that ide_init_drive sends commands to the new * - link drive into the hwgroup
* drive.
*/ */
for (index = 0; index < MAX_DRIVES; ++index) { for (index = 0; index < MAX_DRIVES; ++index) {
ide_drive_t *drive = &hwif->drives[index]; ide_drive_t *drive = &hwif->drives[index];
...@@ -1094,7 +1088,6 @@ static int init_irq (ide_hwif_t *hwif) ...@@ -1094,7 +1088,6 @@ static int init_irq (ide_hwif_t *hwif)
hwgroup->drive->next = drive; hwgroup->drive->next = drive;
} }
spin_unlock_irq(&ide_lock); spin_unlock_irq(&ide_lock);
ide_init_drive(drive);
} }
#if !defined(__mc68000__) && !defined(CONFIG_APUS) && !defined(__sparc__) #if !defined(__mc68000__) && !defined(CONFIG_APUS) && !defined(__sparc__)
...@@ -1310,7 +1303,6 @@ int export_ide_init_queue (ide_drive_t *drive) ...@@ -1310,7 +1303,6 @@ int export_ide_init_queue (ide_drive_t *drive)
if (ide_init_queue(drive)) if (ide_init_queue(drive))
return 1; return 1;
ide_init_drive(drive);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment