Commit 4321e1a1 authored by Russell King - ARM Linux's avatar Russell King - ARM Linux Committed by Eric Miao
Browse files

ARM: pxa: clean up set_pxa_fb_info 



set_pxa_fb_info() has been a long-standing wart in the naming scheme
of the pxa_set_xxx_info() functions.  This renames the function, and
combines set_pxa_fb_parent() with set_pxa_fb_info().

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Acked-by: default avatarIgor Grinberg <grinberg@compulab.co.il>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 54a93b69

arch/arm/mach-pxa/am200epd.c

+2 −2
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static struct notifier_block am200_fb_notif = { 
};



/* this gets called as part of our init. these steps must be done now so

 * that we can use set_pxa_fb_info */

 * that we can use pxa_set_fb_info */

static void __init am200_presetup_fb(void)

{

	int fw;
@@ -249,7 +249,7 @@ static void __init am200_presetup_fb(void) 
	/* we divide since we told the LCD controller we're 16bpp */

	am200_fb_info.modes->xres /= 2;



	set_pxa_fb_info(&am200_fb_info);

	pxa_set_fb_info(NULL, &am200_fb_info);



}

arch/arm/mach-pxa/balloon3.c

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static void __init balloon3_lcd_init(void) 
	}



	balloon3_lcd_screen.pxafb_backlight_power = balloon3_backlight_power;

	set_pxa_fb_info(&balloon3_lcd_screen);

	pxa_set_fb_info(NULL, &balloon3_lcd_screen);

	return;



err2:

arch/arm/mach-pxa/cm-x2xx.c

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ __setup("monitor=", cmx2xx_set_display); 


static void __init cmx2xx_init_display(void)

{

	set_pxa_fb_info(cmx2xx_display);

	pxa_set_fb_info(NULL, cmx2xx_display);

}

#else

static inline void cmx2xx_init_display(void) {}

arch/arm/mach-pxa/cm-x300.c

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ static struct pxafb_mach_info cm_x300_lcd = { 


static void __init cm_x300_init_lcd(void)

{

	set_pxa_fb_info(&cm_x300_lcd);

	pxa_set_fb_info(NULL, &cm_x300_lcd);

}

#else

static inline void cm_x300_init_lcd(void) {}

arch/arm/mach-pxa/colibri-pxa270-income.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static struct pxafb_mach_info income_lcd_screen = { 


static void __init income_lcd_init(void)

{

	set_pxa_fb_info(&income_lcd_screen);

	pxa_set_fb_info(NULL, &income_lcd_screen);

}

#else

static inline void income_lcd_init(void) {}

CRA Git | Maintained and supported by SUSTech CRA and CCSE