Commit a8b44d5d authored Nov 30, 2018 by Andy Shevchenko Committed by Greg Kroah-Hartman Dec 06, 2018

nvmem: Move nvmem_type_str array to its only user



Since we put static variable to a header file it's copied to each module
that includes the header. But not all of them are actually using it.

Move nvmem_type_str array to its only user to make a compiler happy:

In file included from include/linux/rtc.h:18,
                 from drivers/rtc/rtc-proc.c:15:
include/linux/nvmem-provider.h:29:27: warning: 'nvmem_type_str'
defined but not used [-Wunused-const-variable=]
 static const char * const nvmem_type_str[] = {
                           ^~~~~~~~~~~~~~

Suggested-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Suggested-by: Joe Perches <joe@perches.com>
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 611fbca1

drivers/nvmem/core.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,13 @@ static LIST_HEAD(nvmem_lookup_list);

		static BLOCKING_NOTIFIER_HEAD(nvmem_notifier);

		static const char * const nvmem_type_str[] = {
		[NVMEM_TYPE_UNKNOWN] = "Unknown",
		[NVMEM_TYPE_EEPROM] = "EEPROM",
		[NVMEM_TYPE_OTP] = "OTP",
		[NVMEM_TYPE_BATTERY_BACKED] = "Battery backed",
		};

		#ifdef CONFIG_DEBUG_LOCK_ALLOC
		static struct lock_class_key eeprom_lock_key;
		#endif

include/linux/nvmem-provider.h

+0 −7

Original line number	Diff line number	Diff line
		@@ -26,13 +26,6 @@ enum nvmem_type {
		NVMEM_TYPE_BATTERY_BACKED,
		};

		static const char * const nvmem_type_str[] = {
		[NVMEM_TYPE_UNKNOWN] = "Unknown",
		[NVMEM_TYPE_EEPROM] = "EEPROM",
		[NVMEM_TYPE_OTP] = "OTP",
		[NVMEM_TYPE_BATTERY_BACKED] = "Battery backed",
		};

		/**
		* struct nvmem_config - NVMEM device configuration
		*

Admin message