blkcg: fix ref count issue with bio_blkcg using task_css

[linux.git] / drivers / mmc / core / core.c

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 281826d1fcca7d498b1e3d4641b4ceffbebdb4a0..50a5c340307b8c33b9ed6ad72eafeb8afa227174 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2078,7 +2078,7 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from,
                cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
                /* Do not retry else we can't see errors */
                err = mmc_wait_for_cmd(card->host, &cmd, 0);
-               if (err || (cmd.resp[0] & 0xFDF92000)) {
+               if (err || R1_STATUS(cmd.resp[0])) {
                        pr_err("error %d requesting status %#x\n",
                                err, cmd.resp[0]);
                        err = -EIO;
@@ -2716,52 +2716,6 @@ void mmc_stop_host(struct mmc_host *host)
        mmc_release_host(host);
 }
 
-int mmc_power_save_host(struct mmc_host *host)
-{
-       int ret = 0;
-
-       pr_debug("%s: %s: powering down\n", mmc_hostname(host), __func__);
-
-       mmc_bus_get(host);
-
-       if (!host->bus_ops || host->bus_dead) {
-               mmc_bus_put(host);
-               return -EINVAL;
-       }
-
-       if (host->bus_ops->power_save)
-               ret = host->bus_ops->power_save(host);
-
-       mmc_bus_put(host);
-
-       mmc_power_off(host);
-
-       return ret;
-}
-EXPORT_SYMBOL(mmc_power_save_host);
-
-int mmc_power_restore_host(struct mmc_host *host)
-{
-       int ret;
-
-       pr_debug("%s: %s: powering up\n", mmc_hostname(host), __func__);
-
-       mmc_bus_get(host);
-
-       if (!host->bus_ops || host->bus_dead) {
-               mmc_bus_put(host);
-               return -EINVAL;
-       }
-
-       mmc_power_up(host, host->card->ocr);
-       ret = host->bus_ops->power_restore(host);
-
-       mmc_bus_put(host);
-
-       return ret;
-}
-EXPORT_SYMBOL(mmc_power_restore_host);
-
 #ifdef CONFIG_PM_SLEEP
 /* Do the card removal on suspend if card is assumed removeable
  * Do that in pm notifier while userspace isn't yet frozen, so we will be able