From patchwork Fri May 9 05:59:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 4140201 X-Patchwork-Delegate: vinod.koul@intel.com Return-Path: X-Original-To: patchwork-dmaengine@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 68C629F23C for ; Fri, 9 May 2014 05:59:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 63B66201E7 for ; Fri, 9 May 2014 05:59:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 15CA4201DE for ; Fri, 9 May 2014 05:59:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752012AbaEIF7k (ORCPT ); Fri, 9 May 2014 01:59:40 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:19662 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751908AbaEIF7k (ORCPT ); Fri, 9 May 2014 01:59:40 -0400 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N5A009G8LZCXP90@mailout1.samsung.com> for dmaengine@vger.kernel.org; Fri, 09 May 2014 14:59:36 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.49]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id C3.75.11496.8CE6C635; Fri, 09 May 2014 14:59:36 +0900 (KST) X-AuditID: cbfee691-b7f3e6d000002ce8-d7-536c6ec858cc Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 53.22.25708.8CE6C635; Fri, 09 May 2014 14:59:36 +0900 (KST) Received: from DOJG1HAN03 ([12.36.166.146]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N5A008M0LZCA210@mmp1.samsung.com>; Fri, 09 May 2014 14:59:36 +0900 (KST) From: Jingoo Han To: 'Vinod Koul' Cc: dmaengine@vger.kernel.org, "'Williams, Dan J'" , 'Andy Shevchenko' , 'Yong Wang' , 'Jingoo Han' Subject: [PATCH V2] dma: remove DEFINE_PCI_DEVICE_TABLE macro Date: Fri, 09 May 2014 14:59:36 +0900 Message-id: <000401cf6b4b$db3c8710$91b59530$%han@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac9rS9seZa6P5GY3SrWnQ+B35J+tSg== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrHIsWRmVeSWpSXmKPExsVy+t8zQ90TeTnBBrdOy1r0Nk1nspg+9QKj xeqpf1ktLi+8xGrxsm8/i8XumX/ZHNg8Fu95yeQx72SgR9+WVYwenzfJBbBEcdmkpOZklqUW 6dslcGX8nLmVpWAlb0V7k2ID4ybuLkZODgkBE4mGf4uYIGwxiQv31rN1MXJxCAksY5RYeK2H CaZowrl5jBCJRYwSSw++ZYJwfgM5t9+xglSxCahJfPlymL2LkYNDREBdYul1GZAaZoGLjBI7 309mBqkRFrCVWDf9EZjNIqAqcavnDFgvL1C8fe85NghbUOLH5HssIDazgJbE+p3HmSBseYnN a94yg8yXAJr/6K8uSFhEQE9i0bFL7BAlIhL7XrwDO1RC4BC7RMfcZWwQuwQkvk0+xALRKyux 6QAzxGOSEgdX3GCZwCg2C8nmWUg2z0KyeRaSFQsYWVYxiqYWJBcUJ6UXmeoVJ+YWl+al6yXn 525ihMTdxB2M9w9YH2JMBlo/kVlKNDkfGLd5JfGGxmZGFqYmpsZG5pZmpAkrifOmP0oKEhJI TyxJzU5NLUgtii8qzUktPsTIxMEp1cCou9jzXpRbpAh77kQN9Yb2BeyHp287Hx9zvjr6//Rd XwxmfynbLXGjaEZJ1yujma4c/hM/n5hYfst5l0XmVZnNnw03+Htmu3Qdtb61fp3luS8TD56f FS10dcE7M67zyj95mm/NrGneMqFj1k0O3niBzitlh/9lKwv3fY5Y9869M1e40Tj6iZCWEktx RqKhFnNRcSIAZhZ7ptECAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprNKsWRmVeSWpSXmKPExsVy+t9jAd0TeTnBBvvPS1r0Nk1nspg+9QKj xeqpf1ktLi+8xGrxsm8/i8XumX/ZHNg8Fu95yeQx72SgR9+WVYwenzfJBbBENTDaZKQmpqQW KaTmJeenZOal2yp5B8c7x5uaGRjqGlpamCsp5CXmptoqufgE6Lpl5gAtV1IoS8wpBQoFJBYX K+nbYZoQGuKmawHTGKHrGxIE12NkgAYS1jFm/Jy5laVgJW9Fe5NiA+Mm7i5GTg4JAROJCefm MULYYhIX7q1n62Lk4hASWMQosfTgWyYI5zeQc/sdK0gVm4CaxJcvh9m7GDk4RATUJZZelwGp YRa4yCix8/1kZpAaYQFbiXXTH4HZLAKqErd6zoD18gLF2/eeY4OwBSV+TL7HAmIzC2hJrN95 nAnClpfYvOYtM8h8CaD5j/7qgoRFBPQkFh27xA5RIiKx78U7xgmMArOQTJqFZNIsJJNmIWlZ wMiyilE0tSC5oDgpPddIrzgxt7g0L10vOT93EyM4qp9J72Bc1WBxiFGAg1GJh/fFlOxgIdbE suLK3EOMEhzMSiK8Uuk5wUK8KYmVValF+fFFpTmpxYcYk4EencgsJZqcD0w4eSXxhsYmZkaW RmYWRibm5qQJK4nzHmy1DhQSSE8sSc1OTS1ILYLZwsTBKdXAmJ0Y4SPHUhIyr+u1kur1nz8k TCWTLglIG7yMMnmuqZz89MDGz0eFH7Uuij5q8a22U+tr7yp762k7Bdb+XbBNO8piVRVvVmvw 4pqmObdnfV2V8eDJfN/QuyrsGzVyt+UYKVzo+mAo76z3YU7lHhO3yL1+k908D1881fnFW+P5 nW/n06ZNvrGFT4mlOCPRUIu5qDgRAJ0DV2IuAwAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro is deprecated. Signed-off-by: Jingoo Han Acked-by: Andy Shevchenko --- 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(-) 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 */