From patchwork Fri Mar 12 00:33:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 398478 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp765146jai; Thu, 11 Mar 2021 16:33:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJwdysmkFSQNB+J6TdFP7/zyFJbyiKiPkTJXPU0vaTPzctoWxgAbWz7PGr3fLtKkn95B/tm5 X-Received: by 2002:a17:906:58d6:: with SMTP id e22mr5647566ejs.112.1615509190988; Thu, 11 Mar 2021 16:33:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615509190; cv=none; d=google.com; s=arc-20160816; b=Bs42qkCYF1u1uIsShUjO0oBD1S4616CKIcXz87MxgvwSFvLxDpSxZpGJ37d/N8uerH 91vFTrCPjp5w2G4DuAg/4HBpFn4xjY5GPMgZuPyXs1Ojl85dPV203oUy/JaU1CQbd36R nGgsCTBZVqAYTiWjFRA47X4E8RC++vyZxuMGtGudG6FwohnV93iuR7PhsE+ruffiMCGO jjsUEqBVlCNx5LoRq0qBu93KphQ5vTX4eD1dsz9pE5QIpAxP//WoJRBWfUPST8sO5hCD Tmxx1eJ09q9XAQ+48MoP6LN2H3BPGxBuhtC+RBkI/dJRLPgmfnAN4fk3ihv3HGPob1Fg 6kww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6yerQKfDnfz7buskmtSzYD6MzcxxmHz36LYzDDWncI4=; b=hk01iGlGvjttsFXbbRtaBj4jaKidKjrDrmMJPTfbdR0RfkiY856oAkB4t6XyiDJwJd dkWaWAQ5WGH3fiGwKVg3gDdvZg8aOEz/yPuorpU9Q7btwUbXIyLx+Q+yqiBRN7BXtH7a mt1MjS2qets2ptUqyJjqti2W1Ho+fCenqH0CWzGMbeA/c294CplOK8mpQ0WJd1F9LfOJ HgJAajmFcL0mK8yhnmD02mx8kwMLzuBoGNxFnXpT6uSKIG9wk1GRqCsUvsdb2NtS20+b x4oN+erp72F635qzzvnnveD4KtNMXs/+f5P5u83AnzMnhEgHbeBp3P9kjnbZ3/+6pPd2 T9Aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=j4+FEri2; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r21si2991882edy.321.2021.03.11.16.33.10; Thu, 11 Mar 2021 16:33:10 -0800 (PST) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=j4+FEri2; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230341AbhCLAcg (ORCPT + 6 others); Thu, 11 Mar 2021 19:32:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231360AbhCLAcS (ORCPT ); Thu, 11 Mar 2021 19:32:18 -0500 Received: from mail-ot1-x334.google.com (mail-ot1-x334.google.com [IPv6:2607:f8b0:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B763C061762 for ; Thu, 11 Mar 2021 16:32:18 -0800 (PST) Received: by mail-ot1-x334.google.com with SMTP id e45so2727723ote.9 for ; Thu, 11 Mar 2021 16:32:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6yerQKfDnfz7buskmtSzYD6MzcxxmHz36LYzDDWncI4=; b=j4+FEri2ovICTXT2ZO3+c/mLbrKpu5cWHdhqiPqMR0arRsjb8+lFV/4MQOFSL5/bOx CrFy6v67inEGWaL51OH4w4L/9APFRcf/DaO9y7VMbTW5BjWfq3xr27OFA+Y/RuhBj+Vj /QNKDkwP08lPGDIhDndxgwWEtpFdfFFOK7pDL5vILBuVqqdz+2n3hRNHUV6v9Fm2r71B rcAbzQG6UJNvX/NhS+bzREx5gMy2lBu7xjWX6dv2bGVDb6B6ZvevK3wDTW50EjHmWefq gw7+1ua4dhyLZzjjGu9DZkK0QxfWgUcUq8jaucpIvMpJrFt849ju/FB1D8KWwzYLT69+ FeZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6yerQKfDnfz7buskmtSzYD6MzcxxmHz36LYzDDWncI4=; b=lO+17onzKkRiF+JP3IuIciRG7Yjewb1AXHRMu4h9eL7HEJsphvkcWkJKRBRXpdJBuh C4al9ypNGaUQMlG3bDSBWEvELhfnc27tCL81/FkChoxJ6hJcy55PtgIOdWXzk9b6BYMs iC0eSI9CMe6xyAVT/T6o4Ce+OAJHknupDUFr1EFWpWjw5uqpI+boEIbHf4VMz1kZD1RR K71PvtDIZaxtndOUBemTtSY07CwMOzEFTbaMZvZSB1nNtLakbUNPs/f/T5v7jtwyXtyf +ynfW9SxQTf6GVNlDCToeVM2PWJPTNcYulVq0uRX3PcLw7Bre5DZ+yD8E1UzY06PEdaU TH7w== X-Gm-Message-State: AOAM530S0Iv15OFUYJ4/MidTFrmXauyIyazkKEaNf9y0466OLAQZFTKq b65nFXA4qq3RswkAt+c2253jTQ== X-Received: by 2002:a05:6830:1d69:: with SMTP id l9mr1227667oti.369.1615509137518; Thu, 11 Mar 2021 16:32:17 -0800 (PST) Received: from localhost.localdomain (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id l190sm670835oig.39.2021.03.11.16.32.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 16:32:17 -0800 (PST) From: Bjorn Andersson To: Andy Gross , Bjorn Andersson , Rob Herring , Bryan O'Donoghue Cc: Kalle Valo , "David S. Miller" , Jakub Kicinski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 3/5] soc: qcom: wcnss_ctrl: Introduce local variable "dev" Date: Thu, 11 Mar 2021 16:33:16 -0800 Message-Id: <20210312003318.3273536-4-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210312003318.3273536-1-bjorn.andersson@linaro.org> References: <20210312003318.3273536-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Introduce a local variable to carry the struct device *, to reduce the line lengths in the next patch. Signed-off-by: Bjorn Andersson --- drivers/soc/qcom/wcnss_ctrl.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 2.29.2 diff --git a/drivers/soc/qcom/wcnss_ctrl.c b/drivers/soc/qcom/wcnss_ctrl.c index 32bed249f90e..358526b9de06 100644 --- a/drivers/soc/qcom/wcnss_ctrl.c +++ b/drivers/soc/qcom/wcnss_ctrl.c @@ -199,6 +199,7 @@ static int wcnss_download_nv(struct wcnss_ctrl *wcnss, bool *expect_cbc) { struct wcnss_download_nv_req *req; const struct firmware *fw; + struct device *dev = wcnss->dev; const void *data; ssize_t left; int ret; @@ -207,9 +208,9 @@ static int wcnss_download_nv(struct wcnss_ctrl *wcnss, bool *expect_cbc) if (!req) return -ENOMEM; - ret = request_firmware(&fw, NVBIN_FILE, wcnss->dev); + ret = request_firmware(&fw, NVBIN_FILE, dev); if (ret < 0) { - dev_err(wcnss->dev, "Failed to load nv file %s: %d\n", + dev_err(dev, "Failed to load nv file %s: %d\n", NVBIN_FILE, ret); goto free_req; } @@ -235,7 +236,7 @@ static int wcnss_download_nv(struct wcnss_ctrl *wcnss, bool *expect_cbc) ret = rpmsg_send(wcnss->channel, req, req->hdr.len); if (ret < 0) { - dev_err(wcnss->dev, "failed to send smd packet\n"); + dev_err(dev, "failed to send smd packet\n"); goto release_fw; } @@ -248,7 +249,7 @@ static int wcnss_download_nv(struct wcnss_ctrl *wcnss, bool *expect_cbc) ret = wait_for_completion_timeout(&wcnss->ack, WCNSS_REQUEST_TIMEOUT); if (!ret) { - dev_err(wcnss->dev, "timeout waiting for nv upload ack\n"); + dev_err(dev, "timeout waiting for nv upload ack\n"); ret = -ETIMEDOUT; } else { *expect_cbc = wcnss->ack_status == WCNSS_ACK_COLD_BOOTING;