net: ipa: rename a GSI error code

The CHANNEL_NOT_RUNNING error condition has been generalized, so
rename it to be INCORRECT_CHANNEL_STATE.

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 1512a569900f0eee2b2bfcffda08677c14e85a8c..9cfe84319ee4d3935212c82d64229c9672e3082d 100644 (file)
--- a/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@ -1179,15 +1179,15 @@ static void gsi_isr_gp_int1(struct gsi *gsi)
         * Similarly, we could get an error back when updating flow control
         * on a channel because it's not in the proper state.
         *
-        * In either case, we silently ignore a CHANNEL_NOT_RUNNING error
-        * if we receive it.
+        * In either case, we silently ignore a INCORRECT_CHANNEL_STATE
+        * error if we receive it.
         */
        val = ioread32(gsi->virt + GSI_CNTXT_SCRATCH_0_OFFSET);
        result = u32_get_bits(val, GENERIC_EE_RESULT_FMASK);
 
        switch (result) {
        case GENERIC_EE_SUCCESS:
-       case GENERIC_EE_CHANNEL_NOT_RUNNING:
+       case GENERIC_EE_INCORRECT_CHANNEL_STATE:
                gsi->result = 0;
                break;
 

diff --git a/drivers/net/ipa/gsi_reg.h b/drivers/net/ipa/gsi_reg.h
index 8906f4381032e27dfb49386ed7e7b806334e1742..5bd8b31656d30efa419fa640a9be061ed08e5c55 100644 (file)
--- a/drivers/net/ipa/gsi_reg.h
+++ b/drivers/net/ipa/gsi_reg.h
@@ -515,7 +515,7 @@ enum gsi_err_type {
 /** enum gsi_generic_ee_result - GENERIC_EE_RESULT field values in SCRATCH_0 */
 enum gsi_generic_ee_result {
        GENERIC_EE_SUCCESS                      = 0x1,
-       GENERIC_EE_CHANNEL_NOT_RUNNING          = 0x2,
+       GENERIC_EE_INCORRECT_CHANNEL_STATE      = 0x2,
        GENERIC_EE_INCORRECT_DIRECTION          = 0x3,
        GENERIC_EE_INCORRECT_CHANNEL_TYPE       = 0x4,
        GENERIC_EE_INCORRECT_CHANNEL            = 0x5,