Commit c395d3e8 authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds

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: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a1d35a7a
...@@ -417,10 +417,6 @@ static struct fb_ops cirrusfb_ops = { ...@@ -417,10 +417,6 @@ static struct fb_ops cirrusfb_ops = {
.fb_imageblit = cirrusfb_imageblit, .fb_imageblit = cirrusfb_imageblit,
}; };
/*--- Hardware Specific Routines -------------------------------------------*/
static int cirrusfb_decode_var(const struct fb_var_screeninfo *var,
struct cirrusfb_regs *regs,
struct fb_info *info);
/*--- Internal routines ----------------------------------------------------*/ /*--- Internal routines ----------------------------------------------------*/
static void init_vgachip(struct fb_info *info); static void init_vgachip(struct fb_info *info);
static void switch_monitor(struct cirrusfb_info *cinfo, int on); static void switch_monitor(struct cirrusfb_info *cinfo, int on);
...@@ -2020,7 +2016,7 @@ static int release_io_ports; ...@@ -2020,7 +2016,7 @@ static int release_io_ports;
* based on the DRAM bandwidth bit and DRAM bank switching bit. This * based on the DRAM bandwidth bit and DRAM bank switching bit. This
* works with 1MB, 2MB and 4MB configurations (which the Motorola boards * works with 1MB, 2MB and 4MB configurations (which the Motorola boards
* seem to have. */ * seem to have. */
static unsigned int cirrusfb_get_memsize(u8 __iomem *regbase) static unsigned int __devinit cirrusfb_get_memsize(u8 __iomem *regbase)
{ {
unsigned long mem; unsigned long mem;
unsigned char SRF; unsigned char SRF;
...@@ -2117,7 +2113,7 @@ static void __devexit cirrusfb_zorro_unmap(struct fb_info *info) ...@@ -2117,7 +2113,7 @@ static void __devexit cirrusfb_zorro_unmap(struct fb_info *info)
} }
#endif /* CONFIG_ZORRO */ #endif /* CONFIG_ZORRO */
static int cirrusfb_set_fbinfo(struct fb_info *info) static int __devinit cirrusfb_set_fbinfo(struct fb_info *info)
{ {
struct cirrusfb_info *cinfo = info->par; struct cirrusfb_info *cinfo = info->par;
struct fb_var_screeninfo *var = &info->var; struct fb_var_screeninfo *var = &info->var;
...@@ -2161,7 +2157,7 @@ static int cirrusfb_set_fbinfo(struct fb_info *info) ...@@ -2161,7 +2157,7 @@ static int cirrusfb_set_fbinfo(struct fb_info *info)
return 0; return 0;
} }
static int cirrusfb_register(struct fb_info *info) static int __devinit cirrusfb_register(struct fb_info *info)
{ {
struct cirrusfb_info *cinfo = info->par; struct cirrusfb_info *cinfo = info->par;
int err; int err;
...@@ -2232,8 +2228,8 @@ static void __devexit cirrusfb_cleanup(struct fb_info *info) ...@@ -2232,8 +2228,8 @@ static void __devexit cirrusfb_cleanup(struct fb_info *info)
} }
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static int cirrusfb_pci_register(struct pci_dev *pdev, static int __devinit cirrusfb_pci_register(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct cirrusfb_info *cinfo; struct cirrusfb_info *cinfo;
struct fb_info *info; struct fb_info *info;
...@@ -2360,8 +2356,8 @@ static struct pci_driver cirrusfb_pci_driver = { ...@@ -2360,8 +2356,8 @@ static struct pci_driver cirrusfb_pci_driver = {
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
#ifdef CONFIG_ZORRO #ifdef CONFIG_ZORRO
static int cirrusfb_zorro_register(struct zorro_dev *z, static int __devinit cirrusfb_zorro_register(struct zorro_dev *z,
const struct zorro_device_id *ent) const struct zorro_device_id *ent)
{ {
struct cirrusfb_info *cinfo; struct cirrusfb_info *cinfo;
struct fb_info *info; struct fb_info *info;
......
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