From patchwork Tue Aug 7 17:32:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Whitten X-Patchwork-Id: 954603 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="t2nJCiiW"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41lM6J482Zz9rvt for ; Wed, 8 Aug 2018 03:32:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390288AbeHGTsB (ORCPT ); Tue, 7 Aug 2018 15:48:01 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:53398 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389361AbeHGTsB (ORCPT ); Tue, 7 Aug 2018 15:48:01 -0400 Received: by mail-wm0-f67.google.com with SMTP id s9-v6so18255035wmh.3 for ; Tue, 07 Aug 2018 10:32:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=z/0X+l0WWJEeULcbLvmWfoKxdPWx6ekR/nPK+Iy5WMY=; b=t2nJCiiWfO+KL+ITgrw0jPqJeLKoCUdiNF4wHhV624Qx0xdTmJjzgAnBOC/5xdCgJZ /dySr+EMKqBQ4iQ10xoTaB4NZfFPnFc3EtM+l9VZNg3ruNYLIelD/cUh3uf3Mn5tTFtQ IX4c7+2N3t9OegITDCM3O3SJ03LV2aCfJDNXmrn+hkfAaTLDfe7YCtW2ukHonOCcoPsR dwvkI2bR50Jh/TnVfTP6I2QihN4UXMW31AwRhIlgAwnCND8JBI9+Mlc7FAh6FN2MT8NF 0sIYVzHAuLi+Tc+1kzYe6CBrGPV2a8nngSf8EmEd/wFHU1yTLmu0zn4tSf7MZjf5Aid+ FQFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=z/0X+l0WWJEeULcbLvmWfoKxdPWx6ekR/nPK+Iy5WMY=; b=kfujwyxM/n8LjmdeD4hpQY8V5ALoAdgXo2+TWPUFx8/HTDjVPmUS1E0gqXqwey4w8l XIfvh2b47QdGJ9O6b4Wai9KAmvczznGJ7FZ71q5vXEpLW8jhTqIMiUM97NBEmW2KNFD7 WOGq/y+u8t6e9wXs5wXmMWHReBTw1Z6Vtb72VkzkxRsW5njuHpwL4L2W8CdOFsqSawfA +bMJ7+7u6tx0BXKcWqXl6TezhI1IrwmIb+btqMRjbyBilT3Pq0jDL+OFIJiV5h/CKdtt p5G+B8a2cua0WPxSAMROpa2SSohfTwzZP6gx2k9lChvCMWqMfWxKMyzbttxhXslCYTZb m77A== X-Gm-Message-State: AOUpUlGeqc9c1WmXSQDnMCXr3tBQYVXrSuWFv1noOeM9imyqiuMadHAU JJAelHr3rpzNOVk2O32kTI8= X-Google-Smtp-Source: AA+uWPxmyrbA9XTwb+dPBpgxz0g/XWhens4pWM1QuZ4FHS/26tfpLkmhzPbtpSBQShYHgXhAcnAdYg== X-Received: by 2002:a1c:2208:: with SMTP id i8-v6mr2165291wmi.105.1533663157613; Tue, 07 Aug 2018 10:32:37 -0700 (PDT) Received: from Lappy.lan (196.98.125.91.dyn.plus.net. [91.125.98.196]) by smtp.gmail.com with ESMTPSA id m207-v6sm3234263wma.31.2018.08.07.10.32.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Aug 2018 10:32:36 -0700 (PDT) From: Ben Whitten To: afaerber@suse.de, starnight@g.ncu.edu.tw, hasnain.virk@arm.com Cc: netdev@vger.kernel.org, Ben Whitten Subject: [PATCH lora-next 08/10] net: lora: sx1301: convert read and write to priv pointer Date: Tue, 7 Aug 2018 18:32:09 +0100 Message-Id: <1533663131-16313-10-git-send-email-ben.whitten@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533663131-16313-1-git-send-email-ben.whitten@gmail.com> References: <1533663131-16313-1-git-send-email-ben.whitten@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ben Whitten Convert the next layer of read and writes to our private pointer, once again compatiblity later in the page read and write layer. The page functions will be removed with this full stack as page switches are handled by regmap automatically. Signed-off-by: Ben Whitten --- drivers/net/lora/sx1301.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/lora/sx1301.c b/drivers/net/lora/sx1301.c index ab45b5b..f84a6ce 100644 --- a/drivers/net/lora/sx1301.c +++ b/drivers/net/lora/sx1301.c @@ -318,9 +318,8 @@ static int sx1301_read_burst(struct sx1301_priv *priv, u8 reg, u8 *val, size_t l return spi_write_then_read(priv->spi, &addr, 1, val, len); } -static int sx1301_read(struct spi_device *spi, u8 reg, u8 *val) +static int sx1301_read(struct sx1301_priv *priv, u8 reg, u8 *val) { - struct sx1301_priv *priv = spi_get_drvdata(spi); return sx1301_read_burst(priv, reg, val, 1); } @@ -335,9 +334,8 @@ static int sx1301_write_burst(struct sx1301_priv *priv, u8 reg, const u8 *val, s return spi_sync_transfer(priv->spi, xfr, 2); } -static int sx1301_write(struct spi_device *spi, u8 reg, u8 val) +static int sx1301_write(struct sx1301_priv *priv, u8 reg, u8 val) { - struct sx1301_priv *priv = spi_get_drvdata(spi); return sx1301_write_burst(priv, reg, &val, 1); } @@ -350,7 +348,7 @@ static int sx1301_page_switch(struct spi_device *spi, u8 page) return 0; dev_dbg(&spi->dev, "switching to page %u\n", (unsigned)page); - ret = sx1301_write(spi, REG_PAGE_RESET, page & 0x3); + ret = sx1301_write(priv, REG_PAGE_RESET, page & 0x3); if (ret) { dev_err(&spi->dev, "switching to page %u failed\n", (unsigned)page); return ret; @@ -364,23 +362,25 @@ static int sx1301_page_switch(struct spi_device *spi, u8 page) static int sx1301_page_read(struct spi_device *spi, u8 page, u8 reg, u8 *val) { int ret; + struct sx1301_priv *priv = spi_get_drvdata(spi); ret = sx1301_page_switch(spi, page); if (ret) return ret; - return sx1301_read(spi, reg, val); + return sx1301_read(priv, reg, val); } static int sx1301_page_write(struct spi_device *spi, u8 page, u8 reg, u8 val) { int ret; + struct sx1301_priv *priv = spi_get_drvdata(spi); ret = sx1301_page_switch(spi, page); if (ret) return ret; - return sx1301_write(spi, reg, val); + return sx1301_write(priv, reg, val); } #define REG_RADIO_X_DATA 0 @@ -666,7 +666,7 @@ static int sx1301_agc_calibrate(struct spi_device *spi) return ret; } - ret = sx1301_read(spi, REG_EMERGENCY_FORCE, &val); + ret = sx1301_read(priv, REG_EMERGENCY_FORCE, &val); if (ret) { dev_err(&spi->dev, "emergency force read failed\n"); return ret; @@ -674,7 +674,7 @@ static int sx1301_agc_calibrate(struct spi_device *spi) val &= ~REG_EMERGENCY_FORCE_HOST_CTRL; - ret = sx1301_write(spi, REG_EMERGENCY_FORCE, val); + ret = sx1301_write(priv, REG_EMERGENCY_FORCE, val); if (ret) { dev_err(&spi->dev, "emergency force write failed\n"); return ret; @@ -683,7 +683,7 @@ static int sx1301_agc_calibrate(struct spi_device *spi) dev_err(&spi->dev, "starting calibration...\n"); msleep(2300); - ret = sx1301_read(spi, REG_EMERGENCY_FORCE, &val); + ret = sx1301_read(priv, REG_EMERGENCY_FORCE, &val); if (ret) { dev_err(&spi->dev, "emergency force read (1) failed\n"); return ret; @@ -691,13 +691,13 @@ static int sx1301_agc_calibrate(struct spi_device *spi) val |= REG_EMERGENCY_FORCE_HOST_CTRL; - ret = sx1301_write(spi, REG_EMERGENCY_FORCE, val); + ret = sx1301_write(priv, REG_EMERGENCY_FORCE, val); if (ret) { dev_err(&spi->dev, "emergency force write (1) failed\n"); return ret; } - ret = sx1301_read(spi, REG_MCU_AGC_STATUS, &val); + ret = sx1301_read(priv, REG_MCU_AGC_STATUS, &val); if (ret) { dev_err(&spi->dev, "AGC status read failed\n"); return ret;