diff options
| author | Heiko Schocher <hs@denx.de> | 2014-05-22 12:43:05 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-27 10:21:32 -0400 |
| commit | 54c5d08a09e631f88738db54c75395c6457c2157 (patch) | |
| tree | 989241d18408f19062618bc380ef5948154f2334 /test/dm/test-fdt.c | |
| parent | 9665fa8f9e1488209d5e01d0792c243e0a220c5a (diff) | |
| download | u-boot-imx-54c5d08a09e631f88738db54c75395c6457c2157.zip u-boot-imx-54c5d08a09e631f88738db54c75395c6457c2157.tar.gz u-boot-imx-54c5d08a09e631f88738db54c75395c6457c2157.tar.bz2 | |
dm: rename device struct to udevice
using UBI and DM together leads in compiler error, as
both define a "struct device", so rename "struct device"
in include/dm/device.h to "struct udevice", as we use
linux code (MTD/UBI/UBIFS some USB code,...) and cannot
change the linux "struct device"
Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Marek Vasut <marex@denx.de>
Diffstat (limited to 'test/dm/test-fdt.c')
| -rw-r--r-- | test/dm/test-fdt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c index e1d982f..6eccf11 100644 --- a/test/dm/test-fdt.c +++ b/test/dm/test-fdt.c @@ -18,7 +18,7 @@ DECLARE_GLOBAL_DATA_PTR; -static int testfdt_drv_ping(struct device *dev, int pingval, int *pingret) +static int testfdt_drv_ping(struct udevice *dev, int pingval, int *pingret) { const struct dm_test_pdata *pdata = dev->platdata; struct dm_test_priv *priv = dev_get_priv(dev); @@ -33,7 +33,7 @@ static const struct test_ops test_ops = { .ping = testfdt_drv_ping, }; -static int testfdt_ofdata_to_platdata(struct device *dev) +static int testfdt_ofdata_to_platdata(struct udevice *dev) { struct dm_test_pdata *pdata = dev_get_platdata(dev); @@ -44,7 +44,7 @@ static int testfdt_ofdata_to_platdata(struct device *dev) return 0; } -static int testfdt_drv_probe(struct device *dev) +static int testfdt_drv_probe(struct udevice *dev) { struct dm_test_priv *priv = dev_get_priv(dev); @@ -75,7 +75,7 @@ U_BOOT_DRIVER(testfdt_drv) = { }; /* From here is the testfdt uclass code */ -int testfdt_ping(struct device *dev, int pingval, int *pingret) +int testfdt_ping(struct udevice *dev, int pingval, int *pingret) { const struct test_ops *ops = device_get_ops(dev); @@ -94,7 +94,7 @@ UCLASS_DRIVER(testfdt) = { static int dm_test_fdt(struct dm_test_state *dms) { const int num_drivers = 3; - struct device *dev; + struct udevice *dev; struct uclass *uc; int ret; int i; |