Patchwork [3/4] piix_pci: Fix C99 comments

login
register
mail settings
Submitter David Woodhouse
Date Feb. 20, 2013, 9:46 p.m.
Message ID <1361396809-12973-3-git-send-email-dwmw2@infradead.org>
Download mbox | patch
Permalink /patch/222151/
State New
Headers show

Comments

David Woodhouse - Feb. 20, 2013, 9:46 p.m.
From: David Woodhouse <David.Woodhouse@intel.com>

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---
 hw/piix_pci.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
Andreas Färber - Feb. 20, 2013, 11:27 p.m.
Am 20.02.2013 22:46, schrieb David Woodhouse:
> From: David Woodhouse <David.Woodhouse@intel.com>
> 
> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
> ---
>  hw/piix_pci.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/piix_pci.c b/hw/piix_pci.c
> index d45449a..2eeb739 100644
> --- a/hw/piix_pci.c
> +++ b/hw/piix_pci.c
> @@ -426,10 +426,10 @@ static void piix3_reset(void *opaque)
>      PIIX3State *d = opaque;
>      uint8_t *pci_conf = d->dev.config;
>  
> -    pci_conf[0x04] = 0x07; // master, memory and I/O
> +    pci_conf[0x04] = 0x07; /* master, memory and I/O */
>      pci_conf[0x05] = 0x00;
>      pci_conf[0x06] = 0x00;
> -    pci_conf[0x07] = 0x02; // PCI_status_devsel_medium
> +    pci_conf[0x07] = 0x02; /* PCI_status_devsel_medium */
>      pci_conf[0x4c] = 0x4d;
>      pci_conf[0x4e] = 0x03;
>      pci_conf[0x4f] = 0x00;
> @@ -570,7 +570,8 @@ static void piix3_class_init(ObjectClass *klass, void *data)
>      k->init         = piix3_initfn;
>      k->config_write = piix3_write_config;
>      k->vendor_id    = PCI_VENDOR_ID_INTEL;
> -    k->device_id    = PCI_DEVICE_ID_INTEL_82371SB_0; // 82371SB PIIX3 PCI-to-ISA bridge (Step A1)
> +    /* 82371SB PIIX3 PCI-to-ISA bridge (Step A1) */
> +    k->device_id    = PCI_DEVICE_ID_INTEL_82371SB_0;
>      k->class_id     = PCI_CLASS_BRIDGE_ISA;
>  }
>  
> @@ -593,7 +594,8 @@ static void piix3_xen_class_init(ObjectClass *klass, void *data)
>      k->init         = piix3_initfn;
>      k->config_write = piix3_write_config_xen;
>      k->vendor_id    = PCI_VENDOR_ID_INTEL;
> -    k->device_id    = PCI_DEVICE_ID_INTEL_82371SB_0; // 82371SB PIIX3 PCI-to-ISA bridge (Step A1)
> +    /* 82371SB PIIX3 PCI-to-ISA bridge (Step A1) */
> +    k->device_id    = PCI_DEVICE_ID_INTEL_82371SB_0;
>      k->class_id     = PCI_CLASS_BRIDGE_ISA;
>  };
>  

Reviewed-by: Andreas Färber <afaerber@suse.de>

As a follow-up it could be considered to place the last two comments
into dc->desc instead, if exposing the info to the user is desired.

Andreas

Patch

diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index d45449a..2eeb739 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -426,10 +426,10 @@  static void piix3_reset(void *opaque)
     PIIX3State *d = opaque;
     uint8_t *pci_conf = d->dev.config;
 
-    pci_conf[0x04] = 0x07; // master, memory and I/O
+    pci_conf[0x04] = 0x07; /* master, memory and I/O */
     pci_conf[0x05] = 0x00;
     pci_conf[0x06] = 0x00;
-    pci_conf[0x07] = 0x02; // PCI_status_devsel_medium
+    pci_conf[0x07] = 0x02; /* PCI_status_devsel_medium */
     pci_conf[0x4c] = 0x4d;
     pci_conf[0x4e] = 0x03;
     pci_conf[0x4f] = 0x00;
@@ -570,7 +570,8 @@  static void piix3_class_init(ObjectClass *klass, void *data)
     k->init         = piix3_initfn;
     k->config_write = piix3_write_config;
     k->vendor_id    = PCI_VENDOR_ID_INTEL;
-    k->device_id    = PCI_DEVICE_ID_INTEL_82371SB_0; // 82371SB PIIX3 PCI-to-ISA bridge (Step A1)
+    /* 82371SB PIIX3 PCI-to-ISA bridge (Step A1) */
+    k->device_id    = PCI_DEVICE_ID_INTEL_82371SB_0;
     k->class_id     = PCI_CLASS_BRIDGE_ISA;
 }
 
@@ -593,7 +594,8 @@  static void piix3_xen_class_init(ObjectClass *klass, void *data)
     k->init         = piix3_initfn;
     k->config_write = piix3_write_config_xen;
     k->vendor_id    = PCI_VENDOR_ID_INTEL;
-    k->device_id    = PCI_DEVICE_ID_INTEL_82371SB_0; // 82371SB PIIX3 PCI-to-ISA bridge (Step A1)
+    /* 82371SB PIIX3 PCI-to-ISA bridge (Step A1) */
+    k->device_id    = PCI_DEVICE_ID_INTEL_82371SB_0;
     k->class_id     = PCI_CLASS_BRIDGE_ISA;
 };