Commit 5581b416 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Wolfram Sang
Browse files

i2c: i801: Refactor mux code since platform_device_unregister() is NULL aware 



platform_device_unregister() is NULL-aware and thus doesn't required a
duplication check in i801_del_mux(). Besides that it's also error pointer
aware, and we may drop unneeded assignment in i801_add_mux() followed by
conversion to PTR_ERR_OR_ZERO() for the returned value.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 926e6b2c

drivers/i2c/busses/i2c-i801.c

+3 −7
Original line number Diff line number Diff line
@@ -1433,7 +1433,7 @@ static int i801_add_mux(struct i801_priv *priv) 
	const struct i801_mux_config *mux_config;

	struct i2c_mux_gpio_platform_data gpio_data;

	struct gpiod_lookup_table *lookup;

	int err, i;

	int i;



	if (!priv->mux_drvdata)

		return 0;
@@ -1473,19 +1473,15 @@ static int i801_add_mux(struct i801_priv *priv) 
				PLATFORM_DEVID_NONE, &gpio_data,

				sizeof(struct i2c_mux_gpio_platform_data));

	if (IS_ERR(priv->mux_pdev)) {

		err = PTR_ERR(priv->mux_pdev);

		gpiod_remove_lookup_table(lookup);

		priv->mux_pdev = NULL;

		dev_err(dev, "Failed to register i2c-mux-gpio device\n");

		return err;

	}



	return 0;

	return PTR_ERR_OR_ZERO(priv->mux_pdev);

}



static void i801_del_mux(struct i801_priv *priv)

{

	if (priv->mux_pdev)

	platform_device_unregister(priv->mux_pdev);

	gpiod_remove_lookup_table(priv->lookup);

}