Skip to content

L
linux
Commit 48a7d5c6 authored by Helge Deller's avatar Helge Deller Committed by Kyle McMartin
Browse files
Options

[PARISC] fix section mismatch in parisc STI video drivers 

Hi Kyle,

this patch fixes various section mismatches in the sti graphics driver:
WARNING: drivers/built-in.o(.text.sticore_pci_init+0xac): Section mismatch: reference to .init.text:sti_try_rom_generic (after 'sticore_pci_init')
WARNING: drivers/built-in.o(.text.sticore_pci_init+0xe4): Section mismatch: reference to .init.text:sticore_check_for_default_sti (after 'sticore_pci_init')
WARNING: drivers/built-in.o(.text.sti_get_rom+0x18): Section mismatch: reference to .init.text:sti_init_roms (after 'sti_get_rom')
(and others).

Basically it's a replacement of __init by __devinit.
Please apply, Helge
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarKyle McMartin <kyle@parisc-linux.org>
parent 649f0edd
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
drivers/video/console/sticore.c
View file @ 48a7d5c6
...@@ -240,7 +240,7 @@ static void sti_flush(unsigned long from, unsigned long len) ...@@ -240,7 +240,7 @@ static void sti_flush(unsigned long from, unsigned long len)
flush_icache_range(from, from+len); flush_icache_range(from, from+len);
} }
void __init void __devinit
sti_rom_copy(unsigned long base, unsigned long count, void *dest) sti_rom_copy(unsigned long base, unsigned long count, void *dest)
{ {
unsigned long dest_len = count; unsigned long dest_len = count;
...@@ -269,7 +269,7 @@ sti_rom_copy(unsigned long base, unsigned long count, void *dest) ...@@ -269,7 +269,7 @@ sti_rom_copy(unsigned long base, unsigned long count, void *dest)
static char default_sti_path[21] __read_mostly; static char default_sti_path[21] __read_mostly;
#ifndef MODULE #ifndef MODULE
static int __init sti_setup(char *str) static int __devinit sti_setup(char *str)
{ {
if (str) if (str)
strlcpy (default_sti_path, str, sizeof (default_sti_path)); strlcpy (default_sti_path, str, sizeof (default_sti_path));
...@@ -288,12 +288,12 @@ __setup("sti=", sti_setup); ...@@ -288,12 +288,12 @@ __setup("sti=", sti_setup);
static char __initdata *font_name[MAX_STI_ROMS] = { "VGA8x16", }; static char __devinitdata *font_name[MAX_STI_ROMS] = { "VGA8x16", };
static int __initdata font_index[MAX_STI_ROMS], static int __devinitdata font_index[MAX_STI_ROMS],
font_height[MAX_STI_ROMS], font_height[MAX_STI_ROMS],
font_width[MAX_STI_ROMS]; font_width[MAX_STI_ROMS];
#ifndef MODULE #ifndef MODULE
static int __init sti_font_setup(char *str) static int __devinit sti_font_setup(char *str)
{ {
char *x; char *x;
int i = 0; int i = 0;
...@@ -346,7 +346,7 @@ __setup("sti_font=", sti_font_setup); ...@@ -346,7 +346,7 @@ __setup("sti_font=", sti_font_setup);
static void __init static void __devinit
sti_dump_globcfg(struct sti_glob_cfg *glob_cfg, unsigned int sti_mem_request) sti_dump_globcfg(struct sti_glob_cfg *glob_cfg, unsigned int sti_mem_request)
{ {
struct sti_glob_cfg_ext *cfg; struct sti_glob_cfg_ext *cfg;
...@@ -386,7 +386,7 @@ sti_dump_globcfg(struct sti_glob_cfg *glob_cfg, unsigned int sti_mem_request) ...@@ -386,7 +386,7 @@ sti_dump_globcfg(struct sti_glob_cfg *glob_cfg, unsigned int sti_mem_request)
cfg->sti_mem_addr, sti_mem_request)); cfg->sti_mem_addr, sti_mem_request));
} }
static void __init static void __devinit
sti_dump_outptr(struct sti_struct *sti) sti_dump_outptr(struct sti_struct *sti)
{ {
DPRINTK((KERN_INFO DPRINTK((KERN_INFO
...@@ -400,7 +400,7 @@ sti_dump_outptr(struct sti_struct *sti) ...@@ -400,7 +400,7 @@ sti_dump_outptr(struct sti_struct *sti)
sti->outptr.attributes)); sti->outptr.attributes));
} }
static int __init static int __devinit
sti_init_glob_cfg(struct sti_struct *sti, sti_init_glob_cfg(struct sti_struct *sti,
unsigned long rom_address, unsigned long hpa) unsigned long rom_address, unsigned long hpa)
{ {
...@@ -482,7 +482,7 @@ sti_init_glob_cfg(struct sti_struct *sti, ...@@ -482,7 +482,7 @@ sti_init_glob_cfg(struct sti_struct *sti,
} }
#ifdef CONFIG_FB #ifdef CONFIG_FB
struct sti_cooked_font * __init struct sti_cooked_font * __devinit
sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name) sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
{ {
const struct font_desc *fbfont; const struct font_desc *fbfont;
...@@ -538,14 +538,14 @@ sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name) ...@@ -538,14 +538,14 @@ sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
return cooked_font; return cooked_font;
} }
#else #else
struct sti_cooked_font * __init struct sti_cooked_font * __devinit
sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name) sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
{ {
return NULL; return NULL;
} }
#endif #endif
struct sti_cooked_font * __init struct sti_cooked_font * __devinit
sti_select_font(struct sti_cooked_rom *rom, sti_select_font(struct sti_cooked_rom *rom,
int (*search_font_fnc) (struct sti_cooked_rom *,int,int) ) int (*search_font_fnc) (struct sti_cooked_rom *,int,int) )
{ {
...@@ -572,7 +572,7 @@ sti_select_font(struct sti_cooked_rom *rom, ...@@ -572,7 +572,7 @@ sti_select_font(struct sti_cooked_rom *rom,
} }
static void __init static void __devinit
sti_dump_rom(struct sti_rom *rom) sti_dump_rom(struct sti_rom *rom)
{ {
printk(KERN_INFO " id %04x-%04x, conforms to spec rev. %d.%02x\n", printk(KERN_INFO " id %04x-%04x, conforms to spec rev. %d.%02x\n",
...@@ -590,7 +590,7 @@ sti_dump_rom(struct sti_rom *rom) ...@@ -590,7 +590,7 @@ sti_dump_rom(struct sti_rom *rom)
} }
static int __init static int __devinit
sti_cook_fonts(struct sti_cooked_rom *cooked_rom, sti_cook_fonts(struct sti_cooked_rom *cooked_rom,
struct sti_rom *raw_rom) struct sti_rom *raw_rom)
{ {
...@@ -625,7 +625,7 @@ sti_cook_fonts(struct sti_cooked_rom *cooked_rom, ...@@ -625,7 +625,7 @@ sti_cook_fonts(struct sti_cooked_rom *cooked_rom,
} }
static int __init static int __devinit
sti_search_font(struct sti_cooked_rom *rom, int height, int width) sti_search_font(struct sti_cooked_rom *rom, int height, int width)
{ {
struct sti_cooked_font *font; struct sti_cooked_font *font;
...@@ -642,7 +642,7 @@ sti_search_font(struct sti_cooked_rom *rom, int height, int width) ...@@ -642,7 +642,7 @@ sti_search_font(struct sti_cooked_rom *rom, int height, int width)
#define BMODE_RELOCATE(offset) offset = (offset) / 4; #define BMODE_RELOCATE(offset) offset = (offset) / 4;
#define BMODE_LAST_ADDR_OFFS 0x50 #define BMODE_LAST_ADDR_OFFS 0x50
static void * __init static void * __devinit
sti_bmode_font_raw(struct sti_cooked_font *f) sti_bmode_font_raw(struct sti_cooked_font *f)
{ {
unsigned char *n, *p, *q; unsigned char *n, *p, *q;
...@@ -660,7 +660,7 @@ sti_bmode_font_raw(struct sti_cooked_font *f) ...@@ -660,7 +660,7 @@ sti_bmode_font_raw(struct sti_cooked_font *f)
return n + 3; return n + 3;
} }
static void __init static void __devinit
sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest) sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest)
{ {
unsigned long dest_len = count; unsigned long dest_len = count;
...@@ -675,7 +675,7 @@ sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest) ...@@ -675,7 +675,7 @@ sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest)
sti_flush(dest_start, dest_len); sti_flush(dest_start, dest_len);
} }
static struct sti_rom * __init static struct sti_rom * __devinit
sti_get_bmode_rom (unsigned long address) sti_get_bmode_rom (unsigned long address)
{ {
struct sti_rom *raw; struct sti_rom *raw;
...@@ -711,7 +711,7 @@ sti_get_bmode_rom (unsigned long address) ...@@ -711,7 +711,7 @@ sti_get_bmode_rom (unsigned long address)
return raw; return raw;
} }
struct sti_rom * __init struct sti_rom * __devinit
sti_get_wmode_rom (unsigned long address) sti_get_wmode_rom (unsigned long address)
{ {
struct sti_rom *raw; struct sti_rom *raw;
...@@ -727,7 +727,7 @@ sti_get_wmode_rom (unsigned long address) ...@@ -727,7 +727,7 @@ sti_get_wmode_rom (unsigned long address)
return raw; return raw;
} }
int __init int __devinit
sti_read_rom(int wordmode, struct sti_struct *sti, unsigned long address) sti_read_rom(int wordmode, struct sti_struct *sti, unsigned long address)
{ {
struct sti_cooked_rom *cooked; struct sti_cooked_rom *cooked;
...@@ -783,7 +783,7 @@ sti_read_rom(int wordmode, struct sti_struct *sti, unsigned long address) ...@@ -783,7 +783,7 @@ sti_read_rom(int wordmode, struct sti_struct *sti, unsigned long address)
return 0; return 0;
} }
static struct sti_struct * __init static struct sti_struct * __devinit
sti_try_rom_generic(unsigned long address, unsigned long hpa, struct pci_dev *pd) sti_try_rom_generic(unsigned long address, unsigned long hpa, struct pci_dev *pd)
{ {
struct sti_struct *sti; struct sti_struct *sti;
...@@ -898,7 +898,7 @@ sti_try_rom_generic(unsigned long address, unsigned long hpa, struct pci_dev *pd ...@@ -898,7 +898,7 @@ sti_try_rom_generic(unsigned long address, unsigned long hpa, struct pci_dev *pd
return NULL; return NULL;
} }
static void __init sticore_check_for_default_sti(struct sti_struct *sti, char *path) static void __devinit sticore_check_for_default_sti(struct sti_struct *sti, char *path)
{ {
if (strcmp (path, default_sti_path) == 0) if (strcmp (path, default_sti_path) == 0)
default_sti = sti; default_sti = sti;
...@@ -909,7 +909,7 @@ static void __init sticore_check_for_default_sti(struct sti_struct *sti, char *p ...@@ -909,7 +909,7 @@ static void __init sticore_check_for_default_sti(struct sti_struct *sti, char *p
* in the additional address field addr[1] while on * in the additional address field addr[1] while on
* older Systems the PDC stores it in page0->proc_sti * older Systems the PDC stores it in page0->proc_sti
*/ */
static int __init sticore_pa_init(struct parisc_device *dev) static int __devinit sticore_pa_init(struct parisc_device *dev)
{ {
char pa_path[21]; char pa_path[21];
struct sti_struct *sti = NULL; struct sti_struct *sti = NULL;
...@@ -1015,7 +1015,7 @@ static struct parisc_driver pa_sti_driver = { ...@@ -1015,7 +1015,7 @@ static struct parisc_driver pa_sti_driver = {
static int sticore_initialized __read_mostly; static int sticore_initialized __read_mostly;
static void __init sti_init_roms(void) static void __devinit sti_init_roms(void)
{ {
if (sticore_initialized) if (sticore_initialized)
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7