Skip to content

Commit 286fde5

Browse files
committed
Merge tag 'samsung-soc-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/arm
Samsung mach/soc changes for v6.9 Just cleanups: kerneldoc warning and add missing const to bus_type. * tag 'samsung-soc-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: s3c64xx: make bus_type const ARM: s5pv210: fix pm.c kernel-doc warning Link: https://lore.kernel.org/r/20240218182141.31213-4-krzysztof.kozlowski@linaro.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 41bccc9 + a389162 commit 286fde5

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

arch/arm/mach-s3c/cpu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,6 @@ extern void s3c24xx_init_uartdevs(char *name,
7676
struct s3c24xx_uart_resources *res,
7777
struct s3c2410_uartcfg *cfg, int no);
7878

79-
extern struct bus_type s3c6410_subsys;
79+
extern const struct bus_type s3c6410_subsys;
8080

8181
#endif

arch/arm/mach-s3c/s3c6410.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void __init s3c6410_init_irq(void)
5757
s3c64xx_init_irq(~0 & ~(1 << 7), ~0);
5858
}
5959

60-
struct bus_type s3c6410_subsys = {
60+
const struct bus_type s3c6410_subsys = {
6161
.name = "s3c6410-core",
6262
.dev_name = "s3c6410-core",
6363
};

arch/arm/mach-s3c/s3c64xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ static struct map_desc s3c_iodesc[] __initdata = {
149149
},
150150
};
151151

152-
static struct bus_type s3c64xx_subsys = {
152+
static const struct bus_type s3c64xx_subsys = {
153153
.name = "s3c64xx-core",
154154
.dev_name = "s3c64xx-core",
155155
};

arch/arm/mach-s5pv210/pm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ static void s3c_pm_do_save(struct sleep_save *ptr, int count)
4747
}
4848

4949
/**
50-
* s3c_pm_do_restore() - restore register values from the save list.
50+
* s3c_pm_do_restore_core() - restore register values from the save list.
5151
* @ptr: Pointer to an array of registers.
5252
* @count: Size of the ptr array.
5353
*

0 commit comments

Comments
 (0)