diff options
Diffstat (limited to 'drivers/net/ibm_newemac/tah.c')
| -rw-r--r-- | drivers/net/ibm_newemac/tah.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ibm_newemac/tah.c b/drivers/net/ibm_newemac/tah.c index 044637144c43..299aa49490c0 100644 --- a/drivers/net/ibm_newemac/tah.c +++ b/drivers/net/ibm_newemac/tah.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #include "emac.h" | 23 | #include "emac.h" |
| 24 | #include "core.h" | 24 | #include "core.h" |
| 25 | 25 | ||
| 26 | int __devinit tah_attach(struct of_device *ofdev, int channel) | 26 | int __devinit tah_attach(struct platform_device *ofdev, int channel) |
| 27 | { | 27 | { |
| 28 | struct tah_instance *dev = dev_get_drvdata(&ofdev->dev); | 28 | struct tah_instance *dev = dev_get_drvdata(&ofdev->dev); |
| 29 | 29 | ||
| @@ -35,7 +35,7 @@ int __devinit tah_attach(struct of_device *ofdev, int channel) | |||
| 35 | return 0; | 35 | return 0; |
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | void tah_detach(struct of_device *ofdev, int channel) | 38 | void tah_detach(struct platform_device *ofdev, int channel) |
| 39 | { | 39 | { |
| 40 | struct tah_instance *dev = dev_get_drvdata(&ofdev->dev); | 40 | struct tah_instance *dev = dev_get_drvdata(&ofdev->dev); |
| 41 | 41 | ||
| @@ -44,7 +44,7 @@ void tah_detach(struct of_device *ofdev, int channel) | |||
| 44 | mutex_unlock(&dev->lock); | 44 | mutex_unlock(&dev->lock); |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | void tah_reset(struct of_device *ofdev) | 47 | void tah_reset(struct platform_device *ofdev) |
| 48 | { | 48 | { |
| 49 | struct tah_instance *dev = dev_get_drvdata(&ofdev->dev); | 49 | struct tah_instance *dev = dev_get_drvdata(&ofdev->dev); |
| 50 | struct tah_regs __iomem *p = dev->base; | 50 | struct tah_regs __iomem *p = dev->base; |
| @@ -66,13 +66,13 @@ void tah_reset(struct of_device *ofdev) | |||
| 66 | TAH_MR_DIG); | 66 | TAH_MR_DIG); |
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | int tah_get_regs_len(struct of_device *ofdev) | 69 | int tah_get_regs_len(struct platform_device *ofdev) |
| 70 | { | 70 | { |
| 71 | return sizeof(struct emac_ethtool_regs_subhdr) + | 71 | return sizeof(struct emac_ethtool_regs_subhdr) + |
| 72 | sizeof(struct tah_regs); | 72 | sizeof(struct tah_regs); |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | void *tah_dump_regs(struct of_device *ofdev, void *buf) | 75 | void *tah_dump_regs(struct platform_device *ofdev, void *buf) |
| 76 | { | 76 | { |
| 77 | struct tah_instance *dev = dev_get_drvdata(&ofdev->dev); | 77 | struct tah_instance *dev = dev_get_drvdata(&ofdev->dev); |
| 78 | struct emac_ethtool_regs_subhdr *hdr = buf; | 78 | struct emac_ethtool_regs_subhdr *hdr = buf; |
| @@ -87,7 +87,7 @@ void *tah_dump_regs(struct of_device *ofdev, void *buf) | |||
| 87 | return regs + 1; | 87 | return regs + 1; |
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | static int __devinit tah_probe(struct of_device *ofdev, | 90 | static int __devinit tah_probe(struct platform_device *ofdev, |
| 91 | const struct of_device_id *match) | 91 | const struct of_device_id *match) |
| 92 | { | 92 | { |
| 93 | struct device_node *np = ofdev->dev.of_node; | 93 | struct device_node *np = ofdev->dev.of_node; |
| @@ -139,7 +139,7 @@ static int __devinit tah_probe(struct of_device *ofdev, | |||
| 139 | return rc; | 139 | return rc; |
| 140 | } | 140 | } |
| 141 | 141 | ||
| 142 | static int __devexit tah_remove(struct of_device *ofdev) | 142 | static int __devexit tah_remove(struct platform_device *ofdev) |
| 143 | { | 143 | { |
| 144 | struct tah_instance *dev = dev_get_drvdata(&ofdev->dev); | 144 | struct tah_instance *dev = dev_get_drvdata(&ofdev->dev); |
| 145 | 145 | ||
