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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,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 0AA5DC4332F for ; Tue, 7 Sep 2021 12:18:42 +0000 (UTC) Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D368E61100 for ; Tue, 7 Sep 2021 12:18:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D368E61100 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.01.org Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 6EFF2100EB329; Tue, 7 Sep 2021 05:18:36 -0700 (PDT) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=185.125.188.122; helo=smtp-relay-internal-0.canonical.com; envelope-from=krzysztof.kozlowski@canonical.com; receiver= Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 44BDA100EB829 for ; Tue, 7 Sep 2021 05:18:34 -0700 (PDT) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 4203F40798 for ; Tue, 7 Sep 2021 12:18:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631017113; bh=JDWMUU6nWDzDRnCxtysvffFNd9O3HT0+eb4C8TwA21k=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=THvlgJJVPUdS2G4htPrdV0Btl9JrJh9fDSBov0j9gWIRmyu4+OsgSd/dK3DUp2jn2 CLSvm5lBdBBU5P+2DqGMF6n0lS+pzfN7PbB32lKw8/EA0H8xzA9u0fe4kzT+Ud7RgM P9emRigwDxIeS6iMe0iLXGCnlveUChycCN2fO0RIK3Qte8zWeWVgJBY9Bu3ngYgvpL AwPSDFRMp1SW6ReSSJDpUs1+tJk7Yq6jSXZ8dP3uEZXP4AyL8PO7RY0HDOJudrbnoz HUowv9VvGCY8ZP/SIAtUsYf9EVgT5FCGNFSQKL/xVsKVPw90DlkY1W2kPFlBtpF6la W82n2xBhM8pZQ== Received: by mail-wm1-f71.google.com with SMTP id o20-20020a05600c379400b002e755735eedso1053042wmr.0 for ; Tue, 07 Sep 2021 05:18:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JDWMUU6nWDzDRnCxtysvffFNd9O3HT0+eb4C8TwA21k=; b=RdDuHrDLaPBY0a1FvjfWAu3mnvq6qGhe5abs6NUI3Xdzn8VDuorsOIC39006+f20Wl EtrvtTeVaYICL/B9o82YjLFMxda/28YlnxlDf0XaWLnalRmDMJw+/ZRcQTJRmPWI3kHS 3lpRTJh6lLAWB39Rqoh7xHrfqkYaDp2b7rDhtEZVm0QUKT0dc6GwSyIR9R5cNe5tVUyN bAMBWDmUpWepjyz+yBOooMiampbdj7MeBhD75jPf8WIIgSNYboqt2hUbZkmbNNpFA4nP dbQwRTjp5sWGKhlcGqvByNemzGHNhhbRHPeX8SQa7uIoCWUZdssfynAyIR3rBnrX47y3 EUKA== X-Gm-Message-State: AOAM5305+RrTIK00uXr2g6Cra4YB2koC53R7App+xyDON15sXpYqj0Hk z5hcAimCHa/RuDTFXnoPAsczhTi7awyzJEQEIfS1PUMOas0yWNBoojvbDc6D/zVwq0SxwjBvtaN mI4IoPpPigghgjrvaih2IT+6yLgzXDOwb0g== X-Received: by 2002:a05:600c:298:: with SMTP id 24mr3625646wmk.172.1631017112940; Tue, 07 Sep 2021 05:18:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIRJRBnXqqRi/FyU10IMJdS2aVEiOt1XxAF7EDlHa+Uo5rJJxXcKVpKNVHaNkiAm/uo8/TUg== X-Received: by 2002:a05:600c:298:: with SMTP id 24mr3625633wmk.172.1631017112788; Tue, 07 Sep 2021 05:18:32 -0700 (PDT) Received: from kozik-lap.lan ([79.98.113.47]) by smtp.gmail.com with ESMTPSA id m3sm13525216wrg.45.2021.09.07.05.18.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Sep 2021 05:18:32 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Krzysztof Opasiak , Mark Greer , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org Date: Tue, 7 Sep 2021 14:18:10 +0200 Message-Id: <20210907121816.37750-10-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> References: <20210907121816.37750-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Message-ID-Hash: Z66BBX4BSGJLKT2JCVZ5G5P2K62F2E3P X-Message-ID-Hash: Z66BBX4BSGJLKT2JCVZ5G5P2K62F2E3P X-MailFrom: krzysztof.kozlowski@canonical.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.1.1 Precedence: list Subject: [linux-nfc] [PATCH 09/15] nfc: s3fwrn5: simplify dereferencing pointer to struct device List-Id: NFC on Linux Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Simplify the code dereferencing several pointers to reach the struct device. Signed-off-by: Krzysztof Kozlowski --- drivers/nfc/s3fwrn5/firmware.c | 29 +++++++++++------------------ drivers/nfc/s3fwrn5/nci.c | 18 +++++++----------- 2 files changed, 18 insertions(+), 29 deletions(-) diff --git a/drivers/nfc/s3fwrn5/firmware.c b/drivers/nfc/s3fwrn5/firmware.c index 1af7a1e632cf..c20fdbac51c5 100644 --- a/drivers/nfc/s3fwrn5/firmware.c +++ b/drivers/nfc/s3fwrn5/firmware.c @@ -357,6 +357,7 @@ s3fwrn5_fw_is_custom(const struct s3fwrn5_fw_cmd_get_bootinfo_rsp *bootinfo) int s3fwrn5_fw_setup(struct s3fwrn5_fw_info *fw_info) { + struct device *dev = &fw_info->ndev->nfc_dev->dev; struct s3fwrn5_fw_cmd_get_bootinfo_rsp bootinfo; int ret; @@ -364,8 +365,7 @@ int s3fwrn5_fw_setup(struct s3fwrn5_fw_info *fw_info) ret = s3fwrn5_fw_get_bootinfo(fw_info, &bootinfo); if (ret < 0) { - dev_err(&fw_info->ndev->nfc_dev->dev, - "Failed to get bootinfo, ret=%02x\n", ret); + dev_err(dev, "Failed to get bootinfo, ret=%02x\n", ret); goto err; } @@ -373,8 +373,7 @@ int s3fwrn5_fw_setup(struct s3fwrn5_fw_info *fw_info) ret = s3fwrn5_fw_get_base_addr(&bootinfo, &fw_info->base_addr); if (ret < 0) { - dev_err(&fw_info->ndev->nfc_dev->dev, - "Unknown hardware version\n"); + dev_err(dev, "Unknown hardware version\n"); goto err; } @@ -409,6 +408,7 @@ bool s3fwrn5_fw_check_version(const struct s3fwrn5_fw_info *fw_info, u32 version int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info) { + struct device *dev = &fw_info->ndev->nfc_dev->dev; struct s3fwrn5_fw_image *fw = &fw_info->fw; u8 hash_data[SHA1_DIGEST_SIZE]; struct crypto_shash *tfm; @@ -421,8 +421,7 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info) tfm = crypto_alloc_shash("sha1", 0, 0); if (IS_ERR(tfm)) { - dev_err(&fw_info->ndev->nfc_dev->dev, - "Cannot allocate shash (code=%pe)\n", tfm); + dev_err(dev, "Cannot allocate shash (code=%pe)\n", tfm); return PTR_ERR(tfm); } @@ -430,21 +429,18 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info) crypto_free_shash(tfm); if (ret) { - dev_err(&fw_info->ndev->nfc_dev->dev, - "Cannot compute hash (code=%d)\n", ret); + dev_err(dev, "Cannot compute hash (code=%d)\n", ret); return ret; } /* Firmware update process */ - dev_info(&fw_info->ndev->nfc_dev->dev, - "Firmware update: %s\n", fw_info->fw_name); + dev_info(dev, "Firmware update: %s\n", fw_info->fw_name); ret = s3fwrn5_fw_enter_update_mode(fw_info, hash_data, SHA1_DIGEST_SIZE, fw_info->sig, fw_info->sig_size); if (ret < 0) { - dev_err(&fw_info->ndev->nfc_dev->dev, - "Unable to enter update mode\n"); + dev_err(dev, "Unable to enter update mode\n"); return ret; } @@ -452,21 +448,18 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info) ret = s3fwrn5_fw_update_sector(fw_info, fw_info->base_addr + off, fw->image + off); if (ret < 0) { - dev_err(&fw_info->ndev->nfc_dev->dev, - "Firmware update error (code=%d)\n", ret); + dev_err(dev, "Firmware update error (code=%d)\n", ret); return ret; } } ret = s3fwrn5_fw_complete_update_mode(fw_info); if (ret < 0) { - dev_err(&fw_info->ndev->nfc_dev->dev, - "Unable to complete update mode\n"); + dev_err(dev, "Unable to complete update mode\n"); return ret; } - dev_info(&fw_info->ndev->nfc_dev->dev, - "Firmware update: success\n"); + dev_info(dev, "Firmware update: success\n"); return ret; } diff --git a/drivers/nfc/s3fwrn5/nci.c b/drivers/nfc/s3fwrn5/nci.c index e374e670b36b..ca6828f55ba0 100644 --- a/drivers/nfc/s3fwrn5/nci.c +++ b/drivers/nfc/s3fwrn5/nci.c @@ -47,6 +47,7 @@ const struct nci_driver_ops s3fwrn5_nci_prop_ops[4] = { int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name) { + struct device *dev = &info->ndev->nfc_dev->dev; const struct firmware *fw; struct nci_prop_fw_cfg_cmd fw_cfg; struct nci_prop_set_rfreg_cmd set_rfreg; @@ -55,7 +56,7 @@ int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name) int i, len; int ret; - ret = request_firmware(&fw, fw_name, &info->ndev->nfc_dev->dev); + ret = request_firmware(&fw, fw_name, dev); if (ret < 0) return ret; @@ -77,13 +78,11 @@ int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name) /* Start rfreg configuration */ - dev_info(&info->ndev->nfc_dev->dev, - "rfreg configuration update: %s\n", fw_name); + dev_info(dev, "rfreg configuration update: %s\n", fw_name); ret = nci_prop_cmd(info->ndev, NCI_PROP_START_RFREG, 0, NULL); if (ret < 0) { - dev_err(&info->ndev->nfc_dev->dev, - "Unable to start rfreg update\n"); + dev_err(dev, "Unable to start rfreg update\n"); goto out; } @@ -97,8 +96,7 @@ int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name) ret = nci_prop_cmd(info->ndev, NCI_PROP_SET_RFREG, len+1, (__u8 *)&set_rfreg); if (ret < 0) { - dev_err(&info->ndev->nfc_dev->dev, - "rfreg update error (code=%d)\n", ret); + dev_err(dev, "rfreg update error (code=%d)\n", ret); goto out; } set_rfreg.index++; @@ -110,13 +108,11 @@ int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name) ret = nci_prop_cmd(info->ndev, NCI_PROP_STOP_RFREG, sizeof(stop_rfreg), (__u8 *)&stop_rfreg); if (ret < 0) { - dev_err(&info->ndev->nfc_dev->dev, - "Unable to stop rfreg update\n"); + dev_err(dev, "Unable to stop rfreg update\n"); goto out; } - dev_info(&info->ndev->nfc_dev->dev, - "rfreg configuration update: success\n"); + dev_info(dev, "rfreg configuration update: success\n"); out: release_firmware(fw); return ret; -- 2.30.2 _______________________________________________ Linux-nfc mailing list -- linux-nfc@lists.01.org To unsubscribe send an email to linux-nfc-leave@lists.01.org %(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s