[Qemu-devel] [PATCH 16/16] RFC hw/net/smc91c111: Convert init helper into an inline function - Philippe Mathieu-Daudé

From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org, Thomas Huth <thuth@redhat.com>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
	"Magnus Damm" <magnus.damm@gmail.com>,
	"David Gibson" <david@gibson.dropbear.id.au>,
	"Andrew Jeffery" <andrew@aj.id.au>,
	qemu-arm@nongnu.org, qemu-ppc@nongnu.org,
	"Joel Stanley" <joel@jms.id.au>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Andrzej Zaborowski" <balrogg@gmail.com>,
	"Igor Mitsyanko" <i.mitsyanko@gmail.com>,
	"Beniamino Galvani" <b.galvani@gmail.com>,
	"Michael Walle" <michael@walle.cc>,
	"Richard Henderson" <rth@twiddle.net>,
	"Jan Kiszka" <jan.kiszka@web.de>,
	"Jason Wang" <jasowang@redhat.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	"Peter Chubb" <peter.chubb@nicta.com.au>,
	"Aurelien Jarno" <aurelien@aurel32.net>,
	"Cédric Le Goater" <clg@kaod.org>,
	"Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>,
	"Rob Herring" <robh@kernel.org>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [Qemu-devel] [PATCH 16/16] RFC hw/net/smc91c111: Convert init helper into an inline function
Date: Fri,  4 Jan 2019 18:58:47 +0100	[thread overview]
Message-ID: <20190104175847.6290-17-philmd@redhat.com> (raw)
In-Reply-To: <20190104175847.6290-1-philmd@redhat.com>

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
As init helper in "hw/char/pl011.h"
---
 hw/net/smc91c111.c         | 17 -----------------
 include/hw/net/smc91c111.h | 25 ++++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
index d19ea0750d..3472852270 100644
--- a/hw/net/smc91c111.c
+++ b/hw/net/smc91c111.c
@@ -18,7 +18,6 @@
 /* Number of 2k memory pages available.  */
 #define NUM_PACKETS 4
 
-#define TYPE_SMC91C111 "smc91c111"
 #define SMC91C111(obj) OBJECT_CHECK(smc91c111_state, (obj), TYPE_SMC91C111)
 
 typedef struct {
@@ -809,20 +808,4 @@ static void smc91c111_register_types(void)
     type_register_static(&smc91c111_info);
 }
 
-/* Legacy helper function.  Should go away when machine config files are
-   implemented.  */
-void smc91c111_init(NICInfo *nd, uint32_t base, qemu_irq irq)
-{
-    DeviceState *dev;
-    SysBusDevice *s;
-
-    qemu_check_nic_model(nd, "smc91c111");
-    dev = qdev_create(NULL, TYPE_SMC91C111);
-    qdev_set_nic_properties(dev, nd);
-    qdev_init_nofail(dev);
-    s = SYS_BUS_DEVICE(dev);
-    sysbus_mmio_map(s, 0, base);
-    sysbus_connect_irq(s, 0, irq);
-}
-
 type_init(smc91c111_register_types)
diff --git a/include/hw/net/smc91c111.h b/include/hw/net/smc91c111.h
index 46f7d9a5d4..0a1097ddd2 100644
--- a/include/hw/net/smc91c111.h
+++ b/include/hw/net/smc91c111.h
@@ -10,9 +10,32 @@
 #ifndef HW_NET_SMC91C111_H
 #define HW_NET_SMC91C111_H
 
+#include "hw/qdev.h"
 #include "hw/irq.h"
+#include "hw/sysbus.h"
 #include "net/net.h"
 
-void smc91c111_init(NICInfo *, uint32_t, qemu_irq);
+#define TYPE_SMC91C111 "smc91c111"
+
+/*
+ * Legacy helper function.  Should go away when machine config files are
+ * implemented.
+ */
+static inline DeviceState *smc91c111_init(NICInfo *nd,
+                                          uint32_t base, qemu_irq irq)
+{
+    DeviceState *dev;
+    SysBusDevice *s;
+
+    qemu_check_nic_model(nd, "smc91c111");
+    dev = qdev_create(NULL, TYPE_SMC91C111);
+    qdev_set_nic_properties(dev, nd);
+    qdev_init_nofail(dev);
+    s = SYS_BUS_DEVICE(dev);
+    sysbus_mmio_map(s, 0, base);
+    sysbus_connect_irq(s, 0, irq);
+
+    return dev;
+}
 
 #endif
-- 
2.17.2
