| Message ID | bed6bc7e15c3ed398dd61b8f3968049f1f16b1b6.1612244449.git.viresh.kumar@linaro.org |
|---|---|
| State | Accepted |
| Commit | 2f0531869fd22182e769b10dd6cf151861ede791 |
| Headers | show |
| Series | cpufreq: Remove unused flag CPUFREQ_PM_NO_WARN | expand |
On Tue, Feb 2, 2021 at 6:42 AM Viresh Kumar <viresh.kumar@linaro.org> wrote: > > This flag is set by one of the drivers but it isn't used in the code > otherwise. Remove the unused flag and update the driver. > > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Applied as 5.12 material, thanks! > --- > Rebased over: > > https://lore.kernel.org/lkml/a59bb322b22c247d570b70a8e94067804287623b.1612241683.git.viresh.kumar@linaro.org/ > > drivers/cpufreq/pmac32-cpufreq.c | 3 +-- > include/linux/cpufreq.h | 13 +++++-------- > 2 files changed, 6 insertions(+), 10 deletions(-) > > diff --git a/drivers/cpufreq/pmac32-cpufreq.c b/drivers/cpufreq/pmac32-cpufreq.c > index 73621bc11976..4f20c6a9108d 100644 > --- a/drivers/cpufreq/pmac32-cpufreq.c > +++ b/drivers/cpufreq/pmac32-cpufreq.c > @@ -439,8 +439,7 @@ static struct cpufreq_driver pmac_cpufreq_driver = { > .init = pmac_cpufreq_cpu_init, > .suspend = pmac_cpufreq_suspend, > .resume = pmac_cpufreq_resume, > - .flags = CPUFREQ_PM_NO_WARN | > - CPUFREQ_NO_AUTO_DYNAMIC_SWITCHING, > + .flags = CPUFREQ_NO_AUTO_DYNAMIC_SWITCHING, > .attr = cpufreq_generic_attr, > .name = "powermac", > }; > diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h > index c8e40e91fe9b..353969c7acd3 100644 > --- a/include/linux/cpufreq.h > +++ b/include/linux/cpufreq.h > @@ -398,8 +398,11 @@ struct cpufreq_driver { > /* loops_per_jiffy or other kernel "constants" aren't affected by frequency transitions */ > #define CPUFREQ_CONST_LOOPS BIT(1) > > -/* don't warn on suspend/resume speed mismatches */ > -#define CPUFREQ_PM_NO_WARN BIT(2) > +/* > + * Set by drivers that want the core to automatically register the cpufreq > + * driver as a thermal cooling device. > + */ > +#define CPUFREQ_IS_COOLING_DEV BIT(2) > > /* > * This should be set by platforms having multiple clock-domains, i.e. > @@ -431,12 +434,6 @@ struct cpufreq_driver { > */ > #define CPUFREQ_NO_AUTO_DYNAMIC_SWITCHING BIT(6) > > -/* > - * Set by drivers that want the core to automatically register the cpufreq > - * driver as a thermal cooling device. > - */ > -#define CPUFREQ_IS_COOLING_DEV BIT(7) > - > int cpufreq_register_driver(struct cpufreq_driver *driver_data); > int cpufreq_unregister_driver(struct cpufreq_driver *driver_data); > > -- > 2.25.0.rc1.19.g042ed3e048af >
diff --git a/drivers/cpufreq/pmac32-cpufreq.c b/drivers/cpufreq/pmac32-cpufreq.c index 73621bc11976..4f20c6a9108d 100644 --- a/drivers/cpufreq/pmac32-cpufreq.c +++ b/drivers/cpufreq/pmac32-cpufreq.c @@ -439,8 +439,7 @@ static struct cpufreq_driver pmac_cpufreq_driver = { .init = pmac_cpufreq_cpu_init, .suspend = pmac_cpufreq_suspend, .resume = pmac_cpufreq_resume, - .flags = CPUFREQ_PM_NO_WARN | - CPUFREQ_NO_AUTO_DYNAMIC_SWITCHING, + .flags = CPUFREQ_NO_AUTO_DYNAMIC_SWITCHING, .attr = cpufreq_generic_attr, .name = "powermac", }; diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index c8e40e91fe9b..353969c7acd3 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -398,8 +398,11 @@ struct cpufreq_driver { /* loops_per_jiffy or other kernel "constants" aren't affected by frequency transitions */ #define CPUFREQ_CONST_LOOPS BIT(1) -/* don't warn on suspend/resume speed mismatches */ -#define CPUFREQ_PM_NO_WARN BIT(2) +/* + * Set by drivers that want the core to automatically register the cpufreq + * driver as a thermal cooling device. + */ +#define CPUFREQ_IS_COOLING_DEV BIT(2) /* * This should be set by platforms having multiple clock-domains, i.e. @@ -431,12 +434,6 @@ struct cpufreq_driver { */ #define CPUFREQ_NO_AUTO_DYNAMIC_SWITCHING BIT(6) -/* - * Set by drivers that want the core to automatically register the cpufreq - * driver as a thermal cooling device. - */ -#define CPUFREQ_IS_COOLING_DEV BIT(7) - int cpufreq_register_driver(struct cpufreq_driver *driver_data); int cpufreq_unregister_driver(struct cpufreq_driver *driver_data);
This flag is set by one of the drivers but it isn't used in the code otherwise. Remove the unused flag and update the driver. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- Rebased over: https://lore.kernel.org/lkml/a59bb322b22c247d570b70a8e94067804287623b.1612241683.git.viresh.kumar@linaro.org/ drivers/cpufreq/pmac32-cpufreq.c | 3 +-- include/linux/cpufreq.h | 13 +++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) -- 2.25.0.rc1.19.g042ed3e048af