Re: [U-Boot] [PATCH v2 03/80] dm: test: bus: Use a local variable to simplify code

[Simon Glass]

On 25 March 2015 at 12:21, Simon Glass  wrote:
> Adjust this test to avoid repeating the same code too often.
>
> Signed-off-by: Simon Glass 
> ---
>
> Changes in v2: None
>
>  test/dm/bus.c | 16 ++--
>  1 file changed, 10 insertions(+), 6 deletions(-)

Applied to u-boot-dm/next.
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH v2 03/80] dm: test: bus: Use a local variable to simplify code

[Simon Glass]

Adjust this test to avoid repeating the same code too often.

Signed-off-by: Simon Glass 
---

Changes in v2: None

 test/dm/bus.c | 16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/test/dm/bus.c b/test/dm/bus.c
index faffe6a..116a52d 100644
--- a/test/dm/bus.c
+++ b/test/dm/bus.c
@@ -273,20 +273,22 @@ DM_TEST(dm_test_bus_parent_data, DM_TESTF_SCAN_PDATA | 
DM_TESTF_SCAN_FDT);
 /* As above but the size is controlled by the uclass */
 static int dm_test_bus_parent_data_uclass(struct dm_test_state *dms)
 {
+   struct driver *drv;
struct udevice *bus;
int size;
int ret;
 
/* Set the driver size to 0 so that the uclass size is used */
ut_assertok(uclass_find_device(UCLASS_TEST_BUS, 0, &bus));
-   size = bus->driver->per_child_auto_alloc_size;
+   drv = (struct driver *)bus->driver;
+   size = drv->per_child_auto_alloc_size;
bus->uclass->uc_drv->per_child_auto_alloc_size = size;
-   bus->driver->per_child_auto_alloc_size = 0;
+   drv->per_child_auto_alloc_size = 0;
ret = test_bus_parent_data(dms);
if (ret)
return ret;
bus->uclass->uc_drv->per_child_auto_alloc_size = 0;
-   bus->driver->per_child_auto_alloc_size = size;
+   drv->per_child_auto_alloc_size = size;
 
return 0;
 }
@@ -414,19 +416,21 @@ DM_TEST(dm_test_bus_parent_platdata, DM_TESTF_SCAN_PDATA 
| DM_TESTF_SCAN_FDT);
 static int dm_test_bus_parent_platdata_uclass(struct dm_test_state *dms)
 {
struct udevice *bus;
+   struct driver *drv;
int size;
int ret;
 
/* Set the driver size to 0 so that the uclass size is used */
ut_assertok(uclass_find_device(UCLASS_TEST_BUS, 0, &bus));
-   size = bus->driver->per_child_platdata_auto_alloc_size;
+   drv = (struct driver *)bus->driver;
+   size = drv->per_child_platdata_auto_alloc_size;
bus->uclass->uc_drv->per_child_platdata_auto_alloc_size = size;
-   bus->driver->per_child_platdata_auto_alloc_size = 0;
+   drv->per_child_platdata_auto_alloc_size = 0;
ret = test_bus_parent_platdata(dms);
if (ret)
return ret;
bus->uclass->uc_drv->per_child_platdata_auto_alloc_size = 0;
-   bus->driver->per_child_platdata_auto_alloc_size = size;
+   drv->per_child_platdata_auto_alloc_size = size;
 
return 0;
 }
-- 
2.2.0.rc0.207.ga3a616c

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot