dma: remove DEFINE_PCI_DEVICE_TABLE macro
authorJingoo Han <jg1.han@samsung.com>
Fri, 9 May 2014 05:59:36 +0000 (14:59 +0900)
committerVinod Koul <vinod.koul@intel.com>
Wed, 21 May 2014 05:46:18 +0000 (11:16 +0530)
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>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/dw/pci.c
drivers/dma/pch_dma.c

index be81db78062710e788ae64f488d827ae595747a4..39e30c3c7a9d4e810ee91151f3c878d093dcf6c9 100644 (file)
@@ -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 },
index 05fa548bd6595ac9fd63deb1200ddc0c595ef0d7..b4b8cc69c2bf1628c7481c837465ff8452719bd3 100644 (file)
@@ -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 */