mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/staging/greybus/sdio.c
..
..
@@ -12,8 +12,8 @@
12
12
 #include <linux/mmc/mmc.h>
13
13
 #include <linux/scatterlist.h>
14
14
 #include <linux/workqueue.h>
15
+#include <linux/greybus.h>
15
16
 
16
-#include "greybus.h"
17
17
 #include "gbphy.h"
18
18
 
19
19
 struct gb_sdio_host {
..
..
@@ -67,7 +67,6 @@
67
67
 		((r & GB_SDIO_CAP_8_BIT_DATA) ? MMC_CAP_8_BIT_DATA : 0) |
68
68
 		((r & GB_SDIO_CAP_MMC_HS) ? MMC_CAP_MMC_HIGHSPEED : 0) |
69
69
 		((r & GB_SDIO_CAP_SD_HS) ? MMC_CAP_SD_HIGHSPEED : 0) |
70
-		((r & GB_SDIO_CAP_ERASE) ? MMC_CAP_ERASE : 0) |
71
70
 		((r & GB_SDIO_CAP_1_2V_DDR) ? MMC_CAP_1_2V_DDR : 0) |
72
71
 		((r & GB_SDIO_CAP_1_8V_DDR) ? MMC_CAP_1_8V_DDR : 0) |
73
72
 		((r & GB_SDIO_CAP_POWER_OFF_CARD) ? MMC_CAP_POWER_OFF_CARD : 0) |
..
..
@@ -275,7 +274,7 @@
275
274
 		return -ENOMEM;
276
275
 
277
276
 	request = operation->request->payload;
278
-	request->data_flags = (data->flags >> 8);
277
+	request->data_flags = data->flags >> 8;
279
278
 	request->data_blocks = cpu_to_le16(nblocks);
280
279
 	request->data_blksz = cpu_to_le16(data->blksz);
281
280
 
..
..
@@ -329,7 +328,7 @@
329
328
 		return -ENOMEM;
330
329
 
331
330
 	request = operation->request->payload;
332
-	request->data_flags = (data->flags >> 8);
331
+	request->data_flags = data->flags >> 8;
333
332
 	request->data_blocks = cpu_to_le16(nblocks);
334
333
 	request->data_blksz = cpu_to_le16(data->blksz);
335
334
 
..
..
@@ -606,9 +605,9 @@
606
605
 		vdd = 1 << (ios->vdd - GB_SDIO_VDD_SHIFT);
607
606
 	request.vdd = cpu_to_le32(vdd);
608
607
 
609
-	request.bus_mode = (ios->bus_mode == MMC_BUSMODE_OPENDRAIN ?
608
+	request.bus_mode = ios->bus_mode == MMC_BUSMODE_OPENDRAIN ?
610
609
 			    GB_SDIO_BUSMODE_OPENDRAIN :
611
-			    GB_SDIO_BUSMODE_PUSHPULL);
610
+			    GB_SDIO_BUSMODE_PUSHPULL;
612
611
 
613
612
 	switch (ios->power_mode) {
614
613
 	case MMC_POWER_OFF: