Received: from [140.186.70.92] (port=38408 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OHW3I-0003LI-GX for qemu-devel@nongnu.org; Thu, 27 May 2010 01:54:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OHVuK-00048T-Vv for qemu-devel@nongnu.org; Thu, 27 May 2010 01:45:30 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:40084) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OHVuK-00048P-MD for qemu-devel@nongnu.org; Thu, 27 May 2010 01:45:28 -0400 Date: Thu, 27 May 2010 14:42:06 +0900 From: Isaku Yamahata Message-ID: <20100527054206.GG31807@valinux.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] pci: clean up of pci_set_default_subsystem_id(). List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- hw/pci.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 8d84651..3362842 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); } /* -- 1.6.6.1