lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ide: remove SELECT_INTERRUPT()

Browse Source 
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2008-01-25 22:17:13 +01:00
parent cd3dbc99da
commit f919790f8c
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/ide/ide-io.c
View File

@@ -1201,7 +1201,10 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq)
hwif != hwgroup->hwif && hwif != hwgroup->hwif &&
hwif->io_ports[IDE_CONTROL_OFFSET]) { hwif->io_ports[IDE_CONTROL_OFFSET]) {
/* set nIEN for previous hwif */ /* set nIEN for previous hwif */
SELECT_INTERRUPT(drive); if (hwif->intrproc)
hwif->intrproc(drive);
else
hwif->OUTB(drive->ctl | 2, IDE_CONTROL_REG);
} }
hwgroup->hwif = hwif; hwgroup->hwif = hwif;
hwgroup->drive = drive; hwgroup->drive = drive;

8
drivers/ide/ide-iops.c
View File

@@ -175,14 +175,6 @@ void SELECT_DRIVE (ide_drive_t *drive)
EXPORT_SYMBOL(SELECT_DRIVE); EXPORT_SYMBOL(SELECT_DRIVE);
void SELECT_INTERRUPT (ide_drive_t *drive)
{
if (HWIF(drive)->intrproc)
HWIF(drive)->intrproc(drive);
else
HWIF(drive)->OUTB(drive->ctl|2, IDE_CONTROL_REG);
}
void SELECT_MASK (ide_drive_t *drive, int mask) void SELECT_MASK (ide_drive_t *drive, int mask)
{ {
if (HWIF(drive)->maskproc) if (HWIF(drive)->maskproc)

1
include/linux/ide.h
View File

@@ -962,7 +962,6 @@ void ide_tf_load(ide_drive_t *, ide_task_t *);
extern u32 ide_read_24(ide_drive_t *); extern u32 ide_read_24(ide_drive_t *);
extern void SELECT_DRIVE(ide_drive_t *); extern void SELECT_DRIVE(ide_drive_t *);
extern void SELECT_INTERRUPT(ide_drive_t *);
extern void SELECT_MASK(ide_drive_t *, int); extern void SELECT_MASK(ide_drive_t *, int);
extern int drive_is_ready(ide_drive_t *); extern int drive_is_ready(ide_drive_t *);