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

Commit 9a64886b authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: mem-offline: Fix compile warnings"

parents df4e66ba a52112ee

drivers/iommu/arm-smmu.c

+6 −3
Original line number Diff line number Diff line
@@ -1416,7 +1416,7 @@ static void print_ctx_regs(struct arm_smmu_device *smmu, struct arm_smmu_cfg 
	dev_err(smmu->dev, "FAR    = 0x%016llx\n",

		readq_relaxed(cb_base + ARM_SMMU_CB_FAR));

	dev_err(smmu->dev, "PAR    = 0x%pK\n",

		readq_relaxed(cb_base + ARM_SMMU_CB_PAR));

		(void *) readq_relaxed(cb_base + ARM_SMMU_CB_PAR));



	dev_err(smmu->dev,

		"FSR    = 0x%08x [%s%s%s%s%s%s%s%s%s%s]\n",
@@ -1436,15 +1436,18 @@ static void print_ctx_regs(struct arm_smmu_device *smmu, struct arm_smmu_cfg 


	if (cfg->fmt == ARM_SMMU_CTX_FMT_AARCH32_S) {

		dev_err(smmu->dev, "TTBR0  = 0x%pK\n",

			(void *) (unsigned long)

			readl_relaxed(cb_base + ARM_SMMU_CB_TTBR0));

		dev_err(smmu->dev, "TTBR1  = 0x%pK\n",

			(void *) (unsigned long)

			readl_relaxed(cb_base + ARM_SMMU_CB_TTBR1));

	} else {

		dev_err(smmu->dev, "TTBR0  = 0x%pK\n",

			readq_relaxed(cb_base + ARM_SMMU_CB_TTBR0));

			(void *) readq_relaxed(cb_base + ARM_SMMU_CB_TTBR0));

		if (stage1)

			dev_err(smmu->dev, "TTBR1  = 0x%pK\n",

				readq_relaxed(cb_base + ARM_SMMU_CB_TTBR1));

				(void *) readq_relaxed(cb_base +

					ARM_SMMU_CB_TTBR1));

	}

drivers/media/platform/msm/camera/cam_sensor_module/cam_flash/cam_flash_core.c

+4 −4
Original line number Diff line number Diff line
@@ -1312,7 +1312,7 @@ int cam_flash_pmic_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg) 
		csl_packet->header.request_id <= fctrl->last_flush_req

		&& fctrl->last_flush_req != 0) {

		CAM_WARN(CAM_FLASH,

			"reject request %lld, last request to flush %lld",

			"reject request %lld, last request to flush %d",

			csl_packet->header.request_id, fctrl->last_flush_req);

		rc = -EINVAL;

		goto rel_pkt_buf;
@@ -1420,7 +1420,7 @@ int cam_flash_pmic_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg) 


		if (cam_mem_put_cpu_buf(cmd_desc->mem_handle))

			CAM_WARN(CAM_FLASH, "Fail in put buffer: %pK",

				cmd_desc->mem_handle);

				(void *) (unsigned long) cmd_desc->mem_handle);

		break;

	}

	case CAM_FLASH_PACKET_OPCODE_SET_OPS: {
@@ -1718,7 +1718,7 @@ int cam_flash_pmic_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg) 
	}



	if (cam_mem_put_cpu_buf(config.packet_handle))

		CAM_WARN(CAM_FLASH, "Failed in put the buffer: 0x%x ",

		CAM_WARN(CAM_FLASH, "Failed in put the buffer: 0x%llx ",

			config.packet_handle);



	return 0;
@@ -1729,7 +1729,7 @@ int cam_flash_pmic_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg) 
			cmd_desc->mem_handle);

rel_pkt_buf:

	if (cam_mem_put_cpu_buf(config.packet_handle))

		CAM_WARN(CAM_FLASH, "Failed in put the buffer: 0x%x ",

		CAM_WARN(CAM_FLASH, "Failed in put the buffer: 0x%llx ",

			config.packet_handle);



	return rc;

drivers/net/wireless/cnss2/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1228,7 +1228,7 @@ static int cnss_qdss_trace_save_hdlr(struct cnss_plat_data *plat_priv, 
						      size, &seg_id);

			if (!va) {

				cnss_pr_err("Fail to find matching va for pa %pa\n",

					    pa);

					    &pa);

				ret = -EINVAL;

				break;

			}

drivers/net/wireless/cnss2/power.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static void cnss_put_vreg_single(struct cnss_plat_data *plat_priv, 
	devm_kfree(dev, vreg);

}



static cnss_vreg_on_single(struct cnss_vreg_info *vreg)

static int cnss_vreg_on_single(struct cnss_vreg_info *vreg)

{

	int ret = 0;

drivers/net/wireless/cnss2/qmi.c

+2 −2
Original line number Diff line number Diff line
@@ -1446,7 +1446,7 @@ static void cnss_wlfw_qdss_trace_req_mem_ind_cb(struct qmi_handle *qmi_wlfw, 


	plat_priv->qdss_mem_seg_len = ind_msg->mem_seg_len;

	for (i = 0; i < plat_priv->qdss_mem_seg_len; i++) {

		cnss_pr_dbg("QDSS requests for memory, size: 0x%zx, type: %u\n",

		cnss_pr_dbg("QDSS requests for memory, size: 0x%x, type: %u\n",

			    ind_msg->mem_seg[i].size, ind_msg->mem_seg[i].type);

		plat_priv->qdss_mem[i].type = ind_msg->mem_seg[i].type;

		plat_priv->qdss_mem[i].size = ind_msg->mem_seg[i].size;
@@ -1902,7 +1902,7 @@ static int coex_new_server(struct qmi_handle *qmi, 
	}



	set_bit(CNSS_COEX_CONNECTED, &plat_priv->driver_state);

	cnss_pr_dbg("COEX Server Connected: 0x%llx\n",

	cnss_pr_dbg("COEX Server Connected: 0x%lx\n",

		    plat_priv->driver_state);

	return 0;

}