From patchwork Thu Aug 9 12:33:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Whitten X-Patchwork-Id: 955527 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="eXzh9wEM"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41mSPX5XF6z9s1c for ; Thu, 9 Aug 2018 22:34:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732301AbeHIO7U (ORCPT ); Thu, 9 Aug 2018 10:59:20 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:37188 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731095AbeHIO7U (ORCPT ); Thu, 9 Aug 2018 10:59:20 -0400 Received: by mail-wr1-f65.google.com with SMTP id u12-v6so5009623wrr.4 for ; Thu, 09 Aug 2018 05:34:37 -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=vUUZepHoEcyAPpt8ounDRiroB+wMRwa4vna1D0Pfyns=; b=eXzh9wEMS4kDDZhc6XrzQ26I6zssse2e6MhW8Zf0AetrhRJp9dWv3wKoj80UehNSA3 fFc7BxafxASX44w6ZV38qGUh7AvGsFLt2RLcCqX5g/y3alO1guzvG86klWwHqe0ggjhN zpBvdMO9QwKbJaKA7mX/Pw8fUQcM3YhITwVIqsqzs0zThmZGwZfR7K7bfS6sfnVwxbh2 uD5d0LF/7dXThWXuDZqoUIAlazd8t5FleUMUsHFFiH1bnY+ykBKq3Pms2i6mEo3tbAH9 X4XHG2RbTYSh/+RakudIGZESEonYOoW6E29X4kBhfbKNlOFiGyHKeCv434CBvsqVWdvS F2cw== 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=vUUZepHoEcyAPpt8ounDRiroB+wMRwa4vna1D0Pfyns=; b=Oq3fdaaC7Q/OsSufaxAjGW4IGxEpUV8Who1vD0WHnQ0jjPIQy7aqn7nRdX0DTeNk38 qL1dqo3iyG6MoXREM3mhvE/FCH37wm+neXBpWEL94WC7qN+2aqkRRiZFhAZAdhfVNtJu /3+R6oGksrGy/4E2uWXDYXLpj0LCc7m748IE2RPxExqDLOIqzZtXj1ceP56pQ5r7aA4V fuP/n9kqpNdB5QPrIjewXesY/G06vj32LTtPeLZKbqv9vB7/RrjGOGwzb+/fLdtTJkPh +jSox0ZpxPMb1WE8NK3KsNTk96O9u1xbcEobcIALRx3V2OH3CwirY1eMVsDRRoS+yB1d Tm/Q== X-Gm-Message-State: AOUpUlE61ti1rK7F7rKES8/6r3T7S0fK61T/VWUf1bSmTEOvo8RtKHWA f750ZEsTZKkZp0+s85d5vWM= X-Google-Smtp-Source: AA+uWPyYvf0jle8duW9MWStCOx+eXO1XxsGv54TfJ5kmQ6OMuxIitKNUkiXuMNnVSbIIcXgpvtVSOA== X-Received: by 2002:adf:ba12:: with SMTP id o18-v6mr1425256wrg.249.1533818077254; Thu, 09 Aug 2018 05:34:37 -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.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Aug 2018 05:34:36 -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 5/8] net: lora: sx1301: remove duplicate firmware size checks Date: Thu, 9 Aug 2018 13:33:35 +0100 Message-Id: <1533818018-29005-5-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 No need to check the size of the firmware multiple times, just do it once in the function responsible for loading as the firmwares are the same size. Signed-off-by: Ben Whitten --- drivers/net/lora/sx1301.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/drivers/net/lora/sx1301.c b/drivers/net/lora/sx1301.c index 3f2a532..916ee40 100644 --- a/drivers/net/lora/sx1301.c +++ b/drivers/net/lora/sx1301.c @@ -293,8 +293,10 @@ 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 != 8192) { + dev_err(priv->dev, "Unexpected firmware size\n"); return -EINVAL; + } switch (mcu) { case 0: @@ -390,11 +392,6 @@ static int sx1301_agc_calibrate(struct sx1301_priv *priv) return ret; } - if (fw->size != 8192) { - dev_err(priv->dev, "unexpected agc cal firmware size\n"); - return -EINVAL; - } - ret = sx1301_load_firmware(priv, 1, fw); release_firmware(fw); if (ret) { @@ -517,12 +514,6 @@ static int sx1301_load_all_firmware(struct sx1301_priv *priv) return ret; } - if (fw->size != 8192) { - dev_err(priv->dev, "unexpected arb firmware size\n"); - release_firmware(fw); - return -EINVAL; - } - ret = sx1301_load_firmware(priv, 0, fw); release_firmware(fw); if (ret) @@ -534,12 +525,6 @@ static int sx1301_load_all_firmware(struct sx1301_priv *priv) return ret; } - if (fw->size != 8192) { - dev_err(priv->dev, "unexpected agc firmware size\n"); - release_firmware(fw); - return -EINVAL; - } - ret = sx1301_load_firmware(priv, 1, fw); release_firmware(fw); if (ret)