mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/firewire/core-topology.c
..
..
@@ -1,21 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * Incremental bus scan, based on bus topology
3
4
  *
4
5
  * Copyright (C) 2004-2006 Kristian Hoegsberg <krh@bitplanet.net>
5
- *
6
- * This program is free software; you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License as published by
8
- * the Free Software Foundation; either version 2 of the License, or
9
- * (at your option) any later version.
10
- *
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
- * GNU General Public License for more details.
15
- *
16
- * You should have received a copy of the GNU General Public License
17
- * along with this program; if not, write to the Free Software Foundation,
18
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
19
6
  */
20
7
 
21
8
 #include <linux/bug.h>
..
..
@@ -67,6 +54,7 @@
67
54
 		switch (port_type) {
68
55
 		case SELFID_PORT_CHILD:
69
56
 			(*child_port_count)++;
57
+			fallthrough;
70
58
 		case SELFID_PORT_PARENT:
71
59
 		case SELFID_PORT_NCONN:
72
60
 			(*total_port_count)++;
..
..
@@ -386,16 +374,13 @@
386
374
 	card->bm_retries = 0;
387
375
 }
388
376
 
377
+/* Must be called with card->lock held */
389
378
 void fw_destroy_nodes(struct fw_card *card)
390
379
 {
391
-	unsigned long flags;
392
-
393
-	spin_lock_irqsave(&card->lock, flags);
394
380
 	card->color++;
395
381
 	if (card->local_node != NULL)
396
382
 		for_each_fw_node(card, card->local_node, report_lost_node);
397
383
 	card->local_node = NULL;
398
-	spin_unlock_irqrestore(&card->lock, flags);
399
384
 }
400
385
 
401
386
 static void move_tree(struct fw_node *node0, struct fw_node *node1, int port)
..
..
@@ -521,6 +506,8 @@
521
506
 	struct fw_node *local_node;
522
507
 	unsigned long flags;
523
508
 
509
+	spin_lock_irqsave(&card->lock, flags);
510
+
524
511
 	/*
525
512
 	 * If the selfID buffer is not the immediate successor of the
526
513
 	 * previously processed one, we cannot reliably compare the
..
..
@@ -531,8 +518,6 @@
531
518
 		fw_destroy_nodes(card);
532
519
 		card->bm_retries = 0;
533
520
 	}
534
-
535
-	spin_lock_irqsave(&card->lock, flags);
536
521
 
537
522
 	card->broadcast_channel_allocated = card->broadcast_channel_auto_allocated;
538
523
 	card->node_id = node_id;