Browse Source

mmc: vub300: Don't use mmc_card_present() when validating for inserted card

The mmc_card_present() function helps the mmc core to track an internal
state of the card device. More importantly, it's not intended to be used by
mmc host drivers to check for an inserted card. Therefore, let's stop using
it and instead rely on checking for a valid pointer to a struct mmc_card,
as it should be good enough.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Ulf Hansson 8 years ago
parent
commit
2e4af7b655
1 changed files with 2 additions and 4 deletions
  1. 2 4
      drivers/mmc/host/vub300.c

+ 2 - 4
drivers/mmc/host/vub300.c

@@ -726,8 +726,7 @@ static void vub300_deadwork_thread(struct work_struct *work)
 		 */
 		 */
 	} else if (vub300->card_present) {
 	} else if (vub300->card_present) {
 		check_vub300_port_status(vub300);
 		check_vub300_port_status(vub300);
-	} else if (vub300->mmc && vub300->mmc->card &&
-		   mmc_card_present(vub300->mmc->card)) {
+	} else if (vub300->mmc && vub300->mmc->card) {
 		/*
 		/*
 		 * the MMC core must not have responded
 		 * the MMC core must not have responded
 		 * to the previous indication - lets
 		 * to the previous indication - lets
@@ -1754,8 +1753,7 @@ static void vub300_cmndwork_thread(struct work_struct *work)
 		int data_length;
 		int data_length;
 		mutex_lock(&vub300->cmd_mutex);
 		mutex_lock(&vub300->cmd_mutex);
 		init_completion(&vub300->command_complete);
 		init_completion(&vub300->command_complete);
-		if (likely(vub300->vub_name[0]) || !vub300->mmc->card ||
-		    !mmc_card_present(vub300->mmc->card)) {
+		if (likely(vub300->vub_name[0]) || !vub300->mmc->card) {
 			/*
 			/*
 			 * the name of the EMPTY Pseudo firmware file
 			 * the name of the EMPTY Pseudo firmware file
 			 * is used as a flag to indicate that the file
 			 * is used as a flag to indicate that the file