Commit 554ec02c authored by Tzung-Bi Shih's avatar Tzung-Bi Shih
Browse files

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



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: default avatarTzung-Bi Shih <tzungbi@kernel.org>
Reviewed-by: default avatarGuenter Roeck <groeck@chromium.org>
Link: https://lore.kernel.org/r/20230308031247.2866401-1-tzungbi@kernel.org
parent 32d2a15e

drivers/platform/chrome/cros_ec.c

+4 −6
Original line number Diff line number Diff line
@@ -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,7 +312,6 @@ 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->ec);

	mutex_destroy(&ec_dev->lock);