From 9e1b28b773881963150a7e3a11d4d00b9df0129a Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Sun, 15 Aug 2021 17:05:31 -0700 Subject: char: move RANDOM_TRUST_CPU & RANDOM_TRUST_BOOTLOADER into the Character devices menu Include RANDOM_TRUST_CPU and RANDOM_TRUST_BOOTLOADER inside the "Character devices" menu so that they are listed (presented) with other Character devices. Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Cc: Hsin-Yi Wang Cc: Theodore Ts'o Signed-off-by: Randy Dunlap Link: https://lore.kernel.org/r/20210816000531.17934-1-rdunlap@infradead.org Signed-off-by: Greg Kroah-Hartman --- drivers/char/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/char') diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index ea3ead00f30f..740811893c57 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -427,8 +427,6 @@ config ADI and SSM (Silicon Secured Memory). Intended consumers of this driver include crash and makedumpfile. -endmenu - config RANDOM_TRUST_CPU bool "Trust the CPU manufacturer to initialize Linux's CRNG" depends on ARCH_RANDOM @@ -452,3 +450,5 @@ config RANDOM_TRUST_BOOTLOADER booloader is trustworthy so it will be added to the kernel's entropy pool. Otherwise, say N here so it will be regarded as device input that only mixes the entropy pool. + +endmenu -- cgit v1.2.3 From f8cefead37ddc111786b14da73286204eb8509b5 Mon Sep 17 00:00:00 2001 From: jing yangyang Date: Thu, 19 Aug 2021 19:17:52 -0700 Subject: char: mware: fix returnvar.cocci warnings Remove unneeded variables when "0" can be returned. Generated by: scripts/coccinelle/misc/returnvar.cocci Reported-by: Zeal Robot Signed-off-by: jing yangyang Link: https://lore.kernel.org/r/20210820021752.10927-1-jing.yangyang@zte.com.cn Signed-off-by: Greg Kroah-Hartman --- drivers/char/mwave/tp3780i.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'drivers/char') diff --git a/drivers/char/mwave/tp3780i.c b/drivers/char/mwave/tp3780i.c index 8588b51202e5..83eaffeb22c8 100644 --- a/drivers/char/mwave/tp3780i.c +++ b/drivers/char/mwave/tp3780i.c @@ -470,8 +470,6 @@ int tp3780I_StartDSP(THINKPAD_BD_DATA * pBDData) int tp3780I_QueryAbilities(THINKPAD_BD_DATA * pBDData, MW_ABILITIES * pAbilities) { - int retval = 0; - PRINTK_2(TRACE_TP3780I, "tp3780i::tp3780I_QueryAbilities entry pBDData %p\n", pBDData); @@ -502,7 +500,7 @@ int tp3780I_QueryAbilities(THINKPAD_BD_DATA * pBDData, MW_ABILITIES * pAbilities PRINTK_1(TRACE_TP3780I, "tp3780i::tp3780I_QueryAbilities exit retval=SUCCESSFUL\n"); - return retval; + return 0; } int tp3780I_ReadWriteDspDStore(THINKPAD_BD_DATA * pBDData, unsigned int uOpcode, -- cgit v1.2.3