Commit 2109eaab authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

cxgb3: 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: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Divy Le Ray <divy@chelsio.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c4eef189
...@@ -3078,7 +3078,7 @@ static void set_nqsets(struct adapter *adap) ...@@ -3078,7 +3078,7 @@ static void set_nqsets(struct adapter *adap)
} }
} }
static int __devinit cxgb_enable_msix(struct adapter *adap) static int cxgb_enable_msix(struct adapter *adap)
{ {
struct msix_entry entries[SGE_QSETS + 1]; struct msix_entry entries[SGE_QSETS + 1];
int vectors; int vectors;
...@@ -3108,7 +3108,7 @@ static int __devinit cxgb_enable_msix(struct adapter *adap) ...@@ -3108,7 +3108,7 @@ static int __devinit cxgb_enable_msix(struct adapter *adap)
return err; return err;
} }
static void __devinit print_port_info(struct adapter *adap, static void print_port_info(struct adapter *adap,
const struct adapter_info *ai) const struct adapter_info *ai)
{ {
static const char *pci_variant[] = { static const char *pci_variant[] = {
...@@ -3165,7 +3165,7 @@ static const struct net_device_ops cxgb_netdev_ops = { ...@@ -3165,7 +3165,7 @@ static const struct net_device_ops cxgb_netdev_ops = {
#endif #endif
}; };
static void __devinit cxgb3_init_iscsi_mac(struct net_device *dev) static void cxgb3_init_iscsi_mac(struct net_device *dev)
{ {
struct port_info *pi = netdev_priv(dev); struct port_info *pi = netdev_priv(dev);
...@@ -3176,7 +3176,7 @@ static void __devinit cxgb3_init_iscsi_mac(struct net_device *dev) ...@@ -3176,7 +3176,7 @@ static void __devinit cxgb3_init_iscsi_mac(struct net_device *dev)
#define TSO_FLAGS (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN) #define TSO_FLAGS (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN)
#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)
{ {
static int version_printed; static int version_printed;
...@@ -3381,7 +3381,7 @@ static int __devinit init_one(struct pci_dev *pdev, ...@@ -3381,7 +3381,7 @@ static int __devinit init_one(struct pci_dev *pdev,
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);
...@@ -3425,7 +3425,7 @@ static struct pci_driver driver = { ...@@ -3425,7 +3425,7 @@ static struct pci_driver driver = {
.name = DRV_NAME, .name = DRV_NAME,
.id_table = cxgb3_pci_tbl, .id_table = cxgb3_pci_tbl,
.probe = init_one, .probe = init_one,
.remove = __devexit_p(remove_one), .remove = remove_one,
.err_handler = &t3_err_handler, .err_handler = &t3_err_handler,
}; };
......
...@@ -1382,7 +1382,7 @@ static inline int adap2type(struct adapter *adapter) ...@@ -1382,7 +1382,7 @@ static inline int adap2type(struct adapter *adapter)
return type; return type;
} }
void __devinit cxgb3_adapter_ofld(struct adapter *adapter) void cxgb3_adapter_ofld(struct adapter *adapter)
{ {
struct t3cdev *tdev = &adapter->tdev; struct t3cdev *tdev = &adapter->tdev;
...@@ -1396,7 +1396,7 @@ void __devinit cxgb3_adapter_ofld(struct adapter *adapter) ...@@ -1396,7 +1396,7 @@ void __devinit cxgb3_adapter_ofld(struct adapter *adapter)
register_tdev(tdev); register_tdev(tdev);
} }
void __devexit cxgb3_adapter_unofld(struct adapter *adapter) void cxgb3_adapter_unofld(struct adapter *adapter)
{ {
struct t3cdev *tdev = &adapter->tdev; struct t3cdev *tdev = &adapter->tdev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment