Messages in this thread | | | From | Guenter Roeck <> | Date | Wed, 20 Oct 2021 05:54:24 -0700 | Subject | Re: [PATCH v2] platform/chrome: cros_ec: Make cros_ec_unregister() return return void |
| |
On Wed, Oct 20, 2021 at 12:17 AM Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > > 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. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Guenter Roeck <groeck@chromium.org>
> --- > On Tue, Oct 19, 2021 at 02:31:46PM -0700, Guenter Roeck wrote: > > On Tue, Oct 19, 2021 at 1:39 PM Uwe Kleine-König > > <u.kleine-koenig@pengutronix.de> wrote: > > > -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); > > > > Isn't there a "return 0;" hiding about here which would now result in > > a compile error ? > > Argh, you're right. I forgot to squash this in after my build test :-\ > Here's a v2. > > Thanks > Uwe > > drivers/platform/chrome/cros_ec.c | 4 +--- > drivers/platform/chrome/cros_ec.h | 2 +- > drivers/platform/chrome/cros_ec_i2c.c | 4 +++- > drivers/platform/chrome/cros_ec_lpc.c | 4 +++- > drivers/platform/chrome/cros_ec_spi.c | 4 +++- > 5 files changed, 11 insertions(+), 7 deletions(-) > > diff --git a/drivers/platform/chrome/cros_ec.c b/drivers/platform/chrome/cros_ec.c > index fc5aa1525d13..d49a4efe46c8 100644 > --- a/drivers/platform/chrome/cros_ec.c > +++ b/drivers/platform/chrome/cros_ec.c > @@ -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); > > diff --git a/drivers/platform/chrome/cros_ec.h b/drivers/platform/chrome/cros_ec.h > index 78363dcfdf23..bbca0096868a 100644 > --- a/drivers/platform/chrome/cros_ec.h > +++ b/drivers/platform/chrome/cros_ec.h > @@ -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); > diff --git a/drivers/platform/chrome/cros_ec_i2c.c b/drivers/platform/chrome/cros_ec_i2c.c > index 30c8938c27d5..22feb0fd4ce7 100644 > --- a/drivers/platform/chrome/cros_ec_i2c.c > +++ b/drivers/platform/chrome/cros_ec_i2c.c > @@ -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 > diff --git a/drivers/platform/chrome/cros_ec_lpc.c b/drivers/platform/chrome/cros_ec_lpc.c > index 1f7861944044..8527a1bac765 100644 > --- a/drivers/platform/chrome/cros_ec_lpc.c > +++ b/drivers/platform/chrome/cros_ec_lpc.c > @@ -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[] = { > diff --git a/drivers/platform/chrome/cros_ec_spi.c b/drivers/platform/chrome/cros_ec_spi.c > index 14c4046fa04d..713c58687721 100644 > --- a/drivers/platform/chrome/cros_ec_spi.c > +++ b/drivers/platform/chrome/cros_ec_spi.c > @@ -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 > -- > 2.30.2 > > -- > Pengutronix e.K. | Uwe Kleine-König | > Industrial Linux Solutions | https://www.pengutronix.de/ |
| |