Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bad16aa authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

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



Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 64dba9a9

drivers/misc/tifm_7xx1.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static void tifm_7xx1_switch_media(struct work_struct *work) 
		if (sock) {

			printk(KERN_INFO

			       "%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;

			sock_addr = sock->addr;

			spin_unlock_irqrestore(&fm->lock, flags);

drivers/misc/tifm_core.c

+3 −4
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ int tifm_add_adapter(struct tifm_adapter *fm) 
	if (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);

	if (rc) {

		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.release = tifm_free_device;



		snprintf(sock->dev.bus_id, BUS_ID_SIZE,

			 "tifm_%s%u:%u", tifm_media_type_name(type, 2),

			 fm->id, id);

		dev_set_name(&sock->dev, "tifm_%s%u:%u",

			     tifm_media_type_name(type, 2), fm->id, id);

		printk(KERN_INFO DRIVER_NAME

		       ": %s card detected in socket %u:%u\n",

		       tifm_media_type_name(type, 0), fm->id, id);