IB/ehca: Fix warnings issued by checkpatch.pl

[linux-2.6-omap-h63xx.git] / drivers / infiniband / hw / ehca / ehca_eq.c

diff --git a/drivers/infiniband/hw/ehca/ehca_eq.c b/drivers/infiniband/hw/ehca/ehca_eq.c
index 5281dec66f127c5667c3ac44aab490d3f644a417..4825975f88cf5752482f4aa2db58e2b6243b66a8 100644 (file)
--- a/drivers/infiniband/hw/ehca/ehca_eq.c
+++ b/drivers/infiniband/hw/ehca/ehca_eq.c
@@ -61,6 +61,7 @@ int ehca_create_eq(struct ehca_shca *shca,
        struct ib_device *ib_dev = &shca->ib_device;
 
        spin_lock_init(&eq->spinlock);
+       spin_lock_init(&eq->irq_spinlock);
        eq->is_initialized = 0;
 
        if (type != EHCA_EQ && type != EHCA_NEQ) {
@@ -95,7 +96,8 @@ int ehca_create_eq(struct ehca_shca *shca,
        for (i = 0; i < nr_pages; i++) {
                u64 rpage;
 
-               if (!(vpage = ipz_qpageit_get_inc(&eq->ipz_queue))) {
+               vpage = ipz_qpageit_get_inc(&eq->ipz_queue);
+               if (!vpage) {
                        ret = H_RESOURCE;
                        goto create_eq_exit2;
                }
@@ -122,7 +124,7 @@ int ehca_create_eq(struct ehca_shca *shca,
        /* register interrupt handlers and initialize work queues */
        if (type == EHCA_EQ) {
                ret = ibmebus_request_irq(NULL, eq->ist, ehca_interrupt_eq,
-                                         SA_INTERRUPT, "ehca_eq",
+                                         IRQF_DISABLED, "ehca_eq",
                                          (void *)shca);
                if (ret < 0)
                        ehca_err(ib_dev, "Can't map interrupt handler.");
@@ -130,7 +132,7 @@ int ehca_create_eq(struct ehca_shca *shca,
                tasklet_init(&eq->interrupt_task, ehca_tasklet_eq, (long)shca);
        } else if (type == EHCA_NEQ) {
                ret = ibmebus_request_irq(NULL, eq->ist, ehca_interrupt_neq,
-                                         SA_INTERRUPT, "ehca_neq",
+                                         IRQF_DISABLED, "ehca_neq",
                                          (void *)shca);
                if (ret < 0)
                        ehca_err(ib_dev, "Can't map interrupt handler.");