dmaengine: sdxi: Use devres to clean up admin context memory

This removes a goto from the function activation path and makes the
admin context cleanup automatic.

Signed-off-by: Nathan Lynch <nathan.lynch@amd.com>

Author: nathanlynch

drivers/dma/sdxi/context.c

@@ -10,6 +10,7 @@
 #include <linux/bug.h>
 #include <linux/cleanup.h>
 #include <linux/delay.h>
+#include <linux/device/devres.h>
 #include <linux/dma-direction.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmapool.h>
@@ -392,13 +393,21 @@ static void unregister_cxt(struct sdxi_cxt *cxt)
 	xa_erase(&cxt->sdxi->client_cxts, cxt->id);
 }
 
-struct sdxi_cxt *sdxi_admin_cxt_init(struct sdxi_dev *sdxi)
+static void free_admin_cxt(void *ptr)
 {
+	struct sdxi_dev *sdxi = ptr;
+
+	sdxi_free_cxt(sdxi->admin_cxt);
+}
+
+int sdxi_admin_cxt_init(struct sdxi_dev *sdxi)
+{
+	int err;
 	struct sdxi_sq *sq;
 
 	struct sdxi_cxt *cxt __free(sdxi_cxt) = sdxi_alloc_cxt(sdxi);
 	if (!cxt)
-		return NULL;
+		return -ENOMEM;
 
 	sq = cxt->sq;
 	cxt->id = SDXI_ADMIN_CXT_ID;
@@ -407,17 +416,13 @@ struct sdxi_cxt *sdxi_admin_cxt_init(struct sdxi_dev *sdxi)
 	sdxi_ring_state_init(cxt->ring_state, &sq->cxt_sts->read_index,
 			     sq->write_index, sq->ring_entries, sq->desc_ring);
 
-	if (sdxi_publish_cxt(cxt))
-		return NULL;
+	err = sdxi_publish_cxt(cxt);
+	if (err)
+		return err;
 
-	return_ptr(cxt);
-}
+	sdxi->admin_cxt = no_free_ptr(cxt);
 
-void sdxi_admin_cxt_exit(struct sdxi_cxt *cxt)
-{
-	if (WARN_ON(!sdxi_cxt_is_admin(cxt)))
-		return;
-	sdxi_free_cxt(cxt);
+	return devm_add_action_or_reset(sdxi_to_dev(sdxi), free_admin_cxt, sdxi);
 }
 
 int sdxi_start_cxt(struct sdxi_cxt *cxt)

drivers/dma/sdxi/context.h

@@ -51,8 +51,7 @@ struct sdxi_cxt {
 	struct sdxi_ring_state *ring_state;
 };
 
-struct sdxi_cxt *sdxi_admin_cxt_init(struct sdxi_dev *sdxi);
-void sdxi_admin_cxt_exit(struct sdxi_cxt *cxt);
+int sdxi_admin_cxt_init(struct sdxi_dev *sdxi);
 
 struct sdxi_cxt *sdxi_cxt_new(struct sdxi_dev *sdxi);
 void sdxi_cxt_exit(struct sdxi_cxt *cxt);

drivers/dma/sdxi/device.c

@@ -239,9 +239,9 @@ static int sdxi_fn_activate(struct sdxi_dev *sdxi)
 	 * The admin context will not consume descriptors until we
 	 * write its doorbell later.
 	 */
-	sdxi->admin_cxt = sdxi_admin_cxt_init(sdxi);
-	if (!sdxi->admin_cxt)
-		return -ENOMEM;
+	err = sdxi_admin_cxt_init(sdxi);
+	if (err)
+		return err;
 
 	/* SDXI 1.0 4.1.8.4.b: Set CXT_STS.state to CXTV_RUN. */
 	sdxi->admin_cxt->sq->cxt_sts->state = FIELD_PREP(SDXI_CXT_STS_STATE,
@@ -252,7 +252,7 @@ static int sdxi_fn_activate(struct sdxi_dev *sdxi)
 	 */
 	err = sdxi_dev_start(sdxi);
 	if (err)
-		goto admin_cxt_exit;
+		return err;
 
 	/*
 	 * SDXI 1.0 4.1.8.10.b: Start the admin context using method
@@ -264,10 +264,6 @@ static int sdxi_fn_activate(struct sdxi_dev *sdxi)
 	iowrite64(0, sdxi->admin_cxt->db);
 
 	return 0;
-
-admin_cxt_exit:
-	sdxi_admin_cxt_exit(sdxi->admin_cxt);
-	return err;
 }
 
 static int sdxi_create_dma_pool(struct sdxi_dev *sdxi, struct dma_pool **pool,
@@ -310,8 +306,6 @@ static void sdxi_device_exit(struct sdxi_dev *sdxi)
 	xa_for_each(&sdxi->client_cxts, index, cxt)
 		sdxi_cxt_exit(cxt);
 
-	sdxi_admin_cxt_exit(sdxi->admin_cxt);
-
 	sdxi_dev_stop(sdxi);
 }