mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] fixup-next: linux/nvmem-consumer.h: fix warning
@ 2022-08-31  9:26 Antony Pavlov
  2022-08-31  9:27 ` Ahmad Fatoum
  2022-09-01  8:44 ` Sascha Hauer
  0 siblings, 2 replies; 3+ messages in thread
From: Antony Pavlov @ 2022-08-31  9:26 UTC (permalink / raw)
  To: barebox; +Cc: Ahmad Fatoum

This fixes the commit 06825a0ec35343a1
("nvmem: import Linux nvmem_cell_read_variable_le_u32")
from the next branch.

The warning is:

include/linux/nvmem-consumer.h:84:9: warning: returning 'void *' from a
function with return type 'int' makes integer from pointer without a
cast [-Wint-conversion]
   84 |  return ERR_PTR(-EOPNOTSUPP);
      |         ^~~~~~~~~~~~~~~~~~~~

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.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 b461f840957..1fce7e1ae09 100644
--- a/include/linux/nvmem-consumer.h
+++ b/include/linux/nvmem-consumer.h
@@ -81,7 +81,7 @@ static inline int nvmem_cell_read_variable_le_u32(struct device_d *dev,
 						  const char *cell_id,
 						  u32 *val)
 {
-	return ERR_PTR(-EOPNOTSUPP);
+	return -EOPNOTSUPP;
 }
 
 static inline int nvmem_cell_write(struct nvmem_cell *cell,
-- 
2.37.2




^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-09-01  8:46 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-31  9:26 [PATCH] fixup-next: linux/nvmem-consumer.h: fix warning Antony Pavlov
2022-08-31  9:27 ` Ahmad Fatoum
2022-09-01  8:44 ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox