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

Commit ea2ac5a3 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Bartlomiej Zolnierkiewicz
Browse files

hpt366: cleanup maskproc() method 



Since the maskproc() method calls either mirror the interrupt en/disable via
the nIEN bit of the device control register done by the IDE core before issuing
a command or unmask the interrupt after a command executed in polled mode (when
interrupt is already not expected), it is pointless to manipulate the nIEN bit
in this method; therefore, just do nothing for the drives not on the quirk list.
Move the code to the left by using an early return and the 'else if' construct,
while at it....

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
[bart: fix checkpatch.pl warning]
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent e5403bff

drivers/ide/pci/hpt366.c

+16 −18
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * Portions Copyright (C) 2001	        Sun Microsystems, Inc.

 * Portions Copyright (C) 2003		Red Hat Inc

 * Portions Copyright (C) 2007		Bartlomiej Zolnierkiewicz

 * Portions Copyright (C) 2005-2007	MontaVista Software, Inc.

 * Portions Copyright (C) 2005-2008	MontaVista Software, Inc.

 *

 * Thanks to HighPoint Technologies for their assistance, and hardware.

 * Special Thanks to Jon Burchmore in SanDiego for the deep pockets, his
@@ -748,7 +748,9 @@ static void hpt3xx_maskproc(ide_drive_t *drive, int mask) 
	struct pci_dev	*dev	= to_pci_dev(hwif->dev);

	struct hpt_info *info	= hpt3xx_get_info(hwif->dev);



	if (drive->quirk_list) {

	if (drive->quirk_list == 0)

		return;



	if (info->chip_type >= HPT370) {

		u8 scr1 = 0;
@@ -760,15 +762,11 @@ static void hpt3xx_maskproc(ide_drive_t *drive, int mask) 
				scr1 &= ~0x10;

			pci_write_config_byte(dev, 0x5a, scr1);

		}

		} else {

			if (mask)

	} else if (mask)

		disable_irq(hwif->irq);

	else

		enable_irq(hwif->irq);

}

	} else

		outb(ATA_DEVCTL_OBS | (mask ? 2 : 0), hwif->io_ports.ctl_addr);

}



/*

 * This is specific to the HPT366 UDMA chipset