xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i2c: nomadik: Remove unnecessary goto label

Browse Source 
[ Upstream commit 1c5d33fff0d375e4ab7c4261dc62a286babbb4c6 ]

The err_no_mem goto label doesn't do anything. Remove it.

Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Stable-dep-of: 05f933d5f731 ("i2c: nomadik: Remove a useless call in the remove function")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Andi Shyti
2023-06-11 03:36:59 +02:00
committed by Greg Kroah-Hartman
parent 04b1140678
commit ec954a4ab0
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/i2c/busses/i2c-nomadik.c
View File

@@ -971,10 +971,9 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
u32 max_fifo_threshold = (vendor->fifodepth / 2) - 1; u32 max_fifo_threshold = (vendor->fifodepth / 2) - 1;
dev = devm_kzalloc(&adev->dev, sizeof(*dev), GFP_KERNEL); dev = devm_kzalloc(&adev->dev, sizeof(*dev), GFP_KERNEL);
if (!dev) { if (!dev)
ret = -ENOMEM; return -ENOMEM;
goto err_no_mem;
}
dev->vendor = vendor; dev->vendor = vendor;
dev->adev = adev; dev->adev = adev;
nmk_i2c_of_probe(np, dev); nmk_i2c_of_probe(np, dev);
@@ -995,30 +994,27 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
dev->virtbase = devm_ioremap(&adev->dev, adev->res.start, dev->virtbase = devm_ioremap(&adev->dev, adev->res.start,
resource_size(&adev->res)); resource_size(&adev->res));
if (!dev->virtbase) { if (!dev->virtbase)
ret = -ENOMEM; return -ENOMEM;
goto err_no_mem;
}
dev->irq = adev->irq[0]; dev->irq = adev->irq[0];
ret = devm_request_irq(&adev->dev, dev->irq, i2c_irq_handler, 0, ret = devm_request_irq(&adev->dev, dev->irq, i2c_irq_handler, 0,
DRIVER_NAME, dev); DRIVER_NAME, dev);
if (ret) { if (ret) {
dev_err(&adev->dev, "cannot claim the irq %d\n", dev->irq); dev_err(&adev->dev, "cannot claim the irq %d\n", dev->irq);
goto err_no_mem; return ret;
} }
dev->clk = devm_clk_get(&adev->dev, NULL); dev->clk = devm_clk_get(&adev->dev, NULL);
if (IS_ERR(dev->clk)) { if (IS_ERR(dev->clk)) {
dev_err(&adev->dev, "could not get i2c clock\n"); dev_err(&adev->dev, "could not get i2c clock\n");
ret = PTR_ERR(dev->clk); return PTR_ERR(dev->clk);
goto err_no_mem;
} }
ret = clk_prepare_enable(dev->clk); ret = clk_prepare_enable(dev->clk);
if (ret) { if (ret) {
dev_err(&adev->dev, "can't prepare_enable clock\n"); dev_err(&adev->dev, "can't prepare_enable clock\n");
goto err_no_mem; return ret;
} }
init_hw(dev); init_hw(dev);
@@ -1049,7 +1045,6 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
err_no_adap: err_no_adap:
clk_disable_unprepare(dev->clk); clk_disable_unprepare(dev->clk);
err_no_mem:
return ret; return ret;
} }