From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D077EC43612 for ; Sun, 6 Jan 2019 08:38:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A081B218DE for ; Sun, 6 Jan 2019 08:38:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726536AbfAFIiF (ORCPT ); Sun, 6 Jan 2019 03:38:05 -0500 Received: from mx2.suse.de ([195.135.220.15]:57194 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726477AbfAFIiE (ORCPT ); Sun, 6 Jan 2019 03:38:04 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 61094ACBC; Sun, 6 Jan 2019 08:38:03 +0000 (UTC) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: linux-lpwan@lists.infradead.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Ben Whitten , "David S. Miller" Subject: [PATCH lora-next 03/11] net: lora: sx130x: Revert drop of sx1301_soft_reset() Date: Sun, 6 Jan 2019 09:37:46 +0100 Message-Id: <20190106083754.6004-4-afaerber@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190106083754.6004-1-afaerber@suse.de> References: <20190106083754.6004-1-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ben's regmap field conversion patch silently dropped my sx1301_soft_reset() helper. Soft reset is a special operation, so restore this function as sx130x_soft_reset(). To be squashed. Cc: Ben Whitten Signed-off-by: Andreas Färber --- drivers/net/lora/sx130x.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/lora/sx130x.c b/drivers/net/lora/sx130x.c index 21db0ddb101f..7a387d9a75a0 100644 --- a/drivers/net/lora/sx130x.c +++ b/drivers/net/lora/sx130x.c @@ -180,6 +180,11 @@ static int sx130x_field_write(struct sx130x_priv *priv, return regmap_field_write(priv->regmap_fields[field_id], val); } +static int sx130x_soft_reset(struct sx130x_priv *priv) +{ + return sx130x_field_write(priv, F_SOFT_RESET, 1); +} + static int sx130x_agc_ram_read(struct sx130x_priv *priv, u8 addr, unsigned int *val) { int ret; @@ -645,7 +650,7 @@ int sx130x_probe(struct device *dev) return ret; } - ret = sx130x_field_write(priv, F_SOFT_RESET, 1); + ret = sx130x_soft_reset(priv); if (ret) { dev_err(dev, "soft reset failed (%d)\n", ret); return ret; -- 2.16.4