Commit 1c5d33ff authored by Andi Shyti's avatar Andi Shyti Committed by Wolfram Sang
Browse files

i2c: nomadik: Remove unnecessary goto label 



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

Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent a7fbfd44

drivers/i2c/busses/i2c-nomadik.c

+8 −13
Original line number Diff line number Diff line
@@ -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;



	dev = devm_kzalloc(&adev->dev, sizeof(*dev), GFP_KERNEL);

	if (!dev) {

		ret = -ENOMEM;

		goto err_no_mem;

	}

	if (!dev)

		return -ENOMEM;



	dev->vendor = vendor;

	dev->adev = adev;

	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,

				resource_size(&adev->res));

	if (!dev->virtbase) {

		ret = -ENOMEM;

		goto err_no_mem;

	}

	if (!dev->virtbase)

		return -ENOMEM;



	dev->irq = adev->irq[0];

	ret = devm_request_irq(&adev->dev, dev->irq, i2c_irq_handler, 0,

				DRIVER_NAME, dev);

	if (ret) {

		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);

	if (IS_ERR(dev->clk)) {

		dev_err(&adev->dev, "could not get i2c clock\n");

		ret = PTR_ERR(dev->clk);

		goto err_no_mem;

		return PTR_ERR(dev->clk);

	}



	ret = clk_prepare_enable(dev->clk);

	if (ret) {

		dev_err(&adev->dev, "can't prepare_enable clock\n");

		goto err_no_mem;

		return ret;

	}



	init_hw(dev);
@@ -1049,7 +1045,6 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) 


 err_no_adap:

	clk_disable_unprepare(dev->clk);

 err_no_mem:



	return ret;

}