From patchwork Mon Apr 20 10:33:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1083 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id C3F263F1FE for ; Mon, 20 Apr 2020 12:33:59 +0200 (CEST) Received: by mail-pl1-f199.google.com with SMTP id x3sf8270041plm.9 for ; Mon, 20 Apr 2020 03:33:59 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1587378838; cv=pass; d=google.com; s=arc-20160816; b=rPmqZIjHMtyXPMHTCaNTFyYHG/OlpM7JPnTh5z9x3Ts1fycYjKnUk/9pK3hxdKxcld z7RgJfu2AHe8PVzh5Vjjx4VeANfbZxhrYO9jY+PAcPxKKrCeNyyIaAXAI5VqGgGXfqg/ ubKdJu4mLRzfbB3iHQWXQiZIRTxFtBEh7Ayo5ko0enXmagb/ovys1HK/VwnzTmj51ssC 55YDnkwSZABiIgZeSEUuUzxFaPclKkqH4nqFLC0ppJqc+wXV0IX45b+j7O1nEPOl5/0V wuXDpdlxpy91RDl0htTah0xzWEtvsCWWzo4dly0dW8VHPfgeBL5Vjzm8fUIb0LW0jFUg buhw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:message-id:date:subject:cc:to:from :mime-version:dkim-signature; bh=9z7EnnoIFwLUIOiDjvgfOTGku1Zt6ASnEjhD7od3PpI=; b=rPkydJrB2K7mslBONHcwfnH4OAF5QRsBbWk22wLuq7SF2iMR9avqYep88ueWg+VcxI Wg6ZD/6RbOPJu8XBrEk6gdg1dFURUF4KJyT206OSQJxlVZBct7CIRNsLY6siOCDDn4iI gJ+EHOE54nRsHjugFGAG8uJq/wAjzXEmSe16JH/9mj3gobcElZoWUULXVm7X7Pplj5Vg Mb/vbREOKr3V9WZaCGmHBEh0um38V0gu0i+Qp1Z1fqSz9frQYRLOPTx/+d3+4hYqLkzx wOLPBKsMBVdSiGfbVxcPvBZ+NqDCSzQ/X9HjXMDsW5aB/G3vvBQZTNCRLgSzBimgKFgE rlAQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=I63VxZWD; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=mime-version:from:to:cc:subject:date:message-id:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=9z7EnnoIFwLUIOiDjvgfOTGku1Zt6ASnEjhD7od3PpI=; b=QAzQ0QgNv4KmmZimU8p2rHQVYYorxjA/aaL0MktW8y4W71jn8YVmfcQu/vT+BPkeT6 qP7m+vgGQMMa2lVnCtk1iKyUFmq2w4bdDV0W4xbxEIOW1WiV2btzX1qepUljZRVgd+f3 t8JgjpM3KUQsrHF9w4dDhGIyOahgM2bW2pJ1o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:to:cc:subject:date:message-id :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-spam-checked-in-group:list-post:list-help :list-archive:list-unsubscribe; bh=9z7EnnoIFwLUIOiDjvgfOTGku1Zt6ASnEjhD7od3PpI=; b=Td80g2AANjF1cpzzeE9x1IZEIKt3obzY0it/LXFv/KxxM/yfC2ucYBTTV7I7ZJs2O8 mdFEi3XT4zEaq8giQjZd1Q/KD0kgjRmgwa8pa7eiB8qEYGks+5oPahv2DVw/cASupVqp v4AVoI0WUMdaNQUEiq6ZMArWaxBXQjE1PndMmpxYrIYHLSZvHmbmqBjiY+gxRtMKCFdY 8R85JYKir1YTk6CTt9+erm+Vzbwl7kcjERxxV0n5dFK7DDeN4NRjPCzvo+Vdwq2qSX2i twMbhLtu7IP/0AfjeaJXFUlBCpsRFo18e/c0P3AlAYx/CWB64UNpTTUOr8KFQzfnSw2f WpbA== X-Gm-Message-State: AGi0PubjiqleshvC7Eyn/REIbp5XH/1Q6SWvD01gSNrUQBnX7j3ypXz0 X3fU4Apg6eHUFVWMc7VZlBXsueE4 X-Google-Smtp-Source: APiQypI/3zKzNHWHAT7xf0hSNEAkzN5i4DFO8fakEnhFJoFRhCCEUvziNbYa0Ma1NooPo5sNYhYnUQ== X-Received: by 2002:a17:90a:c304:: with SMTP id g4mr20918712pjt.157.1587378837932; Mon, 20 Apr 2020 03:33:57 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:90b:3543:: with SMTP id lt3ls12596368pjb.3.gmail; Mon, 20 Apr 2020 03:33:57 -0700 (PDT) X-Received: by 2002:a17:902:a40f:: with SMTP id p15mr14921498plq.276.1587378837435; Mon, 20 Apr 2020 03:33:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587378837; cv=none; d=google.com; s=arc-20160816; b=WoZJ+AfzQq3C0fqgURqlWCXvpX8Xnszsx9OdUWE+t48YuB7JjRh0t1mnk534sowtkp ifZOLCjItU4gIjM9C1xcWK/vfGavum19MLqaV9ge88Wh36oVUBcDXr0wRq/3+ckDbngP WSzt1TTZh6PgMPHUc9Xe8TmvjQo3B5GIRn1sxUS6+nnO6Pt+H9+lOHmF+8oogdiJFoyP IPqJSLguFgTW3UVRHayMDY/u0O+YgMmB4NbSuhfVZtmgLQxzndPmVjvr+u/K/Eo8dgjg lvYeAFtxkYhhaQqtIyfCqeqU8BIjvDvsNiD4gye8OVc//BspNXBxL6sGayO2sthGRCLC f5Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=Mpw2FJdmEyqPSl5hSItWnlvzDnagVp8BPgS5nUh5Zxc=; b=E1/lBUh77F2nvwP5AyAORTdu3ijNim/hmvDL8H1WncuJhEsL93CjMdhJNb5S0qntYZ wrb6kv7sKzwbzK4moCjV0hFdaCQyLlbOTRH4E9VdqjAWXmvTGDo2xZ/aGFnn0f7oe12s obGCnHIOdCVCpe48jnXUCZcjV5sloyc5zqkeLNLQ8ScLXRKMAcuVvMgte/PxXI96P+f/ gqO5xiwkiYeaeXoX6yZcqeNFPpsS4xWAE5nX/vyM9stIAw7gVBLN7alwA+38l2htNHxq zuZhaLwVMxzd44dEXfIiro3pIzeUDic5Fqbg5db4D1hPSjihcwfx41MLFdGps3ZFVSWB gN1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=I63VxZWD; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id y22sor704816plp.33.2020.04.20.03.33.56 for (Google Transport Security); Mon, 20 Apr 2020 03:33:56 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:902:eb13:: with SMTP id l19mr16157124plb.156.1587378836432; Mon, 20 Apr 2020 03:33:56 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:7ddc:e17b:a9b3:404]) by smtp.gmail.com with ESMTPSA id q97sm858695pjb.7.2020.04.20.03.33.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Apr 2020 03:33:55 -0700 (PDT) From: Jagan Teki To: u-boot@lists.denx.de Cc: Bin Meng , Bhargav Shah , Sagar Shrikant Kadam , linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH] spi: sifive: Tidy up dm_spi_slave_platdata variable Date: Mon, 20 Apr 2020 16:03:46 +0530 Message-Id: <20200420103346.1621-1-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.17.1 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=I63VxZWD; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Usually variable name slave is used for spi_slave structure and plat_slave for the dm_spi_slave_platdata. Let's follow this meaningful notation by replacing slave with plat_slave for dm_spi_slave_platdata structure. Signed-off-by: Jagan Teki Reviewed-by: Bin Meng --- drivers/spi/spi-sifive.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c index 969bd4b75c..8f5efb51a3 100644 --- a/drivers/spi/spi-sifive.c +++ b/drivers/spi/spi-sifive.c @@ -95,25 +95,25 @@ struct sifive_spi { }; static void sifive_spi_prep_device(struct sifive_spi *spi, - struct dm_spi_slave_platdata *slave) + struct dm_spi_slave_platdata *slave_plat) { /* Update the chip select polarity */ - if (slave->mode & SPI_CS_HIGH) - spi->cs_inactive &= ~BIT(slave->cs); + if (slave_plat->mode & SPI_CS_HIGH) + spi->cs_inactive &= ~BIT(slave_plat->cs); else - spi->cs_inactive |= BIT(slave->cs); + spi->cs_inactive |= BIT(slave_plat->cs); writel(spi->cs_inactive, spi->regs + SIFIVE_SPI_REG_CSDEF); /* Select the correct device */ - writel(slave->cs, spi->regs + SIFIVE_SPI_REG_CSID); + writel(slave_plat->cs, spi->regs + SIFIVE_SPI_REG_CSID); } static int sifive_spi_set_cs(struct sifive_spi *spi, - struct dm_spi_slave_platdata *slave) + struct dm_spi_slave_platdata *slave_plat) { u32 cs_mode = SIFIVE_SPI_CSMODE_MODE_HOLD; - if (slave->mode & SPI_CS_HIGH) + if (slave_plat->mode & SPI_CS_HIGH) cs_mode = SIFIVE_SPI_CSMODE_MODE_AUTO; writel(cs_mode, spi->regs + SIFIVE_SPI_REG_CSMODE); @@ -128,7 +128,7 @@ static void sifive_spi_clear_cs(struct sifive_spi *spi) static void sifive_spi_prep_transfer(struct sifive_spi *spi, bool is_rx_xfer, - struct dm_spi_slave_platdata *slave) + struct dm_spi_slave_platdata *slave_plat) { u32 cr; @@ -141,14 +141,14 @@ static void sifive_spi_prep_transfer(struct sifive_spi *spi, /* LSB first? */ cr &= ~SIFIVE_SPI_FMT_ENDIAN; - if (slave->mode & SPI_LSB_FIRST) + if (slave_plat->mode & SPI_LSB_FIRST) cr |= SIFIVE_SPI_FMT_ENDIAN; /* Number of wires ? */ cr &= ~SIFIVE_SPI_FMT_PROTO_MASK; - if ((slave->mode & SPI_TX_QUAD) || (slave->mode & SPI_RX_QUAD)) + if ((slave_plat->mode & SPI_TX_QUAD) || (slave_plat->mode & SPI_RX_QUAD)) cr |= SIFIVE_SPI_FMT_PROTO_QUAD; - else if ((slave->mode & SPI_TX_DUAL) || (slave->mode & SPI_RX_DUAL)) + else if ((slave_plat->mode & SPI_TX_DUAL) || (slave_plat->mode & SPI_RX_DUAL)) cr |= SIFIVE_SPI_FMT_PROTO_DUAL; else cr |= SIFIVE_SPI_FMT_PROTO_SINGLE; @@ -191,21 +191,21 @@ static int sifive_spi_xfer(struct udevice *dev, unsigned int bitlen, { struct udevice *bus = dev->parent; struct sifive_spi *spi = dev_get_priv(bus); - struct dm_spi_slave_platdata *slave = dev_get_parent_platdata(dev); + struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); const unsigned char *tx_ptr = dout; u8 *rx_ptr = din; u32 remaining_len; int ret; if (flags & SPI_XFER_BEGIN) { - sifive_spi_prep_device(spi, slave); + sifive_spi_prep_device(spi, slave_plat); - ret = sifive_spi_set_cs(spi, slave); + ret = sifive_spi_set_cs(spi, slave_plat); if (ret) return ret; } - sifive_spi_prep_transfer(spi, true, slave); + sifive_spi_prep_transfer(spi, true, slave_plat); remaining_len = bitlen / 8;