| Message ID | 20210615141502.1683686-1-yangyingliang@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4ffbcd4ab0b6f77d29acde69dc25bd95318fae5e |
| Headers | show |
| Series | [-next,1/3] ASoC: rockchip: i2s: Use devm_platform_get_and_ioremap_resource() | expand |
On Tue, 15 Jun 2021 22:15:00 +0800, Yang Yingliang wrote: > Use devm_platform_get_and_ioremap_resource() to simplify > code. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/3] ASoC: rockchip: i2s: Use devm_platform_get_and_ioremap_resource() commit: 4ffbcd4ab0b6f77d29acde69dc25bd95318fae5e [2/3] ASoC: rockchip: pdm: Use devm_platform_get_and_ioremap_resource() commit: db4d6d2e6472a5a49801bb5f2c1bd96ed6ffa3d1 [3/3] ASoC: rockchip: spdif: Use devm_platform_get_and_ioremap_resource() commit: 3325b1515a92fc07ec16b4d33c8bccc0a83f12ca 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/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 0740764e7f71..c7dc3509bceb 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -618,8 +618,7 @@ static int rockchip_i2s_probe(struct platform_device *pdev) return PTR_ERR(i2s->mclk); } - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - regs = devm_ioremap_resource(&pdev->dev, res); + regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res); if (IS_ERR(regs)) return PTR_ERR(regs);
Use devm_platform_get_and_ioremap_resource() to simplify code. Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- sound/soc/rockchip/rockchip_i2s.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)