diff mbox

[V2] dma: remove DEFINE_PCI_DEVICE_TABLE macro

Message ID 000401cf6b4b$db3c8710$91b59530$%han@samsung.com (mailing list archive)
State Accepted
Commit 7587821d3d08
Delegated to: Vinod Koul
Headers show

Commit Message

Jingoo Han May 9, 2014, 5:59 a.m. UTC 
Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro
is deprecated.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
Changes since v1:
- Re-based on the latest linux-next kernel. (20140508)
- Added Andy Shevchenko's Acked-by.
- Modified commit message to change from 'not preferred' to 'deprecated'. 

 drivers/dma/dw/pci.c  |    2 +-
 drivers/dma/pch_dma.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Vinod Koul May 21, 2014, 5:46 a.m. UTC | #1 
On Fri, May 09, 2014 at 02:59:36PM +0900, Jingoo Han wrote:
> Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro
> is deprecated.
> 
Applied, thanks
diff mbox

Patch

diff --git a/drivers/dma/dw/pci.c b/drivers/dma/dw/pci.c
index be81db7..39e30c3 100644
--- a/drivers/dma/dw/pci.c
+++ b/drivers/dma/dw/pci.c
@@ -99,7 +99,7 @@  static const struct dev_pm_ops dw_pci_dev_pm_ops = {
 	SET_LATE_SYSTEM_SLEEP_PM_OPS(dw_pci_suspend_late, dw_pci_resume_early)
 };
 
-static DEFINE_PCI_DEVICE_TABLE(dw_pci_id_table) = {
+static const struct pci_device_id dw_pci_id_table[] = {
 	/* Medfield */
 	{ PCI_VDEVICE(INTEL, 0x0827), (kernel_ulong_t)&dw_pci_pdata },
 	{ PCI_VDEVICE(INTEL, 0x0830), (kernel_ulong_t)&dw_pci_pdata },
diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
index 05fa548..b4b8cc6 100644
--- a/drivers/dma/pch_dma.c
+++ b/drivers/dma/pch_dma.c
@@ -996,7 +996,7 @@  static void pch_dma_remove(struct pci_dev *pdev)
 #define PCI_DEVICE_ID_ML7831_DMA1_8CH	0x8810
 #define PCI_DEVICE_ID_ML7831_DMA2_4CH	0x8815
 
-DEFINE_PCI_DEVICE_TABLE(pch_dma_id_table) = {
+const struct pci_device_id pch_dma_id_table[] = {
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_EG20T_PCH_DMA_8CH), 8 },
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_EG20T_PCH_DMA_4CH), 4 },
 	{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_DMA1_8CH), 8}, /* UART Video */