diff options
author | Venkatraman S <svenkatr@ti.com> | 2012-08-07 09:40:38 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2012-09-04 13:58:23 -0400 |
commit | 8986d31bf5bd3c2c06c1fe0dc18f8ea50e9f2a50 (patch) | |
tree | edc97658d12540b9766f0c48bd0eb4efcf98eb61 | |
parent | 75d569d343bdb759105477ea9876cbd62e43d103 (diff) |
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: Venkatraman S <svenkatr@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
-rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index e1807350d3ed..da4f5a73a324 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include <linux/mmc/core.h> | 35 | #include <linux/mmc/core.h> |
36 | #include <linux/mmc/mmc.h> | 36 | #include <linux/mmc/mmc.h> |
37 | #include <linux/io.h> | 37 | #include <linux/io.h> |
38 | #include <linux/semaphore.h> | ||
39 | #include <linux/gpio.h> | 38 | #include <linux/gpio.h> |
40 | #include <linux/regulator/consumer.h> | 39 | #include <linux/regulator/consumer.h> |
41 | #include <linux/pm_runtime.h> | 40 | #include <linux/pm_runtime.h> |
@@ -162,8 +161,6 @@ struct omap_hsmmc_host { | |||
162 | unsigned int dma_sg_idx; | 161 | unsigned int dma_sg_idx; |
163 | unsigned char bus_mode; | 162 | unsigned char bus_mode; |
164 | unsigned char power_mode; | 163 | unsigned char power_mode; |
165 | u32 *buffer; | ||
166 | u32 bytesleft; | ||
167 | int suspended; | 164 | int suspended; |
168 | int irq; | 165 | int irq; |
169 | int use_dma, dma_ch; | 166 | int use_dma, dma_ch; |
@@ -172,7 +169,6 @@ struct omap_hsmmc_host { | |||
172 | int slot_id; | 169 | int slot_id; |
173 | int response_busy; | 170 | int response_busy; |
174 | int context_loss; | 171 | int context_loss; |
175 | int vdd; | ||
176 | int protect_card; | 172 | int protect_card; |
177 | int reqs_blocked; | 173 | int reqs_blocked; |
178 | int use_reg; | 174 | int use_reg; |
@@ -496,7 +492,7 @@ static void omap_hsmmc_set_clock(struct omap_hsmmc_host *host) | |||
496 | unsigned long regval; | 492 | unsigned long regval; |
497 | unsigned long timeout; | 493 | unsigned long timeout; |
498 | 494 | ||
499 | dev_dbg(mmc_dev(host->mmc), "Set clock to %uHz\n", ios->clock); | 495 | dev_vdbg(mmc_dev(host->mmc), "Set clock to %uHz\n", ios->clock); |
500 | 496 | ||
501 | omap_hsmmc_stop_clock(host); | 497 | omap_hsmmc_stop_clock(host); |
502 | 498 | ||
@@ -746,7 +742,7 @@ omap_hsmmc_start_command(struct omap_hsmmc_host *host, struct mmc_command *cmd, | |||
746 | { | 742 | { |
747 | int cmdreg = 0, resptype = 0, cmdtype = 0; | 743 | int cmdreg = 0, resptype = 0, cmdtype = 0; |
748 | 744 | ||
749 | dev_dbg(mmc_dev(host->mmc), "%s: CMD%d, argument 0x%08x\n", | 745 | dev_vdbg(mmc_dev(host->mmc), "%s: CMD%d, argument 0x%08x\n", |
750 | mmc_hostname(host->mmc), cmd->opcode, cmd->arg); | 746 | mmc_hostname(host->mmc), cmd->opcode, cmd->arg); |
751 | host->cmd = cmd; | 747 | host->cmd = cmd; |
752 | 748 | ||
@@ -935,7 +931,7 @@ static void omap_hsmmc_dbg_report_irq(struct omap_hsmmc_host *host, u32 status) | |||
935 | buf += len; | 931 | buf += len; |
936 | } | 932 | } |
937 | 933 | ||
938 | dev_dbg(mmc_dev(host->mmc), "%s\n", res); | 934 | dev_vdbg(mmc_dev(host->mmc), "%s\n", res); |
939 | } | 935 | } |
940 | #else | 936 | #else |
941 | static inline void omap_hsmmc_dbg_report_irq(struct omap_hsmmc_host *host, | 937 | 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) | |||
997 | } | 993 | } |
998 | 994 | ||
999 | data = host->data; | 995 | data = host->data; |
1000 | dev_dbg(mmc_dev(host->mmc), "IRQ Status is %x\n", status); | 996 | dev_vdbg(mmc_dev(host->mmc), "IRQ Status is %x\n", status); |
1001 | 997 | ||
1002 | if (status & ERR) { | 998 | if (status & ERR) { |
1003 | omap_hsmmc_dbg_report_irq(host, status); | 999 | 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) | |||
1502 | case MMC_POWER_OFF: | 1498 | case MMC_POWER_OFF: |
1503 | mmc_slot(host).set_power(host->dev, host->slot_id, | 1499 | mmc_slot(host).set_power(host->dev, host->slot_id, |
1504 | 0, 0); | 1500 | 0, 0); |
1505 | host->vdd = 0; | ||
1506 | break; | 1501 | break; |
1507 | case MMC_POWER_UP: | 1502 | case MMC_POWER_UP: |
1508 | mmc_slot(host).set_power(host->dev, host->slot_id, | 1503 | mmc_slot(host).set_power(host->dev, host->slot_id, |
1509 | 1, ios->vdd); | 1504 | 1, ios->vdd); |
1510 | host->vdd = ios->vdd; | ||
1511 | break; | 1505 | break; |
1512 | case MMC_POWER_ON: | 1506 | case MMC_POWER_ON: |
1513 | do_send_init_stream = 1; | 1507 | do_send_init_stream = 1; |