diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-07-16 08:51:30 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-07-16 08:51:30 +0200 |
| commit | dab5e3469d294a4e1ffed8407d296a78e02cc01f (patch) | |
| tree | c6378034591210b3142ca3add806d52c6ea22b3b /test/dm/test-uclass.c | |
| parent | 14a1613140519a8d0a88e6054c302a8cb3e067a5 (diff) | |
| parent | 524123a70761110c5cf3ccc5f52f6d4da071b959 (diff) | |
| download | u-boot-imx-dab5e3469d294a4e1ffed8407d296a78e02cc01f.zip u-boot-imx-dab5e3469d294a4e1ffed8407d296a78e02cc01f.tar.gz u-boot-imx-dab5e3469d294a4e1ffed8407d296a78e02cc01f.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot
Signed-off-by: Stefano Babic <sbabic@denx.de>
Conflicts:
boards.cfg
Diffstat (limited to 'test/dm/test-uclass.c')
| -rw-r--r-- | test/dm/test-uclass.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/test/dm/test-uclass.c b/test/dm/test-uclass.c index 8b564b8..017e097 100644 --- a/test/dm/test-uclass.c +++ b/test/dm/test-uclass.c @@ -18,7 +18,7 @@ static struct dm_test_state *dms = &global_test_state; -int test_ping(struct device *dev, int pingval, int *pingret) +int test_ping(struct udevice *dev, int pingval, int *pingret) { const struct test_ops *ops = device_get_ops(dev); @@ -28,24 +28,25 @@ int test_ping(struct device *dev, int pingval, int *pingret) return ops->ping(dev, pingval, pingret); } -static int test_post_bind(struct device *dev) +static int test_post_bind(struct udevice *dev) { dm_testdrv_op_count[DM_TEST_OP_POST_BIND]++; return 0; } -static int test_pre_unbind(struct device *dev) +static int test_pre_unbind(struct udevice *dev) { dm_testdrv_op_count[DM_TEST_OP_PRE_UNBIND]++; return 0; } -static int test_post_probe(struct device *dev) +static int test_post_probe(struct udevice *dev) { - struct device *prev = list_entry(dev->uclass_node.prev, struct device, - uclass_node); + struct udevice *prev = list_entry(dev->uclass_node.prev, + struct udevice, uclass_node); + struct dm_test_uclass_perdev_priv *priv = dev->uclass_priv; struct uclass *uc = dev->uclass; @@ -68,7 +69,7 @@ static int test_post_probe(struct device *dev) return 0; } -static int test_pre_remove(struct device *dev) +static int test_pre_remove(struct udevice *dev) { dm_testdrv_op_count[DM_TEST_OP_PRE_REMOVE]++; |