From: Russell King <rmk+kernel@arm.linux.org.uk>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH RFC 37/51] DMA-API: usb: use new dma_coerce_mask_and_coherent()
Date: Thu, 01 Aug 2013 23:11:11 +0100 [thread overview]
Message-ID: <E1V515T-0006tK-SU@rmk-PC.arm.linux.org.uk> (raw)
In-Reply-To: <20130801213420.GL23006@n2100.arm.linux.org.uk>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
drivers/usb/chipidea/ci_hdrc_imx.c | 4 +---
drivers/usb/dwc3/dwc3-exynos.c | 4 +---
drivers/usb/host/ehci-atmel.c | 4 +---
drivers/usb/host/ehci-omap.c | 4 +---
drivers/usb/host/ehci-orion.c | 4 +---
drivers/usb/host/ehci-platform.c | 5 ++---
drivers/usb/host/ehci-s5p.c | 4 +---
drivers/usb/host/ehci-spear.c | 4 +---
drivers/usb/host/ehci-tegra.c | 4 +---
drivers/usb/host/ohci-at91.c | 4 +---
drivers/usb/host/ohci-exynos.c | 4 +---
drivers/usb/host/ohci-nxp.c | 3 +--
drivers/usb/host/ohci-octeon.c | 3 +--
drivers/usb/host/ohci-omap3.c | 4 +---
drivers/usb/host/ohci-pxa27x.c | 4 +---
drivers/usb/host/ohci-spear.c | 4 +---
drivers/usb/host/uhci-platform.c | 4 +---
17 files changed, 18 insertions(+), 49 deletions(-)
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index 1c47edd..ed73337 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -157,9 +157,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
pdata.phy = data->phy;
- if (!pdev->dev.dma_mask)
- pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
- ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+ ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
if (ret)
goto err;
diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c
index 7553ae4..71052a7 100644
--- a/drivers/usb/dwc3/dwc3-exynos.c
+++ b/drivers/usb/dwc3/dwc3-exynos.c
@@ -115,9 +115,7 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
* Since shared usb code relies on it, set it here for now.
* Once we move to full device tree support this will vanish off.
*/
- if (!dev->dma_mask)
- dev->dma_mask = &dev->coherent_dma_mask;
- ret = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
+ ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
if (ret)
goto err1;
diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index 5831a88..8e7323e 100644
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -90,9 +90,7 @@ static int ehci_atmel_drv_probe(struct platform_device *pdev)
* Since shared usb code relies on it, set it here for now.
* Once we have dma capability bindings this can go away.
*/
- if (!pdev->dev.dma_mask)
- pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
- retval = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+ retval = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
if (retval)
goto fail_create_hcd;
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 922e193..98d164d 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -144,9 +144,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
* Since shared usb code relies on it, set it here for now.
* Once we have dma capability bindings this can go away.
*/
- if (!dev->dma_mask)
- dev->dma_mask = &dev->coherent_dma_mask;
- ret = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
+ ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
if (ret)
return ret;
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c
index d7fbad0..3ab4cf2 100644
--- a/drivers/usb/host/ehci-orion.c
+++ b/drivers/usb/host/ehci-orion.c
@@ -180,9 +180,7 @@ static int ehci_orion_drv_probe(struct platform_device *pdev)
* set. Since shared usb code relies on it, set it here for
* now. Once we have dma capability bindings this can go away.
*/
- if (!pdev->dev.dma_mask)
- pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
- err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+ err = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
if (err)
goto err1;
diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
index 2c6004e..b32731b 100644
--- a/drivers/usb/host/ehci-platform.c
+++ b/drivers/usb/host/ehci-platform.c
@@ -89,9 +89,8 @@ static int ehci_platform_probe(struct platform_device *dev)
*/
if (!dev->dev.platform_data)
dev->dev.platform_data = &ehci_platform_defaults;
- if (!dev->dev.dma_mask)
- dev->dev.dma_mask = &dev->dev.coherent_dma_mask;
- err = dma_set_coherent_mask(&dev->dev, DMA_BIT_MASK(32));
+
+ err = dma_coerce_mask_and_coherent(&dev->dev, DMA_BIT_MASK(32));
if (err)
return err;
diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c
index 97127db..788d786 100644
--- a/drivers/usb/host/ehci-s5p.c
+++ b/drivers/usb/host/ehci-s5p.c
@@ -89,9 +89,7 @@ static int s5p_ehci_probe(struct platform_device *pdev)
* Since shared usb code relies on it, set it here for now.
* Once we move to full device tree support this will vanish off.
*/
- if (!pdev->dev.dma_mask)
- pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
- err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+ err = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
if (err)
return err;
diff --git a/drivers/usb/host/ehci-spear.c b/drivers/usb/host/ehci-spear.c
index 6839e15..ee6f9ff 100644
--- a/drivers/usb/host/ehci-spear.c
+++ b/drivers/usb/host/ehci-spear.c
@@ -81,9 +81,7 @@ static int spear_ehci_hcd_drv_probe(struct platform_device *pdev)
* Since shared usb code relies on it, set it here for now.
* Once we have dma capability bindings this can go away.
*/
- if (!pdev->dev.dma_mask)
- pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
- retval = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+ retval = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
if (retval)
goto fail;
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index ade3650..6ccd7ae 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -371,9 +371,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
* Since shared usb code relies on it, set it here for now.
* Once we have dma capability bindings this can go away.
*/
- if (!pdev->dev.dma_mask)
- pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
- err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+ err = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
if (err)
return err;
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index e4a801d..e727edf 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -519,9 +519,7 @@ static int ohci_at91_of_init(struct platform_device *pdev)
* Since shared usb code relies on it, set it here for now.
* Once we have dma capability bindings this can go away.
*/
- if (!pdev->dev.dma_mask)
- pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
- ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+ ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
if (ret)
return ret;
diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c
index 42d6730..29c02a4 100644
--- a/drivers/usb/host/ohci-exynos.c
+++ b/drivers/usb/host/ohci-exynos.c
@@ -114,9 +114,7 @@ static int exynos_ohci_probe(struct platform_device *pdev)
* Since shared usb code relies on it, set it here for now.
* Once we move to full device tree support this will vanish off.
*/
- if (!pdev->dev.dma_mask)
- pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
- err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+ err = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
if (err)
return err;
diff --git a/drivers/usb/host/ohci-nxp.c b/drivers/usb/host/ohci-nxp.c
index 5f82db4..df3eb3e 100644
--- a/drivers/usb/host/ohci-nxp.c
+++ b/drivers/usb/host/ohci-nxp.c
@@ -226,8 +226,7 @@ static int usb_hcd_nxp_probe(struct platform_device *pdev)
return -EPROBE_DEFER;
}
- pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
- ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+ ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
if (ret)
goto fail_disable;
diff --git a/drivers/usb/host/ohci-octeon.c b/drivers/usb/host/ohci-octeon.c
index ac1dea1..6c16dce 100644
--- a/drivers/usb/host/ohci-octeon.c
+++ b/drivers/usb/host/ohci-octeon.c
@@ -127,8 +127,7 @@ static int ohci_octeon_drv_probe(struct platform_device *pdev)
}
/* Ohci is a 32-bit device. */
- pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
- ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+ ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
if (ret)
return ret;
diff --git a/drivers/usb/host/ohci-omap3.c b/drivers/usb/host/ohci-omap3.c
index e767a01..60e135c 100644
--- a/drivers/usb/host/ohci-omap3.c
+++ b/drivers/usb/host/ohci-omap3.c
@@ -166,9 +166,7 @@ static int ohci_hcd_omap3_probe(struct platform_device *pdev)
* Since shared usb code relies on it, set it here for now.
* Once we have dma capability bindings this can go away.
*/
- if (!dev->dma_mask)
- dev->dma_mask = &dev->coherent_dma_mask;
- ret = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
+ ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
if (ret)
goto err_io;
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index 88c97db..35b5662 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -296,9 +296,7 @@ static int ohci_pxa_of_init(struct platform_device *pdev)
* Since shared usb code relies on it, set it here for now.
* Once we have dma capability bindings this can go away.
*/
- if (!pdev->dev.dma_mask)
- pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
- ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+ ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
if (ret)
return ret;
diff --git a/drivers/usb/host/ohci-spear.c b/drivers/usb/host/ohci-spear.c
index 195a0a1..075bb5e 100644
--- a/drivers/usb/host/ohci-spear.c
+++ b/drivers/usb/host/ohci-spear.c
@@ -111,9 +111,7 @@ static int spear_ohci_hcd_drv_probe(struct platform_device *pdev)
* Since shared usb code relies on it, set it here for now.
* Once we have dma capability bindings this can go away.
*/
- if (!pdev->dev.dma_mask)
- pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
- retval = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+ retval = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
if (retval)
goto fail;
diff --git a/drivers/usb/host/uhci-platform.c b/drivers/usb/host/uhci-platform.c
index 048912d..f8548b7 100644
--- a/drivers/usb/host/uhci-platform.c
+++ b/drivers/usb/host/uhci-platform.c
@@ -75,9 +75,7 @@ static int uhci_hcd_platform_probe(struct platform_device *pdev)
* Since shared usb code relies on it, set it here for now.
* Once we have dma capability bindings this can go away.
*/
- if (!pdev->dev.dma_mask)
- pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
- ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+ ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
if (ret)
return ret;
--
1.7.4.4
next prev parent reply other threads:[~2013-08-01 22:11 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-01 21:34 [PATCH RFC 00/51] Preview of DMA mask changes Russell King - ARM Linux
2013-08-01 21:35 ` [PATCH RFC 01/51] DMA-API: provide a helper to set both DMA and coherent DMA masks Russell King
2013-08-01 21:36 ` [PATCH RFC 02/51] DMA-API: net: brocade/bna/bnad.c: fix 32-bit DMA mask handling Russell King
2013-08-01 21:37 ` [PATCH RFC 03/51] DMA-API: net: intel/e1000e: " Russell King
2013-08-01 21:38 ` [PATCH RFC 04/51] DMA-API: net: intel/igb: " Russell King
2013-08-01 21:39 ` [PATCH RFC 05/51] DMA-API: net: intel/igbvf: " Russell King
2013-08-01 21:40 ` [PATCH RFC 06/51] DMA-API: net: intel/ixgb: " Russell King
2013-08-01 21:41 ` [PATCH RFC 07/51] DMA-API: net: intel/ixgbe: " Russell King
2013-08-01 21:42 ` [PATCH RFC 08/51] DMA-API: net: intel/ixgbevf: " Russell King
2013-08-01 21:43 ` [PATCH RFC 09/51] DMA-API: net: broadcom/b44: replace dma_set_mask()+dma_set_coherent_mask() with new helper Russell King
2013-08-01 21:44 ` [PATCH RFC 10/51] DMA-API: net: broadcom/bnx2x: " Russell King
2013-08-01 21:45 ` [PATCH RFC 11/51] DMA-API: net: emulex/benet: " Russell King
2013-08-01 21:46 ` [PATCH RFC 12/51] DMA-API: net: intel/e1000: " Russell King
2013-08-01 21:47 ` [PATCH RFC 13/51] DMA-API: net: sfc/efx.c: " Russell King
2013-08-01 21:48 ` [PATCH RFC 14/51] DMA-API: net: b43: " Russell King
2013-08-01 21:49 ` [PATCH RFC 15/51] DMA-API: net: b43legacy: " Russell King
2013-08-01 21:50 ` [PATCH RFC 16/51] DMA-API: ppc: vio.c: " Russell King
2013-08-01 21:51 ` [PATCH RFC 17/51] DMA-API: block: nvme-core: " Russell King
2013-08-01 21:52 ` [PATCH RFC 18/51] DMA-API: staging: et131x: " Russell King
2013-08-01 21:53 ` [PATCH RFC 19/51] DMA-API: media: dt3155v4l: " Russell King
2013-08-01 21:54 ` [PATCH RFC 20/51] DMA-API: usb: bcma: " Russell King
2013-08-01 21:55 ` [PATCH RFC 21/51] DMA-API: usb: ssb-hcd: " Russell King
2013-08-01 21:56 ` [PATCH RFC 22/51] DMA-API: amba: get rid of separate dma_mask Russell King
2013-08-01 21:57 ` [PATCH RFC 23/51] DMA-API: dma: pl08x: add dma_set_mask_and_coherent() call Russell King
2013-08-01 21:58 ` [PATCH RFC 24/51] DMA-API: dma: pl330: " Russell King
2013-08-01 21:59 ` [PATCH RFC 25/51] DMA-API: video: clcd: " Russell King
2013-08-01 22:00 ` [PATCH RFC 26/51] DMA-API: usb: ohci-sa1111: add a note about DMA masks Russell King
2013-08-01 22:01 ` [PATCH RFC 27/51] DMA-API: provide a helper to setup " Russell King
2013-08-01 22:02 ` [PATCH RFC 28/51] DMA-API: sound: fix dma mask handling in a lot of drivers Russell King
2013-08-01 22:03 ` [PATCH RFC 29/51] DMA-API: ata: pata_octeon_cf: convert to use dma_coerce_mask_and_coherent() Russell King
2013-08-01 22:04 ` [PATCH RFC 30/51] DMA-API: dma: dw_dmac.c: " Russell King
2013-08-01 22:05 ` [PATCH RFC 31/51] DMA-API: media: omap3isp: " Russell King
2013-08-01 22:06 ` [PATCH RFC 32/51] DMA-API: mmc: sdhci-acpi: " Russell King
2013-08-01 22:07 ` [PATCH RFC 33/51] DMA-API: net: nxp/lpc_eth: " Russell King
2013-08-01 22:08 ` [PATCH RFC 34/51] DMA-API: net: octeon: " Russell King
2013-08-01 22:09 ` [PATCH RFC 35/51] DMA-API: parport: parport_pc.c: " Russell King
2013-08-01 22:10 ` [PATCH RFC 36/51] DMA-API: usb: use dma_set_coherent_mask() Russell King
2013-08-01 22:11 ` Russell King [this message]
2013-08-01 22:12 ` [PATCH RFC 38/51] DMA-API: staging: " Russell King
2013-08-01 22:13 ` [PATCH RFC 39/51] DMA-API: others: " Russell King
2013-08-01 22:14 ` [PATCH RFC 40/51] DMA-API: crypto: fix ixp4xx crypto platform device support Russell King
2013-08-01 22:15 ` [PATCH RFC 41/51] DMA-API: crypto: remove last references to 'static struct device *dev' Russell King
2013-08-01 22:16 ` [PATCH RFC 42/51] DMA-API: usb: musb: use platform_device_register_full() to avoid directly messing with dma masks Russell King
2013-08-01 22:17 ` [PATCH RFC 43/51] DMA-API: dma: edma.c: no need to explicitly initialize DMA masks Russell King
2013-08-01 22:18 ` [PATCH RFC 44/51] DMA-API: dcdbas: update DMA mask handing Russell King
2013-08-01 22:19 ` [PATCH RFC 45/51] DMA-API: firmware/google/gsmi.c: avoid direct access to DMA masks Russell King
2013-08-01 22:20 ` [PATCH RFC 46/51] ARM: DMA-API: better handing of DMA masks for coherent allocations Russell King
2013-08-05 22:43 ` Rob Herring
2013-08-05 23:44 ` Russell King - ARM Linux
2013-08-09 11:35 ` Tushar Behera
2013-08-01 22:21 ` [PATCH RFC 47/51] ARM: 7794/1: block: Rename parameter dma_mask to max_addr for blk_queue_bounce_limit() Santosh Shilimkar
2013-08-01 22:37 ` Russell King - ARM Linux
2013-08-01 22:22 ` [PATCH RFC 48/51] ARM: 7795/1: mm: dma-mapping: Add dma_max_pfn(dev) helper function Santosh Shilimkar
2013-08-01 22:23 ` [PATCH RFC 49/51] ARM: 7796/1: scsi: Use dma_max_pfn(dev) helper for bounce_limit calculations Santosh Shilimkar
2013-08-01 22:24 ` [PATCH RFC 50/51] ARM: 7797/1: mmc: " Santosh Shilimkar
2013-08-01 22:25 ` [PATCH RFC 51/51] ARM: 7805/1: mm: change max*pfn to include the physical offset of memory Santosh Shilimkar
2013-08-06 3:15 ` Rob Herring
2013-08-06 8:51 ` Russell King - ARM Linux
2013-08-14 10:38 ` [PATCH RFC 00/51] Preview of DMA mask changes Russell King - ARM Linux
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=E1V515T-0006tK-SU@rmk-PC.arm.linux.org.uk \
--to=rmk+kernel@arm.linux.org.uk \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
/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
all inboxes | Powered by JetHome®