ide: allow to wrap interrupt handler
PATCH 1/3 ide: allow to wrap interrupt handler
Signed-off-by Stanislaw Gruszka <[email protected]>
--- drivers/ide/ide-io.c | 2 ++ drivers/ide/ide-probe.c | 6 +++++- include/linux/ide.h | 1 + 3 files changed, 8 insertions(+), 1 deletions(-)
drivers/ide/ide-io.c +2 -0
@@ -1163,6 +1163,8 @@ out_early:return irq_ret; } +EXPORT_SYMBOL_GPL (ide_intr); +/** * ide_do_drive_cmd - issue IDE special command * @drive: device to issue command
drivers/ide/ide-probe.c +5 -1
@@ -951,6 +951,7 @@ static int init_irq (ide_hwif_t *hwif) {struct ide_io_ports *io_ports = &hwif->io_ports;int sa =0 ; +irq_handler_t irq_handler;mutex_lock (&ide_cfg_mtx);spin_lock_init (&hwif->lock);
@@ -969,7 +970,10 @@ static int init_irq (ide_hwif_t *hwif)if (io_ports->ctl_addr) hwif->tp_ops->set_irq (hwif,1 ); -if (request_irq (hwif->irq, &ide_intr, sa, hwif->name, hwif)) + irq_handler = hwif->host->irq_handler; +if (!irq_handler) + irq_handler = &ide_intr; +if (request_irq (hwif->irq, irq_handler, sa, hwif->name, hwif)) goto out_up;if (!hwif->rqsize) {
include/linux/ide.h +1 -0
@@ -866,6 +866,7 @@ struct ide_host {unsigned int n_ports;struct device *dev[2 ];unsigned int (*init_chipset)(struct pci_dev *); +irq_handler_t irq_handler;unsigned long host_flags;void *host_priv;ide_hwif_t *cur_port;/* for hosts requiring serialization */
Signature · 1 line
1.5.2.5
Quoted 1 line · Stanislaw Gruszka
Signed-off-by Stanislaw Gruszka <[email protected]>
BTW Please remember to check patches with scripts/checkpatch.pl:
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable #22: FILE: drivers/ide/ide-io.c:1166:
+EXPORT_SYMBOL_GPL(ide_intr);
[2/3 also has a few "WARNING: line over 80 characters" ones...]
Thus the applied version looks a bit different:
From: Stanislaw Gruszka <[email protected]>
Subject: [PATCH 1/3] ide: allow to wrap interrupt handler
Signed-off-by Stanislaw Gruszka <[email protected]>
Cc Andrew Victor <[email protected]>
[bart: minor checkpatch.pl / CodingStyle fixups]
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/ide/ide-io.c | 1 + drivers/ide/ide-probe.c | 7 ++++++- include/linux/ide.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-)
drivers/ide/ide-io.c +1 -0
@@ -1162,6 +1162,7 @@ out_early:return irq_ret; } +EXPORT_SYMBOL_GPL (ide_intr);/** * ide_do_drive_cmd - issue IDE special command
drivers/ide/ide-probe.c +6 -1
@@ -950,6 +950,7 @@ static int ide_port_setup_devices(ide_hwstatic int init_irq (ide_hwif_t *hwif) {struct ide_io_ports *io_ports = &hwif->io_ports; +irq_handler_t irq_handler;int sa =0 ;mutex_lock (&ide_cfg_mtx);
@@ -959,6 +960,10 @@ static int init_irq (ide_hwif_t *hwif) hwif->timer.function = &ide_timer_expiry; hwif->timer.data = (unsigned long )hwif; + irq_handler = hwif->host->irq_handler; +if (irq_handler ==NULL ) + irq_handler = ide_intr; +#if defined(__mc68000__) sa =IRQF_SHARED ;#endif /* __mc68000__ */
@@ -969,7 +974,7 @@ static int init_irq (ide_hwif_t *hwif)if (io_ports->ctl_addr) hwif->tp_ops->set_irq (hwif,1 ); -if (request_irq (hwif->irq, &ide_intr, sa, hwif->name, hwif)) +if (request_irq (hwif->irq, irq_handler, sa, hwif->name, hwif)) goto out_up;if (!hwif->rqsize) {
include/linux/ide.h +1 -0
@@ -866,6 +866,7 @@ struct ide_host {unsigned int n_ports;struct device *dev[2 ];unsigned int (*init_chipset)(struct pci_dev *); +irq_handler_t irq_handler;unsigned long host_flags;void *host_priv;ide_hwif_t *cur_port;/* for hosts requiring serialization */