net: ipa: fix two mild warnings

Fix two spots where a variable "channel_id" is unnecessarily
redefined inside loops in "gsi.c".  This is warned about if
"W=2" is added to the build command.

Note that this problem is harmless, so there's no need to backport
it as a bugfix.

Remove a comment in gsi_init() about waking the system; the GSI
interrupt does not wake the system any more.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c
index cb676083dfa7344b9ecc17a505631499d770c0fc..6bfac1efe037cac26b54337f9017fc1ee075de77 100644 (file)
--- a/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@ -1600,7 +1600,7 @@ err_unwind_modem:
        /* Compute which modem channels need to be deallocated */
        mask ^= gsi->modem_channel_bitmap;
        while (mask) {
-               u32 channel_id = __fls(mask);
+               channel_id = __fls(mask);
 
                mask ^= BIT(channel_id);
 
@@ -1628,7 +1628,7 @@ static void gsi_channel_teardown(struct gsi *gsi)
        mutex_lock(&gsi->mutex);
 
        while (mask) {
-               u32 channel_id = __fls(mask);
+               channel_id = __fls(mask);
 
                mask ^= BIT(channel_id);
 
@@ -1972,7 +1972,6 @@ int gsi_init(struct gsi *gsi, struct platform_device *pdev, bool prefetch,
         */
        init_dummy_netdev(&gsi->dummy_dev);
 
-       /* Get the GSI IRQ and request for it to wake the system */
        ret = platform_get_irq_byname(pdev, "gsi");
        if (ret <= 0) {
                dev_err(dev, "DT error %d getting \"gsi\" IRQ property\n", ret);