summaryrefslogtreecommitdiffstats
path: root/arch/sparc/include/asm/parport.h
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-07-22 21:59:23 +0200
committerGrant Likely <grant.likely@secretlab.ca>2010-07-24 17:58:21 +0200
commit94a0cb1fc61ab7a0d47d268a7764374efeb2160b (patch)
treec7da45e6023c77471e18215fb14eab1bc83739fa /arch/sparc/include/asm/parport.h
parentof/device: Protect against binding of_platform_drivers to non-OF devices (diff)
downloadlinux-94a0cb1fc61ab7a0d47d268a7764374efeb2160b.tar.xz
linux-94a0cb1fc61ab7a0d47d268a7764374efeb2160b.zip
of/device: Replace of_device with platform_device in includes and core code
of_device is currently just an #define alias to platform_device until it gets removed entirely. This patch removes references to it from the include directories and the core drivers/of code. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include/asm/parport.h')
-rw-r--r--arch/sparc/include/asm/parport.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/parport.h b/arch/sparc/include/asm/parport.h
index 4891fbce1114..4f7afa01b2ae 100644
--- a/arch/sparc/include/asm/parport.h
+++ b/arch/sparc/include/asm/parport.h
@@ -103,7 +103,7 @@ static inline unsigned int get_dma_residue(unsigned int dmanr)
return ebus_dma_residue(&sparc_ebus_dmas[dmanr].info);
}
-static int __devinit ecpp_probe(struct of_device *op, const struct of_device_id *match)
+static int __devinit ecpp_probe(struct platform_device *op, const struct of_device_id *match)
{
unsigned long base = op->resource[0].start;
unsigned long config = op->resource[1].start;
@@ -192,7 +192,7 @@ out_err:
return err;
}
-static int __devexit ecpp_remove(struct of_device *op)
+static int __devexit ecpp_remove(struct platform_device *op)
{
struct parport *p = dev_get_drvdata(&op->dev);
int slot = p->dma;