Re: [PATCH v4 3/4] ich9: Simplify ich9_lpc_initfn

["Philippe Mathieu-Daudé" <philmd@redhat.com>]

On 12/19/19 7:02 PM, Felipe Franciosi wrote:
> 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)
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>