diff options
| author | Helge Deller <deller@gmx.de> | 2022-07-18 17:06:47 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2022-08-01 18:43:23 +0200 |
| commit | cab56b51ec0e69128909cef4650e1907248d821b (patch) | |
| tree | 137c2da51d11d8fe82d260bf238c390aed3593d1 /arch/parisc | |
| parent | parisc: Clean up names in hardware database (diff) | |
| download | linux-cab56b51ec0e69128909cef4650e1907248d821b.tar.xz linux-cab56b51ec0e69128909cef4650e1907248d821b.zip | |
parisc: Fix device names in /proc/iomem
Fix the output of /proc/iomem to show the real hardware device name
including the pa_pathname, e.g. "Merlin 160 Core Centronics [8:16:0]".
Up to now only the pa_pathname ("[8:16.0]") was shown.
Signed-off-by: Helge Deller <deller@gmx.de>
Cc: <stable@vger.kernel.org> # v4.9+
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/kernel/drivers.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/parisc/kernel/drivers.c b/arch/parisc/kernel/drivers.c index 776d624a7207..d126e78e101a 100644 --- a/arch/parisc/kernel/drivers.c +++ b/arch/parisc/kernel/drivers.c @@ -520,7 +520,6 @@ alloc_pa_dev(unsigned long hpa, struct hardware_path *mod_path) dev->id.hversion_rev = iodc_data[1] & 0x0f; dev->id.sversion = ((iodc_data[4] & 0x0f) << 16) | (iodc_data[5] << 8) | iodc_data[6]; - dev->hpa.name = parisc_pathname(dev); dev->hpa.start = hpa; /* This is awkward. The STI spec says that gfx devices may occupy * 32MB or 64MB. Unfortunately, we don't know how to tell whether @@ -534,10 +533,10 @@ alloc_pa_dev(unsigned long hpa, struct hardware_path *mod_path) dev->hpa.end = hpa + 0xfff; } dev->hpa.flags = IORESOURCE_MEM; - name = parisc_hardware_description(&dev->id); - if (name) { - strlcpy(dev->name, name, sizeof(dev->name)); - } + dev->hpa.name = dev->name; + name = parisc_hardware_description(&dev->id) ? : "unknown"; + snprintf(dev->name, sizeof(dev->name), "%s [%s]", + name, parisc_pathname(dev)); /* Silently fail things like mouse ports which are subsumed within * the keyboard controller |