hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

soc: mediatek: mutex: Simplify with devm_platform_get_and_ioremap_resource() 

Convert platform_get_resource(), devm_ioremap_resource() to a single
call to devm_platform_get_and_ioremap_resource(), as this is exactly
what this function does.

While at it, also remove a redundant call to of_address_to_resource(),
as this was getting the address of the same resource index 0: we can
as well get the iostart from the 'regs' pointer.

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20220623121701.107512-1-angelogioacchino.delregno@collabora.com
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
This commit is contained in:
AngeloGioacchino Del Regno 2022-06-23 14:17:01 +02:00 committed by Matthias Brugger
parent 2b5764fb7b
commit 4d3ddc9bce
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/soc/mediatek/mtk-mutex.c
View File

@ -750,7 +750,7 @@ static int mtk_mutex_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct mtk_mutex_ctx *mtx; struct mtk_mutex_ctx *mtx;
struct resource *regs, addr; struct resource *regs;
int i; int i;
#if IS_REACHABLE(CONFIG_MTK_CMDQ) #if IS_REACHABLE(CONFIG_MTK_CMDQ)
int ret; int ret;
@ -774,11 +774,12 @@ static int mtk_mutex_probe(struct platform_device *pdev)
} }
} }
if (of_address_to_resource(dev->of_node, 0, &addr) < 0) { mtx->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &regs);
dev_err(dev, "Failed to get addr\n"); if (IS_ERR(mtx->regs)) {
return -EINVAL; dev_err(dev, "Failed to map mutex registers\n");
return PTR_ERR(mtx->regs);
} }
mtx->addr = addr.start; mtx->addr = regs->start;
#if IS_REACHABLE(CONFIG_MTK_CMDQ) #if IS_REACHABLE(CONFIG_MTK_CMDQ)
ret = cmdq_dev_get_client_reg(dev, &mtx->cmdq_reg, 0); ret = cmdq_dev_get_client_reg(dev, &mtx->cmdq_reg, 0);
@ -786,13 +787,6 @@ static int mtk_mutex_probe(struct platform_device *pdev)
dev_dbg(dev, "No mediatek,gce-client-reg!\n"); dev_dbg(dev, "No mediatek,gce-client-reg!\n");
#endif #endif
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
mtx->regs = devm_ioremap_resource(dev, regs);
if (IS_ERR(mtx->regs)) {
dev_err(dev, "Failed to map mutex registers\n");
return PTR_ERR(mtx->regs);
}
platform_set_drvdata(pdev, mtx); platform_set_drvdata(pdev, mtx);
return 0; return 0;