dmaengine: idxd: Rename drv_enable/disable_wq to idxd_drv_enable/disable_wq, and...

Rename drv_enable_wq and drv_disable_wq to idxd_drv_enable_wq and
idxd_drv_disable_wq respectively, so that they're no longer too
generic to be exported.  This also matches existing naming within the
idxd driver.

And to allow idxd sub-drivers to enable and disable wqs, export them.

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Reviewed-by: Fenghua Yu <fenghua.yu@intel.com>
Acked-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/dma/idxd/cdev.c b/drivers/dma/idxd/cdev.c
index 0423655f5a88045e2f02119f2bd112f203b011a3..1d918d45d9f6d67453f8f662e08b6f430161f126 100644 (file)
--- a/drivers/dma/idxd/cdev.c
+++ b/drivers/dma/idxd/cdev.c
@@ -550,7 +550,7 @@ static int idxd_user_drv_probe(struct idxd_dev *idxd_dev)
        }
 
        wq->type = IDXD_WQT_USER;
-       rc = drv_enable_wq(wq);
+       rc = idxd_drv_enable_wq(wq);
        if (rc < 0)
                goto err;
 
@@ -565,7 +565,7 @@ static int idxd_user_drv_probe(struct idxd_dev *idxd_dev)
        return 0;
 
 err_cdev:
-       drv_disable_wq(wq);
+       idxd_drv_disable_wq(wq);
 err:
        destroy_workqueue(wq->wq);
        wq->type = IDXD_WQT_NONE;
@@ -580,7 +580,7 @@ static void idxd_user_drv_remove(struct idxd_dev *idxd_dev)
 
        mutex_lock(&wq->wq_lock);
        idxd_wq_del_cdev(wq);
-       drv_disable_wq(wq);
+       idxd_drv_disable_wq(wq);
        wq->type = IDXD_WQT_NONE;
        destroy_workqueue(wq->wq);
        wq->wq = NULL;

diff --git a/drivers/dma/idxd/device.c b/drivers/dma/idxd/device.c
index 8f754f922217dedb7b49d2991d85b007201331ac..feca8534a1c5ce53ed5da3eccde7429beaaa66fd 100644 (file)
--- a/drivers/dma/idxd/device.c
+++ b/drivers/dma/idxd/device.c
@@ -1350,7 +1350,7 @@ err_irq:
        return rc;
 }
 
-int drv_enable_wq(struct idxd_wq *wq)
+int idxd_drv_enable_wq(struct idxd_wq *wq)
 {
        struct idxd_device *idxd = wq->idxd;
        struct device *dev = &idxd->pdev->dev;
@@ -1482,8 +1482,9 @@ err_map_portal:
 err:
        return rc;
 }
+EXPORT_SYMBOL_NS_GPL(idxd_drv_enable_wq, IDXD);
 
-void drv_disable_wq(struct idxd_wq *wq)
+void idxd_drv_disable_wq(struct idxd_wq *wq)
 {
        struct idxd_device *idxd = wq->idxd;
        struct device *dev = &idxd->pdev->dev;
@@ -1503,6 +1504,7 @@ void drv_disable_wq(struct idxd_wq *wq)
        wq->type = IDXD_WQT_NONE;
        wq->client_count = 0;
 }
+EXPORT_SYMBOL_NS_GPL(idxd_drv_disable_wq, IDXD);
 
 int idxd_device_drv_probe(struct idxd_dev *idxd_dev)
 {

diff --git a/drivers/dma/idxd/dma.c b/drivers/dma/idxd/dma.c
index 47a01893cfdbf9667ae62d9cbe934350135b8285..e7043e2354081a23265a8fe8a0850cf06beddcb1 100644 (file)
--- a/drivers/dma/idxd/dma.c
+++ b/drivers/dma/idxd/dma.c
@@ -314,7 +314,7 @@ static int idxd_dmaengine_drv_probe(struct idxd_dev *idxd_dev)
 
        wq->type = IDXD_WQT_KERNEL;
 
-       rc = drv_enable_wq(wq);
+       rc = idxd_drv_enable_wq(wq);
        if (rc < 0) {
                dev_dbg(dev, "Enable wq %d failed: %d\n", wq->id, rc);
                rc = -ENXIO;
@@ -333,7 +333,7 @@ static int idxd_dmaengine_drv_probe(struct idxd_dev *idxd_dev)
        return 0;
 
 err_dma:
-       drv_disable_wq(wq);
+       idxd_drv_disable_wq(wq);
 err:
        wq->type = IDXD_WQT_NONE;
        mutex_unlock(&wq->wq_lock);
@@ -347,7 +347,7 @@ static void idxd_dmaengine_drv_remove(struct idxd_dev *idxd_dev)
        mutex_lock(&wq->wq_lock);
        __idxd_wq_quiesce(wq);
        idxd_unregister_dma_channel(wq);
-       drv_disable_wq(wq);
+       idxd_drv_disable_wq(wq);
        mutex_unlock(&wq->wq_lock);
 }
 

diff --git a/drivers/dma/idxd/idxd.h b/drivers/dma/idxd/idxd.h
index e541d19f14d050a7a01e2ef3590762463b180908..ae3be5cb2ee327d015968ee3a41d9992fa3e3305 100644 (file)
--- a/drivers/dma/idxd/idxd.h
+++ b/drivers/dma/idxd/idxd.h
@@ -685,8 +685,8 @@ void idxd_unmask_error_interrupts(struct idxd_device *idxd);
 /* device control */
 int idxd_device_drv_probe(struct idxd_dev *idxd_dev);
 void idxd_device_drv_remove(struct idxd_dev *idxd_dev);
-int drv_enable_wq(struct idxd_wq *wq);
-void drv_disable_wq(struct idxd_wq *wq);
+int idxd_drv_enable_wq(struct idxd_wq *wq);
+void idxd_drv_disable_wq(struct idxd_wq *wq);
 int idxd_device_init_reset(struct idxd_device *idxd);
 int idxd_device_enable(struct idxd_device *idxd);
 int idxd_device_disable(struct idxd_device *idxd);