Skip to content

L
linux
Commit ff7e4119 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

PCI: fix up some pci drivers that had marked their probe functions with __init 

This also required some other functions and variables to be marked as 
__devinit
parent 484df667
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 47 deletions
drivers/atm/firestream.c
View file @ ff7e4119
...@@ -250,7 +250,7 @@ struct reginit_item { ...@@ -250,7 +250,7 @@ struct reginit_item {
}; };
struct reginit_item PHY_NTC_INIT[] __initdata = { struct reginit_item PHY_NTC_INIT[] __devinitdata = {
{ PHY_CLEARALL, 0x40 }, { PHY_CLEARALL, 0x40 },
{ 0x12, 0x0001 }, { 0x12, 0x0001 },
{ 0x13, 0x7605 }, { 0x13, 0x7605 },
...@@ -1296,7 +1296,7 @@ static const struct atmdev_ops ops = { ...@@ -1296,7 +1296,7 @@ static const struct atmdev_ops ops = {
}; };
static void __init undocumented_pci_fix (struct pci_dev *pdev) static void __devinit undocumented_pci_fix (struct pci_dev *pdev)
{ {
int tint; int tint;
...@@ -1320,13 +1320,13 @@ static void __init undocumented_pci_fix (struct pci_dev *pdev) ...@@ -1320,13 +1320,13 @@ static void __init undocumented_pci_fix (struct pci_dev *pdev)
* PHY routines * * PHY routines *
**************************************************************************/ **************************************************************************/
static void __init write_phy (struct fs_dev *dev, int regnum, int val) static void __devinit write_phy (struct fs_dev *dev, int regnum, int val)
{ {
submit_command (dev, &dev->hp_txq, QE_CMD_PRP_WR | QE_CMD_IMM_INQ, submit_command (dev, &dev->hp_txq, QE_CMD_PRP_WR | QE_CMD_IMM_INQ,
regnum, val, 0); regnum, val, 0);
} }
static int __init init_phy (struct fs_dev *dev, struct reginit_item *reginit) static int __devinit init_phy (struct fs_dev *dev, struct reginit_item *reginit)
{ {
int i; int i;
...@@ -1382,7 +1382,7 @@ static void reset_chip (struct fs_dev *dev) ...@@ -1382,7 +1382,7 @@ static void reset_chip (struct fs_dev *dev)
} }
} }
static void __init *aligned_kmalloc (int size, int flags, int alignment) static void __devinit *aligned_kmalloc (int size, int flags, int alignment)
{ {
void *t; void *t;
...@@ -1399,7 +1399,7 @@ static void __init *aligned_kmalloc (int size, int flags, int alignment) ...@@ -1399,7 +1399,7 @@ static void __init *aligned_kmalloc (int size, int flags, int alignment)
return NULL; return NULL;
} }
static int __init init_q (struct fs_dev *dev, static int __devinit init_q (struct fs_dev *dev,
struct queue *txq, int queue, int nentries, int is_rq) struct queue *txq, int queue, int nentries, int is_rq)
{ {
int sz = nentries * sizeof (struct FS_QENTRY); int sz = nentries * sizeof (struct FS_QENTRY);
...@@ -1435,7 +1435,7 @@ static int __init init_q (struct fs_dev *dev, ...@@ -1435,7 +1435,7 @@ static int __init init_q (struct fs_dev *dev,
} }
static int __init init_fp (struct fs_dev *dev, static int __devinit init_fp (struct fs_dev *dev,
struct freepool *fp, int queue, int bufsize, int nr_buffers) struct freepool *fp, int queue, int bufsize, int nr_buffers)
{ {
func_enter (); func_enter ();
...@@ -1655,7 +1655,7 @@ static void fs_poll (unsigned long data) ...@@ -1655,7 +1655,7 @@ static void fs_poll (unsigned long data)
} }
#endif #endif
static int __init fs_init (struct fs_dev *dev) static int __devinit fs_init (struct fs_dev *dev)
{ {
struct pci_dev *pci_dev; struct pci_dev *pci_dev;
int isr, to; int isr, to;
...@@ -1890,7 +1890,7 @@ static int __init fs_init (struct fs_dev *dev) ...@@ -1890,7 +1890,7 @@ static int __init fs_init (struct fs_dev *dev)
return 0; return 0;
} }
static int __init firestream_init_one (struct pci_dev *pci_dev, static int __devinit firestream_init_one (struct pci_dev *pci_dev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct atm_dev *atm_dev; struct atm_dev *atm_dev;
......
drivers/block/cciss.c
View file @ ff7e4119
...@@ -243,7 +243,7 @@ cciss_proc_write(struct file *file, const char *buffer, ...@@ -243,7 +243,7 @@ cciss_proc_write(struct file *file, const char *buffer,
* Get us a file in /proc/cciss that says something about each controller. * Get us a file in /proc/cciss that says something about each controller.
* Create /proc/cciss if it doesn't exist yet. * Create /proc/cciss if it doesn't exist yet.
*/ */
static void __init cciss_procinit(int i) static void __devinit cciss_procinit(int i)
{ {
struct proc_dir_entry *pde; struct proc_dir_entry *pde;
...@@ -2427,7 +2427,7 @@ static void free_hba(int i) ...@@ -2427,7 +2427,7 @@ static void free_hba(int i)
* stealing all these major device numbers. * stealing all these major device numbers.
* returns the number of block devices registered. * returns the number of block devices registered.
*/ */
static int __init cciss_init_one(struct pci_dev *pdev, static int __devinit cciss_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
request_queue_t *q; request_queue_t *q;
......
drivers/char/epca.c
View file @ ff7e4119
...@@ -3868,7 +3868,7 @@ static struct { ...@@ -3868,7 +3868,7 @@ static struct {
}; };
static int __init epca_init_one (struct pci_dev *pdev, static int __devinit epca_init_one (struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
static int board_num = -1; static int board_num = -1;
......
drivers/char/watchdog/wdt_pci.c
View file @ ff7e4119
...@@ -505,7 +505,7 @@ static struct notifier_block wdtpci_notifier = { ...@@ -505,7 +505,7 @@ static struct notifier_block wdtpci_notifier = {
}; };
static int __init wdtpci_init_one (struct pci_dev *dev, static int __devinit wdtpci_init_one (struct pci_dev *dev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
static int dev_count = 0; static int dev_count = 0;
......
drivers/net/hamachi.c
View file @ ff7e4119
...@@ -178,7 +178,7 @@ static int tx_params[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; ...@@ -178,7 +178,7 @@ static int tx_params[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include <asm/cache.h> #include <asm/cache.h>
static char version[] __initdata = static char version[] __devinitdata =
KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " Written by Donald Becker\n" KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " Written by Donald Becker\n"
KERN_INFO " Some modifications by Eric kasten <kasten@nscl.msu.edu>\n" KERN_INFO " Some modifications by Eric kasten <kasten@nscl.msu.edu>\n"
KERN_INFO " Further modifications by Keith Underwood <keithu@parl.clemson.edu>\n"; KERN_INFO " Further modifications by Keith Underwood <keithu@parl.clemson.edu>\n";
...@@ -569,7 +569,7 @@ static struct net_device_stats *hamachi_get_stats(struct net_device *dev); ...@@ -569,7 +569,7 @@ static struct net_device_stats *hamachi_get_stats(struct net_device *dev);
static void set_rx_mode(struct net_device *dev); static void set_rx_mode(struct net_device *dev);
static int __init hamachi_init_one (struct pci_dev *pdev, static int __devinit hamachi_init_one (struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct hamachi_private *hmp; struct hamachi_private *hmp;
...@@ -794,7 +794,7 @@ static int __init hamachi_init_one (struct pci_dev *pdev, ...@@ -794,7 +794,7 @@ static int __init hamachi_init_one (struct pci_dev *pdev,
return ret; return ret;
} }
static int __init read_eeprom(long ioaddr, int location) static int __devinit read_eeprom(long ioaddr, int location)
{ {
int bogus_cnt = 1000; int bogus_cnt = 1000;
......
drivers/net/irda/via-ircc.c
View file @ ff7e4119
...@@ -107,7 +107,7 @@ static int RxTimerHandler(struct via_ircc_cb *self, int iobase); ...@@ -107,7 +107,7 @@ static int RxTimerHandler(struct via_ircc_cb *self, int iobase);
void hwreset(struct via_ircc_cb *self); void hwreset(struct via_ircc_cb *self);
static int via_ircc_dma_xmit(struct via_ircc_cb *self, u16 iobase); static int via_ircc_dma_xmit(struct via_ircc_cb *self, u16 iobase);
static int upload_rxdata(struct via_ircc_cb *self, int iobase); static int upload_rxdata(struct via_ircc_cb *self, int iobase);
static int __init via_init_one (struct pci_dev *pcidev, const struct pci_device_id *id); static int __devinit via_init_one (struct pci_dev *pcidev, const struct pci_device_id *id);
static void __exit via_remove_one (struct pci_dev *pdev); static void __exit via_remove_one (struct pci_dev *pdev);
/* Should use udelay() instead, even if we are x86 only - Jean II */ /* Should use udelay() instead, even if we are x86 only - Jean II */
...@@ -168,7 +168,7 @@ int __init via_ircc_init(void) ...@@ -168,7 +168,7 @@ int __init via_ircc_init(void)
} }
static int __init via_init_one (struct pci_dev *pcidev, const struct pci_device_id *id) static int __devinit via_init_one (struct pci_dev *pcidev, const struct pci_device_id *id)
{ {
int rc; int rc;
u8 temp,oldPCI_40,oldPCI_44,bTmp,bTmp1; u8 temp,oldPCI_40,oldPCI_44,bTmp,bTmp1;
...@@ -326,7 +326,7 @@ static void __exit via_ircc_cleanup(void) ...@@ -326,7 +326,7 @@ static void __exit via_ircc_cleanup(void)
* Open driver instance * Open driver instance
* *
*/ */
static __init int via_ircc_open(int i, chipio_t * info, unsigned int id) static __devinit int via_ircc_open(int i, chipio_t * info, unsigned int id)
{ {
struct net_device *dev; struct net_device *dev;
struct via_ircc_cb *self; struct via_ircc_cb *self;
......
drivers/net/tc35815.c
View file @ ff7e4119
...@@ -448,7 +448,7 @@ struct tc35815_local { ...@@ -448,7 +448,7 @@ struct tc35815_local {
/* Index to functions, as function prototypes. */ /* Index to functions, as function prototypes. */
static int __init tc35815_probe1(struct pci_dev *pdev, unsigned int base_addr, unsigned int irq); static int __devinit tc35815_probe1(struct pci_dev *pdev, unsigned int base_addr, unsigned int irq);
static int tc35815_open(struct net_device *dev); static int tc35815_open(struct net_device *dev);
static int tc35815_send_packet(struct sk_buff *skb, struct net_device *dev); static int tc35815_send_packet(struct sk_buff *skb, struct net_device *dev);
...@@ -526,7 +526,7 @@ tc35815_probe(struct pci_dev *pdev, ...@@ -526,7 +526,7 @@ tc35815_probe(struct pci_dev *pdev,
return -ENODEV; return -ENODEV;
} }
static int __init tc35815_probe1(struct pci_dev *pdev, unsigned int base_addr, unsigned int irq) static int __devinit tc35815_probe1(struct pci_dev *pdev, unsigned int base_addr, unsigned int irq)
{ {
static unsigned version_printed = 0; static unsigned version_printed = 0;
int i; int i;
......
drivers/net/tokenring/abyss.c
View file @ ff7e4119
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include "tms380tr.h" #include "tms380tr.h"
#include "abyss.h" /* Madge-specific constants */ #include "abyss.h" /* Madge-specific constants */
static char version[] __initdata = static char version[] __devinitdata =
"abyss.c: v1.02 23/11/2000 by Adam Fritzler\n"; "abyss.c: v1.02 23/11/2000 by Adam Fritzler\n";
#define ABYSS_IO_EXTENT 64 #define ABYSS_IO_EXTENT 64
...@@ -92,7 +92,7 @@ static void abyss_sifwritew(struct net_device *dev, unsigned short val, unsigned ...@@ -92,7 +92,7 @@ static void abyss_sifwritew(struct net_device *dev, unsigned short val, unsigned
outw(val, dev->base_addr + reg); outw(val, dev->base_addr + reg);
} }
static int __init abyss_attach(struct pci_dev *pdev, const struct pci_device_id *ent) static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
static int versionprinted; static int versionprinted;
struct net_device *dev; struct net_device *dev;
......
drivers/net/tokenring/tmspci.c
View file @ ff7e4119
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include "tms380tr.h" #include "tms380tr.h"
static char version[] __initdata = static char version[] __devinitdata =
"tmspci.c: v1.02 23/11/2000 by Adam Fritzler\n"; "tmspci.c: v1.02 23/11/2000 by Adam Fritzler\n";
#define TMS_PCI_IO_EXTENT 32 #define TMS_PCI_IO_EXTENT 32
...@@ -91,7 +91,7 @@ static void tms_pci_sifwritew(struct net_device *dev, unsigned short val, unsign ...@@ -91,7 +91,7 @@ static void tms_pci_sifwritew(struct net_device *dev, unsigned short val, unsign
outw(val, dev->base_addr + reg); outw(val, dev->base_addr + reg);
} }
static int __init tms_pci_attach(struct pci_dev *pdev, const struct pci_device_id *ent) static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
static int versionprinted; static int versionprinted;
struct net_device *dev; struct net_device *dev;
......
drivers/net/tulip/de2104x.c
View file @ ff7e4119
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
#include <asm/unaligned.h> #include <asm/unaligned.h>
/* These identify the driver base version and may not be removed. */ /* These identify the driver base version and may not be removed. */
static char version[] __initdata = static char version[] =
KERN_INFO DRV_NAME " PCI Ethernet driver v" DRV_VERSION " (" DRV_RELDATE ")\n"; KERN_INFO DRV_NAME " PCI Ethernet driver v" DRV_VERSION " (" DRV_RELDATE ")\n";
MODULE_AUTHOR("Jeff Garzik <jgarzik@pobox.com>"); MODULE_AUTHOR("Jeff Garzik <jgarzik@pobox.com>");
...@@ -1932,7 +1932,7 @@ static void __init de21041_get_srom_info (struct de_private *de) ...@@ -1932,7 +1932,7 @@ static void __init de21041_get_srom_info (struct de_private *de)
goto fill_defaults; goto fill_defaults;
} }
static int __init de_init_one (struct pci_dev *pdev, static int __devinit de_init_one (struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct net_device *dev; struct net_device *dev;
......
drivers/net/tulip/de4x5.c
View file @ ff7e4119
...@@ -480,7 +480,7 @@ ...@@ -480,7 +480,7 @@
#include "de4x5.h" #include "de4x5.h"
static char version[] __initdata = "de4x5.c:V0.546 2001/02/22 davies@maniac.ultranet.com\n"; static char version[] __devinitdata = "de4x5.c:V0.546 2001/02/22 davies@maniac.ultranet.com\n";
#define c_char const char #define c_char const char
#define TWIDDLE(a) (u_short)le16_to_cpu(get_unaligned((u_short *)(a))) #define TWIDDLE(a) (u_short)le16_to_cpu(get_unaligned((u_short *)(a)))
...@@ -1082,7 +1082,7 @@ static int (*dc_infoblock[])(struct net_device *dev, u_char, u_char *) = { ...@@ -1082,7 +1082,7 @@ static int (*dc_infoblock[])(struct net_device *dev, u_char, u_char *) = {
} }
static int __init static int __devinit
de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev) de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
{ {
char name[DE4X5_NAME_LENGTH + 1]; char name[DE4X5_NAME_LENGTH + 1];
...@@ -2132,7 +2132,7 @@ static struct eisa_driver de4x5_eisa_driver = { ...@@ -2132,7 +2132,7 @@ static struct eisa_driver de4x5_eisa_driver = {
** DECchips, we can find the base SROM irrespective of the BIOS scan direction. ** DECchips, we can find the base SROM irrespective of the BIOS scan direction.
** For single port cards this is a time waster... ** For single port cards this is a time waster...
*/ */
static void __init static void __devinit
srom_search(struct net_device *dev, struct pci_dev *pdev) srom_search(struct net_device *dev, struct pci_dev *pdev)
{ {
u_char pb; u_char pb;
...@@ -2213,7 +2213,7 @@ srom_search(struct net_device *dev, struct pci_dev *pdev) ...@@ -2213,7 +2213,7 @@ srom_search(struct net_device *dev, struct pci_dev *pdev)
** kernels use the V0.535[n] drivers. ** kernels use the V0.535[n] drivers.
*/ */
static int __init de4x5_pci_probe (struct pci_dev *pdev, static int __devinit de4x5_pci_probe (struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
u_char pb, pbus = 0, dev_num, dnum = 0, timer; u_char pb, pbus = 0, dev_num, dnum = 0, timer;
......
drivers/net/wan/dscc4.c
View file @ ff7e4119
...@@ -693,7 +693,7 @@ static void dscc4_free1(struct pci_dev *pdev) ...@@ -693,7 +693,7 @@ static void dscc4_free1(struct pci_dev *pdev)
kfree(ppriv); kfree(ppriv);
} }
static int __init dscc4_init_one(struct pci_dev *pdev, static int __devinit dscc4_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct dscc4_pci_priv *priv; struct dscc4_pci_priv *priv;
......
drivers/pcmcia/i82092.c
View file @ ff7e4119
...@@ -92,7 +92,7 @@ static struct socket_info sockets[MAX_SOCKETS]; ...@@ -92,7 +92,7 @@ static struct socket_info sockets[MAX_SOCKETS];
static int socket_count; /* shortcut */ static int socket_count; /* shortcut */
static int __init i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) static int __devinit i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
{ {
unsigned char configbyte; unsigned char configbyte;
int i, ret; int i, ret;
......
drivers/video/i810/i810_main.c
View file @ ff7e4119
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
#include "i810_main.h" #include "i810_main.h"
/* PCI */ /* PCI */
static const char *i810_pci_list[] __initdata = { static const char *i810_pci_list[] __devinitdata = {
"Intel(R) 810 Framebuffer Device" , "Intel(R) 810 Framebuffer Device" ,
"Intel(R) 810-DC100 Framebuffer Device" , "Intel(R) 810-DC100 Framebuffer Device" ,
"Intel(R) 810E Framebuffer Device" , "Intel(R) 810E Framebuffer Device" ,
...@@ -1456,7 +1456,7 @@ static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor) ...@@ -1456,7 +1456,7 @@ static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
return 0; return 0;
} }
static struct fb_ops i810fb_ops __initdata = { static struct fb_ops i810fb_ops __devinitdata = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.fb_open = i810fb_open, .fb_open = i810fb_open,
.fb_release = i810fb_release, .fb_release = i810fb_release,
...@@ -1538,7 +1538,7 @@ static int i810fb_resume(struct pci_dev *dev) ...@@ -1538,7 +1538,7 @@ static int i810fb_resume(struct pci_dev *dev)
* AGP resource allocation * * AGP resource allocation *
***********************************************************************/ ***********************************************************************/
static void __init i810_fix_pointers(struct i810fb_par *par) static void __devinit i810_fix_pointers(struct i810fb_par *par)
{ {
par->fb.physical = par->aperture.physical+(par->fb.offset << 12); par->fb.physical = par->aperture.physical+(par->fb.offset << 12);
par->fb.virtual = par->aperture.virtual+(par->fb.offset << 12); par->fb.virtual = par->aperture.virtual+(par->fb.offset << 12);
...@@ -1550,7 +1550,7 @@ static void __init i810_fix_pointers(struct i810fb_par *par) ...@@ -1550,7 +1550,7 @@ static void __init i810_fix_pointers(struct i810fb_par *par)
(par->cursor_heap.offset << 12); (par->cursor_heap.offset << 12);
} }
static void __init i810_fix_offsets(struct i810fb_par *par) static void __devinit i810_fix_offsets(struct i810fb_par *par)
{ {
if (vram + 1 > par->aperture.size >> 20) if (vram + 1 > par->aperture.size >> 20)
vram = (par->aperture.size >> 20) - 1; vram = (par->aperture.size >> 20) - 1;
...@@ -1570,7 +1570,7 @@ static void __init i810_fix_offsets(struct i810fb_par *par) ...@@ -1570,7 +1570,7 @@ static void __init i810_fix_offsets(struct i810fb_par *par)
par->cursor_heap.size = 4096; par->cursor_heap.size = 4096;
} }
static int __init i810_alloc_agp_mem(struct fb_info *info) static int __devinit i810_alloc_agp_mem(struct fb_info *info)
{ {
struct i810fb_par *par = (struct i810fb_par *) info->par; struct i810fb_par *par = (struct i810fb_par *) info->par;
int size; int size;
...@@ -1635,7 +1635,7 @@ static int __init i810_alloc_agp_mem(struct fb_info *info) ...@@ -1635,7 +1635,7 @@ static int __init i810_alloc_agp_mem(struct fb_info *info)
* Sets the the user monitor's horizontal and vertical * Sets the the user monitor's horizontal and vertical
* frequency limits * frequency limits
*/ */
static void __init i810_init_monspecs(struct fb_info *info) static void __devinit i810_init_monspecs(struct fb_info *info)
{ {
if (!hsync1) if (!hsync1)
hsync1 = HFMIN; hsync1 = HFMIN;
...@@ -1663,7 +1663,7 @@ static void __init i810_init_monspecs(struct fb_info *info) ...@@ -1663,7 +1663,7 @@ static void __init i810_init_monspecs(struct fb_info *info)
* @par: pointer to i810fb_par structure * @par: pointer to i810fb_par structure
* @info: pointer to current fb_info structure * @info: pointer to current fb_info structure
*/ */
static void __init i810_init_defaults(struct i810fb_par *par, static void __devinit i810_init_defaults(struct i810fb_par *par,
struct fb_info *info) struct fb_info *info)
{ {
if (voffset) if (voffset)
...@@ -1707,7 +1707,7 @@ static void __init i810_init_defaults(struct i810fb_par *par, ...@@ -1707,7 +1707,7 @@ static void __init i810_init_defaults(struct i810fb_par *par,
* i810_init_device - initialize device * i810_init_device - initialize device
* @par: pointer to i810fb_par structure * @par: pointer to i810fb_par structure
*/ */
static void __init i810_init_device(struct i810fb_par *par) static void __devinit i810_init_device(struct i810fb_par *par)
{ {
u8 reg, *mmio = par->mmio_start_virtual; u8 reg, *mmio = par->mmio_start_virtual;
...@@ -1726,7 +1726,7 @@ static void __init i810_init_device(struct i810fb_par *par) ...@@ -1726,7 +1726,7 @@ static void __init i810_init_device(struct i810fb_par *par)
par->mem_freq = (reg) ? 133 : 100; par->mem_freq = (reg) ? 133 : 100;
} }
static int __init static int __devinit
i810_allocate_pci_resource(struct i810fb_par *par, i810_allocate_pci_resource(struct i810fb_par *par,
const struct pci_device_id *entry) const struct pci_device_id *entry)
{ {
...@@ -1831,7 +1831,7 @@ int __init i810fb_setup(char *options) ...@@ -1831,7 +1831,7 @@ int __init i810fb_setup(char *options)
return 0; return 0;
} }
static int __init i810fb_init_pci (struct pci_dev *dev, static int __devinit i810fb_init_pci (struct pci_dev *dev,
const struct pci_device_id *entry) const struct pci_device_id *entry)
{ {
struct fb_info *info; struct fb_info *info;
......
drivers/video/i810/i810_main.h
View file @ ff7e4119
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#ifndef __I810_MAIN_H__ #ifndef __I810_MAIN_H__
#define __I810_MAIN_H__ #define __I810_MAIN_H__
static int __init i810fb_init_pci (struct pci_dev *dev, static int __devinit i810fb_init_pci (struct pci_dev *dev,
const struct pci_device_id *entry); const struct pci_device_id *entry);
static void __exit i810fb_remove_pci(struct pci_dev *dev); static void __exit i810fb_remove_pci(struct pci_dev *dev);
static int i810fb_resume(struct pci_dev *dev); static int i810fb_resume(struct pci_dev *dev);
...@@ -95,7 +95,7 @@ inline void flush_cache(void) ...@@ -95,7 +95,7 @@ inline void flush_cache(void)
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR
#define KERNEL_HAS_MTRR 1 #define KERNEL_HAS_MTRR 1
static inline void __init set_mtrr(struct i810fb_par *par) static inline void __devinit set_mtrr(struct i810fb_par *par)
{ {
par->mtrr_reg = mtrr_add((u32) par->aperture.physical, par->mtrr_reg = mtrr_add((u32) par->aperture.physical,
par->aperture.size, MTRR_TYPE_WRCOMB, 1); par->aperture.size, MTRR_TYPE_WRCOMB, 1);
......
drivers/video/riva/fbdev.c
View file @ ff7e4119
...@@ -1576,7 +1576,7 @@ static struct fb_ops riva_fb_ops = { ...@@ -1576,7 +1576,7 @@ static struct fb_ops riva_fb_ops = {
.fb_sync = rivafb_sync, .fb_sync = rivafb_sync,
}; };
static int __init riva_set_fbinfo(struct fb_info *info) static int __devinit riva_set_fbinfo(struct fb_info *info)
{ {
struct riva_par *par = (struct riva_par *) info->par; struct riva_par *par = (struct riva_par *) info->par;
unsigned int cmap_len; unsigned int cmap_len;
...@@ -1726,7 +1726,7 @@ static void riva_get_dfpinfo(struct fb_info *info) ...@@ -1726,7 +1726,7 @@ static void riva_get_dfpinfo(struct fb_info *info)
* *
* ------------------------------------------------------------------------- */ * ------------------------------------------------------------------------- */
static int __init rivafb_probe(struct pci_dev *pd, static int __devinit rivafb_probe(struct pci_dev *pd,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct riva_chip_info *rci = &riva_chip_info[ent->driver_data]; struct riva_chip_info *rci = &riva_chip_info[ent->driver_data];
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7