diff options
| author | Linus Torvalds | 2005-09-08 15:28:16 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2005-09-08 15:28:16 -0700 |
| commit | 63068465fa9ba8258e341f70c07cd2221b8c114d (patch) | |
| tree | 79ec2bc8af8b95c09479ddc0661b2dec89281e92 /include | |
| parent | 35b7ac4c48fa851600c028e088d2239a2cf3dfca (diff) | |
| parent | c26971cbb39727b0b692c6236f890ba13046a663 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-pxa/mmc.h | 1 | ||||
| -rw-r--r-- | include/linux/mmc/host.h | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/include/asm-arm/arch-pxa/mmc.h b/include/asm-arm/arch-pxa/mmc.h index 9718063a2119..88c17dd02ed2 100644 --- a/include/asm-arm/arch-pxa/mmc.h +++ b/include/asm-arm/arch-pxa/mmc.h @@ -9,6 +9,7 @@ struct mmc_host; struct pxamci_platform_data { unsigned int ocr_mask; /* available voltages */ + unsigned long detect_delay; /* delay in jiffies before detecting cards after interrupt */ int (*init)(struct device *, irqreturn_t (*)(int, void *, struct pt_regs *), void *); int (*get_ro)(struct device *); void (*setpower)(struct device *, unsigned int); diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 6014160d9c06..c1f021eddffa 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -109,6 +109,8 @@ struct mmc_host { struct mmc_card *card_selected; /* the selected MMC card */ struct work_struct detect; + + unsigned long private[0] ____cacheline_aligned; }; extern struct mmc_host *mmc_alloc_host(int extra, struct device *); @@ -116,14 +118,18 @@ extern int mmc_add_host(struct mmc_host *); extern void mmc_remove_host(struct mmc_host *); extern void mmc_free_host(struct mmc_host *); -#define mmc_priv(x) ((void *)((x) + 1)) +static inline void *mmc_priv(struct mmc_host *host) +{ + return (void *)host->private; +} + #define mmc_dev(x) ((x)->dev) #define mmc_hostname(x) ((x)->class_dev.class_id) extern int mmc_suspend_host(struct mmc_host *, pm_message_t); extern int mmc_resume_host(struct mmc_host *); -extern void mmc_detect_change(struct mmc_host *); +extern void mmc_detect_change(struct mmc_host *, unsigned long delay); extern void mmc_request_done(struct mmc_host *, struct mmc_request *); #endif |