Rename scd_ext_ops::init_trigger to finish_init

* Renamed scd_ext_ops::init_trigger callback * Delete unused scd_ext_init_trigger() Change-Id: Ie31b102877ccf5b3958782879c6c5fef8f0ea60e
zzhiyuan · Jul 20, 2018 · 9d4656b · 9d4656b
1 parent b1e09c8
commit 9d4656b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 26 deletions.
diff --git a/src/scd-hwmon.c b/src/scd-hwmon.c
@@ -1597,7 +1597,7 @@ static void scd_ext_hwmon_remove(struct pci_dev *pdev)
    put_device(&pdev->dev);
 }
 
-static int scd_ext_hwmon_init_trigger(struct pci_dev *pdev)
+static int scd_ext_hwmon_finish_init(struct pci_dev *pdev)
 {
    struct scd_context *ctx = get_context_for_pdev(pdev);
 
@@ -1614,7 +1614,7 @@ static int scd_ext_hwmon_init_trigger(struct pci_dev *pdev)
 static struct scd_ext_ops scd_hwmon_ops = {
    .probe  = scd_ext_hwmon_probe,
    .remove = scd_ext_hwmon_remove,
-   .init_trigger = scd_ext_hwmon_init_trigger,
+   .finish_init = scd_ext_hwmon_finish_init,
 };
 
 static int __init scd_hwmon_init(void)

diff --git a/src/scd.c b/src/scd.c
@@ -342,28 +342,8 @@ void scd_unregister_ext_ops() {
    scd_unlock();
 }
 
-void scd_ext_init_trigger(void){
-   struct scd_dev_priv *priv;
-
-   scd_lock();
-   if (!scd_ext_ops) {
-      scd_unlock();
-      return;
-   }
-
-   // call init_trigger() for any existing scd
-   list_for_each_entry(priv, &scd_list, list) {
-      if (scd_ext_ops->init_trigger) {
-         scd_ext_ops->init_trigger(priv->pdev);
-      }
-   }
-   scd_unlock();
-   return;
-}
-
 EXPORT_SYMBOL(scd_register_ext_ops);
 EXPORT_SYMBOL(scd_unregister_ext_ops);
-EXPORT_SYMBOL(scd_ext_init_trigger);
 
 static irqreturn_t scd_interrupt(int irq, void *dev_id)
 {
@@ -756,9 +736,9 @@ static int scd_finish_init(struct device *dev)
          priv->irq_info[0].interrupt_mask_clear_offset);
    }
 
-   // scd_ext init_trigger
-   if (scd_ext_ops && scd_ext_ops->init_trigger) {
-      scd_ext_ops->init_trigger(priv->pdev);
+   // scd_ext finish_init
+   if (scd_ext_ops && scd_ext_ops->finish_init) {
+      scd_ext_ops->finish_init(priv->pdev);
    }
 
    // interrupt polling

diff --git a/src/scd.h b/src/scd.h
@@ -43,7 +43,7 @@ struct scd_em_ops {
 struct scd_ext_ops {
    int (*probe)(struct pci_dev *pdev);
    void (*remove)(struct pci_dev *pdev);
-   int (*init_trigger)(struct pci_dev *pdev);
+   int (*finish_init)(struct pci_dev *pdev);
 };
 
 int scd_register_ardma_ops(struct scd_ardma_ops *ops);