tree 150758fc182cabcd231e8975a44062ee5d44dc71
parent 00b137cfda5276b3d2c87d44236fe4c5ee68b405
author Russell King <[EMAIL PROTECTED]> Fri, 19 Aug 2005 09:42:21 +0100
committer Russell King <[EMAIL PROTECTED]> Fri, 19 Aug 2005 09:42:21 +0100
[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 <[EMAIL PROTECTED]>
drivers/mmc/mmc_sysfs.c | 3 +--
include/linux/mmc/host.h | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/mmc_sysfs.c b/drivers/mmc/mmc_sysfs.c
--- a/drivers/mmc/mmc_sysfs.c
+++ b/drivers/mmc/mmc_sysfs.c
@@ -263,10 +263,9 @@ int mmc_add_host_sysfs(struct mmc_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/include/linux/mmc/host.h b/include/linux/mmc/host.h
--- 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_hos
#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 *);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
