nvmem: core: fix nvmem_cell_write inline function
diff mbox series

Message ID 20190908121038.6877-1-sre@kernel.org
State Accepted
Commit 9b8303fc6efa724bd6a90656434fbde2cc6ceb2c
Headers show
Series
  • nvmem: core: fix nvmem_cell_write inline function
Related show

Commit Message

Sebastian Reichel Sept. 8, 2019, 12:10 p.m. UTC
From: Sebastian Reichel <sebastian.reichel@collabora.com>

nvmem_cell_write's buf argument uses different types based on
the configuration of CONFIG_NVMEM. The function prototype for
enabled NVMEM uses 'void *' type, but the static dummy function
for disabled NVMEM uses 'const char *' instead. Fix the different
behaviour by always expecting a 'void *' typed buf argument.

Fixes: 7a78a7f7695b ("power: reset: nvmem-reboot-mode: use NVMEM as reboot mode write interface")
Reported-by: kbuild test robot <lkp@intel.com>
Cc: Han Nandor <nandor.han@vaisala.com>
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
 include/linux/nvmem-consumer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Nandor Han Sept. 9, 2019, 9:26 a.m. UTC | #1
On 9/8/19 3:10 PM, Sebastian Reichel wrote:
> From: Sebastian Reichel <sebastian.reichel@collabora.com>
> 
> nvmem_cell_write's buf argument uses different types based on
> the configuration of CONFIG_NVMEM. The function prototype for
> enabled NVMEM uses 'void *' type, but the static dummy function
> for disabled NVMEM uses 'const char *' instead. Fix the different
> behaviour by always expecting a 'void *' typed buf argument.
> 
> Fixes: 7a78a7f7695b ("power: reset: nvmem-reboot-mode: use NVMEM as reboot mode write interface")
> Reported-by: kbuild test robot <lkp@intel.com>
> Cc: Han Nandor <nandor.han@vaisala.com>
> Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> ---
>   include/linux/nvmem-consumer.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/linux/nvmem-consumer.h b/include/linux/nvmem-consumer.h
> index 8f8be5b00060..5c17cb733224 100644
> --- a/include/linux/nvmem-consumer.h
> +++ b/include/linux/nvmem-consumer.h
> @@ -118,7 +118,7 @@ static inline void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len)
>   }
>   
>   static inline int nvmem_cell_write(struct nvmem_cell *cell,
> -				    const char *buf, size_t len)
> +				   void *buf, size_t len)

nitpick: alignment issue?

Review-By: Han Nandor <nandor.han@vaisala.com>

Nandor
Sebastian Reichel Sept. 9, 2019, 10:18 a.m. UTC | #2
Hi,

On Mon, Sep 09, 2019 at 12:26:06PM +0300, Nandor Han wrote:
> On 9/8/19 3:10 PM, Sebastian Reichel wrote:
> > From: Sebastian Reichel <sebastian.reichel@collabora.com>
> > 
> > nvmem_cell_write's buf argument uses different types based on
> > the configuration of CONFIG_NVMEM. The function prototype for
> > enabled NVMEM uses 'void *' type, but the static dummy function
> > for disabled NVMEM uses 'const char *' instead. Fix the different
> > behaviour by always expecting a 'void *' typed buf argument.
> > 
> > Fixes: 7a78a7f7695b ("power: reset: nvmem-reboot-mode: use NVMEM as reboot mode write interface")
> > Reported-by: kbuild test robot <lkp@intel.com>
> > Cc: Han Nandor <nandor.han@vaisala.com>
> > Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> > Cc: linux-kernel@vger.kernel.org
> > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> > ---
> >   include/linux/nvmem-consumer.h | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/include/linux/nvmem-consumer.h b/include/linux/nvmem-consumer.h
> > index 8f8be5b00060..5c17cb733224 100644
> > --- a/include/linux/nvmem-consumer.h
> > +++ b/include/linux/nvmem-consumer.h
> > @@ -118,7 +118,7 @@ static inline void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len)
> >   }
> >   static inline int nvmem_cell_write(struct nvmem_cell *cell,
> > -				    const char *buf, size_t len)
> > +				   void *buf, size_t len)
> 
> nitpick: alignment issue?

This actually fixes the alignment issue as a side-effect.
I guess I should have mentioned it in the changelog.

> Review-By: Han Nandor <nandor.han@vaisala.com>

I suppose you meant to write "Reviewed-by" instead of inventing your
own tag?

-- Sebastian
Nandor Han Sept. 9, 2019, noon UTC | #3
On 9/9/19 1:18 PM, Sebastian Reichel wrote:
> Hi,
> 
> On Mon, Sep 09, 2019 at 12:26:06PM +0300, Nandor Han wrote:
>> On 9/8/19 3:10 PM, Sebastian Reichel wrote:
>>> From: Sebastian Reichel <sebastian.reichel@collabora.com>
>>>
>>> nvmem_cell_write's buf argument uses different types based on
>>> the configuration of CONFIG_NVMEM. The function prototype for
>>> enabled NVMEM uses 'void *' type, but the static dummy function
>>> for disabled NVMEM uses 'const char *' instead. Fix the different
>>> behaviour by always expecting a 'void *' typed buf argument.
>>>
>>> Fixes: 7a78a7f7695b ("power: reset: nvmem-reboot-mode: use NVMEM as reboot mode write interface")
>>> Reported-by: kbuild test robot <lkp@intel.com>
>>> Cc: Han Nandor <nandor.han@vaisala.com>
>>> Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
>>> Cc: linux-kernel@vger.kernel.org
>>> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
>>> ---
>>>    include/linux/nvmem-consumer.h | 2 +-
>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/include/linux/nvmem-consumer.h b/include/linux/nvmem-consumer.h
>>> index 8f8be5b00060..5c17cb733224 100644
>>> --- a/include/linux/nvmem-consumer.h
>>> +++ b/include/linux/nvmem-consumer.h
>>> @@ -118,7 +118,7 @@ static inline void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len)
>>>    }
>>>    static inline int nvmem_cell_write(struct nvmem_cell *cell,
>>> -				    const char *buf, size_t len)
>>> +				   void *buf, size_t len)
>>
>> nitpick: alignment issue?
> 
> This actually fixes the alignment issue as a side-effect.
> I guess I should have mentioned it in the changelog.
> 
>> Review-By: Han Nandor <nandor.han@vaisala.com>
> 
> I suppose you meant to write "Reviewed-by" instead of inventing your
> own tag?
> 

Yes :)

Nandor
Arnd Bergmann Sept. 17, 2019, 7:57 a.m. UTC | #4
On Mon, Sep 9, 2019 at 3:45 PM Sebastian Reichel <sre@kernel.org> wrote:
>
> From: Sebastian Reichel <sebastian.reichel@collabora.com>
>
> nvmem_cell_write's buf argument uses different types based on
> the configuration of CONFIG_NVMEM. The function prototype for
> enabled NVMEM uses 'void *' type, but the static dummy function
> for disabled NVMEM uses 'const char *' instead. Fix the different
> behaviour by always expecting a 'void *' typed buf argument.
>
> Fixes: 7a78a7f7695b ("power: reset: nvmem-reboot-mode: use NVMEM as reboot mode write interface")
> Reported-by: kbuild test robot <lkp@intel.com>
> Cc: Han Nandor <nandor.han@vaisala.com>
> Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

I still see the issue in linux-next, did this get dropped by accident?

      Arnd
Srinivas Kandagatla Sept. 17, 2019, 8:20 a.m. UTC | #5
On 17/09/2019 08:57, Arnd Bergmann wrote:
> On Mon, Sep 9, 2019 at 3:45 PM Sebastian Reichel <sre@kernel.org> wrote:
>>
>> From: Sebastian Reichel <sebastian.reichel@collabora.com>
>>
>> nvmem_cell_write's buf argument uses different types based on
>> the configuration of CONFIG_NVMEM. The function prototype for
>> enabled NVMEM uses 'void *' type, but the static dummy function
>> for disabled NVMEM uses 'const char *' instead. Fix the different
>> behaviour by always expecting a 'void *' typed buf argument.
>>
>> Fixes: 7a78a7f7695b ("power: reset: nvmem-reboot-mode: use NVMEM as reboot mode write interface")
>> Reported-by: kbuild test robot <lkp@intel.com>
>> Cc: Han Nandor <nandor.han@vaisala.com>
>> Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
>> Cc: linux-kernel@vger.kernel.org
>> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> 
> I still see the issue in linux-next, did this get dropped by accident?
> 

I just pushed it to nvmem tree, should be fixed in next soon!

--srini
>        Arnd
>

Patch
diff mbox series

diff --git a/include/linux/nvmem-consumer.h b/include/linux/nvmem-consumer.h
index 8f8be5b00060..5c17cb733224 100644
--- a/include/linux/nvmem-consumer.h
+++ b/include/linux/nvmem-consumer.h
@@ -118,7 +118,7 @@  static inline void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len)
 }
 
 static inline int nvmem_cell_write(struct nvmem_cell *cell,
-				    const char *buf, size_t len)
+				   void *buf, size_t len)
 {
 	return -EOPNOTSUPP;
 }