| Message ID | 1433365966-29850-1-git-send-email-paul.gortmaker@windriver.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 03-06-15, 17:12, Paul Gortmaker wrote: > This file depends on a Kconfig option which is a bool, so > we use the appropriate registration function, which avoids us > relying on an implicit inclusion of <module.h> which we are > doing currently. > > While this currently works, we really don't want to be including > the module.h header in non-modular code, which we'd be forced > to do, pending some upcoming code relocation from init.h into > module.h. So we fix it now by using the non-modular equivalent. > > Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> > Cc: Viresh Kumar <viresh.kumar@linaro.org> > Cc: Kukjin Kim <kgene@kernel.org> > Cc: linux-pm@vger.kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> > --- > > [v2: drop exnyos part from patch, since it really was modular and > instead needs its implicit include fixed.] > > drivers/cpufreq/s5pv210-cpufreq.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/cpufreq/s5pv210-cpufreq.c b/drivers/cpufreq/s5pv210-cpufreq.c > index b0dac7d6ba31..9e231f52150c 100644 > --- a/drivers/cpufreq/s5pv210-cpufreq.c > +++ b/drivers/cpufreq/s5pv210-cpufreq.c > @@ -659,4 +659,4 @@ static struct platform_driver s5pv210_cpufreq_platdrv = { > }, > .probe = s5pv210_cpufreq_probe, > }; > -module_platform_driver(s5pv210_cpufreq_platdrv); > +builtin_platform_driver(s5pv210_cpufreq_platdrv); Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
On Wednesday, June 03, 2015 05:12:46 PM Paul Gortmaker wrote: > This file depends on a Kconfig option which is a bool, so > we use the appropriate registration function, which avoids us > relying on an implicit inclusion of <module.h> which we are > doing currently. > > While this currently works, we really don't want to be including > the module.h header in non-modular code, which we'd be forced > to do, pending some upcoming code relocation from init.h into > module.h. So we fix it now by using the non-modular equivalent. > > Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> > Cc: Viresh Kumar <viresh.kumar@linaro.org> > Cc: Kukjin Kim <kgene@kernel.org> > Cc: linux-pm@vger.kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> I'm assuming that this will go in via the Samsung tree.
On 15-06-15 07:50 PM, Rafael J. Wysocki wrote: > On Wednesday, June 03, 2015 05:12:46 PM Paul Gortmaker wrote: >> This file depends on a Kconfig option which is a bool, so >> we use the appropriate registration function, which avoids us >> relying on an implicit inclusion of <module.h> which we are >> doing currently. >> >> While this currently works, we really don't want to be including >> the module.h header in non-modular code, which we'd be forced >> to do, pending some upcoming code relocation from init.h into >> module.h. So we fix it now by using the non-modular equivalent. >> >> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> >> Cc: Viresh Kumar <viresh.kumar@linaro.org> >> Cc: Kukjin Kim <kgene@kernel.org> >> Cc: linux-pm@vger.kernel.org >> Cc: linux-arm-kernel@lists.infradead.org >> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> > > I'm assuming that this will go in via the Samsung tree. Per other patch, I'll have to keep a copy in my branch to avoid introducing bisect compile fails into the git history. Thanks, Paul. > >
diff --git a/drivers/cpufreq/s5pv210-cpufreq.c b/drivers/cpufreq/s5pv210-cpufreq.c index b0dac7d6ba31..9e231f52150c 100644 --- a/drivers/cpufreq/s5pv210-cpufreq.c +++ b/drivers/cpufreq/s5pv210-cpufreq.c @@ -659,4 +659,4 @@ static struct platform_driver s5pv210_cpufreq_platdrv = { }, .probe = s5pv210_cpufreq_probe, }; -module_platform_driver(s5pv210_cpufreq_platdrv); +builtin_platform_driver(s5pv210_cpufreq_platdrv);
This file depends on a Kconfig option which is a bool, so we use the appropriate registration function, which avoids us relying on an implicit inclusion of <module.h> which we are doing currently. While this currently works, we really don't want to be including the module.h header in non-modular code, which we'd be forced to do, pending some upcoming code relocation from init.h into module.h. So we fix it now by using the non-modular equivalent. Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> Cc: Viresh Kumar <viresh.kumar@linaro.org> Cc: Kukjin Kim <kgene@kernel.org> Cc: linux-pm@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- [v2: drop exnyos part from patch, since it really was modular and instead needs its implicit include fixed.] drivers/cpufreq/s5pv210-cpufreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)