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

Commit bf51a8c5 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Wolfram Sang
Browse files

i2c: Ignore return value of i2c_del_adapter() 



i2c_del_adapter() always returns 0. So all checks testing whether it will be
non zero will always evaluate to false and the conditional code is dead code.
This patch updates all callers of i2c_del_mux_adapter() to ignore the return
value and assume that it will always succeed (which it will). In a subsequent
patch the return type of i2c_del_adapter() will be made void.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Reviewed-by: default avatarJean Delvare <khali@linux-fr.org>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent f5fb0822

drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c

+1 −2
Original line number Diff line number Diff line
@@ -319,8 +319,7 @@ void oaktrail_hdmi_i2c_exit(struct pci_dev *dev) 
	struct hdmi_i2c_dev *i2c_dev;



	hdmi_dev = pci_get_drvdata(dev);

	if (i2c_del_adapter(&oaktrail_hdmi_i2c_adapter))

		DRM_DEBUG_DRIVER("Failed to delete hdmi-i2c adapter\n");

	i2c_del_adapter(&oaktrail_hdmi_i2c_adapter);



	i2c_dev = hdmi_dev->i2c_dev;

	kfree(i2c_dev);

drivers/i2c/busses/i2c-amd756-s4882.c

+1 −5
Original line number Diff line number Diff line
@@ -169,11 +169,7 @@ static int __init amd756_s4882_init(void) 
	}



	/* Unregister physical bus */

	error = i2c_del_adapter(&amd756_smbus);

	if (error) {

		dev_err(&amd756_smbus.dev, "Physical bus removal failed\n");

		goto ERROR0;

	}

	i2c_del_adapter(&amd756_smbus);



	printk(KERN_INFO "Enabling SMBus multiplexing for Tyan S4882\n");

	/* Define the 5 virtual adapters and algorithms structures */

drivers/i2c/busses/i2c-at91.c

+2 −3
Original line number Diff line number Diff line
@@ -783,12 +783,11 @@ static int at91_twi_probe(struct platform_device *pdev) 
static int at91_twi_remove(struct platform_device *pdev)

{

	struct at91_twi_dev *dev = platform_get_drvdata(pdev);

	int rc;



	rc = i2c_del_adapter(&dev->adapter);

	i2c_del_adapter(&dev->adapter);

	clk_disable_unprepare(dev->clk);



	return rc;

	return 0;

}



#ifdef CONFIG_PM

drivers/i2c/busses/i2c-cbus-gpio.c

+3 −1
Original line number Diff line number Diff line
@@ -206,7 +206,9 @@ static int cbus_i2c_remove(struct platform_device *pdev) 
{

	struct i2c_adapter *adapter = platform_get_drvdata(pdev);



	return i2c_del_adapter(adapter);

	i2c_del_adapter(adapter);



	return 0;

}



static int cbus_i2c_probe(struct platform_device *pdev)

drivers/i2c/busses/i2c-intel-mid.c

+1 −2
Original line number Diff line number Diff line
@@ -1082,8 +1082,7 @@ static void intel_mid_i2c_remove(struct pci_dev *dev) 
{

	struct intel_mid_i2c_private *mrst = pci_get_drvdata(dev);

	intel_mid_i2c_disable(&mrst->adap);

	if (i2c_del_adapter(&mrst->adap))

		dev_err(&dev->dev, "Failed to delete i2c adapter");

	i2c_del_adapter(&mrst->adap);



	free_irq(dev->irq, mrst);

	iounmap(mrst->base);