diff options
-rw-r--r-- | drivers/mmc/mmc.c | 1 | ||||
-rw-r--r-- | drivers/mmc/mmc_block.c | 1 | ||||
-rw-r--r-- | include/linux/mmc/mmc.h | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 74eaaee66de0..5b9caa7978d3 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c | |||
@@ -996,7 +996,6 @@ static void mmc_read_scrs(struct mmc_host *host) | |||
996 | 996 | ||
997 | mmc_set_data_timeout(&data, card, 0); | 997 | mmc_set_data_timeout(&data, card, 0); |
998 | 998 | ||
999 | data.blksz_bits = 3; | ||
1000 | data.blksz = 1 << 3; | 999 | data.blksz = 1 << 3; |
1001 | data.blocks = 1; | 1000 | data.blocks = 1; |
1002 | data.flags = MMC_DATA_READ; | 1001 | data.flags = MMC_DATA_READ; |
diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c index a0e0dad1b419..f3a99dd8df8f 100644 --- a/drivers/mmc/mmc_block.c +++ b/drivers/mmc/mmc_block.c | |||
@@ -172,7 +172,6 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) | |||
172 | 172 | ||
173 | brq.cmd.arg = req->sector << 9; | 173 | brq.cmd.arg = req->sector << 9; |
174 | brq.cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC; | 174 | brq.cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC; |
175 | brq.data.blksz_bits = md->block_bits; | ||
176 | brq.data.blksz = 1 << md->block_bits; | 175 | brq.data.blksz = 1 << md->block_bits; |
177 | brq.data.blocks = req->nr_sectors >> (md->block_bits - 9); | 176 | brq.data.blocks = req->nr_sectors >> (md->block_bits - 9); |
178 | brq.stop.opcode = MMC_STOP_TRANSMISSION; | 177 | brq.stop.opcode = MMC_STOP_TRANSMISSION; |
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h index 627e2c08ce41..a3594dfd6963 100644 --- a/include/linux/mmc/mmc.h +++ b/include/linux/mmc/mmc.h | |||
@@ -68,7 +68,6 @@ struct mmc_command { | |||
68 | struct mmc_data { | 68 | struct mmc_data { |
69 | unsigned int timeout_ns; /* data timeout (in ns, max 80ms) */ | 69 | unsigned int timeout_ns; /* data timeout (in ns, max 80ms) */ |
70 | unsigned int timeout_clks; /* data timeout (in clocks) */ | 70 | unsigned int timeout_clks; /* data timeout (in clocks) */ |
71 | unsigned int blksz_bits; /* data block size */ | ||
72 | unsigned int blksz; /* data block size */ | 71 | unsigned int blksz; /* data block size */ |
73 | unsigned int blocks; /* number of blocks */ | 72 | unsigned int blocks; /* number of blocks */ |
74 | unsigned int error; /* data error */ | 73 | unsigned int error; /* data error */ |