[2.6 patch] drivers/video/: misc cleanups
This patch contains cleanups under drivers/video/ including:
- make some needlessly global code static
- the following was needlessly EXPORT_SYMBOL'ed:
- fbcon.c: fb_con
- fbmon.c: get_EDID_from_firmware (completely unused)
Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
---
arch/frv/kernel/setup.c|3 ---
drivers/video/console/fbcon.c | 26 --
drivers/video/console/fbcon.h |1 -
drivers/video/console/mdacon.c |4 ++--
drivers/video/fbmon.c | 20 +---
drivers/video/modedb.c |5 ++---
drivers/video/vga16fb.c| 24
include/linux/console.h|1 -
8 files changed, 29 insertions(+), 55 deletions(-)
--- linux-2.6.10-rc2-mm2-full/include/linux/console.h.old 2004-11-21
15:20:38.0 +0100
+++ linux-2.6.10-rc2-mm2-full/include/linux/console.h 2004-11-21
15:20:46.0 +0100
@@ -59,7 +59,6 @@
extern const struct consw *conswitchp;
extern const struct consw dummy_con; /* dummy console buffer */
-extern const struct consw fb_con; /* frame buffer based console */
extern const struct consw vga_con; /* VGA text console */
extern const struct consw newport_con; /* SGI Newport console */
extern const struct consw prom_con;/* SPARC PROM console */
--- linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.h.old 2004-11-21
15:26:10.0 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.h 2004-11-21
15:26:19.0 +0100
@@ -155,7 +155,6 @@
#define SCROLL_REDRAW 0x004
#define SCROLL_PAN_REDRAW 0x005
-extern int fb_console_init(void);
#ifdef CONFIG_FB_TILEBLITTING
extern void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info,
struct display *p, struct fbcon_ops *ops);
--- linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.c.old 2004-11-21
15:19:18.0 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.c 2004-11-21
15:54:54.0 +0100
@@ -107,15 +107,15 @@
};
struct display fb_display[MAX_NR_CONSOLES];
-signed char con2fb_map[MAX_NR_CONSOLES];
-signed char con2fb_map_boot[MAX_NR_CONSOLES];
+static signed char con2fb_map[MAX_NR_CONSOLES];
+static signed char con2fb_map_boot[MAX_NR_CONSOLES];
static int logo_height;
static int logo_lines;
/* logo_shown is an index to vc_cons when >= 0; otherwise follows FBCON_LOGO
enums. */
static int logo_shown = FBCON_LOGO_CANSHOW;
/* Software scrollback */
-int fbcon_softback_size = 32768;
+static int fbcon_softback_size = 32768;
static unsigned long softback_buf, softback_curr;
static unsigned long softback_in;
static unsigned long softback_top, softback_end;
@@ -130,6 +130,8 @@
/* current fb_info */
static int info_idx = -1;
+static const struct consw fb_con;
+
#define CM_SOFTBACK(8)
#define advance_row(p, delta) (unsigned short *)((unsigned long)(p) + (delta)
* vc->vc_size_row)
@@ -305,7 +307,8 @@
mod_timer(>cursor_timer, jiffies + HZ/5);
}
-int __init fb_console_setup(char *this_opt)
+#ifndef MODULE
+static int __init fb_console_setup(char *this_opt)
{
char *options;
int i, j;
@@ -359,6 +362,7 @@
}
__setup("fbcon=", fb_console_setup);
+#endif
static int search_fb_in_map(int idx)
{
@@ -1114,7 +1118,7 @@
static int scrollback_max = 0;
static int scrollback_current = 0;
-int update_var(int con, struct fb_info *info)
+static int update_var(int con, struct fb_info *info)
{
if (con == ((struct fbcon_ops *)info->fbcon_par)->currcon)
return fb_pan_display(info, >var);
@@ -2709,7 +2713,7 @@
* The console `switch' structure for the frame buffer based console
*/
-const struct consw fb_con = {
+static const struct consw fb_con = {
.owner = THIS_MODULE,
.con_startup= fbcon_startup,
.con_init = fbcon_init,
@@ -2739,7 +2743,7 @@
.notifier_call = fbcon_event_notify,
};
-int __init fb_console_init(void)
+static int __init fb_console_init(void)
{
int i;
@@ -2767,7 +2771,7 @@
#ifdef MODULE
-void __exit fb_console_exit(void)
+static void __exit fb_console_exit(void)
{
acquire_console_sem();
fb_unregister_client(_event_notifier);
@@ -2779,10 +2783,4 @@
#endif
-/*
- * Visible symbols for modules
- */
-
-EXPORT_SYMBOL(fb_con);
-
MODULE_LICENSE("GPL");
--- linux-2.6.10-rc2-mm2-full/drivers/video/console/mdacon.c.old
2004-11-21 15:27:40.0 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/console/mdacon.c2004-11-21
15:28:21.0 +0100
@@ -576,7 +576,7 @@
* The console `switch' structure for the MDA based console
*/
-const struct consw mda_con = {
+static const struct consw mda_con = {
.owner =THIS_MODULE,
.con_startup = mdacon_startup,
.con_init = mdacon_init,
@@ -603,7 +603,7 @@
return take_over_console(_con,
[2.6 patch] drivers/video/: misc cleanups
This patch contains cleanups under drivers/video/ including:
- make some needlessly global code static
- the following was needlessly EXPORT_SYMBOL'ed:
- fbcon.c: fb_con
- fbmon.c: get_EDID_from_firmware (completely unused)
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
---
arch/frv/kernel/setup.c|3 ---
drivers/video/console/fbcon.c | 26 --
drivers/video/console/fbcon.h |1 -
drivers/video/console/mdacon.c |4 ++--
drivers/video/fbmon.c | 20 +---
drivers/video/modedb.c |5 ++---
drivers/video/vga16fb.c| 24
include/linux/console.h|1 -
8 files changed, 29 insertions(+), 55 deletions(-)
--- linux-2.6.10-rc2-mm2-full/include/linux/console.h.old 2004-11-21
15:20:38.0 +0100
+++ linux-2.6.10-rc2-mm2-full/include/linux/console.h 2004-11-21
15:20:46.0 +0100
@@ -59,7 +59,6 @@
extern const struct consw *conswitchp;
extern const struct consw dummy_con; /* dummy console buffer */
-extern const struct consw fb_con; /* frame buffer based console */
extern const struct consw vga_con; /* VGA text console */
extern const struct consw newport_con; /* SGI Newport console */
extern const struct consw prom_con;/* SPARC PROM console */
--- linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.h.old 2004-11-21
15:26:10.0 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.h 2004-11-21
15:26:19.0 +0100
@@ -155,7 +155,6 @@
#define SCROLL_REDRAW 0x004
#define SCROLL_PAN_REDRAW 0x005
-extern int fb_console_init(void);
#ifdef CONFIG_FB_TILEBLITTING
extern void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info,
struct display *p, struct fbcon_ops *ops);
--- linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.c.old 2004-11-21
15:19:18.0 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.c 2004-11-21
15:54:54.0 +0100
@@ -107,15 +107,15 @@
};
struct display fb_display[MAX_NR_CONSOLES];
-signed char con2fb_map[MAX_NR_CONSOLES];
-signed char con2fb_map_boot[MAX_NR_CONSOLES];
+static signed char con2fb_map[MAX_NR_CONSOLES];
+static signed char con2fb_map_boot[MAX_NR_CONSOLES];
static int logo_height;
static int logo_lines;
/* logo_shown is an index to vc_cons when = 0; otherwise follows FBCON_LOGO
enums. */
static int logo_shown = FBCON_LOGO_CANSHOW;
/* Software scrollback */
-int fbcon_softback_size = 32768;
+static int fbcon_softback_size = 32768;
static unsigned long softback_buf, softback_curr;
static unsigned long softback_in;
static unsigned long softback_top, softback_end;
@@ -130,6 +130,8 @@
/* current fb_info */
static int info_idx = -1;
+static const struct consw fb_con;
+
#define CM_SOFTBACK(8)
#define advance_row(p, delta) (unsigned short *)((unsigned long)(p) + (delta)
* vc-vc_size_row)
@@ -305,7 +307,8 @@
mod_timer(ops-cursor_timer, jiffies + HZ/5);
}
-int __init fb_console_setup(char *this_opt)
+#ifndef MODULE
+static int __init fb_console_setup(char *this_opt)
{
char *options;
int i, j;
@@ -359,6 +362,7 @@
}
__setup(fbcon=, fb_console_setup);
+#endif
static int search_fb_in_map(int idx)
{
@@ -1114,7 +1118,7 @@
static int scrollback_max = 0;
static int scrollback_current = 0;
-int update_var(int con, struct fb_info *info)
+static int update_var(int con, struct fb_info *info)
{
if (con == ((struct fbcon_ops *)info-fbcon_par)-currcon)
return fb_pan_display(info, info-var);
@@ -2709,7 +2713,7 @@
* The console `switch' structure for the frame buffer based console
*/
-const struct consw fb_con = {
+static const struct consw fb_con = {
.owner = THIS_MODULE,
.con_startup= fbcon_startup,
.con_init = fbcon_init,
@@ -2739,7 +2743,7 @@
.notifier_call = fbcon_event_notify,
};
-int __init fb_console_init(void)
+static int __init fb_console_init(void)
{
int i;
@@ -2767,7 +2771,7 @@
#ifdef MODULE
-void __exit fb_console_exit(void)
+static void __exit fb_console_exit(void)
{
acquire_console_sem();
fb_unregister_client(fbcon_event_notifier);
@@ -2779,10 +2783,4 @@
#endif
-/*
- * Visible symbols for modules
- */
-
-EXPORT_SYMBOL(fb_con);
-
MODULE_LICENSE(GPL);
--- linux-2.6.10-rc2-mm2-full/drivers/video/console/mdacon.c.old
2004-11-21 15:27:40.0 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/console/mdacon.c2004-11-21
15:28:21.0 +0100
@@ -576,7 +576,7 @@
* The console `switch' structure for the MDA based console
*/
-const struct consw mda_con = {
+static const struct consw mda_con = {
.owner =THIS_MODULE,
.con_startup = mdacon_startup,
.con_init = mdacon_init,
@@ -603,7 +603,7 @@
return
[2.6 patch] drivers/video/: misc cleanups
This patch contains cleanups under drivers/video/ including:
- make some needlessly global code static
- the following was needlessly EXPORT_SYMBOL'ed:
- fbcon.c: fb_con
- fbmon.c: get_EDID_from_firmware (completely unused)
Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
---
This patch applies and compiles against 2.6.11-rc4-mm1.
drivers/video/console/fbcon.c | 26 --
drivers/video/console/fbcon.h |1 -
drivers/video/console/mdacon.c |4 ++--
drivers/video/fbmem.c |4 ++--
drivers/video/fbmon.c | 20 +---
drivers/video/vga16fb.c| 24
include/linux/console.h|1 -
drivers/video/modedb.c |5 ++---
8 files changed, 31 insertions(+), 54 deletions(-)
--- linux-2.6.10-rc2-mm2-full/include/linux/console.h.old 2004-11-21
15:20:38.0 +0100
+++ linux-2.6.10-rc2-mm2-full/include/linux/console.h 2004-11-21
15:20:46.0 +0100
@@ -59,7 +59,6 @@
extern const struct consw *conswitchp;
extern const struct consw dummy_con; /* dummy console buffer */
-extern const struct consw fb_con; /* frame buffer based console */
extern const struct consw vga_con; /* VGA text console */
extern const struct consw newport_con; /* SGI Newport console */
extern const struct consw prom_con;/* SPARC PROM console */
--- linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.h.old 2004-11-21
15:26:10.0 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.h 2004-11-21
15:26:19.0 +0100
@@ -155,7 +155,6 @@
#define SCROLL_REDRAW 0x004
#define SCROLL_PAN_REDRAW 0x005
-extern int fb_console_init(void);
#ifdef CONFIG_FB_TILEBLITTING
extern void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info,
struct display *p, struct fbcon_ops *ops);
--- linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.c.old 2004-11-21
15:19:18.0 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.c 2004-11-21
15:54:54.0 +0100
@@ -107,15 +107,15 @@
};
struct display fb_display[MAX_NR_CONSOLES];
-signed char con2fb_map[MAX_NR_CONSOLES];
-signed char con2fb_map_boot[MAX_NR_CONSOLES];
+static signed char con2fb_map[MAX_NR_CONSOLES];
+static signed char con2fb_map_boot[MAX_NR_CONSOLES];
static int logo_height;
static int logo_lines;
/* logo_shown is an index to vc_cons when >= 0; otherwise follows FBCON_LOGO
enums. */
static int logo_shown = FBCON_LOGO_CANSHOW;
/* Software scrollback */
-int fbcon_softback_size = 32768;
+static int fbcon_softback_size = 32768;
static unsigned long softback_buf, softback_curr;
static unsigned long softback_in;
static unsigned long softback_top, softback_end;
@@ -130,6 +130,8 @@
/* current fb_info */
static int info_idx = -1;
+static const struct consw fb_con;
+
#define CM_SOFTBACK(8)
#define advance_row(p, delta) (unsigned short *)((unsigned long)(p) + (delta)
* vc->vc_size_row)
@@ -305,7 +307,8 @@
mod_timer(>cursor_timer, jiffies + HZ/5);
}
-int __init fb_console_setup(char *this_opt)
+#ifndef MODULE
+static int __init fb_console_setup(char *this_opt)
{
char *options;
int i, j;
@@ -359,6 +362,7 @@
}
__setup("fbcon=", fb_console_setup);
+#endif
static int search_fb_in_map(int idx)
{
@@ -1114,7 +1118,7 @@
static int scrollback_max = 0;
static int scrollback_current = 0;
-int update_var(int con, struct fb_info *info)
+static int update_var(int con, struct fb_info *info)
{
if (con == ((struct fbcon_ops *)info->fbcon_par)->currcon)
return fb_pan_display(info, >var);
@@ -2709,7 +2713,7 @@
* The console `switch' structure for the frame buffer based console
*/
-const struct consw fb_con = {
+static const struct consw fb_con = {
.owner = THIS_MODULE,
.con_startup= fbcon_startup,
.con_init = fbcon_init,
@@ -2739,7 +2743,7 @@
.notifier_call = fbcon_event_notify,
};
-int __init fb_console_init(void)
+static int __init fb_console_init(void)
{
int i;
@@ -2767,7 +2771,7 @@
#ifdef MODULE
-void __exit fb_console_exit(void)
+static void __exit fb_console_exit(void)
{
acquire_console_sem();
fb_unregister_client(_event_notifier);
@@ -2779,10 +2783,4 @@
#endif
-/*
- * Visible symbols for modules
- */
-
-EXPORT_SYMBOL(fb_con);
-
MODULE_LICENSE("GPL");
--- linux-2.6.10-rc2-mm2-full/drivers/video/console/mdacon.c.old
2004-11-21 15:27:40.0 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/console/mdacon.c2004-11-21
15:28:21.0 +0100
@@ -576,7 +576,7 @@
* The console `switch' structure for the MDA based console
*/
-const struct consw mda_con = {
+static const struct consw mda_con = {
.owner =THIS_MODULE,
.con_startup = mdacon_startup,
.con_init = mdacon_init,
@@
[2.6 patch] drivers/video/: misc cleanups
This patch contains cleanups under drivers/video/ including:
- make some needlessly global code static
- the following was needlessly EXPORT_SYMBOL'ed:
- fbcon.c: fb_con
- fbmon.c: get_EDID_from_firmware (completely unused)
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
---
This patch applies and compiles against 2.6.11-rc4-mm1.
drivers/video/console/fbcon.c | 26 --
drivers/video/console/fbcon.h |1 -
drivers/video/console/mdacon.c |4 ++--
drivers/video/fbmem.c |4 ++--
drivers/video/fbmon.c | 20 +---
drivers/video/vga16fb.c| 24
include/linux/console.h|1 -
drivers/video/modedb.c |5 ++---
8 files changed, 31 insertions(+), 54 deletions(-)
--- linux-2.6.10-rc2-mm2-full/include/linux/console.h.old 2004-11-21
15:20:38.0 +0100
+++ linux-2.6.10-rc2-mm2-full/include/linux/console.h 2004-11-21
15:20:46.0 +0100
@@ -59,7 +59,6 @@
extern const struct consw *conswitchp;
extern const struct consw dummy_con; /* dummy console buffer */
-extern const struct consw fb_con; /* frame buffer based console */
extern const struct consw vga_con; /* VGA text console */
extern const struct consw newport_con; /* SGI Newport console */
extern const struct consw prom_con;/* SPARC PROM console */
--- linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.h.old 2004-11-21
15:26:10.0 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.h 2004-11-21
15:26:19.0 +0100
@@ -155,7 +155,6 @@
#define SCROLL_REDRAW 0x004
#define SCROLL_PAN_REDRAW 0x005
-extern int fb_console_init(void);
#ifdef CONFIG_FB_TILEBLITTING
extern void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info,
struct display *p, struct fbcon_ops *ops);
--- linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.c.old 2004-11-21
15:19:18.0 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.c 2004-11-21
15:54:54.0 +0100
@@ -107,15 +107,15 @@
};
struct display fb_display[MAX_NR_CONSOLES];
-signed char con2fb_map[MAX_NR_CONSOLES];
-signed char con2fb_map_boot[MAX_NR_CONSOLES];
+static signed char con2fb_map[MAX_NR_CONSOLES];
+static signed char con2fb_map_boot[MAX_NR_CONSOLES];
static int logo_height;
static int logo_lines;
/* logo_shown is an index to vc_cons when = 0; otherwise follows FBCON_LOGO
enums. */
static int logo_shown = FBCON_LOGO_CANSHOW;
/* Software scrollback */
-int fbcon_softback_size = 32768;
+static int fbcon_softback_size = 32768;
static unsigned long softback_buf, softback_curr;
static unsigned long softback_in;
static unsigned long softback_top, softback_end;
@@ -130,6 +130,8 @@
/* current fb_info */
static int info_idx = -1;
+static const struct consw fb_con;
+
#define CM_SOFTBACK(8)
#define advance_row(p, delta) (unsigned short *)((unsigned long)(p) + (delta)
* vc-vc_size_row)
@@ -305,7 +307,8 @@
mod_timer(ops-cursor_timer, jiffies + HZ/5);
}
-int __init fb_console_setup(char *this_opt)
+#ifndef MODULE
+static int __init fb_console_setup(char *this_opt)
{
char *options;
int i, j;
@@ -359,6 +362,7 @@
}
__setup(fbcon=, fb_console_setup);
+#endif
static int search_fb_in_map(int idx)
{
@@ -1114,7 +1118,7 @@
static int scrollback_max = 0;
static int scrollback_current = 0;
-int update_var(int con, struct fb_info *info)
+static int update_var(int con, struct fb_info *info)
{
if (con == ((struct fbcon_ops *)info-fbcon_par)-currcon)
return fb_pan_display(info, info-var);
@@ -2709,7 +2713,7 @@
* The console `switch' structure for the frame buffer based console
*/
-const struct consw fb_con = {
+static const struct consw fb_con = {
.owner = THIS_MODULE,
.con_startup= fbcon_startup,
.con_init = fbcon_init,
@@ -2739,7 +2743,7 @@
.notifier_call = fbcon_event_notify,
};
-int __init fb_console_init(void)
+static int __init fb_console_init(void)
{
int i;
@@ -2767,7 +2771,7 @@
#ifdef MODULE
-void __exit fb_console_exit(void)
+static void __exit fb_console_exit(void)
{
acquire_console_sem();
fb_unregister_client(fbcon_event_notifier);
@@ -2779,10 +2783,4 @@
#endif
-/*
- * Visible symbols for modules
- */
-
-EXPORT_SYMBOL(fb_con);
-
MODULE_LICENSE(GPL);
--- linux-2.6.10-rc2-mm2-full/drivers/video/console/mdacon.c.old
2004-11-21 15:27:40.0 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/console/mdacon.c2004-11-21
15:28:21.0 +0100
@@ -576,7 +576,7 @@
* The console `switch' structure for the MDA based console
*/
-const struct consw mda_con = {
+static const struct consw mda_con = {
.owner =THIS_MODULE,
.con_startup = mdacon_startup,
.con_init = mdacon_init,
[2.6 patch] drivers/video/: misc cleanups
This patch contains cleanups under drivers/video/ including:
- make some needlessly global code static
- the following was needlessly EXPORT_SYMBOL'ed:
- fbcon.c: fb_con
- fbmon.c: get_EDID_from_firmware (completely unused)
Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
---
drivers/video/cfbfillrect.c| 12 ++--
drivers/video/console/fbcon.c | 26 --
drivers/video/console/fbcon.h |1 -
drivers/video/console/mdacon.c |4 ++--
drivers/video/fbmem.c |4 ++--
drivers/video/fbmon.c | 20 +---
drivers/video/modedb.c |4 ++--
drivers/video/vga16fb.c| 24
include/linux/console.h|1 -
9 files changed, 37 insertions(+), 59 deletions(-)
--- linux-2.6.10-rc2-mm2-full/include/linux/console.h.old 2004-11-21
15:20:38.0 +0100
+++ linux-2.6.10-rc2-mm2-full/include/linux/console.h 2004-11-21
15:20:46.0 +0100
@@ -59,7 +59,6 @@
extern const struct consw *conswitchp;
extern const struct consw dummy_con; /* dummy console buffer */
-extern const struct consw fb_con; /* frame buffer based console */
extern const struct consw vga_con; /* VGA text console */
extern const struct consw newport_con; /* SGI Newport console */
extern const struct consw prom_con;/* SPARC PROM console */
--- linux-2.6.10-rc2-mm2-full/drivers/video/cfbfillrect.c.old 2004-11-21
15:17:46.0 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/cfbfillrect.c 2004-11-21
15:18:53.0 +0100
@@ -119,7 +119,7 @@
* Unaligned 32-bit pattern fill using 32/64-bit memory accesses
*/
-void bitfill32(unsigned long __iomem *dst, int dst_idx, u32 pat, u32 n)
+static void bitfill32(unsigned long __iomem *dst, int dst_idx, u32 pat, u32 n)
{
unsigned long val = pat;
unsigned long first, last;
@@ -178,8 +178,8 @@
* used for the next 32/64-bit word
*/
-void bitfill(unsigned long __iomem *dst, int dst_idx, unsigned long pat, int
left,
-int right, u32 n)
+static void bitfill(unsigned long __iomem *dst, int dst_idx, unsigned long pat,
+ int left, int right, u32 n)
{
unsigned long first, last;
@@ -228,7 +228,7 @@
}
}
-void bitfill32_rev(unsigned long __iomem *dst, int dst_idx, u32 pat, u32 n)
+static void bitfill32_rev(unsigned long __iomem *dst, int dst_idx, u32 pat,
u32 n)
{
unsigned long val = pat, dat;
unsigned long first, last;
@@ -300,8 +300,8 @@
* used for the next 32/64-bit word
*/
-void bitfill_rev(unsigned long __iomem *dst, int dst_idx, unsigned long pat,
int left,
-int right, u32 n)
+static void bitfill_rev(unsigned long __iomem *dst, int dst_idx, unsigned long
pat,
+ int left, int right, u32 n)
{
unsigned long first, last, dat;
--- linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.h.old 2004-11-21
15:26:10.0 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.h 2004-11-21
15:26:19.0 +0100
@@ -155,7 +155,6 @@
#define SCROLL_REDRAW 0x004
#define SCROLL_PAN_REDRAW 0x005
-extern int fb_console_init(void);
#ifdef CONFIG_FB_TILEBLITTING
extern void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info,
struct display *p, struct fbcon_ops *ops);
--- linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.c.old 2004-11-21
15:19:18.0 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.c 2004-11-21
15:54:54.0 +0100
@@ -107,15 +107,15 @@
};
struct display fb_display[MAX_NR_CONSOLES];
-signed char con2fb_map[MAX_NR_CONSOLES];
-signed char con2fb_map_boot[MAX_NR_CONSOLES];
+static signed char con2fb_map[MAX_NR_CONSOLES];
+static signed char con2fb_map_boot[MAX_NR_CONSOLES];
static int logo_height;
static int logo_lines;
/* logo_shown is an index to vc_cons when >= 0; otherwise follows FBCON_LOGO
enums. */
static int logo_shown = FBCON_LOGO_CANSHOW;
/* Software scrollback */
-int fbcon_softback_size = 32768;
+static int fbcon_softback_size = 32768;
static unsigned long softback_buf, softback_curr;
static unsigned long softback_in;
static unsigned long softback_top, softback_end;
@@ -130,6 +130,8 @@
/* current fb_info */
static int info_idx = -1;
+static const struct consw fb_con;
+
#define CM_SOFTBACK(8)
#define advance_row(p, delta) (unsigned short *)((unsigned long)(p) + (delta)
* vc->vc_size_row)
@@ -305,7 +307,8 @@
mod_timer(>cursor_timer, jiffies + HZ/5);
}
-int __init fb_console_setup(char *this_opt)
+#ifndef MODULE
+static int __init fb_console_setup(char *this_opt)
{
char *options;
int i, j;
@@ -359,6 +362,7 @@
}
__setup("fbcon=", fb_console_setup);
+#endif
static int search_fb_in_map(int idx)
{
@@ -1114,7 +1118,7 @@
static int scrollback_max = 0;
static int scrollback_current = 0;
-int
[2.6 patch] drivers/video/: misc cleanups
This patch contains cleanups under drivers/video/ including:
- make some needlessly global code static
- the following was needlessly EXPORT_SYMBOL'ed:
- fbcon.c: fb_con
- fbmon.c: get_EDID_from_firmware (completely unused)
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
---
drivers/video/cfbfillrect.c| 12 ++--
drivers/video/console/fbcon.c | 26 --
drivers/video/console/fbcon.h |1 -
drivers/video/console/mdacon.c |4 ++--
drivers/video/fbmem.c |4 ++--
drivers/video/fbmon.c | 20 +---
drivers/video/modedb.c |4 ++--
drivers/video/vga16fb.c| 24
include/linux/console.h|1 -
9 files changed, 37 insertions(+), 59 deletions(-)
--- linux-2.6.10-rc2-mm2-full/include/linux/console.h.old 2004-11-21
15:20:38.0 +0100
+++ linux-2.6.10-rc2-mm2-full/include/linux/console.h 2004-11-21
15:20:46.0 +0100
@@ -59,7 +59,6 @@
extern const struct consw *conswitchp;
extern const struct consw dummy_con; /* dummy console buffer */
-extern const struct consw fb_con; /* frame buffer based console */
extern const struct consw vga_con; /* VGA text console */
extern const struct consw newport_con; /* SGI Newport console */
extern const struct consw prom_con;/* SPARC PROM console */
--- linux-2.6.10-rc2-mm2-full/drivers/video/cfbfillrect.c.old 2004-11-21
15:17:46.0 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/cfbfillrect.c 2004-11-21
15:18:53.0 +0100
@@ -119,7 +119,7 @@
* Unaligned 32-bit pattern fill using 32/64-bit memory accesses
*/
-void bitfill32(unsigned long __iomem *dst, int dst_idx, u32 pat, u32 n)
+static void bitfill32(unsigned long __iomem *dst, int dst_idx, u32 pat, u32 n)
{
unsigned long val = pat;
unsigned long first, last;
@@ -178,8 +178,8 @@
* used for the next 32/64-bit word
*/
-void bitfill(unsigned long __iomem *dst, int dst_idx, unsigned long pat, int
left,
-int right, u32 n)
+static void bitfill(unsigned long __iomem *dst, int dst_idx, unsigned long pat,
+ int left, int right, u32 n)
{
unsigned long first, last;
@@ -228,7 +228,7 @@
}
}
-void bitfill32_rev(unsigned long __iomem *dst, int dst_idx, u32 pat, u32 n)
+static void bitfill32_rev(unsigned long __iomem *dst, int dst_idx, u32 pat,
u32 n)
{
unsigned long val = pat, dat;
unsigned long first, last;
@@ -300,8 +300,8 @@
* used for the next 32/64-bit word
*/
-void bitfill_rev(unsigned long __iomem *dst, int dst_idx, unsigned long pat,
int left,
-int right, u32 n)
+static void bitfill_rev(unsigned long __iomem *dst, int dst_idx, unsigned long
pat,
+ int left, int right, u32 n)
{
unsigned long first, last, dat;
--- linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.h.old 2004-11-21
15:26:10.0 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.h 2004-11-21
15:26:19.0 +0100
@@ -155,7 +155,6 @@
#define SCROLL_REDRAW 0x004
#define SCROLL_PAN_REDRAW 0x005
-extern int fb_console_init(void);
#ifdef CONFIG_FB_TILEBLITTING
extern void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info,
struct display *p, struct fbcon_ops *ops);
--- linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.c.old 2004-11-21
15:19:18.0 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/console/fbcon.c 2004-11-21
15:54:54.0 +0100
@@ -107,15 +107,15 @@
};
struct display fb_display[MAX_NR_CONSOLES];
-signed char con2fb_map[MAX_NR_CONSOLES];
-signed char con2fb_map_boot[MAX_NR_CONSOLES];
+static signed char con2fb_map[MAX_NR_CONSOLES];
+static signed char con2fb_map_boot[MAX_NR_CONSOLES];
static int logo_height;
static int logo_lines;
/* logo_shown is an index to vc_cons when = 0; otherwise follows FBCON_LOGO
enums. */
static int logo_shown = FBCON_LOGO_CANSHOW;
/* Software scrollback */
-int fbcon_softback_size = 32768;
+static int fbcon_softback_size = 32768;
static unsigned long softback_buf, softback_curr;
static unsigned long softback_in;
static unsigned long softback_top, softback_end;
@@ -130,6 +130,8 @@
/* current fb_info */
static int info_idx = -1;
+static const struct consw fb_con;
+
#define CM_SOFTBACK(8)
#define advance_row(p, delta) (unsigned short *)((unsigned long)(p) + (delta)
* vc-vc_size_row)
@@ -305,7 +307,8 @@
mod_timer(ops-cursor_timer, jiffies + HZ/5);
}
-int __init fb_console_setup(char *this_opt)
+#ifndef MODULE
+static int __init fb_console_setup(char *this_opt)
{
char *options;
int i, j;
@@ -359,6 +362,7 @@
}
__setup(fbcon=, fb_console_setup);
+#endif
static int search_fb_in_map(int idx)
{
@@ -1114,7 +1118,7 @@
static int scrollback_max = 0;
static int scrollback_current = 0;
-int
