Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f919790f authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove SELECT_INTERRUPT() 



Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent cd3dbc99

drivers/ide/ide-io.c

+4 −1
Original line number Diff line number Diff line
@@ -1201,7 +1201,10 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq) 
		    hwif != hwgroup->hwif &&

		    hwif->io_ports[IDE_CONTROL_OFFSET]) {

			/* 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->drive = drive;

drivers/ide/ide-iops.c

+0 −8
Original line number Diff line number Diff line
@@ -175,14 +175,6 @@ void SELECT_DRIVE (ide_drive_t *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)

{

	if (HWIF(drive)->maskproc)

include/linux/ide.h

+0 −1
Original line number Diff line number Diff line
@@ -962,7 +962,6 @@ void ide_tf_load(ide_drive_t *, ide_task_t *); 
extern u32 ide_read_24(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 int drive_is_ready(ide_drive_t *);