projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
[oweals/u-boot.git]
/
test
/
dm
/
test-uclass.c
diff --git
a/test/dm/test-uclass.c
b/test/dm/test-uclass.c
index 8b564b89d98ced370c0f524f2f0752154674a9bf..017e097928c7c29c2aadfd0c80f187833d258574 100644
(file)
--- 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;
static struct dm_test_state *dms = &global_test_state;
-int test_ping(struct device *dev, int pingval, int *pingret)
+int test_ping(struct
u
device *dev, int pingval, int *pingret)
{
const struct test_ops *ops = device_get_ops(dev);
{
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);
}
return ops->ping(dev, pingval, pingret);
}
-static int test_post_bind(struct device *dev)
+static int test_post_bind(struct
u
device *dev)
{
dm_testdrv_op_count[DM_TEST_OP_POST_BIND]++;
return 0;
}
{
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
u
device *dev)
{
dm_testdrv_op_count[DM_TEST_OP_PRE_UNBIND]++;
return 0;
}
{
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
u
device *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;
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;
}
return 0;
}
-static int test_pre_remove(struct device *dev)
+static int test_pre_remove(struct
u
device *dev)
{
dm_testdrv_op_count[DM_TEST_OP_PRE_REMOVE]++;
{
dm_testdrv_op_count[DM_TEST_OP_PRE_REMOVE]++;