Skip to content

L
linux-davinci
Commit 54cc1428 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files
Options

ide: remove local_irq_set() macro 

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 898ec223
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
drivers/ide/ide-iops.c
View file @ 54cc1428
...@@ -503,7 +503,8 @@ static int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad, unsigned long ti ...@@ -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); stat = tp_ops->read_status(hwif);
if (stat & ATA_BUSY) { if (stat & ATA_BUSY) {
local_irq_set(flags); local_irq_save(flags);
local_irq_enable_in_hardirq();
timeout += jiffies; timeout += jiffies;
while ((stat = tp_ops->read_status(hwif)) & ATA_BUSY) { while ((stat = tp_ops->read_status(hwif)) & ATA_BUSY) {
if (time_after(jiffies, timeout)) { if (time_after(jiffies, timeout)) {
......
drivers/ide/ide-probe.c
View file @ 54cc1428
...@@ -796,7 +796,8 @@ static int ide_probe_port(ide_hwif_t *hwif) ...@@ -796,7 +796,8 @@ static int ide_probe_port(ide_hwif_t *hwif)
if (irqd) if (irqd)
disable_irq(hwif->irq); disable_irq(hwif->irq);
local_irq_set(flags); local_irq_save(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);
......
include/linux/ide.h
View file @ 54cc1428
...@@ -1586,8 +1586,6 @@ static inline void ide_set_max_pio(ide_drive_t *drive) ...@@ -1586,8 +1586,6 @@ static inline void ide_set_max_pio(ide_drive_t *drive)
ide_set_pio(drive, 255); 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 *); char *ide_media_string(ide_drive_t *);
extern struct device_attribute ide_dev_attrs[]; extern struct device_attribute ide_dev_attrs[];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment