diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-01-19 15:52:30 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-02-26 12:42:16 +0100 |
| commit | 9af21dbee14c5165598d17115ade63184ec0dd8b (patch) | |
| tree | 8bb365934bdac7cb5e1b2cb7cf1dbc32aea4655a /hw/sd/sdhci.c | |
| parent | 7ee6c1e182cca6ccf5253569fca3d05826efb4e9 (diff) | |
| download | qemu-9af21dbee14c5165598d17115ade63184ec0dd8b.tar.gz qemu-9af21dbee14c5165598d17115ade63184ec0dd8b.tar.bz2 qemu-9af21dbee14c5165598d17115ade63184ec0dd8b.zip | |
pci: Trivial device model conversions to realize
Convert the device models where initialization obviously can't fail.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Gonglei <arei.gonglei@huawei.com>
Diffstat (limited to 'hw/sd/sdhci.c')
| -rw-r--r-- | hw/sd/sdhci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 10e5355de7..27b914aa94 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1220,7 +1220,7 @@ static Property sdhci_properties[] = { DEFINE_PROP_END_OF_LIST(), }; -static int sdhci_pci_init(PCIDevice *dev) +static void sdhci_pci_realize(PCIDevice *dev, Error **errp) { SDHCIState *s = PCI_SDHCI(dev); dev->config[PCI_CLASS_PROG] = 0x01; /* Standard Host supported DMA */ @@ -1232,7 +1232,6 @@ static int sdhci_pci_init(PCIDevice *dev) memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci", SDHC_REGISTERS_MAP_SIZE); pci_register_bar(dev, 0, 0, &s->iomem); - return 0; } static void sdhci_pci_exit(PCIDevice *dev) @@ -1246,7 +1245,7 @@ static void sdhci_pci_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); - k->init = sdhci_pci_init; + k->realize = sdhci_pci_realize; k->exit = sdhci_pci_exit; k->vendor_id = PCI_VENDOR_ID_REDHAT; k->device_id = PCI_DEVICE_ID_REDHAT_SDHCI; |