oprofile, s390: Cleanups

Remove unused HAVE_HWSAMPLER config option. It is not used anymore,
removing it.

Also make some functions static and some coding style fixes.

Signed-off-by: Robert Richter <robert.richter@amd.com>

diff --git a/arch/Kconfig b/arch/Kconfig
index 43abf3c6da8e4c72d5e2414cde2d43200a57b40e..f78c2be4242b437ced3308795952102bf1359763 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -30,9 +30,6 @@ config OPROFILE_EVENT_MULTIPLEX
 config HAVE_OPROFILE
        bool
 
-config HAVE_HWSAMPLER
-       bool
-
 config KPROBES
        bool "Kprobes"
        depends on MODULES

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 0cf20adfbb4581a4c0a93d607c7dad8bbe85a15d..ff19efdf6feff6995bdfa57067e65b616c386ae8 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -115,7 +115,6 @@ config S390
        select ARCH_INLINE_WRITE_UNLOCK_BH
        select ARCH_INLINE_WRITE_UNLOCK_IRQ
        select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
-       select HAVE_HWSAMPLER
 
 config SCHED_OMIT_FRAME_POINTER
        def_bool y

diff --git a/arch/s390/oprofile/init.c b/arch/s390/oprofile/init.c
index 0e38a5b8793f320888eee8672bfe716561cd057a..16c76def4a9da5818f8cb557c43ec46f1fbe85da 100644 (file)
--- a/arch/s390/oprofile/init.c
+++ b/arch/s390/oprofile/init.c
@@ -133,7 +133,7 @@ static int oprofile_create_hwsampling_files(struct super_block *sb,
        return 0;
 }
 
-int oprofile_hwsampler_init(struct oprofile_operations* ops)
+static int oprofile_hwsampler_init(struct oprofile_operations *ops)
 {
        if (hwsampler_setup())
                return -ENODEV;
@@ -166,13 +166,13 @@ int oprofile_hwsampler_init(struct oprofile_operations* ops)
        return 0;
 }
 
-void oprofile_hwsampler_exit(void)
+static void oprofile_hwsampler_exit(void)
 {
        oprofile_timer_exit();
        hwsampler_shutdown();
 }
 
-int __init oprofile_arch_init(struct oprofile_operations* ops)
+int __init oprofile_arch_init(struct oprofile_operations *ops)
 {
        ops->backtrace = s390_backtrace;