]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
firewire: core: remove useless generation check
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Thu, 18 Sep 2025 23:54:43 +0000 (08:54 +0900)
committerTakashi Sakamoto <o-takashi@sakamocchi.jp>
Thu, 18 Sep 2025 23:58:34 +0000 (08:58 +0900)
Two functions, fw_core_handle_bus_reset() and bm_work(), are serialized
by a commit 3d91fd440cc7 ("firewire: core: disable bus management work
temporarily during updating topology"). Therefore the generation member
of fw_card is immutable in bm_work().

This commit removes useless generation check in bm_work().

Link: https://lore.kernel.org/r/20250918235448.129705-2-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
drivers/firewire/core-card.c

index 4fcd5ce4b2cef254da5ad9ad50f5647870b27d4e..ef00125fb01ac8fb4580497732976c580f84351f 100644 (file)
@@ -362,14 +362,12 @@ static void bm_work(struct work_struct *work)
                if (rcode == RCODE_COMPLETE) {
                        int bm_id = be32_to_cpu(data[0]);
 
-                       if (generation == card->generation) {
-                               // Used by cdev layer for "struct fw_cdev_event_bus_reset".
-                               scoped_guard(spinlock, &card->lock) {
-                                       if (bm_id != BUS_MANAGER_ID_NOT_REGISTERED)
-                                               card->bm_node_id = 0xffc0 & bm_id;
-                                       else
-                                               card->bm_node_id = local_id;
-                               }
+                       // Used by cdev layer for "struct fw_cdev_event_bus_reset".
+                       scoped_guard(spinlock, &card->lock) {
+                               if (bm_id != BUS_MANAGER_ID_NOT_REGISTERED)
+                                       card->bm_node_id = 0xffc0 & bm_id;
+                               else
+                                       card->bm_node_id = local_id;
                        }
 
                        if (bm_id != BUS_MANAGER_ID_NOT_REGISTERED) {