Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+4 -4
+1 -1
arch/sh/cchips/hd6446x/hd64461.c
··· 72 72 } 73 73 } 74 74 75 - int __init setup_hd64461(void) 75 + static int __init setup_hd64461(void) 76 76 { 77 77 int irq_base, i; 78 78
+1 -1
arch/sh/drivers/dma/dma-sysfs.c
··· 15 15 #include <linux/string.h> 16 16 #include <asm/dma.h> 17 17 18 - static struct bus_type dma_subsys = { 18 + static const struct bus_type dma_subsys = { 19 19 .name = "dma", 20 20 .dev_name = "dma", 21 21 };
+1 -1
drivers/sh/intc/core.c
··· 455 455 .resume = intc_resume, 456 456 }; 457 457 458 - struct bus_type intc_subsys = { 458 + const struct bus_type intc_subsys = { 459 459 .name = "intc", 460 460 .dev_name = "intc", 461 461 };
+1 -1
drivers/sh/intc/internals.h
··· 160 160 /* core.c */ 161 161 extern struct list_head intc_list; 162 162 extern raw_spinlock_t intc_big_lock; 163 - extern struct bus_type intc_subsys; 163 + extern const struct bus_type intc_subsys; 164 164 165 165 unsigned int intc_get_dfl_prio_level(void); 166 166 unsigned int intc_get_prio_level(unsigned int irq);