Commit 76e239e1 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

via-rhine: remove __dev* attributes

CONFIG_HOTPLUG is going away as an option.  As result the __dev*
markings will be going away.

Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.
Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Roger Luethi <rl@hellgate.ch>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b38d1306
...@@ -113,7 +113,7 @@ static const int multicast_filter_limit = 32; ...@@ -113,7 +113,7 @@ static const int multicast_filter_limit = 32;
#include <linux/dmi.h> #include <linux/dmi.h>
/* These identify the driver base version and may not be removed. */ /* These identify the driver base version and may not be removed. */
static const char version[] __devinitconst = static const char version[] =
"v1.10-LK" DRV_VERSION " " DRV_RELDATE " Written by Donald Becker"; "v1.10-LK" DRV_VERSION " " DRV_RELDATE " Written by Donald Becker";
/* This driver was written to use PCI memory space. Some early versions /* This driver was written to use PCI memory space. Some early versions
...@@ -657,7 +657,7 @@ static void enable_mmio(long pioaddr, u32 quirks) ...@@ -657,7 +657,7 @@ static void enable_mmio(long pioaddr, u32 quirks)
* Loads bytes 0x00-0x05, 0x6E-0x6F, 0x78-0x7B from EEPROM * Loads bytes 0x00-0x05, 0x6E-0x6F, 0x78-0x7B from EEPROM
* (plus 0x6C for Rhine-I/II) * (plus 0x6C for Rhine-I/II)
*/ */
static void __devinit rhine_reload_eeprom(long pioaddr, struct net_device *dev) static void rhine_reload_eeprom(long pioaddr, struct net_device *dev)
{ {
struct rhine_private *rp = netdev_priv(dev); struct rhine_private *rp = netdev_priv(dev);
void __iomem *ioaddr = rp->base; void __iomem *ioaddr = rp->base;
...@@ -823,7 +823,7 @@ static int rhine_napipoll(struct napi_struct *napi, int budget) ...@@ -823,7 +823,7 @@ static int rhine_napipoll(struct napi_struct *napi, int budget)
return work_done; return work_done;
} }
static void __devinit rhine_hw_init(struct net_device *dev, long pioaddr) static void rhine_hw_init(struct net_device *dev, long pioaddr)
{ {
struct rhine_private *rp = netdev_priv(dev); struct rhine_private *rp = netdev_priv(dev);
...@@ -856,7 +856,7 @@ static const struct net_device_ops rhine_netdev_ops = { ...@@ -856,7 +856,7 @@ static const struct net_device_ops rhine_netdev_ops = {
#endif #endif
}; };
static int __devinit rhine_init_one(struct pci_dev *pdev, static int rhine_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;
...@@ -2232,7 +2232,7 @@ static int rhine_close(struct net_device *dev) ...@@ -2232,7 +2232,7 @@ static int rhine_close(struct net_device *dev)
} }
static void __devexit rhine_remove_one(struct pci_dev *pdev) static void rhine_remove_one(struct pci_dev *pdev)
{ {
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = pci_get_drvdata(pdev);
struct rhine_private *rp = netdev_priv(dev); struct rhine_private *rp = netdev_priv(dev);
...@@ -2359,7 +2359,7 @@ static struct pci_driver rhine_driver = { ...@@ -2359,7 +2359,7 @@ static struct pci_driver rhine_driver = {
.name = DRV_NAME, .name = DRV_NAME,
.id_table = rhine_pci_tbl, .id_table = rhine_pci_tbl,
.probe = rhine_init_one, .probe = rhine_init_one,
.remove = __devexit_p(rhine_remove_one), .remove = rhine_remove_one,
.shutdown = rhine_shutdown, .shutdown = rhine_shutdown,
.driver.pm = RHINE_PM_OPS, .driver.pm = RHINE_PM_OPS,
}; };
......
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