Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

spi: fsl-lpspi: Clean up fsl_lpspi_probe

Use is_slave local variable to avoid calling of_property_read_bool() twice.
Remove redudant assignment for controller->bus_num, set it once is enough.
Move setting controller->bits_per_word_mask close to the code init other
controller fields.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Axel Lin and committed by
Mark Brown
5d785141 a18656ea

+5 -6
+5 -6
drivers/spi/spi-fsl-lpspi.c
··· 843 843 struct resource *res; 844 844 int i, ret, irq; 845 845 u32 temp; 846 + bool is_slave; 846 847 847 - if (of_property_read_bool((&pdev->dev)->of_node, "spi-slave")) 848 + is_slave = of_property_read_bool((&pdev->dev)->of_node, "spi-slave"); 849 + if (is_slave) 848 850 controller = spi_alloc_slave(&pdev->dev, 849 851 sizeof(struct fsl_lpspi_data)); 850 852 else ··· 858 856 859 857 platform_set_drvdata(pdev, controller); 860 858 861 - controller->bits_per_word_mask = SPI_BPW_RANGE_MASK(8, 32); 862 - controller->bus_num = pdev->id; 863 - 864 859 fsl_lpspi = spi_controller_get_devdata(controller); 865 860 fsl_lpspi->dev = &pdev->dev; 866 - fsl_lpspi->is_slave = of_property_read_bool((&pdev->dev)->of_node, 867 - "spi-slave"); 861 + fsl_lpspi->is_slave = is_slave; 868 862 869 863 if (!fsl_lpspi->is_slave) { 870 864 for (i = 0; i < controller->num_chipselect; i++) { ··· 885 887 controller->prepare_message = fsl_lpspi_prepare_message; 886 888 } 887 889 890 + controller->bits_per_word_mask = SPI_BPW_RANGE_MASK(8, 32); 888 891 controller->transfer_one = fsl_lpspi_transfer_one; 889 892 controller->prepare_transfer_hardware = lpspi_prepare_xfer_hardware; 890 893 controller->unprepare_transfer_hardware = lpspi_unprepare_xfer_hardware;