<br><tt><font size=2>Stefan Roscher <ossrosch@linux.vnet.ibm.com>
wrote on 09.06.2008 17:44:29:<br>
<br>
> Signed-off-by: Stefan Roscher <stefan.roscher@de.ibm.com><br>
> ---<br>
>  arch/powerpc/kernel/ibmebus.c        |  
 5 ++++-<br>
>  drivers/infiniband/hw/ehca/ehca_eq.c |    4 ++--<br>
>  drivers/net/ehea/ehea_main.c         |  
 6 +++---<br>
>  include/asm-powerpc/ibmebus.h        |  
 2 +-<br>
>  4 files changed, 10 insertions(+), 7 deletions(-)<br>
> <br>
> diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c<br>
> index 9971159..a002fdf 100644<br>
> --- a/arch/powerpc/kernel/ibmebus.c<br>
> +++ b/arch/powerpc/kernel/ibmebus.c<br>
> @@ -208,7 +208,7 @@ void ibmebus_unregister_driver(struct <br>
> of_platform_driver *drv)<br>
>  }<br>
>  EXPORT_SYMBOL(ibmebus_unregister_driver);<br>
>  <br>
> -int ibmebus_request_irq(u32 ist, irq_handler_t handler,<br>
> +int ibmebus_request_irq(u32 ist, int *irq_number, irq_handler_t handler,<br>
>           unsigned long irq_flags, const
char *devname,<br>
>           void *dev_id)<br>
>  {<br>
> @@ -217,6 +217,9 @@ int ibmebus_request_irq(u32 ist, irq_handler_t
handler,<br>
>     if (irq == NO_IRQ)<br>
>        return -EINVAL;<br>
>  <br>
> +   if (irq_number)<br>
> +      *irq_number = irq;<br>
> +<br>
>     return request_irq(irq, handler, irq_flags, devname,
dev_id);<br>
>  }<br>
>  EXPORT_SYMBOL(ibmebus_request_irq);<br>
> diff --git a/drivers/infiniband/hw/ehca/ehca_eq.c <br>
> b/drivers/infiniband/hw/ehca/ehca_eq.c<br>
> index 49660df..5bc494f 100644<br>
> --- a/drivers/infiniband/hw/ehca/ehca_eq.c<br>
> +++ b/drivers/infiniband/hw/ehca/ehca_eq.c<br>
> @@ -122,7 +122,7 @@ int ehca_create_eq(struct ehca_shca *shca,<br>
>  <br>
>     /* register interrupt handlers and initialize work queues
*/<br>
>     if (type == EHCA_EQ) {<br>
> -      ret = ibmebus_request_irq(eq->ist, ehca_interrupt_eq,<br>
> +      ret = ibmebus_request_irq(eq->ist, NULL,
ehca_interrupt_eq,<br>
>                   IRQF_DISABLED,
"ehca_eq",<br>
>                   (void
*)shca);<br>
>        if (ret < 0)<br>
> @@ -130,7 +130,7 @@ int ehca_create_eq(struct ehca_shca *shca,<br>
>  <br>
>        tasklet_init(&eq->interrupt_task,
ehca_tasklet_eq, (long)shca);<br>
>     } else if (type == EHCA_NEQ) {<br>
> -      ret = ibmebus_request_irq(eq->ist, ehca_interrupt_neq,<br>
> +      ret = ibmebus_request_irq(eq->ist, NULL,
ehca_interrupt_neq,<br>
>                   IRQF_DISABLED,
"ehca_neq",<br>
>                   (void
*)shca);<br>
>        if (ret < 0)<br>
> diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c<br>
> index 287a619..102ffeb 100644<br>
> --- a/drivers/net/ehea/ehea_main.c<br>
> +++ b/drivers/net/ehea/ehea_main.c<br>
> @@ -1216,7 +1216,7 @@ static int ehea_reg_interrupts(struct net_device
*dev)<br>
>     snprintf(port->int_aff_name, EHEA_IRQ_NAME_SIZE -
1, "%s-aff",<br>
>         dev->name);<br>
>  <br>
> -   ret = ibmebus_request_irq(port->qp_eq->attr.ist1,<br>
> +   ret = ibmebus_request_irq(port->qp_eq->attr.ist1, NULL,<br>
>                ehea_qp_aff_irq_handler,<br>
>                IRQF_DISABLED,
port->int_aff_name, port);<br>
>     if (ret) {<br>
> @@ -1234,7 +1234,7 @@ static int ehea_reg_interrupts(struct net_device
*dev)<br>
>        pr = &port->port_res[i];<br>
>        snprintf(pr->int_send_name, EHEA_IRQ_NAME_SIZE
- 1,<br>
>            "%s-queue%d", dev->name,
i);<br>
> -      ret = ibmebus_request_irq(pr->eq->attr.ist1,<br>
> +      ret = ibmebus_request_irq(pr->eq->attr.ist1,
NULL,<br>
>                   ehea_recv_irq_handler,<br>
>                   IRQF_DISABLED,
pr->int_send_name,<br>
>                   pr);<br>
> @@ -3414,7 +3414,7 @@ static int __devinit ehea_probe_adapter(struct<br>
> of_device *dev,<br>
>     tasklet_init(&adapter->neq_tasklet, ehea_neq_tasklet,<br>
>             (unsigned long)adapter);<br>
>  <br>
> -   ret = ibmebus_request_irq(adapter->neq->attr.ist1,<br>
> +   ret = ibmebus_request_irq(adapter->neq->attr.ist1,
NULL,<br>
>                ehea_interrupt_neq,
IRQF_DISABLED,<br>
>                "ehea_neq",
adapter);<br>
>     if (ret) {<br>
> diff --git a/include/asm-powerpc/ibmebus.h b/include/asm-powerpc/ibmebus.h<br>
> index 1a9d9ae..3a2618a 100644<br>
> --- a/include/asm-powerpc/ibmebus.h<br>
> +++ b/include/asm-powerpc/ibmebus.h<br>
> @@ -51,7 +51,7 @@ extern struct bus_type ibmebus_bus_type;<br>
>  int ibmebus_register_driver(struct of_platform_driver *drv);<br>
>  void ibmebus_unregister_driver(struct of_platform_driver *drv);<br>
>  <br>
> -int ibmebus_request_irq(u32 ist, irq_handler_t handler,<br>
> +int ibmebus_request_irq(u32 ist, int *irq_number, irq_handler_t handler,<br>
>           unsigned long irq_flags, const
char *devname,<br>
>           void *dev_id);<br>
>  void ibmebus_free_irq(u32 ist, void *dev_id);<br>
> -- <br>
> 1.5.5<br>
> </font></tt>
<br>
<br><tt><font size=2>Concerning the eHEA part:</font></tt>
<br>
<br><tt><font size=2>Acked-by: Jan-Bernd Themann <themann@de.ibm.com></font></tt>
<br>
<br><tt><font size=2>Regards,<br>
Jan-Bernd<br>
</font></tt>