Skip to content

Commit 77e0ddf

Browse files
committed
parisc: ccio-dma: Create private runway procfs root entry
Create an own procfs "runway" root entry for the CCIO driver. No need to share it with the sba_iommu driver, as only one of those busses can be active in one machine anyway. Signed-off-by: Helge Deller <deller@gmx.de> Reported-by: kernel test robot <lkp@intel.com> Fixes: 5472595 ("parisc: Move proc_mckinley_root and proc_runway_root to sba_iommu") Cc: <stable@vger.kernel.org> # v6.5
1 parent e0701e7 commit 77e0ddf

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

arch/parisc/include/asm/runway.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
#ifndef ASM_PARISC_RUNWAY_H
33
#define ASM_PARISC_RUNWAY_H
44

5-
/* declared in arch/parisc/kernel/setup.c */
6-
extern struct proc_dir_entry * proc_runway_root;
7-
85
#define RUNWAY_STATUS 0x10
96
#define RUNWAY_DEBUG 0x40
107

drivers/parisc/ccio-dma.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@
6363
#undef CCIO_COLLECT_STATS
6464
#endif
6565

66-
#include <asm/runway.h> /* for proc_runway_root */
67-
6866
#ifdef DEBUG_CCIO_INIT
6967
#define DBG_INIT(x...) printk(x)
7068
#else
@@ -1559,10 +1557,15 @@ static int __init ccio_probe(struct parisc_device *dev)
15591557

15601558
#ifdef CONFIG_PROC_FS
15611559
if (ioc_count == 0) {
1562-
proc_create_single(MODULE_NAME, 0, proc_runway_root,
1560+
struct proc_dir_entry *runway;
1561+
1562+
runway = proc_mkdir("bus/runway", NULL);
1563+
if (runway) {
1564+
proc_create_single(MODULE_NAME, 0, runway,
15631565
ccio_proc_info);
1564-
proc_create_single(MODULE_NAME"-bitmap", 0, proc_runway_root,
1566+
proc_create_single(MODULE_NAME"-bitmap", 0, runway,
15651567
ccio_proc_bitmap_info);
1568+
}
15661569
}
15671570
#endif
15681571
ioc_count++;

drivers/parisc/sba_iommu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ module_param(sba_reserve_agpgart, int, 0444);
121121
MODULE_PARM_DESC(sba_reserve_agpgart, "Reserve half of IO pdir as AGPGART");
122122
#endif
123123

124-
struct proc_dir_entry *proc_runway_root __ro_after_init;
124+
static struct proc_dir_entry *proc_runway_root __ro_after_init;
125125
struct proc_dir_entry *proc_mckinley_root __ro_after_init;
126126

127127
/************************************

0 commit comments

Comments
 (0)