From: Adrian Bunk <bunk@stusta.de>
To: Andrew Morton <akpm@osdl.org>
Cc: Antonino Daplas <adaplas@pol.net>,
linux-kernel@vger.kernel.org,
linux-fbdev-devel@lists.sourceforge.net
Subject: [2.6 patch] drivers/video/i810/: make some code static
Date: Tue, 25 Jan 2005 12:27:54 +0100 [thread overview]
Message-ID: <20050125112754.GF30909@stusta.de> (raw)
This patch makes some needlessly global code static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
drivers/video/i810/i810_gtf.c | 12 ++++++------
drivers/video/i810/i810_main.c | 12 +++++++-----
2 files changed, 13 insertions(+), 11 deletions(-)
This patch was already sent on:
- 21 Nov 2004
--- linux-2.6.10-rc2-mm2-full/drivers/video/i810/i810_gtf.c.old 2004-11-21 15:13:59.000000000 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/i810/i810_gtf.c 2004-11-21 15:15:02.000000000 +0100
@@ -26,7 +26,7 @@
u32 wm;
};
-struct wm_info i810_wm_8_100[] = {
+static struct wm_info i810_wm_8_100[] = {
{ 15, 0x0070c000 }, { 19, 0x0070c000 }, { 25, 0x22003000 },
{ 28, 0x22003000 }, { 31, 0x22003000 }, { 36, 0x22007000 },
{ 40, 0x22007000 }, { 45, 0x22007000 }, { 49, 0x22008000 },
@@ -40,7 +40,7 @@
{ 218, 0x2220f000 }, { 229, 0x22210000 }, { 234, 0x22210000 },
};
-struct wm_info i810_wm_16_100[] = {
+static struct wm_info i810_wm_16_100[] = {
{ 15, 0x0070c000 }, { 19, 0x0020c000 }, { 25, 0x22006000 },
{ 28, 0x22006000 }, { 31, 0x22007000 }, { 36, 0x22007000 },
{ 40, 0x22007000 }, { 45, 0x22007000 }, { 49, 0x22009000 },
@@ -54,7 +54,7 @@
{ 218, 0x22416000 }, { 229, 0x22416000 },
};
-struct wm_info i810_wm_24_100[] = {
+static struct wm_info i810_wm_24_100[] = {
{ 15, 0x0020c000 }, { 19, 0x0040c000 }, { 25, 0x22009000 },
{ 28, 0x22009000 }, { 31, 0x2200a000 }, { 36, 0x2210c000 },
{ 40, 0x2210c000 }, { 45, 0x2210c000 }, { 49, 0x22111000 },
@@ -67,7 +67,7 @@
{ 195, 0x44419000 }, { 202, 0x44419000 }, { 204, 0x44419000 },
};
-struct wm_info i810_wm_8_133[] = {
+static struct wm_info i810_wm_8_133[] = {
{ 15, 0x0070c000 }, { 19, 0x0070c000 }, { 25, 0x22003000 },
{ 28, 0x22003000 }, { 31, 0x22003000 }, { 36, 0x22007000 },
{ 40, 0x22007000 }, { 45, 0x22007000 }, { 49, 0x22008000 },
@@ -81,7 +81,7 @@
{ 218, 0x2220f000 }, { 229, 0x22210000 }, { 234, 0x22210000 },
};
-struct wm_info i810_wm_16_133[] = {
+static struct wm_info i810_wm_16_133[] = {
{ 15, 0x0020c000 }, { 19, 0x0020c000 }, { 25, 0x22006000 },
{ 28, 0x22006000 }, { 31, 0x22007000 }, { 36, 0x22007000 },
{ 40, 0x22007000 }, { 45, 0x22007000 }, { 49, 0x22009000 },
@@ -95,7 +95,7 @@
{ 218, 0x22416000 }, { 229, 0x22416000 },
};
-struct wm_info i810_wm_24_133[] = {
+static struct wm_info i810_wm_24_133[] = {
{ 15, 0x0020c000 }, { 19, 0x00408000 }, { 25, 0x22009000 },
{ 28, 0x22009000 }, { 31, 0x2200a000 }, { 36, 0x2210c000 },
{ 40, 0x2210c000 }, { 45, 0x2210c000 }, { 49, 0x22111000 },
--- linux-2.6.10-rc2-mm2-full/drivers/video/i810/i810_main.c.old 2004-11-21 15:15:22.000000000 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/video/i810/i810_main.c 2004-11-21 15:16:57.000000000 +0100
@@ -635,7 +635,7 @@
* DESCRIPTION:
* Calculates buffer pitch in bytes.
*/
-u32 get_line_length(struct i810fb_par *par, int xres_virtual, int bpp)
+static u32 get_line_length(struct i810fb_par *par, int xres_virtual, int bpp)
{
u32 length;
@@ -724,7 +724,7 @@
* Description:
* Shows or hides the hardware cursor
*/
-void i810_enable_cursor(u8 __iomem *mmio, int mode)
+static void i810_enable_cursor(u8 __iomem *mmio, int mode)
{
u32 temp;
@@ -1804,8 +1804,9 @@
return 0;
}
-
-int __init i810fb_setup(char *options)
+
+#ifndef MODULE
+static int __init i810fb_setup(char *options)
{
char *this_opt, *suffix = NULL;
@@ -1850,6 +1851,7 @@
}
return 0;
}
+#endif
static int __devinit i810fb_init_pci (struct pci_dev *dev,
const struct pci_device_id *entry)
@@ -1976,7 +1978,7 @@
}
#ifndef MODULE
-int __init i810fb_init(void)
+static int __init i810fb_init(void)
{
char *option = NULL;
next reply other threads:[~2005-01-25 11:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-01-25 11:27 Adrian Bunk [this message]
-- strict thread matches above, loose matches on Subject: below --
2004-11-21 15:36 [2.6 patch] drivers/video/i810/: make some code static Adrian Bunk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050125112754.GF30909@stusta.de \
--to=bunk@stusta.de \
--cc=adaplas@pol.net \
--cc=akpm@osdl.org \
--cc=linux-fbdev-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.