From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C5A9D376A0D for ; Thu, 11 Jun 2026 08:02:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781164963; cv=none; b=WixVG021fMt1pf/mw0HWQt87Diaev55Me18FIsqlxsYIY+VVPqCPHEyjdUfir4prAg5zDfs+9+LknTS/SEkfelziEVksw8T035aD/4D/rW+oAL1NY7EeyeCaJaasICItEWlPJN1KOE0ErCyPXi/QCRITSCLYG898qwXx0/D06pw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781164963; c=relaxed/simple; bh=32fjIRogMQH/aBmCWgG/o8/J83kcEv+5aQPcPv8jg0Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tkq2STqsxk3wCKrmDW4r2TaZuy8bUHZ6d8MJhDQX0gkaT/EN7QK8XWF5PmtZPJzcXlwBiYCKtWtfQ0Cxw3/EmX+1dc98PKl5cd7xSi205RD73IXsRMqoKvReKF+3tMoucEweW029FHdvT2g/vVqDBEckOWA/PfOUkq40z11o63Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre.com header.i=@baylibre.com header.b=DKb4Tgo7; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre.com header.i=@baylibre.com header.b="DKb4Tgo7" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-490c1915793so55255695e9.2 for ; Thu, 11 Jun 2026 01:02:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre.com; s=google; t=1781164960; x=1781769760; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YLsOXu/PIA0Rqgf0caOViuMa3t911qJAiucle+LAS6c=; b=DKb4Tgo792Ys+cRvV+ja3gRRX07vTLfxRQ1yM9v448YZjbZix2RkQpIf2boRxJUCOn e5do4q7H0Fe5b/VC1beR2TIYvIKTEJl4/cMWdBHXkMLZWDtPSaPm1MfyE0lm3BLvtlbt R2iEPN2ApUgtJlJBoPRdMRhQGL5VPKW04p968HQORn3+LQEH/HTxTRNDnHvZ9xKEueGi QaelOyEOdbI71LW3gnSr/H2zzZlxA/lCVkx+arb/V1Aa4QhkyJYgzToRMMwrENG8Egbi ONxEtSz2WHxVIBFZQ4YXz8TLH18NHmJU00KbWJGMvts2NiSSLCmjyZ0DRNWKNEmr+SKb PTRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781164960; x=1781769760; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=YLsOXu/PIA0Rqgf0caOViuMa3t911qJAiucle+LAS6c=; b=FX65Izul1yAAabUEpq8gAL/DdbceOgzOBb2FC23jW0492f0taBknYRMNSAQQm3CW/7 dzGsstE+ju0MLVahO32/cWZre5S5dLewpzldcQ9HPzP3abSc2Isd6VZGoUpJMjLSvM4T 4r94vwOvGFWYgL/g+EgSXNsb9QZ/PlBLLiApwIS2bonln35ui5nIdJG2g88RaJ/JongT b0U/HIwqmli0CD/fZCOB7yLqWrkElNR7xld8hhaUl8Iso0YZmQXznN3xxVA2usioXBa9 w4ko46ZOlarVC2Ce1ErkuuqmAMYIgykfNpIVVtwmJEsAfQ4TU9q6KHsApkS8Kj0imz8V TYKQ== X-Forwarded-Encrypted: i=1; AFNElJ+a4NAcugyl/jbeki+zS3cMFcq8nTmjvqwmwP5OXy+5EiJC6rK7LM8E0lsBtshH0vSIKxFxBGwpKv9WIdU=@vger.kernel.org X-Gm-Message-State: AOJu0YyF057a/DRlO9+0p/XsC5oBUm50rwsFIw63uqAYyikQOyo49G+L C9q8CEWjofvoCyFzFm/bkxTH0rJrXvD6AacYwC4ildWtwIBbtMIvg6uiJD2c0b3eNg8= X-Gm-Gg: Acq92OHf/1ynGXWuPnI+/aNsOjgF5Bh7V3jAFMaSoocogZGmbcMyBYWuiWOt/ul2924 CY5tl+T1gpHNYBOdgTmTEdPrBjllXe7aeYdK6N85tlP4lqGr55VuYe6QzfFhO1Myg2lHeLIE5qP Xu7M8qHSFIczpGPWr/dsvpVmN9VngSkBnbcjQ022X1IeNYHyTaj1m1aQIV8ovuVeShP56zJvOMQ L3I1FWXldhH2X8QANAvq4a21kD0gO+AqNf02Y2u1Q3lRas3n3c6MQ5swNZ7YWJvTHIIMNS2Q7Dl ViZjH14c7S0eUWeWtAftzuFFae021CI1tZRb9EywC5k5ofsL48wVfIww73lFD+7eTnK2RFHyftT EnAlsgF7w77exXhu/JF2kie5WT28sIJQeTR/yUDK0rAWi/ijs8Wdptu4D+s340WE/oJfQX2oCfg lUptp6O13oNsUF1bl57oEScHxQWoHP26pTTWLki5U= X-Received: by 2002:a05:600c:c108:b0:490:b5d0:598e with SMTP id 5b1f17b1804b1-490e55f1eb6mr14922115e9.21.1781164958550; Thu, 11 Jun 2026 01:02:38 -0700 (PDT) Received: from localhost ([2a02:8071:56d1:2de0:559d:eec2:887f:c200]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-490e47a8e85sm22883075e9.1.2026.06.11.01.02.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2026 01:02:37 -0700 (PDT) From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= To: Basavaraj Natikar , Vinod Koul , Manivannan Sadhasivam , Viresh Kumar Cc: Frank Li , Andy Shevchenko , dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] dmaengine: Consistently define pci_device_ids using named initializers Date: Thu, 11 Jun 2026 09:45:10 +0200 Message-ID: X-Mailer: git-send-email 2.47.3 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Developer-Signature: v=1; a=openpgp-sha256; l=6615; i=u.kleine-koenig@baylibre.com; h=from:subject:message-id; bh=32fjIRogMQH/aBmCWgG/o8/J83kcEv+5aQPcPv8jg0Y=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBqKmeKnX1O9Hkay7hEVI5fMabDKKW/NAKIRaKZw EcaoTuif6mJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCaipnigAKCRCPgPtYfRL+ TiemB/0aWWIyPSahgynklTbsAIcOZhrrUtfcfVHysAyCIQ2uAnMzUgCEmGqBacTLviRUuVXduTT HQu9PyjHVjJuMNezXXEPbY2Z3Pk9+q5+npOLg7gNCL5SV2J/d4sPqV+Y1KkcLbvOx4M8TksY86B jyxJAcDeJFDeSrK9HUkz4iltqgMqrgiNMauFT9TNsSZ8fL5Pax+faQmtryxkYhyMLNsp/Plf8yL ULS/x3gvamW3eISiR4M734Lln1TPp44Vr6ckCu6CNF3L6XY2pV1RFhIBqm+wFKMMSJzDnoMXKUP +kCgH/PPKnc7i8lUUNRm3fmILRr/8mnJ6MTept1oI11hNBaM X-Developer-Key: i=u.kleine-koenig@baylibre.com; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: 8bit 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. Signed-off-by: Uwe Kleine-König (The Capable Hub) --- 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(-) diff --git a/drivers/dma/amd/ptdma/ptdma-pci.c b/drivers/dma/amd/ptdma/ptdma-pci.c index 22739ff0c3c5..0b226bec950c 100644 --- a/drivers/dma/amd/ptdma/ptdma-pci.c +++ b/drivers/dma/amd/ptdma/ptdma-pci.c @@ -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); diff --git a/drivers/dma/dw-edma/dw-edma-pcie.c b/drivers/dma/dw-edma/dw-edma-pcie.c index 791c46e8ae4c..a27112de5497 100644 --- a/drivers/dma/dw-edma/dw-edma-pcie.c +++ b/drivers/dma/dw-edma/dw-edma-pcie.c @@ -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 }, { } diff --git a/drivers/dma/dw/pci.c b/drivers/dma/dw/pci.c index a3aae3d1c093..99565fab3565 100644 --- a/drivers/dma/dw/pci.c +++ b/drivers/dma/dw/pci.c @@ -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 }, { } }; diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c index bf805f1024f6..152939e7c6fd 100644 --- a/drivers/dma/pch_dma.c +++ b/drivers/dma/pch_dma.c @@ -956,19 +956,19 @@ static void pch_dma_remove(struct pci_dev *pdev) #define PCI_DEVICE_ID_ML7831_DMA2_4CH 0x8815 static 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