leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ARM] 5117/1: pxafb: fix __devinit/exit annotations

Browse Source 
This patch fixes pxafb's init/exit annotations. It uses __devinit/exit for
probe functions and __init for init functions. g_options is left as
__devinitdata since it is used by both.

Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Jaya Kumar 2008-06-22 04:27:27 +01:00 committed by Russell King
parent fc6e14f4fb
commit 9e6c29768f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/video/pxafb.c
View File

@ -1246,7 +1246,7 @@ static int pxafb_resume(struct platform_device *dev)
* cache. Once this area is remapped, all virtual memory * cache. Once this area is remapped, all virtual memory
* access to the video memory should occur at the new region. * access to the video memory should occur at the new region.
*/ */
static int __init pxafb_map_video_memory(struct pxafb_info *fbi) static int __devinit pxafb_map_video_memory(struct pxafb_info *fbi)
{ {
/* /*
* We reserve one page for the palette, plus the size * We reserve one page for the palette, plus the size
@ -1348,7 +1348,7 @@ decode_mode:
pxafb_decode_mode_info(fbi, inf->modes, inf->num_modes); pxafb_decode_mode_info(fbi, inf->modes, inf->num_modes);
} }
static struct pxafb_info * __init pxafb_init_fbinfo(struct device *dev) static struct pxafb_info * __devinit pxafb_init_fbinfo(struct device *dev)
{ {
struct pxafb_info *fbi; struct pxafb_info *fbi;
void *addr; void *addr;
@ -1410,7 +1410,7 @@ static struct pxafb_info * __init pxafb_init_fbinfo(struct device *dev)
} }
#ifdef CONFIG_FB_PXA_PARAMETERS #ifdef CONFIG_FB_PXA_PARAMETERS
static int __init parse_opt_mode(struct device *dev, const char *this_opt) static int __devinit parse_opt_mode(struct device *dev, const char *this_opt)
{ {
struct pxafb_mach_info *inf = dev->platform_data; struct pxafb_mach_info *inf = dev->platform_data;
@ -1469,7 +1469,7 @@ done:
return 0; return 0;
} }
static int __init parse_opt(struct device *dev, char *this_opt) static int __devinit parse_opt(struct device *dev, char *this_opt)
{ {
struct pxafb_mach_info *inf = dev->platform_data; struct pxafb_mach_info *inf = dev->platform_data;
struct pxafb_mode_info *mode = &inf->modes[0]; struct pxafb_mode_info *mode = &inf->modes[0];
@ -1567,7 +1567,7 @@ static int __init parse_opt(struct device *dev, char *this_opt)
return 0; return 0;
} }
static int __init pxafb_parse_options(struct device *dev, char *options) static int __devinit pxafb_parse_options(struct device *dev, char *options)
{ {
char *this_opt; char *this_opt;
int ret; int ret;
@ -1589,7 +1589,7 @@ static int __init pxafb_parse_options(struct device *dev, char *options)
static char g_options[256] __devinitdata = ""; static char g_options[256] __devinitdata = "";
#ifndef MODULE #ifndef MODULE
static int __devinit pxafb_setup_options(void) static int __init pxafb_setup_options(void)
{ {
char *options = NULL; char *options = NULL;
@ -1613,7 +1613,7 @@ MODULE_PARM_DESC(options, "LCD parameters (see Documentation/fb/pxafb.txt)");
#define pxafb_setup_options() (0) #define pxafb_setup_options() (0)
#endif #endif
static int __init pxafb_probe(struct platform_device *dev) static int __devinit pxafb_probe(struct platform_device *dev)
{ {
struct pxafb_info *fbi; struct pxafb_info *fbi;
struct pxafb_mach_info *inf; struct pxafb_mach_info *inf;
@ -1801,7 +1801,7 @@ static struct platform_driver pxafb_driver = {
}, },
}; };
static int __devinit pxafb_init(void) static int __init pxafb_init(void)
{ {
if (pxafb_setup_options()) if (pxafb_setup_options())
return -EINVAL; return -EINVAL;