diff options
author | Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> | 2009-06-10 00:38:54 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-15 02:47:24 -0400 |
commit | 03fa68c245cccbcb99035cbabaa13b408ba91ab5 (patch) | |
tree | b6190d60db6302fd9b84c3aac50bf75b7351f70c /drivers/net/ps3_gelic_net.c | |
parent | 9f08e9db84c1e9234e07b9b595f5b2508c621823 (diff) |
ps3: shorten ps3_system_bus_[gs]et_driver_data to ps3_system_bus_[gs]et_drvdata
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Cc: Geoff Levand <geoffrey.levand@am.sony.com>
Cc: Jim Paris <jim@jtan.com>
Acked-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers/net/ps3_gelic_net.c')
-rw-r--r-- | drivers/net/ps3_gelic_net.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c index 30900b30d532..2b38f39924a6 100644 --- a/drivers/net/ps3_gelic_net.c +++ b/drivers/net/ps3_gelic_net.c | |||
@@ -1648,7 +1648,7 @@ static int ps3_gelic_driver_probe(struct ps3_system_bus_device *dev) | |||
1648 | result = -ENOMEM; | 1648 | result = -ENOMEM; |
1649 | goto fail_alloc_card; | 1649 | goto fail_alloc_card; |
1650 | } | 1650 | } |
1651 | ps3_system_bus_set_driver_data(dev, card); | 1651 | ps3_system_bus_set_drvdata(dev, card); |
1652 | card->dev = dev; | 1652 | card->dev = dev; |
1653 | 1653 | ||
1654 | /* get internal vlan info */ | 1654 | /* get internal vlan info */ |
@@ -1749,7 +1749,7 @@ fail_alloc_irq: | |||
1749 | bus_id(card), | 1749 | bus_id(card), |
1750 | 0, 0); | 1750 | 0, 0); |
1751 | fail_status_indicator: | 1751 | fail_status_indicator: |
1752 | ps3_system_bus_set_driver_data(dev, NULL); | 1752 | ps3_system_bus_set_drvdata(dev, NULL); |
1753 | kfree(netdev_card(netdev)->unalign); | 1753 | kfree(netdev_card(netdev)->unalign); |
1754 | free_netdev(netdev); | 1754 | free_netdev(netdev); |
1755 | fail_alloc_card: | 1755 | fail_alloc_card: |
@@ -1766,7 +1766,7 @@ fail_open: | |||
1766 | 1766 | ||
1767 | static int ps3_gelic_driver_remove(struct ps3_system_bus_device *dev) | 1767 | static int ps3_gelic_driver_remove(struct ps3_system_bus_device *dev) |
1768 | { | 1768 | { |
1769 | struct gelic_card *card = ps3_system_bus_get_driver_data(dev); | 1769 | struct gelic_card *card = ps3_system_bus_get_drvdata(dev); |
1770 | struct net_device *netdev0; | 1770 | struct net_device *netdev0; |
1771 | pr_debug("%s: called\n", __func__); | 1771 | pr_debug("%s: called\n", __func__); |
1772 | 1772 | ||
@@ -1803,7 +1803,7 @@ static int ps3_gelic_driver_remove(struct ps3_system_bus_device *dev) | |||
1803 | kfree(netdev_card(netdev0)->unalign); | 1803 | kfree(netdev_card(netdev0)->unalign); |
1804 | free_netdev(netdev0); | 1804 | free_netdev(netdev0); |
1805 | 1805 | ||
1806 | ps3_system_bus_set_driver_data(dev, NULL); | 1806 | ps3_system_bus_set_drvdata(dev, NULL); |
1807 | 1807 | ||
1808 | ps3_dma_region_free(dev->d_region); | 1808 | ps3_dma_region_free(dev->d_region); |
1809 | 1809 | ||