From mboxrd@z Thu Jan 1 00:00:00 1970 From: 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> References: <1533818018-29005-1-git-send-email-ben.whitten@lairdtech.com> Cc: starnight@g.ncu.edu.tw, hasnain.virk@arm.com, netdev@vger.kernel.org, liuxuenetmail@gmail.com, shess@hessware.de, Ben Whitten To: afaerber@suse.de Return-path: 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) In-Reply-To: <1533818018-29005-1-git-send-email-ben.whitten@lairdtech.com> Sender: netdev-owner@vger.kernel.org List-ID: 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) -- 2.7.4