diff options
Diffstat (limited to 'drivers/pwm/pwm-ab8500.c')
| -rw-r--r-- | drivers/pwm/pwm-ab8500.c | 13 | 
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/pwm/pwm-ab8500.c b/drivers/pwm/pwm-ab8500.c index 1d07a6f9937..4c07a8420b3 100644 --- a/drivers/pwm/pwm-ab8500.c +++ b/drivers/pwm/pwm-ab8500.c @@ -20,10 +20,6 @@  #define AB8500_PWM_OUT_CTRL2_REG	0x61  #define AB8500_PWM_OUT_CTRL7_REG	0x66 -/* backlight driver constants */ -#define ENABLE_PWM			1 -#define DISABLE_PWM			0 -  struct ab8500_pwm_chip {  	struct pwm_chip chip;  }; @@ -64,7 +60,7 @@ static int ab8500_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)  	ret = abx500_mask_and_set_register_interruptible(chip->dev,  				AB8500_MISC, AB8500_PWM_OUT_CTRL7_REG, -				1 << (chip->base - 1), ENABLE_PWM); +				1 << (chip->base - 1), 1 << (chip->base - 1));  	if (ret < 0)  		dev_err(chip->dev, "%s: Failed to enable PWM, Error %d\n",  							pwm->label, ret); @@ -77,11 +73,10 @@ static void ab8500_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)  	ret = abx500_mask_and_set_register_interruptible(chip->dev,  				AB8500_MISC, AB8500_PWM_OUT_CTRL7_REG, -				1 << (chip->base - 1), DISABLE_PWM); +				1 << (chip->base - 1), 0);  	if (ret < 0)  		dev_err(chip->dev, "%s: Failed to disable PWM, Error %d\n",  							pwm->label, ret); -	return;  }  static const struct pwm_ops ab8500_pwm_ops = { @@ -101,10 +96,8 @@ static int ab8500_pwm_probe(struct platform_device *pdev)  	 * device which is required for ab8500 read and write  	 */  	ab8500 = devm_kzalloc(&pdev->dev, sizeof(*ab8500), GFP_KERNEL); -	if (ab8500 == NULL) { -		dev_err(&pdev->dev, "failed to allocate memory\n"); +	if (ab8500 == NULL)  		return -ENOMEM; -	}  	ab8500->chip.dev = &pdev->dev;  	ab8500->chip.ops = &ab8500_pwm_ops;  | 
