mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/net/usb/catc.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  *  Copyright (c) 2001 Vojtech Pavlik
3
4
  *
..
..
@@ -13,18 +14,6 @@
13
14
  */
14
15
 
15
16
 /*
16
- * This program is free software; you can redistribute it and/or modify
17
- * it under the terms of the GNU General Public License as published by
18
- * the Free Software Foundation; either version 2 of the License, or 
19
- * (at your option) any later version.
20
- * 
21
- * This program is distributed in the hope that it will be useful,
22
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
23
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
24
- * GNU General Public License for more details.
25
- * 
26
- * You should have received a copy of the GNU General Public License
27
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
28
17
  * 
29
18
  * Should you need to contact me, the author, you can do so either by
30
19
  * e-mail - mail your message to <vojtech@suse.cz>, or by paper mail:
..
..
@@ -458,7 +447,7 @@
458
447
 	return NETDEV_TX_OK;
459
448
 }
460
449
 
461
-static void catc_tx_timeout(struct net_device *netdev)
450
+static void catc_tx_timeout(struct net_device *netdev, unsigned int txqueue)
462
451
 {
463
452
 	struct catc *catc = netdev_priv(netdev);
464
453
 
..
..
@@ -869,7 +858,7 @@
869
858
 		default:
870
859
 			dev_warn(&intf->dev,
871
860
 				 "Couldn't detect memory size, assuming 32k\n");
872
-			/* fall through */
861
+			fallthrough;
873
862
 		case 0x87654321:
874
863
 			catc_set_reg(catc, TxBufCount, 4);
875
864
 			catc_set_reg(catc, RxBufCount, 16);