mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-02 23:06:50 +07:00
fb: pvr2fb: Fix up section mismatch warnings.
A few minor things were broken here. fix and var screeninfo should have been __devinitdata, board_list[] gets renamed to board_driver[] so the modpost matching does the right thing, and we properly discard some of the unused exit sections. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
parent
989e5ab3e8
commit
e9705a77f5
@ -147,7 +147,7 @@ static struct pvr2fb_par {
|
|||||||
|
|
||||||
static struct fb_info *fb_info;
|
static struct fb_info *fb_info;
|
||||||
|
|
||||||
static struct fb_fix_screeninfo pvr2_fix __initdata = {
|
static struct fb_fix_screeninfo pvr2_fix __devinitdata = {
|
||||||
.id = "NEC PowerVR2",
|
.id = "NEC PowerVR2",
|
||||||
.type = FB_TYPE_PACKED_PIXELS,
|
.type = FB_TYPE_PACKED_PIXELS,
|
||||||
.visual = FB_VISUAL_TRUECOLOR,
|
.visual = FB_VISUAL_TRUECOLOR,
|
||||||
@ -156,7 +156,7 @@ static struct fb_fix_screeninfo pvr2_fix __initdata = {
|
|||||||
.accel = FB_ACCEL_NONE,
|
.accel = FB_ACCEL_NONE,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct fb_var_screeninfo pvr2_var __initdata = {
|
static struct fb_var_screeninfo pvr2_var __devinitdata = {
|
||||||
.xres = 640,
|
.xres = 640,
|
||||||
.yres = 480,
|
.yres = 480,
|
||||||
.xres_virtual = 640,
|
.xres_virtual = 640,
|
||||||
@ -195,10 +195,6 @@ static unsigned int shdma = PVR2_CASCADE_CHAN;
|
|||||||
static unsigned int pvr2dma = ONCHIP_NR_DMA_CHANNELS;
|
static unsigned int pvr2dma = ONCHIP_NR_DMA_CHANNELS;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Interface used by the world */
|
|
||||||
|
|
||||||
int pvr2fb_setup(char*);
|
|
||||||
|
|
||||||
static int pvr2fb_setcolreg(unsigned int regno, unsigned int red, unsigned int green, unsigned int blue,
|
static int pvr2fb_setcolreg(unsigned int regno, unsigned int red, unsigned int green, unsigned int blue,
|
||||||
unsigned int transp, struct fb_info *info);
|
unsigned int transp, struct fb_info *info);
|
||||||
static int pvr2fb_blank(int blank, struct fb_info *info);
|
static int pvr2fb_blank(int blank, struct fb_info *info);
|
||||||
@ -903,7 +899,7 @@ static int __init pvr2fb_dc_init(void)
|
|||||||
return pvr2fb_common_init();
|
return pvr2fb_common_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pvr2fb_dc_exit(void)
|
static void __exit pvr2fb_dc_exit(void)
|
||||||
{
|
{
|
||||||
if (fb_info->screen_base) {
|
if (fb_info->screen_base) {
|
||||||
iounmap(fb_info->screen_base);
|
iounmap(fb_info->screen_base);
|
||||||
@ -987,7 +983,7 @@ static int __init pvr2fb_pci_init(void)
|
|||||||
return pci_register_driver(&pvr2fb_pci_driver);
|
return pci_register_driver(&pvr2fb_pci_driver);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pvr2fb_pci_exit(void)
|
static void __exit pvr2fb_pci_exit(void)
|
||||||
{
|
{
|
||||||
pci_unregister_driver(&pvr2fb_pci_driver);
|
pci_unregister_driver(&pvr2fb_pci_driver);
|
||||||
}
|
}
|
||||||
@ -1021,7 +1017,7 @@ static int __init pvr2_get_param(const struct pvr2_params *p, const char *s,
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef MODULE
|
#ifndef MODULE
|
||||||
int __init pvr2fb_setup(char *options)
|
static int __init pvr2fb_setup(char *options)
|
||||||
{
|
{
|
||||||
char *this_opt;
|
char *this_opt;
|
||||||
char cable_arg[80];
|
char cable_arg[80];
|
||||||
@ -1061,7 +1057,7 @@ static struct pvr2_board {
|
|||||||
int (*init)(void);
|
int (*init)(void);
|
||||||
void (*exit)(void);
|
void (*exit)(void);
|
||||||
char name[16];
|
char name[16];
|
||||||
} board_list[] = {
|
} board_driver[] = {
|
||||||
#ifdef CONFIG_SH_DREAMCAST
|
#ifdef CONFIG_SH_DREAMCAST
|
||||||
{ pvr2fb_dc_init, pvr2fb_dc_exit, "Sega DC PVR2" },
|
{ pvr2fb_dc_init, pvr2fb_dc_exit, "Sega DC PVR2" },
|
||||||
#endif
|
#endif
|
||||||
@ -1071,7 +1067,7 @@ static struct pvr2_board {
|
|||||||
{ 0, },
|
{ 0, },
|
||||||
};
|
};
|
||||||
|
|
||||||
int __init pvr2fb_init(void)
|
static int __init pvr2fb_init(void)
|
||||||
{
|
{
|
||||||
int i, ret = -ENODEV;
|
int i, ret = -ENODEV;
|
||||||
int size;
|
int size;
|
||||||
@ -1095,8 +1091,8 @@ int __init pvr2fb_init(void)
|
|||||||
|
|
||||||
currentpar = (struct pvr2fb_par *)(fb_info + 1);
|
currentpar = (struct pvr2fb_par *)(fb_info + 1);
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(board_list); i++) {
|
for (i = 0; i < ARRAY_SIZE(board_driver); i++) {
|
||||||
struct pvr2_board *pvr_board = board_list + i;
|
struct pvr2_board *pvr_board = board_driver + i;
|
||||||
|
|
||||||
if (!pvr_board->init)
|
if (!pvr_board->init)
|
||||||
continue;
|
continue;
|
||||||
@ -1118,8 +1114,8 @@ static void __exit pvr2fb_exit(void)
|
|||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(board_list); i++) {
|
for (i = 0; i < ARRAY_SIZE(board_driver); i++) {
|
||||||
struct pvr2_board *pvr_board = board_list + i;
|
struct pvr2_board *pvr_board = board_driver + i;
|
||||||
|
|
||||||
if (pvr_board->exit)
|
if (pvr_board->exit)
|
||||||
pvr_board->exit();
|
pvr_board->exit();
|
||||||
@ -1139,4 +1135,3 @@ module_exit(pvr2fb_exit);
|
|||||||
MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>, M. R. Brown <mrbrown@0xd6.org>");
|
MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>, M. R. Brown <mrbrown@0xd6.org>");
|
||||||
MODULE_DESCRIPTION("Framebuffer driver for NEC PowerVR 2 based graphics boards");
|
MODULE_DESCRIPTION("Framebuffer driver for NEC PowerVR 2 based graphics boards");
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user