Merge tag 'iio-fixes-for-3.11a' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / pwm / pwm-pca9685.c

diff --git a/drivers/pwm/pwm-pca9685.c b/drivers/pwm/pwm-pca9685.c
index 2afc9043550a201bf3d8494dbc00b5de89bc0a14..3fb775ded0dff062e07f6d34e2f37f7e8bb93d1a 100644 (file)
--- a/drivers/pwm/pwm-pca9685.c
+++ b/drivers/pwm/pwm-pca9685.c
@@ -190,7 +190,7 @@ static void pca9685_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm)
 
        if (--pca->active_cnt == 0)
                regmap_update_bits(pca->regmap, PCA9685_MODE1, MODE1_SLEEP,
-                                  0x1);
+                                  MODE1_SLEEP);
 }
 
 static const struct pwm_ops pca9685_pwm_ops = {
@@ -199,6 +199,7 @@ static const struct pwm_ops pca9685_pwm_ops = {
        .config = pca9685_pwm_config,
        .request = pca9685_pwm_request,
        .free = pca9685_pwm_free,
+       .owner = THIS_MODULE,
 };
 
 static struct regmap_config pca9685_regmap_i2c_config = {
@@ -263,7 +264,8 @@ static int pca9685_pwm_remove(struct i2c_client *client)
 {
        struct pca9685 *pca = i2c_get_clientdata(client);
 
-       regmap_update_bits(pca->regmap, PCA9685_MODE1, MODE1_SLEEP, 0x1);
+       regmap_update_bits(pca->regmap, PCA9685_MODE1, MODE1_SLEEP,
+                          MODE1_SLEEP);
 
        return pwmchip_remove(&pca->chip);
 }