net: ipa: pass a platform device to ipa_smp2p_init()

[linux-2.6-block.git] / drivers / net / ipa / ipa_smp2p.c

diff --git a/drivers/net/ipa/ipa_smp2p.c b/drivers/net/ipa/ipa_smp2p.c
index 8c4497dfe5afd18f6e36bf32541e1f3a3de254da..831268551d9a7f26c5e332888b1d9422ad3a4abe 100644 (file)
--- a/drivers/net/ipa/ipa_smp2p.c
+++ b/drivers/net/ipa/ipa_smp2p.c
@@ -220,10 +220,11 @@ static void ipa_smp2p_power_release(struct ipa *ipa)
 }
 
 /* Initialize the IPA SMP2P subsystem */
-int ipa_smp2p_init(struct ipa *ipa, bool modem_init)
+int
+ipa_smp2p_init(struct ipa *ipa, struct platform_device *pdev, bool modem_init)
 {
        struct qcom_smem_state *enabled_state;
-       struct device *dev = &ipa->pdev->dev;
+       struct device *dev = &pdev->dev;
        struct qcom_smem_state *valid_state;
        struct ipa_smp2p *smp2p;
        u32 enabled_bit;
@@ -262,7 +263,7 @@ int ipa_smp2p_init(struct ipa *ipa, bool modem_init)
        /* We have enough information saved to handle notifications */
        ipa->smp2p = smp2p;
 
-       ret = ipa_smp2p_irq_init(smp2p, smp2p->ipa->pdev, "ipa-clock-query",
+       ret = ipa_smp2p_irq_init(smp2p, pdev, "ipa-clock-query",
                                 ipa_smp2p_modem_clk_query_isr);
        if (ret < 0)
                goto err_null_smp2p;
@@ -274,8 +275,7 @@ int ipa_smp2p_init(struct ipa *ipa, bool modem_init)
 
        if (modem_init) {
                /* Result will be non-zero (negative for error) */
-               ret = ipa_smp2p_irq_init(smp2p, smp2p->ipa->pdev,
-                                        "ipa-setup-ready",
+               ret = ipa_smp2p_irq_init(smp2p, pdev, "ipa-setup-ready",
                                         ipa_smp2p_modem_setup_ready_isr);
                if (ret < 0)
                        goto err_notifier_unregister;