From: Philippe Mathieu-Daudé Date: Tue, 28 May 2019 16:40:16 +0000 (+0200) Subject: hw/audio/ac97: Use the QOM DEVICE() macro to access DeviceState.qdev X-Git-Tag: v4.1.0-rc0~72^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ce5e0201f1c9baca9586e48a2ea1b256071aac8;p=thirdparty%2Fqemu.git hw/audio/ac97: Use the QOM DEVICE() macro to access DeviceState.qdev Rather than looking inside the definition of a DeviceState with "s->qdev", use the QOM prefered style: "DEVICE(s)". This patch was generated using the following Coccinelle script (with a bit of manual fix-up, removing an extra space to please checkpatch.pl): // Use DEVICE() macros to access DeviceState.qdev @use_device_macro_to_access_qdev@ expression obj; identifier dev; @@ -&obj->dev.qdev +DEVICE(obj) Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell . Message-Id: <20190528164020.32250-7-philmd@redhat.com> Signed-off-by: Laurent Vivier --- diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c index 2265622d44a..a4e8d99e777 100644 --- a/hw/audio/ac97.c +++ b/hw/audio/ac97.c @@ -1388,7 +1388,7 @@ static void ac97_realize(PCIDevice *dev, Error **errp) pci_register_bar (&s->dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io_nam); pci_register_bar (&s->dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &s->io_nabm); AUD_register_card ("ac97", &s->card); - ac97_on_reset (&s->dev.qdev); + ac97_on_reset(DEVICE(s)); } static void ac97_exit(PCIDevice *dev)