lkml.org 
[lkml]   [2019]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 36/53] libnvdimm: Fix compilation warnings with W=1
    Date
    [ Upstream commit c01dafad77fea8d64c4fdca0a6031c980842ad65 ]

    Several places (dimm_devs.c, core.c etc) include label.h but only
    label.c uses NSINDEX_SIGNATURE, so move its definition to label.c
    instead.

    In file included from drivers/nvdimm/dimm_devs.c:23:
    drivers/nvdimm/label.h:41:19: warning: 'NSINDEX_SIGNATURE' defined but
    not used [-Wunused-const-variable=]

    Also, some places abuse "/**" which is only reserved for the kernel-doc.

    drivers/nvdimm/bus.c:648: warning: cannot understand function prototype:
    'struct attribute_group nd_device_attribute_group = '
    drivers/nvdimm/bus.c:677: warning: cannot understand function prototype:
    'struct attribute_group nd_numa_attribute_group = '

    Those are just some member assignments for the "struct attribute_group"
    instances and it can't be expressed in the kernel-doc.

    Reviewed-by: Vishal Verma <vishal.l.verma@intel.com>
    Signed-off-by: Qian Cai <cai@lca.pw>
    Signed-off-by: Dan Williams <dan.j.williams@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/nvdimm/bus.c | 4 ++--
    drivers/nvdimm/label.c | 2 ++
    drivers/nvdimm/label.h | 2 --
    3 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c
    index a6746a1f20ae..2f1b54fab399 100644
    --- a/drivers/nvdimm/bus.c
    +++ b/drivers/nvdimm/bus.c
    @@ -608,7 +608,7 @@ static struct attribute *nd_device_attributes[] = {
    NULL,
    };

    -/**
    +/*
    * nd_device_attribute_group - generic attributes for all devices on an nd bus
    */
    struct attribute_group nd_device_attribute_group = {
    @@ -637,7 +637,7 @@ static umode_t nd_numa_attr_visible(struct kobject *kobj, struct attribute *a,
    return a->mode;
    }

    -/**
    +/*
    * nd_numa_attribute_group - NUMA attributes for all devices on an nd bus
    */
    struct attribute_group nd_numa_attribute_group = {
    diff --git a/drivers/nvdimm/label.c b/drivers/nvdimm/label.c
    index 6a16017cc0d9..1fb3a2491131 100644
    --- a/drivers/nvdimm/label.c
    +++ b/drivers/nvdimm/label.c
    @@ -25,6 +25,8 @@ static guid_t nvdimm_btt2_guid;
    static guid_t nvdimm_pfn_guid;
    static guid_t nvdimm_dax_guid;

    +static const char NSINDEX_SIGNATURE[] = "NAMESPACE_INDEX\0";
    +
    static u32 best_seq(u32 a, u32 b)
    {
    a &= NSINDEX_SEQ_MASK;
    diff --git a/drivers/nvdimm/label.h b/drivers/nvdimm/label.h
    index 1ebf4d3d01ba..9ed772db6900 100644
    --- a/drivers/nvdimm/label.h
    +++ b/drivers/nvdimm/label.h
    @@ -38,8 +38,6 @@ enum {
    ND_NSINDEX_INIT = 0x1,
    };

    -static const char NSINDEX_SIGNATURE[] = "NAMESPACE_INDEX\0";
    -
    /**
    * struct nd_namespace_index - label set superblock
    * @sig: NAMESPACE_INDEX\0
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-06-17 23:29    [W:5.268 / U:0.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site