|
@@ -1730,7 +1730,7 @@ static void __init de21040_get_media_info(struct de_private *de)
|
|
|
}
|
|
|
|
|
|
/* Note: this routine returns extra data bits for size detection. */
|
|
|
-static unsigned __init tulip_read_eeprom(void __iomem *regs, int location, int addr_len)
|
|
|
+static unsigned __devinit tulip_read_eeprom(void __iomem *regs, int location, int addr_len)
|
|
|
{
|
|
|
int i;
|
|
|
unsigned retval = 0;
|
|
@@ -1926,7 +1926,7 @@ bad_srom:
|
|
|
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)
|
|
|
{
|
|
|
struct net_device *dev;
|
|
@@ -2082,7 +2082,7 @@ err_out_free:
|
|
|
return rc;
|
|
|
}
|
|
|
|
|
|
-static void __exit de_remove_one (struct pci_dev *pdev)
|
|
|
+static void __devexit de_remove_one (struct pci_dev *pdev)
|
|
|
{
|
|
|
struct net_device *dev = pci_get_drvdata(pdev);
|
|
|
struct de_private *de = dev->priv;
|
|
@@ -2164,7 +2164,7 @@ static struct pci_driver de_driver = {
|
|
|
.name = DRV_NAME,
|
|
|
.id_table = de_pci_tbl,
|
|
|
.probe = de_init_one,
|
|
|
- .remove = __exit_p(de_remove_one),
|
|
|
+ .remove = __devexit_p(de_remove_one),
|
|
|
#ifdef CONFIG_PM
|
|
|
.suspend = de_suspend,
|
|
|
.resume = de_resume,
|