[PATCH net-next 4/5] net: ipa: kill ipa_endpoint_stop()

[Alex Elder]

The previous commit made ipa_endpoint_stop() be a trivial wrapper
around gsi_channel_stop().  Since it no longer does anything
special, just open-code it in the three places it's used.

Signed-off-by: Alex Elder <el...@linaro.org>
---
 drivers/net/ipa/ipa_endpoint.c | 27 ++++++---------------------
 drivers/net/ipa/ipa_endpoint.h |  2 --
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/drivers/net/ipa/ipa_endpoint.c b/drivers/net/ipa/ipa_endpoint.c
index 4939fdd3fca0..e451c3b20ca3 100644
--- a/drivers/net/ipa/ipa_endpoint.c
+++ b/drivers/net/ipa/ipa_endpoint.c
@@ -1186,7 +1186,7 @@ static int ipa_endpoint_reset_rx_aggr(struct ipa_endpoint 
*endpoint)
 
        gsi_trans_read_byte_done(gsi, endpoint->channel_id);
 
-       ret = ipa_endpoint_stop(endpoint);
+       ret = gsi_channel_stop(gsi, endpoint->channel_id);
        if (ret)
                goto out_suspend_again;
 
@@ -1203,7 +1203,7 @@ static int ipa_endpoint_reset_rx_aggr(struct ipa_endpoint 
*endpoint)
        goto out_suspend_again;
 
 err_endpoint_stop:
-       ipa_endpoint_stop(endpoint);
+       (void)gsi_channel_stop(gsi, endpoint->channel_id);
 out_suspend_again:
        if (endpoint_suspended)
                (void)ipa_endpoint_init_ctrl(endpoint, true);
@@ -1241,22 +1241,6 @@ static void ipa_endpoint_reset(struct ipa_endpoint 
*endpoint)
                        ret, endpoint->channel_id, endpoint->endpoint_id);
 }
 
-/**
- * ipa_endpoint_stop() - Stops a GSI channel in IPA
- * @client:    Client whose endpoint should be stopped
- *
- * This function implements the sequence to stop a GSI channel
- * in IPA. This function returns when the channel is is STOP state.
- *
- * Return value: 0 on success, negative otherwise
- */
-int ipa_endpoint_stop(struct ipa_endpoint *endpoint)
-{
-       struct gsi *gsi = &endpoint->ipa->gsi;
-
-       return gsi_channel_stop(gsi, endpoint->channel_id);
-}
-
 static void ipa_endpoint_program(struct ipa_endpoint *endpoint)
 {
        struct device *dev = &endpoint->ipa->pdev->dev;
@@ -1324,12 +1308,13 @@ void ipa_endpoint_disable_one(struct ipa_endpoint 
*endpoint)
 {
        u32 mask = BIT(endpoint->endpoint_id);
        struct ipa *ipa = endpoint->ipa;
+       struct gsi *gsi = &ipa->gsi;
        int ret;
 
-       if (!(endpoint->ipa->enabled & mask))
+       if (!(ipa->enabled & mask))
                return;
 
-       endpoint->ipa->enabled ^= mask;
+       ipa->enabled ^= mask;
 
        if (!endpoint->toward_ipa) {
                ipa_endpoint_replenish_disable(endpoint);
@@ -1338,7 +1323,7 @@ void ipa_endpoint_disable_one(struct ipa_endpoint 
*endpoint)
        }
 
        /* Note that if stop fails, the channel's state is not well-defined */
-       ret = ipa_endpoint_stop(endpoint);
+       ret = gsi_channel_stop(gsi, endpoint->channel_id);
        if (ret)
                dev_err(&ipa->pdev->dev,
                        "error %d attempting to stop endpoint %u\n", ret,
diff --git a/drivers/net/ipa/ipa_endpoint.h b/drivers/net/ipa/ipa_endpoint.h
index 4b336a1f759d..3b297d65828e 100644
--- a/drivers/net/ipa/ipa_endpoint.h
+++ b/drivers/net/ipa/ipa_endpoint.h
@@ -76,8 +76,6 @@ int ipa_endpoint_modem_exception_reset_all(struct ipa *ipa);
 
 int ipa_endpoint_skb_tx(struct ipa_endpoint *endpoint, struct sk_buff *skb);
 
-int ipa_endpoint_stop(struct ipa_endpoint *endpoint);
-
 void ipa_endpoint_exit_one(struct ipa_endpoint *endpoint);
 
 int ipa_endpoint_enable_one(struct ipa_endpoint *endpoint);
-- 
2.20.1