diff options
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 b22dab9153f6..147c4b088fb3 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c | |||
@@ -3261,7 +3261,7 @@ static ssize_t ehea_probe_port(struct device *dev, | |||
3261 | struct device_attribute *attr, | 3261 | struct device_attribute *attr, |
3262 | const char *buf, size_t count) | 3262 | const char *buf, size_t count) |
3263 | { | 3263 | { |
3264 | struct ehea_adapter *adapter = dev->driver_data; | 3264 | struct ehea_adapter *adapter = dev_get_drvdata(dev); |
3265 | struct ehea_port *port; | 3265 | struct ehea_port *port; |
3266 | struct device_node *eth_dn = NULL; | 3266 | struct device_node *eth_dn = NULL; |
3267 | int i; | 3267 | int i; |
@@ -3316,7 +3316,7 @@ static ssize_t ehea_remove_port(struct device *dev, | |||
3316 | struct device_attribute *attr, | 3316 | struct device_attribute *attr, |
3317 | const char *buf, size_t count) | 3317 | const char *buf, size_t count) |
3318 | { | 3318 | { |
3319 | struct ehea_adapter *adapter = dev->driver_data; | 3319 | struct ehea_adapter *adapter = dev_get_drvdata(dev); |
3320 | struct ehea_port *port; | 3320 | struct ehea_port *port; |
3321 | int i; | 3321 | int i; |
3322 | u32 logical_port_id; | 3322 | u32 logical_port_id; |
@@ -3404,7 +3404,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev, | |||
3404 | 3404 | ||
3405 | adapter->pd = EHEA_PD_ID; | 3405 | adapter->pd = EHEA_PD_ID; |
3406 | 3406 | ||
3407 | dev->dev.driver_data = adapter; | 3407 | dev_set_drvdata(&dev->dev, adapter); |
3408 | 3408 | ||
3409 | 3409 | ||
3410 | /* initialize adapter and ports */ | 3410 | /* initialize adapter and ports */ |
@@ -3468,7 +3468,7 @@ out: | |||
3468 | 3468 | ||
3469 | static int __devexit ehea_remove(struct of_device *dev) | 3469 | static int __devexit ehea_remove(struct of_device *dev) |
3470 | { | 3470 | { |
3471 | struct ehea_adapter *adapter = dev->dev.driver_data; | 3471 | struct ehea_adapter *adapter = dev_get_drvdata(&dev->dev); |
3472 | int i; | 3472 | int i; |
3473 | 3473 | ||
3474 | for (i = 0; i < EHEA_MAX_PORTS; i++) | 3474 | for (i = 0; i < EHEA_MAX_PORTS; i++) |