diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-08-19 04:42:21 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-08-19 04:42:21 -0400 |
commit | 1ad434d7cf5f490c71cfbbb2fb91076c01c8704e (patch) | |
tree | 150758fc182cabcd231e8975a44062ee5d44dc71 /include/linux/mmc | |
parent | 00b137cfda5276b3d2c87d44236fe4c5ee68b405 (diff) |
[MMC] Use class device name for mmc host name
There's no point in having the host name duplicated between
the mmc_host structure and the encapsulated class device
structure.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/linux/mmc')
-rw-r--r-- | include/linux/mmc/host.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index a74a810a1302..113cc27865f0 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h | |||
@@ -68,7 +68,6 @@ struct mmc_host { | |||
68 | unsigned int f_min; | 68 | unsigned int f_min; |
69 | unsigned int f_max; | 69 | unsigned int f_max; |
70 | u32 ocr_avail; | 70 | u32 ocr_avail; |
71 | char host_name[8]; | ||
72 | 71 | ||
73 | /* host specific block data */ | 72 | /* host specific block data */ |
74 | unsigned int max_seg_size; /* see blk_queue_max_segment_size */ | 73 | unsigned int max_seg_size; /* see blk_queue_max_segment_size */ |
@@ -98,7 +97,7 @@ extern void mmc_free_host(struct mmc_host *); | |||
98 | 97 | ||
99 | #define mmc_priv(x) ((void *)((x) + 1)) | 98 | #define mmc_priv(x) ((void *)((x) + 1)) |
100 | #define mmc_dev(x) ((x)->dev) | 99 | #define mmc_dev(x) ((x)->dev) |
101 | #define mmc_hostname(x) ((x)->host_name) | 100 | #define mmc_hostname(x) ((x)->class_dev.class_id) |
102 | 101 | ||
103 | extern int mmc_suspend_host(struct mmc_host *, pm_message_t); | 102 | extern int mmc_suspend_host(struct mmc_host *, pm_message_t); |
104 | extern int mmc_resume_host(struct mmc_host *); | 103 | extern int mmc_resume_host(struct mmc_host *); |