summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRussell King2005-08-19 10:42:21 +0200
committerRussell King2005-08-19 10:42:21 +0200
commit1ad434d7cf5f490c71cfbbb2fb91076c01c8704e (patch)
tree150758fc182cabcd231e8975a44062ee5d44dc71 /include
parent[MMC] Add MMC class devices (diff)
downloadkernel-qcow2-linux-1ad434d7cf5f490c71cfbbb2fb91076c01c8704e.tar.gz
kernel-qcow2-linux-1ad434d7cf5f490c71cfbbb2fb91076c01c8704e.tar.xz
kernel-qcow2-linux-1ad434d7cf5f490c71cfbbb2fb91076c01c8704e.zip
[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')
-rw-r--r--include/linux/mmc/host.h3
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 {
unsigned int f_min;
unsigned int f_max;
u32 ocr_avail;
- char host_name[8];
/* host specific block data */
unsigned int max_seg_size; /* see blk_queue_max_segment_size */
@@ -98,7 +97,7 @@ extern void mmc_free_host(struct mmc_host *);
#define mmc_priv(x) ((void *)((x) + 1))
#define mmc_dev(x) ((x)->dev)
-#define mmc_hostname(x) ((x)->host_name)
+#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 *);