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

Commit 3280ab3e authored by Dan Williams's avatar Dan Williams
Browse files

async_tx: checkpatch says s/__FUNCTION__/__func__/g

parent 3d9b525b
Loading
Loading
Loading
Loading
+3 −3
Original line number Original line Diff line number Diff line
@@ -66,11 +66,11 @@ async_memcpy(struct page *dest, struct page *src, unsigned int dest_offset,
	}
	}


	if (tx) {
	if (tx) {
		pr_debug("%s: (async) len: %zu\n", __FUNCTION__, len);
		pr_debug("%s: (async) len: %zu\n", __func__, len);
		async_tx_submit(chan, tx, flags, depend_tx, cb_fn, cb_param);
		async_tx_submit(chan, tx, flags, depend_tx, cb_fn, cb_param);
	} else {
	} else {
		void *dest_buf, *src_buf;
		void *dest_buf, *src_buf;
		pr_debug("%s: (sync) len: %zu\n", __FUNCTION__, len);
		pr_debug("%s: (sync) len: %zu\n", __func__, len);


		/* wait for any prerequisite operations */
		/* wait for any prerequisite operations */
		if (depend_tx) {
		if (depend_tx) {
@@ -80,7 +80,7 @@ async_memcpy(struct page *dest, struct page *src, unsigned int dest_offset,
			BUG_ON(depend_tx->ack);
			BUG_ON(depend_tx->ack);
			if (dma_wait_for_async_tx(depend_tx) == DMA_ERROR)
			if (dma_wait_for_async_tx(depend_tx) == DMA_ERROR)
				panic("%s: DMA_ERROR waiting for depend_tx\n",
				panic("%s: DMA_ERROR waiting for depend_tx\n",
					__FUNCTION__);
					__func__);
		}
		}


		dest_buf = kmap_atomic(dest, KM_USER0) + dest_offset;
		dest_buf = kmap_atomic(dest, KM_USER0) + dest_offset;
+3 −3
Original line number Original line Diff line number Diff line
@@ -63,11 +63,11 @@ async_memset(struct page *dest, int val, unsigned int offset,
	}
	}


	if (tx) {
	if (tx) {
		pr_debug("%s: (async) len: %zu\n", __FUNCTION__, len);
		pr_debug("%s: (async) len: %zu\n", __func__, len);
		async_tx_submit(chan, tx, flags, depend_tx, cb_fn, cb_param);
		async_tx_submit(chan, tx, flags, depend_tx, cb_fn, cb_param);
	} else { /* run the memset synchronously */
	} else { /* run the memset synchronously */
		void *dest_buf;
		void *dest_buf;
		pr_debug("%s: (sync) len: %zu\n", __FUNCTION__, len);
		pr_debug("%s: (sync) len: %zu\n", __func__, len);


		dest_buf = (void *) (((char *) page_address(dest)) + offset);
		dest_buf = (void *) (((char *) page_address(dest)) + offset);


@@ -79,7 +79,7 @@ async_memset(struct page *dest, int val, unsigned int offset,
			BUG_ON(depend_tx->ack);
			BUG_ON(depend_tx->ack);
			if (dma_wait_for_async_tx(depend_tx) == DMA_ERROR)
			if (dma_wait_for_async_tx(depend_tx) == DMA_ERROR)
				panic("%s: DMA_ERROR waiting for depend_tx\n",
				panic("%s: DMA_ERROR waiting for depend_tx\n",
					__FUNCTION__);
					__func__);
		}
		}


		memset(dest_buf, val, len);
		memset(dest_buf, val, len);
+3 −3
Original line number Original line Diff line number Diff line
@@ -472,11 +472,11 @@ async_trigger_callback(enum async_tx_flags flags,
		tx = NULL;
		tx = NULL;


	if (tx) {
	if (tx) {
		pr_debug("%s: (async)\n", __FUNCTION__);
		pr_debug("%s: (async)\n", __func__);


		async_tx_submit(chan, tx, flags, depend_tx, cb_fn, cb_param);
		async_tx_submit(chan, tx, flags, depend_tx, cb_fn, cb_param);
	} else {
	} else {
		pr_debug("%s: (sync)\n", __FUNCTION__);
		pr_debug("%s: (sync)\n", __func__);


		/* wait for any prerequisite operations */
		/* wait for any prerequisite operations */
		if (depend_tx) {
		if (depend_tx) {
@@ -486,7 +486,7 @@ async_trigger_callback(enum async_tx_flags flags,
			BUG_ON(depend_tx->ack);
			BUG_ON(depend_tx->ack);
			if (dma_wait_for_async_tx(depend_tx) == DMA_ERROR)
			if (dma_wait_for_async_tx(depend_tx) == DMA_ERROR)
				panic("%s: DMA_ERROR waiting for depend_tx\n",
				panic("%s: DMA_ERROR waiting for depend_tx\n",
					__FUNCTION__);
					__func__);
		}
		}


		async_tx_sync_epilog(flags, depend_tx, cb_fn, cb_param);
		async_tx_sync_epilog(flags, depend_tx, cb_fn, cb_param);
+6 −6
Original line number Original line Diff line number Diff line
@@ -47,7 +47,7 @@ do_async_xor(struct dma_device *device,
	int i;
	int i;
	unsigned long dma_prep_flags = cb_fn ? DMA_PREP_INTERRUPT : 0;
	unsigned long dma_prep_flags = cb_fn ? DMA_PREP_INTERRUPT : 0;


	pr_debug("%s: len: %zu\n", __FUNCTION__, len);
	pr_debug("%s: len: %zu\n", __func__, len);


	dma_dest = dma_map_page(device->dev, dest, offset, len,
	dma_dest = dma_map_page(device->dev, dest, offset, len,
				DMA_FROM_DEVICE);
				DMA_FROM_DEVICE);
@@ -86,7 +86,7 @@ do_sync_xor(struct page *dest, struct page **src_list, unsigned int offset,
	void *_dest;
	void *_dest;
	int i;
	int i;


	pr_debug("%s: len: %zu\n", __FUNCTION__, len);
	pr_debug("%s: len: %zu\n", __func__, len);


	/* reuse the 'src_list' array to convert to buffer pointers */
	/* reuse the 'src_list' array to convert to buffer pointers */
	for (i = 0; i < src_cnt; i++)
	for (i = 0; i < src_cnt; i++)
@@ -196,7 +196,7 @@ async_xor(struct page *dest, struct page **src_list, unsigned int offset,
					DMA_ERROR)
					DMA_ERROR)
					panic("%s: DMA_ERROR waiting for "
					panic("%s: DMA_ERROR waiting for "
						"depend_tx\n",
						"depend_tx\n",
						__FUNCTION__);
						__func__);
			}
			}


			do_sync_xor(dest, &src_list[src_off], offset,
			do_sync_xor(dest, &src_list[src_off], offset,
@@ -276,7 +276,7 @@ async_xor_zero_sum(struct page *dest, struct page **src_list,
		unsigned long dma_prep_flags = cb_fn ? DMA_PREP_INTERRUPT : 0;
		unsigned long dma_prep_flags = cb_fn ? DMA_PREP_INTERRUPT : 0;
		int i;
		int i;


		pr_debug("%s: (async) len: %zu\n", __FUNCTION__, len);
		pr_debug("%s: (async) len: %zu\n", __func__, len);


		for (i = 0; i < src_cnt; i++)
		for (i = 0; i < src_cnt; i++)
			dma_src[i] = dma_map_page(device->dev, src_list[i],
			dma_src[i] = dma_map_page(device->dev, src_list[i],
@@ -299,7 +299,7 @@ async_xor_zero_sum(struct page *dest, struct page **src_list,
	} else {
	} else {
		unsigned long xor_flags = flags;
		unsigned long xor_flags = flags;


		pr_debug("%s: (sync) len: %zu\n", __FUNCTION__, len);
		pr_debug("%s: (sync) len: %zu\n", __func__, len);


		xor_flags |= ASYNC_TX_XOR_DROP_DST;
		xor_flags |= ASYNC_TX_XOR_DROP_DST;
		xor_flags &= ~ASYNC_TX_ACK;
		xor_flags &= ~ASYNC_TX_ACK;
@@ -310,7 +310,7 @@ async_xor_zero_sum(struct page *dest, struct page **src_list,
		if (tx) {
		if (tx) {
			if (dma_wait_for_async_tx(tx) == DMA_ERROR)
			if (dma_wait_for_async_tx(tx) == DMA_ERROR)
				panic("%s: DMA_ERROR waiting for tx\n",
				panic("%s: DMA_ERROR waiting for tx\n",
					__FUNCTION__);
					__func__);
			async_tx_ack(tx);
			async_tx_ack(tx);
		}
		}