leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tg3: 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: Matt Carlson <mcarlson@broadcom.com>
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:59 -05:00 committed by Greg Kroah-Hartman
parent cfd95a634f
commit 229b1ad1cb
1 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
drivers/net/ethernet/broadcom/tg3.c
View File

@ -211,7 +211,7 @@ static inline void _tg3_flag_clear(enum TG3_FLAGS flag, unsigned long *bits)
#define FIRMWARE_TG3TSO "tigon/tg3_tso.bin" #define FIRMWARE_TG3TSO "tigon/tg3_tso.bin"
#define FIRMWARE_TG3TSO5 "tigon/tg3_tso5.bin" #define FIRMWARE_TG3TSO5 "tigon/tg3_tso5.bin"
static char version[] __devinitdata = static char version[] =
DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")"; DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")";
MODULE_AUTHOR("David S. Miller (davem@redhat.com) and Jeff Garzik (jgarzik@pobox.com)"); MODULE_AUTHOR("David S. Miller (davem@redhat.com) and Jeff Garzik (jgarzik@pobox.com)");
@ -9938,7 +9938,7 @@ restart_timer:
add_timer(&tp->timer); add_timer(&tp->timer);
} }
static void __devinit tg3_timer_init(struct tg3 *tp) static void tg3_timer_init(struct tg3 *tp)
{ {
if (tg3_flag(tp, TAGGED_STATUS) && if (tg3_flag(tp, TAGGED_STATUS) &&
GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5717 && GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5717 &&
@ -12829,7 +12829,7 @@ static const struct net_device_ops tg3_netdev_ops = {
#endif #endif
}; };
static void __devinit tg3_get_eeprom_size(struct tg3 *tp) static void tg3_get_eeprom_size(struct tg3 *tp)
{ {
u32 cursize, val, magic; u32 cursize, val, magic;
@ -12863,7 +12863,7 @@ static void __devinit tg3_get_eeprom_size(struct tg3 *tp)
tp->nvram_size = cursize; tp->nvram_size = cursize;
} }
static void __devinit tg3_get_nvram_size(struct tg3 *tp) static void tg3_get_nvram_size(struct tg3 *tp)
{ {
u32 val; u32 val;
@ -12896,7 +12896,7 @@ static void __devinit tg3_get_nvram_size(struct tg3 *tp)
tp->nvram_size = TG3_NVRAM_SIZE_512KB; tp->nvram_size = TG3_NVRAM_SIZE_512KB;
} }
static void __devinit tg3_get_nvram_info(struct tg3 *tp) static void tg3_get_nvram_info(struct tg3 *tp)
{ {
u32 nvcfg1; u32 nvcfg1;
@ -12947,7 +12947,7 @@ static void __devinit tg3_get_nvram_info(struct tg3 *tp)
} }
} }
static void __devinit tg3_nvram_get_pagesize(struct tg3 *tp, u32 nvmcfg1) static void tg3_nvram_get_pagesize(struct tg3 *tp, u32 nvmcfg1)
{ {
switch (nvmcfg1 & NVRAM_CFG1_5752PAGE_SIZE_MASK) { switch (nvmcfg1 & NVRAM_CFG1_5752PAGE_SIZE_MASK) {
case FLASH_5752PAGE_SIZE_256: case FLASH_5752PAGE_SIZE_256:
@ -12974,7 +12974,7 @@ static void __devinit tg3_nvram_get_pagesize(struct tg3 *tp, u32 nvmcfg1)
} }
} }
static void __devinit tg3_get_5752_nvram_info(struct tg3 *tp) static void tg3_get_5752_nvram_info(struct tg3 *tp)
{ {
u32 nvcfg1; u32 nvcfg1;
@ -13015,7 +13015,7 @@ static void __devinit tg3_get_5752_nvram_info(struct tg3 *tp)
} }
} }
static void __devinit tg3_get_5755_nvram_info(struct tg3 *tp) static void tg3_get_5755_nvram_info(struct tg3 *tp)
{ {
u32 nvcfg1, protect = 0; u32 nvcfg1, protect = 0;
@ -13071,7 +13071,7 @@ static void __devinit tg3_get_5755_nvram_info(struct tg3 *tp)
} }
} }
static void __devinit tg3_get_5787_nvram_info(struct tg3 *tp) static void tg3_get_5787_nvram_info(struct tg3 *tp)
{ {
u32 nvcfg1; u32 nvcfg1;
@ -13109,7 +13109,7 @@ static void __devinit tg3_get_5787_nvram_info(struct tg3 *tp)
} }
} }
static void __devinit tg3_get_5761_nvram_info(struct tg3 *tp) static void tg3_get_5761_nvram_info(struct tg3 *tp)
{ {
u32 nvcfg1, protect = 0; u32 nvcfg1, protect = 0;
@ -13184,14 +13184,14 @@ static void __devinit tg3_get_5761_nvram_info(struct tg3 *tp)
} }
} }
static void __devinit tg3_get_5906_nvram_info(struct tg3 *tp) static void tg3_get_5906_nvram_info(struct tg3 *tp)
{ {
tp->nvram_jedecnum = JEDEC_ATMEL; tp->nvram_jedecnum = JEDEC_ATMEL;
tg3_flag_set(tp, NVRAM_BUFFERED); tg3_flag_set(tp, NVRAM_BUFFERED);
tp->nvram_pagesize = ATMEL_AT24C512_CHIP_SIZE; tp->nvram_pagesize = ATMEL_AT24C512_CHIP_SIZE;
} }
static void __devinit tg3_get_57780_nvram_info(struct tg3 *tp) static void tg3_get_57780_nvram_info(struct tg3 *tp)
{ {
u32 nvcfg1; u32 nvcfg1;
@ -13264,7 +13264,7 @@ static void __devinit tg3_get_57780_nvram_info(struct tg3 *tp)
} }
static void __devinit tg3_get_5717_nvram_info(struct tg3 *tp) static void tg3_get_5717_nvram_info(struct tg3 *tp)
{ {
u32 nvcfg1; u32 nvcfg1;
@ -13342,7 +13342,7 @@ static void __devinit tg3_get_5717_nvram_info(struct tg3 *tp)
tg3_flag_set(tp, NO_NVRAM_ADDR_TRANS); tg3_flag_set(tp, NO_NVRAM_ADDR_TRANS);
} }
static void __devinit tg3_get_5720_nvram_info(struct tg3 *tp) static void tg3_get_5720_nvram_info(struct tg3 *tp)
{ {
u32 nvcfg1, nvmpinstrp; u32 nvcfg1, nvmpinstrp;
@ -13455,7 +13455,7 @@ static void __devinit tg3_get_5720_nvram_info(struct tg3 *tp)
} }
/* Chips other than 5700/5701 use the NVRAM for fetching info. */ /* Chips other than 5700/5701 use the NVRAM for fetching info. */
static void __devinit tg3_nvram_init(struct tg3 *tp) static void tg3_nvram_init(struct tg3 *tp)
{ {
tw32_f(GRC_EEPROM_ADDR, tw32_f(GRC_EEPROM_ADDR,
(EEPROM_ADDR_FSM_RESET | (EEPROM_ADDR_FSM_RESET |
@ -13525,7 +13525,7 @@ struct subsys_tbl_ent {
u32 phy_id; u32 phy_id;
}; };
static struct subsys_tbl_ent subsys_id_to_phy_id[] __devinitdata = { static struct subsys_tbl_ent subsys_id_to_phy_id[] = {
/* Broadcom boards. */ /* Broadcom boards. */
{ TG3PCI_SUBVENDOR_ID_BROADCOM, { TG3PCI_SUBVENDOR_ID_BROADCOM,
TG3PCI_SUBDEVICE_ID_BROADCOM_95700A6, TG3_PHY_ID_BCM5401 }, TG3PCI_SUBDEVICE_ID_BROADCOM_95700A6, TG3_PHY_ID_BCM5401 },
@ -13589,7 +13589,7 @@ static struct subsys_tbl_ent subsys_id_to_phy_id[] __devinitdata = {
TG3PCI_SUBDEVICE_ID_IBM_5703SAX2, 0 } TG3PCI_SUBDEVICE_ID_IBM_5703SAX2, 0 }
}; };
static struct subsys_tbl_ent * __devinit tg3_lookup_by_subsys(struct tg3 *tp) static struct subsys_tbl_ent *tg3_lookup_by_subsys(struct tg3 *tp)
{ {
int i; int i;
@ -13603,7 +13603,7 @@ static struct subsys_tbl_ent * __devinit tg3_lookup_by_subsys(struct tg3 *tp)
return NULL; return NULL;
} }
static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp) static void tg3_get_eeprom_hw_cfg(struct tg3 *tp)
{ {
u32 val; u32 val;
@ -13803,7 +13803,7 @@ done:
device_set_wakeup_capable(&tp->pdev->dev, false); device_set_wakeup_capable(&tp->pdev->dev, false);
} }
static int __devinit tg3_issue_otp_command(struct tg3 *tp, u32 cmd) static int tg3_issue_otp_command(struct tg3 *tp, u32 cmd)
{ {
int i; int i;
u32 val; u32 val;
@ -13826,7 +13826,7 @@ static int __devinit tg3_issue_otp_command(struct tg3 *tp, u32 cmd)
* configuration is a 32-bit value that straddles the alignment boundary. * configuration is a 32-bit value that straddles the alignment boundary.
* We do two 32-bit reads and then shift and merge the results. * We do two 32-bit reads and then shift and merge the results.
*/ */
static u32 __devinit tg3_read_otp_phycfg(struct tg3 *tp) static u32 tg3_read_otp_phycfg(struct tg3 *tp)
{ {
u32 bhalf_otp, thalf_otp; u32 bhalf_otp, thalf_otp;
@ -13852,7 +13852,7 @@ static u32 __devinit tg3_read_otp_phycfg(struct tg3 *tp)
return ((thalf_otp & 0x0000ffff) << 16) | (bhalf_otp >> 16); return ((thalf_otp & 0x0000ffff) << 16) | (bhalf_otp >> 16);
} }
static void __devinit tg3_phy_init_link_config(struct tg3 *tp) static void tg3_phy_init_link_config(struct tg3 *tp)
{ {
u32 adv = ADVERTISED_Autoneg; u32 adv = ADVERTISED_Autoneg;
@ -13879,7 +13879,7 @@ static void __devinit tg3_phy_init_link_config(struct tg3 *tp)
tp->old_link = -1; tp->old_link = -1;
} }
static int __devinit tg3_phy_probe(struct tg3 *tp) static int tg3_phy_probe(struct tg3 *tp)
{ {
u32 hw_phy_id_1, hw_phy_id_2; u32 hw_phy_id_1, hw_phy_id_2;
u32 hw_phy_id, hw_phy_id_masked; u32 hw_phy_id, hw_phy_id_masked;
@ -14007,7 +14007,7 @@ skip_phy_reset:
return err; return err;
} }
static void __devinit tg3_read_vpd(struct tg3 *tp) static void tg3_read_vpd(struct tg3 *tp)
{ {
u8 *vpd_data; u8 *vpd_data;
unsigned int block_end, rosize, len; unsigned int block_end, rosize, len;
@ -14128,7 +14128,7 @@ nomatch:
} }
} }
static int __devinit tg3_fw_img_is_valid(struct tg3 *tp, u32 offset) static int tg3_fw_img_is_valid(struct tg3 *tp, u32 offset)
{ {
u32 val; u32 val;
@ -14141,7 +14141,7 @@ static int __devinit tg3_fw_img_is_valid(struct tg3 *tp, u32 offset)
return 1; return 1;
} }
static void __devinit tg3_read_bc_ver(struct tg3 *tp) static void tg3_read_bc_ver(struct tg3 *tp)
{ {
u32 val, offset, start, ver_offset; u32 val, offset, start, ver_offset;
int i, dst_off; int i, dst_off;
@ -14193,7 +14193,7 @@ static void __devinit tg3_read_bc_ver(struct tg3 *tp)
} }
} }
static void __devinit tg3_read_hwsb_ver(struct tg3 *tp) static void tg3_read_hwsb_ver(struct tg3 *tp)
{ {
u32 val, major, minor; u32 val, major, minor;
@ -14209,7 +14209,7 @@ static void __devinit tg3_read_hwsb_ver(struct tg3 *tp)
snprintf(&tp->fw_ver[0], 32, "sb v%d.%02d", major, minor); snprintf(&tp->fw_ver[0], 32, "sb v%d.%02d", major, minor);
} }
static void __devinit tg3_read_sb_ver(struct tg3 *tp, u32 val) static void tg3_read_sb_ver(struct tg3 *tp, u32 val)
{ {
u32 offset, major, minor, build; u32 offset, major, minor, build;
@ -14264,7 +14264,7 @@ static void __devinit tg3_read_sb_ver(struct tg3 *tp, u32 val)
} }
} }
static void __devinit tg3_read_mgmtfw_ver(struct tg3 *tp) static void tg3_read_mgmtfw_ver(struct tg3 *tp)
{ {
u32 val, offset, start; u32 val, offset, start;
int i, vlen; int i, vlen;
@ -14316,7 +14316,7 @@ static void __devinit tg3_read_mgmtfw_ver(struct tg3 *tp)
} }
} }
static void __devinit tg3_probe_ncsi(struct tg3 *tp) static void tg3_probe_ncsi(struct tg3 *tp)
{ {
u32 apedata; u32 apedata;
@ -14332,7 +14332,7 @@ static void __devinit tg3_probe_ncsi(struct tg3 *tp)
tg3_flag_set(tp, APE_HAS_NCSI); tg3_flag_set(tp, APE_HAS_NCSI);
} }
static void __devinit tg3_read_dash_ver(struct tg3 *tp) static void tg3_read_dash_ver(struct tg3 *tp)
{ {
int vlen; int vlen;
u32 apedata; u32 apedata;
@ -14355,7 +14355,7 @@ static void __devinit tg3_read_dash_ver(struct tg3 *tp)
(apedata & APE_FW_VERSION_BLDMSK)); (apedata & APE_FW_VERSION_BLDMSK));
} }
static void __devinit tg3_read_fw_ver(struct tg3 *tp) static void tg3_read_fw_ver(struct tg3 *tp)
{ {
u32 val; u32 val;
bool vpd_vers = false; bool vpd_vers = false;
@ -14408,7 +14408,7 @@ static DEFINE_PCI_DEVICE_TABLE(tg3_write_reorder_chipsets) = {
{ }, { },
}; };
static struct pci_dev * __devinit tg3_find_peer(struct tg3 *tp) static struct pci_dev *tg3_find_peer(struct tg3 *tp)
{ {
struct pci_dev *peer; struct pci_dev *peer;
unsigned int func, devnr = tp->pdev->devfn & ~7; unsigned int func, devnr = tp->pdev->devfn & ~7;
@ -14436,7 +14436,7 @@ static struct pci_dev * __devinit tg3_find_peer(struct tg3 *tp)
return peer; return peer;
} }
static void __devinit tg3_detect_asic_rev(struct tg3 *tp, u32 misc_ctrl_reg) static void tg3_detect_asic_rev(struct tg3 *tp, u32 misc_ctrl_reg)
{ {
tp->pci_chip_rev_id = misc_ctrl_reg >> MISC_HOST_CTRL_CHIPREV_SHIFT; tp->pci_chip_rev_id = misc_ctrl_reg >> MISC_HOST_CTRL_CHIPREV_SHIFT;
if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_USE_PROD_ID_REG) { if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_USE_PROD_ID_REG) {
@ -14539,7 +14539,7 @@ static bool tg3_10_100_only_device(struct tg3 *tp,
return false; return false;
} }
static int __devinit tg3_get_invariants(struct tg3 *tp, static int tg3_get_invariants(struct tg3 *tp,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
u32 misc_ctrl_reg; u32 misc_ctrl_reg;
@ -15299,7 +15299,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp,
} }
#ifdef CONFIG_SPARC #ifdef CONFIG_SPARC
static int __devinit tg3_get_macaddr_sparc(struct tg3 *tp) static int tg3_get_macaddr_sparc(struct tg3 *tp)
{ {
struct net_device *dev = tp->dev; struct net_device *dev = tp->dev;
struct pci_dev *pdev = tp->pdev; struct pci_dev *pdev = tp->pdev;
@ -15316,7 +15316,7 @@ static int __devinit tg3_get_macaddr_sparc(struct tg3 *tp)
return -ENODEV; return -ENODEV;
} }
static int __devinit tg3_get_default_macaddr_sparc(struct tg3 *tp) static int tg3_get_default_macaddr_sparc(struct tg3 *tp)
{ {
struct net_device *dev = tp->dev; struct net_device *dev = tp->dev;
@ -15326,7 +15326,7 @@ static int __devinit tg3_get_default_macaddr_sparc(struct tg3 *tp)
} }
#endif #endif
static int __devinit tg3_get_device_address(struct tg3 *tp) static int tg3_get_device_address(struct tg3 *tp)
{ {
struct net_device *dev = tp->dev; struct net_device *dev = tp->dev;
u32 hi, lo, mac_offset; u32 hi, lo, mac_offset;
@ -15405,7 +15405,7 @@ static int __devinit tg3_get_device_address(struct tg3 *tp)
#define BOUNDARY_SINGLE_CACHELINE 1 #define BOUNDARY_SINGLE_CACHELINE 1
#define BOUNDARY_MULTI_CACHELINE 2 #define BOUNDARY_MULTI_CACHELINE 2
static u32 __devinit tg3_calc_dma_bndry(struct tg3 *tp, u32 val) static u32 tg3_calc_dma_bndry(struct tg3 *tp, u32 val)
{ {
int cacheline_size; int cacheline_size;
u8 byte; u8 byte;
@ -15546,7 +15546,8 @@ out:
return val; return val;
} }
static int __devinit tg3_do_test_dma(struct tg3 *tp, u32 *buf, dma_addr_t buf_dma, int size, int to_device) static int tg3_do_test_dma(struct tg3 *tp, u32 *buf, dma_addr_t buf_dma,
int size, int to_device)
{ {
struct tg3_internal_buffer_desc test_desc; struct tg3_internal_buffer_desc test_desc;
u32 sram_dma_descs; u32 sram_dma_descs;
@ -15633,7 +15634,7 @@ static DEFINE_PCI_DEVICE_TABLE(tg3_dma_wait_state_chipsets) = {
{ }, { },
}; };
static int __devinit tg3_test_dma(struct tg3 *tp) static int tg3_test_dma(struct tg3 *tp)
{ {
dma_addr_t buf_dma; dma_addr_t buf_dma;
u32 *buf, saved_dma_rwctrl; u32 *buf, saved_dma_rwctrl;
@ -15823,7 +15824,7 @@ out_nofree:
return ret; return ret;
} }
static void __devinit tg3_init_bufmgr_config(struct tg3 *tp) static void tg3_init_bufmgr_config(struct tg3 *tp)
{ {
if (tg3_flag(tp, 57765_PLUS)) { if (tg3_flag(tp, 57765_PLUS)) {
tp->bufmgr_config.mbuf_read_dma_low_water = tp->bufmgr_config.mbuf_read_dma_low_water =
@ -15879,7 +15880,7 @@ static void __devinit tg3_init_bufmgr_config(struct tg3 *tp)
tp->bufmgr_config.dma_high_water = DEFAULT_DMA_HIGH_WATER; tp->bufmgr_config.dma_high_water = DEFAULT_DMA_HIGH_WATER;
} }
static char * __devinit tg3_phy_string(struct tg3 *tp) static char *tg3_phy_string(struct tg3 *tp)
{ {
switch (tp->phy_id & TG3_PHY_ID_MASK) { switch (tp->phy_id & TG3_PHY_ID_MASK) {
case TG3_PHY_ID_BCM5400: return "5400"; case TG3_PHY_ID_BCM5400: return "5400";
@ -15910,7 +15911,7 @@ static char * __devinit tg3_phy_string(struct tg3 *tp)
} }
} }
static char * __devinit tg3_bus_string(struct tg3 *tp, char *str) static char *tg3_bus_string(struct tg3 *tp, char *str)
{ {
if (tg3_flag(tp, PCI_EXPRESS)) { if (tg3_flag(tp, PCI_EXPRESS)) {
strcpy(str, "PCI Express"); strcpy(str, "PCI Express");
@ -15946,7 +15947,7 @@ static char * __devinit tg3_bus_string(struct tg3 *tp, char *str)
return str; return str;
} }
static void __devinit tg3_init_coal(struct tg3 *tp) static void tg3_init_coal(struct tg3 *tp)
{ {
struct ethtool_coalesce *ec = &tp->coal; struct ethtool_coalesce *ec = &tp->coal;
@ -15977,7 +15978,7 @@ static void __devinit tg3_init_coal(struct tg3 *tp)
} }
} }
static int __devinit tg3_init_one(struct pci_dev *pdev, static int tg3_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;
@ -16357,7 +16358,7 @@ err_out_disable_pdev:
return err; return err;
} }
static void __devexit tg3_remove_one(struct pci_dev *pdev) static void tg3_remove_one(struct pci_dev *pdev)
{ {
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = pci_get_drvdata(pdev);
@ -16626,7 +16627,7 @@ static struct pci_driver tg3_driver = {
.name = DRV_MODULE_NAME, .name = DRV_MODULE_NAME,
.id_table = tg3_pci_tbl, .id_table = tg3_pci_tbl,
.probe = tg3_init_one, .probe = tg3_init_one,
.remove = __devexit_p(tg3_remove_one), .remove = tg3_remove_one,
.err_handler = &tg3_err_handler, .err_handler = &tg3_err_handler,
.driver.pm = TG3_PM_OPS, .driver.pm = TG3_PM_OPS,
}; };