Skip to contentSkip to conversation

ARM/cpuidle: remove __init tag from Calxeda cpuidle probe function

PATCH New Andre Przywara 2 participants 4 messages Dec 13, 2013 – Dec 14, 2013 CPU idle time management framework

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM/cpuidle: remove __init tag from Calxeda cpuidle probe function

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.

---
 drivers/cpuidle/cpuidle-calxeda.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpuidle/cpuidle-calxeda.c +1 -1
index 3679563..6e51114 100644
@@ -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);
 }
Signature · 1 line
1.7.12.1
#1 lore raw

PATCH 1/1 ARM/cpuidle: remove __init tag from Calxeda cpuidle probe function

Quoted 9 lines · Andre Przywara

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.

---

Applied to my tree for 3.14.

Thanks for the fix.

-- Daniel

Quoted 17 lines
  drivers/cpuidle/cpuidle-calxeda.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpuidle/cpuidle-calxeda.c +1 -1
index 3679563..6e51114 100644
@@ -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);
  }
Signature · 5 lines
  <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
#2 lore raw

PATCH 1/1 ARM/cpuidle: remove __init tag from Calxeda cpuidle probe function

Quoted 8 lines · Daniel Lezcano
Quoted 7 lines · Andre Przywara

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.

Quoted 4 lines
Quoted 2 lines

---

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.

Quoted 25 lines

Thanks for the fix.

-- Daniel

Quoted 18 lines
  drivers/cpuidle/cpuidle-calxeda.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpuidle/cpuidle-calxeda.c +1 -1
index 3679563..6e51114 100644
@@ -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);
  }
#3 lore raw

PATCH 1/1 ARM/cpuidle: remove __init tag from Calxeda cpuidle probe function

Quoted 12 lines · Andre Przywara
Quoted 11 lines · Daniel Lezcano
Quoted 9 lines · Andre Przywara

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.

---

Quoted 8 lines
Quoted 1 line

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

Quoted 26 lines
Quoted 25 lines

Thanks for the fix.

-- Daniel

Quoted 18 lines
  drivers/cpuidle/cpuidle-calxeda.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpuidle/cpuidle-calxeda.c +1 -1
index 3679563..6e51114 100644
@@ -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);
  }
Signature · 5 lines
  <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog