Unverified Commit afb0a80e authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Mark Brown
Browse files

platform/chrome: cros_ec: Make cros_ec_unregister() return void 



Up to now cros_ec_unregister() 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, platform and spi remove callbacks is
ignored anyway.

Reviewed-by: default avatarGuenter Roeck <groeck@chromium.org>
Link: https://lore.kernel.org/r/20211020071753.wltjslmimb6wtlp5@pengutronix.de


Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20220123175201.34839-5-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 316f569d

drivers/platform/chrome/cros_ec.c

+1 −3
Original line number Diff line number Diff line
@@ -302,13 +302,11 @@ EXPORT_SYMBOL(cros_ec_register); 
 *

 * Return: 0 on success or negative error code.

 */

int cros_ec_unregister(struct cros_ec_device *ec_dev)

void cros_ec_unregister(struct cros_ec_device *ec_dev)

{

	if (ec_dev->pd)

		platform_device_unregister(ec_dev->pd);

	platform_device_unregister(ec_dev->ec);



	return 0;

}

EXPORT_SYMBOL(cros_ec_unregister);

drivers/platform/chrome/cros_ec.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include <linux/interrupt.h>



int cros_ec_register(struct cros_ec_device *ec_dev);

int cros_ec_unregister(struct cros_ec_device *ec_dev);

void cros_ec_unregister(struct cros_ec_device *ec_dev);



int cros_ec_suspend(struct cros_ec_device *ec_dev);

int cros_ec_resume(struct cros_ec_device *ec_dev);

drivers/platform/chrome/cros_ec_i2c.c

+3 −1
Original line number Diff line number Diff line
@@ -313,7 +313,9 @@ static int cros_ec_i2c_remove(struct i2c_client *client) 
{

	struct cros_ec_device *ec_dev = i2c_get_clientdata(client);



	return cros_ec_unregister(ec_dev);

	cros_ec_unregister(ec_dev);



	return 0;

}



#ifdef CONFIG_PM_SLEEP

drivers/platform/chrome/cros_ec_lpc.c

+3 −1
Original line number Diff line number Diff line
@@ -439,7 +439,9 @@ static int cros_ec_lpc_remove(struct platform_device *pdev) 
		acpi_remove_notify_handler(adev->handle, ACPI_ALL_NOTIFY,

					   cros_ec_lpc_acpi_notify);



	return cros_ec_unregister(ec_dev);

	cros_ec_unregister(ec_dev);



	return 0;

}



static const struct acpi_device_id cros_ec_lpc_acpi_device_ids[] = {

drivers/platform/chrome/cros_ec_spi.c

+3 −1
Original line number Diff line number Diff line
@@ -790,7 +790,9 @@ static int cros_ec_spi_remove(struct spi_device *spi) 
{

	struct cros_ec_device *ec_dev = spi_get_drvdata(spi);



	return cros_ec_unregister(ec_dev);

	cros_ec_unregister(ec_dev);



	return 0;

}



#ifdef CONFIG_PM_SLEEP