From becb293628c172272f76eb8c46c2ef69646abeee Mon Sep 17 00:00:00 2001 From: Lin Huang Date: Thu, 4 Aug 2016 13:52:00 +0800 Subject: [PATCH 1/1] FROMLIST: PM / devfreq: event: remove duplicate devfreq_event_get_drvdata() there define two devfreq_event_get_drvdata() function in devfreq-event.h when disable CONFIG_PM_DEVFREQ_EVENT, it will lead to build fail. So remove devfreq_event_get_drvdata() function. Change-Id: I273e91d4aac48ae25af5ef6de2feb37944cf6e39 Signed-off-by: Lin Huang --- include/linux/devfreq-event.h | 5 ----- 1 file changed, 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) { -- 2.34.1