platform/chrome: cros_ec: remove unneeded label and if-condition

[ Upstream commit 554ec02c97254962bbb0a8776c3160d294fc7e51 ]

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>
Link: https://lore.kernel.org/r/20230308031247.2866401-1-tzungbi@kernel.org
Stable-dep-of: e23749534619 ("platform/chrome: cros_ec: Unregister notifier in cros_ec_unregister()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/platform/chrome/cros_ec.c b/drivers/platform/chrome/cros_ec.c
index 8cac78b6f0ac3a506b3f46437f290aa484992031..ec6ebb250ba3731e517936af71efa522ddb8cd43 100644 (file)
--- a/drivers/platform/chrome/cros_ec.c
+++ b/drivers/platform/chrome/cros_ec.c
@@ -193,7 +193,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) {
@@ -205,7 +205,7 @@ int cros_ec_register(struct cros_ec_device *ec_dev)
                if (err) {
                        dev_err(dev, "Failed to request IRQ %d: %d",
                                ec_dev->irq, err);
-                       goto destroy_mutex;
+                       goto exit;
                }
        }
 
@@ -217,7 +217,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) {
@@ -276,7 +276,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;
@@ -293,8 +292,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);