Skip to content

Commit 554ec02

Browse files
author
Tzung-Bi Shih
committed
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: 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
1 parent 32d2a15 commit 554ec02

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

drivers/platform/chrome/cros_ec.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ int cros_ec_register(struct cros_ec_device *ec_dev)
206206
err = cros_ec_query_all(ec_dev);
207207
if (err) {
208208
dev_err(dev, "Cannot identify the EC: error %d\n", err);
209-
goto destroy_mutex;
209+
goto exit;
210210
}
211211

212212
if (ec_dev->irq > 0) {
@@ -218,7 +218,7 @@ int cros_ec_register(struct cros_ec_device *ec_dev)
218218
if (err) {
219219
dev_err(dev, "Failed to request IRQ %d: %d\n",
220220
ec_dev->irq, err);
221-
goto destroy_mutex;
221+
goto exit;
222222
}
223223
}
224224

@@ -230,7 +230,7 @@ int cros_ec_register(struct cros_ec_device *ec_dev)
230230
dev_err(ec_dev->dev,
231231
"Failed to create CrOS EC platform device\n");
232232
err = PTR_ERR(ec_dev->ec);
233-
goto destroy_mutex;
233+
goto exit;
234234
}
235235

236236
if (ec_dev->max_passthru) {
@@ -296,7 +296,6 @@ int cros_ec_register(struct cros_ec_device *ec_dev)
296296
exit:
297297
platform_device_unregister(ec_dev->ec);
298298
platform_device_unregister(ec_dev->pd);
299-
destroy_mutex:
300299
mutex_destroy(&ec_dev->lock);
301300
lockdep_unregister_key(&ec_dev->lockdep_key);
302301
return err;
@@ -313,8 +312,7 @@ EXPORT_SYMBOL(cros_ec_register);
313312
*/
314313
void cros_ec_unregister(struct cros_ec_device *ec_dev)
315314
{
316-
if (ec_dev->pd)
317-
platform_device_unregister(ec_dev->pd);
315+
platform_device_unregister(ec_dev->pd);
318316
platform_device_unregister(ec_dev->ec);
319317
mutex_destroy(&ec_dev->lock);
320318
lockdep_unregister_key(&ec_dev->lockdep_key);

0 commit comments

Comments
 (0)