Skip to content

Commit bc09c06

Browse files
rafaeljwrafaeljw
committed
Merge tag 'devfreq-next-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux into pm-devfreq
Pull devfreq updates for v5.7 from Chanwoo Choi: "Update devfreq code with minor issue: - Remove unneeded extern keyword from devfreq header file. - Change to DEVFREQ_GOV_UPDATE_INTERNAL event name because old DEVFREQ_GOV_INTERNAL name doesn't specify exactly what to do. - Fix handling code of return value of dev_pm_qos_remove_request(). - Use constant name for userspace governor with DEVFREQ_GOV_USERSPACE. - Get rid of doc warnings and fix typo." * tag 'devfreq-next-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux: PM / devfreq: Get rid of some doc warnings PM / devfreq: Fix handling dev_pm_qos_remove_request result PM / devfreq: Fix a typo in a comment PM / devfreq: Change to DEVFREQ_GOV_UPDATE_INTERVAL event name PM / devfreq: Remove unneeded extern keyword PM / devfreq: Use constant name of userspace governor
2 parents 16fbf79 + 7a51320 commit bc09c06

File tree

6 files changed

+74
-77
lines changed

6 files changed

+74
-77
lines changed

‎drivers/devfreq/devfreq.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -550,14 +550,14 @@ void devfreq_monitor_resume(struct devfreq *devfreq)
550550
EXPORT_SYMBOL(devfreq_monitor_resume);
551551

552552
/**
553-
* devfreq_interval_update() - Update device devfreq monitoring interval
553+
* devfreq_update_interval() - Update device devfreq monitoring interval
554554
* @devfreq: the devfreq instance.
555555
* @delay: new polling interval to be set.
556556
*
557557
* Helper function to set new load monitoring polling interval. Function
558-
* to be called from governor in response to DEVFREQ_GOV_INTERVAL event.
558+
* to be called from governor in response to DEVFREQ_GOV_UPDATE_INTERVAL event.
559559
*/
560-
void devfreq_interval_update(struct devfreq *devfreq, unsigned int *delay)
560+
void devfreq_update_interval(struct devfreq *devfreq, unsigned int *delay)
561561
{
562562
unsigned int cur_delay = devfreq->profile->polling_ms;
563563
unsigned int new_delay = *delay;
@@ -597,7 +597,7 @@ void devfreq_interval_update(struct devfreq *devfreq, unsigned int *delay)
597597
out:
598598
mutex_unlock(&devfreq->lock);
599599
}
600-
EXPORT_SYMBOL(devfreq_interval_update);
600+
EXPORT_SYMBOL(devfreq_update_interval);
601601

602602
/**
603603
* devfreq_notifier_call() - Notify that the device frequency requirements
@@ -705,13 +705,13 @@ static void devfreq_dev_release(struct device *dev)
705705

706706
if (dev_pm_qos_request_active(&devfreq->user_max_freq_req)) {
707707
err = dev_pm_qos_remove_request(&devfreq->user_max_freq_req);
708-
if (err)
708+
if (err < 0)
709709
dev_warn(dev->parent,
710710
"Failed to remove max_freq request: %d\n", err);
711711
}
712712
if (dev_pm_qos_request_active(&devfreq->user_min_freq_req)) {
713713
err = dev_pm_qos_remove_request(&devfreq->user_min_freq_req);
714-
if (err)
714+
if (err < 0)
715715
dev_warn(dev->parent,
716716
"Failed to remove min_freq request: %d\n", err);
717717
}
@@ -1424,7 +1424,7 @@ static ssize_t polling_interval_store(struct device *dev,
14241424
if (ret != 1)
14251425
return -EINVAL;
14261426

1427-
df->governor->event_handler(df, DEVFREQ_GOV_INTERVAL, &value);
1427+
df->governor->event_handler(df, DEVFREQ_GOV_UPDATE_INTERVAL, &value);
14281428
ret = count;
14291429

14301430
return ret;

‎drivers/devfreq/governor.h

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/* Devfreq events */
1919
#define DEVFREQ_GOV_START 0x1
2020
#define DEVFREQ_GOV_STOP 0x2
21-
#define DEVFREQ_GOV_INTERVAL 0x3
21+
#define DEVFREQ_GOV_UPDATE_INTERVAL 0x3
2222
#define DEVFREQ_GOV_SUSPEND 0x4
2323
#define DEVFREQ_GOV_RESUME 0x5
2424

@@ -30,7 +30,7 @@
3030
* @node: list node - contains registered devfreq governors
3131
* @name: Governor's name
3232
* @immutable: Immutable flag for governor. If the value is 1,
33-
* this govenror is never changeable to other governor.
33+
* this governor is never changeable to other governor.
3434
* @interrupt_driven: Devfreq core won't schedule polling work for this
3535
* governor if value is set to 1.
3636
* @get_target_freq: Returns desired operating frequency for the device.
@@ -57,17 +57,16 @@ struct devfreq_governor {
5757
unsigned int event, void *data);
5858
};
5959

60-
extern void devfreq_monitor_start(struct devfreq *devfreq);
61-
extern void devfreq_monitor_stop(struct devfreq *devfreq);
62-
extern void devfreq_monitor_suspend(struct devfreq *devfreq);
63-
extern void devfreq_monitor_resume(struct devfreq *devfreq);
64-
extern void devfreq_interval_update(struct devfreq *devfreq,
65-
unsigned int *delay);
60+
void devfreq_monitor_start(struct devfreq *devfreq);
61+
void devfreq_monitor_stop(struct devfreq *devfreq);
62+
void devfreq_monitor_suspend(struct devfreq *devfreq);
63+
void devfreq_monitor_resume(struct devfreq *devfreq);
64+
void devfreq_update_interval(struct devfreq *devfreq, unsigned int *delay);
6665

67-
extern int devfreq_add_governor(struct devfreq_governor *governor);
68-
extern int devfreq_remove_governor(struct devfreq_governor *governor);
66+
int devfreq_add_governor(struct devfreq_governor *governor);
67+
int devfreq_remove_governor(struct devfreq_governor *governor);
6968

70-
extern int devfreq_update_status(struct devfreq *devfreq, unsigned long freq);
69+
int devfreq_update_status(struct devfreq *devfreq, unsigned long freq);
7170

7271
static inline int devfreq_update_stats(struct devfreq *df)
7372
{

‎drivers/devfreq/governor_simpleondemand.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ static int devfreq_simple_ondemand_handler(struct devfreq *devfreq,
9696
devfreq_monitor_stop(devfreq);
9797
break;
9898

99-
case DEVFREQ_GOV_INTERVAL:
100-
devfreq_interval_update(devfreq, (unsigned int *)data);
99+
case DEVFREQ_GOV_UPDATE_INTERVAL:
100+
devfreq_update_interval(devfreq, (unsigned int *)data);
101101
break;
102102

103103
case DEVFREQ_GOV_SUSPEND:

‎drivers/devfreq/governor_userspace.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ static int devfreq_userspace_handler(struct devfreq *devfreq,
131131
}
132132

133133
static struct devfreq_governor devfreq_userspace = {
134-
.name = "userspace",
134+
.name = DEVFREQ_GOV_USERSPACE,
135135
.get_target_freq = devfreq_userspace_func,
136136
.event_handler = devfreq_userspace_handler,
137137
};

‎drivers/devfreq/tegra30-devfreq.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ static int tegra_governor_event_handler(struct devfreq *devfreq,
734734
devfreq_monitor_stop(devfreq);
735735
break;
736736

737-
case DEVFREQ_GOV_INTERVAL:
737+
case DEVFREQ_GOV_UPDATE_INTERVAL:
738738
/*
739739
* ACTMON hardware supports up to 256 milliseconds for the
740740
* sampling period.
@@ -745,7 +745,7 @@ static int tegra_governor_event_handler(struct devfreq *devfreq,
745745
}
746746

747747
tegra_actmon_pause(tegra);
748-
devfreq_interval_update(devfreq, new_delay);
748+
devfreq_update_interval(devfreq, new_delay);
749749
ret = tegra_actmon_resume(tegra);
750750
break;
751751

‎include/linux/devfreq.h

Lines changed: 52 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ struct devfreq_stats {
158158
* functions except for the context of callbacks defined in struct
159159
* devfreq_governor, the governor should protect its access with the
160160
* struct mutex lock in struct devfreq. A governor may use this mutex
161-
* to protect its own private data in void *data as well.
161+
* to protect its own private data in ``void *data`` as well.
162162
*/
163163
struct devfreq {
164164
struct list_head node;
@@ -201,64 +201,62 @@ struct devfreq_freqs {
201201
};
202202

203203
#if defined(CONFIG_PM_DEVFREQ)
204-
extern struct devfreq *devfreq_add_device(struct device *dev,
205-
struct devfreq_dev_profile *profile,
206-
const char *governor_name,
207-
void *data);
208-
extern int devfreq_remove_device(struct devfreq *devfreq);
209-
extern struct devfreq *devm_devfreq_add_device(struct device *dev,
210-
struct devfreq_dev_profile *profile,
211-
const char *governor_name,
212-
void *data);
213-
extern void devm_devfreq_remove_device(struct device *dev,
214-
struct devfreq *devfreq);
204+
struct devfreq *devfreq_add_device(struct device *dev,
205+
struct devfreq_dev_profile *profile,
206+
const char *governor_name,
207+
void *data);
208+
int devfreq_remove_device(struct devfreq *devfreq);
209+
struct devfreq *devm_devfreq_add_device(struct device *dev,
210+
struct devfreq_dev_profile *profile,
211+
const char *governor_name,
212+
void *data);
213+
void devm_devfreq_remove_device(struct device *dev, struct devfreq *devfreq);
215214

216215
/* Supposed to be called by PM callbacks */
217-
extern int devfreq_suspend_device(struct devfreq *devfreq);
218-
extern int devfreq_resume_device(struct devfreq *devfreq);
216+
int devfreq_suspend_device(struct devfreq *devfreq);
217+
int devfreq_resume_device(struct devfreq *devfreq);
219218

220-
extern void devfreq_suspend(void);
221-
extern void devfreq_resume(void);
219+
void devfreq_suspend(void);
220+
void devfreq_resume(void);
222221

223222
/**
224223
* update_devfreq() - Reevaluate the device and configure frequency
225224
* @devfreq: the devfreq device
226225
*
227226
* Note: devfreq->lock must be held
228227
*/
229-
extern int update_devfreq(struct devfreq *devfreq);
228+
int update_devfreq(struct devfreq *devfreq);
230229

231230
/* Helper functions for devfreq user device driver with OPP. */
232-
extern struct dev_pm_opp *devfreq_recommended_opp(struct device *dev,
233-
unsigned long *freq, u32 flags);
234-
extern int devfreq_register_opp_notifier(struct device *dev,
235-
struct devfreq *devfreq);
236-
extern int devfreq_unregister_opp_notifier(struct device *dev,
237-
struct devfreq *devfreq);
238-
extern int devm_devfreq_register_opp_notifier(struct device *dev,
239-
struct devfreq *devfreq);
240-
extern void devm_devfreq_unregister_opp_notifier(struct device *dev,
241-
struct devfreq *devfreq);
242-
extern int devfreq_register_notifier(struct devfreq *devfreq,
243-
struct notifier_block *nb,
244-
unsigned int list);
245-
extern int devfreq_unregister_notifier(struct devfreq *devfreq,
246-
struct notifier_block *nb,
247-
unsigned int list);
248-
extern int devm_devfreq_register_notifier(struct device *dev,
231+
struct dev_pm_opp *devfreq_recommended_opp(struct device *dev,
232+
unsigned long *freq, u32 flags);
233+
int devfreq_register_opp_notifier(struct device *dev,
234+
struct devfreq *devfreq);
235+
int devfreq_unregister_opp_notifier(struct device *dev,
236+
struct devfreq *devfreq);
237+
int devm_devfreq_register_opp_notifier(struct device *dev,
238+
struct devfreq *devfreq);
239+
void devm_devfreq_unregister_opp_notifier(struct device *dev,
240+
struct devfreq *devfreq);
241+
int devfreq_register_notifier(struct devfreq *devfreq,
242+
struct notifier_block *nb,
243+
unsigned int list);
244+
int devfreq_unregister_notifier(struct devfreq *devfreq,
245+
struct notifier_block *nb,
246+
unsigned int list);
247+
int devm_devfreq_register_notifier(struct device *dev,
249248
struct devfreq *devfreq,
250249
struct notifier_block *nb,
251250
unsigned int list);
252-
extern void devm_devfreq_unregister_notifier(struct device *dev,
251+
void devm_devfreq_unregister_notifier(struct device *dev,
253252
struct devfreq *devfreq,
254253
struct notifier_block *nb,
255254
unsigned int list);
256-
extern struct devfreq *devfreq_get_devfreq_by_phandle(struct device *dev,
257-
int index);
255+
struct devfreq *devfreq_get_devfreq_by_phandle(struct device *dev, int index);
258256

259257
#if IS_ENABLED(CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND)
260258
/**
261-
* struct devfreq_simple_ondemand_data - void *data fed to struct devfreq
259+
* struct devfreq_simple_ondemand_data - ``void *data`` fed to struct devfreq
262260
* and devfreq_add_device
263261
* @upthreshold: If the load is over this value, the frequency jumps.
264262
* Specify 0 to use the default. Valid value = 0 to 100.
@@ -278,7 +276,7 @@ struct devfreq_simple_ondemand_data {
278276

279277
#if IS_ENABLED(CONFIG_DEVFREQ_GOV_PASSIVE)
280278
/**
281-
* struct devfreq_passive_data - void *data fed to struct devfreq
279+
* struct devfreq_passive_data - ``void *data`` fed to struct devfreq
282280
* and devfreq_add_device
283281
* @parent: the devfreq instance of parent device.
284282
* @get_target_freq: Optional callback, Returns desired operating frequency
@@ -311,9 +309,9 @@ struct devfreq_passive_data {
311309

312310
#else /* !CONFIG_PM_DEVFREQ */
313311
static inline struct devfreq *devfreq_add_device(struct device *dev,
314-
struct devfreq_dev_profile *profile,
315-
const char *governor_name,
316-
void *data)
312+
struct devfreq_dev_profile *profile,
313+
const char *governor_name,
314+
void *data)
317315
{
318316
return ERR_PTR(-ENOSYS);
319317
}
@@ -350,31 +348,31 @@ static inline void devfreq_suspend(void) {}
350348
static inline void devfreq_resume(void) {}
351349

352350
static inline struct dev_pm_opp *devfreq_recommended_opp(struct device *dev,
353-
unsigned long *freq, u32 flags)
351+
unsigned long *freq, u32 flags)
354352
{
355353
return ERR_PTR(-EINVAL);
356354
}
357355

358356
static inline int devfreq_register_opp_notifier(struct device *dev,
359-
struct devfreq *devfreq)
357+
struct devfreq *devfreq)
360358
{
361359
return -EINVAL;
362360
}
363361

364362
static inline int devfreq_unregister_opp_notifier(struct device *dev,
365-
struct devfreq *devfreq)
363+
struct devfreq *devfreq)
366364
{
367365
return -EINVAL;
368366
}
369367

370368
static inline int devm_devfreq_register_opp_notifier(struct device *dev,
371-
struct devfreq *devfreq)
369+
struct devfreq *devfreq)
372370
{
373371
return -EINVAL;
374372
}
375373

376374
static inline void devm_devfreq_unregister_opp_notifier(struct device *dev,
377-
struct devfreq *devfreq)
375+
struct devfreq *devfreq)
378376
{
379377
}
380378

@@ -393,22 +391,22 @@ static inline int devfreq_unregister_notifier(struct devfreq *devfreq,
393391
}
394392

395393
static inline int devm_devfreq_register_notifier(struct device *dev,
396-
struct devfreq *devfreq,
397-
struct notifier_block *nb,
398-
unsigned int list)
394+
struct devfreq *devfreq,
395+
struct notifier_block *nb,
396+
unsigned int list)
399397
{
400398
return 0;
401399
}
402400

403401
static inline void devm_devfreq_unregister_notifier(struct device *dev,
404-
struct devfreq *devfreq,
405-
struct notifier_block *nb,
406-
unsigned int list)
402+
struct devfreq *devfreq,
403+
struct notifier_block *nb,
404+
unsigned int list)
407405
{
408406
}
409407

410408
static inline struct devfreq *devfreq_get_devfreq_by_phandle(struct device *dev,
411-
int index)
409+
int index)
412410
{
413411
return ERR_PTR(-ENODEV);
414412
}

0 commit comments

Comments
 (0)