From patchwork Tue Oct 22 13:31:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 177185 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp4897674ill; Tue, 22 Oct 2019 06:54:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqzdJYNLqSXLpgS6bv9e3DZWKSfdluVtX1W7at5pcDME+eRxbeqHaIGbR0JGhQXUwKuD/72q X-Received: by 2002:ac8:1b45:: with SMTP id p5mr3236473qtk.330.1571752482283; Tue, 22 Oct 2019 06:54:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571752482; cv=none; d=google.com; s=arc-20160816; b=pe7RjECvo6xum6Q/062t3yxBWBwPcZwtDthf5ipSerCDTDTzkgQen8aEyRzkW0ctR6 eQc8VSYBhA7U1obu0gOBksAA+NsWAEkpEmFewbC8B+OyKO2bQjnXoeT5xyRGPsTflpSF rsDn46G62nGM+JVimVOpB8SfOC5e/m0P6dGMGDpaTkuppvpq9yNS8LnkVso1aIcrj/jm jcxWKkSlTcmHs3VThSl31BSN6p1WjWXRaFhgP9WPSH4EB7/0W1PIUbCvtasd8XtkX7Xp mDZMgiyp/SsQhqR+bZzz3imLN4CEd9msArCT5D5ekH4+M1DkEuHOZRtN5Ait+O/N4Chp OOwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=5lY7u62vI3+XxTunjo9vzWs8Uh4wfjIbh9S8L0HAuyI=; b=n5J+B51UT1LY0o72hyIdC6L1Mz8xVYttNqWbot72xf3YqINc2bKf6EMdVAZb7B7gIx X9dQiyY/RZu38CziIaeE7/iwQwX7a4CHa2iqNE0pn0Nzt/LzNA+r9dTZJ10w8ou/tcg6 w+HkPbWgYD6c4w4mcvMyfMGimCj3U6PqVML3Eh8Oc5W77KdKP74j+c2I8D2ufwMUYEPO QRI+YYBjdCqZ72uxt5/lJtos+rrU32at1Px0siG7dZGGBaVKr2dbhReWCkSG/njrkxef ziYZRqi70/zpCIgkuwRE7IRZ5pjSX9q1zNhX06p3r8ByfyiMRzwLSkGCDz2va4QpXTSi cO2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YUpnIJVd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 17si17144844qkg.40.2019.10.22.06.54.42 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Oct 2019 06:54:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YUpnIJVd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMucT-0003tW-CV for patch@linaro.org; Tue, 22 Oct 2019 09:54:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37176) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMuHQ-0003RC-17 for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:32:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMuHO-0001Ye-UH for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:32:55 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:33287) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iMuHO-0001YO-Ny for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:32:54 -0400 Received: by mail-wm1-x344.google.com with SMTP id 6so3707781wmf.0 for ; Tue, 22 Oct 2019 06:32:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=5lY7u62vI3+XxTunjo9vzWs8Uh4wfjIbh9S8L0HAuyI=; b=YUpnIJVdO6DVIbNG7gztL2UKLuTluVGPT5dZVuHXeqW22Nabtsfzs7SJSphwMf3Q3K SXM7gFBmGc0GlRBXyydypmQ9YSIMtZogEmly1Kq4cMEmZWT+1HRp1w4luYmo2Ae1O4I5 8HIqjwBOhdJOgoTydEOYonGds+0HSL08K2vB8kIMCigQW+uXfTr5pnrjgFQiL+qduo9e ad1eGCkxZ1litqXZzLiZ/GaGcZFv0hjoIfkLprSwXhiDnT9IKr4Iyff/TITdQUXrLudy obTmxblWnIPsTq2CiHpG4sa2eibyzJ8OkpxLNSNdy8BLqyTazZUqJVypPwZldsnP4lta geIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5lY7u62vI3+XxTunjo9vzWs8Uh4wfjIbh9S8L0HAuyI=; b=aPz3K17CX1JUKMoDOgooIXvnaw6gyGDxAMsuAtafEYULOfwHeaf/sUPAx97n4Q09NX KZ6bGL0YMXFsxLSZqgZmJgo35Nw5kVF4IkeCuaDDf9MPdOgyU3l6/TPvQUE6/PPsUS/q Ho2Ksfgap7btLrB9PtRyAa4wUfkr8Ff60vcOJfvhQolzcmW1KU/6Daun9eWfTv4kpXYf 1QDicaNGC/Ky9KekcLb+UB6qAcposRXrj29G9kMbrhxqf7whDHNerWRsn3brdEJoIo0S G1Sdw60Ii9K9YQGGP+HgtpDMIAqrEgwiPVUmRvKaTM32omDDE7G0ag8yelEs0Ep+rl/r egHA== X-Gm-Message-State: APjAAAU+HksDiGLsHyTAH4GRvt/1Ksh2JXrJ+NmSmiP1yyeyZorQ5bC6 piLloxxhEODoZp5e4ITopJEx9LPFtm0= X-Received: by 2002:a1c:c912:: with SMTP id f18mr3296553wmb.168.1571751172991; Tue, 22 Oct 2019 06:32:52 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id r2sm20263856wma.1.2019.10.22.06.32.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 06:32:51 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 33/41] hw/sd/sdhci: Add a comment to distinct the i.MX eSDHC functions Date: Tue, 22 Oct 2019 14:31:26 +0100 Message-Id: <20191022133134.14487-34-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191022133134.14487-1-peter.maydell@linaro.org> References: <20191022133134.14487-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé This file keeps the various QDev blocks separated by comments. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cleber Rosa Message-id: 20191005154748.21718-3-f4bug@amsat.org Signed-off-by: Peter Maydell --- hw/sd/sdhci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index e08ec3e3985..82ec5c1b4a4 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1532,6 +1532,8 @@ static const TypeInfo sdhci_bus_info = { .class_init = sdhci_bus_class_init, }; +/* --- qdev i.MX eSDHC --- */ + static uint64_t usdhc_read(void *opaque, hwaddr offset, unsigned size) { SDHCIState *s = SYSBUS_SDHCI(opaque); @@ -1734,7 +1736,6 @@ usdhc_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) } } - static const MemoryRegionOps usdhc_mmio_ops = { .read = usdhc_read, .write = usdhc_write,