return err;
        }
 
-       err = kona_pwmc_config(pwm->chip, pwm, state->duty_cycle, state->period);
+       err = kona_pwmc_config(chip, pwm, state->duty_cycle, state->period);
        if (err && !pwm->state.enabled)
                clk_disable_unprepare(kp->clk);
 
 
                return 0;
        }
 
-       err = img_pwm_config(pwm->chip, pwm, state->duty_cycle, state->period);
+       err = img_pwm_config(chip, pwm, state->duty_cycle, state->period);
        if (err)
                return err;
 
 
 static int jz4740_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
                            const struct pwm_state *state)
 {
-       struct jz4740_pwm_chip *jz = to_jz4740(pwm->chip);
+       struct jz4740_pwm_chip *jz = to_jz4740(chip);
        unsigned long long tmp = 0xffffull * NSEC_PER_SEC;
        struct clk *clk = jz->clk[pwm->hwpwm];
        unsigned long period, duty;
 
                return 0;
        }
 
-       err = lpc18xx_pwm_config(pwm->chip, pwm, state->duty_cycle, state->period);
+       err = lpc18xx_pwm_config(chip, pwm, state->duty_cycle, state->period);
        if (err)
                return err;
 
 
                return 0;
        }
 
-       err = lpc32xx_pwm_config(pwm->chip, pwm, state->duty_cycle, state->period);
+       err = lpc32xx_pwm_config(chip, pwm, state->duty_cycle, state->period);
        if (err)
                return err;
 
 
                return 0;
        }
 
-       err = pwm_mediatek_config(pwm->chip, pwm, state->duty_cycle, state->period);
+       err = pwm_mediatek_config(chip, pwm, state->duty_cycle, state->period);
        if (err)
                return err;
 
 
                return 0;
        }
 
-       err = tpu_pwm_config(pwm->chip, pwm,
+       err = tpu_pwm_config(chip, pwm,
                             state->duty_cycle, state->period, enabled);
        if (err)
                return err;
 
                return 0;
        }
 
-       err = sti_pwm_config(pwm->chip, pwm, state->duty_cycle, state->period);
+       err = sti_pwm_config(chip, pwm, state->duty_cycle, state->period);
        if (err)
                return err;
 
 
                return 0;
        }
 
-       err = stmpe_24xx_pwm_config(pwm->chip, pwm, state->duty_cycle, state->period);
+       err = stmpe_24xx_pwm_config(chip, pwm, state->duty_cycle, state->period);
        if (err)
                return err;
 
 
                return 0;
        }
 
-       err = tegra_pwm_config(pwm->chip, pwm, state->duty_cycle, state->period);
+       err = tegra_pwm_config(chip, pwm, state->duty_cycle, state->period);
        if (err)
                return err;
 
 
         * pwm_apply_state because of !state->enabled and so the two values in
         * pwm->state might not be configured in hardware.
         */
-       ret = twl4030_pwmled_config(pwm->chip, pwm,
+       ret = twl4030_pwmled_config(chip, pwm,
                                    state->duty_cycle, state->period);
        if (ret)
                return ret;
                return 0;
        }
 
-       err = twl6030_pwmled_config(pwm->chip, pwm,
+       err = twl6030_pwmled_config(chip, pwm,
                                    state->duty_cycle, state->period);
        if (err)
                return err;
 
                return 0;
        }
 
-       err = twl_pwm_config(pwm->chip, pwm, state->duty_cycle, state->period);
+       err = twl_pwm_config(chip, pwm, state->duty_cycle, state->period);
        if (err)
                return err;
 
                return 0;
        }
 
-       err = twl_pwm_config(pwm->chip, pwm, state->duty_cycle, state->period);
+       err = twl_pwm_config(chip, pwm, state->duty_cycle, state->period);
        if (err)
                return err;
 
 
         * pwm_apply_state because of !state->enabled and so the two values in
         * pwm->state might not be configured in hardware.
         */
-       err = vt8500_pwm_config(pwm->chip, pwm, state->duty_cycle, state->period);
+       err = vt8500_pwm_config(chip, pwm, state->duty_cycle, state->period);
        if (err)
                return err;