#include <linux/mmc/core.h>
 #include <linux/mmc/mmc.h>
 #include <linux/io.h>
-#include <linux/semaphore.h>
 #include <linux/gpio.h>
 #include <linux/regulator/consumer.h>
 #include <linux/pm_runtime.h>
        unsigned int            dma_sg_idx;
        unsigned char           bus_mode;
        unsigned char           power_mode;
-       u32                     *buffer;
-       u32                     bytesleft;
        int                     suspended;
        int                     irq;
        int                     use_dma, dma_ch;
        int                     slot_id;
        int                     response_busy;
        int                     context_loss;
-       int                     vdd;
        int                     protect_card;
        int                     reqs_blocked;
        int                     use_reg;
        unsigned long regval;
        unsigned long timeout;
 
-       dev_dbg(mmc_dev(host->mmc), "Set clock to %uHz\n", ios->clock);
+       dev_vdbg(mmc_dev(host->mmc), "Set clock to %uHz\n", ios->clock);
 
        omap_hsmmc_stop_clock(host);
 
 {
        int cmdreg = 0, resptype = 0, cmdtype = 0;
 
-       dev_dbg(mmc_dev(host->mmc), "%s: CMD%d, argument 0x%08x\n",
+       dev_vdbg(mmc_dev(host->mmc), "%s: CMD%d, argument 0x%08x\n",
                mmc_hostname(host->mmc), cmd->opcode, cmd->arg);
        host->cmd = cmd;
 
                        buf += len;
                }
 
-       dev_dbg(mmc_dev(host->mmc), "%s\n", res);
+       dev_vdbg(mmc_dev(host->mmc), "%s\n", res);
 }
 #else
 static inline void omap_hsmmc_dbg_report_irq(struct omap_hsmmc_host *host,
        }
 
        data = host->data;
-       dev_dbg(mmc_dev(host->mmc), "IRQ Status is %x\n", status);
+       dev_vdbg(mmc_dev(host->mmc), "IRQ Status is %x\n", status);
 
        if (status & ERR) {
                omap_hsmmc_dbg_report_irq(host, status);
                case MMC_POWER_OFF:
                        mmc_slot(host).set_power(host->dev, host->slot_id,
                                                 0, 0);
-                       host->vdd = 0;
                        break;
                case MMC_POWER_UP:
                        mmc_slot(host).set_power(host->dev, host->slot_id,
                                                 1, ios->vdd);
-                       host->vdd = ios->vdd;
                        break;
                case MMC_POWER_ON:
                        do_send_init_stream = 1;