UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'regulator/topic/core' into regulator-next

This commit is contained in:
Mark Brown 2016-01-12 18:26:05 +00:00
parent 353915f0b4 70dc6daff0
commit 9fa295742d
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/regulator/core.c
View File

@ -2360,7 +2360,6 @@ static void regulator_disable_work(struct work_struct *work)
int regulator_disable_deferred(struct regulator *regulator, int ms) int regulator_disable_deferred(struct regulator *regulator, int ms)
{ {
struct regulator_dev *rdev = regulator->rdev; struct regulator_dev *rdev = regulator->rdev;
int ret;
if (regulator->always_on) if (regulator->always_on)
return 0; return 0;
@ -2372,13 +2371,9 @@ int regulator_disable_deferred(struct regulator *regulator, int ms)
rdev->deferred_disables++; rdev->deferred_disables++;
mutex_unlock(&rdev->mutex); mutex_unlock(&rdev->mutex);
ret = queue_delayed_work(system_power_efficient_wq, queue_delayed_work(system_power_efficient_wq, &rdev->disable_work,
&rdev->disable_work, msecs_to_jiffies(ms));
msecs_to_jiffies(ms)); return 0;
if (ret < 0)
return ret;
else
return 0;
} }
EXPORT_SYMBOL_GPL(regulator_disable_deferred); EXPORT_SYMBOL_GPL(regulator_disable_deferred);
@ -3700,7 +3695,7 @@ static umode_t regulator_attr_is_visible(struct kobject *kobj,
struct attribute *attr, int idx) struct attribute *attr, int idx)
{ {
struct device *dev = kobj_to_dev(kobj); struct device *dev = kobj_to_dev(kobj);
struct regulator_dev *rdev = container_of(dev, struct regulator_dev, dev); struct regulator_dev *rdev = dev_to_rdev(dev);
const struct regulator_ops *ops = rdev->desc->ops; const struct regulator_ops *ops = rdev->desc->ops;
umode_t mode = attr->mode; umode_t mode = attr->mode;