diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-03 09:23:03 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-03 14:16:42 -0500 |
commit | d289f864601eb3678824ba3c0b15217af79171e0 (patch) | |
tree | 5c7e0dbfc4404de16e2349b497c3292de8f57c89 /drivers/net/ethernet/chelsio/cxgb4vf | |
parent | 91744948659a5cf937a9094f50f09c412656ca4a (diff) |
cxgb4vf: 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: Casey Leedom <leedom@chelsio.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb4vf')
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 20 | ||||
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 6 |
3 files changed, 15 insertions, 15 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c index 9dad56101e2..f866eb5e35d 100644 --- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | |||
@@ -2023,7 +2023,7 @@ static struct cxgb4vf_debugfs_entry debugfs_files[] = { | |||
2023 | * Set up out /sys/kernel/debug/cxgb4vf sub-nodes. We assume that the | 2023 | * Set up out /sys/kernel/debug/cxgb4vf sub-nodes. We assume that the |
2024 | * directory (debugfs_root) has already been set up. | 2024 | * directory (debugfs_root) has already been set up. |
2025 | */ | 2025 | */ |
2026 | static int __devinit setup_debugfs(struct adapter *adapter) | 2026 | static int setup_debugfs(struct adapter *adapter) |
2027 | { | 2027 | { |
2028 | int i; | 2028 | int i; |
2029 | 2029 | ||
@@ -2064,7 +2064,7 @@ static void cleanup_debugfs(struct adapter *adapter) | |||
2064 | * adapter parameters we're going to be using and initialize basic adapter | 2064 | * adapter parameters we're going to be using and initialize basic adapter |
2065 | * hardware support. | 2065 | * hardware support. |
2066 | */ | 2066 | */ |
2067 | static int __devinit adap_init0(struct adapter *adapter) | 2067 | static int adap_init0(struct adapter *adapter) |
2068 | { | 2068 | { |
2069 | struct vf_resources *vfres = &adapter->params.vfres; | 2069 | struct vf_resources *vfres = &adapter->params.vfres; |
2070 | struct sge_params *sge_params = &adapter->params.sge; | 2070 | struct sge_params *sge_params = &adapter->params.sge; |
@@ -2266,7 +2266,7 @@ static inline void init_rspq(struct sge_rspq *rspq, u8 timer_idx, | |||
2266 | * be modified by the admin via ethtool and cxgbtool prior to the adapter | 2266 | * be modified by the admin via ethtool and cxgbtool prior to the adapter |
2267 | * being brought up for the first time. | 2267 | * being brought up for the first time. |
2268 | */ | 2268 | */ |
2269 | static void __devinit cfg_queues(struct adapter *adapter) | 2269 | static void cfg_queues(struct adapter *adapter) |
2270 | { | 2270 | { |
2271 | struct sge *s = &adapter->sge; | 2271 | struct sge *s = &adapter->sge; |
2272 | int q10g, n10g, qidx, pidx, qs; | 2272 | int q10g, n10g, qidx, pidx, qs; |
@@ -2361,7 +2361,7 @@ static void __devinit cfg_queues(struct adapter *adapter) | |||
2361 | * Reduce the number of Ethernet queues across all ports to at most n. | 2361 | * Reduce the number of Ethernet queues across all ports to at most n. |
2362 | * n provides at least one queue per port. | 2362 | * n provides at least one queue per port. |
2363 | */ | 2363 | */ |
2364 | static void __devinit reduce_ethqs(struct adapter *adapter, int n) | 2364 | static void reduce_ethqs(struct adapter *adapter, int n) |
2365 | { | 2365 | { |
2366 | int i; | 2366 | int i; |
2367 | struct port_info *pi; | 2367 | struct port_info *pi; |
@@ -2400,7 +2400,7 @@ static void __devinit reduce_ethqs(struct adapter *adapter, int n) | |||
2400 | * for our "extras". Note that this process may lower the maximum number of | 2400 | * for our "extras". Note that this process may lower the maximum number of |
2401 | * allowed Queue Sets ... | 2401 | * allowed Queue Sets ... |
2402 | */ | 2402 | */ |
2403 | static int __devinit enable_msix(struct adapter *adapter) | 2403 | static int enable_msix(struct adapter *adapter) |
2404 | { | 2404 | { |
2405 | int i, err, want, need; | 2405 | int i, err, want, need; |
2406 | struct msix_entry entries[MSIX_ENTRIES]; | 2406 | struct msix_entry entries[MSIX_ENTRIES]; |
@@ -2462,7 +2462,7 @@ static const struct net_device_ops cxgb4vf_netdev_ops = { | |||
2462 | * state needed to manage the device. This routine is called "init_one" in | 2462 | * state needed to manage the device. This routine is called "init_one" in |
2463 | * the PF Driver ... | 2463 | * the PF Driver ... |
2464 | */ | 2464 | */ |
2465 | static int __devinit cxgb4vf_pci_probe(struct pci_dev *pdev, | 2465 | static int cxgb4vf_pci_probe(struct pci_dev *pdev, |
2466 | const struct pci_device_id *ent) | 2466 | const struct pci_device_id *ent) |
2467 | { | 2467 | { |
2468 | static int version_printed; | 2468 | static int version_printed; |
@@ -2769,7 +2769,7 @@ err_disable_device: | |||
2769 | * "probe" routine and quiesce the device (disable interrupts, etc.). (Note | 2769 | * "probe" routine and quiesce the device (disable interrupts, etc.). (Note |
2770 | * that this is called "remove_one" in the PF Driver.) | 2770 | * that this is called "remove_one" in the PF Driver.) |
2771 | */ | 2771 | */ |
2772 | static void __devexit cxgb4vf_pci_remove(struct pci_dev *pdev) | 2772 | static void cxgb4vf_pci_remove(struct pci_dev *pdev) |
2773 | { | 2773 | { |
2774 | struct adapter *adapter = pci_get_drvdata(pdev); | 2774 | struct adapter *adapter = pci_get_drvdata(pdev); |
2775 | 2775 | ||
@@ -2835,7 +2835,7 @@ static void __devexit cxgb4vf_pci_remove(struct pci_dev *pdev) | |||
2835 | * "Shutdown" quiesce the device, stopping Ingress Packet and Interrupt | 2835 | * "Shutdown" quiesce the device, stopping Ingress Packet and Interrupt |
2836 | * delivery. | 2836 | * delivery. |
2837 | */ | 2837 | */ |
2838 | static void __devexit cxgb4vf_pci_shutdown(struct pci_dev *pdev) | 2838 | static void cxgb4vf_pci_shutdown(struct pci_dev *pdev) |
2839 | { | 2839 | { |
2840 | struct adapter *adapter; | 2840 | struct adapter *adapter; |
2841 | int pidx; | 2841 | int pidx; |
@@ -2905,8 +2905,8 @@ static struct pci_driver cxgb4vf_driver = { | |||
2905 | .name = KBUILD_MODNAME, | 2905 | .name = KBUILD_MODNAME, |
2906 | .id_table = cxgb4vf_pci_tbl, | 2906 | .id_table = cxgb4vf_pci_tbl, |
2907 | .probe = cxgb4vf_pci_probe, | 2907 | .probe = cxgb4vf_pci_probe, |
2908 | .remove = __devexit_p(cxgb4vf_pci_remove), | 2908 | .remove = cxgb4vf_pci_remove, |
2909 | .shutdown = __devexit_p(cxgb4vf_pci_shutdown), | 2909 | .shutdown = cxgb4vf_pci_shutdown, |
2910 | }; | 2910 | }; |
2911 | 2911 | ||
2912 | /* | 2912 | /* |
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h index a65c80aed1f..283f9d0d37f 100644 --- a/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h +++ b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h | |||
@@ -232,8 +232,8 @@ static inline int t4vf_wr_mbox_ns(struct adapter *adapter, const void *cmd, | |||
232 | return t4vf_wr_mbox_core(adapter, cmd, size, rpl, false); | 232 | return t4vf_wr_mbox_core(adapter, cmd, size, rpl, false); |
233 | } | 233 | } |
234 | 234 | ||
235 | int __devinit t4vf_wait_dev_ready(struct adapter *); | 235 | int t4vf_wait_dev_ready(struct adapter *); |
236 | int __devinit t4vf_port_init(struct adapter *, int); | 236 | int t4vf_port_init(struct adapter *, int); |
237 | 237 | ||
238 | int t4vf_fw_reset(struct adapter *); | 238 | int t4vf_fw_reset(struct adapter *); |
239 | int t4vf_query_params(struct adapter *, unsigned int, const u32 *, u32 *); | 239 | int t4vf_query_params(struct adapter *, unsigned int, const u32 *, u32 *); |
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c index fe3fd3dad6f..9b70cccf843 100644 --- a/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c +++ b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | |||
@@ -46,7 +46,7 @@ | |||
46 | * returning a value other than all 1's). Return an error if it doesn't | 46 | * returning a value other than all 1's). Return an error if it doesn't |
47 | * become ready ... | 47 | * become ready ... |
48 | */ | 48 | */ |
49 | int __devinit t4vf_wait_dev_ready(struct adapter *adapter) | 49 | int t4vf_wait_dev_ready(struct adapter *adapter) |
50 | { | 50 | { |
51 | const u32 whoami = T4VF_PL_BASE_ADDR + PL_VF_WHOAMI; | 51 | const u32 whoami = T4VF_PL_BASE_ADDR + PL_VF_WHOAMI; |
52 | const u32 notready1 = 0xffffffff; | 52 | const u32 notready1 = 0xffffffff; |
@@ -253,7 +253,7 @@ static int hash_mac_addr(const u8 *addr) | |||
253 | * Initializes the SW state maintained for each link, including the link's | 253 | * Initializes the SW state maintained for each link, including the link's |
254 | * capabilities and default speed/flow-control/autonegotiation settings. | 254 | * capabilities and default speed/flow-control/autonegotiation settings. |
255 | */ | 255 | */ |
256 | static void __devinit init_link_config(struct link_config *lc, | 256 | static void init_link_config(struct link_config *lc, |
257 | unsigned int caps) | 257 | unsigned int caps) |
258 | { | 258 | { |
259 | lc->supported = caps; | 259 | lc->supported = caps; |
@@ -275,7 +275,7 @@ static void __devinit init_link_config(struct link_config *lc, | |||
275 | * @adapter: the adapter | 275 | * @adapter: the adapter |
276 | * @pidx: the adapter port index | 276 | * @pidx: the adapter port index |
277 | */ | 277 | */ |
278 | int __devinit t4vf_port_init(struct adapter *adapter, int pidx) | 278 | int t4vf_port_init(struct adapter *adapter, int pidx) |
279 | { | 279 | { |
280 | struct port_info *pi = adap2pinfo(adapter, pidx); | 280 | struct port_info *pi = adap2pinfo(adapter, pidx); |
281 | struct fw_vi_cmd vi_cmd, vi_rpl; | 281 | struct fw_vi_cmd vi_cmd, vi_rpl; |