aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-03 09:23:52 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-03 14:16:54 -0500
commit331774760a65c27c673aa7735075124978e7994b (patch)
treeb62c1b38d48d512dcbe981e59f9a55506dcf887d
parent9871b639d00b75625a4bc855c09096e2c4897816 (diff)
icplus: 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: Francois Romieu <romieu@fr.zoreil.com> Cc: Sorbica Shieh <sorbica@icplus.com.tw> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/ethernet/icplus/ipg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/icplus/ipg.c b/drivers/net/ethernet/icplus/ipg.c
index 1b563bb959c2..f80ae745908d 100644
--- a/drivers/net/ethernet/icplus/ipg.c
+++ b/drivers/net/ethernet/icplus/ipg.c
@@ -2167,7 +2167,7 @@ static const struct ethtool_ops ipg_ethtool_ops = {
2167 .nway_reset = ipg_nway_reset, 2167 .nway_reset = ipg_nway_reset,
2168}; 2168};
2169 2169
2170static void __devexit ipg_remove(struct pci_dev *pdev) 2170static void ipg_remove(struct pci_dev *pdev)
2171{ 2171{
2172 struct net_device *dev = pci_get_drvdata(pdev); 2172 struct net_device *dev = pci_get_drvdata(pdev);
2173 struct ipg_nic_private *sp = netdev_priv(dev); 2173 struct ipg_nic_private *sp = netdev_priv(dev);
@@ -2199,7 +2199,7 @@ static const struct net_device_ops ipg_netdev_ops = {
2199 .ndo_validate_addr = eth_validate_addr, 2199 .ndo_validate_addr = eth_validate_addr,
2200}; 2200};
2201 2201
2202static int __devinit ipg_probe(struct pci_dev *pdev, 2202static int ipg_probe(struct pci_dev *pdev,
2203 const struct pci_device_id *id) 2203 const struct pci_device_id *id)
2204{ 2204{
2205 unsigned int i = id->driver_data; 2205 unsigned int i = id->driver_data;
@@ -2296,7 +2296,7 @@ static struct pci_driver ipg_pci_driver = {
2296 .name = IPG_DRIVER_NAME, 2296 .name = IPG_DRIVER_NAME,
2297 .id_table = ipg_pci_tbl, 2297 .id_table = ipg_pci_tbl,
2298 .probe = ipg_probe, 2298 .probe = ipg_probe,
2299 .remove = __devexit_p(ipg_remove), 2299 .remove = ipg_remove,
2300}; 2300};
2301 2301
2302static int __init ipg_init_module(void) 2302static int __init ipg_init_module(void)