nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

spi: orion: Use device_get_match_data() helper

Browse source 
Use the device_get_match_data() helper instead of open coding.

Signed-off-by: Tian Tao <tiantao6@hisilicon.com>
Link: https://lore.kernel.org/r/1617258288-1490-1-git-send-email-tiantao6@hisilicon.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Tian Tao 2021-04-01 14:24:48 +08:00 committed by Mark Brown
parent 9a446cf97a
commit 0e6521f13c
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 2 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/spi/spi-orion.c
View file

@ -634,7 +634,6 @@ MODULE_DEVICE_TABLE(of, orion_spi_of_match_table);
static int orion_spi_probe(struct platform_device *pdev) static int orion_spi_probe(struct platform_device *pdev)
{ {
const struct of_device_id *of_id;
const struct orion_spi_dev *devdata; const struct orion_spi_dev *devdata;
struct spi_master *master; struct spi_master *master;
struct orion_spi *spi; struct orion_spi *spi;
@ -676,9 +675,8 @@ static int orion_spi_probe(struct platform_device *pdev)
spi->master = master; spi->master = master;
spi->dev = &pdev->dev; spi->dev = &pdev->dev;
of_id = of_match_device(orion_spi_of_match_table, &pdev->dev); devdata = device_get_match_data(&pdev->dev);
devdata = (of_id) ? of_id->data : &orion_spi_dev_data; spi->devdata = devdata ? devdata : &orion_spi_dev_data;
spi->devdata = devdata;
spi->clk = devm_clk_get(&pdev->dev, NULL); spi->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(spi->clk)) { if (IS_ERR(spi->clk)) {