|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen staging] IRQ: drop regs parameter from handler functions
commit 4da40a267a236d785d70ce6de88bb86846b64ccc
Author: Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Thu Feb 22 12:15:20 2024 +0100
Commit: Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Feb 22 12:15:20 2024 +0100
IRQ: drop regs parameter from handler functions
It's simply not needed anymore. Note how Linux made this change many
years ago already, in 2.6.19 (late 2006, see [1]).
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
Acked-by: Julien Grall <jgrall@xxxxxxxxxx>
[1]
https://git.kernel.org/torvalds/c/7d12e780e003f93433d49ce78cfedf4b4c52adc5
---
xen/arch/arm/gic.c | 2 +-
xen/arch/arm/irq.c | 5 ++---
xen/arch/arm/time.c | 4 ++--
xen/arch/x86/hpet.c | 3 +--
xen/arch/x86/irq.c | 4 ++--
xen/arch/x86/time.c | 3 +--
xen/common/irq.c | 2 +-
xen/drivers/char/cadence-uart.c | 2 +-
xen/drivers/char/exynos4210-uart.c | 2 +-
xen/drivers/char/imx-lpuart.c | 3 +--
xen/drivers/char/meson-uart.c | 3 +--
xen/drivers/char/mvebu-uart.c | 3 +--
xen/drivers/char/ns16550.c | 3 +--
xen/drivers/char/omap-uart.c | 2 +-
xen/drivers/char/pl011.c | 2 +-
xen/drivers/char/scif-uart.c | 2 +-
xen/drivers/passthrough/amd/iommu_init.c | 3 +--
xen/drivers/passthrough/arm/ipmmu-vmsa.c | 2 +-
xen/drivers/passthrough/arm/smmu-v3.c | 14 +++++---------
xen/drivers/passthrough/arm/smmu.c | 6 ++----
xen/drivers/passthrough/vtd/iommu.c | 3 +--
xen/include/xen/irq.h | 7 +++----
22 files changed, 32 insertions(+), 48 deletions(-)
diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c
index b5a9c8266c..44c40e86de 100644
--- a/xen/arch/arm/gic.c
+++ b/xen/arch/arm/gic.c
@@ -397,7 +397,7 @@ void gic_interrupt(struct cpu_user_regs *regs, int is_fiq)
} while (1);
}
-static void maintenance_interrupt(int irq, void *dev_id, struct cpu_user_regs
*regs)
+static void maintenance_interrupt(int irq, void *dev_id)
{
/*
* This is a dummy interrupt handler.
diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c
index ae69fb4aeb..6ac952f43b 100644
--- a/xen/arch/arm/irq.c
+++ b/xen/arch/arm/irq.c
@@ -182,8 +182,7 @@ void irq_set_affinity(struct irq_desc *desc, const
cpumask_t *mask)
}
int request_irq(unsigned int irq, unsigned int irqflags,
- void (*handler)(int irq, void *dev_id,
- struct cpu_user_regs *regs),
+ void (*handler)(int irq, void *dev_id),
const char *devname, void *dev_id)
{
struct irqaction *action;
@@ -276,7 +275,7 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int irq,
int is_fiq)
do
{
- action->handler(irq, action->dev_id, regs);
+ action->handler(irq, action->dev_id);
action = action->next;
} while ( action );
diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c
index 09cae8138e..e74d30d258 100644
--- a/xen/arch/arm/time.c
+++ b/xen/arch/arm/time.c
@@ -241,7 +241,7 @@ int reprogram_timer(s_time_t timeout)
}
/* Handle the firing timer */
-static void htimer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs)
+static void htimer_interrupt(int irq, void *dev_id)
{
if ( unlikely(!(READ_SYSREG(CNTHP_CTL_EL2) & CNTx_CTL_PENDING)) )
return;
@@ -255,7 +255,7 @@ static void htimer_interrupt(int irq, void *dev_id, struct
cpu_user_regs *regs)
WRITE_SYSREG(0, CNTHP_CTL_EL2);
}
-static void vtimer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs)
+static void vtimer_interrupt(int irq, void *dev_id)
{
/*
* Edge-triggered interrupts can be used for the virtual timer. Even
diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c
index d982b0f6b2..d9e9c8ffa3 100644
--- a/xen/arch/x86/hpet.c
+++ b/xen/arch/x86/hpet.c
@@ -237,8 +237,7 @@ again:
}
}
-static void cf_check hpet_interrupt_handler(
- int irq, void *data, struct cpu_user_regs *regs)
+static void cf_check hpet_interrupt_handler(int irq, void *data)
{
struct hpet_event_channel *ch = data;
diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
index bbae7751e4..689d7e46ab 100644
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -962,7 +962,7 @@ static int __init cf_check irq_ratelimit_init(void)
__initcall(irq_ratelimit_init);
int __init request_irq(unsigned int irq, unsigned int irqflags,
- void (*handler)(int irq, void *dev_id, struct cpu_user_regs *regs),
+ void (*handler)(int irq, void *dev_id),
const char * devname, void *dev_id)
{
struct irqaction * action;
@@ -2009,7 +2009,7 @@ void do_IRQ(struct cpu_user_regs *regs)
spin_unlock_irq(&desc->lock);
tsc_in = tb_init_done ? get_cycles() : 0;
- action->handler(irq, action->dev_id, regs);
+ action->handler(irq, action->dev_id);
TRACE_3D(TRC_HW_IRQ_HANDLED, irq, tsc_in, get_cycles());
spin_lock_irq(&desc->lock);
diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c
index 34ddb9633f..6087004789 100644
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -198,8 +198,7 @@ static void smp_send_timer_broadcast_ipi(void)
}
}
-static void cf_check timer_interrupt(
- int irq, void *dev_id, struct cpu_user_regs *regs)
+static void cf_check timer_interrupt(int irq, void *dev_id)
{
ASSERT(local_irq_is_enabled());
diff --git a/xen/common/irq.c b/xen/common/irq.c
index 236cf171e2..04f14f7d1a 100644
--- a/xen/common/irq.c
+++ b/xen/common/irq.c
@@ -29,7 +29,7 @@ int init_one_irq_desc(struct irq_desc *desc)
return err;
}
-void cf_check no_action(int cpl, void *dev_id, struct cpu_user_regs *regs)
+void cf_check no_action(int cpl, void *dev_id)
{
}
diff --git a/xen/drivers/char/cadence-uart.c b/xen/drivers/char/cadence-uart.c
index 0b670c64ed..3618fa88d8 100644
--- a/xen/drivers/char/cadence-uart.c
+++ b/xen/drivers/char/cadence-uart.c
@@ -40,7 +40,7 @@ static struct cuart {
#define cuart_read(uart, off) readl((uart)->regs + (off))
#define cuart_write(uart, off,val) writel((val), (uart)->regs + (off))
-static void cuart_interrupt(int irq, void *data, struct cpu_user_regs *regs)
+static void cuart_interrupt(int irq, void *data)
{
struct serial_port *port = data;
struct cuart *uart = port->uart;
diff --git a/xen/drivers/char/exynos4210-uart.c
b/xen/drivers/char/exynos4210-uart.c
index 5c53860df6..b29fd75c5a 100644
--- a/xen/drivers/char/exynos4210-uart.c
+++ b/xen/drivers/char/exynos4210-uart.c
@@ -45,7 +45,7 @@ static struct exynos4210_uart {
#define exynos4210_read(uart, off) readl((uart)->regs + off)
#define exynos4210_write(uart, off, val) writel(val, (uart->regs) + off)
-static void exynos4210_uart_interrupt(int irq, void *data, struct
cpu_user_regs *regs)
+static void exynos4210_uart_interrupt(int irq, void *data)
{
struct serial_port *port = data;
struct exynos4210_uart *uart = port->uart;
diff --git a/xen/drivers/char/imx-lpuart.c b/xen/drivers/char/imx-lpuart.c
index f5b341e20b..522680a25c 100644
--- a/xen/drivers/char/imx-lpuart.c
+++ b/xen/drivers/char/imx-lpuart.c
@@ -37,8 +37,7 @@ static struct imx_lpuart {
struct vuart_info vuart;
} imx8_com;
-static void imx_lpuart_interrupt(int irq, void *data,
- struct cpu_user_regs *regs)
+static void imx_lpuart_interrupt(int irq, void *data)
{
struct serial_port *port = data;
struct imx_lpuart *uart = port->uart;
diff --git a/xen/drivers/char/meson-uart.c b/xen/drivers/char/meson-uart.c
index 640c29dd05..694381986d 100644
--- a/xen/drivers/char/meson-uart.c
+++ b/xen/drivers/char/meson-uart.c
@@ -61,8 +61,7 @@ static struct meson_uart {
struct vuart_info vuart;
} meson_com;
-static void meson_uart_interrupt(int irq, void *data,
- struct cpu_user_regs *regs)
+static void meson_uart_interrupt(int irq, void *data)
{
struct serial_port *port = data;
struct meson_uart *uart = port->uart;
diff --git a/xen/drivers/char/mvebu-uart.c b/xen/drivers/char/mvebu-uart.c
index 57c1259224..1913fe8b5f 100644
--- a/xen/drivers/char/mvebu-uart.c
+++ b/xen/drivers/char/mvebu-uart.c
@@ -67,8 +67,7 @@ static struct mvebu3700_uart {
#define mvebu3700_read(uart, off) readl((uart)->regs + (off))
#define mvebu3700_write(uart, off, val) writel(val, (uart)->regs + (off))
-static void mvebu3700_uart_interrupt(int irq, void *data,
- struct cpu_user_regs *regs)
+static void mvebu3700_uart_interrupt(int irq, void *data)
{
struct serial_port *port = data;
struct mvebu3700_uart *uart = port->uart;
diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c
index 91f0624d74..a126e4a808 100644
--- a/xen/drivers/char/ns16550.c
+++ b/xen/drivers/char/ns16550.c
@@ -175,8 +175,7 @@ static void handle_dw_usr_busy_quirk(struct ns16550 *uart)
}
}
-static void cf_check ns16550_interrupt(
- int irq, void *dev_id, struct cpu_user_regs *regs)
+static void cf_check ns16550_interrupt(int irq, void *dev_id)
{
struct serial_port *port = dev_id;
struct ns16550 *uart = port->uart;
diff --git a/xen/drivers/char/omap-uart.c b/xen/drivers/char/omap-uart.c
index fb842b1707..e4f5be2289 100644
--- a/xen/drivers/char/omap-uart.c
+++ b/xen/drivers/char/omap-uart.c
@@ -59,7 +59,7 @@ static struct omap_uart {
struct vuart_info vuart;
} omap_com = {0};
-static void omap_uart_interrupt(int irq, void *data, struct cpu_user_regs
*regs)
+static void omap_uart_interrupt(int irq, void *data)
{
struct serial_port *port = data;
struct omap_uart *uart = port->uart;
diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c
index cb7c4affa5..7260a988ca 100644
--- a/xen/drivers/char/pl011.c
+++ b/xen/drivers/char/pl011.c
@@ -82,7 +82,7 @@ static unsigned int pl011_intr_status(struct pl011 *uart)
return (pl011_read(uart, RIS) & pl011_read(uart, IMSC));
}
-static void pl011_interrupt(int irq, void *data, struct cpu_user_regs *regs)
+static void pl011_interrupt(int irq, void *data)
{
struct serial_port *port = data;
struct pl011 *uart = port->uart;
diff --git a/xen/drivers/char/scif-uart.c b/xen/drivers/char/scif-uart.c
index d5de8931b2..b7f86f882c 100644
--- a/xen/drivers/char/scif-uart.c
+++ b/xen/drivers/char/scif-uart.c
@@ -102,7 +102,7 @@ static const struct port_params port_params[NR_PORTS] =
},
};
-static void scif_uart_interrupt(int irq, void *data, struct cpu_user_regs
*regs)
+static void scif_uart_interrupt(int irq, void *data)
{
struct serial_port *port = data;
struct scif_uart *uart = port->uart;
diff --git a/xen/drivers/passthrough/amd/iommu_init.c
b/xen/drivers/passthrough/amd/iommu_init.c
index 25e62f20ae..b32da1a28d 100644
--- a/xen/drivers/passthrough/amd/iommu_init.c
+++ b/xen/drivers/passthrough/amd/iommu_init.c
@@ -718,8 +718,7 @@ static void cf_check do_amd_iommu_irq(void *unused)
static DECLARE_SOFTIRQ_TASKLET(amd_iommu_irq_tasklet, do_amd_iommu_irq, NULL);
-static void cf_check iommu_interrupt_handler(
- int irq, void *dev_id, struct cpu_user_regs *regs)
+static void cf_check iommu_interrupt_handler(int irq, void *dev_id)
{
unsigned long flags;
struct amd_iommu *iommu = dev_id;
diff --git a/xen/drivers/passthrough/arm/ipmmu-vmsa.c
b/xen/drivers/passthrough/arm/ipmmu-vmsa.c
index b5c84c51a2..da011413c5 100644
--- a/xen/drivers/passthrough/arm/ipmmu-vmsa.c
+++ b/xen/drivers/passthrough/arm/ipmmu-vmsa.c
@@ -642,7 +642,7 @@ static void ipmmu_domain_irq(struct ipmmu_vmsa_domain
*domain)
domain->d, status, iova);
}
-static void ipmmu_irq(int irq, void *dev, struct cpu_user_regs *regs)
+static void ipmmu_irq(int irq, void *dev)
{
struct ipmmu_vmsa_device *mmu = dev;
unsigned int i;
diff --git a/xen/drivers/passthrough/arm/smmu-v3.c
b/xen/drivers/passthrough/arm/smmu-v3.c
index bca5866b35..c3ac6d17d1 100644
--- a/xen/drivers/passthrough/arm/smmu-v3.c
+++ b/xen/drivers/passthrough/arm/smmu-v3.c
@@ -880,8 +880,7 @@ static void arm_smmu_priq_tasklet(void *dev)
static int arm_smmu_device_disable(struct arm_smmu_device *smmu);
-static void arm_smmu_gerror_handler(int irq, void *dev,
- struct cpu_user_regs *regs)
+static void arm_smmu_gerror_handler(int irq, void *dev)
{
u32 gerror, gerrorn, active;
struct arm_smmu_device *smmu = dev;
@@ -926,12 +925,11 @@ static void arm_smmu_gerror_handler(int irq, void *dev,
writel(gerror, smmu->base + ARM_SMMU_GERRORN);
}
-static void arm_smmu_combined_irq_handler(int irq, void *dev,
- struct cpu_user_regs *regs)
+static void arm_smmu_combined_irq_handler(int irq, void *dev)
{
struct arm_smmu_device *smmu = dev;
- arm_smmu_gerror_handler(irq, dev, regs);
+ arm_smmu_gerror_handler(irq, dev);
tasklet_schedule(&(smmu->combined_irq_tasklet));
}
@@ -945,16 +943,14 @@ static void arm_smmu_combined_irq_tasklet(void *dev)
arm_smmu_priq_tasklet(dev);
}
-static void arm_smmu_evtq_irq_tasklet(int irq, void *dev,
- struct cpu_user_regs *regs)
+static void arm_smmu_evtq_irq_tasklet(int irq, void *dev)
{
struct arm_smmu_device *smmu = dev;
tasklet_schedule(&(smmu->evtq_irq_tasklet));
}
-static void arm_smmu_priq_irq_tasklet(int irq, void *dev,
- struct cpu_user_regs *regs)
+static void arm_smmu_priq_irq_tasklet(int irq, void *dev)
{
struct arm_smmu_device *smmu = dev;
diff --git a/xen/drivers/passthrough/arm/smmu.c
b/xen/drivers/passthrough/arm/smmu.c
index 4a272c8779..625ed0e419 100644
--- a/xen/drivers/passthrough/arm/smmu.c
+++ b/xen/drivers/passthrough/arm/smmu.c
@@ -1097,16 +1097,14 @@ static irqreturn_t arm_smmu_global_fault(int irq, void
*dev)
}
/* Xen: Interrupt handlers wrapper */
-static void arm_smmu_context_fault_xen(int irq, void *dev,
- struct cpu_user_regs *regs)
+static void arm_smmu_context_fault_xen(int irq, void *dev)
{
arm_smmu_context_fault(irq, dev);
}
#define arm_smmu_context_fault arm_smmu_context_fault_xen
-static void arm_smmu_global_fault_xen(int irq, void *dev,
- struct cpu_user_regs *regs)
+static void arm_smmu_global_fault_xen(int irq, void *dev)
{
arm_smmu_global_fault(irq, dev);
}
diff --git a/xen/drivers/passthrough/vtd/iommu.c
b/xen/drivers/passthrough/vtd/iommu.c
index 54c4c0f9b9..c7110af7c9 100644
--- a/xen/drivers/passthrough/vtd/iommu.c
+++ b/xen/drivers/passthrough/vtd/iommu.c
@@ -1117,8 +1117,7 @@ static void cf_check do_iommu_page_fault(void *unused)
__do_iommu_page_fault(drhd->iommu);
}
-static void cf_check iommu_page_fault(
- int irq, void *dev_id, struct cpu_user_regs *regs)
+static void cf_check iommu_page_fault(int irq, void *dev_id)
{
/*
* Just flag the tasklet as runnable. This is fine, according to VT-d
diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h
index 76da442942..72c24c6f04 100644
--- a/xen/include/xen/irq.h
+++ b/xen/include/xen/irq.h
@@ -18,7 +18,7 @@
ASSERT(!in_irq() && (local_irq_is_enabled() || num_online_cpus() <= 1))
struct irqaction {
- void (*handler)(int irq, void *dev_id, struct cpu_user_regs *regs);
+ void (*handler)(int irq, void *dev_id);
const char *name;
void *dev_id;
bool free_on_release;
@@ -119,12 +119,11 @@ extern int setup_irq(unsigned int irq, unsigned int
irqflags,
struct irqaction *new);
extern void release_irq(unsigned int irq, const void *dev_id);
extern int request_irq(unsigned int irq, unsigned int irqflags,
- void (*handler)(int irq, void *dev_id,
- struct cpu_user_regs *regs),
+ void (*handler)(int irq, void *dev_id),
const char *devname, void *dev_id);
extern hw_irq_controller no_irq_type;
-void cf_check no_action(int cpl, void *dev_id, struct cpu_user_regs *regs);
+void cf_check no_action(int cpl, void *dev_id);
unsigned int cf_check irq_startup_none(struct irq_desc *desc);
void cf_check irq_actor_none(struct irq_desc *desc);
#define irq_shutdown_none irq_actor_none
--
generated by git-patchbot for /home/xen/git/xen.git#staging
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |