From: Alexander Sverdlin Date: Thu, 19 Jan 2017 10:06:16 +0000 (+0100) Subject: of/unittest: Swap arguments of of_unittest_apply_overlay() X-Git-Tag: v4.11-rc1~107^2~10 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=ca7b89647b76a2f5c26f0927bb72fdaf854d6592;p=linux.git of/unittest: Swap arguments of of_unittest_apply_overlay() Function signature of_unittest_apply_overlay(int unittest_nr, int overlay_nr, ... and call sites, like in of_unittest_apply_overlay_check(): ret = of_unittest_apply_overlay(overlay_nr, unittest_nr, ... do not match. Fix this in one place (function signature). The only affected test case is 15, which supplies non-existing overlay number 16, but two bugs matched here. Fix the test case. Signed-off-by: Alexander Sverdlin Cc: Rob Herring Cc: Frank Rowand Cc: devicetree@vger.kernel.org Signed-off-by: Rob Herring --- diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index b4e823615f2c..62db55b97c10 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -1180,7 +1180,7 @@ static void of_unittest_destroy_tracked_overlays(void) } while (defers > 0); } -static int of_unittest_apply_overlay(int unittest_nr, int overlay_nr, +static int of_unittest_apply_overlay(int overlay_nr, int unittest_nr, int *overlay_id) { struct device_node *np = NULL; @@ -1839,7 +1839,7 @@ static void of_unittest_overlay_i2c_15(void) int ret; /* device should enable */ - ret = of_unittest_apply_overlay_check(16, 15, 0, 1, I2C_OVERLAY); + ret = of_unittest_apply_overlay_check(15, 15, 0, 1, I2C_OVERLAY); if (ret != 0) return;