Commit b0f6807d authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman
Browse files

base: soc: Make soc_device_match() simpler and easier to read 



The function soc_device_match() is difficult to read for various
reasons:
  - There are two loop conditions using different styles: "while (...)"
    (which is BTW always true) vs. "if ... break",
  - The are two return condition using different logic: "if ... return
    foo" vs. "if ... else return bar".

Make the code easier to read by:
  1. Removing the always-true "!ret" loop condition, and dropping the
     now unneeded pre-initialization of "ret",
  2. Converting "if ... break" to a proper "while (...)" loop condition,
  3. Inverting the logic of the second return condition.

Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/9f9107c06f7d065ae6581e5290ef5d72f7298fd1.1646132835.git.geert+renesas@glider.be


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f2aad547

drivers/base/soc.c

+6 −8
Original line number Diff line number Diff line
@@ -241,15 +241,13 @@ static int soc_device_match_one(struct device *dev, void *arg) 
const struct soc_device_attribute *soc_device_match(

	const struct soc_device_attribute *matches)

{

	int ret = 0;

	int ret;



	if (!matches)

		return NULL;



	while (!ret) {

		if (!(matches->machine || matches->family ||

		      matches->revision || matches->soc_id))

			break;

	while (matches->machine || matches->family || matches->revision ||

	       matches->soc_id) {

		ret = bus_for_each_dev(&soc_bus_type, NULL, (void *)matches,

				       soc_device_match_one);

		if (ret < 0 && early_soc_dev_attr)
@@ -257,10 +255,10 @@ const struct soc_device_attribute *soc_device_match( 
						    matches);

		if (ret < 0)

			return NULL;

		if (!ret)

			matches++;

		else

		if (ret)

			return matches;



		matches++;

	}

	return NULL;

}