---

yaml --- r: 6138 b: refs/heads/master c: 1ad434d h: refs/heads/master v: v3
git-mirror · Aug 19, 2005 · 6586d95 · 6586d95
1 parent d8a8747
commit 6586d95
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00b137cfda5276b3d2c87d44236fe4c5ee68b405
+refs/heads/master: 1ad434d7cf5f490c71cfbbb2fb91076c01c8704e
diff --git a/trunk/drivers/mmc/mmc_sysfs.c b/trunk/drivers/mmc/mmc_sysfs.c
@@ -263,10 +263,9 @@ int mmc_add_host_sysfs(struct mmc_host *host)
 {
 	static unsigned int host_num;
 
-	snprintf(host->host_name, sizeof(host->host_name),
+	snprintf(host->class_dev.class_id, BUS_ID_SIZE,
 		 "mmc%d", host_num++);
 
-	strlcpy(host->class_dev.class_id, host->host_name, BUS_ID_SIZE);
 	return class_device_add(&host->class_dev);
 }
 

diff --git a/trunk/include/linux/mmc/host.h b/trunk/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 *);