net: ipa: rename a phandle variable

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>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ipa/ipa_main.c b/drivers/net/ipa/ipa_main.c
index 1044758..cd4d993 100644 (file)
--- 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;