From 229b59cdb41742aa4aee3628962af6ef2c4d944a Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Wed, 25 Oct 2006 22:04:14 +0300 Subject: [PATCH] Sync with mainline: Get rid of unnecessary pt_regs Get rid of unnecessary pt_regs. Signed-off-by: Tony Lindgren --- arch/arm/plat-omap/dsp/dsp_mem.c | 3 +-- arch/arm/plat-omap/gpio-switch.c | 2 +- arch/arm/plat-omap/mailbox.c | 2 +- arch/arm/plat-omap/sti/sti.c | 2 +- drivers/cbus/tahvo-usb.c | 2 +- drivers/input/touchscreen/omap/omap_ts.c | 2 +- drivers/media/video/omap/omap16xxcam.c | 2 +- drivers/rtc/rtc-omap.c | 2 +- drivers/video/omap/dispc.c | 2 +- 9 files changed, 9 insertions(+), 10 deletions(-) diff --git a/arch/arm/plat-omap/dsp/dsp_mem.c b/arch/arm/plat-omap/dsp/dsp_mem.c index 7c9a728a017..0c49281a7cf 100644 --- a/arch/arm/plat-omap/dsp/dsp_mem.c +++ b/arch/arm/plat-omap/dsp/dsp_mem.c @@ -2417,8 +2417,7 @@ static DECLARE_WORK(mmu_int_work, (void (*)(void *))do_mmu_int, NULL); * DSP MMU interrupt handler */ -static irqreturn_t dsp_mmu_interrupt(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t dsp_mmu_interrupt(int irq, void *dev_id) { disable_irq(omap_dsp->mmu_irq); schedule_work(&mmu_int_work); diff --git a/arch/arm/plat-omap/gpio-switch.c b/arch/arm/plat-omap/gpio-switch.c index cd8bbd424b0..f2e09e2cd89 100644 --- a/arch/arm/plat-omap/gpio-switch.c +++ b/arch/arm/plat-omap/gpio-switch.c @@ -182,7 +182,7 @@ static ssize_t gpio_sw_direction_show(struct device *dev, static DEVICE_ATTR(direction, S_IRUGO, gpio_sw_direction_show, NULL); -static irqreturn_t gpio_sw_irq_handler(int irq, void *arg, struct pt_regs *regs) +static irqreturn_t gpio_sw_irq_handler(int irq, void *arg) { struct gpio_switch *sw = arg; unsigned long timeout; diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c index e8ed9fba738..f6cfb505cff 100644 --- a/arch/arm/plat-omap/mailbox.c +++ b/arch/arm/plat-omap/mailbox.c @@ -134,7 +134,7 @@ static void mbox_msg_receiver(void *p) /* * Mailbox interrupt handler */ -static irqreturn_t mbox_interrupt(int irq, void *p, struct pt_regs *regs) +static irqreturn_t mbox_interrupt(int irq, void *p) { mbox_msg_t msg; struct omap_mbox *mbox = (struct omap_mbox *)p; diff --git a/arch/arm/plat-omap/sti/sti.c b/arch/arm/plat-omap/sti/sti.c index 1a96b522908..d44c30d66b8 100644 --- a/arch/arm/plat-omap/sti/sti.c +++ b/arch/arm/plat-omap/sti/sti.c @@ -135,7 +135,7 @@ EXPORT_SYMBOL(sti_free_irq); * Unfortunately tasklets are too slow for the RX FIFO interrupt (and * possibly some others), so we just do the irqdesc walking here. */ -static irqreturn_t sti_interrupt(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t sti_interrupt(int irq, void *dev_id) { int ret = IRQ_NONE; u16 status; diff --git a/drivers/cbus/tahvo-usb.c b/drivers/cbus/tahvo-usb.c index c3652b77331..635d129fd75 100644 --- a/drivers/cbus/tahvo-usb.c +++ b/drivers/cbus/tahvo-usb.c @@ -111,7 +111,7 @@ static struct platform_device tahvo_usb_device; */ static struct platform_device *tahvo_otg_dev; -static irqreturn_t omap_otg_irq(int irq, void *arg, struct pt_regs *regs) +static irqreturn_t omap_otg_irq(int irq, void *arg) { struct platform_device *otg_dev = (struct platform_device *) arg; struct tahvo_usb *tu = (struct tahvo_usb *) otg_dev->dev.driver_data; diff --git a/drivers/input/touchscreen/omap/omap_ts.c b/drivers/input/touchscreen/omap/omap_ts.c index bd85d0ae80c..8a930d888fe 100644 --- a/drivers/input/touchscreen/omap/omap_ts.c +++ b/drivers/input/touchscreen/omap/omap_ts.c @@ -105,7 +105,7 @@ static void omap_ts_timer(unsigned long data) spin_unlock_irqrestore(&ts_omap.lock, flags); } -static irqreturn_t omap_ts_handler(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t omap_ts_handler(int irq, void *dev_id) { spin_lock(&ts_omap.lock); diff --git a/drivers/media/video/omap/omap16xxcam.c b/drivers/media/video/omap/omap16xxcam.c index f2d949c3d98..b36773a2d7c 100644 --- a/drivers/media/video/omap/omap16xxcam.c +++ b/drivers/media/video/omap/omap16xxcam.c @@ -243,7 +243,7 @@ omap16xx_cam_dma_link_callback(int lch, unsigned short ch_status, void *data) } static irqreturn_t -omap16xx_cam_isr(int irq, void *client_data, struct pt_regs *regs) +omap16xx_cam_isr(int irq, void *client_data) { struct omap16xxcam *data = (struct omap16xxcam *)client_data; unsigned int itstat = data->camera_regs->it_status; diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c index 270007e63f3..6bf35be27b7 100644 --- a/drivers/rtc/rtc-omap.c +++ b/drivers/rtc/rtc-omap.c @@ -124,7 +124,7 @@ static void rtc_wait_not_busy(void) /* now we have ~15 usec to read/write various registers */ } -static irqreturn_t rtc_irq(int irq, void *class_dev, struct pt_regs *regs) +static irqreturn_t rtc_irq(int irq, void *class_dev) { unsigned long events = 0; u8 irq_data; diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c index 048b8e26099..1f00c289c01 100644 --- a/drivers/video/omap/dispc.c +++ b/drivers/video/omap/dispc.c @@ -833,7 +833,7 @@ void omap_dispc_free_irq(void) } EXPORT_SYMBOL(omap_dispc_free_irq); -static irqreturn_t omap_dispc_irq_handler(int irq, void *dev, struct pt_regs *regs) +static irqreturn_t omap_dispc_irq_handler(int irq, void *dev) { u32 stat = dispc_read_reg(DISPC_IRQSTATUS); static int jabber; -- 2.41.1