diff options
| author | Rafael J. Wysocki <[email protected]> | 2016-09-13 02:57:31 +0200 | 
|---|---|---|
| committer | Rafael J. Wysocki <[email protected]> | 2016-09-13 02:57:31 +0200 | 
| commit | e41f323ab0e2fec843ab03219f1454dd9147dfcd (patch) | |
| tree | a015c649e29bb8ce1038182dcc58a74c8bf3ca30 /include/linux/devfreq-event.h | |
| parent | 9395452b4aab7bc2475ef8935b4a4fb99d778d70 (diff) | |
| parent | 5a893e31a636cca3798af2db5aee8d3d144b1e1e (diff) | |
Merge tag 'pull_whole_for_4.9' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq into pm-devfreq
Pull devfreq material for v4.9 from MyungJoo Ham.
* tag 'pull_whole_for_4.9' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq:
  PM / devfreq: rockchip: add devfreq driver for rk3399 dmc
  Documentation: bindings: add dt documentation for rk3399 dmc
  PM / devfreq: event: support rockchip dfi controller
  Documentation: bindings: add dt documentation for dfi controller
  PM / devfreq: event: remove duplicate devfreq_event_get_drvdata()
  PM / devfreq: fix Kconfig indent style
  PM / devfreq: Add COMPILE_TEST for build coverage
  PM / devfreq: exynos-ppmu: remove unneeded of_node_put()
Diffstat (limited to 'include/linux/devfreq-event.h')
| -rw-r--r-- | include/linux/devfreq-event.h | 5 | 
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/devfreq-event.h b/include/linux/devfreq-event.h index 0a83a1e648b0..4db00b02ca3f 100644 --- a/include/linux/devfreq-event.h +++ b/include/linux/devfreq-event.h @@ -148,11 +148,6 @@ static inline int devfreq_event_reset_event(struct devfreq_event_dev *edev)  	return -EINVAL;  } -static inline void *devfreq_event_get_drvdata(struct devfreq_event_dev *edev) -{ -	return ERR_PTR(-EINVAL); -} -  static inline struct devfreq_event_dev *devfreq_event_get_edev_by_phandle(  					struct device *dev, int index)  {  |