spi: omap2-mcspi: Use of_device_get_match_data()
PATCH 1/1 spi: omap2-mcspi: Use of_device_get_match_data()
Use of_device_get_match_data() to fetch platform match data directly instead of open-coding an of_match_device() lookup.
This also lets the driver drop the of_device.h include.
--- drivers/spi/spi-omap2-mcspi.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/spi/spi-omap2-mcspi.c +2 -5
@@ -22,7 +22,6 @@#include <linux/slab.h> #include <linux/pm_runtime.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/gcd.h> #include <linux/spi/spi.h>
@@ -1481,7 +1480,6 @@ static int omap2_mcspi_probe(struct platform_device *pdev)int status =0 , i;u32 regs_offset =0 ;struct device_node *node = pdev->dev.of_node; -const struct of_device_id *match;if (of_property_read_bool (node,"spi-slave" )) ctlr =devm_spi_alloc_target (&pdev->dev,sizeof (*mcspi));
@@ -1509,10 +1507,9 @@ static int omap2_mcspi_probe(struct platform_device *pdev) mcspi =spi_controller_get_devdata (ctlr); mcspi->ctlr = ctlr; - match =of_match_device (omap_mcspi_of_match, &pdev->dev); -if (match) { + pdata =of_device_get_match_data (&pdev->dev); +if (pdata) {u32 num_cs =1 ;/* default number of chipselect */ - pdata = match->data;of_property_read_u32 (node,"ti,spi-num-cs" , &num_cs); ctlr->num_chipselect = num_cs;
--
2.54.0
Mark Brown
maintainerQuoted 1 line · Rosen Penev
spi: omap2-mcspi: Use
of_device_get_match_data()
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-7.2
Thanks!
[1/1] spi: omap2-mcspi: Use of_device_get_match_data()
https://git.kernel.org/broonie/spi/c/82056957e5c4
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