diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-05-05 00:33:19 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-05 00:33:19 -0400 |
commit | c7ae011dc8306d982c25fb4f679752e790a08dc4 (patch) | |
tree | f5ba5370f13272d1cfc43496b4f2b02352e15209 /drivers/net/ehea/ehea_main.c | |
parent | 088eb2d905de9518dad913995bb8aef493d4a7c5 (diff) |
net: remove driver_data direct access of struct device from more drivers
In the near future, the driver core is going to not allow direct access
to the driver_data pointer in struct device. Instead, the functions
dev_get_drvdata() and dev_set_drvdata() should be used. These functions
have been around since the beginning, so are backwards compatible with
all older kernel versions.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ehea/ehea_main.c')
-rw-r--r-- | drivers/net/ehea/ehea_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index 604c844d0769..37a190d85fcd 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c | |||
@@ -3256,7 +3256,7 @@ static ssize_t ehea_probe_port(struct device *dev, | |||
3256 | struct device_attribute *attr, | 3256 | struct device_attribute *attr, |
3257 | const char *buf, size_t count) | 3257 | const char *buf, size_t count) |
3258 | { | 3258 | { |
3259 | struct ehea_adapter *adapter = dev->driver_data; | 3259 | struct ehea_adapter *adapter = dev_get_drvdata(dev); |
3260 | struct ehea_port *port; | 3260 | struct ehea_port *port; |
3261 | struct device_node *eth_dn = NULL; | 3261 | struct device_node *eth_dn = NULL; |
3262 | int i; | 3262 | int i; |
@@ -3311,7 +3311,7 @@ static ssize_t ehea_remove_port(struct device *dev, | |||
3311 | struct device_attribute *attr, | 3311 | struct device_attribute *attr, |
3312 | const char *buf, size_t count) | 3312 | const char *buf, size_t count) |
3313 | { | 3313 | { |
3314 | struct ehea_adapter *adapter = dev->driver_data; | 3314 | struct ehea_adapter *adapter = dev_get_drvdata(dev); |
3315 | struct ehea_port *port; | 3315 | struct ehea_port *port; |
3316 | int i; | 3316 | int i; |
3317 | u32 logical_port_id; | 3317 | u32 logical_port_id; |
@@ -3399,7 +3399,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev, | |||
3399 | 3399 | ||
3400 | adapter->pd = EHEA_PD_ID; | 3400 | adapter->pd = EHEA_PD_ID; |
3401 | 3401 | ||
3402 | dev->dev.driver_data = adapter; | 3402 | dev_set_drvdata(&dev->dev, adapter); |
3403 | 3403 | ||
3404 | 3404 | ||
3405 | /* initialize adapter and ports */ | 3405 | /* initialize adapter and ports */ |
@@ -3463,7 +3463,7 @@ out: | |||
3463 | 3463 | ||
3464 | static int __devexit ehea_remove(struct of_device *dev) | 3464 | static int __devexit ehea_remove(struct of_device *dev) |
3465 | { | 3465 | { |
3466 | struct ehea_adapter *adapter = dev->dev.driver_data; | 3466 | struct ehea_adapter *adapter = dev_get_drvdata(&dev->dev); |
3467 | int i; | 3467 | int i; |
3468 | 3468 | ||
3469 | for (i = 0; i < EHEA_MAX_PORTS; i++) | 3469 | for (i = 0; i < EHEA_MAX_PORTS; i++) |