From patchwork Thu Jan 5 23:11:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Pisa X-Patchwork-Id: 711598 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tvk9V4GnWz9t0H for ; Fri, 6 Jan 2017 10:17:34 +1100 (AEDT) Received: from localhost ([::1]:49189 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cPHHo-0003o8-As for incoming@patchwork.ozlabs.org; Thu, 05 Jan 2017 18:17:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43742) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cPHGG-0002Ao-H6 for qemu-devel@nongnu.org; Thu, 05 Jan 2017 18:15:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cPHGF-0007b6-Kw for qemu-devel@nongnu.org; Thu, 05 Jan 2017 18:15:56 -0500 Received: from smtp7.web4u.cz ([81.91.87.87]:57190 helo=mx-8.mail.web4u.cz) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cPHGF-0007av-Dg for qemu-devel@nongnu.org; Thu, 05 Jan 2017 18:15:55 -0500 Received: from baree.pikron.com (unknown [89.102.27.124]) (Authenticated sender: ppisa@pikron.com) by mx-8.mail.web4u.cz (Postfix) with ESMTPA id 44E2A1FF1A2; Fri, 6 Jan 2017 00:15:54 +0100 (CET) From: pisa@cmp.felk.cvut.cz To: qemu-devel@nongnu.org Date: Fri, 6 Jan 2017 00:11:27 +0100 Message-Id: <39c4f076e685ca79703213a6ee36e11a922e6af6.1483655894.git.pisa@cmp.felk.cvut.cz> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: X-W4U-Auth: d307fa413ab933c93ff11f2b5132096366b8615a X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 81.91.87.87 Subject: [Qemu-devel] [PATCH 5/6] Minor clean-up of can_pcm3680_pci. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Hajnoczi , Deniz Eren , Oliver Hartkopp , Konrad Frederic Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Deniz Eren --- 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 9d8d3f7..1134960 100644 --- a/hw/can/can_pcm3680_pci.c +++ b/hw/can/can_pcm3680_pci.c @@ -249,8 +249,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]); */ @@ -300,8 +299,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; // k->is_bridge = 0; // k->is_express = 0; dc->desc = "Pcm3680i PCICANx";