forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-10 cde9070d9970eef1f7ec2360586c802a16230ad8
kernel/drivers/staging/greybus/sdio.c
....@@ -12,8 +12,8 @@
1212 #include <linux/mmc/mmc.h>
1313 #include <linux/scatterlist.h>
1414 #include <linux/workqueue.h>
15
+#include <linux/greybus.h>
1516
16
-#include "greybus.h"
1717 #include "gbphy.h"
1818
1919 struct gb_sdio_host {
....@@ -67,7 +67,6 @@
6767 ((r & GB_SDIO_CAP_8_BIT_DATA) ? MMC_CAP_8_BIT_DATA : 0) |
6868 ((r & GB_SDIO_CAP_MMC_HS) ? MMC_CAP_MMC_HIGHSPEED : 0) |
6969 ((r & GB_SDIO_CAP_SD_HS) ? MMC_CAP_SD_HIGHSPEED : 0) |
70
- ((r & GB_SDIO_CAP_ERASE) ? MMC_CAP_ERASE : 0) |
7170 ((r & GB_SDIO_CAP_1_2V_DDR) ? MMC_CAP_1_2V_DDR : 0) |
7271 ((r & GB_SDIO_CAP_1_8V_DDR) ? MMC_CAP_1_8V_DDR : 0) |
7372 ((r & GB_SDIO_CAP_POWER_OFF_CARD) ? MMC_CAP_POWER_OFF_CARD : 0) |
....@@ -275,7 +274,7 @@
275274 return -ENOMEM;
276275
277276 request = operation->request->payload;
278
- request->data_flags = (data->flags >> 8);
277
+ request->data_flags = data->flags >> 8;
279278 request->data_blocks = cpu_to_le16(nblocks);
280279 request->data_blksz = cpu_to_le16(data->blksz);
281280
....@@ -329,7 +328,7 @@
329328 return -ENOMEM;
330329
331330 request = operation->request->payload;
332
- request->data_flags = (data->flags >> 8);
331
+ request->data_flags = data->flags >> 8;
333332 request->data_blocks = cpu_to_le16(nblocks);
334333 request->data_blksz = cpu_to_le16(data->blksz);
335334
....@@ -606,9 +605,9 @@
606605 vdd = 1 << (ios->vdd - GB_SDIO_VDD_SHIFT);
607606 request.vdd = cpu_to_le32(vdd);
608607
609
- request.bus_mode = (ios->bus_mode == MMC_BUSMODE_OPENDRAIN ?
608
+ request.bus_mode = ios->bus_mode == MMC_BUSMODE_OPENDRAIN ?
610609 GB_SDIO_BUSMODE_OPENDRAIN :
611
- GB_SDIO_BUSMODE_PUSHPULL);
610
+ GB_SDIO_BUSMODE_PUSHPULL;
612611
613612 switch (ios->power_mode) {
614613 case MMC_POWER_OFF: