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

Commit ee4b8887 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Chris Ball
Browse files

mmc: sh_mmcif: cosmetic clean up 



This patch doesn't introduce any functional changes, it only simplifies
some code fragments, removes superfluous parameters, fixes typos.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 8a8284a9

drivers/mmc/host/sh_mmcif.c

+34 −45
Original line number Original line Diff line number Diff line
@@ -124,6 +124,11 @@ 
#define MASK_MRBSYTO		(1 << 1)

#define MASK_MRBSYTO		(1 << 1)

#define MASK_MRSPTO		(1 << 0)

#define MASK_MRSPTO		(1 << 0)





#define MASK_START_CMD		(MASK_MCMDVIO | MASK_MBUFVIO | MASK_MWDATERR | \

				 MASK_MRDATERR | MASK_MRIDXERR | MASK_MRSPERR | \

				 MASK_MCCSTO | MASK_MCRCSTO | MASK_MWDATTO | \

				 MASK_MRDATTO | MASK_MRBSYTO | MASK_MRSPTO)



/* CE_HOST_STS1 */

/* CE_HOST_STS1 */

#define STS1_CMDSEQ		(1 << 31)

#define STS1_CMDSEQ		(1 << 31)
@@ -176,8 +181,8 @@ struct sh_mmcif_host { 
	long timeout;

	long timeout;

	void __iomem *addr;

	void __iomem *addr;

	struct completion intr_wait;

	struct completion intr_wait;

	spinlock_t lock;		/* protect sh_mmcif_host::state */

	enum mmcif_state state;

	enum mmcif_state state;

	spinlock_t lock;

	bool power;

	bool power;

	bool card_present;

	bool card_present;
@@ -422,7 +427,7 @@ static void sh_mmcif_sync_reset(struct sh_mmcif_host *host) 
static int sh_mmcif_error_manage(struct sh_mmcif_host *host)

static int sh_mmcif_error_manage(struct sh_mmcif_host *host)

{

{

	u32 state1, state2;

	u32 state1, state2;

	int ret, timeout = 10000000;

	int ret, timeout;





	host->sd_error = false;

	host->sd_error = false;
@@ -434,31 +439,30 @@ static int sh_mmcif_error_manage(struct sh_mmcif_host *host) 
	if (state1 & STS1_CMDSEQ) {

	if (state1 & STS1_CMDSEQ) {

		sh_mmcif_bitset(host, MMCIF_CE_CMD_CTRL, CMD_CTRL_BREAK);

		sh_mmcif_bitset(host, MMCIF_CE_CMD_CTRL, CMD_CTRL_BREAK);

		sh_mmcif_bitset(host, MMCIF_CE_CMD_CTRL, ~CMD_CTRL_BREAK);

		sh_mmcif_bitset(host, MMCIF_CE_CMD_CTRL, ~CMD_CTRL_BREAK);

		while (1) {

		for (timeout = 10000000; timeout; timeout--) {

			timeout--;

			if (timeout < 0) {

				dev_err(&host->pd->dev,

					"Forceed end of command sequence timeout err\n");

				return -EIO;

			}

			if (!(sh_mmcif_readl(host->addr, MMCIF_CE_HOST_STS1)

			if (!(sh_mmcif_readl(host->addr, MMCIF_CE_HOST_STS1)

			      & STS1_CMDSEQ))

			      & STS1_CMDSEQ))

				break;

				break;

			mdelay(1);

			mdelay(1);

		}

		}

		if (!timeout) {

			dev_err(&host->pd->dev,

				"Forced end of command sequence timeout err\n");

			return -EIO;

		}

		sh_mmcif_sync_reset(host);

		sh_mmcif_sync_reset(host);

		dev_dbg(&host->pd->dev, "Forced end of command sequence\n");

		dev_dbg(&host->pd->dev, "Forced end of command sequence\n");

		return -EIO;

		return -EIO;

	}

	}





	if (state2 & STS2_CRC_ERR) {

	if (state2 & STS2_CRC_ERR) {

		dev_dbg(&host->pd->dev, ": Happened CRC error\n");

		dev_dbg(&host->pd->dev, ": CRC error\n");

		ret = -EIO;

		ret = -EIO;

	} else if (state2 & STS2_TIMEOUT_ERR) {

	} else if (state2 & STS2_TIMEOUT_ERR) {

		dev_dbg(&host->pd->dev, ": Happened Timeout error\n");

		dev_dbg(&host->pd->dev, ": Timeout\n");

		ret = -ETIMEDOUT;

		ret = -ETIMEDOUT;

	} else {

	} else {

		dev_dbg(&host->pd->dev, ": Happened End/Index error\n");

		dev_dbg(&host->pd->dev, ": End/Index error\n");

		ret = -EIO;

		ret = -EIO;

	}

	}

	return ret;

	return ret;
@@ -681,55 +685,44 @@ static u32 sh_mmcif_set_cmd(struct sh_mmcif_host *host, 
static int sh_mmcif_data_trans(struct sh_mmcif_host *host,

static int sh_mmcif_data_trans(struct sh_mmcif_host *host,

				struct mmc_request *mrq, u32 opc)

				struct mmc_request *mrq, u32 opc)

{

{

	int ret;



	switch (opc) {

	switch (opc) {

	case MMC_READ_MULTIPLE_BLOCK:

	case MMC_READ_MULTIPLE_BLOCK:

		ret = sh_mmcif_multi_read(host, mrq);

		return sh_mmcif_multi_read(host, mrq);

		break;

	case MMC_WRITE_MULTIPLE_BLOCK:

	case MMC_WRITE_MULTIPLE_BLOCK:

		ret = sh_mmcif_multi_write(host, mrq);

		return sh_mmcif_multi_write(host, mrq);

		break;

	case MMC_WRITE_BLOCK:

	case MMC_WRITE_BLOCK:

		ret = sh_mmcif_single_write(host, mrq);

		return sh_mmcif_single_write(host, mrq);

		break;

	case MMC_READ_SINGLE_BLOCK:

	case MMC_READ_SINGLE_BLOCK:

	case MMC_SEND_EXT_CSD:

	case MMC_SEND_EXT_CSD:

		ret = sh_mmcif_single_read(host, mrq);

		return sh_mmcif_single_read(host, mrq);

		break;

	default:

	default:

		dev_err(&host->pd->dev, "UNSUPPORTED CMD = d'%08d\n", opc);

		dev_err(&host->pd->dev, "UNSUPPORTED CMD = d'%08d\n", opc);

		ret = -EINVAL;

		return -EINVAL;

		break;

	}

	}

	return ret;

}

}





static void sh_mmcif_start_cmd(struct sh_mmcif_host *host,

static void sh_mmcif_start_cmd(struct sh_mmcif_host *host,

			struct mmc_request *mrq, struct mmc_command *cmd)

			       struct mmc_request *mrq)

{

{

	struct mmc_command *cmd = mrq->cmd;

	long time;

	long time;

	int ret = 0, mask = 0;

	int ret = 0;

	u32 opc = cmd->opcode;

	u32 mask, opc = cmd->opcode;





	switch (opc) {

	switch (opc) {

	/* respons busy check */

	/* response busy check */

	case MMC_SWITCH:

	case MMC_SWITCH:

	case MMC_STOP_TRANSMISSION:

	case MMC_STOP_TRANSMISSION:

	case MMC_SET_WRITE_PROT:

	case MMC_SET_WRITE_PROT:

	case MMC_CLR_WRITE_PROT:

	case MMC_CLR_WRITE_PROT:

	case MMC_ERASE:

	case MMC_ERASE:

	case MMC_GEN_CMD:

	case MMC_GEN_CMD:

		mask = MASK_MRBSYE;

		mask = MASK_START_CMD | MASK_MRBSYE;

		break;

		break;

	default:

	default:

		mask = MASK_MCRSPE;

		mask = MASK_START_CMD | MASK_MCRSPE;

		break;

		break;

	}

	}

	mask |=	MASK_MCMDVIO | MASK_MBUFVIO | MASK_MWDATERR |

		MASK_MRDATERR | MASK_MRIDXERR | MASK_MRSPERR |

		MASK_MCCSTO | MASK_MCRCSTO | MASK_MWDATTO |

		MASK_MRDATTO | MASK_MRBSYTO | MASK_MRSPTO;





	if (host->data) {

	if (host->data) {

		sh_mmcif_writel(host->addr, MMCIF_CE_BLOCK_SET, 0);

		sh_mmcif_writel(host->addr, MMCIF_CE_BLOCK_SET, 0);
@@ -797,8 +790,9 @@ static void sh_mmcif_start_cmd(struct sh_mmcif_host *host, 
}

}





static void sh_mmcif_stop_cmd(struct sh_mmcif_host *host,

static void sh_mmcif_stop_cmd(struct sh_mmcif_host *host,

		struct mmc_request *mrq, struct mmc_command *cmd)

			      struct mmc_request *mrq)

{

{

	struct mmc_command *cmd = mrq->stop;

	long time;

	long time;





	if (mrq->cmd->opcode == MMC_READ_MULTIPLE_BLOCK)

	if (mrq->cmd->opcode == MMC_READ_MULTIPLE_BLOCK)
@@ -867,11 +861,11 @@ static void sh_mmcif_request(struct mmc_host *mmc, struct mmc_request *mrq) 
				sh_mmcif_start_dma_tx(host);

				sh_mmcif_start_dma_tx(host);

		}

		}

	}

	}

	sh_mmcif_start_cmd(host, mrq, mrq->cmd);

	sh_mmcif_start_cmd(host, mrq);

	host->data = NULL;

	host->data = NULL;





	if (!mrq->cmd->error && mrq->stop)

	if (!mrq->cmd->error && mrq->stop)

		sh_mmcif_stop_cmd(host, mrq, mrq->stop);

		sh_mmcif_stop_cmd(host, mrq);

	host->state = STATE_IDLE;

	host->state = STATE_IDLE;

	mmc_request_done(mmc, mrq);

	mmc_request_done(mmc, mrq);

}

}
@@ -948,11 +942,6 @@ static struct mmc_host_ops sh_mmcif_ops = { 
	.get_cd		= sh_mmcif_get_cd,

	.get_cd		= sh_mmcif_get_cd,

};

};





static void sh_mmcif_detect(struct mmc_host *mmc)

{

	mmc_detect_change(mmc, 0);

}



static irqreturn_t sh_mmcif_intr(int irq, void *dev_id)

static irqreturn_t sh_mmcif_intr(int irq, void *dev_id)

{

{

	struct sh_mmcif_host *host = dev_id;

	struct sh_mmcif_host *host = dev_id;
@@ -1114,7 +1103,7 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev) 
		goto clean_up3;

		goto clean_up3;

	}

	}





	sh_mmcif_detect(host->mmc);

	mmc_detect_change(host->mmc, 0);





	dev_info(&pdev->dev, "driver version %s\n", DRIVER_VERSION);

	dev_info(&pdev->dev, "driver version %s\n", DRIVER_VERSION);

	dev_dbg(&pdev->dev, "chip ver H'%04x\n",

	dev_dbg(&pdev->dev, "chip ver H'%04x\n",