Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3dce0171 authored by Dan Williams's avatar Dan Williams
Browse files

async_tx: remove depend_tx from async_tx_sync_epilog 



All callers of async_tx_sync_epilog have called async_tx_quiesce on the
depend_tx, so async_tx_sync_epilog need only call the callback to
complete the operation.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent d2c52b79

crypto/async_tx/async_memcpy.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ async_memcpy(struct page *dest, struct page *src, unsigned int dest_offset, 
		kunmap_atomic(dest_buf, KM_USER0);

		kunmap_atomic(src_buf, KM_USER1);



		async_tx_sync_epilog(flags, depend_tx, cb_fn, cb_param);

		async_tx_sync_epilog(cb_fn, cb_param);

	}



	return tx;

crypto/async_tx/async_memset.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ async_memset(struct page *dest, int val, unsigned int offset, 


		memset(dest_buf, val, len);



		async_tx_sync_epilog(flags, depend_tx, cb_fn, cb_param);

		async_tx_sync_epilog(cb_fn, cb_param);

	}



	return tx;

crypto/async_tx/async_tx.c

+1 −1
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ async_trigger_callback(enum async_tx_flags flags, 
		/* wait for any prerequisite operations */

		async_tx_quiesce(&depend_tx);



		async_tx_sync_epilog(flags, depend_tx, cb_fn, cb_param);

		async_tx_sync_epilog(cb_fn, cb_param);

	}



	return tx;

crypto/async_tx/async_xor.c

+3 −4
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ do_async_xor(struct dma_chan *chan, struct page *dest, struct page **src_list, 
static void

do_sync_xor(struct page *dest, struct page **src_list, unsigned int offset,

	    int src_cnt, size_t len, enum async_tx_flags flags,

	    struct dma_async_tx_descriptor *depend_tx,

	    dma_async_tx_callback cb_fn, void *cb_param)

{

	int i;
@@ -150,7 +149,7 @@ do_sync_xor(struct page *dest, struct page **src_list, unsigned int offset, 
		src_off += xor_src_cnt;

	}



	async_tx_sync_epilog(flags, depend_tx, cb_fn, cb_param);

	async_tx_sync_epilog(cb_fn, cb_param);

}



/**
@@ -204,7 +203,7 @@ async_xor(struct page *dest, struct page **src_list, unsigned int offset, 
		async_tx_quiesce(&depend_tx);



		do_sync_xor(dest, src_list, offset, src_cnt, len,

			    flags, depend_tx, cb_fn, cb_param);

			    flags, cb_fn, cb_param);



		return NULL;

	}
@@ -287,7 +286,7 @@ async_xor_zero_sum(struct page *dest, struct page **src_list, 


		*result = page_is_zero(dest, offset, len) ? 0 : 1;



		async_tx_sync_epilog(flags, depend_tx, cb_fn, cb_param);

		async_tx_sync_epilog(cb_fn, cb_param);

	}



	return tx;

include/linux/async_tx.h

+1 −8
Original line number Diff line number Diff line
@@ -101,21 +101,14 @@ async_tx_find_channel(struct dma_async_tx_descriptor *depend_tx, 


/**

 * async_tx_sync_epilog - actions to take if an operation is run synchronously

 * @flags: async_tx flags

 * @depend_tx: transaction depends on depend_tx

 * @cb_fn: function to call when the transaction completes

 * @cb_fn_param: parameter to pass to the callback routine

 */

static inline void

async_tx_sync_epilog(unsigned long flags,

	struct dma_async_tx_descriptor *depend_tx,

	dma_async_tx_callback cb_fn, void *cb_fn_param)

async_tx_sync_epilog(dma_async_tx_callback cb_fn, void *cb_fn_param)

{

	if (cb_fn)

		cb_fn(cb_fn_param);



	if (depend_tx && (flags & ASYNC_TX_DEP_ACK))

		async_tx_ack(depend_tx);

}



void