Commit f28ef561 authored by Shawn Lin's avatar Shawn Lin Committed by Ulf Hansson
Browse files

mmc: mmc_test: remove BUG_ONs and deploy error handling 



It is unnecessary to panic the kernel when testing mmc. Instead,
cast a warning for folkz to debug and return the error code to
the caller to indicate the failure of this test should be enough.

Signed-off-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 8508cb98

drivers/mmc/card/mmc_test.c

+8 −4
Original line number Diff line number Diff line
@@ -214,7 +214,8 @@ static void mmc_test_prepare_mrq(struct mmc_test_card *test, 
	struct mmc_request *mrq, struct scatterlist *sg, unsigned sg_len,

	unsigned dev_addr, unsigned blocks, unsigned blksz, int write)

{

	BUG_ON(!mrq || !mrq->cmd || !mrq->data || !mrq->stop);

	if (WARN_ON(!mrq || !mrq->cmd || !mrq->data || !mrq->stop))

		return;



	if (blocks > 1) {

		mrq->cmd->opcode = write ?
@@ -694,7 +695,8 @@ static int mmc_test_cleanup(struct mmc_test_card *test) 
static void mmc_test_prepare_broken_mrq(struct mmc_test_card *test,

	struct mmc_request *mrq, int write)

{

	BUG_ON(!mrq || !mrq->cmd || !mrq->data);

	if (WARN_ON(!mrq || !mrq->cmd || !mrq->data))

		return;



	if (mrq->data->blocks > 1) {

		mrq->cmd->opcode = write ?
@@ -714,7 +716,8 @@ static int mmc_test_check_result(struct mmc_test_card *test, 
{

	int ret;



	BUG_ON(!mrq || !mrq->cmd || !mrq->data);

	if (WARN_ON(!mrq || !mrq->cmd || !mrq->data))

		return -EINVAL;



	ret = 0;
@@ -768,7 +771,8 @@ static int mmc_test_check_broken_result(struct mmc_test_card *test, 
{

	int ret;



	BUG_ON(!mrq || !mrq->cmd || !mrq->data);

	if (WARN_ON(!mrq || !mrq->cmd || !mrq->data))

		return -EINVAL;



	ret = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE