intel_mid_dma: remove legacy pm interface

PATCH In review Alan Cox 3 participants 4 messages Dec 15, 2011 – Jan 2, 2012 dmaengine

lore

Share & tools

lore

Alan Cox

author

2011-12-15 22:20 UTC #0 lore raw

PATCH 1/1 intel_mid_dma: remove legacy pm interface

From: Kristen Carlson Accardi <[email protected]>

Drivers should not support both legacy pm and new framework.

Signed-off-by Kristen Carlson Accardi <[email protected]>

Signed-off-by Kirill A. Shutemov <[email protected]>

Signed-off-by Alan Cox <[email protected]>

---

 drivers/dma/intel_mid_dma.c      |   12 +++++++-----
 drivers/dma/intel_mid_dma_regs.h |    2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

drivers/dma/intel_mid_dma.c +7 -5

index 01929ed..d67cecf 100644
@@ -868,7 +868,7 @@ static int intel_mid_dma_alloc_chan_resources(struct dma_chan *chan)
 	pm_runtime_get_sync(&mid->pdev->dev);
 
 	if (mid->state == SUSPENDED) {
-		if (dma_resume(mid->pdev)) {
+		if (dma_resume(&mid->pdev->dev)) {
 			pr_err("ERR_MDMA: resume failed");
 			return -EFAULT;
 		}

@@ -1337,8 +1337,9 @@ static void __devexit intel_mid_dma_remove(struct pci_dev *pdev)
 *
 * This function is called by OS when a power event occurs
 */
-int dma_suspend(struct pci_dev *pci, pm_message_t state)
+int dma_suspend(struct device *dev)
 {
+	struct pci_dev *pci = to_pci_dev(dev);
 	int i;
 	struct middma_device *device = pci_get_drvdata(pci);
 	pr_debug("MDMA: dma_suspend called\n");

@@ -1362,8 +1363,9 @@ int dma_suspend(struct pci_dev *pci, pm_message_t state)
 *
 * This function is called by OS when a power event occurs
 */
-int dma_resume(struct pci_dev *pci)
+int dma_resume(struct device *dev)
 {
+	struct pci_dev *pci = to_pci_dev(dev);
 	int ret;
 	struct middma_device *device = pci_get_drvdata(pci);

@@ -1429,6 +1431,8 @@ static const struct dev_pm_ops intel_mid_dma_pm = {
 	.runtime_suspend = dma_runtime_suspend,
 	.runtime_resume = dma_runtime_resume,
 	.runtime_idle = dma_runtime_idle,
+	.suspend = dma_suspend,
+	.resume = dma_resume,
 };
 
 static struct pci_driver intel_mid_dma_pci_driver = {

@@ -1437,8 +1441,6 @@ static struct pci_driver intel_mid_dma_pci_driver = {
 	.probe		=	intel_mid_dma_probe,
 	.remove		=	__devexit_p(intel_mid_dma_remove),
 #ifdef CONFIG_PM
-	.suspend = dma_suspend,
-	.resume = dma_resume,
 	.driver = {
 		.pm = &intel_mid_dma_pm,
 	},

drivers/dma/intel_mid_dma_regs.h +1 -1

index c6de919..c83d35b 100644
@@ -296,6 +296,6 @@ static inline struct intel_mid_dma_slave *to_intel_mid_dma_slave
 }
 
 
-int dma_resume(struct pci_dev *pci);
+int dma_resume(struct device *dev);
 
 #endif /*__INTEL_MID_DMAC_REGS_H__*/

Vinod Koul

2011-12-23 16:19 UTC #1 lore raw

Quoted 3 lines · Alan Cox

From: Kristen Carlson Accardi <[email protected]>
Drivers should not support both legacy pm and new framework.

Not really.

I am using this driver in our system where we go to D0i3 aka runtime_suspend when DMA is idle.
Also we goto D3/S3 aka when traditional suspend is invoked.

So we need both.

Quoted 82 lines

Signed-off-by Kristen Carlson Accardi <[email protected]>

Signed-off-by Kirill A. Shutemov <[email protected]>

Signed-off-by Alan Cox <[email protected]>

---

 drivers/dma/intel_mid_dma.c      |   12 +++++++-----
 drivers/dma/intel_mid_dma_regs.h |    2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

drivers/dma/intel_mid_dma.c +7 -5

index 01929ed..d67cecf 100644
@@ -868,7 +868,7 @@ static int intel_mid_dma_alloc_chan_resources(struct dma_chan *chan)
 	pm_runtime_get_sync(&mid->pdev->dev);
 
 	if (mid->state == SUSPENDED) {
-		if (dma_resume(mid->pdev)) {
+		if (dma_resume(&mid->pdev->dev)) {
 			pr_err("ERR_MDMA: resume failed");
 			return -EFAULT;
 		}

@@ -1337,8 +1337,9 @@ static void __devexit intel_mid_dma_remove(struct pci_dev *pdev)
 *
 * This function is called by OS when a power event occurs
 */
-int dma_suspend(struct pci_dev *pci, pm_message_t state)
+int dma_suspend(struct device *dev)
 {
+	struct pci_dev *pci = to_pci_dev(dev);
 	int i;
 	struct middma_device *device = pci_get_drvdata(pci);
 	pr_debug("MDMA: dma_suspend called\n");

@@ -1362,8 +1363,9 @@ int dma_suspend(struct pci_dev *pci, pm_message_t state)
 *
 * This function is called by OS when a power event occurs
 */
-int dma_resume(struct pci_dev *pci)
+int dma_resume(struct device *dev)
 {
+	struct pci_dev *pci = to_pci_dev(dev);
 	int ret;
 	struct middma_device *device = pci_get_drvdata(pci);

@@ -1429,6 +1431,8 @@ static const struct dev_pm_ops intel_mid_dma_pm = {
 	.runtime_suspend = dma_runtime_suspend,
 	.runtime_resume = dma_runtime_resume,
 	.runtime_idle = dma_runtime_idle,
+	.suspend = dma_suspend,
+	.resume = dma_resume,
 };
 
 static struct pci_driver intel_mid_dma_pci_driver = {

@@ -1437,8 +1441,6 @@ static struct pci_driver intel_mid_dma_pci_driver = {
 	.probe		=	intel_mid_dma_probe,
 	.remove		=	__devexit_p(intel_mid_dma_remove),
 #ifdef CONFIG_PM
-	.suspend = dma_suspend,
-	.resume = dma_resume,
 	.driver = {
 		.pm = &intel_mid_dma_pm,
 	},

drivers/dma/intel_mid_dma_regs.h +1 -2

index c6de919..c83d35b 100644
@@ -296,6 +296,6 @@ static inline struct intel_mid_dma_slave *to_intel_mid_dma_slave
 }
 
 
-int dma_resume(struct pci_dev *pci);
+int dma_resume(struct device *dev);
 
 #endif /*__INTEL_MID_DMAC_REGS_H__*/
 
--

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Signature · 1 line

~Vinod

Adrian Hunter

2011-12-27 07:55 UTC #2 lore raw

Quoted 11 lines · Vinod Koul

Quoted 3 lines · Alan Cox
From: Kristen Carlson Accardi <[email protected]>
Drivers should not support both legacy pm and new framework.
Not really.
I am using this driver in our system where we go to D0i3 aka runtime_suspend when DMA is idle.
Also we goto D3/S3 aka when traditional suspend is invoked.
So we need both.

There is no functional change caused by this patch.

It simply moves suspend/resume calls into dev_pm_ops where they really belong now. It is necessary to prevent kernel warnings.

Quoted 84 lines

Quoted 82 lines

Signed-off-by Kristen Carlson Accardi <[email protected]>

Signed-off-by Kirill A. Shutemov <[email protected]>

Signed-off-by Alan Cox <[email protected]>

---

 drivers/dma/intel_mid_dma.c      |   12 +++++++-----
 drivers/dma/intel_mid_dma_regs.h |    2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

drivers/dma/intel_mid_dma.c +7 -5

index 01929ed..d67cecf 100644
@@ -868,7 +868,7 @@ static int intel_mid_dma_alloc_chan_resources(struct dma_chan *chan)
 	pm_runtime_get_sync(&mid->pdev->dev);
 
 	if (mid->state == SUSPENDED) {
-		if (dma_resume(mid->pdev)) {
+		if (dma_resume(&mid->pdev->dev)) {
 			pr_err("ERR_MDMA: resume failed");
 			return -EFAULT;
 		}

@@ -1337,8 +1337,9 @@ static void __devexit intel_mid_dma_remove(struct pci_dev *pdev)
 *
 * This function is called by OS when a power event occurs
 */
-int dma_suspend(struct pci_dev *pci, pm_message_t state)
+int dma_suspend(struct device *dev)
 {
+	struct pci_dev *pci = to_pci_dev(dev);
 	int i;
 	struct middma_device *device = pci_get_drvdata(pci);
 	pr_debug("MDMA: dma_suspend called\n");

@@ -1362,8 +1363,9 @@ int dma_suspend(struct pci_dev *pci, pm_message_t state)
 *
 * This function is called by OS when a power event occurs
 */
-int dma_resume(struct pci_dev *pci)
+int dma_resume(struct device *dev)
 {
+	struct pci_dev *pci = to_pci_dev(dev);
 	int ret;
 	struct middma_device *device = pci_get_drvdata(pci);

@@ -1429,6 +1431,8 @@ static const struct dev_pm_ops intel_mid_dma_pm = {
 	.runtime_suspend = dma_runtime_suspend,
 	.runtime_resume = dma_runtime_resume,
 	.runtime_idle = dma_runtime_idle,
+	.suspend = dma_suspend,
+	.resume = dma_resume,
 };
 
 static struct pci_driver intel_mid_dma_pci_driver = {

@@ -1437,8 +1441,6 @@ static struct pci_driver intel_mid_dma_pci_driver = {
 	.probe		=	intel_mid_dma_probe,
 	.remove		=	__devexit_p(intel_mid_dma_remove),
 #ifdef CONFIG_PM
-	.suspend = dma_suspend,
-	.resume = dma_resume,
 	.driver = {
 		.pm = &intel_mid_dma_pm,
 	},

drivers/dma/intel_mid_dma_regs.h +1 -2

index c6de919..c83d35b 100644
@@ -296,6 +296,6 @@ static inline struct intel_mid_dma_slave *to_intel_mid_dma_slave
 }
 
 
-int dma_resume(struct pci_dev *pci);
+int dma_resume(struct device *dev);
 
 #endif /*__INTEL_MID_DMAC_REGS_H__*/
 
--

Vinod Koul

2012-01-02 11:05 UTC #3 lore raw

Quoted 11 lines · Adrian Hunter

Quoted 10 lines · Vinod Koul
Quoted 3 lines · Alan Cox
From: Kristen Carlson Accardi <[email protected]>
Drivers should not support both legacy pm and new framework.
Not really.
I am using this driver in our system where we go to D0i3 aka runtime_suspend when DMA is idle.
Also we goto D3/S3 aka when traditional suspend is invoked.

Quoted 7 lines

Quoted 1 line
So we need both.
There is no functional change caused by this patch.
It simply moves suspend/resume calls into dev_pm_ops where they really belong now. It is necessary to prevent kernel warnings.

Somehow I didn't read the patch correctly in first place.

Applied now, Thanks

Signature · 1 line

~Vinod