aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Sakamoto <[email protected]>2024-08-13 08:52:06 +0900
committerTakashi Sakamoto <[email protected]>2024-08-13 08:52:06 +0900
commit3b443fe087889cf6c9c133638f36da5617431703 (patch)
treec8e90cfc5b0e81a96555b222e0d536191a2f307c
parent7a0a57cff296bbd90451fbf1f5614ffc48da73cd (diff)
firewire: core: minor code refactoring to release client resource
Current implementation checks and validates the result to find resource entry two times. It is redundant. This commit refactors the redundancy. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Takashi Sakamoto <[email protected]>
-rw-r--r--drivers/firewire/core-cdev.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index c211bb19c94e..81fdb2be9063 100644
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -512,15 +512,14 @@ static int release_client_resource(struct client *client, u32 handle,
scoped_guard(spinlock_irq, &client->lock) {
if (client->in_shutdown)
- resource = NULL;
- else
- resource = idr_find(&client->resource_idr, handle);
- if (resource && resource->release == release)
- idr_remove(&client->resource_idr, handle);
- }
+ return -EINVAL;
- if (!(resource && resource->release == release))
- return -EINVAL;
+ resource = idr_find(&client->resource_idr, handle);
+ if (!resource || resource->release != release)
+ return -EINVAL;
+
+ idr_remove(&client->resource_idr, handle);
+ }
if (return_resource)
*return_resource = resource;