adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Kay Sievers 2009-01-06 10:44:35 -08:00 committed by Greg Kroah-Hartman
parent 64dba9a9a3
commit 0bad16aa08
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/misc/tifm_7xx1.c
View file

@ -164,7 +164,7 @@ static void tifm_7xx1_switch_media(struct work_struct *work)
if (sock) { if (sock) {
printk(KERN_INFO printk(KERN_INFO
"%s : demand removing card from socket %u:%u\n", "%s : demand removing card from socket %u:%u\n",
fm->dev.bus_id, fm->id, cnt); dev_name(&fm->dev), fm->id, cnt);
fm->sockets[cnt] = NULL; fm->sockets[cnt] = NULL;
sock_addr = sock->addr; sock_addr = sock->addr;
spin_unlock_irqrestore(&fm->lock, flags); spin_unlock_irqrestore(&fm->lock, flags);

7
drivers/misc/tifm_core.c
View file

@ -203,7 +203,7 @@ int tifm_add_adapter(struct tifm_adapter *fm)
if (rc) if (rc)
return rc; return rc;
snprintf(fm->dev.bus_id, BUS_ID_SIZE, "tifm%u", fm->id); dev_set_name(&fm->dev, "tifm%u", fm->id);
rc = device_add(&fm->dev); rc = device_add(&fm->dev);
if (rc) { if (rc) {
spin_lock(&tifm_adapter_lock); spin_lock(&tifm_adapter_lock);
@ -266,9 +266,8 @@ struct tifm_dev *tifm_alloc_device(struct tifm_adapter *fm, unsigned int id,
sock->dev.dma_mask = fm->dev.parent->dma_mask; sock->dev.dma_mask = fm->dev.parent->dma_mask;
sock->dev.release = tifm_free_device; sock->dev.release = tifm_free_device;
snprintf(sock->dev.bus_id, BUS_ID_SIZE, dev_set_name(&sock->dev, "tifm_%s%u:%u",
"tifm_%s%u:%u", tifm_media_type_name(type, 2), tifm_media_type_name(type, 2), fm->id, id);
fm->id, id);
printk(KERN_INFO DRIVER_NAME printk(KERN_INFO DRIVER_NAME
": %s card detected in socket %u:%u\n", ": %s card detected in socket %u:%u\n",
tifm_media_type_name(type, 0), fm->id, id); tifm_media_type_name(type, 0), fm->id, id);