Commit 4df4946d authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman
Browse files

misc: lis3lv02d: Make lis3lv02d_remove_fs() return void 



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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20211012153945.2651412-13-u.kleine-koenig@pengutronix.de


Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 424f1ac2

drivers/misc/lis3lv02d/lis3lv02d.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

drivers/misc/lis3lv02d/lis3lv02d.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/misc/lis3lv02d/lis3lv02d_spi.c

+3 −1
Original line number Diff line number Diff line
@@ -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

drivers/platform/x86/hp_accel.c

+2 −1
Original line number Diff line number Diff line
@@ -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