Menu
▾
▴
Re: [Linux-fbdev-devel] [PATCH 09/15] viafb: Remove MMIO from private structure
|
From: Krzysztof H. <krz...@po...> - 2009-05-23 06:26:22
|
On Thu, 21 May 2009 04:28:47 +0800
Harald Welte <Har...@vi...> wrote:
> From: Harald Welte <la...@gn...>
>
> 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 <Har...@vi...>
> ---
Acked-by: Krzysztof Helt <krz...@wp...>
> 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 c420623..00f58c8 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
>
>
> ------------------------------------------------------------------------------
> Crystal Reports - New Free Runtime and 30 Day Trial
> Check out the new simplified licensing option that enables
> unlimited royalty-free distribution of the report engine
> for externally facing server and web deployment.
> http://p.sf.net/sfu/businessobjects
> _______________________________________________
> Linux-fbdev-devel mailing list
> Lin...@li...
> https://lists.sourceforge.net/lists/listinfo/linux-fbdev-devel
>
----------------------------------------------------------------------
Chcesz miec nawigacje GPS ?
Zamow lub przedluz umowe na neostrade, a nawigacja bedzie Twoja.
Kliknij na link po szczegoly! http://link.interia.pl/f219a
|
