aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2008-10-16 01:03:39 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 14:21:43 -0400
commitc395d3e8c7ed6d61ee87cb49187111122c8a499c (patch)
tree4b1e7b7f87271e4af80f588435fcb7b4ef78e5ea
parenta1d35a7a50d01b445e29d87f479f8c055a414f7e (diff)
cirrusfb: add __devinit attribute to probing functions
Add __devinit attribute to probing functions. This fixed section mismatch warning from my previous patch. Kill one redundant forward declaration. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/video/cirrusfb.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index 4c16b68a9c5a..4e34a6817435 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -417,10 +417,6 @@ static struct fb_ops cirrusfb_ops = {
417 .fb_imageblit = cirrusfb_imageblit, 417 .fb_imageblit = cirrusfb_imageblit,
418}; 418};
419 419
420/*--- Hardware Specific Routines -------------------------------------------*/
421static int cirrusfb_decode_var(const struct fb_var_screeninfo *var,
422 struct cirrusfb_regs *regs,
423 struct fb_info *info);
424/*--- Internal routines ----------------------------------------------------*/ 420/*--- Internal routines ----------------------------------------------------*/
425static void init_vgachip(struct fb_info *info); 421static void init_vgachip(struct fb_info *info);
426static void switch_monitor(struct cirrusfb_info *cinfo, int on); 422static void switch_monitor(struct cirrusfb_info *cinfo, int on);
@@ -2020,7 +2016,7 @@ static int release_io_ports;
2020 * based on the DRAM bandwidth bit and DRAM bank switching bit. This 2016 * based on the DRAM bandwidth bit and DRAM bank switching bit. This
2021 * works with 1MB, 2MB and 4MB configurations (which the Motorola boards 2017 * works with 1MB, 2MB and 4MB configurations (which the Motorola boards
2022 * seem to have. */ 2018 * seem to have. */
2023static unsigned int cirrusfb_get_memsize(u8 __iomem *regbase) 2019static unsigned int __devinit cirrusfb_get_memsize(u8 __iomem *regbase)
2024{ 2020{
2025 unsigned long mem; 2021 unsigned long mem;
2026 unsigned char SRF; 2022 unsigned char SRF;
@@ -2117,7 +2113,7 @@ static void __devexit cirrusfb_zorro_unmap(struct fb_info *info)
2117} 2113}
2118#endif /* CONFIG_ZORRO */ 2114#endif /* CONFIG_ZORRO */
2119 2115
2120static int cirrusfb_set_fbinfo(struct fb_info *info) 2116static int __devinit cirrusfb_set_fbinfo(struct fb_info *info)
2121{ 2117{
2122 struct cirrusfb_info *cinfo = info->par; 2118 struct cirrusfb_info *cinfo = info->par;
2123 struct fb_var_screeninfo *var = &info->var; 2119 struct fb_var_screeninfo *var = &info->var;
@@ -2161,7 +2157,7 @@ static int cirrusfb_set_fbinfo(struct fb_info *info)
2161 return 0; 2157 return 0;
2162} 2158}
2163 2159
2164static int cirrusfb_register(struct fb_info *info) 2160static int __devinit cirrusfb_register(struct fb_info *info)
2165{ 2161{
2166 struct cirrusfb_info *cinfo = info->par; 2162 struct cirrusfb_info *cinfo = info->par;
2167 int err; 2163 int err;
@@ -2232,8 +2228,8 @@ static void __devexit cirrusfb_cleanup(struct fb_info *info)
2232} 2228}
2233 2229
2234#ifdef CONFIG_PCI 2230#ifdef CONFIG_PCI
2235static int cirrusfb_pci_register(struct pci_dev *pdev, 2231static int __devinit cirrusfb_pci_register(struct pci_dev *pdev,
2236 const struct pci_device_id *ent) 2232 const struct pci_device_id *ent)
2237{ 2233{
2238 struct cirrusfb_info *cinfo; 2234 struct cirrusfb_info *cinfo;
2239 struct fb_info *info; 2235 struct fb_info *info;
@@ -2360,8 +2356,8 @@ static struct pci_driver cirrusfb_pci_driver = {
2360#endif /* CONFIG_PCI */ 2356#endif /* CONFIG_PCI */
2361 2357
2362#ifdef CONFIG_ZORRO 2358#ifdef CONFIG_ZORRO
2363static int cirrusfb_zorro_register(struct zorro_dev *z, 2359static int __devinit cirrusfb_zorro_register(struct zorro_dev *z,
2364 const struct zorro_device_id *ent) 2360 const struct zorro_device_id *ent)
2365{ 2361{
2366 struct cirrusfb_info *cinfo; 2362 struct cirrusfb_info *cinfo;
2367 struct fb_info *info; 2363 struct fb_info *info;