Commit 6a8f359c authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Wolfram Sang
Browse files

gpio: pca953x: Make platform teardown callback return void 



All platforms that provide a teardown callback return 0. New users are
supposed to not make use of platform support, so there is no
functionality lost.

This patch is a preparation for making i2c remove callbacks return void.

Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 22a23436

arch/arm/mach-davinci/board-da850-evm.c

+4 −8
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ static int da850_evm_ui_expander_setup(struct i2c_client *client, unsigned gpio, 
	return ret;

}



static int da850_evm_ui_expander_teardown(struct i2c_client *client,

static void da850_evm_ui_expander_teardown(struct i2c_client *client,

					   unsigned gpio, unsigned ngpio, void *c)

{

	platform_device_unregister(&da850_evm_ui_keys_device);
@@ -529,8 +529,6 @@ static int da850_evm_ui_expander_teardown(struct i2c_client *client, 
	gpio_free(gpio + DA850_EVM_UI_EXP_SEL_C);

	gpio_free(gpio + DA850_EVM_UI_EXP_SEL_B);

	gpio_free(gpio + DA850_EVM_UI_EXP_SEL_A);



	return 0;

}



/* assign the baseboard expander's GPIOs after the UI board's */
@@ -697,13 +695,11 @@ static int da850_evm_bb_expander_setup(struct i2c_client *client, 
	return ret;

}



static int da850_evm_bb_expander_teardown(struct i2c_client *client,

static void da850_evm_bb_expander_teardown(struct i2c_client *client,

					   unsigned gpio, unsigned ngpio, void *c)

{

	platform_device_unregister(&da850_evm_bb_leds_device);

	platform_device_unregister(&da850_evm_bb_keys_device);



	return 0;

}



static struct pca953x_platform_data da850_evm_ui_expander_info = {

drivers/gpio/gpio-pca953x.c

+3 −8
Original line number Diff line number Diff line
@@ -1105,20 +1105,15 @@ static int pca953x_remove(struct i2c_client *client) 
{

	struct pca953x_platform_data *pdata = dev_get_platdata(&client->dev);

	struct pca953x_chip *chip = i2c_get_clientdata(client);

	int ret;



	if (pdata && pdata->teardown) {

		ret = pdata->teardown(client, chip->gpio_chip.base,

		pdata->teardown(client, chip->gpio_chip.base,

				chip->gpio_chip.ngpio, pdata->context);

		if (ret < 0)

			dev_err(&client->dev, "teardown failed, %d\n", ret);

	} else {

		ret = 0;

	}



	regulator_disable(chip->regulator);



	return ret;

	return 0;

}



#ifdef CONFIG_PM_SLEEP

include/linux/platform_data/pca953x.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ struct pca953x_platform_data { 
	int		(*setup)(struct i2c_client *client,

				unsigned gpio, unsigned ngpio,

				void *context);

	int		(*teardown)(struct i2c_client *client,

	void		(*teardown)(struct i2c_client *client,

				unsigned gpio, unsigned ngpio,

				void *context);

	const char	*const *names;