diff mbox series

[3/3] libnvdimm: mark 'security_show' static again

Message ID 20230516201415.556858-3-arnd@kernel.org (mailing list archive)
State Accepted
Commit e5baf8c07707a601f978c02de958bbeb8cd6374a
Headers show
Series [1/3] acpi: nfit: add declaration in a local header | expand

Commit Message

Arnd Bergmann May 16, 2023, 8:14 p.m. UTC 
From: Arnd Bergmann <arnd@arndb.de>

The security_show() function was made global and __weak at some
point to allow overriding it. The override was removed later, but
it remains global, which causes a warning about the missing
declaration:

drivers/nvdimm/dimm_devs.c:352:9: error: no previous prototype for 'security_show'

This is also not an appropriate name for a global symbol in the
kernel, so just make it static again.

Fixes: 15a8348707ff ("libnvdimm: Introduce CONFIG_NVDIMM_SECURITY_TEST flag")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/nvdimm/dimm_devs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Dave Jiang May 22, 2023, 3:22 p.m. UTC | #1 
On 5/16/23 1:14 PM, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> The security_show() function was made global and __weak at some
> point to allow overriding it. The override was removed later, but
> it remains global, which causes a warning about the missing
> declaration:
> 
> drivers/nvdimm/dimm_devs.c:352:9: error: no previous prototype for 'security_show'
> 
> This is also not an appropriate name for a global symbol in the
> kernel, so just make it static again.
> 
> Fixes: 15a8348707ff ("libnvdimm: Introduce CONFIG_NVDIMM_SECURITY_TEST flag")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Reviewed-by: Dave Jiang <dave.jiang@intel.com>
> ---
>   drivers/nvdimm/dimm_devs.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/nvdimm/dimm_devs.c b/drivers/nvdimm/dimm_devs.c
> index 957f7c3d17ba..10c3cb6a574a 100644
> --- a/drivers/nvdimm/dimm_devs.c
> +++ b/drivers/nvdimm/dimm_devs.c
> @@ -349,7 +349,7 @@ static ssize_t available_slots_show(struct device *dev,
>   }
>   static DEVICE_ATTR_RO(available_slots);
>   
> -ssize_t security_show(struct device *dev,
> +static ssize_t security_show(struct device *dev,
>   		struct device_attribute *attr, char *buf)
>   {
>   	struct nvdimm *nvdimm = to_nvdimm(dev);
diff mbox series

Patch

diff --git a/drivers/nvdimm/dimm_devs.c b/drivers/nvdimm/dimm_devs.c
index 957f7c3d17ba..10c3cb6a574a 100644
--- a/drivers/nvdimm/dimm_devs.c
+++ b/drivers/nvdimm/dimm_devs.c
@@ -349,7 +349,7 @@  static ssize_t available_slots_show(struct device *dev,
 }
 static DEVICE_ATTR_RO(available_slots);
 
-ssize_t security_show(struct device *dev,
+static ssize_t security_show(struct device *dev,
 		struct device_attribute *attr, char *buf)
 {
 	struct nvdimm *nvdimm = to_nvdimm(dev);