openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: jz4740-i2s: Add local dev variable in probe function 

Make the code cleaner by using a "struct device *dev" variable instead
of dereferencing it everytime from within the struct platform_device.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20200306222931.39664-3-paul@crapouillou.net
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Paul Cercueil 2020-03-06 23:29:28 +01:00 committed by Mark Brown
parent ab985be95d
commit a42d9ba15c
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sound/soc/jz4740/jz4740-i2s.c
View File

@ -492,45 +492,45 @@ MODULE_DEVICE_TABLE(of, jz4740_of_matches);
static int jz4740_i2s_dev_probe(struct platform_device *pdev) static int jz4740_i2s_dev_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev;
struct jz4740_i2s *i2s; struct jz4740_i2s *i2s;
struct resource *mem; struct resource *mem;
int ret; int ret;
i2s = devm_kzalloc(&pdev->dev, sizeof(*i2s), GFP_KERNEL); i2s = devm_kzalloc(dev, sizeof(*i2s), GFP_KERNEL);
if (!i2s) if (!i2s)
return -ENOMEM; return -ENOMEM;
i2s->version = i2s->version = (enum jz47xx_i2s_version)of_device_get_match_data(dev);
(enum jz47xx_i2s_version)of_device_get_match_data(&pdev->dev);
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
i2s->base = devm_ioremap_resource(&pdev->dev, mem); i2s->base = devm_ioremap_resource(dev, mem);
if (IS_ERR(i2s->base)) if (IS_ERR(i2s->base))
return PTR_ERR(i2s->base); return PTR_ERR(i2s->base);
i2s->phys_base = mem->start; i2s->phys_base = mem->start;
i2s->clk_aic = devm_clk_get(&pdev->dev, "aic"); i2s->clk_aic = devm_clk_get(dev, "aic");
if (IS_ERR(i2s->clk_aic)) if (IS_ERR(i2s->clk_aic))
return PTR_ERR(i2s->clk_aic); return PTR_ERR(i2s->clk_aic);
i2s->clk_i2s = devm_clk_get(&pdev->dev, "i2s"); i2s->clk_i2s = devm_clk_get(dev, "i2s");
if (IS_ERR(i2s->clk_i2s)) if (IS_ERR(i2s->clk_i2s))
return PTR_ERR(i2s->clk_i2s); return PTR_ERR(i2s->clk_i2s);
platform_set_drvdata(pdev, i2s); platform_set_drvdata(pdev, i2s);
if (i2s->version == JZ_I2S_JZ4780) if (i2s->version == JZ_I2S_JZ4780)
ret = devm_snd_soc_register_component(&pdev->dev, ret = devm_snd_soc_register_component(dev,
&jz4740_i2s_component, &jz4780_i2s_dai, 1); &jz4740_i2s_component, &jz4780_i2s_dai, 1);
else else
ret = devm_snd_soc_register_component(&pdev->dev, ret = devm_snd_soc_register_component(dev,
&jz4740_i2s_component, &jz4740_i2s_dai, 1); &jz4740_i2s_component, &jz4740_i2s_dai, 1);
if (ret) if (ret)
return ret; return ret;
return devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, return devm_snd_dmaengine_pcm_register(dev, NULL,
SND_DMAENGINE_PCM_FLAG_COMPAT); SND_DMAENGINE_PCM_FLAG_COMPAT);
} }