diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-08-06 11:25:50 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-08-06 11:25:50 -0400 |
commit | 2dc11581376829303b98eadb2de253bee065a56a (patch) | |
tree | dbce62559c822cd720d1819a50c488bfecdfa945 /drivers/dma | |
parent | fc1caf6eafb30ea185720e29f7f5eccca61ecd60 (diff) |
of/device: Replace struct of_device with struct platform_device
of_device is just an alias for platform_device, so remove it entirely. Also
replace to_of_device() with to_platform_device() and update comment blocks.
This patch was initially generated from the following semantic patch, and then
edited by hand to pick up the bits that coccinelle didn't catch.
@@
@@
-struct of_device
+struct platform_device
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Reviewed-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/fsldma.c | 4 | ||||
-rw-r--r-- | drivers/dma/mpc512x_dma.c | 4 | ||||
-rw-r--r-- | drivers/dma/ppc4xx/adma.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c index f0fd6db6063c..cea08bed9cf9 100644 --- a/drivers/dma/fsldma.c +++ b/drivers/dma/fsldma.c | |||
@@ -1297,7 +1297,7 @@ static void fsl_dma_chan_remove(struct fsldma_chan *chan) | |||
1297 | kfree(chan); | 1297 | kfree(chan); |
1298 | } | 1298 | } |
1299 | 1299 | ||
1300 | static int __devinit fsldma_of_probe(struct of_device *op, | 1300 | static int __devinit fsldma_of_probe(struct platform_device *op, |
1301 | const struct of_device_id *match) | 1301 | const struct of_device_id *match) |
1302 | { | 1302 | { |
1303 | struct fsldma_device *fdev; | 1303 | struct fsldma_device *fdev; |
@@ -1382,7 +1382,7 @@ out_return: | |||
1382 | return err; | 1382 | return err; |
1383 | } | 1383 | } |
1384 | 1384 | ||
1385 | static int fsldma_of_remove(struct of_device *op) | 1385 | static int fsldma_of_remove(struct platform_device *op) |
1386 | { | 1386 | { |
1387 | struct fsldma_device *fdev; | 1387 | struct fsldma_device *fdev; |
1388 | unsigned int i; | 1388 | unsigned int i; |
diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c index 14a8c0f1698e..4e9cbf300594 100644 --- a/drivers/dma/mpc512x_dma.c +++ b/drivers/dma/mpc512x_dma.c | |||
@@ -627,7 +627,7 @@ mpc_dma_prep_memcpy(struct dma_chan *chan, dma_addr_t dst, dma_addr_t src, | |||
627 | return &mdesc->desc; | 627 | return &mdesc->desc; |
628 | } | 628 | } |
629 | 629 | ||
630 | static int __devinit mpc_dma_probe(struct of_device *op, | 630 | static int __devinit mpc_dma_probe(struct platform_device *op, |
631 | const struct of_device_id *match) | 631 | const struct of_device_id *match) |
632 | { | 632 | { |
633 | struct device_node *dn = op->dev.of_node; | 633 | struct device_node *dn = op->dev.of_node; |
@@ -753,7 +753,7 @@ static int __devinit mpc_dma_probe(struct of_device *op, | |||
753 | return retval; | 753 | return retval; |
754 | } | 754 | } |
755 | 755 | ||
756 | static int __devexit mpc_dma_remove(struct of_device *op) | 756 | static int __devexit mpc_dma_remove(struct platform_device *op) |
757 | { | 757 | { |
758 | struct device *dev = &op->dev; | 758 | struct device *dev = &op->dev; |
759 | struct mpc_dma *mdma = dev_get_drvdata(dev); | 759 | struct mpc_dma *mdma = dev_get_drvdata(dev); |
diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c index 7c3747902a37..0d58a4a4487f 100644 --- a/drivers/dma/ppc4xx/adma.c +++ b/drivers/dma/ppc4xx/adma.c | |||
@@ -4257,11 +4257,11 @@ static int ppc440spe_adma_setup_irqs(struct ppc440spe_adma_device *adev, | |||
4257 | struct ppc440spe_adma_chan *chan, | 4257 | struct ppc440spe_adma_chan *chan, |
4258 | int *initcode) | 4258 | int *initcode) |
4259 | { | 4259 | { |
4260 | struct of_device *ofdev; | 4260 | struct platform_device *ofdev; |
4261 | struct device_node *np; | 4261 | struct device_node *np; |
4262 | int ret; | 4262 | int ret; |
4263 | 4263 | ||
4264 | ofdev = container_of(adev->dev, struct of_device, dev); | 4264 | ofdev = container_of(adev->dev, struct platform_device, dev); |
4265 | np = ofdev->dev.of_node; | 4265 | np = ofdev->dev.of_node; |
4266 | if (adev->id != PPC440SPE_XOR_ID) { | 4266 | if (adev->id != PPC440SPE_XOR_ID) { |
4267 | adev->err_irq = irq_of_parse_and_map(np, 1); | 4267 | adev->err_irq = irq_of_parse_and_map(np, 1); |
@@ -4393,7 +4393,7 @@ static void ppc440spe_adma_release_irqs(struct ppc440spe_adma_device *adev, | |||
4393 | /** | 4393 | /** |
4394 | * ppc440spe_adma_probe - probe the asynch device | 4394 | * ppc440spe_adma_probe - probe the asynch device |
4395 | */ | 4395 | */ |
4396 | static int __devinit ppc440spe_adma_probe(struct of_device *ofdev, | 4396 | static int __devinit ppc440spe_adma_probe(struct platform_device *ofdev, |
4397 | const struct of_device_id *match) | 4397 | const struct of_device_id *match) |
4398 | { | 4398 | { |
4399 | struct device_node *np = ofdev->dev.of_node; | 4399 | struct device_node *np = ofdev->dev.of_node; |
@@ -4625,7 +4625,7 @@ out: | |||
4625 | /** | 4625 | /** |
4626 | * ppc440spe_adma_remove - remove the asynch device | 4626 | * ppc440spe_adma_remove - remove the asynch device |
4627 | */ | 4627 | */ |
4628 | static int __devexit ppc440spe_adma_remove(struct of_device *ofdev) | 4628 | static int __devexit ppc440spe_adma_remove(struct platform_device *ofdev) |
4629 | { | 4629 | { |
4630 | struct ppc440spe_adma_device *adev = dev_get_drvdata(&ofdev->dev); | 4630 | struct ppc440spe_adma_device *adev = dev_get_drvdata(&ofdev->dev); |
4631 | struct device_node *np = ofdev->dev.of_node; | 4631 | struct device_node *np = ofdev->dev.of_node; |