From: Felipe Franciosi <felipe@nutanix.com>
To: Marc-Andre Lureau <marcandre.lureau@gmail.com>,
Philippe Mathieu-Daude <philmd@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
Alexey Kardashevskiy <aik@ozlabs.ru>
Cc: "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>,
Felipe Franciosi <felipe@nutanix.com>
Subject: [PATCH v3 3/4] ich9: Simplify ich9_lpc_initfn
Date: Fri, 29 Nov 2019 17:46:54 +0000 [thread overview]
Message-ID: <20191129174630.6922-4-felipe@nutanix.com> (raw)
In-Reply-To: <20191129174630.6922-1-felipe@nutanix.com>
Currently, ich9_lpc_initfn simply serves as a caller to
ich9_lpc_add_properties. This simplifies the code a bit by eliminating
ich9_lpc_add_properties altogether and executing its logic in the parent
object initialiser function.
Signed-off-by: Felipe Franciosi <felipe@nutanix.com>
---
hw/isa/lpc_ich9.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index 9f4e00dddd..c40bb3c420 100644
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -634,12 +634,14 @@ static void ich9_lpc_get_sci_int(Object *obj, Visitor *v, const char *name,
visit_type_uint8(v, name, &lpc->sci_gsi, errp);
}
-static void ich9_lpc_add_properties(ICH9LPCState *lpc)
+static void ich9_lpc_initfn(Object *obj)
{
+ ICH9LPCState *lpc = ICH9_LPC_DEVICE(obj);
+
static const uint8_t acpi_enable_cmd = ICH9_APM_ACPI_ENABLE;
static const uint8_t acpi_disable_cmd = ICH9_APM_ACPI_DISABLE;
- object_property_add(OBJECT(lpc), ACPI_PM_PROP_SCI_INT, "uint8",
+ object_property_add(obj, ACPI_PM_PROP_SCI_INT, "uint8",
ich9_lpc_get_sci_int,
NULL, NULL, NULL, NULL);
object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_ENABLE_CMD,
@@ -647,14 +649,7 @@ static void ich9_lpc_add_properties(ICH9LPCState *lpc)
object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_DISABLE_CMD,
&acpi_disable_cmd, OBJ_PROP_FLAG_READ, NULL);
- ich9_pm_add_properties(OBJECT(lpc), &lpc->pm, NULL);
-}
-
-static void ich9_lpc_initfn(Object *obj)
-{
- ICH9LPCState *lpc = ICH9_LPC_DEVICE(obj);
-
- ich9_lpc_add_properties(lpc);
+ ich9_pm_add_properties(obj, &lpc->pm, NULL);
}
static void ich9_lpc_realize(PCIDevice *d, Error **errp)
--
2.20.1
next prev parent reply other threads:[~2019-11-29 18:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-29 17:46 [PATCH v3 0/4] Improve default object property_add uint helpers Felipe Franciosi
2019-11-29 17:46 ` [PATCH v3 1/4] qom/object: enable setter for uint types Felipe Franciosi
2019-11-30 7:50 ` Marc-André Lureau
2019-12-02 15:06 ` Felipe Franciosi
2019-11-29 17:46 ` [PATCH v3 2/4] ich9: fix getter type for sci_int property Felipe Franciosi
2019-11-30 7:51 ` Marc-André Lureau
2019-11-29 17:46 ` Felipe Franciosi [this message]
2019-11-30 7:52 ` [PATCH v3 3/4] ich9: Simplify ich9_lpc_initfn Marc-André Lureau
2019-11-29 17:46 ` [PATCH v3 4/4] qom/object: Use common get/set uint helpers Felipe Franciosi
2019-11-30 7:55 ` Marc-André Lureau
2019-12-02 6:31 ` Alexey Kardashevskiy
2019-12-10 12:04 ` Felipe Franciosi
2019-12-12 1:05 ` Alexey Kardashevskiy
2019-12-17 22:19 ` Felipe Franciosi
2019-12-18 0:19 ` Alexey Kardashevskiy
2019-12-02 15:00 ` [PATCH v3 0/4] Improve default object property_add " Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191129174630.6922-4-felipe@nutanix.com \
--to=felipe@nutanix.com \
--cc=aik@ozlabs.ru \
--cc=armbru@redhat.com \
--cc=ehabkost@redhat.com \
--cc=marcandre.lureau@gmail.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).