From patchwork Thu Aug 9 12:33:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Whitten X-Patchwork-Id: 955528 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="a7OmjoGh"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41mSPZ11XMz9s1x for ; Thu, 9 Aug 2018 22:34:42 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732354AbeHIO7V (ORCPT ); Thu, 9 Aug 2018 10:59:21 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:39969 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727786AbeHIO7V (ORCPT ); Thu, 9 Aug 2018 10:59:21 -0400 Received: by mail-wm0-f65.google.com with SMTP id y9-v6so108169wma.5 for ; Thu, 09 Aug 2018 05:34:39 -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=UEM/QaaFtKxoVa6SF6Al6ziDRq0SavRLHvC+hjR9jdc=; b=a7OmjoGhnSRb9Qcaa1wFQo3SVGQX4xsbMBu04GjYfVfJR1kVdAasQP6O+6SCeInL5d VARuyfyErF8eUULDlr3RLTAUSKpxykXQykjwE64jpToIQN7E37MIhRCFSOUZXG5uEtea Wx6luM5muSGeey3oU/7HF0Yq7PzczEAmuQnN+Fv65Iv/S638yNDVRuX5XpBvNOZhl8BS vtH9dc2JX1Ziwh3hVxaMmli7zs1AI9qRQKHGczUwEbaqUwojizao76ez+jlDkJfLEbBY EjcVWGOjTSpFpqS7T+ciey5e2XX9BCoa74DoV0eF9a4h9UpgP1VC3QDmUnbrF5lzXq6D QKvw== 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=UEM/QaaFtKxoVa6SF6Al6ziDRq0SavRLHvC+hjR9jdc=; b=LKP45OdU/iGFnVsGUC07tiI9HiIkIBsr9JplDXu8sC9ESOzDM4e2HQVrJ2o8JG86zI 7z2v8S4RR0ZQuJD+UjDWJRtyAsLgx0UAlXX33qpfzwFv6l46OpKlK55N5i7P80mAGHGS l+FdWAqqNjpVIO6ug3no7DstgvDP1v3ptoxtFwh6Lqn1TkAQpDVGG5lcCjonATTHoevB Q81oKQP/7wE6MNkoye2CBgV7mX+0aLX8c5uDqUKqEvxGqelj5NBT/AqXFIbrxI1p2LCv 0bSJKts53pI9tI+PeFlfSrqpYN1mTi4oYo2KeK+u2xVjAfBa/3BkZpQbYZCA4+z/sUKb 5+Pw== X-Gm-Message-State: AOUpUlFqizqn/UZyz1ui+M6BWShXCX7p/WPuKCejEoVgAASpuD4A3qzf 5LQO1HKk5Sv4CLyl8P5jEzs= X-Google-Smtp-Source: AA+uWPwVRVAQpduMQEpkTPPcvv9RzfymPEz7D3B2zBJcQqEvVYsP5dLeeW7qV5Ldg8+yveuQhmMTPA== X-Received: by 2002:a1c:cb87:: with SMTP id b129-v6mr1640707wmg.64.1533818078718; Thu, 09 Aug 2018 05:34:38 -0700 (PDT) Received: from Sarah.corp.lairdtech.com ([109.174.151.67]) by smtp.gmail.com with ESMTPSA id g125-v6sm8596848wmf.16.2018.08.09.05.34.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Aug 2018 05:34:37 -0700 (PDT) From: Ben Whitten X-Google-Original-From: Ben Whitten To: afaerber@suse.de Cc: starnight@g.ncu.edu.tw, hasnain.virk@arm.com, netdev@vger.kernel.org, liuxuenetmail@gmail.com, shess@hessware.de, Ben Whitten Subject: [PATCH lora-next v2 6/8] net: lora: sx1301: replace version and size magic numbers with defines Date: Thu, 9 Aug 2018 13:33:36 +0100 Message-Id: <1533818018-29005-6-git-send-email-ben.whitten@lairdtech.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533818018-29005-1-git-send-email-ben.whitten@lairdtech.com> References: <1533818018-29005-1-git-send-email-ben.whitten@lairdtech.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We replace the hard coded numbers for size and version with meaningful names. Signed-off-by: Ben Whitten --- drivers/net/lora/sx1301.c | 21 +++++++++++++-------- drivers/net/lora/sx1301.h | 18 ++++++++++++++++++ 2 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 drivers/net/lora/sx1301.h diff --git a/drivers/net/lora/sx1301.c b/drivers/net/lora/sx1301.c index 916ee40..8e81179 100644 --- a/drivers/net/lora/sx1301.c +++ b/drivers/net/lora/sx1301.c @@ -21,6 +21,8 @@ #include #include +#include "sx1301.h" + #define REG_PAGE_RESET 0 #define REG_VERSION 1 #define REG_MCU_PROM_ADDR 9 @@ -293,7 +295,7 @@ static int sx1301_load_firmware(struct sx1301_priv *priv, int mcu, const struct u8 val, rst, select_mux; int ret; - if (fw->size != 8192) { + if (fw->size != SX1301_MCU_FW_BYTE) { dev_err(priv->dev, "Unexpected firmware size\n"); return -EINVAL; } @@ -445,8 +447,9 @@ static int sx1301_agc_calibrate(struct sx1301_priv *priv) dev_info(priv->dev, "AGC calibration firmware version %u\n", (unsigned)val); - if (val != 2) { - dev_err(priv->dev, "unexpected firmware version, expecting %u\n", 2); + if (val != SX1301_MCU_AGC_CAL_FW_VERSION) { + dev_err(priv->dev, "unexpected firmware version, expecting %u\n", + SX1301_MCU_AGC_CAL_FW_VERSION); return -ENXIO; } @@ -572,8 +575,9 @@ static int sx1301_load_all_firmware(struct sx1301_priv *priv) dev_info(priv->dev, "AGC firmware version %u\n", (unsigned)val); - if (val != 4) { - dev_err(priv->dev, "unexpected firmware version, expecting %u\n", 4); + if (val != SX1301_MCU_AGC_FW_VERSION) { + dev_err(priv->dev, "unexpected firmware version, expecting %u\n", + SX1301_MCU_AGC_FW_VERSION); return -ENXIO; } @@ -585,8 +589,9 @@ static int sx1301_load_all_firmware(struct sx1301_priv *priv) dev_info(priv->dev, "ARB firmware version %u\n", (unsigned)val); - if (val != 1) { - dev_err(priv->dev, "unexpected firmware version, expecting %u\n", 1); + if (val != SX1301_MCU_ARB_FW_VERSION) { + dev_err(priv->dev, "unexpected firmware version, expecting %u\n", + SX1301_MCU_ARB_FW_VERSION); return -ENXIO; } @@ -642,7 +647,7 @@ static int sx1301_probe(struct spi_device *spi) return ret; } - if (val != 103) { + if (val != SX1301_CHIP_VERSION) { dev_err(&spi->dev, "unexpected version: %u\n", val); return -ENXIO; } diff --git a/drivers/net/lora/sx1301.h b/drivers/net/lora/sx1301.h new file mode 100644 index 0000000..b37ac56 --- /dev/null +++ b/drivers/net/lora/sx1301.h @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Semtech SX1301 lora concentrator + * + * Copyright (c) 2018 Ben Whitten + */ + +#ifndef _SX1301_ +#define _SX1301_ + +#define SX1301_CHIP_VERSION 103 + +#define SX1301_MCU_FW_BYTE 8192 +#define SX1301_MCU_ARB_FW_VERSION 1 +#define SX1301_MCU_AGC_FW_VERSION 4 +#define SX1301_MCU_AGC_CAL_FW_VERSION 2 + +#endif