Skip to content

Commit c9560ba

Browse files
committed
Merge tag 'intel-pinctrl-v6.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel into fixes
intel-pinctrl for v6.12-2 Fixes a few issues with Intel pin control platform driver: * fix missing reference counter drop of fwnode on error path * replace comma by semicolon to follow the kernel style * add Panther Lake to the list of supported devices The following is an automated git shortlog grouped by driver: intel: - platform: Add Panther Lake to the list of supported - platform: use semicolon instead of comma in ncommunities assignment - platform: fix error path in device_for_each_child_node() Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2 parents 393c554 + 3775625 commit c9560ba

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

drivers/pinctrl/intel/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ config PINCTRL_INTEL_PLATFORM
4646
of Intel PCH pins and using them as GPIOs. Currently the following
4747
Intel SoCs / platforms require this to be functional:
4848
- Lunar Lake
49+
- Panther Lake
4950

5051
config PINCTRL_ALDERLAKE
5152
tristate "Intel Alder Lake pinctrl and GPIO driver"

drivers/pinctrl/intel/pinctrl-intel-platform.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ static int intel_platform_pinctrl_prepare_community(struct device *dev,
9090
struct intel_community *community,
9191
struct intel_platform_pins *pins)
9292
{
93-
struct fwnode_handle *child;
9493
struct intel_padgroup *gpps;
9594
unsigned int group;
9695
size_t ngpps;
@@ -131,7 +130,7 @@ static int intel_platform_pinctrl_prepare_community(struct device *dev,
131130
return -ENOMEM;
132131

133132
group = 0;
134-
device_for_each_child_node(dev, child) {
133+
device_for_each_child_node_scoped(dev, child) {
135134
struct intel_padgroup *gpp = &gpps[group];
136135

137136
gpp->reg_num = group;
@@ -159,7 +158,7 @@ static int intel_platform_pinctrl_prepare_soc_data(struct device *dev,
159158
int ret;
160159

161160
/* Version 1.0 of the specification assumes only a single community per device node */
162-
ncommunities = 1,
161+
ncommunities = 1;
163162
communities = devm_kcalloc(dev, ncommunities, sizeof(*communities), GFP_KERNEL);
164163
if (!communities)
165164
return -ENOMEM;

0 commit comments

Comments
 (0)