openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Russell King 2005-08-19 09:42:21 +01:00 committed by Russell King
parent 00b137cfda
commit 1ad434d7cf
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/mmc/mmc_sysfs.c
View File

@ -263,10 +263,9 @@ int mmc_add_host_sysfs(struct mmc_host *host)
{ {
static unsigned int host_num; 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++); "mmc%d", host_num++);
strlcpy(host->class_dev.class_id, host->host_name, BUS_ID_SIZE);
return class_device_add(&host->class_dev); return class_device_add(&host->class_dev);
} }

3
include/linux/mmc/host.h
View File

@ -68,7 +68,6 @@ struct mmc_host {
unsigned int f_min; unsigned int f_min;
unsigned int f_max; unsigned int f_max;
u32 ocr_avail; u32 ocr_avail;
char host_name[8];
/* host specific block data */ /* host specific block data */
unsigned int max_seg_size; /* see blk_queue_max_segment_size */ 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_priv(x) ((void *)((x) + 1))
#define mmc_dev(x) ((x)->dev) #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_suspend_host(struct mmc_host *, pm_message_t);
extern int mmc_resume_host(struct mmc_host *); extern int mmc_resume_host(struct mmc_host *);