]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
EDP: psy depletion: use flush_delayed_work
authorPhilip Rakity <prakity@nvidia.com>
Wed, 25 Sep 2013 11:42:31 +0000 (12:42 +0100)
committerAjay Nandakumar <anandakumarm@nvidia.com>
Thu, 3 Oct 2013 13:47:35 +0000 (19:17 +0530)
flush_delayed_work should be used rather then
flush_delay_work_sync.

flush_delayed_work_sync just calls flush_delayed_work.
see workqueue.h

/nvidia/DEV_KERNEL/kernel/drivers/edp/psy_depletion.c
In function 'capacity_set':
nvidia/DEV_KERNEL/kernel/drivers/edp/psy_depletion.c:280:2:
warning: 'flush_delayed_work_sync' is deprecated
(declared at
/nvidia/DEV_KERNEL/kernel/include/linux/workqueue.h:454)
[-Wdeprecated-declarations]

/nvidia/DEV_KERNEL/kernel/drivers/edp/psy_depletion.c:
In function 'vsysmin_set'
/nvidia/DEV_KERNEL/kernel/drivers/edp/psy_depletion.c:297:2:
warning: 'flush_delayed_work_sync' is deprecated
(declared at
/nvidia/DEV_KERNEL/kernel/include/linux/workqueue.h:454)
[-Wdeprecated-declarations]

Change-Id: Ib6ee73feb40560aa5eb9b8941047e5313ac3aaa9
Signed-off-by: Philip Rakity <prakity@nvidia.com>
Reviewed-on: http://git-master/r/278887
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Nitin Kumbhar <nkumbhar@nvidia.com>
(cherry picked from commit 1ad8994d893cf805e84988a4f1077250f90957bb)
Signed-off-by: Ajay Nandakumar <anandakumarm@nvidia.com>
drivers/edp/psy_depletion.c

index ae2d3e803ae7263ce050bffec33ec359dc99cda3..e31b076097688692fefb2a65849ff83cecc03156 100644 (file)
@@ -277,7 +277,7 @@ static int capacity_set(void *data, u64 val)
        struct depl_driver *drv = data;
 
        drv->capacity = clamp_t(int, val, 0, 100);
-       flush_delayed_work_sync(&drv->work);
+       flush_delayed_work(&drv->work);
 
        return 0;
 }
@@ -294,7 +294,7 @@ static int vsysmin_set(void *data, u64 val)
        struct depl_driver *drv = data;
 
        drv->pdata->vsys_min = val;
-       flush_delayed_work_sync(&drv->work);
+       flush_delayed_work(&drv->work);
 
        return 0;
 }