On Mon, Aug 15, 2022 at 10:02 AM Uwe Kleine-König
<u.kleine-koenig@xxxxxxxxxxxxxx> wrote:
>
> 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: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
> ---
> arch/arm/mach-davinci/board-da850-evm.c | 12 ++++--------
> drivers/gpio/gpio-pca953x.c | 11 +++--------
> include/linux/platform_data/pca953x.h | 2 +-
> 3 files changed, 8 insertions(+), 17 deletions(-)
>
> diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
> index 92d74bc71967..d752ee2b30ff 100644
> --- a/arch/arm/mach-davinci/board-da850-evm.c
> +++ b/arch/arm/mach-davinci/board-da850-evm.c
> @@ -516,8 +516,8 @@ 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,
> - unsigned gpio, unsigned ngpio, void *c)
> +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,
> - unsigned gpio, unsigned ngpio, void *c)
> +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 = {
> diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
> index ecd7d169470b..1860e566eb94 100644
> --- a/drivers/gpio/gpio-pca953x.c
> +++ b/drivers/gpio/gpio-pca953x.c
> @@ -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,
> - chip->gpio_chip.ngpio, pdata->context);
> - if (ret < 0)
> - dev_err(&client->dev, "teardown failed, %d\n", ret);
> - } else {
> - ret = 0;
> + pdata->teardown(client, chip->gpio_chip.base,
> + chip->gpio_chip.ngpio, pdata->context);
> }
>
> regulator_disable(chip->regulator);
>
> - return ret;
> + return 0;
> }
>
> #ifdef CONFIG_PM_SLEEP
> diff --git a/include/linux/platform_data/pca953x.h b/include/linux/platform_data/pca953x.h
> index 4eb53e023997..96c1a14ab365 100644
> --- a/include/linux/platform_data/pca953x.h
> +++ b/include/linux/platform_data/pca953x.h
> @@ -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;
> --
> 2.36.1
>
Acked-by: Bartosz Golaszewski <brgl@xxxxxxxx>
