summaryrefslogtreecommitdiffstats
path: root/drivers/of
diff options
context:
space:
mode:
authorAlexander Sverdlin <alexander.sverdlin@nokia.com>2017-01-19 11:06:16 +0100
committerRob Herring <robh@kernel.org>2017-01-23 14:58:03 -0600
commitca7b89647b76a2f5c26f0927bb72fdaf854d6592 (patch)
tree590a0889cf74a91d75da56417aa8f8fd664b6d88 /drivers/of
parenta51741ebe1315c88488ed35f942e95f427ea2d31 (diff)
downloadlinux-stable-ca7b89647b76a2f5c26f0927bb72fdaf854d6592.tar.gz
linux-stable-ca7b89647b76a2f5c26f0927bb72fdaf854d6592.tar.bz2
linux-stable-ca7b89647b76a2f5c26f0927bb72fdaf854d6592.zip
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 <alexander.sverdlin@nokia.com> Cc: Rob Herring <robh+dt@kernel.org> Cc: Frank Rowand <frowand.list@gmail.com> Cc: devicetree@vger.kernel.org Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/unittest.c4
1 files changed, 2 insertions, 2 deletions
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;