Merge "msm: sps: remove the dependency on IPC logging flag" (a6b58f17) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/platform/msm/sps/sps.c

+9 −15

Original line number	Diff line number	Diff line
		@@ -2165,47 +2165,41 @@ int sps_register_bam_device(const struct sps_bam_props *bam_props,
		&bam->props.phys_addr);
		bam->ipc_log0 = ipc_log_context_create(SPS_IPC_LOGPAGES,
		bam_name, 0);
		if (!bam->ipc_log0) {
		if (!bam->ipc_log0)
		SPS_ERR(sps, "%s : unable to create IPC Logging 0 for bam %pa",
		__func__, &bam->props.phys_addr);
		goto exit_err;
		}

		snprintf(bam_name, sizeof(bam_name), "sps_bam_%pa_1",
		&bam->props.phys_addr);
		bam->ipc_log1 = ipc_log_context_create(SPS_IPC_LOGPAGES,
		bam_name, 0);
		if (!bam->ipc_log1) {
		if (!bam->ipc_log1)
		SPS_ERR(sps, "%s : unable to create IPC Logging 1 for bam %pa",
		__func__, &bam->props.phys_addr);
		goto exit_err;
		}

		snprintf(bam_name, sizeof(bam_name), "sps_bam_%pa_2",
		&bam->props.phys_addr);
		bam->ipc_log2 = ipc_log_context_create(SPS_IPC_LOGPAGES,
		bam_name, 0);
		if (!bam->ipc_log2) {
		if (!bam->ipc_log2)
		SPS_ERR(sps, "%s : unable to create IPC Logging 2 for bam %pa",
		__func__, &bam->props.phys_addr);
		goto exit_err;
		}

		snprintf(bam_name, sizeof(bam_name), "sps_bam_%pa_3",
		&bam->props.phys_addr);
		bam->ipc_log3 = ipc_log_context_create(SPS_IPC_LOGPAGES,
		bam_name, 0);
		if (!bam->ipc_log3) {
		if (!bam->ipc_log3)
		SPS_ERR(sps, "%s : unable to create IPC Logging 3 for bam %pa",
		__func__, &bam->props.phys_addr);
		goto exit_err;
		}

		snprintf(bam_name, sizeof(bam_name), "sps_bam_%pa_4",
		&bam->props.phys_addr);
		bam->ipc_log4 = ipc_log_context_create(SPS_IPC_LOGPAGES,
		bam_name, 0);
		if (!bam->ipc_log4) {
		if (!bam->ipc_log4)
		SPS_ERR(sps, "%s : unable to create IPC Logging 4 for bam %pa",
		__func__, &bam->props.phys_addr);
		goto exit_err;
		}

		if (bam_props->ipc_loglevel)
		bam->ipc_loglevel = bam_props->ipc_loglevel;

drivers/platform/msm/sps/spsi.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ extern u8 print_limit_option;
		ipc_log_string((dev)->ipc_log4, \
		"%s: " msg, __func__, args); \
		else \
		pr_err("sps: no such IPC logging index!\n"); \
		pr_debug("sps: no such IPC logging index!\n"); \
		} \
		} while (0)
		#define SPS_DUMP(msg, args...) do { \