summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2025-09-19 02:54:48 +0300
committerTakashi Sakamoto <o-takashi@sakamocchi.jp>2025-09-19 02:58:34 +0300
commit19e73f65940d3d3357c637f3d7e19a59305a748f (patch)
treeea51447144202265971ac29206724da96b520dc0
parent9192c37929ff26eae7ab4e82ddb4af54ed73c6e2 (diff)
downloadlinux-19e73f65940d3d3357c637f3d7e19a59305a748f.tar.xz
firewire: core: minor code refactoring to delete useless local variable
The do_reset local variable has less merit. Let's remove it. Link: https://lore.kernel.org/r/20250918235448.129705-7-o-takashi@sakamocchi.jp Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
-rw-r--r--drivers/firewire/core-card.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
index 58d1f58a4a0f..4a5459696093 100644
--- a/drivers/firewire/core-card.c
+++ b/drivers/firewire/core-card.c
@@ -387,7 +387,6 @@ static void bm_work(struct work_struct *work)
struct fw_node *root_node __free(node_unref) = NULL;
int root_id, new_root_id, irm_id, local_id;
int expected_gap_count, generation;
- bool do_reset = false;
bool stand_for_root = false;
if (card->local_node == NULL)
@@ -499,16 +498,10 @@ static void bm_work(struct work_struct *work)
else
expected_gap_count = 63;
- /*
- * Finally, figure out if we should do a reset or not. If we have
- * done less than 5 resets with the same physical topology and we
- * have either a new root or a new gap count setting, let's do it.
- */
-
- if (card->bm_retries++ < 5 && (card->gap_count != expected_gap_count || new_root_id != root_id))
- do_reset = true;
-
- if (do_reset) {
+ // Finally, figure out if we should do a reset or not. If we have done less than 5 resets
+ // with the same physical topology and we have either a new root or a new gap count
+ // setting, let's do it.
+ if (card->bm_retries++ < 5 && (card->gap_count != expected_gap_count || new_root_id != root_id)) {
int card_gap_count = card->gap_count;
fw_notice(card, "phy config: new root=%x, gap_count=%d\n",