From 4340038998255dda56755209be9ed02dd91025d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= Date: Mon, 15 Jun 2026 14:51:37 +0200 Subject: [PATCH] power: supply: surface_{battery,charger}: Consistently define ssam_device_ids using named initializers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The .driver_data member of the the two struct ssam_device_id arrays were initialized by list expressions. This isn't easily readable if you don't work with the Surface System Aggregator core regularily. Using named initializers is more explicit and thus easier to parse and also more robust to changes of the struct definition. This robustness is relevant for a planned change to struct ssam_device_id replacing .driver_data by an anonymous union. While touching these arrays, also drop the comma after the list terminators. This change doesn't introduce changes to the compiled ssam_device_id arrays. Signed-off-by: Uwe Kleine-König (The Capable Hub) Reviewed-by: Maximilian Luz Link: https://patch.msgid.link/bc8eff03b2f36c82af5a75fc7114c277228921db.1781526433.git.u.kleine-koenig@baylibre.com Reviewed-by: Ilpo Järvinen Signed-off-by: Ilpo Järvinen --- drivers/power/supply/surface_battery.c | 11 ++++++++--- drivers/power/supply/surface_charger.c | 7 +++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/power/supply/surface_battery.c b/drivers/power/supply/surface_battery.c index c759add4df49..1273b6082311 100644 --- a/drivers/power/supply/surface_battery.c +++ b/drivers/power/supply/surface_battery.c @@ -852,9 +852,14 @@ static const struct spwr_psy_properties spwr_psy_props_bat2_sb3 = { }; static const struct ssam_device_id surface_battery_match[] = { - { SSAM_SDEV(BAT, SAM, 0x01, 0x00), (unsigned long)&spwr_psy_props_bat1 }, - { SSAM_SDEV(BAT, KIP, 0x01, 0x00), (unsigned long)&spwr_psy_props_bat2_sb3 }, - { }, + { + SSAM_SDEV(BAT, SAM, 0x01, 0x00), + .driver_data = (unsigned long)&spwr_psy_props_bat1, + }, { + SSAM_SDEV(BAT, KIP, 0x01, 0x00), + .driver_data = (unsigned long)&spwr_psy_props_bat2_sb3, + }, + { } }; MODULE_DEVICE_TABLE(ssam, surface_battery_match); diff --git a/drivers/power/supply/surface_charger.c b/drivers/power/supply/surface_charger.c index 90b823848c99..d4bba6b41794 100644 --- a/drivers/power/supply/surface_charger.c +++ b/drivers/power/supply/surface_charger.c @@ -260,8 +260,11 @@ static const struct spwr_psy_properties spwr_psy_props_adp1 = { }; static const struct ssam_device_id surface_ac_match[] = { - { SSAM_SDEV(BAT, SAM, 0x01, 0x01), (unsigned long)&spwr_psy_props_adp1 }, - { }, + { + SSAM_SDEV(BAT, SAM, 0x01, 0x01), + .driver_data = (unsigned long)&spwr_psy_props_adp1, + }, + { } }; MODULE_DEVICE_TABLE(ssam, surface_ac_match);