Drop 'afu' from IRQ API function names

Signed-off-by: Alastair D'Silva <alastair@d-silva.org>

Author: deece

src/include/libocxl.h

@@ -165,10 +165,10 @@ ocxl_err ocxl_afu_attach(ocxl_afu_h afu);
 
 /* irq.c */
 /* AFU IRQ functions */
-ocxl_err ocxl_afu_irq_alloc(ocxl_afu_h afu, void *info, ocxl_irq_h * irq_handle);
-uint64_t ocxl_afu_irq_get_handle(ocxl_afu_h afu, ocxl_irq_h irq);
+ocxl_err ocxl_irq_alloc(ocxl_afu_h afu, void *info, ocxl_irq_h * irq_handle);
+uint64_t ocxl_irq_get_handle(ocxl_afu_h afu, ocxl_irq_h irq);
 int ocxl_afu_get_event_fd(ocxl_afu_h afu);
-int ocxl_afu_irq_get_descriptor(ocxl_afu_h afu, ocxl_irq_h irq);
+int ocxl_irq_get_descriptor(ocxl_afu_h afu, ocxl_irq_h irq);
 int ocxl_afu_get_event_descriptor(ocxl_afu_h afu);
 int ocxl_afu_event_check_versioned(ocxl_afu_h afu, int timeout, ocxl_event *events, uint16_t event_count,
                                    uint16_t event_api_version);

src/irq.c

@@ -159,7 +159,7 @@ static ocxl_err irq_allocate(ocxl_afu * afu, ocxl_irq * irq, void *info)
  * @retval OCXL_OK if the IRQs have been allocated
  * @retval OCXL_NO_MEM if a memory allocation error occurred
  */
-ocxl_err ocxl_afu_irq_alloc(ocxl_afu_h afu, void *info, ocxl_irq_h * irq)
+ocxl_err ocxl_irq_alloc(ocxl_afu_h afu, void *info, ocxl_irq_h * irq)
 {
 	ocxl_afu *my_afu = (ocxl_afu *) afu;
 
@@ -193,7 +193,7 @@ ocxl_err ocxl_afu_irq_alloc(ocxl_afu_h afu, void *info, ocxl_irq_h * irq)
  * @param irq the IRQ to get the handle of
  * @return the handle, or 0 if the handle is invalid
  */
-uint64_t ocxl_afu_irq_get_handle(ocxl_afu_h afu, ocxl_irq_h irq)
+uint64_t ocxl_irq_get_handle(ocxl_afu_h afu, ocxl_irq_h irq)
 {
 	ocxl_afu *my_afu = (ocxl_afu *) afu;
 
@@ -213,7 +213,7 @@ uint64_t ocxl_afu_irq_get_handle(ocxl_afu_h afu, ocxl_irq_h irq)
  * @param irq the IRQ to get the descriptor of
  * @return the handle, or -1 if the descriptor is invalid
  */
-int ocxl_afu_irq_get_descriptor(ocxl_afu_h afu, ocxl_irq_h irq)
+int ocxl_irq_get_descriptor(ocxl_afu_h afu, ocxl_irq_h irq)
 {
 	ocxl_afu *my_afu = (ocxl_afu *) afu;
 
@@ -228,13 +228,7 @@ int ocxl_afu_irq_get_descriptor(ocxl_afu_h afu, ocxl_irq_h irq)
 /**
  * Get a descriptor that will trigger a poll when an AFU event occurs
  *
-<<<<<<< HEAD
- * When triggered, call ocxl_read_afu_event() to extract the event information
-=======
  * When triggered, call ocxl_afu_event_check() to extract the event information.
- *
- * @see ocxl_afu_event_check()
->>>>>>> 4339b2e... Make ocxl_read_afu_event internal
  *
  * @pre the AFU has been opened
  * @see ocxl_afu_event_check()

symver.map

@@ -18,10 +18,10 @@ LIBOCXL_0 {
 		ocxl_afu_open_from_dev;
 		ocxl_afu_open_specific;
 		ocxl_afu_attach;
-		ocxl_afu_irq_alloc;
-		ocxl_afu_irq_get_handle;
+		ocxl_irq_alloc;
+		ocxl_irq_get_handle;
         ocxl_afu_get_event_fd;
-		ocxl_afu_irq_get_descriptor;
+		ocxl_irq_get_descriptor;
 		ocxl_afu_get_event_descriptor;
 		ocxl_afu_event_check_versioned;
 		ocxl_afu_set_ppc64_amr;