Skip to content

Commit 6428bc7

Browse files
committed
parisc: sba_iommu: Fix build warning if procfs if disabled
Clean up the code, e.g. make proc_mckinley_root static, drop the now empty mckinley header file and remove some unneeded ifdefs around procfs functions. Signed-off-by: Helge Deller <[email protected]> Reported-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/ Fixes: 77e0ddf ("parisc: ccio-dma: Create private runway procfs root entry")
1 parent 6c1b980 commit 6428bc7

File tree

2 files changed

+2
-16
lines changed

2 files changed

+2
-16
lines changed

arch/parisc/include/asm/mckinley.h

Lines changed: 0 additions & 8 deletions
This file was deleted.

drivers/parisc/sba_iommu.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@
4646
#include <linux/module.h>
4747

4848
#include <asm/ropes.h>
49-
#include <asm/mckinley.h> /* for proc_mckinley_root */
50-
#include <asm/runway.h> /* for proc_runway_root */
5149
#include <asm/page.h> /* for PAGE0 */
5250
#include <asm/pdc.h> /* for PDC_MODEL_* */
5351
#include <asm/pdcpat.h> /* for is_pdc_pat() */
@@ -122,7 +120,7 @@ MODULE_PARM_DESC(sba_reserve_agpgart, "Reserve half of IO pdir as AGPGART");
122120
#endif
123121

124122
static struct proc_dir_entry *proc_runway_root __ro_after_init;
125-
struct proc_dir_entry *proc_mckinley_root __ro_after_init;
123+
static struct proc_dir_entry *proc_mckinley_root __ro_after_init;
126124

127125
/************************************
128126
** SBA register read and write support
@@ -1899,9 +1897,7 @@ static int __init sba_driver_callback(struct parisc_device *dev)
18991897
int i;
19001898
char *version;
19011899
void __iomem *sba_addr = ioremap(dev->hpa.start, SBA_FUNC_SIZE);
1902-
#ifdef CONFIG_PROC_FS
1903-
struct proc_dir_entry *root;
1904-
#endif
1900+
struct proc_dir_entry *root __maybe_unused;
19051901

19061902
sba_dump_ranges(sba_addr);
19071903

@@ -1967,7 +1963,6 @@ static int __init sba_driver_callback(struct parisc_device *dev)
19671963

19681964
hppa_dma_ops = &sba_ops;
19691965

1970-
#ifdef CONFIG_PROC_FS
19711966
switch (dev->id.hversion) {
19721967
case PLUTO_MCKINLEY_PORT:
19731968
if (!proc_mckinley_root)
@@ -1985,7 +1980,6 @@ static int __init sba_driver_callback(struct parisc_device *dev)
19851980

19861981
proc_create_single("sba_iommu", 0, root, sba_proc_info);
19871982
proc_create_single("sba_iommu-bitmap", 0, root, sba_proc_bitmap_info);
1988-
#endif
19891983
return 0;
19901984
}
19911985

0 commit comments

Comments
 (0)