diff options
| author | Vinod Koul <vkoul@kernel.org> | 2018-06-04 07:58:49 +0300 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2018-06-04 07:58:49 +0300 |
| commit | e6f81f3cdb6b94db4e057d76cfcfe74cedca116d (patch) | |
| tree | 945aced5c8812f3a7ccd193e1473aee03844eb05 /drivers/dma | |
| parent | 4923be7b1bec2966f3bbe89d51a5185ce13850d9 (diff) | |
| parent | 6ae7abe370d14c62e5ae70e3f5909d31a44a560b (diff) | |
| download | linux-e6f81f3cdb6b94db4e057d76cfcfe74cedca116d.tar.xz | |
Merge branch 'topic/qcom' into for-linus
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/qcom/hidma.c | 3 | ||||
| -rw-r--r-- | drivers/dma/qcom/hidma_mgmt_sys.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/dma/qcom/hidma.c b/drivers/dma/qcom/hidma.c index 963cc5228d05..43d4b00b8138 100644 --- a/drivers/dma/qcom/hidma.c +++ b/drivers/dma/qcom/hidma.c @@ -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; diff --git a/drivers/dma/qcom/hidma_mgmt_sys.c b/drivers/dma/qcom/hidma_mgmt_sys.c index d61f1068a34b..cbb89eafd844 100644 --- a/drivers/dma/qcom/hidma_mgmt_sys.c +++ b/drivers/dma/qcom/hidma_mgmt_sys.c @@ -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; |