clocksource/drivers/stm: Fix section mismatches

Platform drivers can be probed after their init sections have been discarded (e.g. on probe deferral or manual rebind through sysfs) so the probe function must not live in init. Device managed resource actions similarly cannot be discarded.

The "_probe" suffix of the driver structure name prevents modpost from warning about this so replace it to catch any similar future issues.

Fixes cec32ac75827 ("clocksource/drivers/nxp-timer: Add the System Timer Module for the s32gx platforms")

Cc [email protected] # 6.16

Cc Daniel Lezcano <[email protected]>

Signed-off-by Johan Hovold <[email protected]>

Quoted 5 lines · Johan Hovold

Platform drivers can be probed after their init sections have been discarded (e.g. on probe deferral or manual rebind through sysfs) so the probe function must not live in init. Device managed resource actions similarly cannot be discarded.

Quoted 7 lines

The "_probe" suffix of the driver structure name prevents modpost from warning about this so replace it to catch any similar future issues.

Fixes cec32ac75827 ("clocksource/drivers/nxp-timer: Add the System Timer Module for the s32gx platforms")

Cc [email protected] # 6.16

Cc Daniel Lezcano <[email protected]>

Signed-off-by Johan Hovold <[email protected]>

Addressing this apparently depends on commit 84b1a903aed8 ("time/sched_clock: Export symbol for sched_clock register function") which was merged for 6.18-rc1.

So the stable tag should be dropped (e.g. unless it's possible to backport also the dependency to 6.17).

Quoted 14 lines · Johan Hovold

Quoted 12 lines · Johan Hovold

Platform drivers can be probed after their init sections have been discarded (e.g. on probe deferral or manual rebind through sysfs) so the probe function must not live in init. Device managed resource actions similarly cannot be discarded.

The "_probe" suffix of the driver structure name prevents modpost from warning about this so replace it to catch any similar future issues.

Fixes cec32ac75827 ("clocksource/drivers/nxp-timer: Add the System Timer Module for the s32gx platforms")

Cc [email protected] # 6.16

Cc Daniel Lezcano <[email protected]>

Signed-off-by Johan Hovold <[email protected]>

Quoted 6 lines

Addressing this apparently depends on commit 84b1a903aed8 ("time/sched_clock: Export symbol for sched_clock register function") which was merged for 6.18-rc1.

So the stable tag should be dropped (e.g. unless it's possible to backport also the dependency to 6.17).

Quite easy to do so, just ask us! :)

Platform drivers can be probed after their init sections have been discarded (e.g. on probe deferral or manual rebind through sysfs) so the probe function must not live in init. Device managed resource actions similarly cannot be discarded.

The "_probe" suffix of the driver structure name prevents modpost from warning about this so replace it to catch any similar future issues.

Fixes cec32ac75827 ("clocksource/drivers/nxp-timer: Add the System Timer Module for the s32gx platforms")

Cc [email protected] # 6.16

Cc Daniel Lezcano <[email protected]>

Signed-off-by Johan Hovold <[email protected]>

---
  drivers/clocksource/timer-nxp-stm.c | 18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)

drivers/clocksource/timer-nxp-stm.c +9 -9

index bbc40623728f..ce10bdcfc76b 100644
@@ -177,15 +177,15 @@ static void nxp_stm_clocksource_resume(struct clocksource *cs)
  	nxp_stm_clocksource_enable(cs);
  }
 
-static void __init devm_clocksource_unregister(void *data)
+static void devm_clocksource_unregister(void *data)
  {
  	struct stm_timer *stm_timer = data;
 
  	clocksource_unregister(&stm_timer->cs);
  }
 
-static int __init nxp_stm_clocksource_init(struct device *dev, struct stm_timer *stm_timer,
-					   const char *name, void __iomem *base, struct clk *clk)
+static int nxp_stm_clocksource_init(struct device *dev, struct stm_timer *stm_timer,
+				    const char *name, void __iomem *base, struct clk *clk)
  {
  	int ret;
 

@@ -298,9 +298,9 @@ static void nxp_stm_clockevent_resume(struct clock_event_device *ced)
  	nxp_stm_module_get(stm_timer);
  }
 
-static int __init nxp_stm_clockevent_per_cpu_init(struct device *dev, struct stm_timer *stm_timer,
-						  const char *name, void __iomem *base, int irq,
-						  struct clk *clk, int cpu)
+static int nxp_stm_clockevent_per_cpu_init(struct device *dev, struct stm_timer *stm_timer,
+					   const char *name, void __iomem *base, int irq,
+					   struct clk *clk, int cpu)
  {
  	stm_timer->base = base;
  	stm_timer->rate = clk_get_rate(clk);

@@ -388,7 +388,7 @@ static irqreturn_t nxp_stm_module_interrupt(int irq, void *dev_id)
  	return IRQ_HANDLED;
  }
 
-static int __init nxp_stm_timer_probe(struct platform_device *pdev)
+static int nxp_stm_timer_probe(struct platform_device *pdev)
  {
  	struct stm_timer *stm_timer;
  	struct device *dev = &pdev->dev;

@@ -484,14 +484,14 @@ static const struct of_device_id nxp_stm_of_match[] = {
  };
  MODULE_DEVICE_TABLE(of, nxp_stm_of_match);
 
-static struct platform_driver nxp_stm_probe = {
+static struct platform_driver nxp_stm_driver = {
  	.probe	= nxp_stm_timer_probe,
  	.driver	= {
  		.name		= "nxp-stm",
  		.of_match_table	= nxp_stm_of_match,
  	},
  };
-module_platform_driver(nxp_stm_probe);
+module_platform_driver(nxp_stm_driver);
 
  MODULE_DESCRIPTION("NXP System Timer Module driver");
  MODULE_LICENSE("GPL");

You should replace __init by __init_or_module

Quoted 4 lines

Platform drivers can be probed after their init sections have been discarded (e.g. on probe deferral or manual rebind through sysfs) so the probe function must not live in init. Device managed resource actions similarly cannot be discarded.

Hi Daniel,

Quoted 1 line · Daniel Lezcano

You should replace __init by __init_or_module

That's not sufficient as the driver can still be rebound through sysfs currently (the driver would probably crash anyway, but that's a separate issue).

Also note that no drivers use __init_or_module these days, likely as everyone uses modules and it's not worth the added complexity in trying to get the section markers right for a build configuration that few people care about.

I can send a follow-on patch to suppress the unbind attribute, or include it in a v2 if you insist on using __init_or_module.

What do you prefer?

Quoted 13 lines · Johan Hovold

Quoted 1 line · Daniel Lezcano

You should replace __init by __init_or_module

That's not sufficient as the driver can still be rebound through sysfs currently (the driver would probably crash anyway, but that's a separate issue).

Also note that no drivers use __init_or_module these days, likely as everyone uses modules and it's not worth the added complexity in trying to get the section markers right for a build configuration that few people care about.

Quoted 4 lines

I can send a follow-on patch to suppress the unbind attribute, or include it in a v2 if you insist on using __init_or_module.

What do you prefer?

I think it makes sens to use __init_or_module because these drivers have been always compiled in and we are converting them into modules.

Platform drivers can be probed after their init sections have been discarded (e.g. on probe deferral or manual rebind through sysfs) so the probe function must not live in init. Device managed resource actions similarly cannot be discarded.

The "_probe" suffix of the driver structure name prevents modpost from warning about this so replace it to catch any similar future issues.

Fixes cec32ac75827 ("clocksource/drivers/nxp-timer: Add the System Timer Module for the s32gx platforms")

Cc [email protected] # 6.16

Cc Daniel Lezcano <[email protected]>

Signed-off-by Johan Hovold <[email protected]>

---