Merge "msm: mhi_dev: Remove redundant code" (d109e629) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/platform/msm/mhi_dev/mhi.c

+39 −50

Original line number	Diff line number	Diff line
		@@ -122,7 +122,6 @@ void mhi_dev_read_from_host(struct mhi_dev mhi, struct mhi_addr transfer)
		host_addr_pa = transfer->host_pa \| bit_40;
		}

		if (mhi->use_ipa) {
		mhi_log(MHI_MSG_VERBOSE,
		"device 0x%x <<-- host 0x%llx, size %d\n",
		transfer->phy_addr, host_addr_pa,
		@@ -134,10 +133,7 @@ void mhi_dev_read_from_host(struct mhi_dev mhi, struct mhi_addr transfer)
		pr_err("error while reading from host:%d\n", rc);

		wait_for_completion(&done);
		} else {
		memcpy(transfer->virt_addr, (void *) &transfer->device_va,
		(int) transfer->size);
		}

		}
		EXPORT_SYMBOL(mhi_dev_read_from_host);

		@@ -160,7 +156,6 @@ void mhi_dev_write_to_host(struct mhi_dev mhi, struct mhi_addr transfer,
		host_addr_pa = transfer->host_pa \| bit_40;
		}

		if (mhi->use_ipa) {
		mhi_log(MHI_MSG_VERBOSE,
		"device 0x%llx --> host 0x%llx, size %d\n",
		(uint64_t) mhi->cache_dma_handle, host_addr_pa,
		@@ -191,12 +186,6 @@ void mhi_dev_write_to_host(struct mhi_dev mhi, struct mhi_addr transfer,
		if (rc)
		pr_err("error while writing to host:%d\n", rc);
		}
		} else {
		memcpy((void *) &transfer->device_va, transfer->virt_addr,
		transfer->size);
		/* Update state before sending events */
		wmb();
		}
		}
		EXPORT_SYMBOL(mhi_dev_write_to_host);