From 77e0ddf097d6d4ceaf898e088b133b99e0a97fa0 Mon Sep 17 00:00:00 2001 From: Helge Deller Date: Mon, 28 Aug 2023 17:29:46 +0200 Subject: [PATCH] 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 Reported-by: kernel test robot Fixes: 547259580dfa ("parisc: Move proc_mckinley_root and proc_runway_root to sba_iommu") Cc: # v6.5 --- arch/parisc/include/asm/runway.h | 3 --- drivers/parisc/ccio-dma.c | 11 +++++++---- drivers/parisc/sba_iommu.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/parisc/include/asm/runway.h b/arch/parisc/include/asm/runway.h index 5cf0613..2837f02 100644 --- a/arch/parisc/include/asm/runway.h +++ b/arch/parisc/include/asm/runway.h @@ -2,9 +2,6 @@ #ifndef ASM_PARISC_RUNWAY_H #define ASM_PARISC_RUNWAY_H -/* declared in arch/parisc/kernel/setup.c */ -extern struct proc_dir_entry * proc_runway_root; - #define RUNWAY_STATUS 0x10 #define RUNWAY_DEBUG 0x40 diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c index bd92856..509a407 100644 --- a/drivers/parisc/ccio-dma.c +++ b/drivers/parisc/ccio-dma.c @@ -63,8 +63,6 @@ #undef CCIO_COLLECT_STATS #endif -#include /* for proc_runway_root */ - #ifdef DEBUG_CCIO_INIT #define DBG_INIT(x...) printk(x) #else @@ -1559,10 +1557,15 @@ static int __init ccio_probe(struct parisc_device *dev) #ifdef CONFIG_PROC_FS if (ioc_count == 0) { - proc_create_single(MODULE_NAME, 0, proc_runway_root, + struct proc_dir_entry *runway; + + runway = proc_mkdir("bus/runway", NULL); + if (runway) { + proc_create_single(MODULE_NAME, 0, runway, ccio_proc_info); - proc_create_single(MODULE_NAME"-bitmap", 0, proc_runway_root, + proc_create_single(MODULE_NAME"-bitmap", 0, runway, ccio_proc_bitmap_info); + } } #endif ioc_count++; diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c index 33da29d..f6b5106 100644 --- a/drivers/parisc/sba_iommu.c +++ b/drivers/parisc/sba_iommu.c @@ -121,7 +121,7 @@ module_param(sba_reserve_agpgart, int, 0444); MODULE_PARM_DESC(sba_reserve_agpgart, "Reserve half of IO pdir as AGPGART"); #endif -struct proc_dir_entry *proc_runway_root __ro_after_init; +static struct proc_dir_entry *proc_runway_root __ro_after_init; struct proc_dir_entry *proc_mckinley_root __ro_after_init; /************************************ -- 2.7.4