From: Harald Welte <HaraldWelte@viatech.com>
To: linux-fbdev-devel@lists.sourceforge.net
Cc: Andrew Morton <akpm@linux-foundation.org>,
Harald Welte <HaraldWelte@viatech.com>
Subject: [PATCH 08/14] viafb: Remove MMIO from private structure
Date: Sat, 23 May 2009 17:41:30 +0800 [thread overview]
Message-ID: <1243071696-9334-8-git-send-email-HaraldWelte@viatech.com> (raw)
In-Reply-To: <1243071696-9334-7-git-send-email-HaraldWelte@viatech.com>
From: Harald Welte <laforge@gnumonks.org>
Rather than using our own private structure members for MMIO base
and length, we use the fb_info->fix ones.
Signed-off-by: Harald Welte <HaraldWelte@viatech.com>
Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>
---
drivers/video/via/viafbdev.c | 11 ++++-------
drivers/video/via/viafbdev.h | 2 --
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index 3c4651c..a8bfc0a 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -122,9 +122,6 @@ static void viafb_setup_fixinfo(struct fb_fix_screeninfo *fix,
strcpy(fix->id, viafb_name);
fix->smem_len = viaparinfo->fbmem_free;
- fix->mmio_start = viaparinfo->mmio_base;
- fix->mmio_len = viaparinfo->mmio_len;
-
fix->type = FB_TYPE_PACKED_PIXELS;
fix->type_aux = 0;
@@ -2175,10 +2172,10 @@ static int __devinit via_pci_probe(struct pci_dev *pdev,
goto out_delete_i2c;
}
- viaparinfo->mmio_base = pci_resource_start(pdev, 1);
- viaparinfo->mmio_len = pci_resource_len(pdev, 1);
- viaparinfo->io_virt = ioremap_nocache(viaparinfo->mmio_base,
- viaparinfo->mmio_len);
+ viafbinfo->fix.mmio_start = pci_resource_start(pdev, 1);
+ viafbinfo->fix.mmio_len = pci_resource_len(pdev, 1);
+ viaparinfo->io_virt = ioremap_nocache(viafbinfo->fix.mmio_start,
+ viafbinfo->fix.mmio_len);
if (!viaparinfo->io_virt) {
printk(KERN_ERR "ioremap of MMIO failed\n");
rc = -EIO;
diff --git a/drivers/video/via/viafbdev.h b/drivers/video/via/viafbdev.h
index ed4129e..0c1d734 100644
--- a/drivers/video/via/viafbdev.h
+++ b/drivers/video/via/viafbdev.h
@@ -47,8 +47,6 @@ struct viafb_par {
void __iomem *io_virt; /*iospace virtual memory address */
unsigned int io; /*io space address */
- unsigned long mmio_base; /*mmio base address */
- unsigned long mmio_len; /*mmio base length */
u32 fbmem_free; /* Free FB memory */
u32 fbmem_used; /* Use FB memory size */
u32 cursor_start; /* Cursor Start Address */
--
1.6.2.4
------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, &
iPhoneDevCamp asthey present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://www.creativitycat.com
next prev parent reply other threads:[~2009-05-23 9:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-23 9:41 [PATCH 01/14] [FB] viafb: Add missing break statement in switch Harald Welte
2009-05-23 9:41 ` [PATCH 02/14] [FB] viafb: Add support for the VX855 chipset Harald Welte
2009-05-23 9:41 ` [PATCH 03/14] [FB] viafb: Fix various resource leaks during module_init() Harald Welte
2009-05-23 9:41 ` [PATCH 04/14] [FB] viafb: make viafb a first-class citizen using pci_driver Harald Welte
2009-05-23 9:41 ` [PATCH 05/14] viafb: pass reference to pci device when calling framebuffer_alloc() Harald Welte
2009-05-23 9:41 ` [PATCH 06/14] viafb: use proper pci config API Harald Welte
2009-05-23 9:41 ` [PATCH 07/14] viafb: get rid of some duplicated fields in private structure Harald Welte
2009-05-23 9:41 ` Harald Welte [this message]
2009-05-23 9:41 ` [PATCH 09/14] viafb: make module parameters visible in sysfs Harald Welte
2009-05-23 9:41 ` [PATCH 10/14] viafb: clean up duplicated code from 2D acceleration Harald Welte
2009-05-23 9:41 ` [PATCH 11/14] viafb: introduce wrapper for 2D engine registers Harald Welte
2009-05-23 9:41 ` [PATCH 12/14] viafb: initialize 2D engine registers from loop Harald Welte
2009-05-23 9:41 ` [PATCH 13/14] viafb: Determine type of 2D engine and store it in chip_info Harald Welte
2009-05-23 9:41 ` [PATCH 14/14] viafb: Add support for 2D accelerated framebuffer on VX800/VX855 Harald Welte
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=1243071696-9334-8-git-send-email-HaraldWelte@viatech.com \
--to=haraldwelte@viatech.com \
--cc=akpm@linux-foundation.org \
--cc=linux-fbdev-devel@lists.sourceforge.net \
/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).