diff options
| author | Ulf Hansson | 2013-09-13 11:31:33 +0200 |
|---|---|---|
| committer | Chris Ball | 2013-10-31 01:26:29 +0100 |
| commit | 6904115095ad60ced638eb1e36e0e4e5e7de00b0 (patch) | |
| tree | 7bf979ff85dbf5a97c0aef99624293b67a54b094 /include/linux/mmc | |
| parent | mmc: core: Cleanup code for setting ocr mask for SDIO (diff) | |
| download | kernel-qcow2-linux-6904115095ad60ced638eb1e36e0e4e5e7de00b0.tar.gz kernel-qcow2-linux-6904115095ad60ced638eb1e36e0e4e5e7de00b0.tar.xz kernel-qcow2-linux-6904115095ad60ced638eb1e36e0e4e5e7de00b0.zip | |
mmc: core: Move cached value of the negotiated ocr mask to card struct
The negotiated ocr mask is directly related to the card. Once a card
gets removed, the mask shall be dropped. By moving the cache of the ocr
mask from the host struct to the card struct we have accomplished this.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'include/linux/mmc')
| -rw-r--r-- | include/linux/mmc/card.h | 1 | ||||
| -rw-r--r-- | include/linux/mmc/host.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index f42cdbd8ac21..33d9a74f92e6 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -240,6 +240,7 @@ struct mmc_part { struct mmc_card { struct mmc_host *host; /* the host this device belongs to */ struct device dev; /* the device */ + u32 ocr; /* the current OCR setting */ unsigned int rca; /* relative card address of device */ unsigned int type; /* card type */ #define MMC_TYPE_MMC 0 /* MMC card */ diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 3b0c33ae13e1..1c91bbbb01c3 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -309,7 +309,6 @@ struct mmc_host { spinlock_t lock; /* lock for claim and bus ops */ struct mmc_ios ios; /* current io bus settings */ - u32 ocr; /* the current OCR setting */ /* group bitfields together to minimize padding */ unsigned int use_spi_crc:1; |