dmaengine: sdxi: Replace variadic sdxi_cxt_range()

Just have sdxi_cxt_range() for two values and sdxi_cxt_range_single()
for one. The variadic macro cleverness isn't necessary and checkpatch
complains about unused arguments:

  #define _sdxi_cxt_range(_1, _2, _fn, ...) _fn

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

Author: nathanlynch

drivers/dma/sdxi/context.c

@@ -416,7 +416,7 @@ int sdxi_start_cxt(struct sdxi_cxt *cxt)
 
 	desc = sdxi_ring_resv_next(&resv);
 	sdxi_encode_cxt_start(desc, &(const struct sdxi_cxt_start) {
-			.range = sdxi_cxt_range(cxt->id),
+			.range = sdxi_cxt_range_single(cxt->id),
 		});
 	sdxi_completion_attach(desc, sc);
 	sdxi_desc_make_valid(desc);
@@ -450,11 +450,11 @@ void sdxi_stop_cxt(struct sdxi_cxt *cxt)
 	sync = sdxi_ring_resv_next(&resv);
 
 	sdxi_encode_cxt_stop(stop, &(const struct sdxi_cxt_stop) {
-			.range = sdxi_cxt_range(cxt->id),
+			.range = sdxi_cxt_range_single(cxt->id),
 		});
 	sdxi_encode_sync(sync, &(const struct sdxi_sync) {
 			.filter = SDXI_SYNC_FLT_STOP,
-			.range = sdxi_cxt_range(cxt->id),
+			.range = sdxi_cxt_range_single(cxt->id),
 		});
 	sdxi_completion_attach(sync, sc);
 	sdxi_desc_make_valid(stop);

drivers/dma/sdxi/descriptor.h

@@ -77,27 +77,18 @@ struct sdxi_cxt_range {
 	u16 cxt_end;
 };
 
-static inline struct sdxi_cxt_range __sdxi_cxt_range(u16 a, u16 b)
+static inline struct sdxi_cxt_range sdxi_cxt_range(u16 a, u16 b)
 {
 	return (struct sdxi_cxt_range) {
 		.cxt_start = min(a, b),
 		.cxt_end   = max(a, b),
 	};
 }
 
-#define sdxi_cxt_range_1(_id)			\
-	({					\
-		u16 id = (_id);			\
-		__sdxi_cxt_range(id, id);	\
-	})
-
-#define sdxi_cxt_range_2(_id1, _id2) __sdxi_cxt_range(_id1, _id2)
-
-#define _sdxi_cxt_range(_1, _2, _fn, ...) _fn
-
-#define sdxi_cxt_range(...)						\
-	_sdxi_cxt_range(__VA_ARGS__,					\
-			sdxi_cxt_range_2, sdxi_cxt_range_1)(__VA_ARGS__)
+static inline struct sdxi_cxt_range sdxi_cxt_range_single(u16 nr)
+{
+	return sdxi_cxt_range(nr, nr);
+}
 
 void sdxi_serialize_nop(struct sdxi_desc *desc);
 

drivers/dma/sdxi/descriptor_kunit.c

@@ -363,7 +363,7 @@ static void cxt_start(struct kunit *t)
 {
 	struct unpacked_desc unpacked;
 	struct sdxi_cxt_start start = {
-		.range = sdxi_cxt_range(2),
+		.range = sdxi_cxt_range_single(2),
 	};
 	struct sdxi_desc desc;
 
@@ -400,7 +400,7 @@ static void cxt_stop(struct kunit *t)
 {
 	struct unpacked_desc unpacked;
 	struct sdxi_cxt_stop stop = {
-		.range = sdxi_cxt_range(2),
+		.range = sdxi_cxt_range_single(2),
 	};
 	struct sdxi_desc desc;