| Message ID | 1617152319-17701-1-git-send-email-tiantao6@hisilicon.com |
|---|---|
| State | Accepted |
| Commit | 30700a057ce84e6f18f4cc3627570f8b2ae3c17f |
| Headers | show |
| Series | [v3] spi: davinci: Use device_get_match_data() helper | expand |
On Wed, 31 Mar 2021 08:58:39 +0800, Tian Tao wrote:
> Use the device_get_match_data() helper instead of open coding.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next
Thanks!
[1/1] spi: davinci: Use device_get_match_data() helper
commit: 30700a057ce84e6f18f4cc3627570f8b2ae3c17f
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-davinci.c b/drivers/spi/spi-davinci.c index 7453a1d..e114e6fe 100644 --- a/drivers/spi/spi-davinci.c +++ b/drivers/spi/spi-davinci.c @@ -817,18 +817,13 @@ static int spi_davinci_get_pdata(struct platform_device *pdev, struct davinci_spi *dspi) { struct device_node *node = pdev->dev.of_node; - struct davinci_spi_of_data *spi_data; + const struct davinci_spi_of_data *spi_data; struct davinci_spi_platform_data *pdata; unsigned int num_cs, intr_line = 0; - const struct of_device_id *match; pdata = &dspi->pdata; - match = of_match_device(davinci_spi_of_match, &pdev->dev); - if (!match) - return -ENODEV; - - spi_data = (struct davinci_spi_of_data *)match->data; + spi_data = device_get_match_data(&pdev->dev); pdata->version = spi_data->version; pdata->prescaler_limit = spi_data->prescaler_limit;
Use the device_get_match_data() helper instead of open coding. Signed-off-by: Tian Tao <tiantao6@hisilicon.com> Suggested-by: Fabio Estevam <festevam@gmail.com> --- v2: Removed forced type conversions. v3: Use the device_get_match_data() instead of of_the device_get_match_data() and update the commit message and patch name. --- drivers/spi/spi-davinci.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)