From nobody Tue Feb 10 01:30:34 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 1516308401736862.7284857911593; Thu, 18 Jan 2018 12:46:41 -0800 (PST) Received: from localhost ([::1]:53835 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecH57-0004VO-0k for importer@patchew.org; Thu, 18 Jan 2018 15:46:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45081) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecH0I-0000jJ-EW for qemu-devel@nongnu.org; Thu, 18 Jan 2018 15:41:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecH0H-0007g1-GF for qemu-devel@nongnu.org; Thu, 18 Jan 2018 15:41:42 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:42368) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ecH0H-0007fp-Bq for qemu-devel@nongnu.org; Thu, 18 Jan 2018 15:41:41 -0500 Received: by mail-qt0-x241.google.com with SMTP id c2so33613431qtn.9 for ; Thu, 18 Jan 2018 12:41:41 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 24sm5484621qkv.64.2018.01.18.12.41.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jan 2018 12:41:40 -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=yeQgdEbmUtoGW6TfkItmkbaMHecl7p4ijlt2eKoKlIA=; b=PlrCKdXHGwbjzrzQa9IC4fQ3aIVA1dzZr5FmIJwK9obF8h5UHOSRVmQ11R3W0WkJA1 K/KyiolMD13n3LXmG/MsTBcyWZMqB1YTo3rXj1490YQoTDC+NTXlOrG46/9Ht2vOhRfQ O3uIRR+O1Prgi5gewz72r+ZMcocL36LC3ox0QOn86JcV+tcDtF5mv/lIUxYPgilcmpVq fHCuimsJHUOcOB1fgVv7tG9+5cjfaEMdS6CPIR4pfmlYRq2Z3aS6cFJQ2t+2tSLFo8is tmafXFxEXbp1pad04+Ua4ryUSyKoCSOSUsYrqGRFBFOEU2Pqwu/TWJ/skPHdv8DVuhh7 BwgA== 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=yeQgdEbmUtoGW6TfkItmkbaMHecl7p4ijlt2eKoKlIA=; b=UUJES0WQxjbqwqLXLcAGkd4iG0G2P4yNL+l8Wt6ELFPHbHwz6qBgJ5qkZHBaWupsME RwIOFCc6ubfpKkh/ZKamzrUj7vxrAj2k1ubxtcSrI5RN3GZc0Xcm+sYVdw9bTCuzK1sm Y0kHcbhFEXoY2GxdgmluIye33CV4w60efQCQgUiZoAVgaZF/vBzQb9DAguNaG1FlQwJD 1Jma7yUi8NNX52tJxHQ16CKtqe4SRv0/662NQ3IqUqklkyQXvQoK1575f0Z6h74RL3i3 U+G0ucAUAWW+FPgD+GorTqBnUO7rBObOljnjX/Y+jwODe0o7cAfqExjSUyUHYB+U+qQK TXZQ== X-Gm-Message-State: AKwxytcD6cwNeJUBnOUhC0ONMZBqnR16GzxoUtW+oGzCZbNbFlY5jutg uxmw/b8d/6XLtOmeM0fr+kg= X-Google-Smtp-Source: ACJfBouPcJiWvyTD37gYUYL5oozx4bGHCcEuJghg5+zl3YbWypE6oB2sjYQ64CztTLDiXSj0Bj0/6A== X-Received: by 10.200.53.6 with SMTP id y6mr40456947qtb.191.1516308100895; Thu, 18 Jan 2018 12:41:40 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Thu, 18 Jan 2018 17:40:53 -0300 Message-Id: <20180118204058.5768-10-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180118204058.5768-1-f4bug@amsat.org> References: <20180118204058.5768-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::241 Subject: [Qemu-devel] [PATCH v7 09/14] sdhci: remove the deprecated 'capareg' property 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: "Edgar E . Iglesias" , Prasad J Pandit , Peter Crosthwaite , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Sai Pavan Boddu 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 All SDHCI consumers have been upgraded to set correct properties. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sdhci.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index ec7430c83c..651f523089 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1184,7 +1184,6 @@ static inline unsigned int sdhci_get_fifolen(SDHCISta= te *s) =20 static void sdhci_init_readonly_registers(SDHCIState *s, Error **errp) { - uint64_t capab; Error *local_err =3D NULL; =20 switch (s->spec_version) { @@ -1196,20 +1195,11 @@ static void sdhci_init_readonly_registers(SDHCIStat= e *s, Error **errp) } s->version =3D (SDHC_HCVER_VENDOR << 8) | (s->spec_version - 1); =20 - capab =3D sdhci_init_capareg(s, &local_err); + s->capareg =3D sdhci_init_capareg(s, &local_err); if (local_err) { error_propagate(errp, local_err); return; } - if (s->capareg =3D=3D UINT64_MAX) { - s->capareg =3D capab; - } else { - capab =3D s->capareg & ~capab; - if (capab) { - error_setg(errp, "missing capability mask: 0x%" PRIx64, capab); - return; - } - } } =20 /* --- qdev common --- */ @@ -1239,9 +1229,6 @@ static void sdhci_init_readonly_registers(SDHCIState = *s, Error **errp) DEFINE_PROP_UINT8("bus-speed", _state, cap.sdr, 0), \ DEFINE_PROP_UINT8("driver-strength", _state, cap.strength, 0), \ \ - /* deprecated: Capabilities registers provide information on supported - * features of this specific host controller implementation */ \ - DEFINE_PROP_UINT64("capareg", _state, capareg, UINT64_MAX), \ DEFINE_PROP_UINT64("maxcurr", _state, maxcurr, 0) =20 static void sdhci_initfn(SDHCIState *s) --=20 2.15.1