Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 56ec0c7b88c6eb17733e5015f31302f6312511ed

Authored by Harry Ciao
Committed by Linus Torvalds
1 parent 46f7e602fb
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

edac: AMD8111 & AMD8131 use dev_name() 

The "bus_id" member in the device structure has been obsolete, use
dev_name() instead.

Signed-off-by: Harry Ciao <qingtao.cao@windriver.com>
Cc: Doug Thompson <norsk5@yahoo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

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

drivers/edac/amd8111_edac.c
Diff comments   View file @ 56ec0c7
... ... @@ -389,7 +389,7 @@
389 389 dev_info->edac_dev->dev = &dev_info->dev->dev;
390 390 dev_info->edac_dev->mod_name = AMD8111_EDAC_MOD_STR;
391 391 dev_info->edac_dev->ctl_name = dev_info->ctl_name;
392   - dev_info->edac_dev->dev_name = dev_info->dev->dev.bus_id;
  392 + dev_info->edac_dev->dev_name = dev_name(&dev_info->dev->dev);
393 393  
394 394 if (edac_op_state == EDAC_OPSTATE_POLL)
395 395 dev_info->edac_dev->edac_check = dev_info->check;
... ... @@ -473,7 +473,7 @@
473 473 pci_info->edac_dev->dev = &pci_info->dev->dev;
474 474 pci_info->edac_dev->mod_name = AMD8111_EDAC_MOD_STR;
475 475 pci_info->edac_dev->ctl_name = pci_info->ctl_name;
476   - pci_info->edac_dev->dev_name = pci_info->dev->dev.bus_id;
  476 + pci_info->edac_dev->dev_name = dev_name(&pci_info->dev->dev);
477 477  
478 478 if (edac_op_state == EDAC_OPSTATE_POLL)
479 479 pci_info->edac_dev->edac_check = pci_info->check;
drivers/edac/amd8131_edac.c
Diff comments   View file @ 56ec0c7
... ... @@ -287,7 +287,7 @@
287 287 dev_info->edac_dev->dev = &dev_info->dev->dev;
288 288 dev_info->edac_dev->mod_name = AMD8131_EDAC_MOD_STR;
289 289 dev_info->edac_dev->ctl_name = dev_info->ctl_name;
290   - dev_info->edac_dev->dev_name = dev_info->dev->dev.bus_id;
  290 + dev_info->edac_dev->dev_name = dev_name(&dev_info->dev->dev);
291 291  
292 292 if (edac_op_state == EDAC_OPSTATE_POLL)
293 293 dev_info->edac_dev->edac_check = amd8131_chipset.check;