Merge branch 'topic/qcom' into for-linus (e6f81f3c) · Commits · 戴 / test

MAINTAINERS

+8 −0

Original line number	Diff line number	Diff line
		@@ -11657,6 +11657,14 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.g
		S: Supported
		F: arch/hexagon/

		QUALCOMM HIDMA DRIVER
		M: Sinan Kaya <okaya@codeaurora.org>
		L: linux-arm-kernel@lists.infradead.org
		L: linux-arm-msm@vger.kernel.org
		L: dmaengine@vger.kernel.org
		S: Supported
		F: drivers/dma/qcom/hidma*

		QUALCOMM IOMMU
		M: Rob Clark <robdclark@gmail.com>
		L: iommu@lists.linux-foundation.org

+1 −2

Original line number	Diff line number	Diff line
		@@ -616,8 +616,7 @@ static irqreturn_t hidma_chirq_handler_msi(int chirq, void *arg)
		static ssize_t hidma_show_values(struct device *dev,
		struct device_attribute attr, char buf)
		{
		struct platform_device *pdev = to_platform_device(dev);
		struct hidma_dev *mdev = platform_get_drvdata(pdev);
		struct hidma_dev *mdev = dev_get_drvdata(dev);

		buf[0] = 0;

+2 −4

Original line number	Diff line number	Diff line
		@@ -107,8 +107,7 @@ static struct hidma_mgmt_fileinfo hidma_mgmt_files[] = {
		static ssize_t show_values(struct device dev, struct device_attribute attr,
		char *buf)
		{
		struct platform_device *pdev = to_platform_device(dev);
		struct hidma_mgmt_dev *mdev = platform_get_drvdata(pdev);
		struct hidma_mgmt_dev *mdev = dev_get_drvdata(dev);
		unsigned int i;

		buf[0] = 0;
		@@ -125,8 +124,7 @@ static ssize_t show_values(struct device dev, struct device_attribute attr,
		static ssize_t set_values(struct device dev, struct device_attribute attr,
		const char *buf, size_t count)
		{
		struct platform_device *pdev = to_platform_device(dev);
		struct hidma_mgmt_dev *mdev = platform_get_drvdata(pdev);
		struct hidma_mgmt_dev *mdev = dev_get_drvdata(dev);
		unsigned long tmp;
		unsigned int i;
		int rc;