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

Commit c78b8038 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: bam: Use memset_io instead of memset"

parents 9b0f0857 d2a32aec

drivers/platform/msm/sps/sps_bam.c

+2 −2
Original line number Diff line number Diff line
@@ -866,7 +866,7 @@ int sps_bam_pipe_connect(struct sps_pipe *bam_pipe, 


		/* Clear the data FIFO for debug */

		if (map->data.base != NULL && bam_pipe->mode == SPS_MODE_SRC)

			memset(map->data.base, 0, hw_params.data_size);

			memset_io(map->data.base, 0, hw_params.data_size);



		/* set NWD bit for BAM2BAM producer pipe */

		if (bam_pipe->mode == SPS_MODE_SRC) {
@@ -911,7 +911,7 @@ int sps_bam_pipe_connect(struct sps_pipe *bam_pipe, 
	if (desc_buf != NULL)

		if (bam_pipe->mode == SPS_MODE_SRC ||

		    hw_params.mode == BAM_PIPE_MODE_SYSTEM)

			memset(desc_buf, 0, hw_params.desc_size);

			memset_io(desc_buf, 0, hw_params.desc_size);



	bam_pipe->desc_size = hw_params.desc_size;

	bam_pipe->num_descs = bam_pipe->desc_size / sizeof(struct sps_iovec);

drivers/platform/msm/usb_bam.c

+2 −2
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ static int connect_pipe(u8 idx, u32 *usb_pipe_idx) 
			ret = -ENOMEM;

			goto disable_memclk;

		}

		memset(data_buf->base, 0, data_buf->size);

		memset_io(data_buf->base, 0, data_buf->size);



		desc_buf->phys_base =

			pipe_connect->desc_fifo_base_offset +
@@ -462,7 +462,7 @@ static int connect_pipe(u8 idx, u32 *usb_pipe_idx) 
			ret = -ENOMEM;

			goto disable_memclk;

		}

		memset(desc_buf->base, 0, desc_buf->size);

		memset_io(desc_buf->base, 0, desc_buf->size);

		break;

	case SYSTEM_MEM:

		pr_debug("%s: USB BAM using system memory\n", __func__);