diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-03 09:23:10 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-03 14:16:43 -0500 |
commit | 0297be07091fc809f27a9f50e5130d41c9ac3f52 (patch) | |
tree | e45eda69d77115f16332a408f067b9a25272eacd /drivers | |
parent | 3bc6b06ce06039b981333e600f79963ae5a86dba (diff) |
ehea: 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: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/ibm/ehea/ehea_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c index 09faf333e941..e238130574ca 100644 --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c | |||
@@ -98,10 +98,10 @@ static struct ehea_fw_handle_array ehea_fw_handles; | |||
98 | static struct ehea_bcmc_reg_array ehea_bcmc_regs; | 98 | static struct ehea_bcmc_reg_array ehea_bcmc_regs; |
99 | 99 | ||
100 | 100 | ||
101 | static int __devinit ehea_probe_adapter(struct platform_device *dev, | 101 | static int ehea_probe_adapter(struct platform_device *dev, |
102 | const struct of_device_id *id); | 102 | const struct of_device_id *id); |
103 | 103 | ||
104 | static int __devexit ehea_remove(struct platform_device *dev); | 104 | static int ehea_remove(struct platform_device *dev); |
105 | 105 | ||
106 | static struct of_device_id ehea_device_table[] = { | 106 | static struct of_device_id ehea_device_table[] = { |
107 | { | 107 | { |
@@ -2909,7 +2909,7 @@ static ssize_t ehea_show_port_id(struct device *dev, | |||
2909 | static DEVICE_ATTR(log_port_id, S_IRUSR | S_IRGRP | S_IROTH, ehea_show_port_id, | 2909 | static DEVICE_ATTR(log_port_id, S_IRUSR | S_IRGRP | S_IROTH, ehea_show_port_id, |
2910 | NULL); | 2910 | NULL); |
2911 | 2911 | ||
2912 | static void __devinit logical_port_release(struct device *dev) | 2912 | static void logical_port_release(struct device *dev) |
2913 | { | 2913 | { |
2914 | struct ehea_port *port = container_of(dev, struct ehea_port, ofdev.dev); | 2914 | struct ehea_port *port = container_of(dev, struct ehea_port, ofdev.dev); |
2915 | of_node_put(port->ofdev.dev.of_node); | 2915 | of_node_put(port->ofdev.dev.of_node); |
@@ -3257,7 +3257,7 @@ static void ehea_remove_device_sysfs(struct platform_device *dev) | |||
3257 | device_remove_file(&dev->dev, &dev_attr_remove_port); | 3257 | device_remove_file(&dev->dev, &dev_attr_remove_port); |
3258 | } | 3258 | } |
3259 | 3259 | ||
3260 | static int __devinit ehea_probe_adapter(struct platform_device *dev, | 3260 | static int ehea_probe_adapter(struct platform_device *dev, |
3261 | const struct of_device_id *id) | 3261 | const struct of_device_id *id) |
3262 | { | 3262 | { |
3263 | struct ehea_adapter *adapter; | 3263 | struct ehea_adapter *adapter; |
@@ -3364,7 +3364,7 @@ out: | |||
3364 | return ret; | 3364 | return ret; |
3365 | } | 3365 | } |
3366 | 3366 | ||
3367 | static int __devexit ehea_remove(struct platform_device *dev) | 3367 | static int ehea_remove(struct platform_device *dev) |
3368 | { | 3368 | { |
3369 | struct ehea_adapter *adapter = dev_get_drvdata(&dev->dev); | 3369 | struct ehea_adapter *adapter = dev_get_drvdata(&dev->dev); |
3370 | int i; | 3370 | int i; |