Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31f51fa8 authored by Andres Salomon's avatar Andres Salomon Committed by Linus Torvalds
Browse files

lxfb: clean up final bits of df_regs 



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: default avatarAndres Salomon <dilinger@debian.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Jordan Crouse <jordan.crouse@amd.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f5c90e85

drivers/video/geode/lxfb.h

+5 −7
Original line number Diff line number Diff line
@@ -8,12 +8,10 @@ 


struct lxfb_par {

	int output;

	int panel_width;

	int panel_height;



	void __iomem *gp_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)
@@ -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)

{

	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)

{

	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)

{

	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)

{

	writel(val, par->df_regs + 8*reg + VP_FP_START);

	writel(val, par->vp_regs + 8*reg + VP_FP_START);

}



#endif

drivers/video/geode/lxfb_core.c

+6 −6
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ static int __init lxfb_map_video_memory(struct fb_info *info, 
	if (ret)

		return ret;



	ret = pci_request_region(dev, 3, "lxfb-vip");

	ret = pci_request_region(dev, 3, "lxfb-vp");



	if (ret)

		return ret;
@@ -360,10 +360,10 @@ static int __init lxfb_map_video_memory(struct fb_info *info, 
	if (par->dc_regs == NULL)

		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));



	if (par->df_regs == NULL)

	if (par->vp_regs == NULL)

		return ret;



	write_dc(par, DC_UNLOCK, DC_UNLOCK_UNLOCK);
@@ -507,8 +507,8 @@ static int __init lxfb_probe(struct pci_dev *pdev, 
		iounmap(par->dc_regs);

		pci_release_region(pdev, 2);

	}

	if (par->df_regs) {

		iounmap(par->df_regs);

	if (par->vp_regs) {

		iounmap(par->vp_regs);

		pci_release_region(pdev, 3);

	}
@@ -534,7 +534,7 @@ static void lxfb_remove(struct pci_dev *pdev) 
	iounmap(par->dc_regs);

	pci_release_region(pdev, 2);



	iounmap(par->df_regs);

	iounmap(par->vp_regs);

	pci_release_region(pdev, 3);



	pci_set_drvdata(pdev, NULL);