diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-05-22 20:52:31 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-05-26 00:27:58 -0400 |
commit | 8513fbd880093f00a47e85a552f14ca2de8d84d6 (patch) | |
tree | 6f061e2e9b87983cd91688bff5238c730db79137 /drivers/net/ethernet/ibm/emac/mal.c | |
parent | 6d0bfe22611602f36617bc7aa2ffa1bbb2f54c67 (diff) |
net: ethernet: use platform_{get,set}_drvdata()
Use the wrapper functions for getting and setting the driver data using
platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev,
so we can directly pass a struct platform_device.
Also, unnecessary dev_set_drvdata() is removed, because the driver core
clears the driver data to NULL after device_release or on probe failure.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ibm/emac/mal.c')
-rw-r--r-- | drivers/net/ethernet/ibm/emac/mal.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/ibm/emac/mal.c b/drivers/net/ethernet/ibm/emac/mal.c index 610ed223d1db..856ea66c9223 100644 --- a/drivers/net/ethernet/ibm/emac/mal.c +++ b/drivers/net/ethernet/ibm/emac/mal.c | |||
@@ -696,7 +696,7 @@ static int mal_probe(struct platform_device *ofdev) | |||
696 | 696 | ||
697 | /* Advertise this instance to the rest of the world */ | 697 | /* Advertise this instance to the rest of the world */ |
698 | wmb(); | 698 | wmb(); |
699 | dev_set_drvdata(&ofdev->dev, mal); | 699 | platform_set_drvdata(ofdev, mal); |
700 | 700 | ||
701 | mal_dbg_register(mal); | 701 | mal_dbg_register(mal); |
702 | 702 | ||
@@ -722,7 +722,7 @@ static int mal_probe(struct platform_device *ofdev) | |||
722 | 722 | ||
723 | static int mal_remove(struct platform_device *ofdev) | 723 | static int mal_remove(struct platform_device *ofdev) |
724 | { | 724 | { |
725 | struct mal_instance *mal = dev_get_drvdata(&ofdev->dev); | 725 | struct mal_instance *mal = platform_get_drvdata(ofdev); |
726 | 726 | ||
727 | MAL_DBG(mal, "remove" NL); | 727 | MAL_DBG(mal, "remove" NL); |
728 | 728 | ||
@@ -735,8 +735,6 @@ static int mal_remove(struct platform_device *ofdev) | |||
735 | "mal%d: commac list is not empty on remove!\n", | 735 | "mal%d: commac list is not empty on remove!\n", |
736 | mal->index); | 736 | mal->index); |
737 | 737 | ||
738 | dev_set_drvdata(&ofdev->dev, NULL); | ||
739 | |||
740 | free_irq(mal->serr_irq, mal); | 738 | free_irq(mal->serr_irq, mal); |
741 | free_irq(mal->txde_irq, mal); | 739 | free_irq(mal->txde_irq, mal); |
742 | free_irq(mal->txeob_irq, mal); | 740 | free_irq(mal->txeob_irq, mal); |