Commit 1c92c505 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Peter Maydell
Browse files

sdhci: refactor common sysbus/pci class_init() into sdhci_common_class_init() 



Now both inherited classes appear as DEVICE_CATEGORY_STORAGE.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarAlistair Francis <alistair.francis@xilinx.com>
Message-id: 20180115182436.2066-5-f4bug@amsat.org
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent b635d98c

hw/sd/sdhci.c

+13 −5
Original line number Original line Diff line number Diff line
@@ -1273,6 +1273,15 @@ const VMStateDescription sdhci_vmstate = { 
    },

    },

};

};





static void sdhci_common_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);



    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

    dc->vmsd = &sdhci_vmstate;

    dc->reset = sdhci_poweron_reset;

}



/* --- qdev PCI --- */

/* --- qdev PCI --- */





static Property sdhci_pci_properties[] = {

static Property sdhci_pci_properties[] = {
@@ -1310,10 +1319,9 @@ static void sdhci_pci_class_init(ObjectClass *klass, void *data) 
    k->vendor_id = PCI_VENDOR_ID_REDHAT;

    k->vendor_id = PCI_VENDOR_ID_REDHAT;

    k->device_id = PCI_DEVICE_ID_REDHAT_SDHCI;

    k->device_id = PCI_DEVICE_ID_REDHAT_SDHCI;

    k->class_id = PCI_CLASS_SYSTEM_SDHCI;

    k->class_id = PCI_CLASS_SYSTEM_SDHCI;

    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

    dc->vmsd = &sdhci_vmstate;

    dc->props = sdhci_pci_properties;

    dc->props = sdhci_pci_properties;

    dc->reset = sdhci_poweron_reset;



    sdhci_common_class_init(klass, data);

}

}





static const TypeInfo sdhci_pci_info = {

static const TypeInfo sdhci_pci_info = {
@@ -1366,10 +1374,10 @@ static void sdhci_sysbus_class_init(ObjectClass *klass, void *data) 
{

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    DeviceClass *dc = DEVICE_CLASS(klass);





    dc->vmsd = &sdhci_vmstate;

    dc->props = sdhci_sysbus_properties;

    dc->props = sdhci_sysbus_properties;

    dc->realize = sdhci_sysbus_realize;

    dc->realize = sdhci_sysbus_realize;

    dc->reset = sdhci_poweron_reset;



    sdhci_common_class_init(klass, data);

}

}





static const TypeInfo sdhci_sysbus_info = {

static const TypeInfo sdhci_sysbus_info = {