net: ipa: kill ipa_modem_init()

A recent commit made disabling the SMP2P "setup ready" interrupt
unrelated to ipa_modem_stop().  Given that, it seems fitting to get
rid of ipa_modem_init() and ipa_modem_exit() (which are trivial
wrapper functions), and call ipa_smp2p_init() and ipa_smp2p_exit()
directly instead.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ipa/ipa_main.c b/drivers/net/ipa/ipa_main.c
index cdfa98a76e1f4a66a030c7fbdbfd9a29606d6eb7..6960efbe66ddbd546ce691e52e04fc9b5dc047a8 100644 (file)
--- a/drivers/net/ipa/ipa_main.c
+++ b/drivers/net/ipa/ipa_main.c
@@ -29,6 +29,7 @@
 #include "ipa_mem.h"
 #include "ipa_table.h"
 #include "ipa_modem.h"
+#include "ipa_smp2p.h"
 #include "ipa_uc.h"
 #include "ipa_interrupt.h"
 #include "gsi_trans.h"
@@ -733,7 +734,7 @@ static int ipa_probe(struct platform_device *pdev)
        if (ret)
                goto err_endpoint_exit;
 
-       ret = ipa_modem_init(ipa, modem_init);
+       ret = ipa_smp2p_init(ipa, modem_init);
        if (ret)
                goto err_table_exit;
 
@@ -775,7 +776,7 @@ err_deconfig:
        ipa_deconfig(ipa);
 err_power_put:
        pm_runtime_put_noidle(dev);
-       ipa_modem_exit(ipa);
+       ipa_smp2p_exit(ipa);
 err_table_exit:
        ipa_table_exit(ipa);
 err_endpoint_exit:
@@ -821,7 +822,7 @@ static int ipa_remove(struct platform_device *pdev)
        ipa_deconfig(ipa);
 out_power_put:
        pm_runtime_put_noidle(dev);
-       ipa_modem_exit(ipa);
+       ipa_smp2p_exit(ipa);
        ipa_table_exit(ipa);
        ipa_endpoint_exit(ipa);
        gsi_exit(&ipa->gsi);

diff --git a/drivers/net/ipa/ipa_modem.c b/drivers/net/ipa/ipa_modem.c
index ad116bcc0580e859ac790ee93e4f36f88ace02a2..33ac626bd803eb8eabb9fea817b8433fc925820b 100644 (file)
--- a/drivers/net/ipa/ipa_modem.c
+++ b/drivers/net/ipa/ipa_modem.c
@@ -442,16 +442,6 @@ static int ipa_modem_notify(struct notifier_block *nb, unsigned long action,
        return NOTIFY_OK;
 }
 
-int ipa_modem_init(struct ipa *ipa, bool modem_init)
-{
-       return ipa_smp2p_init(ipa, modem_init);
-}
-
-void ipa_modem_exit(struct ipa *ipa)
-{
-       ipa_smp2p_exit(ipa);
-}
-
 int ipa_modem_config(struct ipa *ipa)
 {
        void *notifier;

diff --git a/drivers/net/ipa/ipa_modem.h b/drivers/net/ipa/ipa_modem.h
index 5e6e3d234454aa103e69f0da665680fb1d70f48e..e64ccc2402e9d954518c56adbaff61f6b103b5bf 100644 (file)
--- a/drivers/net/ipa/ipa_modem.h
+++ b/drivers/net/ipa/ipa_modem.h
@@ -18,9 +18,6 @@ void ipa_modem_skb_rx(struct net_device *netdev, struct sk_buff *skb);
 void ipa_modem_suspend(struct net_device *netdev);
 void ipa_modem_resume(struct net_device *netdev);
 
-int ipa_modem_init(struct ipa *ipa, bool modem_init);
-void ipa_modem_exit(struct ipa *ipa);
-
 int ipa_modem_config(struct ipa *ipa);
 void ipa_modem_deconfig(struct ipa *ipa);