From: Cong Wang <amwang@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: akpm@linux-foundation.org, Cong Wang <amwang@redhat.com>,
Nicolas Ferre <nicolas.ferre@atmel.com>,
Chris Ball <cjb@laptop.org>, David Brown <davidb@codeaurora.org>,
Daniel Walker <dwalker@fifo99.com>,
Bryan Huntsman <bryanh@codeaurora.org>,
Alex Dubov <oakad@yahoo.com>,
Guennadi Liakhovetski <g.liakhovetski@gmx.de>,
Ian Molton <ian@mnementh.co.uk>,
linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org,
linux-arm-msm@vger.kernel.org
Subject: [PATCH 20/62] mmc: remove the second argument of k[un]map_atomic()
Date: Sun, 27 Nov 2011 13:27:00 +0800 [thread overview]
Message-ID: <1322371662-26166-21-git-send-email-amwang@redhat.com> (raw)
In-Reply-To: <1322371662-26166-1-git-send-email-amwang@redhat.com>
Signed-off-by: Cong Wang <amwang@redhat.com>
---
drivers/mmc/host/at91_mci.c | 8 ++++----
drivers/mmc/host/msm_sdcc.c | 6 +++---
drivers/mmc/host/sdhci.c | 4 ++--
drivers/mmc/host/tifm_sd.c | 16 ++++++++--------
drivers/mmc/host/tmio_mmc.c | 1 -
drivers/mmc/host/tmio_mmc.h | 4 ++--
6 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
index a8b4d2a..9a32922 100644
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -236,7 +236,7 @@ static inline void at91_mci_sg_to_dma(struct at91mci_host *host, struct mmc_data
sg = &data->sg[i];
- sgbuffer = kmap_atomic(sg_page(sg), KM_BIO_SRC_IRQ) + sg->offset;
+ sgbuffer = kmap_atomic(sg_page(sg)) + sg->offset;
amount = min(size, sg->length);
size -= amount;
@@ -252,7 +252,7 @@ static inline void at91_mci_sg_to_dma(struct at91mci_host *host, struct mmc_data
dmabuf = (unsigned *)tmpv;
}
- kunmap_atomic(sgbuffer, KM_BIO_SRC_IRQ);
+ kunmap_atomic(sgbuffer);
if (size == 0)
break;
@@ -302,7 +302,7 @@ static void at91_mci_post_dma_read(struct at91mci_host *host)
sg = &data->sg[i];
- sgbuffer = kmap_atomic(sg_page(sg), KM_BIO_SRC_IRQ) + sg->offset;
+ sgbuffer = kmap_atomic(sg_page(sg)) + sg->offset;
amount = min(size, sg->length);
size -= amount;
@@ -318,7 +318,7 @@ static void at91_mci_post_dma_read(struct at91mci_host *host)
}
flush_kernel_dcache_page(sg_page(sg));
- kunmap_atomic(sgbuffer, KM_BIO_SRC_IRQ);
+ kunmap_atomic(sgbuffer);
data->bytes_xfered += amount;
if (size == 0)
break;
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index 80d8eb1..62faa4a 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -689,8 +689,8 @@ msmsdcc_pio_irq(int irq, void *dev_id)
/* Map the current scatter buffer */
local_irq_save(flags);
- buffer = kmap_atomic(sg_page(host->pio.sg),
- KM_BIO_SRC_IRQ) + host->pio.sg->offset;
+ buffer = kmap_atomic(sg_page(host->pio.sg))
+ + host->pio.sg->offset;
buffer += host->pio.sg_off;
remain = host->pio.sg->length - host->pio.sg_off;
len = 0;
@@ -700,7 +700,7 @@ msmsdcc_pio_irq(int irq, void *dev_id)
len = msmsdcc_pio_write(host, buffer, remain, status);
/* Unmap the buffer */
- kunmap_atomic(buffer, KM_BIO_SRC_IRQ);
+ kunmap_atomic(buffer);
local_irq_restore(flags);
host->pio.sg_off += len;
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 6d8eea3..2cc9e29 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -423,12 +423,12 @@ static void sdhci_transfer_pio(struct sdhci_host *host)
static char *sdhci_kmap_atomic(struct scatterlist *sg, unsigned long *flags)
{
local_irq_save(*flags);
- return kmap_atomic(sg_page(sg), KM_BIO_SRC_IRQ) + sg->offset;
+ return kmap_atomic(sg_page(sg)) + sg->offset;
}
static void sdhci_kunmap_atomic(void *buffer, unsigned long *flags)
{
- kunmap_atomic(buffer, KM_BIO_SRC_IRQ);
+ kunmap_atomic(buffer);
local_irq_restore(*flags);
}
diff --git a/drivers/mmc/host/tifm_sd.c b/drivers/mmc/host/tifm_sd.c
index f70d046..fc00081 100644
--- a/drivers/mmc/host/tifm_sd.c
+++ b/drivers/mmc/host/tifm_sd.c
@@ -118,7 +118,7 @@ static void tifm_sd_read_fifo(struct tifm_sd *host, struct page *pg,
unsigned char *buf;
unsigned int pos = 0, val;
- buf = kmap_atomic(pg, KM_BIO_DST_IRQ) + off;
+ buf = kmap_atomic(pg) + off;
if (host->cmd_flags & DATA_CARRY) {
buf[pos++] = host->bounce_buf_data[0];
host->cmd_flags &= ~DATA_CARRY;
@@ -134,7 +134,7 @@ static void tifm_sd_read_fifo(struct tifm_sd *host, struct page *pg,
}
buf[pos++] = (val >> 8) & 0xff;
}
- kunmap_atomic(buf - off, KM_BIO_DST_IRQ);
+ kunmap_atomic(buf - off);
}
static void tifm_sd_write_fifo(struct tifm_sd *host, struct page *pg,
@@ -144,7 +144,7 @@ static void tifm_sd_write_fifo(struct tifm_sd *host, struct page *pg,
unsigned char *buf;
unsigned int pos = 0, val;
- buf = kmap_atomic(pg, KM_BIO_SRC_IRQ) + off;
+ buf = kmap_atomic(pg) + off;
if (host->cmd_flags & DATA_CARRY) {
val = host->bounce_buf_data[0] | ((buf[pos++] << 8) & 0xff00);
writel(val, sock->addr + SOCK_MMCSD_DATA);
@@ -161,7 +161,7 @@ static void tifm_sd_write_fifo(struct tifm_sd *host, struct page *pg,
val |= (buf[pos++] << 8) & 0xff00;
writel(val, sock->addr + SOCK_MMCSD_DATA);
}
- kunmap_atomic(buf - off, KM_BIO_SRC_IRQ);
+ kunmap_atomic(buf - off);
}
static void tifm_sd_transfer_data(struct tifm_sd *host)
@@ -212,13 +212,13 @@ static void tifm_sd_copy_page(struct page *dst, unsigned int dst_off,
struct page *src, unsigned int src_off,
unsigned int count)
{
- unsigned char *src_buf = kmap_atomic(src, KM_BIO_SRC_IRQ) + src_off;
- unsigned char *dst_buf = kmap_atomic(dst, KM_BIO_DST_IRQ) + dst_off;
+ unsigned char *src_buf = kmap_atomic(src) + src_off;
+ unsigned char *dst_buf = kmap_atomic(dst) + dst_off;
memcpy(dst_buf, src_buf, count);
- kunmap_atomic(dst_buf - dst_off, KM_BIO_DST_IRQ);
- kunmap_atomic(src_buf - src_off, KM_BIO_SRC_IRQ);
+ kunmap_atomic(dst_buf - dst_off);
+ kunmap_atomic(src_buf - src_off);
}
static void tifm_sd_bounce_block(struct tifm_sd *host, struct mmc_data *r_data)
diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
index a4ea102..4626ef2 100644
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
@@ -20,7 +20,6 @@
#include <linux/module.h>
#include <linux/pagemap.h>
#include <linux/scatterlist.h>
-
#include "tmio_mmc.h"
#ifdef CONFIG_PM
diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
index 3020f98..a95e6d9 100644
--- a/drivers/mmc/host/tmio_mmc.h
+++ b/drivers/mmc/host/tmio_mmc.h
@@ -105,13 +105,13 @@ static inline char *tmio_mmc_kmap_atomic(struct scatterlist *sg,
unsigned long *flags)
{
local_irq_save(*flags);
- return kmap_atomic(sg_page(sg), KM_BIO_SRC_IRQ) + sg->offset;
+ return kmap_atomic(sg_page(sg)) + sg->offset;
}
static inline void tmio_mmc_kunmap_atomic(struct scatterlist *sg,
unsigned long *flags, void *virt)
{
- kunmap_atomic(virt - sg->offset, KM_BIO_SRC_IRQ);
+ kunmap_atomic(virt - sg->offset);
local_irq_restore(*flags);
}
--
1.7.4.4
next prev parent reply other threads:[~2011-11-27 5:32 UTC|newest]
Thread overview: 121+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-27 5:26 [V2 PATCH 00/62] highmem: remove the second argument of kmap_atomic/kunmap_atomic Cong Wang
2011-11-27 5:26 ` [PATCH 01/62] highmem: mark k[un]map_atomic() with two arguments as deprecated Cong Wang
2011-11-27 12:34 ` Cesar Eduardo Barros
2011-11-28 5:07 ` Cong Wang
2011-11-28 7:46 ` [UPDATED PATCH " Cong Wang
2011-11-27 5:26 ` [PATCH 02/62] include/linux/highmem.h: remove the second argument of k[un]map_atomic() Cong Wang
2011-11-27 5:26 ` [PATCH 03/62] arm: " Cong Wang
2011-12-10 21:46 ` Russell King - ARM Linux
2011-11-27 5:26 ` [PATCH 04/62] mips: " Cong Wang
2011-12-09 16:06 ` Ralf Baechle
2011-12-12 2:52 ` Cong Wang
2011-11-27 5:26 ` [PATCH 05/62] powerpc: " Cong Wang
2011-11-27 5:26 ` [PATCH 06/62] sh: " Cong Wang
2011-11-27 5:26 ` [PATCH 07/62] um: " Cong Wang
2011-11-27 5:26 ` [PATCH 08/62] x86: " Cong Wang
2011-11-28 12:35 ` Avi Kivity
2011-11-28 12:47 ` Herbert Xu
2011-11-27 5:26 ` [PATCH 09/62] crypto: " Cong Wang
2011-11-27 5:26 ` [PATCH 10/62] ata: " Cong Wang
2011-11-27 18:40 ` Jeff Garzik
2011-11-28 10:01 ` Sergei Shtylyov
2011-11-28 11:42 ` Cong Wang
2011-11-28 11:49 ` Cong Wang
2011-11-28 19:00 ` James Bottomley
2011-11-29 3:25 ` Cong Wang
2011-11-27 5:26 ` [PATCH 11/62] block: " Cong Wang
2011-11-27 5:26 ` [PATCH 12/62] crypto: " Cong Wang
2011-11-27 5:26 ` [PATCH 13/62] edac: " Cong Wang
2011-11-27 5:26 ` [PATCH 14/62] drm: " Cong Wang
2011-11-27 5:26 ` [PATCH 15/62] ide: " Cong Wang
2011-11-27 6:12 ` David Miller
2011-11-27 5:26 ` [PATCH 16/62] infiniband: " Cong Wang
2011-11-28 7:38 ` Roland Dreier
2011-11-28 7:45 ` Cong Wang
2011-11-27 5:26 ` [PATCH 17/62] md: " Cong Wang
2011-11-27 6:00 ` NeilBrown
2011-11-27 10:27 ` [dm-devel] " Milan Broz
2011-11-28 5:10 ` Cong Wang
2011-11-28 7:47 ` [UPDATED PATCH " Cong Wang
2011-11-27 5:26 ` [PATCH 18/62] media: " Cong Wang
2011-11-27 23:10 ` Andy Walls
2011-11-27 5:26 ` [PATCH 19/62] memstick: " Cong Wang
2011-11-27 5:27 ` Cong Wang [this message]
2011-11-27 21:02 ` [PATCH 20/62] mmc: " Guennadi Liakhovetski
2011-11-30 23:51 ` David Brown
2011-12-01 18:47 ` Chris Ball
2011-12-02 2:10 ` Cong Wang
2011-11-27 5:27 ` [PATCH 21/62] net: " Cong Wang
2011-11-27 6:12 ` David Miller
2011-11-27 8:07 ` Eric Dumazet
2011-11-28 18:06 ` Alexander Duyck
2011-11-28 18:26 ` Eric Dumazet
2011-11-28 7:39 ` Cong Wang
2011-11-28 7:48 ` [UPDATED PATCH " Cong Wang
2011-11-27 5:27 ` [PATCH 23/62] hv: " Cong Wang
2011-11-27 9:34 ` Greg KH
2011-11-27 5:27 ` [PATCH 24/62] pohmelfs: " Cong Wang
2011-11-27 9:34 ` Greg KH
2011-11-28 0:58 ` Evgeniy Polyakov
2011-11-27 5:27 ` [PATCH 25/62] rtl8192u: " Cong Wang
2011-11-27 9:34 ` Greg KH
2011-11-27 5:27 ` [PATCH 26/62] zram: " Cong Wang
2011-11-27 9:34 ` Greg KH
2011-11-27 5:27 ` [PATCH 27/62] target: " Cong Wang
2011-11-27 5:27 ` [PATCH 28/62] vhost: " Cong Wang
2011-11-27 5:27 ` [PATCH 29/62] fs: " Cong Wang
2011-11-28 2:36 ` Benjamin LaHaise
2011-11-27 5:27 ` [PATCH 30/62] btrfs: " Cong Wang
2011-11-27 5:27 ` [PATCH 31/62] ecryptfs: " Cong Wang
2011-11-27 5:27 ` [PATCH 32/62] afs: " Cong Wang
2011-11-27 5:27 ` [PATCH 33/62] exofs: " Cong Wang
2011-11-28 17:35 ` Boaz Harrosh
2011-11-27 5:27 ` [PATCH 34/62] ext2: " Cong Wang
2011-11-28 14:15 ` Jan Kara
2011-11-27 5:27 ` [PATCH 35/62] fuse: " Cong Wang
2011-11-27 5:27 ` [PATCH 36/62] gfs2: " Cong Wang
2011-11-27 5:27 ` [PATCH 37/62] jbd: " Cong Wang
2011-11-28 14:15 ` Jan Kara
2011-11-27 5:27 ` [PATCH 38/62] jbd2: " Cong Wang
2011-11-27 5:27 ` [PATCH 39/62] logfs: " Cong Wang
2011-11-27 5:27 ` [PATCH 40/62] minix: " Cong Wang
2011-11-27 5:27 ` [PATCH 41/62] nfs: " Cong Wang
2011-11-27 5:27 ` [PATCH 42/62] nilfs2: " Cong Wang
2011-11-28 16:14 ` Ryusuke Konishi
2011-11-27 5:27 ` [PATCH 43/62] ntfs: " Cong Wang
2011-11-27 5:27 ` [PATCH 44/62] ocfs2: " Cong Wang
2011-12-01 20:18 ` Joel Becker
2011-12-02 2:04 ` Cong Wang
2011-12-02 2:29 ` Andrew Morton
2011-12-02 2:38 ` Cong Wang
2011-11-27 5:27 ` [PATCH 45/62] reiserfs: " Cong Wang
2011-11-27 5:27 ` [PATCH 46/62] squashfs: " Cong Wang
2011-11-27 5:27 ` [PATCH 47/62] ubifs: " Cong Wang
2011-11-27 5:27 ` [PATCH 48/62] udf: " Cong Wang
2011-11-28 14:16 ` Jan Kara
2011-11-27 5:27 ` [PATCH 49/62] kdb: " Cong Wang
2011-11-27 5:27 ` [PATCH 50/62] power: " Cong Wang
2011-11-27 11:38 ` Rafael J. Wysocki
2011-11-27 5:27 ` [PATCH 51/62] lib: " Cong Wang
2011-11-27 5:27 ` [PATCH 52/62] mm: " Cong Wang
2011-11-27 5:27 ` [PATCH 53/62] net: " Cong Wang
2011-11-27 6:12 ` David Miller
2011-11-27 5:27 ` [PATCH 54/62] rds: " Cong Wang
2011-11-27 6:13 ` David Miller
2011-11-27 5:27 ` [PATCH 55/62] sunrpc: " Cong Wang
2011-11-27 5:27 ` [PATCH 56/62] tomoyo: " Cong Wang
2011-11-27 5:27 ` [PATCH 57/62] md: " Cong Wang
2011-11-28 7:50 ` [UPDATED PATCH 57/62] dm: " Cong Wang
2011-11-27 5:27 ` [PATCH 58/62] gma500: " Cong Wang
2011-11-28 11:33 ` Alan Cox
2011-11-27 5:27 ` [PATCH 59/62] zcache: " Cong Wang
2011-11-27 9:34 ` Greg KH
2011-11-27 5:27 ` [PATCH 60/62] drbd: " Cong Wang
2011-11-27 5:27 ` [PATCH 61/62] highmem: kill all __kmap_atomic() Cong Wang
2011-12-09 16:07 ` Ralf Baechle
2011-11-27 5:27 ` [PATCH 62/62] feature-removal-schedule.txt: add the deprecated form of kmap_atomic() Cong Wang
2011-11-27 22:21 ` [V2 PATCH 00/62] highmem: remove the second argument of kmap_atomic/kunmap_atomic Benjamin Herrenschmidt
2011-11-28 4:34 ` Benjamin Herrenschmidt
2011-11-28 5:34 ` Cong Wang
2011-11-28 7:42 ` Cong Wang
2011-11-29 3:36 ` Cong Wang
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=1322371662-26166-21-git-send-email-amwang@redhat.com \
--to=amwang@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=bryanh@codeaurora.org \
--cc=cjb@laptop.org \
--cc=davidb@codeaurora.org \
--cc=dwalker@fifo99.com \
--cc=g.liakhovetski@gmx.de \
--cc=ian@mnementh.co.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=nicolas.ferre@atmel.com \
--cc=oakad@yahoo.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
all inboxes | Powered by JetHome®