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
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
@@ -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",
|
||||
};
|
||||
|
||||
@@ -455,7 +455,7 @@ struct syscore_ops intc_syscore_ops = {
|
||||
.resume = intc_resume,
|
||||
};
|
||||
|
||||
struct bus_type intc_subsys = {
|
||||
const struct bus_type intc_subsys = {
|
||||
.name = "intc",
|
||||
.dev_name = "intc",
|
||||
};
|
||||
|
||||
@@ -160,7 +160,7 @@ void _intc_enable(struct irq_data *data, unsigned long handle);
|
||||
/* core.c */
|
||||
extern struct list_head intc_list;
|
||||
extern raw_spinlock_t intc_big_lock;
|
||||
extern struct bus_type intc_subsys;
|
||||
extern const struct bus_type intc_subsys;
|
||||
|
||||
unsigned int intc_get_dfl_prio_level(void);
|
||||
unsigned int intc_get_prio_level(unsigned int irq);
|
||||
|
||||
Reference in New Issue
Block a user