On Tuesday, 23 February 2021, 21:30:02 CET, Daniel Lezcano wrote: > The HZ_PER_KHZ macro definition is duplicated in different subsystems. > > The macro now exists in include/linux/units.h, make use of it and > remove all the duplicated ones. > > Signed-off-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> > --- > drivers/devfreq/devfreq.c | 2 +- > drivers/iio/light/as73211.c | 3 +-- > drivers/thermal/devfreq_cooling.c | 2 +- > 3 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c > index 6aa10de792b3..4c636c336ace 100644 > --- a/drivers/devfreq/devfreq.c > +++ b/drivers/devfreq/devfreq.c > @@ -26,6 +26,7 @@ > #include <linux/hrtimer.h> > #include <linux/of.h> > #include <linux/pm_qos.h> > +#include <linux/units.h> > #include "governor.h" > > #define CREATE_TRACE_POINTS > @@ -33,7 +34,6 @@ > > #define IS_SUPPORTED_FLAG(f, name) ((f & DEVFREQ_GOV_FLAG_##name) ? true : false) > #define IS_SUPPORTED_ATTR(f, name) ((f & DEVFREQ_GOV_ATTR_##name) ? true : false) > -#define HZ_PER_KHZ 1000 > > static struct class *devfreq_class; > static struct dentry *devfreq_debugfs; > diff --git a/drivers/iio/light/as73211.c b/drivers/iio/light/as73211.c > index 7b32dfaee9b3..3ba2378df3dd 100644 > --- a/drivers/iio/light/as73211.c > +++ b/drivers/iio/light/as73211.c > @@ -24,8 +24,7 @@ > #include <linux/module.h> > #include <linux/mutex.h> > #include <linux/pm.h> > - > -#define HZ_PER_KHZ 1000 > +#include <linux/units.h> > > #define AS73211_DRV_NAME "as73211" > > diff --git a/drivers/thermal/devfreq_cooling.c b/drivers/thermal/devfreq_cooling.c > index fed3121ff2a1..fa5b8b0c7604 100644 > --- a/drivers/thermal/devfreq_cooling.c > +++ b/drivers/thermal/devfreq_cooling.c > @@ -19,10 +19,10 @@ > #include <linux/pm_opp.h> > #include <linux/pm_qos.h> > #include <linux/thermal.h> > +#include <linux/units.h> > > #include <trace/events/thermal.h> > > -#define HZ_PER_KHZ 1000 > #define SCALE_ERROR_MITIGATION 100 > > static DEFINE_IDA(devfreq_ida); > Reviewed-by: Christian Eggers <ceggers@xxxxxxx>
