| Message ID | 20100527054206.GG31807@valinux.co.jp |
|---|---|
| State | New |
| Headers | show |
On Thu, May 27, 2010 at 02:42:06PM +0900, Isaku Yamahata wrote: > 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 <yamahata@valinux.co.jp> Applied, thanks! > --- > 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 >
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); } /*
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 <yamahata@valinux.co.jp> --- hw/pci.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-)