Unverified Commit 9ac42035 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-arm-soc-for-v7.1-tag1' of... 

Merge tag 'renesas-arm-soc-for-v7.1-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into soc/arm

Renesas ARM SoC updates for v7.1

  - Use the of_phandle_args_equal() helper.

* tag 'renesas-arm-soc-for-v7.1-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel

:
  ARM: shmobile: rcar-gen2: Use of_phandle_args_equal() helper

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 23e4b053 d784bbad

arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c

+4 −12
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static struct notifier_block regulator_quirk_nb = { 
static int __init rcar_gen2_regulator_quirk(void)

{

	struct regulator_quirk *quirk, *pos, *tmp;

	struct of_phandle_args *argsa, *argsb;

	struct of_phandle_args *args;

	const struct of_device_id *id;

	struct device_node *np;

	u32 mon, addr;
@@ -171,14 +171,14 @@ static int __init rcar_gen2_regulator_quirk(void) 
			goto err_mem;

		}



		argsa = &quirk->irq_args;

		args = &quirk->irq_args;

		memcpy(&quirk->i2c_msg, id->data, sizeof(quirk->i2c_msg));



		quirk->id = id;

		quirk->np = of_node_get(np);

		quirk->i2c_msg.addr = addr;



		ret = of_irq_parse_one(np, 0, argsa);

		ret = of_irq_parse_one(np, 0, args);

		if (ret) {	/* Skip invalid entry and continue */

			of_node_put(np);

			kfree(quirk);
@@ -186,15 +186,7 @@ static int __init rcar_gen2_regulator_quirk(void) 
		}



		list_for_each_entry(pos, &quirk_list, list) {

			argsb = &pos->irq_args;



			if (argsa->args_count != argsb->args_count)

				continue;



			ret = memcmp(argsa->args, argsb->args,

				     argsa->args_count *

				     sizeof(argsa->args[0]));

			if (!ret) {

			if (of_phandle_args_equal(args, &pos->irq_args)) {

				pos->shared = true;

				quirk->shared = true;

			}