diff mbox

hw/net/e1000: Fix compiler warning

Message ID 1469418480-18574-1-git-send-email-xiecl.fnst@cn.fujitsu.com (mailing list archive)
State New, archived
Headers show

Commit Message

Changlong Xie July 25, 2016, 3:48 a.m. UTC 
slave:~/.xie/qemu-colo # gcc --version
gcc (SUSE Linux) 4.3.4 [gcc-4_3-branch revision 152973]

slave:~/.xie/qemu-colo # make -j8
CC    hw/net/e1000e_core.o
hw/net/e1000e_core.c:56: warning: ‘e1000e_set_interrupt_cause’ declared inline after being called
hw/net/e1000e_core.c:56: warning: previous declaration of ‘e1000e_set_interrupt_cause’ was here
LINK  x86_64-softmmu/qemu-system-x86_64

Signed-off-by: Changlong Xie <xiecl.fnst@cn.fujitsu.com>
---
 hw/net/e1000e_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Dmitry Fleytman July 25, 2016, 5:34 a.m. UTC | #1 
Hi,

s/e1000/e1000e/ in commit message subject, except this looks ok.

Thanks for the patch,
Dmitry

Reviewed-by: Dmitry Fleytman <dmitry@daynix.com>

> On 25 Jul 2016, at 06:48 AM, Changlong Xie <xiecl.fnst@cn.fujitsu.com> wrote:
> 
> slave:~/.xie/qemu-colo # gcc --version
> gcc (SUSE Linux) 4.3.4 [gcc-4_3-branch revision 152973]
> 
> slave:~/.xie/qemu-colo # make -j8
> CC    hw/net/e1000e_core.o
> hw/net/e1000e_core.c:56: warning: ‘e1000e_set_interrupt_cause’ declared inline after being called
> hw/net/e1000e_core.c:56: warning: previous declaration of ‘e1000e_set_interrupt_cause’ was here
> LINK  x86_64-softmmu/qemu-system-x86_64
> 
> Signed-off-by: Changlong Xie <xiecl.fnst@cn.fujitsu.com>
> ---
> hw/net/e1000e_core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c
> index badb1fe..e0bd31c 100644
> --- a/hw/net/e1000e_core.c
> +++ b/hw/net/e1000e_core.c
> @@ -52,7 +52,7 @@
>                                      second according to spec 10.2.4.2 */
> #define E1000E_MAX_TX_FRAGS (64)
> 
> -static void
> +static inline void
> e1000e_set_interrupt_cause(E1000ECore *core, uint32_t val);
> 
> static inline void
> -- 
> 1.9.3
> 
> 
>
Michael Tokarev July 28, 2016, 3:47 p.m. UTC | #2 
Applied to -trivial, with commit message fixed.

/mjt
diff mbox

Patch

diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c
index badb1fe..e0bd31c 100644
--- a/hw/net/e1000e_core.c
+++ b/hw/net/e1000e_core.c
@@ -52,7 +52,7 @@ 
                                      second according to spec 10.2.4.2 */
 #define E1000E_MAX_TX_FRAGS (64)
 
-static void
+static inline void
 e1000e_set_interrupt_cause(E1000ECore *core, uint32_t val);
 
 static inline void