From 5e434f4e60f8e5a9dadf324b3ee31c3ce0e80165 Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Thu, 27 May 2010 14:42:06 +0900 Subject: [PATCH] pci: clean up of pci_set_default_subsystem_id(). Use pci accessor function. don't return value because it always return 0 and the caller doesn't check the return value. Signed-off-by: Isaku Yamahata Signed-off-by: Michael S. Tsirkin --- hw/pci.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 8d84651f19..3362842bf2 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -419,14 +419,12 @@ int pci_device_load(PCIDevice *s, QEMUFile *f) return ret; } -static int pci_set_default_subsystem_id(PCIDevice *pci_dev) +static void pci_set_default_subsystem_id(PCIDevice *pci_dev) { - uint16_t *id; - - id = (void*)(&pci_dev->config[PCI_SUBSYSTEM_VENDOR_ID]); - id[0] = cpu_to_le16(pci_default_sub_vendor_id); - id[1] = cpu_to_le16(pci_default_sub_device_id); - return 0; + pci_set_word(pci_dev->config + PCI_SUBSYSTEM_VENDOR_ID, + pci_default_sub_vendor_id); + pci_set_word(pci_dev->config + PCI_SUBSYSTEM_ID, + pci_default_sub_device_id); } /*