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

ide: always set nIEN on idle devices 



* Set nIEN for previous port/device in ide_do_request()
  also if port uses a non-shared IRQ.

* Remove no longer needed ide_hwif_t.sharing_irq.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 46aa7af1

drivers/ide/ide-io.c

+1 −1
Original line number Diff line number Diff line
@@ -1003,7 +1003,7 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq) 
		}

	again:

		hwif = HWIF(drive);

		if (hwgroup->hwif->sharing_irq && hwif != hwgroup->hwif) {

		if (hwif != hwgroup->hwif) {

			/*

			 * set nIEN for previous hwif, drives in the

			 * quirk_list may not like intr setups/cleanups

drivers/ide/ide-probe.c

+1 −3
Original line number Diff line number Diff line
@@ -1060,7 +1060,6 @@ static int init_irq (ide_hwif_t *hwif) 


		if (h && h->hwgroup) {  /* scan only initialized ports */

			if (hwif->irq == h->irq) {

				hwif->sharing_irq = h->sharing_irq = 1;

				if (hwif->chipset != ide_pci ||

				    h->chipset != ide_pci) {

					save_match(hwif, h, &match);
@@ -1152,8 +1151,7 @@ static int init_irq (ide_hwif_t *hwif) 
		io_ports->data_addr, hwif->irq);

#endif /* __mc68000__ */

	if (match)

		printk(KERN_CONT " (%sed with %s)",

			hwif->sharing_irq ? "shar" : "serializ", match->name);

		printk(KERN_CONT " (serialized with %s)", match->name);

	printk(KERN_CONT "\n");



	mutex_unlock(&ide_cfg_mtx);

include/linux/ide.h

+0 −1
Original line number Diff line number Diff line
@@ -842,7 +842,6 @@ typedef struct hwif_s { 


	unsigned	present    : 1;	/* this interface exists */

	unsigned	serialized : 1;	/* serialized all channel operation */

	unsigned	sharing_irq: 1;	/* 1 = sharing irq with another hwif */

	unsigned	sg_mapped  : 1;	/* sg_table and sg_nents are ready */



	struct device		gendev;