| Message ID | 1386967759-12952-1-git-send-email-andre.przywara@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 12/13/2013 09:49 PM, Andre Przywara wrote: > Commit 60a66e370007e8535b7a561353b07b37deaf35ba changed the Calxeda > cpuidle driver to a platform driver, copying the __init tag from the > _init() to the newly used _probe() function. However, "probe should > not be __init." (Rob said ;-) > Remove the __init tag to fix a section mismatch in the Calxeda > cpuidle driver. > > Signed-off-by: Andre Przywara <andre.przywara@linaro.org> > --- Applied to my tree for 3.14. Thanks for the fix. -- Daniel > drivers/cpuidle/cpuidle-calxeda.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/cpuidle/cpuidle-calxeda.c b/drivers/cpuidle/cpuidle-calxeda.c > index 3679563..6e51114 100644 > --- a/drivers/cpuidle/cpuidle-calxeda.c > +++ b/drivers/cpuidle/cpuidle-calxeda.c > @@ -65,7 +65,7 @@ static struct cpuidle_driver calxeda_idle_driver = { > .state_count = 2, > }; > > -static int __init calxeda_cpuidle_probe(struct platform_device *pdev) > +static int calxeda_cpuidle_probe(struct platform_device *pdev) > { > return cpuidle_register(&calxeda_idle_driver, NULL); > } >
On 12/13/2013 10:57 PM, Daniel Lezcano wrote: > On 12/13/2013 09:49 PM, Andre Przywara wrote: >> Commit 60a66e370007e8535b7a561353b07b37deaf35ba changed the Calxeda >> cpuidle driver to a platform driver, copying the __init tag from the >> _init() to the newly used _probe() function. However, "probe should >> not be __init." (Rob said ;-) >> Remove the __init tag to fix a section mismatch in the Calxeda >> cpuidle driver. >> >> Signed-off-by: Andre Przywara <andre.przywara@linaro.org> >> --- > > Applied to my tree for 3.14. Daniel, thanks! But since this is a regression (3.12 compiles fine), can someone please push this still for 3.13? If I am not mistaken, the rework was introduced in the last merge window, so I'd consider this a bug fix. Thanks, Andre. > Thanks for the fix. > > -- Daniel > >> drivers/cpuidle/cpuidle-calxeda.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/cpuidle/cpuidle-calxeda.c >> b/drivers/cpuidle/cpuidle-calxeda.c >> index 3679563..6e51114 100644 >> --- a/drivers/cpuidle/cpuidle-calxeda.c >> +++ b/drivers/cpuidle/cpuidle-calxeda.c >> @@ -65,7 +65,7 @@ static struct cpuidle_driver calxeda_idle_driver = { >> .state_count = 2, >> }; >> >> -static int __init calxeda_cpuidle_probe(struct platform_device *pdev) >> +static int calxeda_cpuidle_probe(struct platform_device *pdev) >> { >> return cpuidle_register(&calxeda_idle_driver, NULL); >> } >> > >
On 12/13/2013 11:47 PM, Andre Przywara wrote: > On 12/13/2013 10:57 PM, Daniel Lezcano wrote: >> On 12/13/2013 09:49 PM, Andre Przywara wrote: >>> Commit 60a66e370007e8535b7a561353b07b37deaf35ba changed the Calxeda >>> cpuidle driver to a platform driver, copying the __init tag from the >>> _init() to the newly used _probe() function. However, "probe should >>> not be __init." (Rob said ;-) >>> Remove the __init tag to fix a section mismatch in the Calxeda >>> cpuidle driver. >>> >>> Signed-off-by: Andre Przywara <andre.przywara@linaro.org> >>> --- >> >> Applied to my tree for 3.14. > > Daniel, > > thanks! > But since this is a regression (3.12 compiles fine), can someone please > push this still for 3.13? If I am not mistaken, the rework was > introduced in the last merge window, so I'd consider this a bug fix. Yep. Done. -- Daniel >> Thanks for the fix. > >> >> -- Daniel >> >>> drivers/cpuidle/cpuidle-calxeda.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/drivers/cpuidle/cpuidle-calxeda.c >>> b/drivers/cpuidle/cpuidle-calxeda.c >>> index 3679563..6e51114 100644 >>> --- a/drivers/cpuidle/cpuidle-calxeda.c >>> +++ b/drivers/cpuidle/cpuidle-calxeda.c >>> @@ -65,7 +65,7 @@ static struct cpuidle_driver calxeda_idle_driver = { >>> .state_count = 2, >>> }; >>> >>> -static int __init calxeda_cpuidle_probe(struct platform_device *pdev) >>> +static int calxeda_cpuidle_probe(struct platform_device *pdev) >>> { >>> return cpuidle_register(&calxeda_idle_driver, NULL); >>> } >>> >> >> >
diff --git a/drivers/cpuidle/cpuidle-calxeda.c b/drivers/cpuidle/cpuidle-calxeda.c index 3679563..6e51114 100644 --- a/drivers/cpuidle/cpuidle-calxeda.c +++ b/drivers/cpuidle/cpuidle-calxeda.c @@ -65,7 +65,7 @@ static struct cpuidle_driver calxeda_idle_driver = { .state_count = 2, }; -static int __init calxeda_cpuidle_probe(struct platform_device *pdev) +static int calxeda_cpuidle_probe(struct platform_device *pdev) { return cpuidle_register(&calxeda_idle_driver, NULL); }
Commit 60a66e370007e8535b7a561353b07b37deaf35ba changed the Calxeda cpuidle driver to a platform driver, copying the __init tag from the _init() to the newly used _probe() function. However, "probe should not be __init." (Rob said ;-) Remove the __init tag to fix a section mismatch in the Calxeda cpuidle driver. Signed-off-by: Andre Przywara <andre.przywara@linaro.org> --- drivers/cpuidle/cpuidle-calxeda.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)