Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea734404 authored by Wolfram Sang's avatar Wolfram Sang Committed by Wolfram Sang
Browse files

i2c: don't print error when adding adapter fails 



The core will do this for us now.

Signed-off-by: default avatarWolfram Sang <wsa-dev@sang-engineering.com>
Reviewed-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Acked-by: default avatarPeter Korsgaard <peter@korsgaard.com>
Acked-by: default avatarHeiko Stuebner <heiko@sntech.de>
Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Acked-by: default avatarRay Jui <ray.jui@broadcom.com>
Acked-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Acked-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
Acked-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent fa8410b3

drivers/i2c/busses/i2c-amd756.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -378,11 +378,8 @@ static int amd756_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		 amd756_ioport);

		 amd756_ioport);





	error = i2c_add_adapter(&amd756_smbus);

	error = i2c_add_adapter(&amd756_smbus);

	if (error) {

	if (error)

		dev_err(&pdev->dev,

			"Adapter registration failed, module not inserted\n");

		goto out_err;

		goto out_err;

	}





	return 0;

	return 0;

drivers/i2c/busses/i2c-at91.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -1122,8 +1122,6 @@ static int at91_twi_probe(struct platform_device *pdev) 




	rc = i2c_add_numbered_adapter(&dev->adapter);

	rc = i2c_add_numbered_adapter(&dev->adapter);

	if (rc) {

	if (rc) {

		dev_err(dev->dev, "Adapter %s registration failed\n",

			dev->adapter.name);

		clk_disable_unprepare(dev->clk);

		clk_disable_unprepare(dev->clk);





		pm_runtime_disable(dev->dev);

		pm_runtime_disable(dev->dev);

drivers/i2c/busses/i2c-axxia.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -558,13 +558,7 @@ static int axxia_i2c_probe(struct platform_device *pdev) 




	platform_set_drvdata(pdev, idev);

	platform_set_drvdata(pdev, idev);





	ret = i2c_add_adapter(&idev->adapter);

	return i2c_add_adapter(&idev->adapter);

	if (ret) {

		dev_err(&pdev->dev, "failed to add adapter\n");

		return ret;

	}



	return 0;

}

}





static int axxia_i2c_remove(struct platform_device *pdev)

static int axxia_i2c_remove(struct platform_device *pdev)

drivers/i2c/busses/i2c-bcm-iproc.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -488,13 +488,7 @@ static int bcm_iproc_i2c_probe(struct platform_device *pdev) 
	adap->dev.parent = &pdev->dev;

	adap->dev.parent = &pdev->dev;

	adap->dev.of_node = pdev->dev.of_node;

	adap->dev.of_node = pdev->dev.of_node;





	ret = i2c_add_adapter(adap);

	return i2c_add_adapter(adap);

	if (ret) {

		dev_err(iproc_i2c->device, "failed to add adapter\n");

		return ret;

	}



	return 0;

}

}





static int bcm_iproc_i2c_remove(struct platform_device *pdev)

static int bcm_iproc_i2c_remove(struct platform_device *pdev)

drivers/i2c/busses/i2c-bcm-kona.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -858,10 +858,8 @@ static int bcm_kona_i2c_probe(struct platform_device *pdev) 
	adap->dev.of_node = pdev->dev.of_node;

	adap->dev.of_node = pdev->dev.of_node;





	rc = i2c_add_adapter(adap);

	rc = i2c_add_adapter(adap);

	if (rc) {

	if (rc)

		dev_err(dev->device, "failed to add adapter\n");

		return rc;

		return rc;

	}





	dev_info(dev->device, "device registered successfully\n");

	dev_info(dev->device, "device registered successfully\n");