cxl: Split afu_register_irqs() function

Split the afu_register_irqs() function so that different parts can
be useful elsewhere.

Signed-off-by: Michael Neuling <mikey@neuling.org>
Acked-by: Ian Munsie <imunsie@au1.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h
index eccddfe5d5a35ea7162230b337a7d8464c63aaab..778161afd0a32511807bc7893d9cd6107922fbb6 100644 (file)
--- a/drivers/misc/cxl/cxl.h
+++ b/drivers/misc/cxl/cxl.h
@@ -672,5 +672,6 @@ int cxl_psl_purge(struct cxl_afu *afu);
 void cxl_stop_trace(struct cxl *cxl);
 
 extern struct pci_driver cxl_pci_driver;
+int afu_allocate_irqs(struct cxl_context *ctx, u32 count);
 
 #endif

diff --git a/drivers/misc/cxl/irq.c b/drivers/misc/cxl/irq.c
index c740c7bc2bd257626caf6905d03a7186480e763f..212790b4ee57ed630c6a7eee90e549436f2861d5 100644 (file)
--- a/drivers/misc/cxl/irq.c
+++ b/drivers/misc/cxl/irq.c
@@ -416,9 +416,8 @@ void afu_irq_name_free(struct cxl_context *ctx)
        }
 }
 
-int afu_register_irqs(struct cxl_context *ctx, u32 count)
+int afu_allocate_irqs(struct cxl_context *ctx, u32 count)
 {
-       irq_hw_number_t hwirq;
        int rc, r, i, j = 1;
        struct cxl_irq_name *irq_name;
 
@@ -458,6 +457,18 @@ int afu_register_irqs(struct cxl_context *ctx, u32 count)
                        j++;
                }
        }
+       return 0;
+
+out:
+       afu_irq_name_free(ctx);
+       return -ENOMEM;
+}
+
+void afu_register_hwirqs(struct cxl_context *ctx)
+{
+       irq_hw_number_t hwirq;
+       struct cxl_irq_name *irq_name;
+       int r,i;
 
        /* We've allocated all memory now, so let's do the irq allocations */
        irq_name = list_first_entry(&ctx->irq_names, struct cxl_irq_name, list);
@@ -469,13 +480,19 @@ int afu_register_irqs(struct cxl_context *ctx, u32 count)
                        irq_name = list_next_entry(irq_name, list);
                }
        }
+}
 
-       return 0;
+int afu_register_irqs(struct cxl_context *ctx, u32 count)
+{
+       int rc;
 
-out:
-       afu_irq_name_free(ctx);
-       return -ENOMEM;
-}
+       rc = afu_allocate_irqs(ctx, count);
+       if (rc)
+               return rc;
+
+       afu_register_hwirqs(ctx);
+       return 0;
+ }
 
 void afu_release_irqs(struct cxl_context *ctx, void *cookie)
 {