mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 23:27:06 +00:00
Code Issues Releases Wiki Activity

packetengines: remove __dev* attributes

Browse source 
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: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bill Pemberton 2012-12-03 09:23:23 -05:00 committed by Greg Kroah-Hartman
parent 5bc7ec702f
commit 134c1f154e
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/net/ethernet/packetengines/hamachi.c
View file

@ -166,7 +166,7 @@ static int tx_params[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
#include <asm/unaligned.h>
#include <asm/cache.h>
static const char version[] __devinitconst =
static const char version[] =
KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " Written by Donald Becker\n"
" Some modifications by Eric kasten <kasten@nscl.msu.edu>\n"
" Further modifications by Keith Underwood <keithu@parl.clemson.edu>\n";
@ -576,8 +576,8 @@ static const struct net_device_ops hamachi_netdev_ops = {
};
static int __devinit hamachi_init_one (struct pci_dev *pdev,
const struct pci_device_id *ent)
static int hamachi_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
struct hamachi_private *hmp;
int option, i, rx_int_var, tx_int_var, boguscnt;
@ -791,7 +791,7 @@ static int __devinit hamachi_init_one (struct pci_dev *pdev,
return ret;
}
static int __devinit read_eeprom(void __iomem *ioaddr, int location)
static int read_eeprom(void __iomem *ioaddr, int location)
{
int bogus_cnt = 1000;
@ -1894,7 +1894,7 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
}
static void __devexit hamachi_remove_one (struct pci_dev *pdev)
static void hamachi_remove_one(struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
@ -1923,7 +1923,7 @@ static struct pci_driver hamachi_driver = {
.name = DRV_NAME,
.id_table = hamachi_pci_tbl,
.probe = hamachi_init_one,
.remove = __devexit_p(hamachi_remove_one),
.remove = hamachi_remove_one,
};
static int __init hamachi_init (void)

10
drivers/net/ethernet/packetengines/yellowfin.c
View file

@ -106,7 +106,7 @@ static int gx_fix;
#include <asm/io.h>
/* These identify the driver base version and may not be removed. */
static const char version[] __devinitconst =
static const char version[] =
KERN_INFO DRV_NAME ".c:v1.05 1/09/2001 Written by Donald Becker <becker@scyld.com>\n"
" (unofficial 2.4.x port, " DRV_VERSION ", " DRV_RELDATE ")\n";
@ -367,7 +367,7 @@ static const struct net_device_ops netdev_ops = {
.ndo_tx_timeout = yellowfin_tx_timeout,
};
static int __devinit yellowfin_init_one(struct pci_dev *pdev,
static int yellowfin_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
struct net_device *dev;
@ -522,7 +522,7 @@ static int __devinit yellowfin_init_one(struct pci_dev *pdev,
return -ENODEV;
}
static int __devinit read_eeprom(void __iomem *ioaddr, int location)
static int read_eeprom(void __iomem *ioaddr, int location)
{
int bogus_cnt = 10000; /* Typical 33Mhz: 1050 ticks */
@ -1372,7 +1372,7 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
}
static void __devexit yellowfin_remove_one (struct pci_dev *pdev)
static void yellowfin_remove_one(struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
struct yellowfin_private *np;
@ -1399,7 +1399,7 @@ static struct pci_driver yellowfin_driver = {
.name = DRV_NAME,
.id_table = yellowfin_pci_tbl,
.probe = yellowfin_init_one,
.remove = __devexit_p(yellowfin_remove_one),
.remove = yellowfin_remove_one,
};