Merge tag 'kbuild-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[J-linux.git] / drivers / pinctrl / intel / pinctrl-intel.c

diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c
index d6f29e6faab79b9059f06b5ae7d933da4d28584c..89bd7ce6711a1361413de6e7f2e2013df9d687a1 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-intel.c
+++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@ -1492,7 +1492,7 @@ static int intel_pinctrl_probe_pwm(struct intel_pinctrl *pctrl,
                .base_unit_bits = 22,
                .bypass = true,
        };
-       struct pwm_lpss_chip *pwm;
+       struct pwm_chip *chip;
 
        if (!(community->features & PINCTRL_FEATURE_PWM))
                return 0;
@@ -1500,8 +1500,8 @@ static int intel_pinctrl_probe_pwm(struct intel_pinctrl *pctrl,
        if (!IS_REACHABLE(CONFIG_PWM_LPSS))
                return 0;
 
-       pwm = devm_pwm_lpss_probe(pctrl->dev, community->regs + PWMC, &info);
-       return PTR_ERR_OR_ZERO(pwm);
+       chip = devm_pwm_lpss_probe(pctrl->dev, community->regs + PWMC, &info);
+       return PTR_ERR_OR_ZERO(chip);
 }
 
 int intel_pinctrl_probe(struct platform_device *pdev,