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

net: ipa: pass channel pointer to gsi_channel_state()

Pass a channel pointer rather than a GSI pointer and channel ID to
gsi_channel_state().
Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b7052ba7
...@@ -416,12 +416,13 @@ static void gsi_evt_ring_de_alloc_command(struct gsi *gsi, u32 evt_ring_id) ...@@ -416,12 +416,13 @@ static void gsi_evt_ring_de_alloc_command(struct gsi *gsi, u32 evt_ring_id)
} }
/* Return the hardware's notion of the current state of a channel */ /* Return the hardware's notion of the current state of a channel */
static enum gsi_channel_state static enum gsi_channel_state gsi_channel_state(struct gsi_channel *channel)
gsi_channel_state(struct gsi *gsi, u32 channel_id)
{ {
u32 channel_id = gsi_channel_id(channel);
void *virt = channel->gsi->virt;
u32 val; u32 val;
val = ioread32(gsi->virt + GSI_CH_C_CNTXT_0_OFFSET(channel_id)); val = ioread32(virt + GSI_CH_C_CNTXT_0_OFFSET(channel_id));
return u32_get_bits(val, CHSTATE_FMASK); return u32_get_bits(val, CHSTATE_FMASK);
} }
...@@ -453,7 +454,7 @@ static int gsi_channel_alloc_command(struct gsi *gsi, u32 channel_id) ...@@ -453,7 +454,7 @@ static int gsi_channel_alloc_command(struct gsi *gsi, u32 channel_id)
int ret; int ret;
/* Get initial channel state */ /* Get initial channel state */
channel->state = gsi_channel_state(gsi, channel_id); channel->state = gsi_channel_state(channel);
if (channel->state != GSI_CHANNEL_STATE_NOT_ALLOCATED) if (channel->state != GSI_CHANNEL_STATE_NOT_ALLOCATED)
return -EINVAL; return -EINVAL;
...@@ -940,7 +941,7 @@ static void gsi_isr_chan_ctrl(struct gsi *gsi) ...@@ -940,7 +941,7 @@ static void gsi_isr_chan_ctrl(struct gsi *gsi)
channel_mask ^= BIT(channel_id); channel_mask ^= BIT(channel_id);
channel = &gsi->channel[channel_id]; channel = &gsi->channel[channel_id];
channel->state = gsi_channel_state(gsi, channel_id); channel->state = gsi_channel_state(channel);
complete(&channel->completion); complete(&channel->completion);
} }
......
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