| Message ID | 1364392374-12236-2-git-send-email-rajagopal.venkat@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Wed, Mar 27, 2013 at 10:52 PM, Rajagopal Venkat <rajagopal.venkat@linaro.org> wrote: > Fix compiler warnings generated when devfreq is not enabled > (CONFIG_PM_DEVFREQ is not set). > > Signed-off-by: Rajagopal Venkat <rajagopal.venkat@linaro.org> Thanks! Acked-by: MyungJoo Ham <myungjoo.ham@samsung.com> > --- > include/linux/devfreq.h | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h > index 04ad61d..5f1ab92 100644 > --- a/include/linux/devfreq.h > +++ b/include/linux/devfreq.h > @@ -215,7 +215,7 @@ struct devfreq_simple_ondemand_data { > #endif > > #else /* !CONFIG_PM_DEVFREQ */ > -static struct devfreq *devfreq_add_device(struct device *dev, > +static inline struct devfreq *devfreq_add_device(struct device *dev, > struct devfreq_dev_profile *profile, > const char *governor_name, > void *data) > @@ -223,34 +223,34 @@ static struct devfreq *devfreq_add_device(struct device *dev, > return NULL; > } > > -static int devfreq_remove_device(struct devfreq *devfreq) > +static inline int devfreq_remove_device(struct devfreq *devfreq) > { > return 0; > } > > -static int devfreq_suspend_device(struct devfreq *devfreq) > +static inline int devfreq_suspend_device(struct devfreq *devfreq) > { > return 0; > } > > -static int devfreq_resume_device(struct devfreq *devfreq) > +static inline int devfreq_resume_device(struct devfreq *devfreq) > { > return 0; > } > > -static struct opp *devfreq_recommended_opp(struct device *dev, > +static inline struct opp *devfreq_recommended_opp(struct device *dev, > unsigned long *freq, u32 flags) > { > - return -EINVAL; > + return ERR_PTR(-EINVAL); > } > > -static int devfreq_register_opp_notifier(struct device *dev, > +static inline int devfreq_register_opp_notifier(struct device *dev, > struct devfreq *devfreq) > { > return -EINVAL; > } > > -static int devfreq_unregister_opp_notifier(struct device *dev, > +static inline int devfreq_unregister_opp_notifier(struct device *dev, > struct devfreq *devfreq) > { > return -EINVAL; > -- > 1.7.10.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pm" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thursday, March 28, 2013 03:03:12 PM MyungJoo Ham wrote: > On Wed, Mar 27, 2013 at 10:52 PM, Rajagopal Venkat > <rajagopal.venkat@linaro.org> wrote: > > Fix compiler warnings generated when devfreq is not enabled > > (CONFIG_PM_DEVFREQ is not set). > > > > Signed-off-by: Rajagopal Venkat <rajagopal.venkat@linaro.org> > > Thanks! > > Acked-by: MyungJoo Ham <myungjoo.ham@samsung.com> Applied. Thanks, Rafael > > --- > > include/linux/devfreq.h | 16 ++++++++-------- > > 1 file changed, 8 insertions(+), 8 deletions(-) > > > > diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h > > index 04ad61d..5f1ab92 100644 > > --- a/include/linux/devfreq.h > > +++ b/include/linux/devfreq.h > > @@ -215,7 +215,7 @@ struct devfreq_simple_ondemand_data { > > #endif > > > > #else /* !CONFIG_PM_DEVFREQ */ > > -static struct devfreq *devfreq_add_device(struct device *dev, > > +static inline struct devfreq *devfreq_add_device(struct device *dev, > > struct devfreq_dev_profile *profile, > > const char *governor_name, > > void *data) > > @@ -223,34 +223,34 @@ static struct devfreq *devfreq_add_device(struct device *dev, > > return NULL; > > } > > > > -static int devfreq_remove_device(struct devfreq *devfreq) > > +static inline int devfreq_remove_device(struct devfreq *devfreq) > > { > > return 0; > > } > > > > -static int devfreq_suspend_device(struct devfreq *devfreq) > > +static inline int devfreq_suspend_device(struct devfreq *devfreq) > > { > > return 0; > > } > > > > -static int devfreq_resume_device(struct devfreq *devfreq) > > +static inline int devfreq_resume_device(struct devfreq *devfreq) > > { > > return 0; > > } > > > > -static struct opp *devfreq_recommended_opp(struct device *dev, > > +static inline struct opp *devfreq_recommended_opp(struct device *dev, > > unsigned long *freq, u32 flags) > > { > > - return -EINVAL; > > + return ERR_PTR(-EINVAL); > > } > > > > -static int devfreq_register_opp_notifier(struct device *dev, > > +static inline int devfreq_register_opp_notifier(struct device *dev, > > struct devfreq *devfreq) > > { > > return -EINVAL; > > } > > > > -static int devfreq_unregister_opp_notifier(struct device *dev, > > +static inline int devfreq_unregister_opp_notifier(struct device *dev, > > struct devfreq *devfreq) > > { > > return -EINVAL; > > -- > > 1.7.10.4 > > > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-pm" in > > the body of a message to majordomo@vger.kernel.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > > >
diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h index 04ad61d..5f1ab92 100644 --- a/include/linux/devfreq.h +++ b/include/linux/devfreq.h @@ -215,7 +215,7 @@ struct devfreq_simple_ondemand_data { #endif #else /* !CONFIG_PM_DEVFREQ */ -static struct devfreq *devfreq_add_device(struct device *dev, +static inline struct devfreq *devfreq_add_device(struct device *dev, struct devfreq_dev_profile *profile, const char *governor_name, void *data) @@ -223,34 +223,34 @@ static struct devfreq *devfreq_add_device(struct device *dev, return NULL; } -static int devfreq_remove_device(struct devfreq *devfreq) +static inline int devfreq_remove_device(struct devfreq *devfreq) { return 0; } -static int devfreq_suspend_device(struct devfreq *devfreq) +static inline int devfreq_suspend_device(struct devfreq *devfreq) { return 0; } -static int devfreq_resume_device(struct devfreq *devfreq) +static inline int devfreq_resume_device(struct devfreq *devfreq) { return 0; } -static struct opp *devfreq_recommended_opp(struct device *dev, +static inline struct opp *devfreq_recommended_opp(struct device *dev, unsigned long *freq, u32 flags) { - return -EINVAL; + return ERR_PTR(-EINVAL); } -static int devfreq_register_opp_notifier(struct device *dev, +static inline int devfreq_register_opp_notifier(struct device *dev, struct devfreq *devfreq) { return -EINVAL; } -static int devfreq_unregister_opp_notifier(struct device *dev, +static inline int devfreq_unregister_opp_notifier(struct device *dev, struct devfreq *devfreq) { return -EINVAL;
Fix compiler warnings generated when devfreq is not enabled (CONFIG_PM_DEVFREQ is not set). Signed-off-by: Rajagopal Venkat <rajagopal.venkat@linaro.org> --- include/linux/devfreq.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)