From nobody Sun Jun 14 02:36:45 2026 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 092903DEACB for ; Mon, 4 May 2026 14:21:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777904489; cv=none; b=bYQV0KrzilZouJQ4uYqfmQxrw8qt3HAAN0BHSiLdxvPJrX3NbWUUOaNEV/cGvJDXWJ4kAZcsOHJtoyE8nZGEOnJrgucDj5gaAQKD4t8rRSPZWlVKHx9MRK06m3yFt9FegOPJQ35zHpnsYoqiNXWg+6oRKx86feJh+A/UEYJmP3Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777904489; c=relaxed/simple; bh=5wOwuVvefdU5ZTRUm0XTEf89qcddrLF3nFm7eExiqLo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=pP2p2Sv0fXAKXNxgGqP8DO12IrtnTj5BVGfoAdHtPm/55u3UsPBFXksglqrJtt+mgVkU7THnx16jZ399aUjIcpMHwuXKAxKou+7BR7UPQNiXqSNoD5LoD3S94PoN/cgi4cJ1THBwHYxCh+wXRmAIrAOfX8jtF0wuyUDoApNMX4s= 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.20251104.gappssmtp.com header.i=@baylibre-com.20251104.gappssmtp.com header.b=Kyhunzos; arc=none smtp.client-ip=209.85.128.54 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.20251104.gappssmtp.com header.i=@baylibre-com.20251104.gappssmtp.com header.b="Kyhunzos" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-48a563e4ef7so40003875e9.0 for ; Mon, 04 May 2026 07:21:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20251104.gappssmtp.com; s=20251104; t=1777904484; x=1778509284; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=T6YVwSs5jEunYIFmliOy6CPtzbx28+OMoZtmtntomi0=; b=Kyhunzosl9YvBtAbqtPkBv01KJp0U+egsfqMsgtqFTnJE9tdrO6lAzqmhmHo7tmLoe WU68bbSx3a8TIxnQZJLci0kaRAET7UpICCOmg1z3ZMHM/yc2GNZ+0NnbpXlYCLC0l59o wiCrGMb+1GVMK3HdPEQB3FEifd2hZ4pilM/cysmA4US7cx9kWk/VN5ZlysjGxUJoRFZl XR2N4sl3s+YHLFl5yWtggxbDoy5QOQbtd8/ZhYg7B3rFvSXY/lnN34QOvztcjSXf/zCx bSBJJ9C1hwW77E8aLNWES4Ww4GCE1QNrmLbGeHrp21t4qofbgLkZL65ecEgq5pg5Cb+o /2DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777904484; x=1778509284; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=T6YVwSs5jEunYIFmliOy6CPtzbx28+OMoZtmtntomi0=; b=M8c9hZseSuamG4JyAqnoeEvKXnF7G7N53SAa6spGNPwQbYMHHQtWwL/8oUsie14DJ9 b1cTMYFxWPYXbIL1GGeqfK0XPLyBW8G1pPTkLJqana2F8c/ylgVhjuSd2Tit4rf8cTSo 2hq0e0+ytsBvHNoAwvm4g61yigeVy53YAid4lo38vHxTzpjkp9aHWkF7tmTvHwl6ghMO Do5DhMKhXJUj3zzMEVJUXgvE7dGhIgBMDDrDn5ONxoL9oOXTgxBubOe8PQ2B+jGN/cN+ n0rl5TwJTT51an2x+JxpuN3p8BhTZe04S7neb8LrVHWnVHRVbyIA1j1REzusGcvd8LAX SD0w== X-Forwarded-Encrypted: i=1; AFNElJ+c/zrz4G16/EQPx0IBGsXCmqdX4Ct7r1Gt9d6k8o4kQ6tB+znYMLfE2CeJ/qyaMm5YmS4J+9Kmm+JU+GA=@vger.kernel.org X-Gm-Message-State: AOJu0YwvoCqPlZSZXd912PfPQ5WgnQSfpl3S1i55+r9I6lRFPo4OWuBm tbb5cdeT7QNTOOk46to2E0iFljO3hPxAKxSATzdBWUNfCrH0zaYzs/KDFwkYYP5q+Lw= X-Gm-Gg: AeBDiesQjP8mYTY4meXXpr8l6SVVTTIKqNOGsQHFDdsJNbDddBt20TDIK6m8pqf/4L1 3KH2zDzSwR//zU+QdVi+8ZWCGzLJVhwIMdh8d676z88fjt8f7PldEu9w35lOwWBKMmss+V6WE4r ncc1oFmmLlwmOqFSOUpTBKhiX8QPxPFwpmxX7mScLdzEPVemu7yyMmUJEdrSD4dFtlWPIau3b1S rOkK2ahSrwIhhbGS9lQDLiDoa1F8GjX8j3NZte9CNnFXSsbo0t5P2pQWfbbJ24pc7YoYQnvj8pV f9sqNAyDfh90ETiaGrkv/lD7CWW1WYdX2Us+w0xWbZ8TYpldjSjTPDpEkpH+ot+fkOLKQCBB4uW 1dmi/+3H/LTWfly4aiHsLYWMZh9wYOcH3/LUnGgtzqZLhQpEuqMtvpCmkNmewHadZF3DynIB3Nw m5UiYxcCzlFBOtgxFOYeOVgwhGMNGvGq4km7EyhVymAUeZLrjBi2P4KctX+TDH500a6eVR2WMy4 CW6p+U8bxBpZ2D+QWe8bhI7Pg== X-Received: by 2002:a05:600c:c170:b0:48a:7aad:4425 with SMTP id 5b1f17b1804b1-48a9852e515mr156429485e9.3.1777904484336; Mon, 04 May 2026 07:21:24 -0700 (PDT) Received: from localhost (p200300f65f114e08197264a4bf9e813f.dip0.t-ipconnect.de. [2003:f6:5f11:4e08:1972:64a4:bf9e:813f]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-48a8fe94be1sm102456925e9.1.2026.05.04.07.21.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2026 07:21:23 -0700 (PDT) From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= To: Mark Brown Cc: Markus Schneider-Pargmann , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] spi: Consistently define pci_device_ids using named initializers Date: Mon, 4 May 2026 16:21:17 +0200 Message-ID: <20260504142117.2116978-2-u.kleine-koenig@baylibre.com> X-Mailer: git-send-email 2.47.3 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=12488; i=u.kleine-koenig@baylibre.com; h=from:subject; bh=5wOwuVvefdU5ZTRUm0XTEf89qcddrLF3nFm7eExiqLo=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBp+KtdGgGNLmB00W/cEQb1+hTNgxLK6SEACtxjy 0fnD7B93eGJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCafirXQAKCRCPgPtYfRL+ Tjh3B/9qS0LYm/MOnw9wq9fNga6vjjEVRxfF5YmONbruT5wsOvWGALwdTtk7WcpJT0QWh8IHNdw CmK0IzIho9lTFhW4OA1DyI4yGkcNqyCq16JWWmGZD1D+4KLtuCyA9DaSIpKd/btI4WruMESfgz9 tAsCwUb+WBdETQTX40qUNLyyV36waPoZCLtMmMpCBXLGZFicp25Cj+t5/EHMMewz1MX2a9lFHft ZAxPSg5z2i8tPjAXXcL2SsPJZzD+HqjmP6Thjv1AJ83QNMiWF+J4snXxbMVy5fb+XgB6V8Aj+6C NL2h9QGGM70mink/0qMCfsfyI7KF/GI0c/f+GCSn7FA9Y2zf X-Developer-Key: i=u.kleine-koenig@baylibre.com; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable 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. Also skip explicit assignments of 0 (which the compiler then takes care of). This change doesn't introduce changes to the compiled pci_device_id arrays. Tested on x86 and arm64. Signed-off-by: Uwe Kleine-K=C3=B6nig (The Capable Hub) --- Hello, The secret plan is to make struct pci_device_id::driver_data an anonymous union (similar to https://lore.kernel.org/all/cover.1776579304.git.u.kleine-koenig@baylibre.c= om/) and that requires named initializers. But IMHO it's also a nice cleanup on its own. The anonymous union will allow changes like the following: - { PCI_VDEVICE(INTEL, 0x4b84), .driver_data =3D (kernel_ulong_t)&dw_spi_pc= i_ehl_desc }, + { PCI_VDEVICE(INTEL, 0x4b84), .driver_data_ptr =3D &dw_spi_pci_ehl_desc }, (together with the respective change in the code when the value is used). This gets rid of a bunch of casts and thus slightly improving type safety. Best regards Uwe drivers/spi/spi-dw-pci.c | 14 ++++---- drivers/spi/spi-intel-pci.c | 66 +++++++++++++++++----------------- drivers/spi/spi-pci1xxxx.c | 42 +++++++++++----------- drivers/spi/spi-topcliff-pch.c | 8 ++--- 4 files changed, 65 insertions(+), 65 deletions(-) diff --git a/drivers/spi/spi-dw-pci.c b/drivers/spi/spi-dw-pci.c index 72d9f5bc87f7..7f002d5e5b88 100644 --- a/drivers/spi/spi-dw-pci.c +++ b/drivers/spi/spi-dw-pci.c @@ -185,15 +185,15 @@ static const struct pci_device_id dw_spi_pci_ids[] = =3D { * exclusively used by SCU to communicate with MSIC. */ /* Intel MID platform SPI controller 1 */ - { PCI_VDEVICE(INTEL, 0x0800), (kernel_ulong_t)&dw_spi_pci_mid_desc_1}, + { PCI_VDEVICE(INTEL, 0x0800), .driver_data =3D (kernel_ulong_t)&dw_spi_pc= i_mid_desc_1 }, /* Intel MID platform SPI controller 2 */ - { PCI_VDEVICE(INTEL, 0x0812), (kernel_ulong_t)&dw_spi_pci_mid_desc_2}, + { PCI_VDEVICE(INTEL, 0x0812), .driver_data =3D (kernel_ulong_t)&dw_spi_pc= i_mid_desc_2 }, /* Intel Elkhart Lake PSE SPI controllers */ - { PCI_VDEVICE(INTEL, 0x4b84), (kernel_ulong_t)&dw_spi_pci_ehl_desc}, - { PCI_VDEVICE(INTEL, 0x4b85), (kernel_ulong_t)&dw_spi_pci_ehl_desc}, - { PCI_VDEVICE(INTEL, 0x4b86), (kernel_ulong_t)&dw_spi_pci_ehl_desc}, - { PCI_VDEVICE(INTEL, 0x4b87), (kernel_ulong_t)&dw_spi_pci_ehl_desc}, - {}, + { PCI_VDEVICE(INTEL, 0x4b84), .driver_data =3D (kernel_ulong_t)&dw_spi_pc= i_ehl_desc }, + { PCI_VDEVICE(INTEL, 0x4b85), .driver_data =3D (kernel_ulong_t)&dw_spi_pc= i_ehl_desc }, + { PCI_VDEVICE(INTEL, 0x4b86), .driver_data =3D (kernel_ulong_t)&dw_spi_pc= i_ehl_desc }, + { PCI_VDEVICE(INTEL, 0x4b87), .driver_data =3D (kernel_ulong_t)&dw_spi_pc= i_ehl_desc }, + { }, }; MODULE_DEVICE_TABLE(pci, dw_spi_pci_ids); =20 diff --git a/drivers/spi/spi-intel-pci.c b/drivers/spi/spi-intel-pci.c index d8ef8f89330a..8c429c832ddd 100644 --- a/drivers/spi/spi-intel-pci.c +++ b/drivers/spi/spi-intel-pci.c @@ -66,39 +66,39 @@ static int intel_spi_pci_probe(struct pci_dev *pdev, } =20 static const struct pci_device_id intel_spi_pci_ids[] =3D { - { PCI_VDEVICE(INTEL, 0x02a4), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0x06a4), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0x18e0), (unsigned long)&bxt_info }, - { PCI_VDEVICE(INTEL, 0x19e0), (unsigned long)&bxt_info }, - { PCI_VDEVICE(INTEL, 0x1bca), (unsigned long)&bxt_info }, - { PCI_VDEVICE(INTEL, 0x34a4), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0x38a4), (unsigned long)&bxt_info }, - { PCI_VDEVICE(INTEL, 0x43a4), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0x4b24), (unsigned long)&bxt_info }, - { PCI_VDEVICE(INTEL, 0x4d23), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0x4da4), (unsigned long)&bxt_info }, - { PCI_VDEVICE(INTEL, 0x51a4), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0x54a4), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0x5794), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0x5825), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0x6e24), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0x7723), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0x7a24), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0x7aa4), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0x7e23), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0x7f24), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0x9d24), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0x9da4), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0xa0a4), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0xa1a4), (unsigned long)&bxt_info }, - { PCI_VDEVICE(INTEL, 0xa224), (unsigned long)&bxt_info }, - { PCI_VDEVICE(INTEL, 0xa2a4), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0xa324), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0xa3a4), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0xa823), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0xd323), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0xe323), (unsigned long)&cnl_info }, - { PCI_VDEVICE(INTEL, 0xe423), (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0x02a4), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0x06a4), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0x18e0), .driver_data =3D (unsigned long)&bxt_info }, + { PCI_VDEVICE(INTEL, 0x19e0), .driver_data =3D (unsigned long)&bxt_info }, + { PCI_VDEVICE(INTEL, 0x1bca), .driver_data =3D (unsigned long)&bxt_info }, + { PCI_VDEVICE(INTEL, 0x34a4), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0x38a4), .driver_data =3D (unsigned long)&bxt_info }, + { PCI_VDEVICE(INTEL, 0x43a4), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0x4b24), .driver_data =3D (unsigned long)&bxt_info }, + { PCI_VDEVICE(INTEL, 0x4d23), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0x4da4), .driver_data =3D (unsigned long)&bxt_info }, + { PCI_VDEVICE(INTEL, 0x51a4), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0x54a4), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0x5794), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0x5825), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0x6e24), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0x7723), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0x7a24), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0x7aa4), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0x7e23), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0x7f24), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0x9d24), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0x9da4), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0xa0a4), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0xa1a4), .driver_data =3D (unsigned long)&bxt_info }, + { PCI_VDEVICE(INTEL, 0xa224), .driver_data =3D (unsigned long)&bxt_info }, + { PCI_VDEVICE(INTEL, 0xa2a4), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0xa324), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0xa3a4), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0xa823), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0xd323), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0xe323), .driver_data =3D (unsigned long)&cnl_info }, + { PCI_VDEVICE(INTEL, 0xe423), .driver_data =3D (unsigned long)&cnl_info }, { }, }; MODULE_DEVICE_TABLE(pci, intel_spi_pci_ids); diff --git a/drivers/spi/spi-pci1xxxx.c b/drivers/spi/spi-pci1xxxx.c index 8577a19705de..af6ed78493e3 100644 --- a/drivers/spi/spi-pci1xxxx.c +++ b/drivers/spi/spi-pci1xxxx.c @@ -173,27 +173,27 @@ struct pci1xxxx_spi { }; =20 static const struct pci_device_id pci1xxxx_spi_pci_id_table[] =3D { - { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa004, PCI_ANY_ID, 0x0001), 0, 0, 0x02}, - { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa004, PCI_ANY_ID, 0x0002), 0, 0, 0x01}, - { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa004, PCI_ANY_ID, 0x0003), 0, 0, 0x11}, - { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa004, PCI_ANY_ID, PCI_ANY_ID), 0, 0, 0= x01}, - { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa014, PCI_ANY_ID, 0x0001), 0, 0, 0x02}, - { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa014, PCI_ANY_ID, 0x0002), 0, 0, 0x01}, - { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa014, PCI_ANY_ID, 0x0003), 0, 0, 0x11}, - { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa014, PCI_ANY_ID, PCI_ANY_ID), 0, 0, 0= x01}, - { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa024, PCI_ANY_ID, 0x0001), 0, 0, 0x02}, - { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa024, PCI_ANY_ID, 0x0002), 0, 0, 0x01}, - { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa024, PCI_ANY_ID, 0x0003), 0, 0, 0x11}, - { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa024, PCI_ANY_ID, PCI_ANY_ID), 0, 0, 0= x01}, - { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa034, PCI_ANY_ID, 0x0001), 0, 0, 0x02}, - { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa034, PCI_ANY_ID, 0x0002), 0, 0, 0x01}, - { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa034, PCI_ANY_ID, 0x0003), 0, 0, 0x11}, - { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa034, PCI_ANY_ID, PCI_ANY_ID), 0, 0, 0= x01}, - { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa044, PCI_ANY_ID, 0x0001), 0, 0, 0x02}, - { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa044, PCI_ANY_ID, 0x0002), 0, 0, 0x01}, - { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa044, PCI_ANY_ID, 0x0003), 0, 0, 0x11}, - { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa044, PCI_ANY_ID, PCI_ANY_ID), 0, 0, 0= x01}, - { 0, } + { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa004, PCI_ANY_ID, 0x0001), .driver_dat= a =3D 0x02 }, + { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa004, PCI_ANY_ID, 0x0002), .driver_dat= a =3D 0x01 }, + { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa004, PCI_ANY_ID, 0x0003), .driver_dat= a =3D 0x11 }, + { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa004, PCI_ANY_ID, PCI_ANY_ID), .driver= _data =3D 0x01 }, + { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa014, PCI_ANY_ID, 0x0001), .driver_dat= a =3D 0x02 }, + { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa014, PCI_ANY_ID, 0x0002), .driver_dat= a =3D 0x01 }, + { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa014, PCI_ANY_ID, 0x0003), .driver_dat= a =3D 0x11 }, + { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa014, PCI_ANY_ID, PCI_ANY_ID), .driver= _data =3D 0x01 }, + { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa024, PCI_ANY_ID, 0x0001), .driver_dat= a =3D 0x02 }, + { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa024, PCI_ANY_ID, 0x0002), .driver_dat= a =3D 0x01 }, + { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa024, PCI_ANY_ID, 0x0003), .driver_dat= a =3D 0x11 }, + { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa024, PCI_ANY_ID, PCI_ANY_ID), .driver= _data =3D 0x01 }, + { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa034, PCI_ANY_ID, 0x0001), .driver_dat= a =3D 0x02 }, + { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa034, PCI_ANY_ID, 0x0002), .driver_dat= a =3D 0x01 }, + { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa034, PCI_ANY_ID, 0x0003), .driver_dat= a =3D 0x11 }, + { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa034, PCI_ANY_ID, PCI_ANY_ID), .driver= _data =3D 0x01 }, + { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa044, PCI_ANY_ID, 0x0001), .driver_dat= a =3D 0x02 }, + { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa044, PCI_ANY_ID, 0x0002), .driver_dat= a =3D 0x01 }, + { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa044, PCI_ANY_ID, 0x0003), .driver_dat= a =3D 0x11 }, + { PCI_DEVICE_SUB(VENDOR_ID_MCHP, 0xa044, PCI_ANY_ID, PCI_ANY_ID), .driver= _data =3D 0x01 }, + { } }; =20 MODULE_DEVICE_TABLE(pci, pci1xxxx_spi_pci_id_table); diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c index 14d11450e86d..02ced638d8b4 100644 --- a/drivers/spi/spi-topcliff-pch.c +++ b/drivers/spi/spi-topcliff-pch.c @@ -207,10 +207,10 @@ struct pch_pd_dev_save { }; =20 static const struct pci_device_id pch_spi_pcidev_id[] =3D { - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_GE_SPI), 1, }, - { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_SPI), 2, }, - { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_SPI), 1, }, - { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7831_SPI), 1, }, + { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_GE_SPI), .driver_data =3D 1 }, + { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_SPI), .driver_data =3D 2 }, + { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_SPI), .driver_data =3D 1 }, + { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7831_SPI), .driver_data =3D 1 }, { } }; =20 base-commit: 254f49634ee16a731174d2ae34bc50bd5f45e731 --=20 2.47.3