Skip to content

L
linux
Commit 7034227a authored by David S. Miller's avatar David S. Miller
Browse files
Options

[SCSI ESP]: Update for irqreturn_t.

parent 923d1864
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
drivers/scsi/esp.c
View file @ 7034227a
...@@ -186,7 +186,7 @@ static spinlock_t espchain_lock = SPIN_LOCK_UNLOCKED; ...@@ -186,7 +186,7 @@ static spinlock_t espchain_lock = SPIN_LOCK_UNLOCKED;
static int esps_running = 0; static int esps_running = 0;
/* Forward declarations. */ /* Forward declarations. */
static void esp_intr(int irq, void *dev_id, struct pt_regs *pregs); static irqreturn_t esp_intr(int irq, void *dev_id, struct pt_regs *pregs);
/* Debugging routines */ /* Debugging routines */
struct esp_cmdstrings { struct esp_cmdstrings {
...@@ -4321,7 +4321,7 @@ static void esp_handle(struct esp *esp) ...@@ -4321,7 +4321,7 @@ static void esp_handle(struct esp *esp)
} }
/* Service only the ESP described by dev_id. */ /* Service only the ESP described by dev_id. */
static void esp_intr(int irq, void *dev_id, struct pt_regs *pregs) static irqreturn_t esp_intr(int irq, void *dev_id, struct pt_regs *pregs)
{ {
struct esp *esp = dev_id; struct esp *esp = dev_id;
unsigned long flags; unsigned long flags;
...@@ -4337,6 +4337,8 @@ static void esp_intr(int irq, void *dev_id, struct pt_regs *pregs) ...@@ -4337,6 +4337,8 @@ static void esp_intr(int irq, void *dev_id, struct pt_regs *pregs)
ESP_INTSON(esp->dregs); ESP_INTSON(esp->dregs);
} }
spin_unlock_irqrestore(esp->ehost->host_lock, flags); spin_unlock_irqrestore(esp->ehost->host_lock, flags);
return IRQ_HANDLED;
} }
static int esp_slave_alloc(Scsi_Device *SDptr) static int esp_slave_alloc(Scsi_Device *SDptr)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7