Commit c9d92cf2 authored by Alex Elder's avatar Alex Elder Committed by David S. Miller

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: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c15f950d
...@@ -1179,15 +1179,15 @@ static void gsi_isr_gp_int1(struct gsi *gsi) ...@@ -1179,15 +1179,15 @@ static void gsi_isr_gp_int1(struct gsi *gsi)
* Similarly, we could get an error back when updating flow control * Similarly, we could get an error back when updating flow control
* on a channel because it's not in the proper state. * on a channel because it's not in the proper state.
* *
* In either case, we silently ignore a CHANNEL_NOT_RUNNING error * In either case, we silently ignore a INCORRECT_CHANNEL_STATE
* if we receive it. * error if we receive it.
*/ */
val = ioread32(gsi->virt + GSI_CNTXT_SCRATCH_0_OFFSET); val = ioread32(gsi->virt + GSI_CNTXT_SCRATCH_0_OFFSET);
result = u32_get_bits(val, GENERIC_EE_RESULT_FMASK); result = u32_get_bits(val, GENERIC_EE_RESULT_FMASK);
switch (result) { switch (result) {
case GENERIC_EE_SUCCESS: case GENERIC_EE_SUCCESS:
case GENERIC_EE_CHANNEL_NOT_RUNNING: case GENERIC_EE_INCORRECT_CHANNEL_STATE:
gsi->result = 0; gsi->result = 0;
break; break;
......
...@@ -515,7 +515,7 @@ enum gsi_err_type { ...@@ -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_RESULT field values in SCRATCH_0 */
enum gsi_generic_ee_result { enum gsi_generic_ee_result {
GENERIC_EE_SUCCESS = 0x1, GENERIC_EE_SUCCESS = 0x1,
GENERIC_EE_CHANNEL_NOT_RUNNING = 0x2, GENERIC_EE_INCORRECT_CHANNEL_STATE = 0x2,
GENERIC_EE_INCORRECT_DIRECTION = 0x3, GENERIC_EE_INCORRECT_DIRECTION = 0x3,
GENERIC_EE_INCORRECT_CHANNEL_TYPE = 0x4, GENERIC_EE_INCORRECT_CHANNEL_TYPE = 0x4,
GENERIC_EE_INCORRECT_CHANNEL = 0x5, GENERIC_EE_INCORRECT_CHANNEL = 0x5,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment