From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Whitten Subject: [PATCH lora-next 07/10] net: lora: sx1301: convert read and write burst to take priv data Date: Tue, 7 Aug 2018 18:32:08 +0100 Message-ID: <1533663131-16313-9-git-send-email-ben.whitten@gmail.com> References: <1533663131-16313-1-git-send-email-ben.whitten@gmail.com> Cc: netdev@vger.kernel.org, Ben Whitten To: afaerber@suse.de, starnight@g.ncu.edu.tw, hasnain.virk@arm.com Return-path: Received: from mail-wr1-f67.google.com ([209.85.221.67]:35593 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389712AbeHGTr7 (ORCPT ); Tue, 7 Aug 2018 15:47:59 -0400 Received: by mail-wr1-f67.google.com with SMTP id g1-v6so13044186wru.2 for ; Tue, 07 Aug 2018 10:32:36 -0700 (PDT) In-Reply-To: <1533663131-16313-1-git-send-email-ben.whitten@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Ben Whitten As part of standardising on passing our priv data around we convert read and write burst to take the priv data, there is a small compat step needed in the old _read and _write functions and will be removed in the next step. Signed-off-by: Ben Whitten --- drivers/net/lora/sx1301.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/net/lora/sx1301.c b/drivers/net/lora/sx1301.c index 4cec524..ab45b5b 100644 --- a/drivers/net/lora/sx1301.c +++ b/drivers/net/lora/sx1301.c @@ -312,18 +312,19 @@ static int sx1301_field_write(struct sx1301_priv *priv, return regmap_field_write(priv->regmap_fields[field_id], val); } -static int sx1301_read_burst(struct spi_device *spi, u8 reg, u8 *val, size_t len) +static int sx1301_read_burst(struct sx1301_priv *priv, u8 reg, u8 *val, size_t len) { u8 addr = reg & 0x7f; - return spi_write_then_read(spi, &addr, 1, val, len); + return spi_write_then_read(priv->spi, &addr, 1, val, len); } static int sx1301_read(struct spi_device *spi, u8 reg, u8 *val) { - return sx1301_read_burst(spi, reg, val, 1); + struct sx1301_priv *priv = spi_get_drvdata(spi); + return sx1301_read_burst(priv, reg, val, 1); } -static int sx1301_write_burst(struct spi_device *spi, u8 reg, const u8 *val, size_t len) +static int sx1301_write_burst(struct sx1301_priv *priv, u8 reg, const u8 *val, size_t len) { u8 addr = reg | BIT(7); struct spi_transfer xfr[2] = { @@ -331,12 +332,13 @@ static int sx1301_write_burst(struct spi_device *spi, u8 reg, const u8 *val, siz { .tx_buf = val, .len = len }, }; - return spi_sync_transfer(spi, xfr, 2); + return spi_sync_transfer(priv->spi, xfr, 2); } static int sx1301_write(struct spi_device *spi, u8 reg, u8 val) { - return sx1301_write_burst(spi, reg, &val, 1); + struct sx1301_priv *priv = spi_get_drvdata(spi); + return sx1301_write_burst(priv, reg, &val, 1); } static int sx1301_page_switch(struct spi_device *spi, u8 page) @@ -551,7 +553,7 @@ static int sx1301_load_firmware(struct sx1301_priv *priv, int mcu, const struct if (ret) return ret; - ret = sx1301_write_burst(priv->spi, REG_MCU_PROM_DATA, fw->data, fw->size); + ret = sx1301_write_burst(priv, REG_MCU_PROM_DATA, fw->data, fw->size); if (ret) { dev_err(priv->dev, "MCU prom data write failed\n"); return ret; @@ -567,7 +569,7 @@ static int sx1301_load_firmware(struct sx1301_priv *priv, int mcu, const struct if (!buf) return -ENOMEM; - ret = sx1301_read_burst(priv->spi, REG_MCU_PROM_DATA, buf, fw->size); + ret = sx1301_read_burst(priv, REG_MCU_PROM_DATA, buf, fw->size); if (ret) { dev_err(priv->dev, "MCU prom data read failed\n"); return ret; -- 2.7.4