From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59619) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZjvM-0006kI-PE for qemu-devel@nongnu.org; Thu, 11 Jan 2018 15:58:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZjvK-00038A-F0 for qemu-devel@nongnu.org; Thu, 11 Jan 2018 15:58:08 -0500 Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 11 Jan 2018 17:56:21 -0300 Message-Id: <20180111205626.23291-17-f4bug@amsat.org> In-Reply-To: <20180111205626.23291-1-f4bug@amsat.org> References: <20180111205626.23291-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v6 16/21] sdhci: remove the deprecated 'capareg' property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alistair Francis , Peter Maydell , Andrey Smirnov , Igor Mitsyanko Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, "Edgar E . Iglesias" , Sai Pavan Boddu , Clement Deschamps , Jean-Christophe Dubois , =?UTF-8?q?Gr=C3=A9gory=20Estrade?= , Krzysztof Kozlowski , Andrew Baumann , Prasad J Pandit , Peter Crosthwaite , qemu-arm@nongnu.org All SDHCI consumers have been upgraded to set correct properties. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- 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 6593f5d8b5..8e4805c84e 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1190,9 +1190,7 @@ static void sdhci_init_readonly_registers(SDHCIState *s, Error **errp) } s->version = (SDHC_HCVER_VENDOR << 8) | (s->spec_version - 1); - if (s->capareg == UINT64_MAX) { - sdhci_init_capareg(s, errp); - } + sdhci_init_capareg(s, errp); } static void sdhci_initfn(SDHCIState *s) @@ -1338,9 +1336,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), -- 2.15.1