Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 132919ba authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[MMC] Remove data->blksz_bits member 



data->blksz_bits is unused now - remove it.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 3bc87f24

drivers/mmc/mmc.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -996,7 +996,6 @@ static void mmc_read_scrs(struct mmc_host *host) 




		mmc_set_data_timeout(&data, card, 0);

		mmc_set_data_timeout(&data, card, 0);





		data.blksz_bits = 3;

		data.blksz = 1 << 3;

		data.blksz = 1 << 3;

		data.blocks = 1;

		data.blocks = 1;

		data.flags = MMC_DATA_READ;

		data.flags = MMC_DATA_READ;

drivers/mmc/mmc_block.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -172,7 +172,6 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) 




		brq.cmd.arg = req->sector << 9;

		brq.cmd.arg = req->sector << 9;

		brq.cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;

		brq.cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;

		brq.data.blksz_bits = md->block_bits;

		brq.data.blksz = 1 << md->block_bits;

		brq.data.blksz = 1 << md->block_bits;

		brq.data.blocks = req->nr_sectors >> (md->block_bits - 9);

		brq.data.blocks = req->nr_sectors >> (md->block_bits - 9);

		brq.stop.opcode = MMC_STOP_TRANSMISSION;

		brq.stop.opcode = MMC_STOP_TRANSMISSION;

include/linux/mmc/mmc.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -68,7 +68,6 @@ struct mmc_command { 
struct mmc_data {

struct mmc_data {

	unsigned int		timeout_ns;	/* data timeout (in ns, max 80ms) */

	unsigned int		timeout_ns;	/* data timeout (in ns, max 80ms) */

	unsigned int		timeout_clks;	/* data timeout (in clocks) */

	unsigned int		timeout_clks;	/* data timeout (in clocks) */

	unsigned int		blksz_bits;	/* data block size */

	unsigned int		blksz;		/* data block size */

	unsigned int		blksz;		/* data block size */

	unsigned int		blocks;		/* number of blocks */

	unsigned int		blocks;		/* number of blocks */

	unsigned int		error;		/* data error */

	unsigned int		error;		/* data error */