From: Sriram Dash <sriram.dash@nxp.com>
To: <linux-kernel@vger.kernel.org>, <linux-usb@vger.kernel.org>
Cc: <mathias.nyman@intel.com>, <gregkh@linuxfoundation.org>,
<suresh.gupta@nxp.com>, <felipe.balbi@linux.intel.com>,
<stern@rowland.harvard.edu>, <pku.leo@gmail.com>,
Sriram Dash <sriram.dash@nxp.com>, Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH 2/3] usb: dwc3: host: Do not use dma_set_coherent_mask
Date: Tue, 25 Oct 2016 16:26:27 +0530 [thread overview]
Message-ID: <1477392988-7253-3-git-send-email-sriram.dash@nxp.com> (raw)
In-Reply-To: <1477392988-7253-1-git-send-email-sriram.dash@nxp.com>
Do not require dma_set_coherent_mask for hcd
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/usb/chipidea/core.c | 3 ---
drivers/usb/dwc3/core.c | 6 ------
drivers/usb/dwc3/dwc3-st.c | 1 -
drivers/usb/dwc3/host.c | 4 ----
4 files changed, 14 deletions(-)
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 69426e6..8917a03 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -833,9 +833,6 @@ struct platform_device *ci_hdrc_add_device(struct device *dev,
}
pdev->dev.parent = dev;
- pdev->dev.dma_mask = dev->dma_mask;
- pdev->dev.dma_parms = dev->dma_parms;
- dma_set_coherent_mask(&pdev->dev, dev->coherent_dma_mask);
ret = platform_device_add_resources(pdev, res, nres);
if (ret)
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index e0f64ef..0af0dc0 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -1059,12 +1059,6 @@ static int dwc3_probe(struct platform_device *pdev)
spin_lock_init(&dwc->lock);
- if (!dev->dma_mask) {
- dev->dma_mask = dev->parent->dma_mask;
- dev->dma_parms = dev->parent->dma_parms;
- dma_set_coherent_mask(dev, dev->parent->coherent_dma_mask);
- }
-
pm_runtime_set_active(dev);
pm_runtime_use_autosuspend(dev);
pm_runtime_set_autosuspend_delay(dev, DWC3_DEFAULT_AUTOSUSPEND_DELAY);
diff --git a/drivers/usb/dwc3/dwc3-st.c b/drivers/usb/dwc3/dwc3-st.c
index 89a2f71..4d7439c 100644
--- a/drivers/usb/dwc3/dwc3-st.c
+++ b/drivers/usb/dwc3/dwc3-st.c
@@ -218,7 +218,6 @@ static int st_dwc3_probe(struct platform_device *pdev)
if (IS_ERR(regmap))
return PTR_ERR(regmap);
- dma_set_coherent_mask(dev, dev->coherent_dma_mask);
dwc3_data->dev = dev;
dwc3_data->regmap = regmap;
diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
index bb83eee..045ec27 100644
--- a/drivers/usb/dwc3/host.c
+++ b/drivers/usb/dwc3/host.c
@@ -72,11 +72,7 @@ int dwc3_host_init(struct dwc3 *dwc)
return -ENOMEM;
}
- dma_set_coherent_mask(&xhci->dev, dwc->dev->coherent_dma_mask);
-
xhci->dev.parent = dwc->dev;
- xhci->dev.dma_mask = dwc->dev->dma_mask;
- xhci->dev.dma_parms = dwc->dev->dma_parms;
dwc->xhci = xhci;
--
2.1.0
next prev parent reply other threads:[~2016-10-25 11:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-25 10:56 [PATCH 0/3] inherit dma configuration from parent dev Sriram Dash
2016-10-25 10:56 ` [PATCH 1/3] usb: dwc3: host: " Sriram Dash
2016-10-26 3:29 ` Peter Chen
2016-10-25 10:56 ` Sriram Dash [this message]
2016-10-25 20:42 ` [PATCH 2/3] usb: dwc3: host: Do not use dma_set_coherent_mask Arnd Bergmann
2016-10-27 5:29 ` Sriram Dash
2016-10-25 10:56 ` [PATCH 3/3] usb: dwc3: host: Do not use dma_coerce_mask_and_coherent Sriram Dash
2016-10-25 20:27 ` Arnd Bergmann
2016-10-27 5:28 ` Sriram Dash
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1477392988-7253-3-git-send-email-sriram.dash@nxp.com \
--to=sriram.dash@nxp.com \
--cc=arnd@arndb.de \
--cc=felipe.balbi@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@intel.com \
--cc=pku.leo@gmail.com \
--cc=stern@rowland.harvard.edu \
--cc=suresh.gupta@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox