From nobody Thu Sep 24 23:33:50 2026 Received: from mail-wm2-f13.google.com (mail-wm2-f13.google.com [74.125.225.141]) (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 3C2943A9013 for ; Fri, 18 Sep 2026 13:02:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.141 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789736525; cv=none; b=GTeTQd6RYnPs8DgbR9jRd7DGOER9f9lS4eohyG/97S3OdmqQqB29AZB43g79fVDVFDWkRtnUyOG0KHe93QxKnv1h9ck6mdqJG7EA09S2nJ2IGFT01lHFFji4iVyo/Z/x7UQpnft7wj6teVkGpBanOypmngenXsGDBjtlU2OZoAE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789736525; c=relaxed/simple; bh=fa6kq1q/j0kmHwk4URxaYOv2Xe357GRD8EOADLztHbM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ch/OxvBQjffcxVUW+7Lod6pFbIifqQhUCbT89ux1NoQ6/ITIsR0lHVP7G/C7FKa6KgAy7zO/9oHUvFdnsnRZ/rOr8/yTBExmf0YPPRQTXC7rjKBCe98NxywCmPmlsfcNrZWQ58Z6rLZFeF7AsdJIJFB5jDVVIGTxUTGnoEWyKXY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=thegoodpenguin.co.uk; spf=pass smtp.mailfrom=thegoodpenguin.co.uk; dkim=pass (2048-bit key) header.d=thegoodpenguin-co-uk.20251104.gappssmtp.com header.i=@thegoodpenguin-co-uk.20251104.gappssmtp.com header.b=NZrH3U87; arc=none smtp.client-ip=74.125.225.141 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=thegoodpenguin.co.uk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=thegoodpenguin.co.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=thegoodpenguin-co-uk.20251104.gappssmtp.com header.i=@thegoodpenguin-co-uk.20251104.gappssmtp.com header.b="NZrH3U87" Received: by mail-wm2-f13.google.com with SMTP id 5b1f17b1804b1-49b912d37b6so3562075e9.0 for ; Fri, 18 Sep 2026 06:02:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thegoodpenguin-co-uk.20251104.gappssmtp.com; s=20251104; t=1789736520; x=1790341320; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=ZtkHI/KnMWq6CTlHyr0XTNdYgawafpLs2G6PQA3uwQY=; b=NZrH3U87dZsnlbwOto4AUSnCpj9hOectdrGDxbsNgt4SlS16Qg13X8u47IdvjkbPzc tZqUY7mgIpwEFdF9dtwxCGCQVNKeglmj8SNcvLbCkEgXjmpSSHujzBO8e8XMGE/oKJlZ 0ydHrrCm1023xdazO+bRAyUqJG2rz3HtuBsDVzxH2Kxz2Lhh5rBBWmNfp7ToGNjomsqB HpMF58YPMI186FVwaJb8i7wnAo0U+HcANip1Z1EXA7Rh4cGU6JLcNT/9fBkoV4Pg44lO TmmJdnmK/ionL9Cb5cgOPwQ5QBfVfq6oyhBb09WNQOiU7CKpa6jehWUx6OagPo1eQHHP 0Hdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789736520; x=1790341320; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=ZtkHI/KnMWq6CTlHyr0XTNdYgawafpLs2G6PQA3uwQY=; b=CchjPcrKcmlhKfPzhqsgyHBCfKHNvGbdkImiV8V7nLx2Z4Pv4qHcZyn9JMMNShMfok aVO+ZIdIG/VyAnIBpYErPaKqJtqWNIqQilSOWNZPeuUPEF9i5+GWI95dNEl4A6SxDM21 hSBT1q+YlpyxGC7YMHpCCkX5BwiI6ZGVidmBDauuon7/99wFM7W0esJj7rMk3PReC2yx ZGvtkR8AjAT7i9BgIxM6V0gWhBK/wXVdvukFvt2LZqSxu+G8Fh8H2Z85WWMjH86nvaaJ PFw68VoT8J+nfGlQkAiujRB8RWuP2UjHKMXre/RUxP+secepIvT8NUvdH2dHjhxYehkI 6F2w== X-Forwarded-Encrypted: i=1; AKwUvBymavf/zs+oDVxmhKKa0A3VEgKESpWPc760EnDapIC1keJsce3CXQBfYLThwLwdTFXVb66z4E6ZJvWlKsU=@vger.kernel.org X-Gm-Message-State: AFuF++lwNFYGRMb+83V9r4TJUw8q8A57C3Ee7MC/hCG3IfDmcawyottI ZeczNfp4m6OI2eRg4KKYINdredUHgOpwBmx7SdJASyxR3aHM4gs1DGAgbEGqqSaxIx8= X-Gm-Gg: AYBFou1I/2dhFS1Bcmd4dIKZwQ4C2SVgMjXj9JUhB1kcHh7i7j73WHK0JZSwreQrRFs WH2OHNcnFeUN16Z7QvwKOJ53Z40AGOx0Lv9MiIpbbLYlFtthSgQHJoZ9H5Qu+XzTGwGm3Vsm1yX QE8V+I7/Qe2wLrKTT6S1pT3K/svqK+CCGqzi1OdZU3qBCoyUVOpTz2k1NG8w1g6/SOTIeL3MDkp Gc4O3ay6CSGHgW9TNQdBhgYv5Hj6+7WM3sWg0owOnJtGgDeFILy71Ih82Eu2cLRNTeUeoYLAtRE qQnExx2d/IMXD6TQOkeAP5ORY9JOFQaJn5V+Q74B22R+7hWJW3e945tHn+FSyWvBvGUW9bZ0cQO eFdEqYb/JjXEyDYTTeaOPe6Gbwm1LCecgVMjaBgrn1Kf01geN/CV3pugbEt2HxIJqzF1ZydRacX ZG8hcqjjjwgNHtDav06gVSt/+9n3O4hyTb8qYGx4PKzDoqxeATlgQ2a5KZDSzNDLBaWNOWH0CUB L04ClTzjQ5J4iw= X-Received: by 2002:a05:600c:1f95:b0:49f:bcb7:8e9 with SMTP id 5b1f17b1804b1-49fc5726c1fmr60894575e9.9.1789736520206; Fri, 18 Sep 2026 06:02:00 -0700 (PDT) Received: from [10.42.0.1] ([2a00:23c7:1d1a:9c01:767:e33f:e8e7:bc85]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fbd24034esm188663345e9.15.2026.09.18.06.01.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 06:01:59 -0700 (PDT) From: Pawel Zalewski Date: Fri, 18 Sep 2026 14:01:50 +0100 Subject: [PATCH 1/2] i2c: i2c-core-acpi: use named initializers for acpi_device_id 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" Content-Transfer-Encoding: quoted-printable Message-Id: <20260918-acpi-i2c-v1-1-caf4bea4886c@thegoodpenguin.co.uk> References: <20260918-acpi-i2c-v1-0-caf4bea4886c@thegoodpenguin.co.uk> In-Reply-To: <20260918-acpi-i2c-v1-0-caf4bea4886c@thegoodpenguin.co.uk> To: Andi Shyti , Mika Westerberg , Shyam Sundar S K , Elie Morisse , Benson Leung , Guenter Roeck , Mika Westerberg , Andy Shevchenko , Wolfram Sang , Devyn Liu , Oleksij Rempel , Pengutronix Kernel Team , Frank Li , Sascha Hauer , Fabio Estevam , Binbin Zhou , Khalil Blaiech , Asmaa Mnebhi , Mukesh Kumar Savaliya , Viken Dadhaniya , Ard Biesheuvel , Laxman Dewangan , Dmitry Osipenko , Thierry Reding , Jonathan Hunter , Israel Cepeda , Hans de Goede , Sakari Ailus , Hans Hu , George Cherian Cc: linux-i2c@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, chrome-platform@lists.linux.dev, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-tegra@vger.kernel.org, Pawel Zalewski X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1789736516; l=1626; i=pzalewski@thegoodpenguin.co.uk; s=20260430; h=from:subject:message-id; bh=fa6kq1q/j0kmHwk4URxaYOv2Xe357GRD8EOADLztHbM=; b=EYFqwB3JTSDF/v6810RjGhnD5BuvCmTHk4T0POvMYduD0+qDSn25FQg7BXKXC7O8I0YPInY/k wW3a/ein6rHDASDulAEy/3FhDJTusf+soHqll38+PQvEAnd5Rrg6OMI X-Developer-Key: i=pzalewski@thegoodpenguin.co.uk; a=ed25519; pk=vHq4n9IonORH2GTzLv8r6CWAFHzgfBuNkQPXA8NSly0= Use a designated initializer for the acpi_device_id fields which makes the code more readable and consistent with how lists are initialized in the rest of the kernel code base. Also drop explicitly setting fields to 0 where it is redundant. Unify the list terminator to have a single space between the brackets and no trailing comma. Signed-off-by: Pawel Zalewski Acked-by: Mika Westerberg --- drivers/i2c/i2c-core-acpi.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c index 8f3bdd50186e..5161e8a7ca10 100644 --- a/drivers/i2c/i2c-core-acpi.c +++ b/drivers/i2c/i2c-core-acpi.c @@ -352,8 +352,8 @@ static const struct acpi_device_id i2c_acpi_force_400kh= z_device_ids[] =3D { * at 400KHz (as can be expected of any recent i2c hw) so we force * the speed of the bus to 400 KHz if a Silead device is present. */ - { "MSSL1680", 0 }, - {} + { .id =3D "MSSL1680" }, + { } }; =20 static const struct acpi_device_id i2c_acpi_force_100khz_device_ids[] =3D { @@ -371,11 +371,11 @@ static const struct acpi_device_id i2c_acpi_force_100= khz_device_ids[] =3D { * the device works without issues on Windows at what is expected to be * a 400KHz frequency. The root cause of the issue is not known. */ - { "DLL0945", 0 }, - { "ELAN0678", 0 }, - { "ELAN06FA", 0 }, - { "ELAN1300", 0 }, - {} + { .id =3D "DLL0945" }, + { .id =3D "ELAN0678" }, + { .id =3D "ELAN06FA" }, + { .id =3D "ELAN1300" }, + { } }; =20 static acpi_status i2c_acpi_lookup_speed(acpi_handle handle, u32 level, --=20 2.43.0 From nobody Thu Sep 24 23:33:50 2026 Received: from mail-wm2-f13.google.com (mail-wm2-f13.google.com [74.125.225.141]) (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 B3BCC4A2630 for ; Fri, 18 Sep 2026 13:02:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.141 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789736528; cv=none; b=HkZ7+a5KkcexJwaX29mRtiaCBjaWbhMdwJm5EpMZARqfmc2V4LV/J9LIWgmUnBNTw3cHYpsZ/oMGaGCgneJ/fQBBfp6T0UWZTLc26oVXhXb/zydkha7dm2c6rgD3ObDWnwFjgRb2I1Pq5Ia6NfrVoDmsPw9Ey3m4IsFzpHOGJXY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789736528; c=relaxed/simple; bh=uQuDrQC54rH73rDKSYpShBEhGdmb7pu28vKNxMjdMYA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JlPg3o+T/drI1lVeClG+hRhZIwspHOM8Oo+nOLcpent6Rbx6fxiy0nrS3gnKbDFi9tnmWmjTUIhTMfEZEOMFuKuFN5QtCAOgPCAGJdnYFigFuFcqP3/brKApf9SGgmsIkW+YRFuHc2FwWHCvMX1zBGV4GVSJsBiQ1JpjFUP/qGc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=thegoodpenguin.co.uk; spf=pass smtp.mailfrom=thegoodpenguin.co.uk; dkim=pass (2048-bit key) header.d=thegoodpenguin-co-uk.20251104.gappssmtp.com header.i=@thegoodpenguin-co-uk.20251104.gappssmtp.com header.b=TiEzSBW3; arc=none smtp.client-ip=74.125.225.141 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=thegoodpenguin.co.uk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=thegoodpenguin.co.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=thegoodpenguin-co-uk.20251104.gappssmtp.com header.i=@thegoodpenguin-co-uk.20251104.gappssmtp.com header.b="TiEzSBW3" Received: by mail-wm2-f13.google.com with SMTP id 5b1f17b1804b1-49ccead2aecso3831645e9.0 for ; Fri, 18 Sep 2026 06:02:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thegoodpenguin-co-uk.20251104.gappssmtp.com; s=20251104; t=1789736523; x=1790341323; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=EOCNg+dN98nBmxQbC7nXxjUH9WHqr4W+3IIRIsKj1vs=; b=TiEzSBW3jNjaaQmnPuUbb+aq2CgWDRQ3bNpfU7QVXpPy8mwYgw73Hw0IgMsX6CxmXI CaOaqlJMCySe6Ics6vIGkiczfcg17y1ps3Vv7JMD98VjjyyPnHA/GQDnMAufrLF2h8oz 0eXg68HRlxrVfoHCVZSMJhR6rZCZmHivCcY47y0lG1E8nk9G7Rtdx+1cxQ1hMQJbcIdx 365Y92wX4WzW0D1MHntvEO4KQtDRsKA/mSoubmnqD5AXF6GcDf8AL0ws/jX6x851MJlC h87L+zDZ9zGqJ+9h8Qd3nCFcyYA+kZEaW6E0qtZQQJkO2UW03CdcIV30KK2uMsxc5JiS iuuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789736523; x=1790341323; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=EOCNg+dN98nBmxQbC7nXxjUH9WHqr4W+3IIRIsKj1vs=; b=pO+8aOPi+QPfixl7jjVPPFsbtZvvTaQ8z2ryVjEn5ly+BXOstnoPzqOR8xckYaDiqg uTEW8RmhUR+8HoI4MPRRGbyVggzuH58xwduRhd229HvP5dKtKyhk2THlWajOnCUrm1pY ZR6IE7WfdcMWWyyZIavxgKApeW5/KMUwjGOJd1hATqpHaDaqgSMxNENNw9v8a2T1rtXZ 6zscwHmQ13Mc2zaUnYq7fJltdMsvRi088Kl3Lk9Xbm3wFGf02tQiW5kes9b+ZhzGeuTK Pzeksd+hW0UWskpDJM2SegGKx/hF+Q0WRDTNRdUqJUNLlmWdze4mrbVDPENFLIvqJEeN btDw== X-Forwarded-Encrypted: i=1; AKwUvBxayLxaEfX76X4pmU9tN2VQfFwFSeiYFIxsfepJqDZvttUVRhEzPpFer9A+Hi8CMjN2wTecz8Hs+DREE0M=@vger.kernel.org X-Gm-Message-State: AFuF++kHN0ey2ZWTRz0qFJ/yxIgwkTCCA/7GJgsj2z+Km4nYG+37eiL9 oUWbGUHKmc2TjCJylCHaPKSOLoW50KKos2ipwv1D7T/n+0296ZE7iZZ5s9b7O9ZEuKs= X-Gm-Gg: AYBFou3ZBvBMTYwNVVDYPqbn4tFwGiEw52jI+QKo4wHixTKji3tBVtZteYyWdcXNLFR tTuUSlK82H3/Y7eYLGMcfv0pBndpSz0sFd7+dROUzytX+aahFBaaz6JD4emfGvsCZdIJ/rLbXPO EUAPHQQLCODltAO2xF7Kklgkl7k8F5d+zZyZVTSsRvLgApuTgViUChyUGd4K0qMJMOUObtZY+H3 7IwBk3wHTIqsMgler/SQOhBCNx8lx6RzURdG00Yz773KOW9Eok40bxuujtMFE1Cu9xzl8n60Kec Pd9MoGttp6Pzez/9mMjhvFJ1i6DXm9tjNhCu89yfwiuFAXhCtMgtjg/8CVXFdrWw5BhSGYaRyb0 kfxBYfnRdzQtlIRAnjDPhobHkdwcVEDH+SH5rZMoJFq2lfoEzlSa233ygAgp+UYTS7S3vQianeN OfiygyUK/ZdOyASwJZMwUK1EtRWWo/dOpDnk+K6Z1daPMi0MstQTVN9OVUZk//91AXMFjtzVIiq 9LLUbSAzAfK9yk= X-Received: by 2002:a05:600c:8584:b0:49f:cbf1:e76d with SMTP id 5b1f17b1804b1-49fcbf1e9a5mr8437375e9.0.1789736522589; Fri, 18 Sep 2026 06:02:02 -0700 (PDT) Received: from [10.42.0.1] ([2a00:23c7:1d1a:9c01:767:e33f:e8e7:bc85]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fbd24034esm188663345e9.15.2026.09.18.06.02.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2026 06:02:01 -0700 (PDT) From: Pawel Zalewski Date: Fri, 18 Sep 2026 14:01:51 +0100 Subject: [PATCH 2/2] i2c: busses: use named initializers for acpi_device_id 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" Content-Transfer-Encoding: quoted-printable Message-Id: <20260918-acpi-i2c-v1-2-caf4bea4886c@thegoodpenguin.co.uk> References: <20260918-acpi-i2c-v1-0-caf4bea4886c@thegoodpenguin.co.uk> In-Reply-To: <20260918-acpi-i2c-v1-0-caf4bea4886c@thegoodpenguin.co.uk> To: Andi Shyti , Mika Westerberg , Shyam Sundar S K , Elie Morisse , Benson Leung , Guenter Roeck , Mika Westerberg , Andy Shevchenko , Wolfram Sang , Devyn Liu , Oleksij Rempel , Pengutronix Kernel Team , Frank Li , Sascha Hauer , Fabio Estevam , Binbin Zhou , Khalil Blaiech , Asmaa Mnebhi , Mukesh Kumar Savaliya , Viken Dadhaniya , Ard Biesheuvel , Laxman Dewangan , Dmitry Osipenko , Thierry Reding , Jonathan Hunter , Israel Cepeda , Hans de Goede , Sakari Ailus , Hans Hu , George Cherian Cc: linux-i2c@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, chrome-platform@lists.linux.dev, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-tegra@vger.kernel.org, Pawel Zalewski X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1789736516; l=13774; i=pzalewski@thegoodpenguin.co.uk; s=20260430; h=from:subject:message-id; bh=uQuDrQC54rH73rDKSYpShBEhGdmb7pu28vKNxMjdMYA=; b=mmV8nSqpS6TG7XYJiURdQ7w4GuYjUmy7J6hKP9xFaptGqBL9K2aUTD5JRl3498IAVGRzuiIDc 40THKzjx2INDZqWshrv7JhKZ+YsJJ55ouYgxNk+4VAUf1eFbdJpE0gL X-Developer-Key: i=pzalewski@thegoodpenguin.co.uk; a=ed25519; pk=vHq4n9IonORH2GTzLv8r6CWAFHzgfBuNkQPXA8NSly0= Use a designated initializer for the acpi_device_id fields which makes the code more readable and consistent with how lists are initialized in the rest of the kernel code base. Also drop explicitly setting fields to 0 where it is redundant. Unify the list terminator to have a single space between the brackets and no trailing comma. Unify list item alignment to have a single space padding between the brackets. Signed-off-by: Pawel Zalewski Acked-by: Mika Westerberg --- drivers/i2c/busses/i2c-amd-asf-plat.c | 2 +- drivers/i2c/busses/i2c-amd-mp2-plat.c | 2 +- drivers/i2c/busses/i2c-cros-ec-tunnel.c | 2 +- drivers/i2c/busses/i2c-designware-platdrv.c | 42 ++++++++++++++-----------= ---- drivers/i2c/busses/i2c-gpio.c | 2 +- drivers/i2c/busses/i2c-hisi.c | 2 +- drivers/i2c/busses/i2c-imx.c | 2 +- drivers/i2c/busses/i2c-ls2x.c | 2 +- drivers/i2c/busses/i2c-mlxbf.c | 8 +++--- drivers/i2c/busses/i2c-qcom-geni.c | 4 +-- drivers/i2c/busses/i2c-qup.c | 2 +- drivers/i2c/busses/i2c-scmi.c | 8 +++--- drivers/i2c/busses/i2c-synquacer.c | 4 +-- drivers/i2c/busses/i2c-tegra.c | 8 +++--- drivers/i2c/busses/i2c-usbio.c | 12 ++++----- drivers/i2c/busses/i2c-viai2c-zhaoxin.c | 2 +- drivers/i2c/busses/i2c-xgene-slimpro.c | 6 ++--- drivers/i2c/busses/i2c-xlp9xx.c | 6 ++--- 18 files changed, 58 insertions(+), 58 deletions(-) diff --git a/drivers/i2c/busses/i2c-amd-asf-plat.c b/drivers/i2c/busses/i2c= -amd-asf-plat.c index b0b40fe1d79bf..2a5711411ee5c 100644 --- a/drivers/i2c/busses/i2c-amd-asf-plat.c +++ b/drivers/i2c/busses/i2c-amd-asf-plat.c @@ -354,7 +354,7 @@ static int amd_asf_probe(struct platform_device *pdev) } =20 static const struct acpi_device_id amd_asf_acpi_ids[] =3D { - { "AMDI001A" }, + { .id =3D "AMDI001A" }, { } }; MODULE_DEVICE_TABLE(acpi, amd_asf_acpi_ids); diff --git a/drivers/i2c/busses/i2c-amd-mp2-plat.c b/drivers/i2c/busses/i2c= -amd-mp2-plat.c index 9fdd6a5fb8b65..cc5961364bcc0 100644 --- a/drivers/i2c/busses/i2c-amd-mp2-plat.c +++ b/drivers/i2c/busses/i2c-amd-mp2-plat.c @@ -341,7 +341,7 @@ static void i2c_amd_remove(struct platform_device *pdev) } =20 static const struct acpi_device_id i2c_amd_acpi_match[] =3D { - { "AMDI0011" }, + { .id =3D "AMDI0011" }, { } }; MODULE_DEVICE_TABLE(acpi, i2c_amd_acpi_match); diff --git a/drivers/i2c/busses/i2c-cros-ec-tunnel.c b/drivers/i2c/busses/i= 2c-cros-ec-tunnel.c index 208ce4f9e782c..a83e735d2086c 100644 --- a/drivers/i2c/busses/i2c-cros-ec-tunnel.c +++ b/drivers/i2c/busses/i2c-cros-ec-tunnel.c @@ -300,7 +300,7 @@ static const struct of_device_id cros_ec_i2c_of_match[]= __maybe_unused =3D { MODULE_DEVICE_TABLE(of, cros_ec_i2c_of_match); =20 static const struct acpi_device_id cros_ec_i2c_tunnel_acpi_id[] __maybe_un= used =3D { - { "GOOG0012", 0 }, + { .id =3D "GOOG0012" }, { } }; MODULE_DEVICE_TABLE(acpi, cros_ec_i2c_tunnel_acpi_id); diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/buss= es/i2c-designware-platdrv.c index 447af5523c2e4..1da6b0314b6a0 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -260,27 +260,27 @@ static const struct of_device_id dw_i2c_of_match[] = =3D { MODULE_DEVICE_TABLE(of, dw_i2c_of_match); =20 static const struct acpi_device_id dw_i2c_acpi_match[] =3D { - { "80860F41", ACCESS_NO_IRQ_SUSPEND }, - { "808622C1", ACCESS_NO_IRQ_SUSPEND }, - { "AMD0010", ACCESS_INTR_MASK }, - { "AMDI0010", ACCESS_INTR_MASK }, - { "AMDI0019", ACCESS_INTR_MASK | ARBITRATION_SEMAPHORE }, - { "AMDI0510", 0 }, - { "APMC0D0F", 0 }, - { "FUJI200B", 0 }, - { "GOOG5000", 0 }, - { "HISI02A1", 0 }, - { "HISI02A2", 0 }, - { "HISI02A3", 0 }, - { "HJMC3001", ACCESS_INTR_MASK }, - { "HYGO0010", ACCESS_INTR_MASK }, - { "INT33C2", 0 }, - { "INT33C3", 0 }, - { "INT3432", 0 }, - { "INT3433", 0 }, - { "INTC10EF", 0 }, - { "LECA0003", 0 }, - {} + { .id =3D "80860F41", .driver_data =3D ACCESS_NO_IRQ_SUSPEND }, + { .id =3D "808622C1", .driver_data =3D ACCESS_NO_IRQ_SUSPEND }, + { .id =3D "AMD0010", .driver_data =3D ACCESS_INTR_MASK }, + { .id =3D "AMDI0010", .driver_data =3D ACCESS_INTR_MASK }, + { .id =3D "AMDI0019", .driver_data =3D ACCESS_INTR_MASK | ARBITRATION_SEM= APHORE }, + { .id =3D "AMDI0510" }, + { .id =3D "APMC0D0F" }, + { .id =3D "FUJI200B" }, + { .id =3D "GOOG5000" }, + { .id =3D "HISI02A1" }, + { .id =3D "HISI02A2" }, + { .id =3D "HISI02A3" }, + { .id =3D "HJMC3001", .driver_data =3D ACCESS_INTR_MASK }, + { .id =3D "HYGO0010", .driver_data =3D ACCESS_INTR_MASK }, + { .id =3D "INT33C2" }, + { .id =3D "INT33C3" }, + { .id =3D "INT3432" }, + { .id =3D "INT3433" }, + { .id =3D "INTC10EF" }, + { .id =3D "LECA0003" }, + { } }; MODULE_DEVICE_TABLE(acpi, dw_i2c_acpi_match); =20 diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c index 6294b0b0cc8f7..56d6847cbf6d7 100644 --- a/drivers/i2c/busses/i2c-gpio.c +++ b/drivers/i2c/busses/i2c-gpio.c @@ -664,7 +664,7 @@ static const struct of_device_id i2c_gpio_dt_ids[] =3D { MODULE_DEVICE_TABLE(of, i2c_gpio_dt_ids); =20 static const struct acpi_device_id i2c_gpio_acpi_match[] =3D { - { "LOON0005" }, /* LoongArch */ + { .id =3D "LOON0005" }, /* LoongArch */ { } }; MODULE_DEVICE_TABLE(acpi, i2c_gpio_acpi_match); diff --git a/drivers/i2c/busses/i2c-hisi.c b/drivers/i2c/busses/i2c-hisi.c index ba5c9579ae190..fca1ca011312d 100644 --- a/drivers/i2c/busses/i2c-hisi.c +++ b/drivers/i2c/busses/i2c-hisi.c @@ -516,7 +516,7 @@ static int hisi_i2c_probe(struct platform_device *pdev) } =20 static const struct acpi_device_id hisi_i2c_acpi_ids[] =3D { - { "HISI03D1", 0 }, + { .id =3D "HISI03D1" }, { } }; MODULE_DEVICE_TABLE(acpi, hisi_i2c_acpi_ids); diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 19ec056b00afe..e5fb493327b10 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -349,7 +349,7 @@ static const struct of_device_id i2c_imx_dt_ids[] =3D { MODULE_DEVICE_TABLE(of, i2c_imx_dt_ids); =20 static const struct acpi_device_id i2c_imx_acpi_ids[] =3D { - {"NXP0001", .driver_data =3D (kernel_ulong_t)&vf610_i2c_hwdata}, + { .id =3D "NXP0001", .driver_data =3D (kernel_ulong_t)&vf610_i2c_hwdata }, { } }; MODULE_DEVICE_TABLE(acpi, i2c_imx_acpi_ids); diff --git a/drivers/i2c/busses/i2c-ls2x.c b/drivers/i2c/busses/i2c-ls2x.c index af7bf61b0f4d7..ef2e2a26981e5 100644 --- a/drivers/i2c/busses/i2c-ls2x.c +++ b/drivers/i2c/busses/i2c-ls2x.c @@ -356,7 +356,7 @@ static const struct of_device_id ls2x_i2c_id_table[] = =3D { MODULE_DEVICE_TABLE(of, ls2x_i2c_id_table); =20 static const struct acpi_device_id ls2x_i2c_acpi_match[] =3D { - { "LOON0004" }, /* Loongson LS7A */ + { .id =3D "LOON0004" }, /* Loongson LS7A */ { } }; MODULE_DEVICE_TABLE(acpi, ls2x_i2c_acpi_match); diff --git a/drivers/i2c/busses/i2c-mlxbf.c b/drivers/i2c/busses/i2c-mlxbf.c index 24ccc4546ab88..0cc8b9e5f3336 100644 --- a/drivers/i2c/busses/i2c-mlxbf.c +++ b/drivers/i2c/busses/i2c-mlxbf.c @@ -2198,10 +2198,10 @@ static struct i2c_adapter_quirks mlxbf_i2c_quirks = =3D { }; =20 static const struct acpi_device_id mlxbf_i2c_acpi_ids[] =3D { - { "MLNXBF03", (kernel_ulong_t)&mlxbf_i2c_chip[MLXBF_I2C_CHIP_TYPE_1] }, - { "MLNXBF23", (kernel_ulong_t)&mlxbf_i2c_chip[MLXBF_I2C_CHIP_TYPE_2] }, - { "MLNXBF31", (kernel_ulong_t)&mlxbf_i2c_chip[MLXBF_I2C_CHIP_TYPE_3] }, - {}, + { .id =3D "MLNXBF03", .driver_data =3D (kernel_ulong_t)&mlxbf_i2c_chip[ML= XBF_I2C_CHIP_TYPE_1] }, + { .id =3D "MLNXBF23", .driver_data =3D (kernel_ulong_t)&mlxbf_i2c_chip[ML= XBF_I2C_CHIP_TYPE_2] }, + { .id =3D "MLNXBF31", .driver_data =3D (kernel_ulong_t)&mlxbf_i2c_chip[ML= XBF_I2C_CHIP_TYPE_3] }, + { } }; =20 MODULE_DEVICE_TABLE(acpi, mlxbf_i2c_acpi_ids); diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qc= om-geni.c index 00013b41a6f59..37a071b885f0b 100644 --- a/drivers/i2c/busses/i2c-qcom-geni.c +++ b/drivers/i2c/busses/i2c-qcom-geni.c @@ -1303,8 +1303,8 @@ static const struct geni_i2c_desc sa8255p_geni_i2c = =3D { =20 #ifdef CONFIG_ACPI static const struct acpi_device_id geni_i2c_acpi_match[] =3D { - { "QCOM0220", (kernel_ulong_t)&geni_i2c}, - { "QCOM0411", (kernel_ulong_t)&geni_i2c}, + { .id =3D "QCOM0220", .driver_data =3D (kernel_ulong_t)&geni_i2c }, + { .id =3D "QCOM0411", .driver_data =3D (kernel_ulong_t)&geni_i2c }, { } }; MODULE_DEVICE_TABLE(acpi, geni_i2c_acpi_match); diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c index ee7915ee2ba2f..ce30634e1f402 100644 --- a/drivers/i2c/busses/i2c-qup.c +++ b/drivers/i2c/busses/i2c-qup.c @@ -1688,7 +1688,7 @@ static void qup_i2c_disable_clocks(struct qup_i2c_dev= *qup) } =20 static const struct acpi_device_id qup_i2c_acpi_match[] =3D { - { "QCOM8010"}, + { .id =3D "QCOM8010" }, { } }; MODULE_DEVICE_TABLE(acpi, qup_i2c_acpi_match); diff --git a/drivers/i2c/busses/i2c-scmi.c b/drivers/i2c/busses/i2c-scmi.c index 324a63efa1ab9..37442c9ee2229 100644 --- a/drivers/i2c/busses/i2c-scmi.c +++ b/drivers/i2c/busses/i2c-scmi.c @@ -42,10 +42,10 @@ static const struct smbus_methods_t ibm_smbus_methods = =3D { }; =20 static const struct acpi_device_id acpi_smbus_cmi_ids[] =3D { - {"SMBUS01", (kernel_ulong_t)&smbus_methods}, - {ACPI_SMBUS_IBM_HID, (kernel_ulong_t)&ibm_smbus_methods}, - {ACPI_SMBUS_MS_HID, (kernel_ulong_t)&smbus_methods}, - {"", 0} + { .id =3D "SMBUS01", .driver_data =3D (kernel_ulong_t)&smbus_methods }, + { .id =3D ACPI_SMBUS_IBM_HID, .driver_data =3D (kernel_ulong_t)&ibm_smbus= _methods }, + { .id =3D ACPI_SMBUS_MS_HID, .driver_data =3D (kernel_ulong_t)&smbus_meth= ods }, + { } }; MODULE_DEVICE_TABLE(acpi, acpi_smbus_cmi_ids); =20 diff --git a/drivers/i2c/busses/i2c-synquacer.c b/drivers/i2c/busses/i2c-sy= nquacer.c index 0216e398f2740..968cbe32161ed 100644 --- a/drivers/i2c/busses/i2c-synquacer.c +++ b/drivers/i2c/busses/i2c-synquacer.c @@ -622,8 +622,8 @@ MODULE_DEVICE_TABLE(of, synquacer_i2c_dt_ids); =20 #ifdef CONFIG_ACPI static const struct acpi_device_id synquacer_i2c_acpi_ids[] =3D { - { "SCX0003" }, - { /* sentinel */ } + { .id =3D "SCX0003" }, + { } }; MODULE_DEVICE_TABLE(acpi, synquacer_i2c_acpi_ids); #endif diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index 9c281b4905ebd..76d21bc51c618 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -2486,10 +2486,10 @@ static const struct dev_pm_ops tegra_i2c_pm =3D { }; =20 static const struct acpi_device_id tegra_i2c_acpi_match[] =3D { - {.id =3D "NVDA0101", .driver_data =3D (kernel_ulong_t)&tegra210_i2c_hw}, - {.id =3D "NVDA0201", .driver_data =3D (kernel_ulong_t)&tegra186_i2c_hw}, - {.id =3D "NVDA0301", .driver_data =3D (kernel_ulong_t)&tegra194_i2c_hw}, - {.id =3D "NVDA2017", .driver_data =3D (kernel_ulong_t)&tegra410_i2c_hw}, + { .id =3D "NVDA0101", .driver_data =3D (kernel_ulong_t)&tegra210_i2c_hw }, + { .id =3D "NVDA0201", .driver_data =3D (kernel_ulong_t)&tegra186_i2c_hw }, + { .id =3D "NVDA0301", .driver_data =3D (kernel_ulong_t)&tegra194_i2c_hw }, + { .id =3D "NVDA2017", .driver_data =3D (kernel_ulong_t)&tegra410_i2c_hw }, { } }; MODULE_DEVICE_TABLE(acpi, tegra_i2c_acpi_match); diff --git a/drivers/i2c/busses/i2c-usbio.c b/drivers/i2c/busses/i2c-usbio.c index 259754e5fd05b..66da1e90848ae 100644 --- a/drivers/i2c/busses/i2c-usbio.c +++ b/drivers/i2c/busses/i2c-usbio.c @@ -24,12 +24,12 @@ struct usbio_i2c { }; =20 static const struct acpi_device_id usbio_i2c_acpi_hids[] =3D { - { "INTC1008" }, /* MTL */ - { "INTC10B3" }, /* ARL */ - { "INTC10B6" }, /* LNL */ - { "INTC10D2" }, /* MTL-CVF */ - { "INTC10E3" }, /* PTL */ - { "INTC1118" }, /* NVL */ + { .id =3D "INTC1008" }, /* MTL */ + { .id =3D "INTC10B3" }, /* ARL */ + { .id =3D "INTC10B6" }, /* LNL */ + { .id =3D "INTC10D2" }, /* MTL-CVF */ + { .id =3D "INTC10E3" }, /* PTL */ + { .id =3D "INTC1118" }, /* NVL */ { } }; =20 diff --git a/drivers/i2c/busses/i2c-viai2c-zhaoxin.c b/drivers/i2c/busses/i= 2c-viai2c-zhaoxin.c index 764a2dbc957ab..81f0bfdf919f8 100644 --- a/drivers/i2c/busses/i2c-viai2c-zhaoxin.c +++ b/drivers/i2c/busses/i2c-viai2c-zhaoxin.c @@ -345,7 +345,7 @@ static const struct dev_pm_ops zxi2c_pm =3D { }; =20 static const struct acpi_device_id zxi2c_acpi_match[] =3D { - {"IIC1D17", 0 }, + { .id =3D "IIC1D17" }, { } }; MODULE_DEVICE_TABLE(acpi, zxi2c_acpi_match); diff --git a/drivers/i2c/busses/i2c-xgene-slimpro.c b/drivers/i2c/busses/i2= c-xgene-slimpro.c index b29dec66b2c33..08a126aa83dfa 100644 --- a/drivers/i2c/busses/i2c-xgene-slimpro.c +++ b/drivers/i2c/busses/i2c-xgene-slimpro.c @@ -539,9 +539,9 @@ MODULE_DEVICE_TABLE(of, xgene_slimpro_i2c_dt_ids); =20 #ifdef CONFIG_ACPI static const struct acpi_device_id xgene_slimpro_i2c_acpi_ids[] =3D { - {"APMC0D40", XGENE_SLIMPRO_I2C_V1}, - {"APMC0D8B", XGENE_SLIMPRO_I2C_V2}, - {} + { .id =3D "APMC0D40", .driver_data =3D XGENE_SLIMPRO_I2C_V1 }, + { .id =3D "APMC0D8B", .driver_data =3D XGENE_SLIMPRO_I2C_V2 }, + { } }; MODULE_DEVICE_TABLE(acpi, xgene_slimpro_i2c_acpi_ids); #endif diff --git a/drivers/i2c/busses/i2c-xlp9xx.c b/drivers/i2c/busses/i2c-xlp9x= x.c index ad0e5cd218f0f..44cad95ee8abc 100644 --- a/drivers/i2c/busses/i2c-xlp9xx.c +++ b/drivers/i2c/busses/i2c-xlp9xx.c @@ -570,9 +570,9 @@ static void xlp9xx_i2c_remove(struct platform_device *p= dev) =20 #ifdef CONFIG_ACPI static const struct acpi_device_id xlp9xx_i2c_acpi_ids[] =3D { - {"BRCM9007", 0}, - {"CAV9007", 0}, - {} + { .id =3D "BRCM9007" }, + { .id =3D "CAV9007" }, + { } }; MODULE_DEVICE_TABLE(acpi, xlp9xx_i2c_acpi_ids); #endif --=20 2.43.0