Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0bad16aa081002c290d4b424bc019d890cab8796

Authored by Kay Sievers
Committed by Greg Kroah-Hartman
1 parent 64dba9a9a3
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 2 changed files with 4 additions and 5 deletions Side-by-side Diff

drivers/misc/tifm_7xx1.c
Diff comments   View file @ 0bad16a
... ... @@ -164,7 +164,7 @@
164 164 if (sock) {
165 165 printk(KERN_INFO
166 166 "%s : demand removing card from socket %u:%u\n",
167   - fm->dev.bus_id, fm->id, cnt);
  167 + dev_name(&fm->dev), fm->id, cnt);
168 168 fm->sockets[cnt] = NULL;
169 169 sock_addr = sock->addr;
170 170 spin_unlock_irqrestore(&fm->lock, flags);
drivers/misc/tifm_core.c
Diff comments   View file @ 0bad16a
... ... @@ -203,7 +203,7 @@
203 203 if (rc)
204 204 return rc;
205 205  
206   - snprintf(fm->dev.bus_id, BUS_ID_SIZE, "tifm%u", fm->id);
  206 + dev_set_name(&fm->dev, "tifm%u", fm->id);
207 207 rc = device_add(&fm->dev);
208 208 if (rc) {
209 209 spin_lock(&tifm_adapter_lock);
... ... @@ -266,9 +266,8 @@
266 266 sock->dev.dma_mask = fm->dev.parent->dma_mask;
267 267 sock->dev.release = tifm_free_device;
268 268  
269   - snprintf(sock->dev.bus_id, BUS_ID_SIZE,
270   - "tifm_%s%u:%u", tifm_media_type_name(type, 2),
271   - fm->id, id);
  269 + dev_set_name(&sock->dev, "tifm_%s%u:%u",
  270 + tifm_media_type_name(type, 2), fm->id, id);
272 271 printk(KERN_INFO DRIVER_NAME
273 272 ": %s card detected in socket %u:%u\n",
274 273 tifm_media_type_name(type, 0), fm->id, id);