summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid Schalig <dschalig@nvidia.com>2011-06-14 16:10:58 +0900
committerNiket Sirsi <nsirsi@nvidia.com>2011-06-15 21:44:29 -0700
commit40c8a6e8551e81ad4d7647029e0d85f7b0a7e496 (patch)
tree2dcec22b9ee4a13b62c295d259b656fbb36c865a /include
parent9d8f88a186320e9eb032059ae101cccd5e66781b (diff)
mmc: revert deferred resume
Revert MMC_BLOCK_DEFERRED_RESUME feature from SD driver. The feature was not implemented thread-safe. Fixing it would require a lot of locking logic at limited value. Deferred resume has no effect on eMMC, because eMMC will be used right after resume. For SD card it only saves power between resume and first SD card access, which is a limited usecase. It does not save power on normal SD card idle. Bug 833034 Change-Id: Ic6c9d751f463ef8135d0cf4c845462598fab774c Reviewed-on: http://git-master/r/36451 Reviewed-by: David Schalig <dschalig@nvidia.com> Tested-by: David Schalig <dschalig@nvidia.com> Reviewed-by: Alex Courbot <acourbot@nvidia.com> Reviewed-by: Sachin Nikam <snikam@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/mmc/host.h16
1 files changed, 0 insertions, 16 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 62ffcb05fb78..7076851d9c2c 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -230,10 +230,6 @@ struct mmc_host {
const struct mmc_bus_ops *bus_ops; /* current bus driver */
unsigned int bus_refs; /* reference counter */
- unsigned int bus_resume_flags;
-#define MMC_BUSRESUME_MANUAL_RESUME (1 << 0)
-#define MMC_BUSRESUME_NEEDS_RESUME (1 << 1)
-
unsigned int tuning_status;
#define MMC_SD_TUNING_COMPLETED (1 << 0)
#define MMC_SD_SAMPLING_CLOCK_SELECT_SET (1 << 1)
@@ -287,18 +283,6 @@ static inline void *mmc_priv(struct mmc_host *host)
#define mmc_dev(x) ((x)->parent)
#define mmc_classdev(x) (&(x)->class_dev)
#define mmc_hostname(x) (dev_name(&(x)->class_dev))
-#define mmc_bus_needs_resume(host) ((host)->bus_resume_flags & MMC_BUSRESUME_NEEDS_RESUME)
-#define mmc_bus_manual_resume(host) ((host)->bus_resume_flags & MMC_BUSRESUME_MANUAL_RESUME)
-
-static inline void mmc_set_bus_resume_policy(struct mmc_host *host, int manual)
-{
- if (manual)
- host->bus_resume_flags |= MMC_BUSRESUME_MANUAL_RESUME;
- else
- host->bus_resume_flags &= ~MMC_BUSRESUME_MANUAL_RESUME;
-}
-
-extern int mmc_resume_bus(struct mmc_host *host);
extern int mmc_suspend_host(struct mmc_host *);
extern int mmc_resume_host(struct mmc_host *);