| Message ID | 20230717085934.409476-1-alexander.stein@ew.tq-group.com |
|---|---|
| State | Accepted |
| Commit | a55265eeedafee12d9743196ce5bb43266509c31 |
| Headers | show |
| Series | [v2,1/3] spi: spi-fsl-lpspi: Remove num_cs from device struct | expand |
On Mon, 17 Jul 2023 10:59:32 +0200, Alexander Stein wrote: > This is only used during probe() call, so there is no need to store it > longer than that. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/3] spi: spi-fsl-lpspi: Remove num_cs from device struct commit: a55265eeedafee12d9743196ce5bb43266509c31 [2/3] spi: spi-fsl-lpspi: Move controller initialization further down (no commit info) [3/3] spi: spi-fsl-lpspi: Read chip-select amount from hardware for i.MX93 (no commit info) All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/drivers/spi/spi-fsl-lpspi.c b/drivers/spi/spi-fsl-lpspi.c index dfdcb69f66ab..0a0677f11a3d 100644 --- a/drivers/spi/spi-fsl-lpspi.c +++ b/drivers/spi/spi-fsl-lpspi.c @@ -97,7 +97,6 @@ struct fsl_lpspi_data { struct clk *clk_ipg; struct clk *clk_per; bool is_slave; - u32 num_cs; bool is_only_cs1; bool is_first_byte; @@ -825,6 +824,7 @@ static int fsl_lpspi_probe(struct platform_device *pdev) struct spi_controller *controller; struct resource *res; int ret, irq; + u32 num_cs; u32 temp; bool is_slave; @@ -847,8 +847,8 @@ static int fsl_lpspi_probe(struct platform_device *pdev) fsl_lpspi->is_only_cs1 = of_property_read_bool((&pdev->dev)->of_node, "fsl,spi-only-use-cs1-sel"); if (of_property_read_u32((&pdev->dev)->of_node, "num-cs", - &fsl_lpspi->num_cs)) - fsl_lpspi->num_cs = 1; + &num_cs)) + num_cs = 1; controller->bits_per_word_mask = SPI_BPW_RANGE_MASK(8, 32); controller->transfer_one = fsl_lpspi_transfer_one; @@ -858,7 +858,7 @@ static int fsl_lpspi_probe(struct platform_device *pdev) controller->flags = SPI_CONTROLLER_MUST_RX | SPI_CONTROLLER_MUST_TX; controller->dev.of_node = pdev->dev.of_node; controller->bus_num = pdev->id; - controller->num_chipselect = fsl_lpspi->num_cs; + controller->num_chipselect = num_cs; controller->slave_abort = fsl_lpspi_slave_abort; if (!fsl_lpspi->is_slave) controller->use_gpio_descriptors = true;
This is only used during probe() call, so there is no need to store it longer than that. Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> --- Changes in v2: * Rebase to next-20230717 drivers/spi/spi-fsl-lpspi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)