Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 203b42f7 authored by Tejun Heo's avatar Tejun Heo
Browse files

workqueue: make deferrable delayed_work initializer names consistent 



Initalizers for deferrable delayed_work are confused.

* __DEFERRED_WORK_INITIALIZER()
* DECLARE_DEFERRED_WORK()
* INIT_DELAYED_WORK_DEFERRABLE()

Rename them to

* __DEFERRABLE_WORK_INITIALIZER()
* DECLARE_DEFERRABLE_WORK()
* INIT_DEFERRABLE_WORK()

This patch doesn't cause any functional changes.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent ee64e7f6

arch/powerpc/platforms/cell/cpufreq_spudemand.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -76,7 +76,7 @@ static void spu_gov_work(struct work_struct *work) 
static void spu_gov_init_work(struct spu_gov_info_struct *info)

static void spu_gov_init_work(struct spu_gov_info_struct *info)

{

{

	int delay = usecs_to_jiffies(info->poll_int);

	int delay = usecs_to_jiffies(info->poll_int);

	INIT_DELAYED_WORK_DEFERRABLE(&info->work, spu_gov_work);

	INIT_DEFERRABLE_WORK(&info->work, spu_gov_work);

	schedule_delayed_work_on(info->policy->cpu, &info->work, delay);

	schedule_delayed_work_on(info->policy->cpu, &info->work, delay);

}

}

drivers/cpufreq/cpufreq_conservative.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -466,7 +466,7 @@ static inline void dbs_timer_init(struct cpu_dbs_info_s *dbs_info) 
	delay -= jiffies % delay;

	delay -= jiffies % delay;





	dbs_info->enable = 1;

	dbs_info->enable = 1;

	INIT_DELAYED_WORK_DEFERRABLE(&dbs_info->work, do_dbs_timer);

	INIT_DEFERRABLE_WORK(&dbs_info->work, do_dbs_timer);

	schedule_delayed_work_on(dbs_info->cpu, &dbs_info->work, delay);

	schedule_delayed_work_on(dbs_info->cpu, &dbs_info->work, delay);

}

}

drivers/cpufreq/cpufreq_ondemand.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -644,7 +644,7 @@ static inline void dbs_timer_init(struct cpu_dbs_info_s *dbs_info) 
		delay -= jiffies % delay;

		delay -= jiffies % delay;





	dbs_info->sample_type = DBS_NORMAL_SAMPLE;

	dbs_info->sample_type = DBS_NORMAL_SAMPLE;

	INIT_DELAYED_WORK_DEFERRABLE(&dbs_info->work, do_dbs_timer);

	INIT_DEFERRABLE_WORK(&dbs_info->work, do_dbs_timer);

	schedule_delayed_work_on(dbs_info->cpu, &dbs_info->work, delay);

	schedule_delayed_work_on(dbs_info->cpu, &dbs_info->work, delay);

}

}

drivers/devfreq/devfreq.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -607,7 +607,7 @@ static int __init devfreq_start_polling(void) 
	mutex_lock(&devfreq_list_lock);

	mutex_lock(&devfreq_list_lock);

	polling = false;

	polling = false;

	devfreq_wq = create_freezable_workqueue("devfreq_wq");

	devfreq_wq = create_freezable_workqueue("devfreq_wq");

	INIT_DELAYED_WORK_DEFERRABLE(&devfreq_work, devfreq_monitor);

	INIT_DEFERRABLE_WORK(&devfreq_work, devfreq_monitor);

	mutex_unlock(&devfreq_list_lock);

	mutex_unlock(&devfreq_list_lock);





	devfreq_monitor(&devfreq_work.work);

	devfreq_monitor(&devfreq_work.work);

drivers/net/ethernet/mellanox/mlx4/sense.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -153,5 +153,5 @@ void mlx4_sense_init(struct mlx4_dev *dev) 
	for (port = 1; port <= dev->caps.num_ports; port++)

	for (port = 1; port <= dev->caps.num_ports; port++)

		sense->do_sense_port[port] = 1;

		sense->do_sense_port[port] = 1;





	INIT_DELAYED_WORK_DEFERRABLE(&sense->sense_poll, mlx4_sense_port);

	INIT_DEFERRABLE_WORK(&sense->sense_poll, mlx4_sense_port);

}
 
}