OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cxgb4: 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: Bill Pemberton <wfp5p@virginia.edu>
Cc: Dimitris Michailidis <dm@chelsio.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bill Pemberton 2012-12-03 09:23:02 -05:00 committed by Greg Kroah-Hartman
parent 2109eaab72
commit 9174494865
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
View File

@ -2148,7 +2148,7 @@ static const struct file_operations mem_debugfs_fops = {
.llseek = default_llseek, .llseek = default_llseek,
}; };
static void __devinit add_debugfs_mem(struct adapter *adap, const char *name, static void add_debugfs_mem(struct adapter *adap, const char *name,
unsigned int idx, unsigned int size_mb) unsigned int idx, unsigned int size_mb)
{ {
struct dentry *de; struct dentry *de;
@ -2159,7 +2159,7 @@ static void __devinit add_debugfs_mem(struct adapter *adap, const char *name,
de->d_inode->i_size = size_mb << 20; de->d_inode->i_size = size_mb << 20;
} }
static int __devinit setup_debugfs(struct adapter *adap) static int setup_debugfs(struct adapter *adap)
{ {
int i; int i;
@ -4173,7 +4173,7 @@ static inline void init_rspq(struct sge_rspq *q, u8 timer_idx, u8 pkt_cnt_idx,
* of ports we found and the number of available CPUs. Most settings can be * of ports we found and the number of available CPUs. Most settings can be
* modified by the admin prior to actual use. * modified by the admin prior to actual use.
*/ */
static void __devinit cfg_queues(struct adapter *adap) static void cfg_queues(struct adapter *adap)
{ {
struct sge *s = &adap->sge; struct sge *s = &adap->sge;
int i, q10g = 0, n10g = 0, qidx = 0; int i, q10g = 0, n10g = 0, qidx = 0;
@ -4257,7 +4257,7 @@ static void __devinit cfg_queues(struct adapter *adap)
* Reduce the number of Ethernet queues across all ports to at most n. * Reduce the number of Ethernet queues across all ports to at most n.
* n provides at least one queue per port. * n provides at least one queue per port.
*/ */
static void __devinit reduce_ethqs(struct adapter *adap, int n) static void reduce_ethqs(struct adapter *adap, int n)
{ {
int i; int i;
struct port_info *pi; struct port_info *pi;
@ -4284,7 +4284,7 @@ static void __devinit reduce_ethqs(struct adapter *adap, int n)
/* 2 MSI-X vectors needed for the FW queue and non-data interrupts */ /* 2 MSI-X vectors needed for the FW queue and non-data interrupts */
#define EXTRA_VECS 2 #define EXTRA_VECS 2
static int __devinit enable_msix(struct adapter *adap) static int enable_msix(struct adapter *adap)
{ {
int ofld_need = 0; int ofld_need = 0;
int i, err, want, need; int i, err, want, need;
@ -4333,7 +4333,7 @@ static int __devinit enable_msix(struct adapter *adap)
#undef EXTRA_VECS #undef EXTRA_VECS
static int __devinit init_rss(struct adapter *adap) static int init_rss(struct adapter *adap)
{ {
unsigned int i, j; unsigned int i, j;
@ -4349,7 +4349,7 @@ static int __devinit init_rss(struct adapter *adap)
return 0; return 0;
} }
static void __devinit print_port_info(const struct net_device *dev) static void print_port_info(const struct net_device *dev)
{ {
static const char *base[] = { static const char *base[] = {
"R XFI", "R XAUI", "T SGMII", "T XFI", "T XAUI", "KX4", "CX4", "R XFI", "R XAUI", "T SGMII", "T XFI", "T XAUI", "KX4", "CX4",
@ -4386,7 +4386,7 @@ static void __devinit print_port_info(const struct net_device *dev)
adap->params.vpd.sn, adap->params.vpd.ec); adap->params.vpd.sn, adap->params.vpd.ec);
} }
static void __devinit enable_pcie_relaxed_ordering(struct pci_dev *dev) static void enable_pcie_relaxed_ordering(struct pci_dev *dev)
{ {
pcie_capability_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_RELAX_EN); pcie_capability_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_RELAX_EN);
} }
@ -4419,7 +4419,7 @@ static void free_some_resources(struct adapter *adapter)
#define VLAN_FEAT (NETIF_F_SG | NETIF_F_IP_CSUM | TSO_FLAGS | \ #define VLAN_FEAT (NETIF_F_SG | NETIF_F_IP_CSUM | TSO_FLAGS | \
NETIF_F_IPV6_CSUM | NETIF_F_HIGHDMA) NETIF_F_IPV6_CSUM | NETIF_F_HIGHDMA)
static int __devinit init_one(struct pci_dev *pdev, static int init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
int func, i, err; int func, i, err;
@ -4640,7 +4640,7 @@ sriov:
return err; return err;
} }
static void __devexit remove_one(struct pci_dev *pdev) static void remove_one(struct pci_dev *pdev)
{ {
struct adapter *adapter = pci_get_drvdata(pdev); struct adapter *adapter = pci_get_drvdata(pdev);
@ -4680,7 +4680,7 @@ static struct pci_driver cxgb4_driver = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.id_table = cxgb4_pci_tbl, .id_table = cxgb4_pci_tbl,
.probe = init_one, .probe = init_one,
.remove = __devexit_p(remove_one), .remove = remove_one,
.err_handler = &cxgb4_eeh, .err_handler = &cxgb4_eeh,
}; };

12
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
View File

@ -2003,7 +2003,7 @@ void t4_tp_wr_bits_indirect(struct adapter *adap, unsigned int addr,
* *
* Initialize the congestion control parameters. * Initialize the congestion control parameters.
*/ */
static void __devinit init_cong_ctrl(unsigned short *a, unsigned short *b) static void init_cong_ctrl(unsigned short *a, unsigned short *b)
{ {
a[0] = a[1] = a[2] = a[3] = a[4] = a[5] = a[6] = a[7] = a[8] = 1; a[0] = a[1] = a[2] = a[3] = a[4] = a[5] = a[6] = a[7] = a[8] = 1;
a[9] = 2; a[9] = 2;
@ -3440,7 +3440,7 @@ int t4_handle_fw_rpl(struct adapter *adap, const __be64 *rpl)
return 0; return 0;
} }
static void __devinit get_pci_mode(struct adapter *adapter, static void get_pci_mode(struct adapter *adapter,
struct pci_params *p) struct pci_params *p)
{ {
u16 val; u16 val;
@ -3460,7 +3460,7 @@ static void __devinit get_pci_mode(struct adapter *adapter,
* Initializes the SW state maintained for each link, including the link's * Initializes the SW state maintained for each link, including the link's
* capabilities and default speed/flow-control/autonegotiation settings. * capabilities and default speed/flow-control/autonegotiation settings.
*/ */
static void __devinit init_link_config(struct link_config *lc, static void init_link_config(struct link_config *lc,
unsigned int caps) unsigned int caps)
{ {
lc->supported = caps; lc->supported = caps;
@ -3485,7 +3485,7 @@ int t4_wait_dev_ready(struct adapter *adap)
return t4_read_reg(adap, PL_WHOAMI) != 0xffffffff ? 0 : -EIO; return t4_read_reg(adap, PL_WHOAMI) != 0xffffffff ? 0 : -EIO;
} }
static int __devinit get_flash_params(struct adapter *adap) static int get_flash_params(struct adapter *adap)
{ {
int ret; int ret;
u32 info; u32 info;
@ -3521,7 +3521,7 @@ static int __devinit get_flash_params(struct adapter *adap)
* values for some adapter tunables, take PHYs out of reset, and * values for some adapter tunables, take PHYs out of reset, and
* initialize the MDIO interface. * initialize the MDIO interface.
*/ */
int __devinit t4_prep_adapter(struct adapter *adapter) int t4_prep_adapter(struct adapter *adapter)
{ {
int ret; int ret;
@ -3549,7 +3549,7 @@ int __devinit t4_prep_adapter(struct adapter *adapter)
return 0; return 0;
} }
int __devinit t4_port_init(struct adapter *adap, int mbox, int pf, int vf) int t4_port_init(struct adapter *adap, int mbox, int pf, int vf)
{ {
u8 addr[6]; u8 addr[6];
int ret, i, j = 0; int ret, i, j = 0;