From patchwork Wed Jan 3 18:34:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 855183 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=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XCp9ligV"; dkim-atps=neutral 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 3zBg5b1nZlz9s7g for ; Thu, 4 Jan 2018 05:52:03 +1100 (AEDT) Received: from localhost ([::1]:32812 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWo8v-0003oi-AB for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 13:52:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34196) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnss-0003ka-Bk for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:35:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnsr-0007ux-L1 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:35:26 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:39298) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnsr-0007uW-2X for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:35:25 -0500 Received: by mail-qt0-x241.google.com with SMTP id k19so3221805qtj.6 for ; Wed, 03 Jan 2018 10:35:24 -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=TcIDMeWYOPbWsXkOMYQ67Jpjv1tUDs/0V/CtgDPJrE0=; b=XCp9ligVnn13JFFshI3bZ5baYc7VrniUVIAlBbqp7AQ15/CsGzj8HE7VWvdceQbvJA RPwANl6gxTiNTS81jGfSfsJfrK3YaNF9hZ/SJQg2ppXtZQbyBgRSabMzz8tphdn+Ja5A Wt3Bk36CVPvxJN6Tcegl5e/wOMuHp9sfcvA9LKVfYFiltAsHjjl3eRzHSAtmPi7i0b+1 xHZcg6md7la4ivesoKX7edosqU5HXSSgdM8T+cV0ERaSvAAdPqxH5eA2I/s2BN2pd6FX fq66SUcmi2udOehFPhT5iSvRKbraQlQxV9DFMkwwC9vSOXb+xE0QWjehRAKt703wbgZg tffw== 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=TcIDMeWYOPbWsXkOMYQ67Jpjv1tUDs/0V/CtgDPJrE0=; b=bTMNmS3gFs3myZBX3BktFc42Wvw2UvKqU6XfKxnDkI2RKpPNGomBVLwrnZPGv3b0+O sdKWHEUK+49hM+fWuZ08z1s0KyvNoYAKtdVfEq1aPjBzj6bbB8CyUrURz0rocjRTgal9 cAaBuY1ls8ch//X6aYPjq2WJTtD85AGSZ1meTSFxCBDHDs6SunTtD2xe18c+z2YRei4T vnR+caeZ4lXSBEKf6w12dzBX9N+Ht21ULmnCSUuSnGGndZqzEUOCIhCpuX9YSp1eOFKs x53ybFFxqRTJzTG8JjvqrA8vn4RKN6NY42mFA9/Yg9/bsfOgNB+gUNpS5Wiy38EDpgbF doTw== X-Gm-Message-State: AKGB3mLByWN3+zVx1qw+c5Ch5Ofy5MPycA+3OEVsEvHEPLXG5VjJwbeL IeU+K2ctfeEWGLPqpBQJd8s= X-Google-Smtp-Source: ACJfBotf+EiGg2QtzlnlaRKoAIkUGpxQoWSJf5Xpj3JChDVXyp/GYICE01W4FeXpG99q0WPgT27Tfg== X-Received: by 10.237.53.115 with SMTP id b48mr3016097qte.304.1515004524627; Wed, 03 Jan 2018 10:35:24 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 185sm992854qkd.1.2018.01.03.10.35.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:35:24 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Andrey Smirnov Date: Wed, 3 Jan 2018 15:34:13 -0300 Message-Id: <20180103183418.23730-21-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103183418.23730-1-f4bug@amsat.org> References: <20180103183418.23730-1-f4bug@amsat.org> MIME-Version: 1.0 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 v4 20/25] 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: Peter Crosthwaite , =?utf-8?q?Philippe_Ma?= =?utf-8?q?thieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" All SDHCI consumers have been upgraded to set correct properties. Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/sdhci.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 2bd3c5a4b9..2b63ff1891 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1195,9 +1195,7 @@ static void sdhci_init_readonly_registers(SDHCIState *s, Error **errp) s->cap.sdma = s->cap.adma1 = s->cap.adma2 = false; } - if (s->capareg == UINT64_MAX) { - sdhci_init_capareg(s, errp); - } + sdhci_init_capareg(s, errp); } static void sdhci_initfn(SDHCIState *s) @@ -1347,9 +1345,6 @@ static Property sdhci_properties[] = { DEFINE_PROP_UINT8("bus-speed", SDHCIState, cap.sdr, 0), DEFINE_PROP_UINT8("driver-strength", SDHCIState, cap.strength, 0), - /* capareg: deprecated */ - DEFINE_PROP_UINT64("capareg", SDHCIState, capareg, UINT64_MAX), - DEFINE_PROP_UINT64("maxcurr", SDHCIState, maxcurr, 0), DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_quirk, false),