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

Unverified Commit 43004f31 authored by Linus Walleij's avatar Linus Walleij Committed by Mark Brown
Browse files

spi: Rename of_spi_register_master() function 



Rename this function to of_spi_get_gpio_numbers() as this
is what the function does, it does not register a master,
it is called in the path of registering a master so the
name is logical in a convoluted way, but it is better to
follow Rusty Russell's ABI level no 7:
"The obvious use is (probably) the correct one"

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20190808150321.23319-1-linus.walleij@linaro.org


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

drivers/spi/spi.c

+3 −3
Original line number Diff line number Diff line
@@ -2235,7 +2235,7 @@ struct spi_controller *__spi_alloc_controller(struct device *dev, 
EXPORT_SYMBOL_GPL(__spi_alloc_controller);



#ifdef CONFIG_OF

static int of_spi_register_master(struct spi_controller *ctlr)

static int of_spi_get_gpio_numbers(struct spi_controller *ctlr)

{

	int nb, i, *cs;

	struct device_node *np = ctlr->dev.of_node;
@@ -2268,7 +2268,7 @@ static int of_spi_register_master(struct spi_controller *ctlr) 
	return 0;

}

#else

static int of_spi_register_master(struct spi_controller *ctlr)

static int of_spi_get_gpio_numbers(struct spi_controller *ctlr)

{

	return 0;

}
@@ -2455,7 +2455,7 @@ int spi_register_controller(struct spi_controller *ctlr) 
			ctlr->mode_bits |= SPI_CS_HIGH;

		} else {

			/* Legacy code path for GPIOs from DT */

			status = of_spi_register_master(ctlr);

			status = of_spi_get_gpio_numbers(ctlr);

			if (status)

				return status;

		}