diff mbox series

[5/6] Minor clean-up of can_pcm3680_pci.

Message ID 2edc282892a5572f90cc0c839eac5608da670cf3.1508885974.git.pisa@cmp.felk.cvut.cz
State New
Headers show
Series CAN bus support for QEMU (SJA1000 PCI so far) | expand

Commit Message

Pavel Pisa Oct. 24, 2017, 11:29 p.m. UTC 
From: Deniz Eren <deniz.eren@icloud.com>

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
---
 hw/can/can_pcm3680_pci.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Comments

KONRAD Frederic Oct. 25, 2017, 7:46 a.m. UTC | #1 
The same than the previous patch.

Fred

On 10/25/2017 01:29 AM, pisa@cmp.felk.cvut.cz wrote:
> From: Deniz Eren <deniz.eren@icloud.com>
> 
> Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
> ---
>   hw/can/can_pcm3680_pci.c | 7 +++----
>   1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/can/can_pcm3680_pci.c b/hw/can/can_pcm3680_pci.c
> index bc6b164ea7..692aab6ab8 100644
> --- a/hw/can/can_pcm3680_pci.c
> +++ b/hw/can/can_pcm3680_pci.c
> @@ -255,8 +255,7 @@ static void pcm3680i_pci_exit(PCIDevice *pci_dev)
>       qemu_unregister_reset(pcm3680i_pci_reset, d);
>   
>       /*
> -     * regions d->s5920_io, d->sja_io and d->xilinx_io
> -     * are destroyed by QOM now
> +     * region d->sja_io is destroyed by QOM now
>        */
>       /* memory_region_destroy(&d->sja_io[0]); */
>       /* memory_region_destroy(&d->sja_io[1]); */
> @@ -308,8 +307,8 @@ static void pcm3680i_pci_class_init(ObjectClass *klass, void *data)
>       k->device_id = PCM3680i_PCI_DEVICE_ID1;
>       k->revision = 0x00;
>       k->class_id = 0x000c09;
> -    k->subsystem_vendor_id = 0x13fe;
> -    k->subsystem_id = 0xc002;
> +    k->subsystem_vendor_id = PCM3680i_PCI_VENDOR_ID1;
> +    k->subsystem_id = PCM3680i_PCI_DEVICE_ID1;
>       dc->desc = "Pcm3680i PCICANx";
>       dc->props = pcm3680i_pci_properties;
>       dc->vmsd = &vmstate_pcm3680i_pci;
>
diff mbox series

Patch

diff --git a/hw/can/can_pcm3680_pci.c b/hw/can/can_pcm3680_pci.c
index bc6b164ea7..692aab6ab8 100644
--- a/hw/can/can_pcm3680_pci.c
+++ b/hw/can/can_pcm3680_pci.c
@@ -255,8 +255,7 @@  static void pcm3680i_pci_exit(PCIDevice *pci_dev)
     qemu_unregister_reset(pcm3680i_pci_reset, d);
 
     /*
-     * regions d->s5920_io, d->sja_io and d->xilinx_io
-     * are destroyed by QOM now
+     * region d->sja_io is destroyed by QOM now
      */
     /* memory_region_destroy(&d->sja_io[0]); */
     /* memory_region_destroy(&d->sja_io[1]); */
@@ -308,8 +307,8 @@  static void pcm3680i_pci_class_init(ObjectClass *klass, void *data)
     k->device_id = PCM3680i_PCI_DEVICE_ID1;
     k->revision = 0x00;
     k->class_id = 0x000c09;
-    k->subsystem_vendor_id = 0x13fe;
-    k->subsystem_id = 0xc002;
+    k->subsystem_vendor_id = PCM3680i_PCI_VENDOR_ID1;
+    k->subsystem_id = PCM3680i_PCI_DEVICE_ID1;
     dc->desc = "Pcm3680i PCICANx";
     dc->props = pcm3680i_pci_properties;
     dc->vmsd = &vmstate_pcm3680i_pci;