移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/drivers/net/wireless/marvell/libertas/if_sdio.c
..
..
@@ -1,14 +1,10 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  *  linux/drivers/net/wireless/libertas/if_sdio.c
3
4
  *
4
5
  *  Copyright 2007-2008 Pierre Ossman
5
6
  *
6
7
  * Inspired by if_cs.c, Copyright 2007 Holger Schurig
7
- *
8
- * This program is free software; you can redistribute it and/or modify
9
- * it under the terms of the GNU General Public License as published by
10
- * the Free Software Foundation; either version 2 of the License, or (at
11
- * your option) any later version.
12
8
  *
13
9
  * This hardware has more or less no CMD53 support, so all registers
14
10
  * must be accessed using sdio_readb()/sdio_writeb().
..
..
@@ -69,7 +65,7 @@
69
65
 	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL,
70
66
 			SDIO_DEVICE_ID_MARVELL_LIBERTAS) },
71
67
 	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL,
72
-			SDIO_DEVICE_ID_MARVELL_8688WLAN) },
68
+			SDIO_DEVICE_ID_MARVELL_8688_WLAN) },
73
69
 	{ /* end: all zeroes */				},
74
70
 };
75
71
 
..
..
@@ -107,7 +103,7 @@
107
103
 struct if_sdio_packet {
108
104
 	struct if_sdio_packet	*next;
109
105
 	u16			nb;
110
-	u8			buffer[0] __attribute__((aligned(4)));
106
+	u8			buffer[] __aligned(4);
111
107
 };
112
108
 
113
109
 struct if_sdio_card {
..
..
@@ -1210,8 +1206,8 @@
1210
1206
 
1211
1207
 
1212
1208
 	priv = lbs_add_card(card, &func->dev);
1213
-	if (!priv) {
1214
-		ret = -ENOMEM;
1209
+	if (IS_ERR(priv)) {
1210
+		ret = PTR_ERR(priv);
1215
1211
 		goto free;
1216
1212
 	}
1217
1213