net: ipa: change ipa_interrupt_config() prototype

Change the return type of ipa_interrupt_config() to be an error
code rather than an IPA interrupt structure pointer, and assign the
the pointer within that function.

Change ipa_interrupt_deconfig() to take the IPA pointer as argument
and have it invalidate the ipa->interrupt pointer.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ipa/ipa_interrupt.c b/drivers/net/ipa/ipa_interrupt.c
index 4d80bf77a53239d58873b48f8b1485ddc86b5a35..e23c9a5942eda41f155d408c564139f241d33bbf 100644 (file)
--- a/drivers/net/ipa/ipa_interrupt.c
+++ b/drivers/net/ipa/ipa_interrupt.c
@@ -236,7 +236,7 @@ void ipa_interrupt_simulate_suspend(struct ipa_interrupt *interrupt)
 }
 
 /* Configure the IPA interrupt framework */
-struct ipa_interrupt *ipa_interrupt_config(struct ipa *ipa)
+int ipa_interrupt_config(struct ipa *ipa)
 {
        struct device *dev = &ipa->pdev->dev;
        struct ipa_interrupt *interrupt;
@@ -246,15 +246,14 @@ struct ipa_interrupt *ipa_interrupt_config(struct ipa *ipa)
 
        ret = platform_get_irq_byname(ipa->pdev, "ipa");
        if (ret <= 0) {
-               dev_err(dev, "DT error %d getting \"ipa\" IRQ property\n",
-                       ret);
-               return ERR_PTR(ret ? : -EINVAL);
+               dev_err(dev, "DT error %d getting \"ipa\" IRQ property\n", ret);
+               return ret ? : -EINVAL;
        }
        irq = ret;
 
        interrupt = kzalloc(sizeof(*interrupt), GFP_KERNEL);
        if (!interrupt)
-               return ERR_PTR(-ENOMEM);
+               return -ENOMEM;
        interrupt->ipa = ipa;
        interrupt->irq = irq;
 
@@ -271,24 +270,30 @@ struct ipa_interrupt *ipa_interrupt_config(struct ipa *ipa)
 
        ret = dev_pm_set_wake_irq(dev, irq);
        if (ret) {
-               dev_err(dev, "error %d registering \"ipa\" IRQ as wakeirq\n", ret);
+               dev_err(dev, "error %d registering \"ipa\" IRQ as wakeirq\n",
+                       ret);
                goto err_free_irq;
        }
 
-       return interrupt;
+       ipa->interrupt = interrupt;
+
+       return 0;
 
 err_free_irq:
        free_irq(interrupt->irq, interrupt);
 err_kfree:
        kfree(interrupt);
 
-       return ERR_PTR(ret);
+       return ret;
 }
 
 /* Inverse of ipa_interrupt_config() */
-void ipa_interrupt_deconfig(struct ipa_interrupt *interrupt)
+void ipa_interrupt_deconfig(struct ipa *ipa)
 {
-       struct device *dev = &interrupt->ipa->pdev->dev;
+       struct ipa_interrupt *interrupt = ipa->interrupt;
+       struct device *dev = &ipa->pdev->dev;
+
+       ipa->interrupt = NULL;
 
        dev_pm_clear_wake_irq(dev);
        free_irq(interrupt->irq, interrupt);

diff --git a/drivers/net/ipa/ipa_interrupt.h b/drivers/net/ipa/ipa_interrupt.h
index 53e1b71685c7550a100c8677eed91aa8d4171077..1947654e3e360b2f0fe011ee9172ae159d847404 100644 (file)
--- a/drivers/net/ipa/ipa_interrupt.h
+++ b/drivers/net/ipa/ipa_interrupt.h
@@ -76,17 +76,17 @@ void ipa_interrupt_irq_enable(struct ipa *ipa);
 void ipa_interrupt_irq_disable(struct ipa *ipa);
 
 /**
- * ipa_interrupt_config() - Configure the IPA interrupt framework
+ * ipa_interrupt_config() - Configure IPA interrupts
  * @ipa:       IPA pointer
  *
- * Return:     Pointer to IPA SMP2P info, or a pointer-coded error
+ * Return:     0 if successful, or a negative error code
  */
-struct ipa_interrupt *ipa_interrupt_config(struct ipa *ipa);
+int ipa_interrupt_config(struct ipa *ipa);
 
 /**
  * ipa_interrupt_deconfig() - Inverse of ipa_interrupt_config()
- * @interrupt: IPA interrupt structure
+ * @ipa:       IPA pointer
  */
-void ipa_interrupt_deconfig(struct ipa_interrupt *interrupt);
+void ipa_interrupt_deconfig(struct ipa *ipa);
 
 #endif /* _IPA_INTERRUPT_H_ */

diff --git a/drivers/net/ipa/ipa_main.c b/drivers/net/ipa/ipa_main.c
index 00475fd7a20547b14c272dd689892f4ea51b7041..0c6e6719d99e395ebf6db112541f01e40fce885e 100644 (file)
--- a/drivers/net/ipa/ipa_main.c
+++ b/drivers/net/ipa/ipa_main.c
@@ -542,12 +542,9 @@ static int ipa_config(struct ipa *ipa, const struct ipa_data *data)
        if (ret)
                goto err_hardware_deconfig;
 
-       ipa->interrupt = ipa_interrupt_config(ipa);
-       if (IS_ERR(ipa->interrupt)) {
-               ret = PTR_ERR(ipa->interrupt);
-               ipa->interrupt = NULL;
+       ret = ipa_interrupt_config(ipa);
+       if (ret)
                goto err_mem_deconfig;
-       }
 
        ipa_uc_config(ipa);
 
@@ -572,8 +569,7 @@ err_endpoint_deconfig:
        ipa_endpoint_deconfig(ipa);
 err_uc_deconfig:
        ipa_uc_deconfig(ipa);
-       ipa_interrupt_deconfig(ipa->interrupt);
-       ipa->interrupt = NULL;
+       ipa_interrupt_deconfig(ipa);
 err_mem_deconfig:
        ipa_mem_deconfig(ipa);
 err_hardware_deconfig:
@@ -591,8 +587,7 @@ static void ipa_deconfig(struct ipa *ipa)
        ipa_modem_deconfig(ipa);
        ipa_endpoint_deconfig(ipa);
        ipa_uc_deconfig(ipa);
-       ipa_interrupt_deconfig(ipa->interrupt);
-       ipa->interrupt = NULL;
+       ipa_interrupt_deconfig(ipa);
        ipa_mem_deconfig(ipa);
        ipa_hardware_deconfig(ipa);
 }