From: syrjala@sci.fi
To: linux-fbdev-devel@lists.sourceforge.net
Cc: alex.kern@gmx.de, Ville Syrjala <syrjala@sci.fi>
Subject: [patch 6/9] atyfb: Fix __init and __devinit annotations
Date: Mon, 04 Sep 2006 01:06:53 +0300 [thread overview]
Message-ID: <20060903220703.009244062@proteus.korsu.shacknet.nu> (raw)
In-Reply-To: 20060903220646.894202994@proteus.korsu.shacknet.nu
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: atyfb_fix_init_and_devinit_annotations.patch --]
[-- Type: text/plain, Size: 2464 bytes --]
Fix some __init and __devinit annotations.
Signed-off-by: Ville Syrjala <syrjala@sci.fi>
---
drivers/video/aty/atyfb_base.c | 8 ++++----
drivers/video/aty/mach64_ct.c | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
Index: linux-2.6.18-rc4/drivers/video/aty/atyfb_base.c
===================================================================
--- linux-2.6.18-rc4.orig/drivers/video/aty/atyfb_base.c
+++ linux-2.6.18-rc4/drivers/video/aty/atyfb_base.c
@@ -3177,7 +3177,7 @@ static int __devinit atyfb_setup_sparc(s
#ifdef __i386__
#ifdef CONFIG_FB_ATY_GENERIC_LCD
-static void aty_init_lcd(struct atyfb_par *par, u32 bios_base)
+static void __devinit aty_init_lcd(struct atyfb_par *par, u32 bios_base)
{
u32 driv_inf_tab, sig;
u16 lcd_ofs;
@@ -3636,7 +3636,7 @@ err_release_mem:
#ifdef CONFIG_ATARI
-static int __devinit atyfb_atari_probe(void)
+static int __init atyfb_atari_probe(void)
{
struct atyfb_par *par;
struct fb_info *info;
@@ -3782,7 +3782,7 @@ static struct pci_driver atyfb_driver =
#endif /* CONFIG_PCI */
#ifndef MODULE
-static int __devinit atyfb_setup(char *options)
+static int __init atyfb_setup(char *options)
{
char *this_opt;
@@ -3854,7 +3854,7 @@ static int __devinit atyfb_setup(char *o
}
#endif /* MODULE */
-static int __devinit atyfb_init(void)
+static int __init atyfb_init(void)
{
#ifndef MODULE
char *option = NULL;
Index: linux-2.6.18-rc4/drivers/video/aty/mach64_ct.c
===================================================================
--- linux-2.6.18-rc4.orig/drivers/video/aty/mach64_ct.c
+++ linux-2.6.18-rc4/drivers/video/aty/mach64_ct.c
@@ -370,8 +370,8 @@ void aty_set_pll_ct(const struct fb_info
#endif
}
-static void __init aty_get_pll_ct(const struct fb_info *info,
- union aty_pll *pll)
+static void __devinit aty_get_pll_ct(const struct fb_info *info,
+ union aty_pll *pll)
{
struct atyfb_par *par = (struct atyfb_par *) info->par;
u8 tmp, clock;
@@ -394,8 +394,8 @@ static void __init aty_get_pll_ct(const
}
}
-static int __init aty_init_pll_ct(const struct fb_info *info,
- union aty_pll *pll)
+static int __devinit aty_init_pll_ct(const struct fb_info *info,
+ union aty_pll *pll)
{
struct atyfb_par *par = (struct atyfb_par *) info->par;
u8 mpost_div, xpost_div, sclk_post_div_real, sclk_fb_div, spll_cntl2;
--
Ville Syrj������l������
syrjala@sci.fi
http://www.sci.fi/~syrjala/
[-- Attachment #2: Type: text/plain, Size: 373 bytes --]
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
[-- Attachment #3: Type: text/plain, Size: 182 bytes --]
_______________________________________________
Linux-fbdev-devel mailing list
Linux-fbdev-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-fbdev-devel
next prev parent reply other threads:[~2006-09-03 22:00 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-03 22:06 [patch 1/9] atyfb: Remove FIXME syrjala
2006-09-03 22:06 ` [patch 2/9] atyfb: Fix compiler warnings syrjala
2006-09-03 22:06 ` [patch 3/9] atyfb: Fix sparse warnings syrjala
2006-09-03 22:06 ` [patch 4/9] atyfb: Fix blanking level transitions syrjala
2006-09-03 22:06 ` [patch 5/9] atyfb: Remove pointless aty_init() argument syrjala
2006-09-03 22:06 ` syrjala [this message]
2006-09-03 22:06 ` [patch 7/9] atyfb: Remove aty_cmap_regs syrjala
2006-09-03 22:06 ` [patch 8/9] atyfb: Improve atyfb_atari_probe() syrjala
2006-09-04 9:20 ` Geert Uytterhoeven
2006-09-03 22:06 ` [patch 9/9] atyfb: Improve power management syrjala
2006-09-08 22:02 ` [patch 1/9] atyfb: Remove FIXME Alexander Kern
2006-09-09 7:46 ` Ville Syrjälä
2006-09-09 8:20 ` Geert Uytterhoeven
2006-09-09 12:39 ` Ville Syrjälä
2006-09-10 7:48 ` Geert Uytterhoeven
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=20060903220703.009244062@proteus.korsu.shacknet.nu \
--to=syrjala@sci.fi \
--cc=alex.kern@gmx.de \
--cc=linux-fbdev-devel@lists.sourceforge.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).