From patchwork Thu Feb 18 20:06:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 1441877 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=QhC+hyrU; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DhQhr4GM2z9sRf for ; Fri, 19 Feb 2021 07:06:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0EAFE82764; Thu, 18 Feb 2021 21:06:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QhC+hyrU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 793FA8276B; Thu, 18 Feb 2021 21:06:47 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B853582753 for ; Thu, 18 Feb 2021 21:06:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pbrobinson@gmail.com Received: by mail-wr1-x42e.google.com with SMTP id n8so4294017wrm.10 for ; Thu, 18 Feb 2021 12:06:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=B6BCER/xhEA0rFTy44iEs7yRUIJ1rnnlxj6GrpwTCeM=; b=QhC+hyrUZEHCag9fMGM2Ua3RGmLLyp1UdiTAXDPkce52R4FRlSUFPUgjaK33j1RZ8H dYOPGtm/EFOGv3kEjUAaNbqPwzJQjwS3YyPOwKwqu5hVoIxDAorgKy4Ox3RNOVUGHAgu PjaixWXYYotpermyaPO87fNDBCY8UCANQWhGzn86FDCyXWF2RpDo2ifRV2J/XnC9c0nv tY1IFC1+IOWo6ILbVTHZiyYgKnBV88egU1AcEWUkt5fVRAfkRtwR0gsg0DmHRgURsTQ2 XZpEx/YoG2qhqnFTKurzagdvQClrHRc6dYAoTSxJG00qFyovLVP42TttaMtbniTiLJ3A rMVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=B6BCER/xhEA0rFTy44iEs7yRUIJ1rnnlxj6GrpwTCeM=; b=g+C9Oluf+/mTtoUiDWCGKy4s9gyvXIpX9l5Hcm/kROM6yC6ezm1r6dE1FCvKb7U+4u 2nrpaygoUE85bqFoLfY23n5iBlAcHCGunzAG1mL6KPkqJM7RsPjLfwcuL3nOO62mA3X5 Mav13/ao9JsPFwfPQ2JPdsMAhcwIblzJT2RQ+BZF4x5g4fFPfr4Fd/EWwgxzpgha9Y07 RUjOjNM0VWz/gbx5cL/2KHED8thk8fX5s3WYEXm470Hjxhv5yu7DD3r0877QYkdS71NB urDECsH0x20z9EXOjYCaowucbP6IXzcBQcIv3oP8xerIGV23olI3m9J/gKrXFoRn19mc 7woA== X-Gm-Message-State: AOAM5321wpsm+JnmQihWf09fp0gP2VEI2q2Zk+FtPzb//aQz6eA5mPzT Qd+t8MgorFXFDfIxxiYtU04= X-Google-Smtp-Source: ABdhPJzSVwSR+v5r3dvQR4IwgMsiR6adBu72xnGXNNyR74+xbuQ/NP6195gEkowpUaE8KJGDDjBp2w== X-Received: by 2002:a05:6000:146:: with SMTP id r6mr5728087wrx.239.1613678802316; Thu, 18 Feb 2021 12:06:42 -0800 (PST) Received: from morpheus.home.roving-it.com (f.c.9.1.f.e.c.d.1.e.0.0.2.b.5.5.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681:55b2:e1:dcef:19cf]) by smtp.googlemail.com with ESMTPSA id z2sm8922445wml.30.2021.02.18.12.06.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 12:06:40 -0800 (PST) From: Peter Robinson To: Matthias Brugger , Sughosh Ganu , Heinrich Schuchardt , u-boot@lists.denx.de Cc: Peter Robinson Subject: [PATCH] rng: iProc rng200: Rename ..._platdata variables to just ..._plat Date: Thu, 18 Feb 2021 20:06:37 +0000 Message-Id: <20210218200637.1677869-1-pbrobinson@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean In 8a8d24bd Simon dropped data from all the various _platdata calls but it seems this wasn't caught for the RNG200 driver from when it was posted to merged. This fixes that issue. Fixes: 537f0018 (rng: Add iProc RNG200 driver) Signed-off-by: Peter Robinson --- drivers/rng/iproc_rng200.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/rng/iproc_rng200.c b/drivers/rng/iproc_rng200.c index f71f285f53..1126bbd797 100644 --- a/drivers/rng/iproc_rng200.c +++ b/drivers/rng/iproc_rng200.c @@ -33,11 +33,11 @@ #define RNG_FIFO_COUNT_OFFSET 0x24 #define RNG_FIFO_COUNT_RNG_FIFO_COUNT_MASK 0x000000FF -struct iproc_rng200_platdata { +struct iproc_rng200_plat { fdt_addr_t base; }; -static void iproc_rng200_enable(struct iproc_rng200_platdata *pdata, bool enable) +static void iproc_rng200_enable(struct iproc_rng200_plat *pdata, bool enable) { fdt_addr_t rng_base = pdata->base; u32 val; @@ -52,7 +52,7 @@ static void iproc_rng200_enable(struct iproc_rng200_platdata *pdata, bool enable writel(val, rng_base + RNG_CTRL_OFFSET); } -static void iproc_rng200_restart(struct iproc_rng200_platdata *pdata) +static void iproc_rng200_restart(struct iproc_rng200_plat *pdata) { fdt_addr_t rng_base = pdata->base; u32 val; @@ -84,7 +84,7 @@ static void iproc_rng200_restart(struct iproc_rng200_platdata *pdata) static int iproc_rng200_read(struct udevice *dev, void *data, size_t len) { - struct iproc_rng200_platdata *priv = dev_get_plat(dev); + struct iproc_rng200_plat *priv = dev_get_plat(dev); char *buf = (char *)data; u32 num_remaining = len; u32 status; @@ -136,7 +136,7 @@ static int iproc_rng200_read(struct udevice *dev, void *data, size_t len) static int iproc_rng200_probe(struct udevice *dev) { - struct iproc_rng200_platdata *priv = dev_get_plat(dev); + struct iproc_rng200_plat *priv = dev_get_plat(dev); iproc_rng200_enable(priv, true); @@ -145,16 +145,16 @@ static int iproc_rng200_probe(struct udevice *dev) static int iproc_rng200_remove(struct udevice *dev) { - struct iproc_rng200_platdata *priv = dev_get_plat(dev); + struct iproc_rng200_plat *priv = dev_get_plat(dev); iproc_rng200_enable(priv, false); return 0; } -static int iproc_rng200_ofdata_to_platdata(struct udevice *dev) +static int iproc_rng200_of_to_plat(struct udevice *dev) { - struct iproc_rng200_platdata *pdata = dev_get_plat(dev); + struct iproc_rng200_plat *pdata = dev_get_plat(dev); pdata->base = dev_read_addr(dev); if (!pdata->base) @@ -180,6 +180,6 @@ U_BOOT_DRIVER(iproc_rng200_rng) = { .ops = &iproc_rng200_ops, .probe = iproc_rng200_probe, .remove = iproc_rng200_remove, - .plat_auto = sizeof(struct iproc_rng200_platdata), - .of_to_plat = iproc_rng200_ofdata_to_platdata, + .priv_auto = sizeof(struct iproc_rng200_plat), + .of_to_plat = iproc_rng200_of_to_plat, };