dmaengine: Use named initializers for arrays of pci_device_id
Subsystems (5)
v2 cover dmaengine: Use named initializers for arrays of pci_device_id
From: Uwe Kleine-König <[email protected]>
Hello,
(implicit) v1 of this series was only a single patch, it's archived at
https://lore.kernel.org/all/[email protected] .
Andy criticised that the changes to the HSU driver don't fit to the remaining stuff in that patch. So I put that change in a separate patch.
Andy also suggested to use the PCI_DEVICE_DATA(). I didn't implement that as we don't agree about this being better. He likes it being compact, I don't like it as it hides assignments in a macro that I prefer to be explicit.
Best regards
Uwe
Uwe Kleine-König (The Capable Hub) (2):
dmaengine: hsu: Drop unused platform driver data
dmaengine: Consistently define pci_device_ids using named initializers
drivers/dma/amd/ptdma/ptdma-pci.c | 4 ++-- drivers/dma/dw-edma/dw-edma-pcie.c | 2 +- drivers/dma/dw/pci.c | 22 +++++++++++----------- drivers/dma/hsu/pci.c | 4 ++-- drivers/dma/pch_dma.c | 26 +++++++++++++------------- 5 files changed, 29 insertions(+), 29 deletions(-)
base-commit: abe651837cb394f76d738a7a747322fca3bf17ba
Signature · 1 line
2.47.3
PATCH v2 1/2 dmaengine: hsu: Drop unused platform driver data
The driver explicitly sets the .driver_data member of struct pnp_device_id to zero without relying on that value. Drop these unused assignments.
This patch doesn't modify the compiled array, only its representation in source form benefits. The former was confirmed with builds on x86 and arm64.
--- drivers/dma/hsu/pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dma/hsu/pci.c +2 -2
@@ -116,8 +116,8 @@ static int hsu_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) }static const struct pci_device_id hsu_pci_id_table[] = { - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_MFLD_HSU_DMA ),0 }, - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_MRFLD_HSU_DMA ),0 }, + {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_MFLD_HSU_DMA ) }, + {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_MRFLD_HSU_DMA ) }, { } };MODULE_DEVICE_TABLE (pci, hsu_pci_id_table);
Signature · 1 line
2.47.3
[email protected]
AI reviewRe: [PATCH v2 1/2] dmaengine: hsu: Drop unused platform driver data
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Low] The commit message incorrectly states that it modifies struct pnp_device_id instead of struct…
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] The commit message incorrectly states that it modifies struct pnp_device_id instead of struct pci_device_id. --
commit 5cb66572eea17e218716d84ce22cd0b73ee38c30
Author: Uwe Kleine-König (The Capable Hub) <[email protected]>
dmaengine: hsu: Drop unused platform driver data
This patch drops the unused .driver_data assignments from the hsu_pci_id_table array. It only modifies the source code representation and does not affect the compiled output.
Quoted 3 lines
The driver explicitly sets the .driver_data member of struct
pnp_device_idto zero without relying on that value. Drop these unused assignments.
[Severity: Low]
This isn't a bug, but the commit message states that the driver sets the member of struct pnp_device_id, while the patch actually modifies an array of struct pci_device_id in drivers/dma/hsu/pci.c. Should the commit message be updated to reference the correct struct?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Re: [PATCH v2 1/2] dmaengine: hsu: Drop unused platform driver data
Hello,
Quoted 17 lines · On Thu, Jun 11, 2026 at 08:11:05AM +0000, [email protected] wrote:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] The commit message incorrectly states that it modifies structpnp_device_idinstead of structpci_device_id. --commit
5cb66572eea17e218716d84ce22cd0b73ee38c30
Author: Uwe Kleine-König (The Capable Hub) <[email protected]>dmaengine: hsu: Drop unused platform driver data
This patch drops the unused .driver_data assignments from the
hsu_pci_id_tablearray. It only modifies the source code representation and does not affect the compiled output.Quoted 3 lines
The driver explicitly sets the .driver_data member of struct
pnp_device_idto zero without relying on that value. Drop these unused assignments.
Quoted 5 lines
[Severity: Low]
This isn't a bug, but the commit message states that the driver sets the member of structpnp_device_id, while the patch actually modifies an array of structpci_device_idindrivers/dma/hsu/pci.c. Should the commit message be updated to reference the correct struct?
Should I resent for that? If now, doing s/pnp/pci/ on the commit log whan applying would be great.
Best regards
Uwe
Re: [PATCH v2 1/2] dmaengine: hsu: Drop unused platform driver data
In reply to Uwe Kleine-König (The Capable Hub)Quoted 7 lines · Uwe Kleine-König (The Capable Hub)
The driver explicitly sets the .driver_data member of struct
pnp_device_idto zero without relying on that value. Drop these unused assignments.This patch doesn't modify the compiled array, only its representation in source form benefits. The former was confirmed with builds on x86 and arm64.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v2 1/2] dmaengine: hsu: Drop unused platform driver data
In reply to Uwe Kleine-König (The Capable Hub)Quoted 11 lines · Uwe Kleine-König (The Capable Hub)
The driver explicitly sets the .driver_data member of struct
pnp_device_idto zero without relying on that value. Drop these unused assignments.This patch doesn't modify the compiled array, only its representation in source form benefits. The former was confirmed with builds on x86 and arm64.
Signed-off-by Uwe Kleine-König (The Capable Hub) <[email protected]>---
Quoted 21 lines
drivers/dma/hsu/pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/dma/hsu/pci.c +2
-3@@ -116,8 +116,8 @@ static int hsu_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) }static const struct pci_device_id hsu_pci_id_table[] = { - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_MFLD_HSU_DMA ),0 }, - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_MRFLD_HSU_DMA ),0 }, + {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_MFLD_HSU_DMA ) }, + {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_MRFLD_HSU_DMA ) }, { } };MODULE_DEVICE_TABLE (pci, hsu_pci_id_table); --2.47.3
PATCH v2 2/2 dmaengine: Consistently define pci_device_ids using named initializers
In reply to Uwe Kleine-König (The Capable Hub)The .driver_data member of the various struct pci_device_id arrays were initialized by list expressions. This isn't easily readable if you're not into PCI. Using named initializers is more explicit and thus easier to parse.
While touching these arrays, unify the list terminators to be just an empty struct with no trailing comma.
This change doesn't introduce changes to the compiled pci_device_id arrays, which was confirmed using x86 and arm64 builds.
--- drivers/dma/amd/ptdma/ptdma-pci.c | 4 ++-- drivers/dma/dw-edma/dw-edma-pcie.c | 2 +- drivers/dma/dw/pci.c | 22 +++++++++++----------- drivers/dma/pch_dma.c | 26 +++++++++++++------------- 4 files changed, 27 insertions(+), 27 deletions(-)
drivers/dma/amd/ptdma/ptdma-pci.c +2 -2
@@ -223,9 +223,9 @@ static const struct pt_dev_vdata dev_vdata[] = { };static const struct pci_device_id pt_pci_table[] = { - {PCI_VDEVICE (AMD ,0x1498 ), (kernel_ulong_t)&dev_vdata[0 ] }, + {PCI_VDEVICE (AMD ,0x1498 ), .driver_data = (kernel_ulong_t)&dev_vdata[0 ] },/* Last entry must be zero */ - {0 , } + { } };MODULE_DEVICE_TABLE (pci, pt_pci_table);
drivers/dma/dw-edma/dw-edma-pcie.c +1 -1
@@ -563,7 +563,7 @@ static void dw_edma_pcie_remove(struct pci_dev *pdev)static const struct pci_device_id dw_edma_pcie_id_table[] = { {PCI_DEVICE_DATA (SYNOPSYS ,EDDA , &snps_edda_data) }, {PCI_VDEVICE (XILINX ,PCI_DEVICE_ID_XILINX_B054 ), - (kernel_ulong_t)&xilinx_mdb_data }, + .driver_data = (kernel_ulong_t)&xilinx_mdb_data }, {PCI_VDEVICE (XILINX ,PCI_DEVICE_ID_XILINX_B00F ), .driver_data = (kernel_ulong_t)&xilinx_cpm6_dma_data }, { }
drivers/dma/dw/pci.c +11 -11
@@ -98,29 +98,29 @@ static const struct dev_pm_ops dw_pci_dev_pm_ops = {static const struct pci_device_id dw_pci_id_table[] = {/* Medfield (GPDMA) */ - {PCI_VDEVICE (INTEL ,0x0827 ), (kernel_ulong_t)&dw_dma_chip_pdata }, + {PCI_VDEVICE (INTEL ,0x0827 ), .driver_data = (kernel_ulong_t)&dw_dma_chip_pdata },/* BayTrail */ - {PCI_VDEVICE (INTEL ,0x0f06 ), (kernel_ulong_t)&dw_dma_chip_pdata }, - {PCI_VDEVICE (INTEL ,0x0f40 ), (kernel_ulong_t)&dw_dma_chip_pdata }, + {PCI_VDEVICE (INTEL ,0x0f06 ), .driver_data = (kernel_ulong_t)&dw_dma_chip_pdata }, + {PCI_VDEVICE (INTEL ,0x0f40 ), .driver_data = (kernel_ulong_t)&dw_dma_chip_pdata },/* Merrifield */ - {PCI_VDEVICE (INTEL ,0x11a2 ), (kernel_ulong_t)&idma32_chip_pdata }, + {PCI_VDEVICE (INTEL ,0x11a2 ), .driver_data = (kernel_ulong_t)&idma32_chip_pdata },/* Braswell */ - {PCI_VDEVICE (INTEL ,0x2286 ), (kernel_ulong_t)&dw_dma_chip_pdata }, - {PCI_VDEVICE (INTEL ,0x22c0 ), (kernel_ulong_t)&dw_dma_chip_pdata }, + {PCI_VDEVICE (INTEL ,0x2286 ), .driver_data = (kernel_ulong_t)&dw_dma_chip_pdata }, + {PCI_VDEVICE (INTEL ,0x22c0 ), .driver_data = (kernel_ulong_t)&dw_dma_chip_pdata },/* Elkhart Lake iDMA 32-bit (PSE DMA) */ - {PCI_VDEVICE (INTEL ,0x4bb4 ), (kernel_ulong_t)&xbar_chip_pdata }, - {PCI_VDEVICE (INTEL ,0x4bb5 ), (kernel_ulong_t)&xbar_chip_pdata }, - {PCI_VDEVICE (INTEL ,0x4bb6 ), (kernel_ulong_t)&xbar_chip_pdata }, + {PCI_VDEVICE (INTEL ,0x4bb4 ), .driver_data = (kernel_ulong_t)&xbar_chip_pdata }, + {PCI_VDEVICE (INTEL ,0x4bb5 ), .driver_data = (kernel_ulong_t)&xbar_chip_pdata }, + {PCI_VDEVICE (INTEL ,0x4bb6 ), .driver_data = (kernel_ulong_t)&xbar_chip_pdata },/* Haswell */ - {PCI_VDEVICE (INTEL ,0x9c60 ), (kernel_ulong_t)&dw_dma_chip_pdata }, + {PCI_VDEVICE (INTEL ,0x9c60 ), .driver_data = (kernel_ulong_t)&dw_dma_chip_pdata },/* Broadwell */ - {PCI_VDEVICE (INTEL ,0x9ce0 ), (kernel_ulong_t)&dw_dma_chip_pdata }, + {PCI_VDEVICE (INTEL ,0x9ce0 ), .driver_data = (kernel_ulong_t)&dw_dma_chip_pdata }, { } };
drivers/dma/pch_dma.c +13 -13
@@ -956,19 +956,19 @@ static void pch_dma_remove(struct pci_dev *pdev)#define PCI_DEVICE_ID_ML7831_DMA2_4CH 0x8815static 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 */ - {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7213_DMA2_8CH ),8 },/* PCMIF SPI */ - {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7213_DMA3_4CH ),4 },/* FPGA */ - {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7213_DMA4_12CH ),12 },/* I2S */ - {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7223_DMA1_4CH ),4 },/* UART */ - {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7223_DMA2_4CH ),4 },/* Video SPI */ - {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7223_DMA3_4CH ),4 },/* Security */ - {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7223_DMA4_4CH ),4 },/* FPGA */ - {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7831_DMA1_8CH ),8 },/* UART */ - {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7831_DMA2_4CH ),4 },/* SPI */ - {0 , }, + {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_EG20T_PCH_DMA_8CH ), .driver_data =8 }, + {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_EG20T_PCH_DMA_4CH ), .driver_data =4 }, + {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7213_DMA1_8CH ), .driver_data =8 },/* UART Video */ + {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7213_DMA2_8CH ), .driver_data =8 },/* PCMIF SPI */ + {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7213_DMA3_4CH ), .driver_data =4 },/* FPGA */ + {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7213_DMA4_12CH ), .driver_data =12 },/* I2S */ + {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7223_DMA1_4CH ), .driver_data =4 },/* UART */ + {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7223_DMA2_4CH ), .driver_data =4 },/* Video SPI */ + {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7223_DMA3_4CH ), .driver_data =4 },/* Security */ + {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7223_DMA4_4CH ), .driver_data =4 },/* FPGA */ + {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7831_DMA1_8CH ), .driver_data =8 },/* UART */ + {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7831_DMA2_4CH ), .driver_data =4 },/* SPI */ + { } };MODULE_DEVICE_TABLE (pci, pch_dma_id_table);
Signature · 1 line
2.47.3
Andy Shevchenko
reviewerRe: [PATCH v2 2/2] dmaengine: Consistently define pci_device_ids using named initializers
Quoted 10 lines · Uwe Kleine-König (The Capable Hub)
The .driver_data member of the various struct
pci_device_idarrays were initialized by list expressions. This isn't easily readable if you're not into PCI. Using named initializers is more explicit and thus easier to parse.While touching these arrays, unify the list terminators to be just an empty struct with no trailing comma.
This change doesn't introduce changes to the compiled
pci_device_idarrays, which was confirmed using x86 and arm64 builds.
...
Quoted 1 line
static const struct
pci_device_idpch_dma_id_table[] = {
This case is almost ready to use PCI_DEVICE_DATA() and I see no reason to not go with it. The disadvantages of the proposed change here is that it makes lines much longer without any good benefit.
So, just to state again: I disagree with changing this driver (pch_dma) in the proposed way.
Quoted 27 lines
drivers/dma/pch_dma.c +13
-13- { 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 */ - { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_DMA2_8CH), 8}, /* PCMIF SPI */ - { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_DMA3_4CH), 4}, /* FPGA */ - { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_DMA4_12CH), 12}, /* I2S */ - { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_DMA1_4CH), 4}, /* UART */ - { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_DMA2_4CH), 4}, /* Video SPI */ - { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_DMA3_4CH), 4}, /* Security */ - { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_DMA4_4CH), 4}, /* FPGA */ - { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7831_DMA1_8CH), 8}, /* UART */ - { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7831_DMA2_4CH), 4}, /* SPI */ - { 0, }, + { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_EG20T_PCH_DMA_8CH), .driver_data = 8 }, + { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_EG20T_PCH_DMA_4CH), .driver_data = 4 }, + { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_DMA1_8CH), .driver_data = 8 }, /* UART Video */ + { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_DMA2_8CH), .driver_data = 8 }, /* PCMIF SPI */ + { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_DMA3_4CH), .driver_data = 4 }, /* FPGA */ + { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_DMA4_12CH), .driver_data = 12 }, /* I2S */ + { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_DMA1_4CH), .driver_data = 4 }, /* UART */ + { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_DMA2_4CH), .driver_data = 4 }, /* Video SPI */ + { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_DMA3_4CH), .driver_data = 4 }, /* Security */ + { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_DMA4_4CH), .driver_data = 4 }, /* FPGA */ + { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7831_DMA1_8CH), .driver_data = 8 }, /* UART */ + { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7831_DMA2_4CH), .driver_data = 4 }, /* SPI */ + { } };
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v2 2/2] dmaengine: Consistently define pci_device_ids using named initializers
In reply to Uwe Kleine-König (The Capable Hub)Quoted 6 lines · Uwe Kleine-König (The Capable Hub)
The .driver_data member of the various struct
pci_device_idarrays were initialized by list expressions. This isn't easily readable if you're not into PCI. Using named initializers is more explicit and thus easier to parse.
Quoted 8 lines
While touching these arrays, unify the list terminators to be just an empty struct with no trailing comma.
This change doesn't introduce changes to the compiled
pci_device_idarrays, which was confirmed using x86 and arm64 builds.Signed-off-by Uwe Kleine-König (The Capable Hub) <[email protected]>---
Quoted 120 lines
drivers/dma/amd/ptdma/ptdma-pci.c | 4 ++-- drivers/dma/dw-edma/dw-edma-pcie.c | 2 +- drivers/dma/dw/pci.c | 22 +++++++++++----------- drivers/dma/pch_dma.c | 26 +++++++++++++------------- 4 files changed, 27 insertions(+), 27 deletions(-)drivers/dma/amd/ptdma/ptdma-pci.c +2
-2@@ -223,9 +223,9 @@ static const struct pt_dev_vdata dev_vdata[] = { };static const struct pci_device_id pt_pci_table[] = { - {PCI_VDEVICE (AMD ,0x1498 ), (kernel_ulong_t)&dev_vdata[0 ] }, + {PCI_VDEVICE (AMD ,0x1498 ), .driver_data = (kernel_ulong_t)&dev_vdata[0 ] },/* Last entry must be zero */ - {0 , } + { } };MODULE_DEVICE_TABLE (pci, pt_pci_table);drivers/dma/dw-edma/dw-edma-pcie.c +1
-1@@ -563,7 +563,7 @@ static void dw_edma_pcie_remove(struct pci_dev *pdev)static const struct pci_device_id dw_edma_pcie_id_table[] = { {PCI_DEVICE_DATA (SYNOPSYS ,EDDA , &snps_edda_data) }, {PCI_VDEVICE (XILINX ,PCI_DEVICE_ID_XILINX_B054 ), - (kernel_ulong_t)&xilinx_mdb_data }, + .driver_data = (kernel_ulong_t)&xilinx_mdb_data }, {PCI_VDEVICE (XILINX ,PCI_DEVICE_ID_XILINX_B00F ), .driver_data = (kernel_ulong_t)&xilinx_cpm6_dma_data }, { }drivers/dma/dw/pci.c +11
-11@@ -98,29 +98,29 @@ static const struct dev_pm_ops dw_pci_dev_pm_ops = {static const struct pci_device_id dw_pci_id_table[] = {/* Medfield (GPDMA) */ - {PCI_VDEVICE (INTEL ,0x0827 ), (kernel_ulong_t)&dw_dma_chip_pdata }, + {PCI_VDEVICE (INTEL ,0x0827 ), .driver_data = (kernel_ulong_t)&dw_dma_chip_pdata },/* BayTrail */ - {PCI_VDEVICE (INTEL ,0x0f06 ), (kernel_ulong_t)&dw_dma_chip_pdata }, - {PCI_VDEVICE (INTEL ,0x0f40 ), (kernel_ulong_t)&dw_dma_chip_pdata }, + {PCI_VDEVICE (INTEL ,0x0f06 ), .driver_data = (kernel_ulong_t)&dw_dma_chip_pdata }, + {PCI_VDEVICE (INTEL ,0x0f40 ), .driver_data = (kernel_ulong_t)&dw_dma_chip_pdata },/* Merrifield */ - {PCI_VDEVICE (INTEL ,0x11a2 ), (kernel_ulong_t)&idma32_chip_pdata }, + {PCI_VDEVICE (INTEL ,0x11a2 ), .driver_data = (kernel_ulong_t)&idma32_chip_pdata },/* Braswell */ - {PCI_VDEVICE (INTEL ,0x2286 ), (kernel_ulong_t)&dw_dma_chip_pdata }, - {PCI_VDEVICE (INTEL ,0x22c0 ), (kernel_ulong_t)&dw_dma_chip_pdata }, + {PCI_VDEVICE (INTEL ,0x2286 ), .driver_data = (kernel_ulong_t)&dw_dma_chip_pdata }, + {PCI_VDEVICE (INTEL ,0x22c0 ), .driver_data = (kernel_ulong_t)&dw_dma_chip_pdata },/* Elkhart Lake iDMA 32-bit (PSE DMA) */ - {PCI_VDEVICE (INTEL ,0x4bb4 ), (kernel_ulong_t)&xbar_chip_pdata }, - {PCI_VDEVICE (INTEL ,0x4bb5 ), (kernel_ulong_t)&xbar_chip_pdata }, - {PCI_VDEVICE (INTEL ,0x4bb6 ), (kernel_ulong_t)&xbar_chip_pdata }, + {PCI_VDEVICE (INTEL ,0x4bb4 ), .driver_data = (kernel_ulong_t)&xbar_chip_pdata }, + {PCI_VDEVICE (INTEL ,0x4bb5 ), .driver_data = (kernel_ulong_t)&xbar_chip_pdata }, + {PCI_VDEVICE (INTEL ,0x4bb6 ), .driver_data = (kernel_ulong_t)&xbar_chip_pdata },/* Haswell */ - {PCI_VDEVICE (INTEL ,0x9c60 ), (kernel_ulong_t)&dw_dma_chip_pdata }, + {PCI_VDEVICE (INTEL ,0x9c60 ), .driver_data = (kernel_ulong_t)&dw_dma_chip_pdata },/* Broadwell */ - {PCI_VDEVICE (INTEL ,0x9ce0 ), (kernel_ulong_t)&dw_dma_chip_pdata }, + {PCI_VDEVICE (INTEL ,0x9ce0 ), .driver_data = (kernel_ulong_t)&dw_dma_chip_pdata }, { } };drivers/dma/pch_dma.c +13
-14@@ -956,19 +956,19 @@ static void pch_dma_remove(struct pci_dev *pdev)#define PCI_DEVICE_ID_ML7831_DMA2_4CH 0x8815static 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 */ - {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7213_DMA2_8CH ),8 },/* PCMIF SPI */ - {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7213_DMA3_4CH ),4 },/* FPGA */ - {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7213_DMA4_12CH ),12 },/* I2S */ - {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7223_DMA1_4CH ),4 },/* UART */ - {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7223_DMA2_4CH ),4 },/* Video SPI */ - {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7223_DMA3_4CH ),4 },/* Security */ - {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7223_DMA4_4CH ),4 },/* FPGA */ - {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7831_DMA1_8CH ),8 },/* UART */ - {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7831_DMA2_4CH ),4 },/* SPI */ - {0 , }, + {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_EG20T_PCH_DMA_8CH ), .driver_data =8 }, + {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_EG20T_PCH_DMA_4CH ), .driver_data =4 }, + {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7213_DMA1_8CH ), .driver_data =8 },/* UART Video */ + {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7213_DMA2_8CH ), .driver_data =8 },/* PCMIF SPI */ + {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7213_DMA3_4CH ), .driver_data =4 },/* FPGA */ + {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7213_DMA4_12CH ), .driver_data =12 },/* I2S */ + {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7223_DMA1_4CH ), .driver_data =4 },/* UART */ + {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7223_DMA2_4CH ), .driver_data =4 },/* Video SPI */ + {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7223_DMA3_4CH ), .driver_data =4 },/* Security */ + {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7223_DMA4_4CH ), .driver_data =4 },/* FPGA */ + {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7831_DMA1_8CH ), .driver_data =8 },/* UART */ + {PCI_VDEVICE (ROHM ,PCI_DEVICE_ID_ML7831_DMA2_4CH ), .driver_data =4 },/* SPI */ + { } };MODULE_DEVICE_TABLE (pci, pch_dma_id_table); --2.47.3