From nobody Sun Nov 16 07:20:39 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599087604; cv=none; d=zohomail.com; s=zohoarc; b=CzeegC8+lWev7N3QMBaJnB4HJkOq4xkPm+j4LjOyS+GY5YGAnT9QeyflbKkiTVrP6jaBlDRsOK//TRjKaYFbFXuqOYO4BxeoV5f14bnflSjt055OpolhsH5zXOnzfkBK6cVJ/fENJNPp/wvBH3PyPTW7BqalPjRIjIekNcqdxAA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599087604; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YTkyBykFkXbbk86GGkCUTC7xRyB9nfmDNLeqhsrCO9M=; b=hY6SOQetwMSNWEzfanVjgisL/Q5VxqKxx/CC9g8bDgq/barpnBW1tzuFsOZXDNUfrIc83RxpbKmW4GDiF/T/5hlYAL9rqcHcyyFcflO/RLmtfFiL/3E/s3cHWM7gADEaCE1NTKnqHAUSu4ve+dntWIZulD9+3C22rZtm4jYaGC0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599087604939648.4411874150856; Wed, 2 Sep 2020 16:00:04 -0700 (PDT) Received: from localhost ([::1]:36410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbjX-0001eW-W3 for importer@patchew.org; Wed, 02 Sep 2020 19:00:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbUv-0003t0-AV for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:57 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:58680 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbUt-0008TR-5N for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:44:56 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-256-JivF25oUPYKVwEA8vXah_g-1; Wed, 02 Sep 2020 18:44:52 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BCE971074642 for ; Wed, 2 Sep 2020 22:44:51 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 85F44100EBBE; Wed, 2 Sep 2020 22:44:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YTkyBykFkXbbk86GGkCUTC7xRyB9nfmDNLeqhsrCO9M=; b=P2UUK5HNeeee/r8sv6K92gWj66HbvAV+c4DvAtHQ8ASHggj98Rgz4lp1+zE8t6pjfAc8Ir XesXk2Bfyrb80uAIfQkgiJxi1n+oIml1zhPphIhGZVSJIoF3IMdfEJwGS4cDBD/cZxFQTu NZVVYq0v7uICszAG/Gm9CP8adnS2siM= X-MC-Unique: JivF25oUPYKVwEA8vXah_g-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 36/63] can: Rename PCM3680i_PCI_DEV to PCM3680_PCI Date: Wed, 2 Sep 2020 18:42:44 -0400 Message-Id: <20200902224311.1321159-37-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 17:27:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , berrange@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Make the type checking macro name consistent with the TYPE_* constant. Signed-off-by: Eduardo Habkost --- Cc: Jason Wang Cc: qemu-devel@nongnu.org --- hw/net/can/can_pcm3680_pci.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/net/can/can_pcm3680_pci.c b/hw/net/can/can_pcm3680_pci.c index 530cd04a5d..cb9db3c322 100644 --- a/hw/net/can/can_pcm3680_pci.c +++ b/hw/net/can/can_pcm3680_pci.c @@ -44,7 +44,7 @@ #define TYPE_PCM3680_PCI "pcm3680_pci" =20 typedef struct Pcm3680iPCIState Pcm3680iPCIState; -DECLARE_INSTANCE_CHECKER(Pcm3680iPCIState, PCM3680i_PCI_DEV, +DECLARE_INSTANCE_CHECKER(Pcm3680iPCIState, PCM3680_PCI, TYPE_PCM3680_PCI) =20 /* the PCI device and vendor IDs */ @@ -76,7 +76,7 @@ struct Pcm3680iPCIState { =20 static void pcm3680i_pci_reset(DeviceState *dev) { - Pcm3680iPCIState *d =3D PCM3680i_PCI_DEV(dev); + Pcm3680iPCIState *d =3D PCM3680_PCI(dev); int i; =20 for (i =3D 0; i < PCM3680i_PCI_SJA_COUNT; i++) { @@ -156,7 +156,7 @@ static const MemoryRegionOps pcm3680i_pci_sja2_io_ops = =3D { =20 static void pcm3680i_pci_realize(PCIDevice *pci_dev, Error **errp) { - Pcm3680iPCIState *d =3D PCM3680i_PCI_DEV(pci_dev); + Pcm3680iPCIState *d =3D PCM3680_PCI(pci_dev); uint8_t *pci_conf; int i; =20 @@ -190,7 +190,7 @@ static void pcm3680i_pci_realize(PCIDevice *pci_dev, Er= ror **errp) =20 static void pcm3680i_pci_exit(PCIDevice *pci_dev) { - Pcm3680iPCIState *d =3D PCM3680i_PCI_DEV(pci_dev); + Pcm3680iPCIState *d =3D PCM3680_PCI(pci_dev); int i; =20 for (i =3D 0; i < PCM3680i_PCI_SJA_COUNT; i++) { @@ -217,7 +217,7 @@ static const VMStateDescription vmstate_pcm3680i_pci = =3D { =20 static void pcm3680i_pci_instance_init(Object *obj) { - Pcm3680iPCIState *d =3D PCM3680i_PCI_DEV(obj); + Pcm3680iPCIState *d =3D PCM3680_PCI(obj); =20 object_property_add_link(obj, "canbus0", TYPE_CAN_BUS, (Object **)&d->canbus[0], --=20 2.26.2