Re: [PATCH 06/39] dma: remove DEFINE_PCI_DEVICE_TABLE macro

Shevchenko, Andriy
2013-12-03T12:11:16Z

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 2364 bytes --]

On Tue, 2013-12-03 at 08:05 +0900, Jingoo Han wrote:
> Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro
> is not preferred.

I'm sorry, but Documentation/PCI/pci.txt still says "is the preferred
method".

Is there any link to patch for Documentation and discussion why change
is established?

>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> ---
> 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 e89fc24..fc3aea1 100644
> --- a/drivers/dma/dw/pci.c
> +++ b/drivers/dma/dw/pci.c
> @@ -75,7 +75,7 @@ static void dw_pci_remove(struct pci_dev *pdev)
> dev_warn(&pdev->dev, "can't remove device properly: %d\n", ret);
> }
>
> -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 61fdc54..9f0cdb1 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 */

--
Andy Shevchenko <andriy.shevchenko@intel.com>
Intel Finland Oy
---------------------------------------------------------------------
Intel Finland Oy
Registered Address: PL 281, 00181 Helsinki
Business Identity Code: 0357606 - 4
Domiciled in Helsinki

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éÝ¶\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dÊ‡Ú™ë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥