From: Thomas Schlichter <thomas.schlichter@web.de>
To: Paul Mundt <lethal@linux-sh.org>
Cc: Michal Januszewski <spock@gentoo.org>,
linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/3] uvesafb: remove-ifdef-CONFIG_X86-around-ioremap
Date: Sun, 06 Feb 2011 11:14:56 +0000 [thread overview]
Message-ID: <201102061214.56729.thomas.schlichter@web.de> (raw)
In-Reply-To: <201102061202.09503.thomas.schlichter@web.de>
[-- Attachment #1: Type: text/plain, Size: 1 bytes --]
[-- Attachment #2: 0003-uvesafb-remove-ifdef-CONFIG_X86-around-ioremap.patch --]
[-- Type: text/x-patch, Size: 1308 bytes --]
From d1e432f878746b699856160456f811affc3c42fe Mon Sep 17 00:00:00 2001
From: Thomas Schlichter <thomas.schlichter@web.de>
Date: Sun, 6 Feb 2011 11:45:08 +0100
Subject: [PATCH 3/3] uvesafb: remove ifdef CONFIG_X86 around ioremap in
Now that ioremap_cache() and ioremap_wc() are available on each architecture
we can remove the unneccessary ifdef in uvesafb.
Signed-off-by: Thomas Schlichter <thomas.schlichter@web.de>
---
drivers/video/uvesafb.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
index 2d6f799..ca15166 100644
--- a/drivers/video/uvesafb.c
+++ b/drivers/video/uvesafb.c
@@ -1567,7 +1567,6 @@ static void __devinit uvesafb_init_mtrr(struct fb_info *info)
static void __devinit uvesafb_ioremap(struct fb_info *info)
{
-#ifdef CONFIG_X86
switch (mtrr) {
case 1: /* uncachable */
info->screen_base = ioremap_nocache(info->fix.smem_start, info->fix.smem_len);
@@ -1583,9 +1582,6 @@ static void __devinit uvesafb_ioremap(struct fb_info *info)
info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len);
break;
}
-#else
- info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len);
-#endif /* CONFIG_X86 */
}
static ssize_t uvesafb_show_vbe_ver(struct device *dev,
--
1.7.1
prev parent reply other threads:[~2011-02-06 11:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-27 13:37 [PATCH] uvesafb,vesafb: create write-combining or write-back PAT entries Thomas Schlichter
2010-11-30 6:10 ` Paul Mundt
2011-02-06 11:02 ` Thomas Schlichter
2011-02-06 11:11 ` [PATCH 1/3] uvesafb,vesafb: create WC or WB " Thomas Schlichter
2011-02-06 11:12 ` [PATCH 2/3] Add ioremap_cache and ioremap_wc to all architectures Thomas Schlichter
2011-02-06 12:34 ` Geert Uytterhoeven
2011-02-06 11:14 ` Thomas Schlichter [this message]
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=201102061214.56729.thomas.schlichter@web.de \
--to=thomas.schlichter@web.de \
--cc=lethal@linux-sh.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=spock@gentoo.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;
as well as URLs for NNTP newsgroup(s).