public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] firmware: Fix missing inline
@ 2019-07-23  8:11 Takashi Iwai
  2019-07-23  8:21 ` Greg Kroah-Hartman
  0 siblings, 1 reply; 2+ messages in thread
From: Takashi Iwai @ 2019-07-23  8:11 UTC (permalink / raw)
  To: Greg Kroah-Hartman; +Cc: Mauro Rossi, linux-kernel

I mistakenly dropped the inline while resolving the patch conflicts in
the previous fix patch.  Without inline, we get compiler warnings wrt
unused functions.

Note that Mauro's original patch contained the correct changes; it's
all my fault to submit a patch before a morning coffee.

Fixes: c8917b8ff09e ("firmware: fix build errors in paged buffer handling code")
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 drivers/base/firmware_loader/firmware.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/base/firmware_loader/firmware.h b/drivers/base/firmware_loader/firmware.h
index 842e63f19f22..7ecd590e67fe 100644
--- a/drivers/base/firmware_loader/firmware.h
+++ b/drivers/base/firmware_loader/firmware.h
@@ -141,8 +141,8 @@ int fw_grow_paged_buf(struct fw_priv *fw_priv, int pages_needed);
 int fw_map_paged_buf(struct fw_priv *fw_priv);
 #else
 static inline void fw_free_paged_buf(struct fw_priv *fw_priv) {}
-static int fw_grow_paged_buf(struct fw_priv *fw_priv, int pages_needed) { return -ENXIO; }
-static int fw_map_paged_buf(struct fw_priv *fw_priv) { return -ENXIO; }
+static inline int fw_grow_paged_buf(struct fw_priv *fw_priv, int pages_needed) { return -ENXIO; }
+static inline int fw_map_paged_buf(struct fw_priv *fw_priv) { return -ENXIO; }
 #endif
 
 #endif /* __FIRMWARE_LOADER_H */
-- 
2.16.4


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

* Re: [PATCH] firmware: Fix missing inline
  2019-07-23  8:11 [PATCH] firmware: Fix missing inline Takashi Iwai
@ 2019-07-23  8:21 ` Greg Kroah-Hartman
  0 siblings, 0 replies; 2+ messages in thread
From: Greg Kroah-Hartman @ 2019-07-23  8:21 UTC (permalink / raw)
  To: Takashi Iwai; +Cc: Mauro Rossi, linux-kernel

On Tue, Jul 23, 2019 at 10:11:59AM +0200, Takashi Iwai wrote:
> I mistakenly dropped the inline while resolving the patch conflicts in
> the previous fix patch.  Without inline, we get compiler warnings wrt
> unused functions.
> 
> Note that Mauro's original patch contained the correct changes; it's
> all my fault to submit a patch before a morning coffee.
> 
> Fixes: c8917b8ff09e ("firmware: fix build errors in paged buffer handling code")
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
>  drivers/base/firmware_loader/firmware.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Thanks, now queued up.

greg k-h

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

end of thread, other threads:[~2019-07-23  8:21 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-23  8:11 [PATCH] firmware: Fix missing inline Takashi Iwai
2019-07-23  8:21 ` Greg Kroah-Hartman

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