Skip to contentSkip to conversation

dma: intel_mid_dma: remove redundant pci_set_drvdata calls

PATCH Applied Axel Lin 2 participants 2 messages Jul 19, 2011 – Jul 25, 2011 dmaengine

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 dma: intel_mid_dma: remove redundant pci_set_drvdata calls

Call pci_set_drvdata() once in intel_mid_dma_probe() is enough. Remove redundant pci_set_drvdata() calls in dma_suspend() and dma_resume().

Signed-off-by Axel Lin <[email protected]>
---
 drivers/dma/intel_mid_dma.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/dma/intel_mid_dma.c +0 -2
index f653517..8a3fdd8 100644
@@ -1351,7 +1351,6 @@ int dma_suspend(struct pci_dev *pci, pm_message_t state)
 			return -EAGAIN;
 	}
 	device->state = SUSPENDED;
-	pci_set_drvdata(pci, device);
 	pci_save_state(pci);
 	pci_disable_device(pci);
 	pci_set_power_state(pci, PCI_D3hot);

@@ -1380,7 +1379,6 @@ int dma_resume(struct pci_dev *pci)
 	}
 	device->state = RUNNING;
 	iowrite32(REG_BIT0, device->dma_base + DMA_CFG);
-	pci_set_drvdata(pci, device);
 	return 0;
 }
Signature · 1 line
1.7.4.1
Applied
#1 lore raw
Quoted 21 lines · Axel Lin

Call pci_set_drvdata() once in intel_mid_dma_probe() is enough. Remove redundant pci_set_drvdata() calls in dma_suspend() and dma_resume().

Signed-off-by Axel Lin <[email protected]>
---
 drivers/dma/intel_mid_dma.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/dma/intel_mid_dma.c +0 -1
index f653517..8a3fdd8 100644
@@ -1351,7 +1351,6 @@ int dma_suspend(struct pci_dev *pci, pm_message_t state)
 			return -EAGAIN;
 	}
 	device->state = SUSPENDED;
-	pci_set_drvdata(pci, device);
 	pci_save_state(pci);
 	pci_disable_device(pci);
 	pci_set_power_state(pci, PCI_D3hot);

drivers/dma/intel_mid_dma.c int dma_resume(struct pci_dev *pci) · line 1384

Quoted 7 lines
drivers/dma/intel_mid_dma.c +0 -1
@@ -1380,7 +1379,6 @@ int dma_resume(struct pci_dev *pci)
 	}
 	device->state = RUNNING;
 	iowrite32(REG_BIT0, device->dma_base + DMA_CFG);
-	pci_set_drvdata(pci, device);
 	return 0;
 }

Applied, Thanks

Signature · 2 lines
~Vinod Koul
Intel Corp.