Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cabb7d5b authored by Grant Likely's avatar Grant Likely
Browse files

of/selftest: Use selftest() macro throughout 



Some of the selftests are open-coded. Others use the selftest() macro
defined in drivers/of/selftest.c. The macro makes for cleaner selftest
code, so refactor the of_parse_phandle_with_args() tests to use it.

Cc: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent f7f951c2

drivers/of/selftest.c

+14 −23
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * Self tests for device tree subsystem

 */



#define pr_fmt(fmt) "### %s(): " fmt, __func__

#define pr_fmt(fmt) "### dt-test ### " fmt



#include <linux/clk.h>

#include <linux/err.h>
@@ -16,19 +16,20 @@ 


static bool selftest_passed = true;

#define selftest(result, fmt, ...) { \

	selftest_passed &= (result); \

	if (!(result)) \

	if (!(result)) { \

		pr_err("FAIL %s:%i " fmt, __FILE__, __LINE__, ##__VA_ARGS__); \

		selftest_passed = false; \

	} else { \

		pr_info("pass %s:%i\n", __FILE__, __LINE__); \

	} \

}



static void __init of_selftest_parse_phandle_with_args(void)

{

	struct device_node *np;

	struct of_phandle_args args;

	int rc, i;

	bool passed_all = true;

	int i, rc;



	pr_info("start\n");

	np = of_find_node_by_path("/testcase-data/phandle-tests/consumer-a");

	if (!np) {

		pr_err("missing testcase data\n");
@@ -79,45 +80,35 @@ static void __init of_selftest_parse_phandle_with_args(void) 
			passed &= (args.args[0] == (i + 1));

			break;

		case 7:

			passed &= (rc == -EINVAL);

			passed &= (rc == -ENOENT);

			break;

		default:

			passed = false;

		}



		if (!passed) {

			int j;

			pr_err("index %i - data error on node %s rc=%i regs=[",

		selftest(passed, "index %i - data error on node %s rc=%i\n",

			 i, args.np->full_name, rc);

			for (j = 0; j < args.args_count; j++)

				printk(" %i", args.args[j]);

			printk(" ]\n");



			passed_all = false;

		}

	}



	/* Check for missing list property */

	rc = of_parse_phandle_with_args(np, "phandle-list-missing",

					"#phandle-cells", 0, &args);

	passed_all &= (rc == -EINVAL);

	selftest(rc == -ENOENT, "expected:%i got:%i\n", -ENOENT, rc);



	/* Check for missing cells property */

	rc = of_parse_phandle_with_args(np, "phandle-list",

					"#phandle-cells-missing", 0, &args);

	passed_all &= (rc == -EINVAL);

	selftest(rc == -EINVAL, "expected:%i got:%i\n", -EINVAL, rc);



	/* Check for bad phandle in list */

	rc = of_parse_phandle_with_args(np, "phandle-list-bad-phandle",

					"#phandle-cells", 0, &args);

	passed_all &= (rc == -EINVAL);

	selftest(rc == -EINVAL, "expected:%i got:%i\n", -EINVAL, rc);



	/* Check for incorrectly formed argument list */

	rc = of_parse_phandle_with_args(np, "phandle-list-bad-args",

					"#phandle-cells", 1, &args);

	passed_all &= (rc == -EINVAL);



	pr_info("end - %s\n", passed_all ? "PASS" : "FAIL");

	selftest(rc == -EINVAL, "expected:%i got:%i\n", -EINVAL, rc);

}



static void __init of_selftest_property_match_string(void)