diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2009-09-22 16:47:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 07:39:52 -0700 |
| commit | 68fa92082ffda84adcbae06fdd307fca53469c25 (patch) | |
| tree | f63686d996017fd70a66b420b2a22a9000c34c66 /drivers | |
| parent | 8594ac33450e6d66460230e5d07f5515b51476c9 (diff) | |
viafb: another small cleanup of viafb_par
This removes the completly useless io variable as well as the temporary
used variables mmio_base and mmio_len in favor to use directly the fb_info
variables.
This is a code cleanup only, no runtime change expected.
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Scott Fang <ScottFang@viatech.com.cn>
Cc: Joseph Chan <JosephChan@via.com.tw>
Cc: Harald Welte <laforge@gnumonks.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/via/hw.c | 3 | ||||
| -rw-r--r-- | drivers/video/via/hw.h | 3 | ||||
| -rw-r--r-- | drivers/video/via/viafbdev.c | 9 | ||||
| -rw-r--r-- | drivers/video/via/viafbdev.h | 3 |
4 files changed, 6 insertions, 12 deletions
diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c index 5be4a670596..86050e79b89 100644 --- a/drivers/video/via/hw.c +++ b/drivers/video/via/hw.c @@ -2496,8 +2496,7 @@ void viafb_crt_enable(void) viafb_write_reg_mask(CR36, VIACR, 0x0, BIT5 + BIT4); } -void viafb_get_mmio_info(unsigned long *mmio_base, - unsigned long *mmio_len) +void viafb_get_mmio_info(unsigned long *mmio_base, u32 *mmio_len) { struct pci_dev *pdev = NULL; u32 vendor, device; diff --git a/drivers/video/via/hw.h b/drivers/video/via/hw.h index 874ea3fc290..cf1dfd5c7fd 100644 --- a/drivers/video/via/hw.h +++ b/drivers/video/via/hw.h @@ -923,8 +923,7 @@ int viafb_get_pixclock(int hres, int vres, int vmode_refresh); int viafb_get_refresh(int hres, int vres, u32 float_refresh); void viafb_update_device_setting(int hres, int vres, int bpp, int vmode_refresh, int flag); -void viafb_get_mmio_info(unsigned long *mmio_base, - unsigned long *mmio_len); +void viafb_get_mmio_info(unsigned long *mmio_base, u32 *mmio_len); void viafb_set_iga_path(void); void viafb_set_primary_address(u32 addr); diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c index 924177cc814..a17e138c92b 100644 --- a/drivers/video/via/viafbdev.c +++ b/drivers/video/via/viafbdev.c @@ -69,8 +69,6 @@ static void viafb_setup_fixinfo(struct fb_fix_screeninfo *fix, fix->smem_start = viaparinfo->fbmem; 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; @@ -2004,9 +2002,10 @@ static int __devinit via_pci_probe(void) return -ENOMEM; } - viafb_get_mmio_info(&viaparinfo->mmio_base, &viaparinfo->mmio_len); - viaparinfo->io_virt = ioremap_nocache(viaparinfo->mmio_base, - viaparinfo->mmio_len); + viafb_get_mmio_info(&viafbinfo->fix.mmio_start, + &viafbinfo->fix.mmio_len); + viaparinfo->io_virt = ioremap_nocache(viafbinfo->fix.mmio_start, + viafbinfo->fix.mmio_len); if (!viaparinfo->io_virt) { printk(KERN_WARNING "ioremap failed: hardware acceleration disabled\n"); viafb_accel = 0; diff --git a/drivers/video/via/viafbdev.h b/drivers/video/via/viafbdev.h index cd871f95498..2763922bbe4 100644 --- a/drivers/video/via/viafbdev.h +++ b/drivers/video/via/viafbdev.h @@ -41,9 +41,6 @@ struct viafb_par { void __iomem *io_virt; /*iospace virtual memory address */ unsigned int fbmem; /*framebuffer physical memory address */ unsigned int memsize; /*size of fbmem */ - 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 */ |