From patchwork Tue Oct 24 23:29:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Pisa X-Patchwork-Id: 830068 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yM8hb6NnYz9t1G for ; Wed, 25 Oct 2017 10:33:03 +1100 (AEDT) Received: from localhost ([::1]:45920 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e78gv-0007Y2-JL for incoming@patchwork.ozlabs.org; Tue, 24 Oct 2017 19:33:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53174) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e78eU-0005oA-C2 for qemu-devel@nongnu.org; Tue, 24 Oct 2017 19:30:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e78eT-0000Wh-CP for qemu-devel@nongnu.org; Tue, 24 Oct 2017 19:30:30 -0400 Received: from smtp8.web4u.cz ([81.91.87.88]:42740 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 1e78eT-0000Vn-5K for qemu-devel@nongnu.org; Tue, 24 Oct 2017 19:30:29 -0400 Received: from baree.pikron.com (unknown [89.102.4.32]) (Authenticated sender: ppisa@pikron.com) by mx-8.mail.web4u.cz (Postfix) with ESMTPA id 0AE571FFFC2; Wed, 25 Oct 2017 01:30:28 +0200 (CEST) From: pisa@cmp.felk.cvut.cz To: qemu-devel@nongnu.org Date: Wed, 25 Oct 2017 01:29:45 +0200 Message-Id: <2edc282892a5572f90cc0c839eac5608da670cf3.1508885974.git.pisa@cmp.felk.cvut.cz> X-Mailer: git-send-email 2.11.0 In-Reply-To: <7df70170550e3a10152a3571012f507dd035ba7c.1508885974.git.pisa@cmp.felk.cvut.cz> References: <7df70170550e3a10152a3571012f507dd035ba7c.1508885974.git.pisa@cmp.felk.cvut.cz> In-Reply-To: References: X-W4U-Auth: d7784779f7814da74ea8080c7f8c270d7d9e8a25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 81.91.87.88 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: Marek Vasut , Stefan Hajnoczi , Deniz Eren , Jan Kiszka , Oliver Hartkopp , Pavel Pisa , Konrad Frederic Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Deniz Eren Signed-off-by: Pavel Pisa --- 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;