diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-04-13 08:57:03 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-04-13 08:57:03 +0200 |
| commit | 889fac6d67d46a5e781c08fb26fec9016db1c307 (patch) | |
| tree | 7e01d04928f7ce343afff5b77ba13c2f3d083326 /arch/s390/pci/pci_debug.c | |
| parent | dad38ca64a252144b4ccdfe9730a3fe2b7c61957 (diff) | |
| parent | bf16200689118d19de1b8d2a3c314fc21f5dc7bb (diff) | |
Merge tag 'v4.6-rc3' into perf/core, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/s390/pci/pci_debug.c')
| -rw-r--r-- | arch/s390/pci/pci_debug.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/s390/pci/pci_debug.c b/arch/s390/pci/pci_debug.c index 4129b0a5fd78..c555de3d12d6 100644 --- a/arch/s390/pci/pci_debug.c +++ b/arch/s390/pci/pci_debug.c @@ -128,10 +128,9 @@ static const struct file_operations debugfs_pci_perf_fops = { .release = single_release, }; -void zpci_debug_init_device(struct zpci_dev *zdev) +void zpci_debug_init_device(struct zpci_dev *zdev, const char *name) { - zdev->debugfs_dev = debugfs_create_dir(dev_name(&zdev->pdev->dev), - debugfs_root); + zdev->debugfs_dev = debugfs_create_dir(name, debugfs_root); if (IS_ERR(zdev->debugfs_dev)) zdev->debugfs_dev = NULL; |