Hi,
On 10/12/21 5:39 PM, Uwe Kleine-König wrote:
> Up to now lis3lv02d_remove_fs() returns zero unconditionally. Make it return
> void instead which makes it easier to see in the callers that there is
> no error to handle.
>
> Also the return value of i2c and spi remove callbacks is ignored anyway.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Also please consider this as my ack for merging the
drivers/platform/x86/ part of this through whatever
tree is convenient.
Regards,
Hans
> ---
> drivers/misc/lis3lv02d/lis3lv02d.c | 3 +--
> drivers/misc/lis3lv02d/lis3lv02d.h | 2 +-
> drivers/misc/lis3lv02d/lis3lv02d_spi.c | 4 +++-
> drivers/platform/x86/hp_accel.c | 3 ++-
> 4 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
> index 70c5bb1e6f49..3a7808b796b1 100644
> --- a/drivers/misc/lis3lv02d/lis3lv02d.c
> +++ b/drivers/misc/lis3lv02d/lis3lv02d.c
> @@ -878,7 +878,7 @@ static int lis3lv02d_add_fs(struct lis3lv02d *lis3)
> return sysfs_create_group(&lis3->pdev->dev.kobj, &lis3lv02d_attribute_group);
> }
>
> -int lis3lv02d_remove_fs(struct lis3lv02d *lis3)
> +void lis3lv02d_remove_fs(struct lis3lv02d *lis3)
> {
> sysfs_remove_group(&lis3->pdev->dev.kobj, &lis3lv02d_attribute_group);
> platform_device_unregister(lis3->pdev);
> @@ -894,7 +894,6 @@ int lis3lv02d_remove_fs(struct lis3lv02d *lis3)
> pm_runtime_set_suspended(lis3->pm_dev);
> }
> kfree(lis3->reg_cache);
> - return 0;
> }
> EXPORT_SYMBOL_GPL(lis3lv02d_remove_fs);
>
> diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
> index c394c0b08519..195bd2fd2eb5 100644
> --- a/drivers/misc/lis3lv02d/lis3lv02d.h
> +++ b/drivers/misc/lis3lv02d/lis3lv02d.h
> @@ -312,7 +312,7 @@ int lis3lv02d_joystick_enable(struct lis3lv02d *lis3);
> void lis3lv02d_joystick_disable(struct lis3lv02d *lis3);
> void lis3lv02d_poweroff(struct lis3lv02d *lis3);
> int lis3lv02d_poweron(struct lis3lv02d *lis3);
> -int lis3lv02d_remove_fs(struct lis3lv02d *lis3);
> +void lis3lv02d_remove_fs(struct lis3lv02d *lis3);
> int lis3lv02d_init_dt(struct lis3lv02d *lis3);
>
> extern struct lis3lv02d lis3_dev;
> diff --git a/drivers/misc/lis3lv02d/lis3lv02d_spi.c b/drivers/misc/lis3lv02d/lis3lv02d_spi.c
> index f664ed123730..9e40dfb60742 100644
> --- a/drivers/misc/lis3lv02d/lis3lv02d_spi.c
> +++ b/drivers/misc/lis3lv02d/lis3lv02d_spi.c
> @@ -102,7 +102,9 @@ static int lis302dl_spi_remove(struct spi_device *spi)
> lis3lv02d_joystick_disable(lis3);
> lis3lv02d_poweroff(lis3);
>
> - return lis3lv02d_remove_fs(&lis3_dev);
> + lis3lv02d_remove_fs(&lis3_dev);
> +
> + return 0;
> }
>
> #ifdef CONFIG_PM_SLEEP
> diff --git a/drivers/platform/x86/hp_accel.c b/drivers/platform/x86/hp_accel.c
> index cc53f725c041..b183967ecfb7 100644
> --- a/drivers/platform/x86/hp_accel.c
> +++ b/drivers/platform/x86/hp_accel.c
> @@ -349,7 +349,8 @@ static int lis3lv02d_remove(struct platform_device *device)
> led_classdev_unregister(&hpled_led.led_classdev);
> flush_work(&hpled_led.work);
>
> - return lis3lv02d_remove_fs(&lis3_dev);
> + lis3lv02d_remove_fs(&lis3_dev);
> + return 0;
> }
>
> #ifdef CONFIG_PM_SLEEP
>
