Commit 286fde54 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'samsung-soc-6.9' of...

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.orgSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 41bccc98 a3891621
...@@ -76,6 +76,6 @@ extern void s3c24xx_init_uartdevs(char *name, ...@@ -76,6 +76,6 @@ extern void s3c24xx_init_uartdevs(char *name,
struct s3c24xx_uart_resources *res, struct s3c24xx_uart_resources *res,
struct s3c2410_uartcfg *cfg, int no); struct s3c2410_uartcfg *cfg, int no);
extern struct bus_type s3c6410_subsys; extern const struct bus_type s3c6410_subsys;
#endif #endif
...@@ -57,7 +57,7 @@ void __init s3c6410_init_irq(void) ...@@ -57,7 +57,7 @@ void __init s3c6410_init_irq(void)
s3c64xx_init_irq(~0 & ~(1 << 7), ~0); s3c64xx_init_irq(~0 & ~(1 << 7), ~0);
} }
struct bus_type s3c6410_subsys = { const struct bus_type s3c6410_subsys = {
.name = "s3c6410-core", .name = "s3c6410-core",
.dev_name = "s3c6410-core", .dev_name = "s3c6410-core",
}; };
......
...@@ -149,7 +149,7 @@ static struct map_desc s3c_iodesc[] __initdata = { ...@@ -149,7 +149,7 @@ static struct map_desc s3c_iodesc[] __initdata = {
}, },
}; };
static struct bus_type s3c64xx_subsys = { static const struct bus_type s3c64xx_subsys = {
.name = "s3c64xx-core", .name = "s3c64xx-core",
.dev_name = "s3c64xx-core", .dev_name = "s3c64xx-core",
}; };
......
...@@ -47,7 +47,7 @@ static void s3c_pm_do_save(struct sleep_save *ptr, int count) ...@@ -47,7 +47,7 @@ static void s3c_pm_do_save(struct sleep_save *ptr, int count)
} }
/** /**
* s3c_pm_do_restore() - restore register values from the save list. * s3c_pm_do_restore_core() - restore register values from the save list.
* @ptr: Pointer to an array of registers. * @ptr: Pointer to an array of registers.
* @count: Size of the ptr array. * @count: Size of the ptr array.
* *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment