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

Commit 8986d31b authored by Venkatraman S's avatar Venkatraman S Committed by Chris Ball
Browse files

mmc: omap_hsmmc: remove unused vars and includes 



Some straight forward cleanup of unnecessary #include's and host
variables. Some of the verbose and redundant debug messages are
converted to use dev_vdbg.

Signed-off-by: default avatarVenkatraman S <svenkatr@ti.com>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 75d569d3

drivers/mmc/host/omap_hsmmc.c

+4 −10
Original line number Original line Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <linux/mmc/core.h>

#include <linux/mmc/core.h>

#include <linux/mmc/mmc.h>

#include <linux/mmc/mmc.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/semaphore.h>

#include <linux/gpio.h>

#include <linux/gpio.h>

#include <linux/regulator/consumer.h>

#include <linux/regulator/consumer.h>

#include <linux/pm_runtime.h>

#include <linux/pm_runtime.h>
@@ -162,8 +161,6 @@ struct omap_hsmmc_host { 
	unsigned int		dma_sg_idx;

	unsigned int		dma_sg_idx;

	unsigned char		bus_mode;

	unsigned char		bus_mode;

	unsigned char		power_mode;

	unsigned char		power_mode;

	u32			*buffer;

	u32			bytesleft;

	int			suspended;

	int			suspended;

	int			irq;

	int			irq;

	int			use_dma, dma_ch;

	int			use_dma, dma_ch;
@@ -172,7 +169,6 @@ struct omap_hsmmc_host { 
	int			slot_id;

	int			slot_id;

	int			response_busy;

	int			response_busy;

	int			context_loss;

	int			context_loss;

	int			vdd;

	int			protect_card;

	int			protect_card;

	int			reqs_blocked;

	int			reqs_blocked;

	int			use_reg;

	int			use_reg;
@@ -496,7 +492,7 @@ static void omap_hsmmc_set_clock(struct omap_hsmmc_host *host) 
	unsigned long regval;

	unsigned long regval;

	unsigned long timeout;

	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);

	omap_hsmmc_stop_clock(host);
@@ -746,7 +742,7 @@ omap_hsmmc_start_command(struct omap_hsmmc_host *host, struct mmc_command *cmd, 
{

{

	int cmdreg = 0, resptype = 0, cmdtype = 0;

	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);

		mmc_hostname(host->mmc), cmd->opcode, cmd->arg);

	host->cmd = cmd;

	host->cmd = cmd;
@@ -935,7 +931,7 @@ static void omap_hsmmc_dbg_report_irq(struct omap_hsmmc_host *host, u32 status) 
			buf += len;

			buf += len;

		}

		}





	dev_dbg(mmc_dev(host->mmc), "%s\n", res);

	dev_vdbg(mmc_dev(host->mmc), "%s\n", res);

}

}

#else

#else

static inline void omap_hsmmc_dbg_report_irq(struct omap_hsmmc_host *host,

static inline void omap_hsmmc_dbg_report_irq(struct omap_hsmmc_host *host,
@@ -997,7 +993,7 @@ static void omap_hsmmc_do_irq(struct omap_hsmmc_host *host, int status) 
	}

	}





	data = host->data;

	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) {

	if (status & ERR) {

		omap_hsmmc_dbg_report_irq(host, status);

		omap_hsmmc_dbg_report_irq(host, status);
@@ -1502,12 +1498,10 @@ static void omap_hsmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
		case MMC_POWER_OFF:

		case MMC_POWER_OFF:

			mmc_slot(host).set_power(host->dev, host->slot_id,

			mmc_slot(host).set_power(host->dev, host->slot_id,

						 0, 0);

						 0, 0);

			host->vdd = 0;

			break;

			break;

		case MMC_POWER_UP:

		case MMC_POWER_UP:

			mmc_slot(host).set_power(host->dev, host->slot_id,

			mmc_slot(host).set_power(host->dev, host->slot_id,

						 1, ios->vdd);

						 1, ios->vdd);

			host->vdd = ios->vdd;

			break;

			break;

		case MMC_POWER_ON:

		case MMC_POWER_ON:

			do_send_init_stream = 1;

			do_send_init_stream = 1;