2022-11-06 08:34:43

by Christophe JAILLET

[permalink] [raw]
Subject: [PATCH] rtc: Include <linux/kstrtox.h> when appropriate

The kstrto<something>() functions have been moved from kernel.h to
kstrtox.h.

So, include the latter directly in the appropriate files.

Signed-off-by: Christophe JAILLET <[email protected]>
---
The goal of this patch is to eventually remove <linux/kernel.h> from
<linux/watchdog.h>.

This patch is needed to avoid indirect inclusion, via <linux/watchdog.h>,
in rtc-abx80x.c and rtc-ds1307.c.

I've done my best to keep alphabetical order of the included files, to that
is not always easy to achieve!
---
drivers/rtc/rtc-abx80x.c | 1 +
drivers/rtc/rtc-bq32k.c | 1 +
drivers/rtc/rtc-ds1307.c | 1 +
drivers/rtc/rtc-rv3029c2.c | 1 +
drivers/rtc/rtc-rx8025.c | 1 +
drivers/rtc/sysfs.c | 1 +
6 files changed, 6 insertions(+)

diff --git a/drivers/rtc/rtc-abx80x.c b/drivers/rtc/rtc-abx80x.c
index 9b0138d07232..973649d95e13 100644
--- a/drivers/rtc/rtc-abx80x.c
+++ b/drivers/rtc/rtc-abx80x.c
@@ -12,6 +12,7 @@

#include <linux/bcd.h>
#include <linux/i2c.h>
+#include <linux/kstrtox.h>
#include <linux/module.h>
#include <linux/of_device.h>
#include <linux/rtc.h>
diff --git a/drivers/rtc/rtc-bq32k.c b/drivers/rtc/rtc-bq32k.c
index 6d6a55efb9cc..967ddc6bf76d 100644
--- a/drivers/rtc/rtc-bq32k.c
+++ b/drivers/rtc/rtc-bq32k.c
@@ -13,6 +13,7 @@
#include <linux/i2c.h>
#include <linux/rtc.h>
#include <linux/init.h>
+#include <linux/kstrtox.h>
#include <linux/errno.h>
#include <linux/bcd.h>

diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index d51565bcc189..7c2276cf5514 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -11,6 +11,7 @@
#include <linux/bcd.h>
#include <linux/i2c.h>
#include <linux/init.h>
+#include <linux/kstrtox.h>
#include <linux/mod_devicetable.h>
#include <linux/module.h>
#include <linux/property.h>
diff --git a/drivers/rtc/rtc-rv3029c2.c b/drivers/rtc/rtc-rv3029c2.c
index eb483a30bd92..e4fdd47ae066 100644
--- a/drivers/rtc/rtc-rv3029c2.c
+++ b/drivers/rtc/rtc-rv3029c2.c
@@ -17,6 +17,7 @@
#include <linux/of.h>
#include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
+#include <linux/kstrtox.h>
#include <linux/regmap.h>

/* Register map */
diff --git a/drivers/rtc/rtc-rx8025.c b/drivers/rtc/rtc-rx8025.c
index dde86f3e2a4b..078b4406acad 100644
--- a/drivers/rtc/rtc-rx8025.c
+++ b/drivers/rtc/rtc-rx8025.c
@@ -19,6 +19,7 @@
#include <linux/bitops.h>
#include <linux/i2c.h>
#include <linux/kernel.h>
+#include <linux/kstrtox.h>
#include <linux/module.h>
#include <linux/rtc.h>

diff --git a/drivers/rtc/sysfs.c b/drivers/rtc/sysfs.c
index 00f1945bcb7e..e3062c4d3f2c 100644
--- a/drivers/rtc/sysfs.c
+++ b/drivers/rtc/sysfs.c
@@ -6,6 +6,7 @@
* Author: Alessandro Zummo <[email protected]>
*/

+#include <linux/kstrtox.h>
#include <linux/module.h>
#include <linux/rtc.h>

--
2.34.1



2022-11-14 21:55:56

by Alexandre Belloni

[permalink] [raw]
Subject: Re: [PATCH] rtc: Include <linux/kstrtox.h> when appropriate

On Sun, 6 Nov 2022 09:00:51 +0100, Christophe JAILLET wrote:
> The kstrto<something>() functions have been moved from kernel.h to
> kstrtox.h.
>
> So, include the latter directly in the appropriate files.
>
>

Applied, thanks!

[1/1] rtc: Include <linux/kstrtox.h> when appropriate
commit: 81d8865e8bea9de75be02231ddb42926509b44b0

Best regards,

--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com