Skip to contentSkip to conversation

parisc: Drop the pa7300lc LPMC handler

PATCH New Helge Deller 1 participant 2 messages Aug 12, 2023 PA-RISC architecture

lore
Share & tools
lore

Helge Deller

author maintainer
#0 lore raw

PATCH 1/2 parisc: Drop the pa7300lc LPMC handler

This was actually never really used, and the info it prints won't help. Drop it.

---
 arch/parisc/include/asm/machdep.h | 17 -----------
 arch/parisc/kernel/Makefile       |  2 +-
 arch/parisc/kernel/pa7300lc.c     | 51 -------------------------------
 arch/parisc/kernel/setup.c        |  3 --
 4 files changed, 1 insertion(+), 72 deletions(-)
 delete mode 100644 arch/parisc/include/asm/machdep.h
 delete mode 100644 arch/parisc/kernel/pa7300lc.c
arch/parisc/include/asm/machdep.h deleted +0 -17
deleted file mode 100644
index 215d2c43989d..000000000000
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _PARISC_MACHDEP_H
-#define _PARISC_MACHDEP_H
-
-#include <linux/notifier.h>
-
-#define	MACH_RESTART	1
-#define	MACH_HALT	2
-#define MACH_POWER_ON	3
-#define	MACH_POWER_OFF	4
-
-extern struct notifier_block *mach_notifier;
-extern void pa7300lc_init(void);
-
-extern void (*cpu_lpmc)(int, struct pt_regs *);
-
-#endif
arch/parisc/kernel/Makefile +1 -1
index 2d1478fc4aa5..5ab0467be70a 100644
@@ -6,7 +6,7 @@
 extra-y		:= vmlinux.lds
 
 obj-y		:= head.o cache.o pacache.o setup.o pdt.o traps.o time.o irq.o \
-		   pa7300lc.o syscall.o entry.o sys_parisc.o firmware.o \
+		   syscall.o entry.o sys_parisc.o firmware.o \
 		   ptrace.o hardware.o inventory.o drivers.o alternative.o \
 		   signal.o hpmc.o real2.o parisc_ksyms.o unaligned.o \
 		   process.o processor.o pdc_cons.o pdc_chassis.o unwind.o \
arch/parisc/kernel/pa7300lc.c deleted +0 -51

51 lines not on this page · raw message

arch/parisc/kernel/setup.c +0 -3
index 211a4afdd282..3e95b5417a50 100644
@@ -31,7 +31,6 @@
 #include <asm/sections.h>
 #include <asm/pdc.h>
 #include <asm/led.h>
-#include <asm/machdep.h>	/* for pa7300lc_init() proto */
 #include <asm/pdc_chassis.h>
 #include <asm/io.h>
 #include <asm/setup.h>
@@ -93,8 +92,6 @@ static void __init dma_ops_init(void)
 			"the PA-RISC 1.1 or 2.0 architecture specification.\n");
 
 	case pcxl2:
-		pa7300lc_init();
-		break;
 	default:
 		break;
 	}

--
2.41.0

author maintainer
#1 lore raw

PATCH 2/2 parisc: traps: Drop cpu_lpmc function pointer

This function pointer is only used by one function, so no need to keep such an indirection.

---
 arch/parisc/kernel/traps.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
arch/parisc/kernel/traps.c +1 -4
index 3b97944c7291..1107ca819ac8 100644
@@ -335,9 +335,6 @@ static void default_trap(int code, struct pt_regs *regs)
 	show_regs(regs);
 }
 
-void (*cpu_lpmc) (int code, struct pt_regs *regs) __read_mostly = default_trap;
-
-
 static void transfer_pim_to_trap_frame(struct pt_regs *regs)
 {
     register int i;
@@ -557,7 +554,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
 
 		flush_cache_all();
 		flush_tlb_all();
-		cpu_lpmc(5, regs);
+		default_trap(code, regs);
 		return;
 
 	case  PARISC_ITLB_TRAP:

--
2.41.0