| Message ID | 20230308031247.2866401-1-tzungbi@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | db7df0cfaff3ffe5c125f8b79bcd54a4ad163b37 |
| Headers | show |
| Series | platform/chrome: cros_ec: remove unneeded label and if-condition | expand |
On Tue, Mar 7, 2023 at 7:13 PM Tzung-Bi Shih <tzungbi@kernel.org> wrote: > > Both `ec_dev->ec` and `ec_dev->pd` are initialized to NULL at the > beginning of cros_ec_register(). Also, platform_device_unregister() > takes care if the given platform_device is NULL. > > Remove the unneeded goto-label and if-condition. > > Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org> Reviewed-by: Guenter Roeck <groeck@chromium.org> > --- > drivers/platform/chrome/cros_ec.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/platform/chrome/cros_ec.c b/drivers/platform/chrome/cros_ec.c > index b895c8130bba..8b7949220382 100644 > --- a/drivers/platform/chrome/cros_ec.c > +++ b/drivers/platform/chrome/cros_ec.c > @@ -206,7 +206,7 @@ int cros_ec_register(struct cros_ec_device *ec_dev) > err = cros_ec_query_all(ec_dev); > if (err) { > dev_err(dev, "Cannot identify the EC: error %d\n", err); > - goto destroy_mutex; > + goto exit; > } > > if (ec_dev->irq > 0) { > @@ -218,7 +218,7 @@ int cros_ec_register(struct cros_ec_device *ec_dev) > if (err) { > dev_err(dev, "Failed to request IRQ %d: %d\n", > ec_dev->irq, err); > - goto destroy_mutex; > + goto exit; > } > } > > @@ -230,7 +230,7 @@ int cros_ec_register(struct cros_ec_device *ec_dev) > dev_err(ec_dev->dev, > "Failed to create CrOS EC platform device\n"); > err = PTR_ERR(ec_dev->ec); > - goto destroy_mutex; > + goto exit; > } > > if (ec_dev->max_passthru) { > @@ -296,7 +296,6 @@ int cros_ec_register(struct cros_ec_device *ec_dev) > exit: > platform_device_unregister(ec_dev->ec); > platform_device_unregister(ec_dev->pd); > -destroy_mutex: > mutex_destroy(&ec_dev->lock); > lockdep_unregister_key(&ec_dev->lockdep_key); > return err; > @@ -313,8 +312,7 @@ EXPORT_SYMBOL(cros_ec_register); > */ > 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->pd); > platform_device_unregister(ec_dev->ec); > mutex_destroy(&ec_dev->lock); > lockdep_unregister_key(&ec_dev->lockdep_key); > -- > 2.40.0.rc1.284.g88254d51c5-goog >
Hello: This patch was applied to chrome-platform/linux.git (for-kernelci) by Tzung-Bi Shih <tzungbi@kernel.org>: On Wed, 8 Mar 2023 11:12:47 +0800 you wrote: > Both `ec_dev->ec` and `ec_dev->pd` are initialized to NULL at the > beginning of cros_ec_register(). Also, platform_device_unregister() > takes care if the given platform_device is NULL. > > Remove the unneeded goto-label and if-condition. > > Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org> > > [...] Here is the summary with links: - platform/chrome: cros_ec: remove unneeded label and if-condition https://git.kernel.org/chrome-platform/c/db7df0cfaff3 You are awesome, thank you!
Hello: This patch was applied to chrome-platform/linux.git (for-next) by Tzung-Bi Shih <tzungbi@kernel.org>: On Wed, 8 Mar 2023 11:12:47 +0800 you wrote: > Both `ec_dev->ec` and `ec_dev->pd` are initialized to NULL at the > beginning of cros_ec_register(). Also, platform_device_unregister() > takes care if the given platform_device is NULL. > > Remove the unneeded goto-label and if-condition. > > Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org> > > [...] Here is the summary with links: - platform/chrome: cros_ec: remove unneeded label and if-condition https://git.kernel.org/chrome-platform/c/db7df0cfaff3 You are awesome, thank you!
diff --git a/drivers/platform/chrome/cros_ec.c b/drivers/platform/chrome/cros_ec.c index b895c8130bba..8b7949220382 100644 --- a/drivers/platform/chrome/cros_ec.c +++ b/drivers/platform/chrome/cros_ec.c @@ -206,7 +206,7 @@ int cros_ec_register(struct cros_ec_device *ec_dev) err = cros_ec_query_all(ec_dev); if (err) { dev_err(dev, "Cannot identify the EC: error %d\n", err); - goto destroy_mutex; + goto exit; } if (ec_dev->irq > 0) { @@ -218,7 +218,7 @@ int cros_ec_register(struct cros_ec_device *ec_dev) if (err) { dev_err(dev, "Failed to request IRQ %d: %d\n", ec_dev->irq, err); - goto destroy_mutex; + goto exit; } } @@ -230,7 +230,7 @@ int cros_ec_register(struct cros_ec_device *ec_dev) dev_err(ec_dev->dev, "Failed to create CrOS EC platform device\n"); err = PTR_ERR(ec_dev->ec); - goto destroy_mutex; + goto exit; } if (ec_dev->max_passthru) { @@ -296,7 +296,6 @@ int cros_ec_register(struct cros_ec_device *ec_dev) exit: platform_device_unregister(ec_dev->ec); platform_device_unregister(ec_dev->pd); -destroy_mutex: mutex_destroy(&ec_dev->lock); lockdep_unregister_key(&ec_dev->lockdep_key); return err; @@ -313,8 +312,7 @@ EXPORT_SYMBOL(cros_ec_register); */ 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->pd); platform_device_unregister(ec_dev->ec); mutex_destroy(&ec_dev->lock); lockdep_unregister_key(&ec_dev->lockdep_key);
Both `ec_dev->ec` and `ec_dev->pd` are initialized to NULL at the beginning of cros_ec_register(). Also, platform_device_unregister() takes care if the given platform_device is NULL. Remove the unneeded goto-label and if-condition. Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org> --- drivers/platform/chrome/cros_ec.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)