mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Alex Elder <elder@linaro.org>
To: davem@davemloft.net, kuba@kernel.org
Cc: evgreen@chromium.org, subashab@codeaurora.org,
	cpratapa@codeaurora.org, bjorn.andersson@linaro.org,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH net-next 09/10] net: ipa: rename a phandle variable
Date: Mon, 28 Sep 2020 18:04:45 -0500	[thread overview]
Message-ID: <20200928230446.20561-10-elder@linaro.org> (raw)
In-Reply-To: <20200928230446.20561-1-elder@linaro.org>

When "W=2" is supplied to the build command, we get a warning about
shadowing a global declaration (of a typedef) for a variable defined
in ipa_probe().  Rename the variable to get rid of the warning.

Signed-off-by: Alex Elder <elder@linaro.org>
---
 drivers/net/ipa/ipa_main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ipa/ipa_main.c b/drivers/net/ipa/ipa_main.c
index 1044758b501d2..cd4d993b0bbb2 100644
--- a/drivers/net/ipa/ipa_main.c
+++ b/drivers/net/ipa/ipa_main.c
@@ -723,8 +723,8 @@ static int ipa_probe(struct platform_device *pdev)
 	bool modem_alloc;
 	bool modem_init;
 	struct ipa *ipa;
-	phandle phandle;
 	bool prefetch;
+	phandle ph;
 	int ret;
 
 	ipa_validate_build();
@@ -736,13 +736,13 @@ static int ipa_probe(struct platform_device *pdev)
 			return -EPROBE_DEFER;
 
 	/* We rely on remoteproc to tell us about modem state changes */
-	phandle = of_property_read_phandle(dev->of_node, "modem-remoteproc");
-	if (!phandle) {
+	ph = of_property_read_phandle(dev->of_node, "modem-remoteproc");
+	if (!ph) {
 		dev_err(dev, "DT missing \"modem-remoteproc\" property\n");
 		return -EINVAL;
 	}
 
-	rproc = rproc_get_by_phandle(phandle);
+	rproc = rproc_get_by_phandle(ph);
 	if (!rproc)
 		return -EPROBE_DEFER;
 
-- 
2.20.1


  parent reply	other threads:[~2020-09-28 23:14 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-28 23:04 [PATCH net-next 00/10] net: ipa: miscellaneous cleanups Alex Elder
2020-09-28 23:04 ` [PATCH net-next 01/10] net: ipa: kill definition of TRE_FLAGS_IEOB_FMASK Alex Elder
2020-09-28 23:04 ` [PATCH net-next 02/10] net: ipa: kill unused status opcodes Alex Elder
2020-09-28 23:04 ` [PATCH net-next 03/10] net: ipa: kill unused status exceptions Alex Elder
2020-09-28 23:04 ` [PATCH net-next 04/10] net: ipa: remove unused status structure field masks Alex Elder
2020-09-28 23:04 ` [PATCH net-next 05/10] net: ipa: share field mask values for GSI interrupt type Alex Elder
2020-09-28 23:04 ` [PATCH net-next 06/10] net: ipa: share field mask values for GSI global interrupt Alex Elder
2020-09-28 23:04 ` [PATCH net-next 07/10] net: ipa: share field mask values for GSI general interrupt Alex Elder
2020-09-28 23:04 ` [PATCH net-next 08/10] net: ipa: fix two mild warnings Alex Elder
2020-09-28 23:04 ` Alex Elder [this message]
2020-09-28 23:04 ` [PATCH net-next 10/10] net: ipa: fix two comments Alex Elder
2020-09-29  1:35 ` [PATCH net-next 00/10] net: ipa: miscellaneous cleanups David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200928230446.20561-10-elder@linaro.org \
    --to=elder@linaro.org \
    --cc=bjorn.andersson@linaro.org \
    --cc=cpratapa@codeaurora.org \
    --cc=davem@davemloft.net \
    --cc=evgreen@chromium.org \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=subashab@codeaurora.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®