diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-21 20:13:47 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-21 20:13:47 +0300 |
commit | 26bbcd630f2f521e60d7ef0a58da188e766553ad (patch) | |
tree | 1002a639b21322209a47d00c86230cb28922d7c7 /arch | |
parent | cfce216e1439d67a52a4b4c709299f6555946c33 (diff) | |
parent | 1e21acb7fbfb15fcb4afe21fb5a50a1bc00743ec (diff) | |
download | linux-26bbcd630f2f521e60d7ef0a58da188e766553ad.tar.xz |
Merge tag 'sh-for-v6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux
Pull sh updates from John Paul Adrian Glaubitz:
"Two patches by Ricardo B. Marliere make two instances of struct
bus_type in the interrupt controller driver and the DMA sysfs
interface const since the driver core in the kernel is now able to
handle that.
A third patch by Artur Rojek enforces internal linkage for the
function setup_hd64461() in order to fix the build of hp6xx_defconfig
with -Werror=missing-prototypes"
* tag 'sh-for-v6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux:
sh: hd64461: Make setup_hd64461() static
sh: intc: Make intc_subsys const
sh: dma-sysfs: Make dma_subsys const
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sh/cchips/hd6446x/hd64461.c | 2 | ||||
-rw-r--r-- | arch/sh/drivers/dma/dma-sysfs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/cchips/hd6446x/hd64461.c b/arch/sh/cchips/hd6446x/hd64461.c index f3fba967445a..81764882d87d 100644 --- a/arch/sh/cchips/hd6446x/hd64461.c +++ b/arch/sh/cchips/hd6446x/hd64461.c @@ -72,7 +72,7 @@ static void hd64461_irq_demux(struct irq_desc *desc) } } -int __init setup_hd64461(void) +static int __init setup_hd64461(void) { int irq_base, i; diff --git a/arch/sh/drivers/dma/dma-sysfs.c b/arch/sh/drivers/dma/dma-sysfs.c index 431bc18f0a41..9f666280d80c 100644 --- a/arch/sh/drivers/dma/dma-sysfs.c +++ b/arch/sh/drivers/dma/dma-sysfs.c @@ -15,7 +15,7 @@ #include <linux/string.h> #include <asm/dma.h> -static struct bus_type dma_subsys = { +static const struct bus_type dma_subsys = { .name = "dma", .dev_name = "dma", }; |