Merge "spi-geni-qcom: Fix compile warnings" (eb0c0ec6) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/platform/msm/ipa/ipa_v3/ipa_wigig_i.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@
		static int ipa3_wigig_uc_loaded_handler(struct notifier_block *self,
		unsigned long val, void *data)
		{
		IPADBG("val %d\n", val);
		IPADBG("val %ld\n", val);

		if (!ipa3_ctx) {
		IPAERR("IPA ctx is null\n");
		@@ -829,7 +829,7 @@ int ipa3_conn_wigig_rx_pipe_i(void in, struct ipa_wigig_conn_out_params out)
		if (
		IPA_WIGIG_MSB(input->dbuff.data_buffer_base_pa) & 0xFFFFFF00) {
		IPAERR(
		"data_buffers_base_address_msb is over the 8 bit limit (0xpa)\n"
		"data_buffers_base_address_msb is over the 8 bit limit (0x%pa)\n"
		, &input->dbuff.data_buffer_base_pa);
		IPA_ACTIVE_CLIENTS_DEC_SIMPLE();
		return -EFAULT;
		@@ -971,7 +971,7 @@ int ipa3_conn_wigig_client_i(void in, struct ipa_wigig_conn_out_params out)
		!= IPA_WIGIG_8_MSB(
		input_smmu->pipe_smmu.status_ring_HWTAIL_pa)) {
		IPAERR(
		"status ring HWHEAD and HWTAIL differ in 8 MSbs head 0x%X tail 0x%X\n"
		"status ring HWHEAD and HWTAIL differ in 8 MSbs head 0x%llX tail 0x%llX\n"
		, input_smmu->pipe_smmu.status_ring_HWHEAD_pa,
		input_smmu->pipe_smmu.status_ring_HWTAIL_pa);
		return -EFAULT;
		@@ -1010,7 +1010,7 @@ int ipa3_conn_wigig_client_i(void in, struct ipa_wigig_conn_out_params out)
		!= IPA_WIGIG_8_MSB(
		input->pipe.status_ring_HWTAIL_pa)) {
		IPAERR(
		"status ring HWHEAD and HWTAIL differ in 8 MSbs head 0x%X tail 0x%X\n"
		"status ring HWHEAD and HWTAIL differ in 8 MSbs head 0x%llX tail 0x%llX\n"
		, input->pipe.status_ring_HWHEAD_pa,
		input->pipe.status_ring_HWTAIL_pa);
		return -EFAULT;
		@@ -1472,7 +1472,7 @@ int ipa3_enable_wigig_pipe_i(enum ipa_client_type client)
		ep->gsi_mem_info.chan_ring_len -
		IPA_WIGIG_DESC_RING_EL_SIZE;

		IPADBG("ring ch doorbell (0x%llX) TX %d\n", val,
		IPADBG("ring ch doorbell (0x%llX) TX %ld\n", val,
		ep->gsi_chan_hdl);
		res = gsi_ring_ch_ring_db(ep->gsi_chan_hdl, val);
		if (res) {

drivers/soc/qcom/spcom.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -400,7 +400,7 @@ static int spcom_rx(struct spcom_channel *ch,
		goto exit_err;
		}
		} else {
		pr_debug("pending data size [%zu], requested size [%zu], ch->txn_id %d\n",
		pr_debug("pending data size [%zu], requested size [%u], ch->txn_id %d\n",
		ch->actual_rx_size, size, ch->txn_id);
		}
		if (!ch->rpmsg_rx_buf) {
		@@ -895,7 +895,7 @@ static int spcom_handle_lock_ion_buf_command(struct spcom_channel *ch,
		}

		if (cmd->arg > (unsigned int)INT_MAX) {
		pr_err("int overflow [%ld]\n", cmd->arg);
		pr_err("int overflow [%u]\n", cmd->arg);
		return -EINVAL;
		}
		fd = cmd->arg;
		@@ -926,7 +926,7 @@ static int spcom_handle_lock_ion_buf_command(struct spcom_channel *ch,
		if (ch->dmabuf_handle_table[i] == NULL) {
		ch->dmabuf_handle_table[i] = dma_buf;
		ch->dmabuf_fd_table[i] = fd;
		pr_debug("ch [%s] locked ion buf #%d fd [%d] dma_buf=0x%x\n",
		pr_debug("ch [%s] locked ion buf #%d fd [%d] dma_buf=0x%pK\n",
		ch->name, i,
		ch->dmabuf_fd_table[i],
		ch->dmabuf_handle_table[i]);
		@@ -964,7 +964,7 @@ static int spcom_handle_unlock_ion_buf_command(struct spcom_channel *ch,
		return -EINVAL;
		}
		if (cmd->arg > (unsigned int)INT_MAX) {
		pr_err("int overflow [%ld]\n", cmd->arg);
		pr_err("int overflow [%u]\n", cmd->arg);
		return -EINVAL;
		}
		fd = cmd->arg;
		@@ -1000,7 +1000,7 @@ static int spcom_handle_unlock_ion_buf_command(struct spcom_channel *ch,
		if (!ch->dmabuf_handle_table[i])
		continue;
		if (ch->dmabuf_handle_table[i] == dma_buf) {
		pr_debug("ch [%s] unlocked ion buf #%d fd [%d] dma_buf=0x%x\n",
		pr_debug("ch [%s] unlocked ion buf #%d fd [%d] dma_buf=0x%pK\n",
		ch->name, i,
		ch->dmabuf_fd_table[i],
		ch->dmabuf_handle_table[i]);
		@@ -1369,7 +1369,7 @@ static int spcom_device_release(struct inode inode, struct file filp)
		ch->is_busy = false;
		ch->pid = 0;
		if (ch->rpmsg_rx_buf) {
		pr_debug("ch [%s] discarting unconsumed rx packet actual_rx_size=%d\n",
		pr_debug("ch [%s] discarting unconsumed rx packet actual_rx_size=%zd\n",
		name, ch->actual_rx_size);
		kfree(ch->rpmsg_rx_buf);
		ch->rpmsg_rx_buf = NULL;
		@@ -1884,7 +1884,7 @@ static void spcom_signal_rx_done(struct work_struct *ignored)

		if (ch->rpmsg_abort) {
		if (ch->rpmsg_rx_buf) {
		pr_debug("ch [%s] rx aborted free %d bytes\n",
		pr_debug("ch [%s] rx aborted free %zd bytes\n",
		ch->name, ch->actual_rx_size);
		kfree(ch->rpmsg_rx_buf);
		ch->actual_rx_size = 0;
		@@ -1892,7 +1892,7 @@ static void spcom_signal_rx_done(struct work_struct *ignored)
		goto rx_aborted;
		}
		if (ch->rpmsg_rx_buf) {
		pr_err("ch [%s] previous buffer not consumed %d bytes\n",
		pr_err("ch [%s] previous buffer not consumed %zd bytes\n",
		ch->name, ch->actual_rx_size);
		kfree(ch->rpmsg_rx_buf);
		ch->rpmsg_rx_buf = NULL;

drivers/spi/spi-geni-qcom.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -188,7 +188,7 @@ static int get_spi_clk_cfg(u32 speed_hz, struct spi_geni_master *mas,

		res_freq = (sclk_freq / (*clk_div));

		dev_dbg(mas->dev, "%s: req %u resultant %u sclk %lu, idx %d, div %d\n",
		dev_dbg(mas->dev, "%s: req %u resultant %lu sclk %lu, idx %d, div %d\n",
		__func__, speed_hz, res_freq, sclk_freq, clk_idx, clk_div);

		ret = clk_set_rate(rsc->se_clk, sclk_freq);