| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 2 Feb 2012 16:32:15 -0500
From: Alexandre Bounine <alexandre.bounine@....com>
To: vinod.koul@...el.com, dan.j.williams@...el.com,
linux-kernel@...r.kernel.org
Cc: Alexandre Bounine <alexandre.bounine@....com>,
Nicolas Ferre <nicolas.ferre@...el.com>,
Chris Ball <cjb@...top.org>,
Guennadi Liakhovetski <g.liakhovetski@....de>,
Ian Molton <ian@...menth.co.uk>,
Russell King <rmk+kernel@....linux.org.uk>,
Linus Walleij <linus.walleij@...aro.org>,
Per Forlin <per.forlin@...ricsson.com>,
Ulf Hansson <ulf.hansson@...ricsson.com>,
Sascha Hauer <s.hauer@...gutronix.de>,
Anton Vorontsov <cbouatmailru@...il.com>,
Shawn Guo <shawn.guo@...aro.org>,
Wolfram Sang <w.sang@...gutronix.de>,
Paul Gortmaker <paul.gortmaker@...driver.com>,
Viresh Kumar <viresh.kumar@...com>
Subject: [PATCH 05/11] mmc/host: add context parameter for DMA_SLAVE and DMA_CYCLIC
Fixups for calls affected by adding the new context parameter to DMA_SLAVE
and DMA_CYCLIC interfaces.
Signed-off-by: Alexandre Bounine <alexandre.bounine@....com>
Cc: Nicolas Ferre <nicolas.ferre@...el.com>
Cc: Chris Ball <cjb@...top.org>
Cc: Guennadi Liakhovetski <g.liakhovetski@....de>
Cc: Ian Molton <ian@...menth.co.uk>
Cc: Russell King <rmk+kernel@....linux.org.uk>
Cc: Linus Walleij <linus.walleij@...aro.org>
Cc: Per Forlin <per.forlin@...ricsson.com>
Cc: Ulf Hansson <ulf.hansson@...ricsson.com>
Cc: Sascha Hauer <s.hauer@...gutronix.de>
Cc: Anton Vorontsov <cbouatmailru@...il.com>
Cc: Shawn Guo <shawn.guo@...aro.org>
Cc: Wolfram Sang <w.sang@...gutronix.de>
Cc: Paul Gortmaker <paul.gortmaker@...driver.com>
Cc: Viresh Kumar <viresh.kumar@...com>
---
drivers/mmc/host/atmel-mci.c | 2 +-
drivers/mmc/host/mmci.c | 2 +-
drivers/mmc/host/mxcmmc.c | 2 +-
drivers/mmc/host/mxs-mmc.c | 2 +-
drivers/mmc/host/sh_mmcif.c | 6 ++++--
drivers/mmc/host/tmio_mmc_dma.c | 4 ++--
6 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index fcfe1eb..8e2d1f9 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -874,7 +874,7 @@ atmci_prepare_data_dma(struct atmel_mci *host, struct mmc_data *data)
desc = chan->device->device_prep_slave_sg(chan,
data->sg, sglen, slave_dirn,
- DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+ DMA_PREP_INTERRUPT | DMA_CTRL_ACK, NULL);
if (!desc)
goto unmap_exit;
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 0d955ff..39b574d 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -412,7 +412,7 @@ static int mmci_dma_prep_data(struct mmci_host *host, struct mmc_data *data,
dmaengine_slave_config(chan, &conf);
desc = device->device_prep_slave_sg(chan, data->sg, nr_sg,
- conf.direction, DMA_CTRL_ACK);
+ conf.direction, DMA_CTRL_ACK, NULL);
if (!desc)
goto unmap_exit;
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
index 4184b79..870f94f 100644
--- a/drivers/mmc/host/mxcmmc.c
+++ b/drivers/mmc/host/mxcmmc.c
@@ -256,7 +256,7 @@ static int mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data)
host->desc = host->dma->device->device_prep_slave_sg(host->dma,
data->sg, data->sg_len, slave_dirn,
- DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+ DMA_PREP_INTERRUPT | DMA_CTRL_ACK, NULL);
if (!host->desc) {
dma_unmap_sg(host->dma->device->dev, data->sg, data->sg_len,
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index 382c835..2bd7066 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -325,7 +325,7 @@ static struct dma_async_tx_descriptor *mxs_mmc_prep_dma(
}
desc = host->dmach->device->device_prep_slave_sg(host->dmach,
- sgl, sg_len, host->slave_dirn, append);
+ sgl, sg_len, host->slave_dirn, append, NULL);
if (desc) {
desc->callback = mxs_mmc_dma_irq_callback;
desc->callback_param = host;
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index f5d8b53..deff2fa 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -286,7 +286,8 @@ static void sh_mmcif_start_dma_rx(struct sh_mmcif_host *host)
if (ret > 0) {
host->dma_active = true;
desc = chan->device->device_prep_slave_sg(chan, sg, ret,
- DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+ DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT | DMA_CTRL_ACK,
+ NULL);
}
if (desc) {
@@ -335,7 +336,8 @@ static void sh_mmcif_start_dma_tx(struct sh_mmcif_host *host)
if (ret > 0) {
host->dma_active = true;
desc = chan->device->device_prep_slave_sg(chan, sg, ret,
- DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+ DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT | DMA_CTRL_ACK,
+ NULL);
}
if (desc) {
diff --git a/drivers/mmc/host/tmio_mmc_dma.c b/drivers/mmc/host/tmio_mmc_dma.c
index 7a6e6cc..3fb4286 100644
--- a/drivers/mmc/host/tmio_mmc_dma.c
+++ b/drivers/mmc/host/tmio_mmc_dma.c
@@ -77,7 +77,7 @@ static void tmio_mmc_start_dma_rx(struct tmio_mmc_host *host)
ret = dma_map_sg(chan->device->dev, sg, host->sg_len, DMA_FROM_DEVICE);
if (ret > 0)
desc = chan->device->device_prep_slave_sg(chan, sg, ret,
- DMA_DEV_TO_MEM, DMA_CTRL_ACK);
+ DMA_DEV_TO_MEM, DMA_CTRL_ACK, NULL);
if (desc) {
cookie = dmaengine_submit(desc);
@@ -158,7 +158,7 @@ static void tmio_mmc_start_dma_tx(struct tmio_mmc_host *host)
ret = dma_map_sg(chan->device->dev, sg, host->sg_len, DMA_TO_DEVICE);
if (ret > 0)
desc = chan->device->device_prep_slave_sg(chan, sg, ret,
- DMA_MEM_TO_DEV, DMA_CTRL_ACK);
+ DMA_MEM_TO_DEV, DMA_CTRL_ACK, NULL);
if (desc) {
cookie = dmaengine_submit(desc);
--
1.7.8.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists