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

Commit 54cc1428 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove local_irq_set() macro 



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

drivers/ide/ide-iops.c

+2 −1
Original line number Diff line number Diff line
@@ -503,7 +503,8 @@ static int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad, unsigned long ti 
	stat = tp_ops->read_status(hwif);



	if (stat & ATA_BUSY) {

		local_irq_set(flags);

		local_irq_save(flags);

		local_irq_enable_in_hardirq();

		timeout += jiffies;

		while ((stat = tp_ops->read_status(hwif)) & ATA_BUSY) {

			if (time_after(jiffies, timeout)) {

drivers/ide/ide-probe.c

+2 −1
Original line number Diff line number Diff line
@@ -796,7 +796,8 @@ static int ide_probe_port(ide_hwif_t *hwif) 
	if (irqd)

		disable_irq(hwif->irq);



	local_irq_set(flags);

	local_irq_save(flags);

	local_irq_enable_in_hardirq();



	if (ide_port_wait_ready(hwif) == -EBUSY)

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

include/linux/ide.h

+0 −2
Original line number Diff line number Diff line
@@ -1586,8 +1586,6 @@ static inline void ide_set_max_pio(ide_drive_t *drive) 
	ide_set_pio(drive, 255);

}



#define local_irq_set(flags)	do { local_save_flags((flags)); local_irq_enable_in_hardirq(); } while (0)



char *ide_media_string(ide_drive_t *);



extern struct device_attribute ide_dev_attrs[];