From nobody Tue Feb 10 19:23:13 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516901178816115.97735039196868; Thu, 25 Jan 2018 09:26:18 -0800 (PST) Received: from localhost ([::1]:52922 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eelHv-0005Ki-UY for importer@patchew.org; Thu, 25 Jan 2018 12:26:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eel6q-0004b4-KQ for qemu-devel@nongnu.org; Thu, 25 Jan 2018 12:14:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eel6p-0004zy-Lc for qemu-devel@nongnu.org; Thu, 25 Jan 2018 12:14:44 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:33560) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eel6p-0004zq-Gw for qemu-devel@nongnu.org; Thu, 25 Jan 2018 12:14:43 -0500 Received: by mail-qt0-x242.google.com with SMTP id d8so21039874qtm.0 for ; Thu, 25 Jan 2018 09:14:43 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id u23sm2012835qke.88.2018.01.25.09.14.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jan 2018 09:14:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=avpfXPT4BvJIR1NqUVZGWP9tBTM3mYn1lhwdbU2WoIY=; b=oe9P/9Lnvs+JM5YGSyXqEsPTTFUT0bq9YvX7LWXx39iKBTZ0E5KlRlfoQ76niRIUMp 4jGsPOXUIkx1zlCEEZnNswE7pwbdEClvgivsb43JXyijMAT1A12KNpoDB7VEL64DLEpG YzEn8VtMwOgjDZc3+SqidBSjAtkca3mxXHI+52luwxy4Veeb4vvwaeQ5iO0d4OEngrEf sbPGK4QNKqqZbBUusgwhV29MJJr4yfhN00WV7ojbYk040TDEDg5ipOql0kH3RYbg/gZU pkYhY6eu06z0MFV7MwfW/F4nBYHvpRH7vO/XS7g3F4BQWKLAbxLQVbJ6I0+Oo3GmD5TE qJlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=avpfXPT4BvJIR1NqUVZGWP9tBTM3mYn1lhwdbU2WoIY=; b=F/2Es7y+i/6kFJKo+ylv2s0MaiDX1wj2NCIXeAm5rQ3FD0N7BqQbAdaoIp4fIpQAqN a2FrEgZ25ewqMNXexl3nyNT7SaNOZr6EPj4GM+xlQ26LEvmHwFrfgrMNIJS7nls5NZyJ EqL8I58r+4+FHVgsBdcUpZvMQngeRdmt8hwM+3YeriH+HGbwUSSBN3RfvnQLhoE56eUm jeyVzVvTvHMpPEfBg991iekqPKesS7MieRjfrbQNl0XBoWZtrWe2unMgwyGAKTJef/n6 lm+lUP8nphFlmawfDC4tULyU7i0Jt1qeJl55bYXxVS8GaudJfyW/l4zCVDfX0+lX/Z0l vaGQ== X-Gm-Message-State: AKwxytfHVwVXbM0SNNtx5RU5Q6jVALCGo861KyGJwE673gGaNfKrioPL D2KLdmlgj3AgmjvU70AMAFY= X-Google-Smtp-Source: AH8x227eOcmIfA8tDZfOQjhMhK8M5bTrN3kwQd4MY5agEAcWjOgS0fBk9cGHMt0BVBFpxAlPJMmQDA== X-Received: by 10.200.48.71 with SMTP id g7mr18443839qte.317.1516900483161; Thu, 25 Jan 2018 09:14:43 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Gerd Hoffmann , Mao Zhongyi , Cao jin Date: Thu, 25 Jan 2018 14:14:31 -0300 Message-Id: <20180125171432.13554-3-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180125171432.13554-1-f4bug@amsat.org> References: <20180125171432.13554-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH v3 2/3] usb-ccid: inline ccid_card_initfn() in ccid_card_realize() 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/usb/dev-smartcard-reader.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index 0092493f4e..85f5f2247b 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -510,20 +510,6 @@ static void ccid_card_exitfn(CCIDCardState *card) =20 } =20 -static void ccid_card_initfn(CCIDCardState *card, Error **errp) -{ - CCIDCardClass *cc =3D CCID_CARD_GET_CLASS(card); - Error *local_err =3D NULL; - - if (cc->realize) { - cc->realize(card, &local_err); - if (local_err !=3D NULL) { - error_propagate(errp, local_err); - return; - } - } -} - static bool ccid_has_pending_answers(USBCCIDState *s) { return s->pending_answers_num > 0; @@ -1302,6 +1288,7 @@ static int ccid_card_exit(DeviceState *qdev) static void ccid_card_realize(DeviceState *qdev, Error **errp) { CCIDCardState *card =3D CCID_CARD(qdev); + CCIDCardClass *cc =3D CCID_CARD_GET_CLASS(card); USBDevice *dev =3D USB_DEVICE(qdev->parent_bus->parent); USBCCIDState *s =3D USB_CCID_DEV(dev); Error *local_err =3D NULL; @@ -1315,10 +1302,12 @@ static void ccid_card_realize(DeviceState *qdev, Er= ror **errp) error_setg(errp, "usb-ccid card already full, not adding"); return; } - ccid_card_initfn(card, &local_err); - if (local_err !=3D NULL) { - error_propagate(errp, local_err); - return; + if (cc->realize) { + cc->realize(card, &local_err); + if (local_err !=3D NULL) { + error_propagate(errp, local_err); + return; + } } s->card =3D card; } --=20 2.15.1