Unverified Commit fbab5b2c authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mark Brown
Browse files

spi: Remove unneeded OF node NULL checks 



In the couple of places the NULL check of OF node is implied by the call
that takes it as a parameter. Drop the respective duplicate checks.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230710154932.68377-2-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 06c2afb8

drivers/spi/spi.c

+1 −4
Original line number Diff line number Diff line
@@ -2399,9 +2399,6 @@ static void of_register_spi_devices(struct spi_controller *ctlr) 
	struct spi_device *spi;

	struct device_node *nc;



	if (!ctlr->dev.of_node)

		return;



	for_each_available_child_of_node(ctlr->dev.of_node, nc) {

		if (of_node_test_and_set_flag(nc, OF_POPULATED))

			continue;
@@ -3134,7 +3131,7 @@ int spi_register_controller(struct spi_controller *ctlr) 
		if (WARN(id < 0, "couldn't get idr"))

			return id == -ENOSPC ? -EBUSY : id;

		ctlr->bus_num = id;

	} else if (ctlr->dev.of_node) {

	} else {

		/* Allocate dynamic bus number using Linux idr */

		id = of_alias_get_id(ctlr->dev.of_node, "spi");

		if (id >= 0) {