Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@zip.com.au>2002-02-20 20:25:34 -0800
committerLinus Torvalds <torvalds@penguin.transmeta.com>2002-02-20 20:25:34 -0800
commitd46f8df66db42edc8f487f2f6ad302567d853264 (patch)
tree132791384feec0aaf1116cee809d3eaa2c02ef2c
parentbcaab0f9acb04c18817edb52720379ca3a518cf3 (diff)
[PATCH] .text.exit linkage errors
A forward-port of all the .text.exit fixes which went into 2.4. Also contains a couple of s/MINOR/minor/ changes.
-rw-r--r--drivers/atm/firestream.c6
-rw-r--r--drivers/char/mwave/mwavedd.c2
-rw-r--r--drivers/char/synclink.c4
-rw-r--r--drivers/char/wdt_pci.c4
-rw-r--r--drivers/isdn/avmb1/capi.c2
-rw-r--r--drivers/media/video/zr36120.c2
-rw-r--r--drivers/mtd/maps/elan-104nc.c2
-rw-r--r--drivers/mtd/maps/sbc_gxx.c2
-rw-r--r--drivers/net/hamachi.c4
-rw-r--r--drivers/net/rcpci45.c4
-rw-r--r--drivers/net/tokenring/abyss.c4
-rw-r--r--drivers/net/tokenring/tmspci.c4
-rw-r--r--sound/oss/cs4232.c8
-rw-r--r--sound/oss/i810_audio.c4
-rw-r--r--sound/oss/mpu401.c2
-rw-r--r--sound/oss/rme96xx.c4
-rw-r--r--sound/oss/sonicvibes.c8
-rw-r--r--sound/oss/trident.c4
-rw-r--r--sound/oss/via82cxxx_audio.c6
19 files changed, 39 insertions, 37 deletions
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 4db7ab6a36f9..8e65eda23b87 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -1530,7 +1530,7 @@ static void top_off_fp (struct fs_dev *dev, struct freepool *fp, int gfp_flags)
fs_dprintk (FS_DEBUG_QUEUE, "Added %d entries. \n", n);
}
-static void __exit free_queue (struct fs_dev *dev, struct queue *txq)
+static void __devexit free_queue (struct fs_dev *dev, struct queue *txq)
{
func_enter ();
@@ -1546,7 +1546,7 @@ static void __exit free_queue (struct fs_dev *dev, struct queue *txq)
func_exit ();
}
-static void __exit free_freepool (struct fs_dev *dev, struct freepool *fp)
+static void __devexit free_freepool (struct fs_dev *dev, struct freepool *fp)
{
func_enter ();
@@ -2088,7 +2088,7 @@ int __init init_PCI (void)
#endif
*/
-const static struct pci_device_id firestream_pci_tbl[] __devinitdata = {
+static struct pci_device_id firestream_pci_tbl[] __devinitdata = {
{ PCI_VENDOR_ID_FUJITSU_ME, PCI_DEVICE_ID_FUJITSU_FS50,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, FS_IS50},
{ PCI_VENDOR_ID_FUJITSU_ME, PCI_DEVICE_ID_FUJITSU_FS155,
diff --git a/drivers/char/mwave/mwavedd.c b/drivers/char/mwave/mwavedd.c
index e22ec9668393..b0a2caae5035 100644
--- a/drivers/char/mwave/mwavedd.c
+++ b/drivers/char/mwave/mwavedd.c
@@ -461,7 +461,7 @@ static struct miscdevice mwave_misc_dev = { MWAVE_MINOR, "mwave", &mwave_fops };
* mwave_exit is called on module unload
* mwave_exit is also used to clean up after an aborted mwave_init
*/
-static void __exit mwave_exit(void)
+static void mwave_exit(void)
{
pMWAVE_DEVICE_DATA pDrvData = &mwave_s_mdd;
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index f2afd4cf4db3..80a894193622 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -941,7 +941,7 @@ static struct pci_driver synclink_pci_driver = {
name: "synclink",
id_table: synclink_pci_tbl,
probe: synclink_init_one,
- remove: synclink_remove_one,
+ remove: __devexit_p(synclink_remove_one),
};
static struct tty_driver serial_driver, callout_driver;
@@ -8220,7 +8220,7 @@ static int __init synclink_init_one (struct pci_dev *dev,
return 0;
}
-static void __exit synclink_remove_one (struct pci_dev *dev)
+static void __devexit synclink_remove_one (struct pci_dev *dev)
{
}
diff --git a/drivers/char/wdt_pci.c b/drivers/char/wdt_pci.c
index 872a5e453ae4..9097fe935726 100644
--- a/drivers/char/wdt_pci.c
+++ b/drivers/char/wdt_pci.c
@@ -558,7 +558,7 @@ out_reg:
}
-static void __exit wdtpci_remove_one (struct pci_dev *pdev)
+static void __devexit wdtpci_remove_one (struct pci_dev *pdev)
{
/* here we assume only one device will ever have
* been picked up and registered by probe function */
@@ -583,7 +583,7 @@ static struct pci_driver wdtpci_driver = {
name: "wdt-pci",
id_table: wdtpci_pci_tbl,
probe: wdtpci_init_one,
- remove: wdtpci_remove_one,
+ remove: __devexit_p(wdtpci_remove_one),
};
diff --git a/drivers/isdn/avmb1/capi.c b/drivers/isdn/avmb1/capi.c
index e50cd7c31767..32e784ec5faf 100644
--- a/drivers/isdn/avmb1/capi.c
+++ b/drivers/isdn/avmb1/capi.c
@@ -1535,7 +1535,7 @@ static void __exit proc_exit(void)
/* -------- init function and module interface ---------------------- */
-static void __exit alloc_exit(void)
+static void alloc_exit(void)
{
if (capidev_cachep) {
(void)kmem_cache_destroy(capidev_cachep);
diff --git a/drivers/media/video/zr36120.c b/drivers/media/video/zr36120.c
index 9f76cd8d2321..6e33e94b9e6d 100644
--- a/drivers/media/video/zr36120.c
+++ b/drivers/media/video/zr36120.c
@@ -2024,7 +2024,7 @@ int __init init_zoran(int card)
}
static
-void __exit release_zoran(int max)
+void release_zoran(int max)
{
struct zoran *ztv;
int i;
diff --git a/drivers/mtd/maps/elan-104nc.c b/drivers/mtd/maps/elan-104nc.c
index eaa9d43c626e..0776fd053243 100644
--- a/drivers/mtd/maps/elan-104nc.c
+++ b/drivers/mtd/maps/elan-104nc.c
@@ -213,7 +213,7 @@ static struct map_info elan_104nc_map = {
/* MTD device for all of the flash. */
static struct mtd_info *all_mtd;
-static void __exit cleanup_elan_104nc(void)
+static void cleanup_elan_104nc(void)
{
if( all_mtd ) {
del_mtd_partitions( all_mtd );
diff --git a/drivers/mtd/maps/sbc_gxx.c b/drivers/mtd/maps/sbc_gxx.c
index e5915c8433e0..2ea82481099e 100644
--- a/drivers/mtd/maps/sbc_gxx.c
+++ b/drivers/mtd/maps/sbc_gxx.c
@@ -221,7 +221,7 @@ static struct map_info sbc_gxx_map = {
/* MTD device for all of the flash. */
static struct mtd_info *all_mtd;
-static void __exit cleanup_sbc_gxx(void)
+static void cleanup_sbc_gxx(void)
{
if( all_mtd ) {
del_mtd_partitions( all_mtd );
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index 45c3021f8673..6dd6f95daef1 100644
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -1978,7 +1978,7 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
}
-static void __exit hamachi_remove_one (struct pci_dev *pdev)
+static void __devexit hamachi_remove_one (struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
@@ -2008,7 +2008,7 @@ static struct pci_driver hamachi_driver = {
name: DRV_NAME,
id_table: hamachi_pci_tbl,
probe: hamachi_init_one,
- remove: hamachi_remove_one,
+ remove: __devexit_p(hamachi_remove_one),
};
static int __init hamachi_init (void)
diff --git a/drivers/net/rcpci45.c b/drivers/net/rcpci45.c
index f0a8fedaf8ba..87d34f4e86ac 100644
--- a/drivers/net/rcpci45.c
+++ b/drivers/net/rcpci45.c
@@ -115,7 +115,7 @@ static struct pci_device_id rcpci45_pci_table[] __devinitdata = {
MODULE_DEVICE_TABLE (pci, rcpci45_pci_table);
MODULE_LICENSE("GPL");
-static void __exit
+static void __devexit
rcpci45_remove_one (struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata (pdev);
@@ -267,7 +267,7 @@ static struct pci_driver rcpci45_driver = {
name: "rcpci45",
id_table: rcpci45_pci_table,
probe: rcpci45_init_one,
- remove: rcpci45_remove_one,
+ remove: __devexit_p(rcpci45_remove_one),
};
static int __init
diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
index bafb344b2fe2..8b9a003a5786 100644
--- a/drivers/net/tokenring/abyss.c
+++ b/drivers/net/tokenring/abyss.c
@@ -433,7 +433,7 @@ static int abyss_close(struct net_device *dev)
return 0;
}
-static void __exit abyss_detach (struct pci_dev *pdev)
+static void __devexit abyss_detach (struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
@@ -451,7 +451,7 @@ static struct pci_driver abyss_driver = {
name: "abyss",
id_table: abyss_pci_tbl,
probe: abyss_attach,
- remove: abyss_detach,
+ remove: __devexit_p(abyss_detach),
};
static int __init abyss_init (void)
diff --git a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c
index b361b223ca0e..deca3a49caae 100644
--- a/drivers/net/tokenring/tmspci.c
+++ b/drivers/net/tokenring/tmspci.c
@@ -220,7 +220,7 @@ static unsigned short tms_pci_setnselout_pins(struct net_device *dev)
return val;
}
-static void __exit tms_pci_detach (struct pci_dev *pdev)
+static void __devexit tms_pci_detach (struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
@@ -238,7 +238,7 @@ static struct pci_driver tms_pci_driver = {
name: "tmspci",
id_table: tmspci_pci_tbl,
probe: tms_pci_attach,
- remove: tms_pci_detach,
+ remove: __devexit_p(tms_pci_detach),
};
static int __init tms_pci_init (void)
diff --git a/sound/oss/cs4232.c b/sound/oss/cs4232.c
index 15bd72c404e7..375d5382e4c2 100644
--- a/sound/oss/cs4232.c
+++ b/sound/oss/cs4232.c
@@ -277,7 +277,7 @@ void __init attach_cs4232(struct address_info *hw_config)
}
}
-void __exit unload_cs4232(struct address_info *hw_config)
+static void __exit unload_cs4232(struct address_info *hw_config)
{
int base = hw_config->io_base, irq = hw_config->irq;
int dma1 = hw_config->dma, dma2 = hw_config->dma2;
@@ -460,10 +460,12 @@ static int __init init_cs4232(void)
return 0;
}
-int cs4232_isapnp_remove(struct pci_dev *dev, const struct isapnp_device_id *id)
+static int __exit cs4232_isapnp_remove(struct pci_dev *dev,
+ const struct isapnp_device_id *id)
{
struct address_info *cfg = (struct address_info*)pci_get_drvdata(dev);
- if (cfg) unload_cs4232(cfg);
+ if (cfg)
+ unload_cs4232(cfg);
pci_set_drvdata(dev,NULL);
dev->deactivate(dev);
return 0;
diff --git a/sound/oss/i810_audio.c b/sound/oss/i810_audio.c
index d3d396b7e3bb..a1656d32f360 100644
--- a/sound/oss/i810_audio.c
+++ b/sound/oss/i810_audio.c
@@ -2958,7 +2958,7 @@ static int __init i810_probe(struct pci_dev *pci_dev, const struct pci_device_id
return -ENODEV;
}
-static void __exit i810_remove(struct pci_dev *pci_dev)
+static void __devexit i810_remove(struct pci_dev *pci_dev)
{
int i;
struct i810_card *card = pci_get_drvdata(pci_dev);
@@ -3118,7 +3118,7 @@ static struct pci_driver i810_pci_driver = {
name: I810_MODULE_NAME,
id_table: i810_pci_tbl,
probe: i810_probe,
- remove: i810_remove,
+ remove: __devexit_p(i810_remove),
#ifdef CONFIG_PM
suspend: i810_pm_suspend,
resume: i810_pm_resume,
diff --git a/sound/oss/mpu401.c b/sound/oss/mpu401.c
index f3a006162fe0..01d7c489c252 100644
--- a/sound/oss/mpu401.c
+++ b/sound/oss/mpu401.c
@@ -1227,7 +1227,7 @@ int probe_mpu401(struct address_info *hw_config)
return ok;
}
-void __exit unload_mpu401(struct address_info *hw_config)
+void unload_mpu401(struct address_info *hw_config)
{
void *p;
int n=hw_config->slots[1];
diff --git a/sound/oss/rme96xx.c b/sound/oss/rme96xx.c
index 51ba5697d4ab..95aebe7f056b 100644
--- a/sound/oss/rme96xx.c
+++ b/sound/oss/rme96xx.c
@@ -1162,7 +1162,7 @@ static int rme96xx_ioctl(struct inode *in, struct file *file,
static int rme96xx_open(struct inode *in, struct file *f)
{
- int minor = MINOR(in->i_rdev);
+ int minor = minor(in->i_rdev);
struct list_head *list;
int devnum = ((minor-3)/16) % devices; /* default = 0 */
rme96xx_info *s;
@@ -1490,7 +1490,7 @@ static struct file_operations rme96xx_audio_fops = {
static int rme96xx_mixer_open(struct inode *inode, struct file *file)
{
- int minor = MINOR(inode->i_rdev);
+ int minor = minor(inode->i_rdev);
struct list_head *list;
rme96xx_info *s;
diff --git a/sound/oss/sonicvibes.c b/sound/oss/sonicvibes.c
index f2784bf1f219..79410bb19555 100644
--- a/sound/oss/sonicvibes.c
+++ b/sound/oss/sonicvibes.c
@@ -1235,7 +1235,7 @@ static int mixer_ioctl(struct sv_state *s, unsigned int cmd, unsigned long arg)
static int sv_open_mixdev(struct inode *inode, struct file *file)
{
- int minor = MINOR(inode->i_rdev);
+ int minor = minor(inode->i_rdev);
struct list_head *list;
struct sv_state *s;
@@ -1893,7 +1893,7 @@ static int sv_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un
static int sv_open(struct inode *inode, struct file *file)
{
- int minor = MINOR(inode->i_rdev);
+ int minor = minor(inode->i_rdev);
DECLARE_WAITQUEUE(wait, current);
unsigned char fmtm = ~0, fmts = 0;
struct list_head *list;
@@ -2142,7 +2142,7 @@ static unsigned int sv_midi_poll(struct file *file, struct poll_table_struct *wa
static int sv_midi_open(struct inode *inode, struct file *file)
{
- int minor = MINOR(inode->i_rdev);
+ int minor = minor(inode->i_rdev);
DECLARE_WAITQUEUE(wait, current);
unsigned long flags;
struct list_head *list;
@@ -2364,7 +2364,7 @@ static int sv_dmfm_ioctl(struct inode *inode, struct file *file, unsigned int cm
static int sv_dmfm_open(struct inode *inode, struct file *file)
{
- int minor = MINOR(inode->i_rdev);
+ int minor = minor(inode->i_rdev);
DECLARE_WAITQUEUE(wait, current);
struct list_head *list;
struct sv_state *s;
diff --git a/sound/oss/trident.c b/sound/oss/trident.c
index a400ac7e5cc6..c85f230f31c9 100644
--- a/sound/oss/trident.c
+++ b/sound/oss/trident.c
@@ -4149,7 +4149,7 @@ out_release_region:
goto out;
}
-static void __exit trident_remove(struct pci_dev *pci_dev)
+static void __devexit trident_remove(struct pci_dev *pci_dev)
{
int i;
struct trident_card *card = pci_get_drvdata(pci_dev);
@@ -4202,7 +4202,7 @@ static struct pci_driver trident_pci_driver = {
name: TRIDENT_MODULE_NAME,
id_table: trident_pci_tbl,
probe: trident_probe,
- remove: trident_remove,
+ remove: __devexit_p(trident_remove),
suspend: trident_suspend,
resume: trident_resume
};
diff --git a/sound/oss/via82cxxx_audio.c b/sound/oss/via82cxxx_audio.c
index 510ff867a182..f49f2ca18c7f 100644
--- a/sound/oss/via82cxxx_audio.c
+++ b/sound/oss/via82cxxx_audio.c
@@ -311,7 +311,7 @@ static unsigned via_num_cards = 0;
*/
static int via_init_one (struct pci_dev *dev, const struct pci_device_id *id);
-static void via_remove_one (struct pci_dev *pdev);
+static void __devexit via_remove_one (struct pci_dev *pdev);
static ssize_t via_dsp_read(struct file *file, char *buffer, size_t count, loff_t *ppos);
static ssize_t via_dsp_write(struct file *file, const char *buffer, size_t count, loff_t *ppos);
@@ -365,7 +365,7 @@ static struct pci_driver via_driver = {
name: VIA_MODULE_NAME,
id_table: via_pci_tbl,
probe: via_init_one,
- remove: via_remove_one,
+ remove: __devexit_p(via_remove_one),
};
@@ -3271,7 +3271,7 @@ err_out:
}
-static void __exit via_remove_one (struct pci_dev *pdev)
+static void __devexit via_remove_one (struct pci_dev *pdev)
{
struct via_info *card;