adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2025-01-02 14:13:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

lxfb: clean up final bits of df_regs

Browse source 
Finally drop the last remnants of df_regs, using vp_regs instead.  Also, drop
panel_width and panel_height from lxfb_par; they're unused.

Signed-off-by: Andres Salomon <dilinger@debian.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Jordan Crouse <jordan.crouse@amd.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andres Salomon 2008-04-28 02:15:25 -07:00 committed by Linus Torvalds
parent f5c90e85dc
commit 31f51fa8d4
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/video/geode/lxfb.h
View file

@ -8,12 +8,10 @@
struct lxfb_par { struct lxfb_par {
int output; int output;
int panel_width;
int panel_height;
void __iomem *gp_regs; void __iomem *gp_regs;
void __iomem *dc_regs; void __iomem *dc_regs;
void __iomem *df_regs; void __iomem *vp_regs;
}; };
static inline unsigned int lx_get_pitch(unsigned int xres, int bpp) static inline unsigned int lx_get_pitch(unsigned int xres, int bpp)
@ -374,22 +372,22 @@ static inline void write_dc(struct lxfb_par *par, int reg, uint32_t val)
static inline uint32_t read_vp(struct lxfb_par *par, int reg) static inline uint32_t read_vp(struct lxfb_par *par, int reg)
{ {
return readl(par->df_regs + 8*reg); return readl(par->vp_regs + 8*reg);
} }
static inline void write_vp(struct lxfb_par *par, int reg, uint32_t val) static inline void write_vp(struct lxfb_par *par, int reg, uint32_t val)
{ {
writel(val, par->df_regs + 8*reg); writel(val, par->vp_regs + 8*reg);
} }
static inline uint32_t read_fp(struct lxfb_par *par, int reg) static inline uint32_t read_fp(struct lxfb_par *par, int reg)
{ {
return readl(par->df_regs + 8*reg + VP_FP_START); return readl(par->vp_regs + 8*reg + VP_FP_START);
} }
static inline void write_fp(struct lxfb_par *par, int reg, uint32_t val) static inline void write_fp(struct lxfb_par *par, int reg, uint32_t val)
{ {
writel(val, par->df_regs + 8*reg + VP_FP_START); writel(val, par->vp_regs + 8*reg + VP_FP_START);
} }
#endif #endif

12
drivers/video/geode/lxfb_core.c
View file

@ -333,7 +333,7 @@ static int __init lxfb_map_video_memory(struct fb_info *info,
if (ret) if (ret)
return ret; return ret;
ret = pci_request_region(dev, 3, "lxfb-vip"); ret = pci_request_region(dev, 3, "lxfb-vp");
if (ret) if (ret)
return ret; return ret;
@ -360,10 +360,10 @@ static int __init lxfb_map_video_memory(struct fb_info *info,
if (par->dc_regs == NULL) if (par->dc_regs == NULL)
return ret; return ret;
par->df_regs = ioremap(pci_resource_start(dev, 3), par->vp_regs = ioremap(pci_resource_start(dev, 3),
pci_resource_len(dev, 3)); pci_resource_len(dev, 3));
if (par->df_regs == NULL) if (par->vp_regs == NULL)
return ret; return ret;
write_dc(par, DC_UNLOCK, DC_UNLOCK_UNLOCK); write_dc(par, DC_UNLOCK, DC_UNLOCK_UNLOCK);
@ -507,8 +507,8 @@ err:
iounmap(par->dc_regs); iounmap(par->dc_regs);
pci_release_region(pdev, 2); pci_release_region(pdev, 2);
} }
if (par->df_regs) { if (par->vp_regs) {
iounmap(par->df_regs); iounmap(par->vp_regs);
pci_release_region(pdev, 3); pci_release_region(pdev, 3);
} }
@ -534,7 +534,7 @@ static void lxfb_remove(struct pci_dev *pdev)
iounmap(par->dc_regs); iounmap(par->dc_regs);
pci_release_region(pdev, 2); pci_release_region(pdev, 2);
iounmap(par->df_regs); iounmap(par->vp_regs);
pci_release_region(pdev, 3); pci_release_region(pdev, 3);
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);