tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

memstick: struct device - replace bus_id with dev_name(), dev_set_name()

Cc: Alex Dubov <oakad@yahoo.com>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Kay Sievers and committed by
Greg Kroah-Hartman 0252c3b4 1bb5beb4

+11 -12
+2 -3
drivers/memstick/core/memstick.c
··· 385 385 386 386 if (card) { 387 387 card->host = host; 388 - snprintf(card->dev.bus_id, sizeof(card->dev.bus_id), 389 - "%s", host->dev.bus_id); 388 + dev_set_name(&card->dev, "%s", dev_name(&host->dev)); 390 389 card->dev.parent = &host->dev; 391 390 card->dev.bus = &memstick_bus_type; 392 391 card->dev.release = memstick_free_card; ··· 518 519 if (rc) 519 520 return rc; 520 521 521 - snprintf(host->dev.bus_id, BUS_ID_SIZE, "memstick%u", host->id); 522 + dev_set_name(&host->dev, "memstick%u", host->id); 522 523 523 524 rc = device_add(&host->dev); 524 525 if (rc) {
+7 -7
drivers/memstick/core/mspro_block.c
··· 887 887 if (rc) { 888 888 printk(KERN_WARNING 889 889 "%s: could not switch to 4-bit mode, error %d\n", 890 - card->dev.bus_id, rc); 890 + dev_name(&card->dev), rc); 891 891 return 0; 892 892 } 893 893 894 894 msb->system = MEMSTICK_SYS_PAR4; 895 895 host->set_param(host, MEMSTICK_INTERFACE, MEMSTICK_PAR4); 896 896 printk(KERN_INFO "%s: switching to 4-bit parallel mode\n", 897 - card->dev.bus_id); 897 + dev_name(&card->dev)); 898 898 899 899 if (msb->caps & MEMSTICK_CAP_PAR8) { 900 900 rc = mspro_block_set_interface(card, MEMSTICK_SYS_PAR8); ··· 905 905 MEMSTICK_PAR8); 906 906 printk(KERN_INFO 907 907 "%s: switching to 8-bit parallel mode\n", 908 - card->dev.bus_id); 908 + dev_name(&card->dev)); 909 909 } else 910 910 printk(KERN_WARNING 911 911 "%s: could not switch to 8-bit mode, error %d\n", 912 - card->dev.bus_id, rc); 912 + dev_name(&card->dev), rc); 913 913 } 914 914 915 915 card->next_request = h_mspro_block_req_init; ··· 922 922 if (rc) { 923 923 printk(KERN_WARNING 924 924 "%s: interface error, trying to fall back to serial\n", 925 - card->dev.bus_id); 925 + dev_name(&card->dev)); 926 926 msb->system = MEMSTICK_SYS_SERIAL; 927 927 host->set_param(host, MEMSTICK_POWER, MEMSTICK_POWER_OFF); 928 928 msleep(10); ··· 992 992 993 993 if (be16_to_cpu(attr->signature) != MSPRO_BLOCK_SIGNATURE) { 994 994 printk(KERN_ERR "%s: unrecognized device signature %x\n", 995 - card->dev.bus_id, be16_to_cpu(attr->signature)); 995 + dev_name(&card->dev), be16_to_cpu(attr->signature)); 996 996 rc = -ENODEV; 997 997 goto out_free_attr; 998 998 } 999 999 1000 1000 if (attr->count > MSPRO_BLOCK_MAX_ATTRIBUTES) { 1001 1001 printk(KERN_WARNING "%s: way too many attribute entries\n", 1002 - card->dev.bus_id); 1002 + dev_name(&card->dev)); 1003 1003 attr_count = MSPRO_BLOCK_MAX_ATTRIBUTES; 1004 1004 } else 1005 1005 attr_count = attr->count;
+2 -2
drivers/memstick/host/tifm_ms.c
··· 546 546 printk(KERN_ERR 547 547 "%s : card failed to respond for a long period of time " 548 548 "(%x, %x)\n", 549 - host->dev->dev.bus_id, host->req ? host->req->tpc : 0, 549 + dev_name(&host->dev->dev), host->req ? host->req->tpc : 0, 550 550 host->cmd_flags); 551 551 552 552 tifm_eject(host->dev); ··· 561 561 if (!(TIFM_SOCK_STATE_OCCUPIED 562 562 & readl(sock->addr + SOCK_PRESENT_STATE))) { 563 563 printk(KERN_WARNING "%s : card gone, unexpectedly\n", 564 - sock->dev.bus_id); 564 + dev_name(&sock->dev)); 565 565 return rc; 566 566 } 567 567