diff options
| author | Simon Glass <sjg@chromium.org> | 2017-01-17 16:52:55 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2017-02-08 06:12:14 -0700 |
| commit | e160f7d430f163bc42757aff3bf2bcac0a459f02 (patch) | |
| tree | ce006f94b4a52f6fff567eacd86922c3be6df706 /test | |
| parent | 8aa41363ebf46b9ff63b311bd2aa793c67a49def (diff) | |
| download | u-boot-e160f7d430f163bc42757aff3bf2bcac0a459f02.zip u-boot-e160f7d430f163bc42757aff3bf2bcac0a459f02.tar.gz u-boot-e160f7d430f163bc42757aff3bf2bcac0a459f02.tar.bz2 | |
dm: core: Replace of_offset with accessor
At present devices use a simple integer offset to record the device tree
node associated with the device. In preparation for supporting a live
device tree, which uses a node pointer instead, refactor existing code to
access this field through an inline function.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/dm/spi.c | 2 | ||||
| -rw-r--r-- | test/dm/test-fdt.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/dm/spi.c b/test/dm/spi.c index 5733096..f52cb73 100644 --- a/test/dm/spi.c +++ b/test/dm/spi.c @@ -35,7 +35,7 @@ static int dm_test_spi_find(struct unit_test_state *uts) */ ut_asserteq(0, uclass_get_device_by_seq(UCLASS_SPI, busnum, &bus)); ut_assertok(spi_cs_info(bus, cs, &info)); - of_offset = info.dev->of_offset; + of_offset = dev_of_offset(info.dev); device_remove(info.dev); device_unbind(info.dev); diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c index 49a36cb..3048a7b 100644 --- a/test/dm/test-fdt.c +++ b/test/dm/test-fdt.c @@ -37,9 +37,9 @@ static int testfdt_ofdata_to_platdata(struct udevice *dev) { struct dm_test_pdata *pdata = dev_get_platdata(dev); - pdata->ping_add = fdtdec_get_int(gd->fdt_blob, dev->of_offset, + pdata->ping_add = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), "ping-add", -1); - pdata->base = fdtdec_get_addr(gd->fdt_blob, dev->of_offset, + pdata->base = fdtdec_get_addr(gd->fdt_blob, dev_of_offset(dev), "ping-expect"); return 0; @@ -121,10 +121,10 @@ int dm_check_devices(struct unit_test_state *uts, int num_devices) * want to test the code that sets that up * (testfdt_drv_probe()). */ - base = fdtdec_get_addr(gd->fdt_blob, dev->of_offset, + base = fdtdec_get_addr(gd->fdt_blob, dev_of_offset(dev), "ping-expect"); debug("dev=%d, base=%d: %s\n", i, base, - fdt_get_name(gd->fdt_blob, dev->of_offset, NULL)); + fdt_get_name(gd->fdt_blob, dev_of_offset(dev), NULL)); ut_assert(!dm_check_operations(uts, dev, base, dev_get_priv(dev))); |