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

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

ide: no need to touch local IRQs in ide_probe_port() 



Remove superfluous

	local_save_flags()
	local_irq_enable_in_hardirq()

	...

	local_irq_restore()

combo.

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

drivers/ide/ide-probe.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -779,7 +779,6 @@ EXPORT_SYMBOL_GPL(ide_undecoded_slave); 
static int ide_probe_port(ide_hwif_t *hwif)

static int ide_probe_port(ide_hwif_t *hwif)

{

{

	ide_drive_t *drive;

	ide_drive_t *drive;

	unsigned long flags;

	unsigned int irqd;

	unsigned int irqd;

	int i, rc = -ENODEV;

	int i, rc = -ENODEV;
@@ -797,9 +796,6 @@ static int ide_probe_port(ide_hwif_t *hwif) 
	if (irqd)

	if (irqd)

		disable_irq(hwif->irq);

		disable_irq(hwif->irq);





	local_save_flags(flags);

	local_irq_enable_in_hardirq();



	if (ide_port_wait_ready(hwif) == -EBUSY)

	if (ide_port_wait_ready(hwif) == -EBUSY)

		printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name);

		printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name);
@@ -813,8 +809,6 @@ static int ide_probe_port(ide_hwif_t *hwif) 
			rc = 0;

			rc = 0;

	}

	}





	local_irq_restore(flags);



	/*

	/*

	 * Use cached IRQ number. It might be (and is...) changed by probe

	 * Use cached IRQ number. It might be (and is...) changed by probe

	 * code above

	 * code above