iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bnx2: 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>
Cc: Michael Chan <mchan@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bill Pemberton 2012-12-03 09:22:58 -05:00 committed by Greg Kroah-Hartman
parent 2397188710
commit cfd95a634f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/ethernet/broadcom/bnx2.c
View File

@ -71,7 +71,7 @@
/* Time in jiffies before concluding the transmitter is hung. */
#define TX_TIMEOUT (5*HZ)
static char version[] __devinitdata =
static char version[] =
"Broadcom NetXtreme II Gigabit Ethernet Driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>");
@ -106,7 +106,7 @@ typedef enum {
/* indexed by board_t, above */
static struct {
char *name;
} board_info[] __devinitdata = {
} board_info[] = {
{ "Broadcom NetXtreme II BCM5706 1000Base-T" },
{ "HP NC370T Multifunction Gigabit Server Adapter" },
{ "HP NC370i Multifunction Gigabit Server Adapter" },
@ -7896,7 +7896,7 @@ poll_bnx2(struct net_device *dev)
}
#endif
static void __devinit
static void
bnx2_get_5709_media(struct bnx2 *bp)
{
u32 val = REG_RD(bp, BNX2_MISC_DUAL_MEDIA_CTRL);
@ -7934,7 +7934,7 @@ bnx2_get_5709_media(struct bnx2 *bp)
}
}
static void __devinit
static void
bnx2_get_pci_speed(struct bnx2 *bp)
{
u32 reg;
@ -7986,7 +7986,7 @@ bnx2_get_pci_speed(struct bnx2 *bp)
}
static void __devinit
static void
bnx2_read_vpd_fw_ver(struct bnx2 *bp)
{
int rc, i, j;
@ -8054,7 +8054,7 @@ vpd_done:
kfree(data);
}
static int __devinit
static int
bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
{
struct bnx2 *bp;
@ -8439,7 +8439,7 @@ err_out:
return rc;
}
static char * __devinit
static char *
bnx2_bus_string(struct bnx2 *bp, char *str)
{
char *s = str;
@ -8505,7 +8505,7 @@ static const struct net_device_ops bnx2_netdev_ops = {
#endif
};
static int __devinit
static int
bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
{
static int version_printed = 0;
@ -8573,7 +8573,7 @@ err_free:
return rc;
}
static void __devexit
static void
bnx2_remove_one(struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
@ -8752,7 +8752,7 @@ static struct pci_driver bnx2_pci_driver = {
.name = DRV_MODULE_NAME,
.id_table = bnx2_pci_tbl,
.probe = bnx2_init_one,
.remove = __devexit_p(bnx2_remove_one),
.remove = bnx2_remove_one,
.suspend = bnx2_suspend,
.resume = bnx2_resume,
.err_handler = &bnx2_err_handler,