* [PATCH] nvmem: fix nvmem_cell_read() return type for !CONFIG_NVMEM
@ 2016-06-08 16:26 Brian Norris
2016-06-08 16:40 ` Brian Norris
0 siblings, 1 reply; 5+ messages in thread
From: Brian Norris @ 2016-06-08 16:26 UTC (permalink / raw)
To: Srinivas Kandagatla, Maxime Ripard
Cc: linux-kernel, Brian Norris, Greg Kroah-Hartman, Brian Norris
With CONFIG_NVMEM, nvmem_cell_read() returns void *. With !CONFIG_NVMEM
it returns char *. Let's make that consistent. Also drop the
incorrect/inconsistent comment about char * above the nvmem_cell_read()
definition.
drivers/thermal/mtk_thermal.c is already working around this by casting
to (u32 *).
Signed-off-by: Brian Norris <briannorris@chromium.org>
---
drivers/nvmem/core.c | 4 ++--
include/linux/nvmem-consumer.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 965911d9b36a..398ea7f54826 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -981,8 +981,8 @@ static int __nvmem_cell_read(struct nvmem_device *nvmem,
* @cell: nvmem cell to be read.
* @len: pointer to length of cell which will be populated on successful read.
*
- * Return: ERR_PTR() on error or a valid pointer to a char * buffer on success.
- * The buffer should be freed by the consumer with a kfree().
+ * Return: ERR_PTR() on error or a valid pointer to a buffer on success. The
+ * buffer should be freed by the consumer with a kfree().
*/
void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len)
{
diff --git a/include/linux/nvmem-consumer.h b/include/linux/nvmem-consumer.h
index 9bb77d3ed6e0..c2256d746543 100644
--- a/include/linux/nvmem-consumer.h
+++ b/include/linux/nvmem-consumer.h
@@ -74,7 +74,7 @@ static inline void nvmem_cell_put(struct nvmem_cell *cell)
{
}
-static inline char *nvmem_cell_read(struct nvmem_cell *cell, size_t *len)
+static inline void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len)
{
return ERR_PTR(-ENOSYS);
}
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] nvmem: fix nvmem_cell_read() return type for !CONFIG_NVMEM
2016-06-08 16:26 [PATCH] nvmem: fix nvmem_cell_read() return type for !CONFIG_NVMEM Brian Norris
@ 2016-06-08 16:40 ` Brian Norris
2016-06-08 17:40 ` Guenter Roeck
2016-06-08 18:52 ` Srinivas Kandagatla
0 siblings, 2 replies; 5+ messages in thread
From: Brian Norris @ 2016-06-08 16:40 UTC (permalink / raw)
To: Srinivas Kandagatla, Maxime Ripard
Cc: linux-kernel, Brian Norris, Greg Kroah-Hartman, Guenter Roeck
On Wed, Jun 08, 2016 at 09:26:46AM -0700, Brian Norris wrote:
> With CONFIG_NVMEM, nvmem_cell_read() returns void *. With !CONFIG_NVMEM
> it returns char *. Let's make that consistent. Also drop the
> incorrect/inconsistent comment about char * above the nvmem_cell_read()
> definition.
>
> drivers/thermal/mtk_thermal.c is already working around this by casting
> to (u32 *).
>
> Signed-off-by: Brian Norris <briannorris@chromium.org>
Seems Guenter submitted the same thing a week ago, with no response:
https://patchwork.kernel.org/patch/9148325/
I'll selfishly suggest that mine is better, since it also corrects the
comments :)
Brian
> ---
> drivers/nvmem/core.c | 4 ++--
> include/linux/nvmem-consumer.h | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
> index 965911d9b36a..398ea7f54826 100644
> --- a/drivers/nvmem/core.c
> +++ b/drivers/nvmem/core.c
> @@ -981,8 +981,8 @@ static int __nvmem_cell_read(struct nvmem_device *nvmem,
> * @cell: nvmem cell to be read.
> * @len: pointer to length of cell which will be populated on successful read.
> *
> - * Return: ERR_PTR() on error or a valid pointer to a char * buffer on success.
> - * The buffer should be freed by the consumer with a kfree().
> + * Return: ERR_PTR() on error or a valid pointer to a buffer on success. The
> + * buffer should be freed by the consumer with a kfree().
> */
> void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len)
> {
> diff --git a/include/linux/nvmem-consumer.h b/include/linux/nvmem-consumer.h
> index 9bb77d3ed6e0..c2256d746543 100644
> --- a/include/linux/nvmem-consumer.h
> +++ b/include/linux/nvmem-consumer.h
> @@ -74,7 +74,7 @@ static inline void nvmem_cell_put(struct nvmem_cell *cell)
> {
> }
>
> -static inline char *nvmem_cell_read(struct nvmem_cell *cell, size_t *len)
> +static inline void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len)
> {
> return ERR_PTR(-ENOSYS);
> }
> --
> 2.8.0.rc3.226.g39d4020
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] nvmem: fix nvmem_cell_read() return type for !CONFIG_NVMEM
2016-06-08 16:40 ` Brian Norris
@ 2016-06-08 17:40 ` Guenter Roeck
2016-06-08 18:52 ` Srinivas Kandagatla
1 sibling, 0 replies; 5+ messages in thread
From: Guenter Roeck @ 2016-06-08 17:40 UTC (permalink / raw)
To: Brian Norris
Cc: Srinivas Kandagatla, Maxime Ripard, linux-kernel, Brian Norris,
Greg Kroah-Hartman
On Wed, Jun 08, 2016 at 09:40:11AM -0700, Brian Norris wrote:
> On Wed, Jun 08, 2016 at 09:26:46AM -0700, Brian Norris wrote:
> > With CONFIG_NVMEM, nvmem_cell_read() returns void *. With !CONFIG_NVMEM
> > it returns char *. Let's make that consistent. Also drop the
> > incorrect/inconsistent comment about char * above the nvmem_cell_read()
> > definition.
> >
> > drivers/thermal/mtk_thermal.c is already working around this by casting
> > to (u32 *).
> >
> > Signed-off-by: Brian Norris <briannorris@chromium.org>
>
> Seems Guenter submitted the same thing a week ago, with no response:
>
> https://patchwork.kernel.org/patch/9148325/
>
> I'll selfishly suggest that mine is better, since it also corrects the
> comments :)
>
Perfectly fine with me.
Guenter
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] nvmem: fix nvmem_cell_read() return type for !CONFIG_NVMEM
2016-06-08 16:40 ` Brian Norris
2016-06-08 17:40 ` Guenter Roeck
@ 2016-06-08 18:52 ` Srinivas Kandagatla
2016-06-08 20:00 ` Brian Norris
1 sibling, 1 reply; 5+ messages in thread
From: Srinivas Kandagatla @ 2016-06-08 18:52 UTC (permalink / raw)
To: Brian Norris, Maxime Ripard
Cc: linux-kernel, Brian Norris, Greg Kroah-Hartman, Guenter Roeck
On 08/06/16 17:40, Brian Norris wrote:
> On Wed, Jun 08, 2016 at 09:26:46AM -0700, Brian Norris wrote:
>> With CONFIG_NVMEM, nvmem_cell_read() returns void *. With !CONFIG_NVMEM
>> it returns char *. Let's make that consistent. Also drop the
>> incorrect/inconsistent comment about char * above the nvmem_cell_read()
>> definition.
>>
>> drivers/thermal/mtk_thermal.c is already working around this by casting
>> to (u32 *).
>>
>> Signed-off-by: Brian Norris <briannorris@chromium.org>
>
> Seems Guenter submitted the same thing a week ago, with no response:
This patch has been already sent to Greg few days back with my sign off
http://permalink.gmane.org/gmane.linux.kernel/2233276
>
> https://patchwork.kernel.org/patch/9148325/
>
> I'll selfishly suggest that mine is better, since it also corrects the
> comments :)
>
I agree, If Greg has not picked that up yet, then its easy to apply
this, else we need another patch to fix the comment. :-).
--srini
> Brian
>
>> ---
>> drivers/nvmem/core.c | 4 ++--
>> include/linux/nvmem-consumer.h | 2 +-
>> 2 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
>> index 965911d9b36a..398ea7f54826 100644
>> --- a/drivers/nvmem/core.c
>> +++ b/drivers/nvmem/core.c
>> @@ -981,8 +981,8 @@ static int __nvmem_cell_read(struct nvmem_device *nvmem,
>> * @cell: nvmem cell to be read.
>> * @len: pointer to length of cell which will be populated on successful read.
>> *
>> - * Return: ERR_PTR() on error or a valid pointer to a char * buffer on success.
>> - * The buffer should be freed by the consumer with a kfree().
>> + * Return: ERR_PTR() on error or a valid pointer to a buffer on success. The
>> + * buffer should be freed by the consumer with a kfree().
>> */
>> void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len)
>> {
>> diff --git a/include/linux/nvmem-consumer.h b/include/linux/nvmem-consumer.h
>> index 9bb77d3ed6e0..c2256d746543 100644
>> --- a/include/linux/nvmem-consumer.h
>> +++ b/include/linux/nvmem-consumer.h
>> @@ -74,7 +74,7 @@ static inline void nvmem_cell_put(struct nvmem_cell *cell)
>> {
>> }
>>
>> -static inline char *nvmem_cell_read(struct nvmem_cell *cell, size_t *len)
>> +static inline void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len)
>> {
>> return ERR_PTR(-ENOSYS);
>> }
>> --
>> 2.8.0.rc3.226.g39d4020
>>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] nvmem: fix nvmem_cell_read() return type for !CONFIG_NVMEM
2016-06-08 18:52 ` Srinivas Kandagatla
@ 2016-06-08 20:00 ` Brian Norris
0 siblings, 0 replies; 5+ messages in thread
From: Brian Norris @ 2016-06-08 20:00 UTC (permalink / raw)
To: Srinivas Kandagatla
Cc: Maxime Ripard, linux-kernel, Brian Norris, Greg Kroah-Hartman,
Guenter Roeck
On Wed, Jun 08, 2016 at 07:52:06PM +0100, Srinivas Kandagatla wrote:
> On 08/06/16 17:40, Brian Norris wrote:
> >On Wed, Jun 08, 2016 at 09:26:46AM -0700, Brian Norris wrote:
> >>With CONFIG_NVMEM, nvmem_cell_read() returns void *. With !CONFIG_NVMEM
> >>it returns char *. Let's make that consistent. Also drop the
> >>incorrect/inconsistent comment about char * above the nvmem_cell_read()
> >>definition.
> >>
> >>drivers/thermal/mtk_thermal.c is already working around this by casting
> >>to (u32 *).
> >>
> >>Signed-off-by: Brian Norris <briannorris@chromium.org>
> >
> >Seems Guenter submitted the same thing a week ago, with no response:
>
> This patch has been already sent to Greg few days back with my sign
> off http://permalink.gmane.org/gmane.linux.kernel/2233276
Ah, didn't notice that either. Anyway, doesn't seem to show up in
linux-next.
Brian
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-06-08 20:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-08 16:26 [PATCH] nvmem: fix nvmem_cell_read() return type for !CONFIG_NVMEM Brian Norris
2016-06-08 16:40 ` Brian Norris
2016-06-08 17:40 ` Guenter Roeck
2016-06-08 18:52 ` Srinivas Kandagatla
2016-06-08 20:00 ` Brian Norris
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).