diff options
58 files changed, 109 insertions, 216 deletions
diff --git a/arch/arm/mach-mx27/mx27ads.c b/arch/arm/mach-mx27/mx27ads.c index 32bf16c8ecdf..3ab971d99e42 100644 --- a/arch/arm/mach-mx27/mx27ads.c +++ b/arch/arm/mach-mx27/mx27ads.c @@ -352,8 +352,7 @@ static u32 mxc_card_state_changed(u32 mask, u32 s0, u32 s1) * Interrupt handler for the expio (CPLD) to deal with interrupts from * FEC, external UART, CS8900 Ethernet and SD cards, etc. */ -static void mxc_expio_irq_handler(u32 irq, struct irqdesc *desc, - struct pt_regs *regs) +static void mxc_expio_irq_handler(u32 irq, struct irqdesc *desc) { u32 imr, card_int, i; u32 int_valid; @@ -398,7 +397,7 @@ static void mxc_expio_irq_handler(u32 irq, struct irqdesc *desc, expio_irq); BUG(); /* oops */ } - d->handle_irq(expio_irq, d, regs); + d->handle_irq(expio_irq, d); } out: @@ -408,8 +407,7 @@ static void mxc_expio_irq_handler(u32 irq, struct irqdesc *desc, #ifdef MXC_CARD_DEBUG -static irqreturn_t mxc_sd_test_handler(int irq, void *desc, - struct pt_regs *regs) +static irqreturn_t mxc_sd_test_handler(int irq, void *desc) { int s = -1; diff --git a/arch/arm/mach-mx27/time.c b/arch/arm/mach-mx27/time.c index 3daf8333a0c1..33d222e31726 100644 --- a/arch/arm/mach-mx27/time.c +++ b/arch/arm/mach-mx27/time.c @@ -62,20 +62,17 @@ * * @param irq GPT interrupt source number (not used) * @param dev_id this parameter is not used - * @param regs pointer to a structure containing the processor - * registers and state prior to servicing the interrupt * @return always returns \b IRQ_HANDLED as defined in * include/linux/interrupt.h. */ -static irqreturn_t mxc_timer_interrupt(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t mxc_timer_interrupt(int irq, void *dev_id) { unsigned int next_match; write_seqlock(&xtime_lock); do { - timer_tick(regs); + timer_tick(); next_match = __raw_readl(MXC_GPT_TCMP_TICK) + LATCH; __raw_writel(GPT_TSTAT_COMP, MXC_GPT_TSTAT_TICK); __raw_writel(next_match, MXC_GPT_TCMP_TICK); diff --git a/arch/arm/mach-mx27/usb.c b/arch/arm/mach-mx27/usb.c index 9be702dac0e9..6c51554d1b05 100644 --- a/arch/arm/mach-mx27/usb.c +++ b/arch/arm/mach-mx27/usb.c @@ -29,7 +29,6 @@ * Include files */ -#include <linux/config.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/types.h> @@ -37,7 +36,7 @@ #include <linux/init.h> #include <linux/err.h> #include <linux/platform_device.h> -#include <linux/usb_otg.h> +#include <linux/usb/otg.h> #include <linux/delay.h> #include <asm/io.h> @@ -751,7 +750,7 @@ static struct platform_device *host_pdev_register(struct resource *res, pdev = platform_device_register_simple("fsl-ehci", instance_id, res, n_res); if (IS_ERR(pdev)) { - pr_debug("can't register %s Host, %d\n", + pr_debug("can't register %s Host, %ld\n", config->name, PTR_ERR(pdev)); return NULL; } diff --git a/arch/arm/mach-mx3/mx31ads.c b/arch/arm/mach-mx3/mx31ads.c index f5ebd1d01f99..8d43cfbffff2 100644 --- a/arch/arm/mach-mx3/mx31ads.c +++ b/arch/arm/mach-mx3/mx31ads.c @@ -346,8 +346,7 @@ static inline void mxc_init_fb(void) } #endif -static void mxc_expio_irq_handler(u32 irq, struct irqdesc *desc, - struct pt_regs *regs) +static void mxc_expio_irq_handler(u32 irq, struct irqdesc *desc) { u32 imr_val; u32 int_valid; @@ -375,7 +374,7 @@ static void mxc_expio_irq_handler(u32 irq, struct irqdesc *desc, expio_irq); BUG(); /* oops */ } - d->handle_irq(expio_irq, d, regs); + d->handle_irq(expio_irq, d); } out: diff --git a/arch/arm/mach-mx3/mx31ads_gpio.c b/arch/arm/mach-mx3/mx31ads_gpio.c index c3502252db62..a1478596e068 100644 --- a/arch/arm/mach-mx3/mx31ads_gpio.c +++ b/arch/arm/mach-mx3/mx31ads_gpio.c @@ -1138,7 +1138,7 @@ EXPORT_SYMBOL(gpio_ata_inactive); * otherwise returns an error code. */ int extuart_intr_setup(unsigned int port, unsigned int irq, - irqreturn_t(*handler) (int, void *, struct pt_regs *), + irqreturn_t(*handler) (int, void *), unsigned long irq_flags, const char *devname, void *dev_id) { diff --git a/arch/arm/mach-mx3/time.c b/arch/arm/mach-mx3/time.c index 5d1598f40f16..96812ebcb236 100644 --- a/arch/arm/mach-mx3/time.c +++ b/arch/arm/mach-mx3/time.c @@ -142,13 +142,10 @@ static int g_wdog_count = 0; * * @param irq GPT interrupt source number (not used) * @param dev_id this parameter is not used - * @param regs pointer to a structure containing the processor - * registers and state prior to servicing the interrupt * @return always returns \b IRQ_HANDLED as defined in * include/linux/interrupt.h. */ -static irqreturn_t mxc_timer_interrupt(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t mxc_timer_interrupt(int irq, void *dev_id) { unsigned int next_match; @@ -166,7 +163,7 @@ static irqreturn_t mxc_timer_interrupt(int irq, void *dev_id, #else kick_wd(); #endif /* WDOG_SERVICE_PERIOD */ - timer_tick(regs); + timer_tick(); next_match = __raw_readl(MXC_GPT_GPTOCR1) + LATCH; __raw_writel(GPTSR_OF1, MXC_GPT_GPTSR); __raw_writel(next_match, MXC_GPT_GPTOCR1); diff --git a/arch/arm/mach-mx3/usb.c b/arch/arm/mach-mx3/usb.c index 9c8b00deed44..0d272cd6031e 100644 --- a/arch/arm/mach-mx3/usb.c +++ b/arch/arm/mach-mx3/usb.c @@ -29,7 +29,6 @@ *Include files */ -#include <linux/config.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/types.h> @@ -37,7 +36,7 @@ #include <linux/init.h> #include <linux/err.h> #include <linux/platform_device.h> -#include <linux/usb_otg.h> +#include <linux/usb/otg.h> #include <linux/delay.h> #include <asm/io.h> diff --git a/arch/arm/plat-mxc/dma_mx2.c b/arch/arm/plat-mxc/dma_mx2.c index 3cbed7ee930b..d9686b71f299 100644 --- a/arch/arm/plat-mxc/dma_mx2.c +++ b/arch/arm/plat-mxc/dma_mx2.c @@ -388,7 +388,7 @@ static void setup_dmac(mxc_dma_channel_t * dma) /*! * @brief interrupt handler of dma channel */ -static irqreturn_t dma_irq_handler(int irq, void *dev_id, struct pt_regs *reg) +static irqreturn_t dma_irq_handler(int irq, void *dev_id) { mxc_dma_channel_t *dma = (mxc_dma_channel_t *) dev_id; mx2_dma_priv_t *priv = (mx2_dma_priv_t *) (dma ? dma->private : NULL); diff --git a/arch/arm/plat-mxc/gpio.c b/arch/arm/plat-mxc/gpio.c index 222976aafb3f..c1aade96ebe0 100644 --- a/arch/arm/plat-mxc/gpio.c +++ b/arch/arm/plat-mxc/gpio.c @@ -313,8 +313,7 @@ void mxc_free_gpio(iomux_pin_name_t pin) * line's interrupt handler has been run, we may miss some nested * interrupts. */ -static void mxc_gpio_irq_handler(u32 irq, struct irq_desc *desc, - struct pt_regs *regs) +static void mxc_gpio_irq_handler(u32 irq, struct irq_desc *desc) { u32 isr_reg = 0, imr_reg = 0, imr_val; u32 int_valid; @@ -346,13 +345,12 @@ static void mxc_gpio_irq_handler(u32 irq, struct irq_desc *desc, port->num, gpio_irq); BUG(); /* oops */ } - d->handle_irq(gpio_irq, d, regs); + d->handle_irq(gpio_irq, d); } } #ifdef MXC_MUX_GPIO_INTERRUPTS -static void mxc_gpio_mux_irq_handler(u32 irq, struct irq_desc *desc, - struct pt_regs *regs) +static void mxc_gpio_mux_irq_handler(u32 irq, struct irq_desc *desc) { int i; u32 isr_reg = 0, imr_reg = 0, imr_val; @@ -369,7 +367,7 @@ static void mxc_gpio_mux_irq_handler(u32 irq, struct irq_desc *desc, if (int_valid) { set_irq_data(irq, (void *)port); - mxc_gpio_irq_handler(irq, desc, regs); + mxc_gpio_irq_handler(irq, desc); } } } diff --git a/arch/arm/plat-mxc/sdma/sdma.c b/arch/arm/plat-mxc/sdma/sdma.c index a4d1098bb6bf..8c4ba3bfe1e5 100644 --- a/arch/arm/plat-mxc/sdma/sdma.c +++ b/arch/arm/plat-mxc/sdma/sdma.c @@ -155,11 +155,9 @@ static void sdma_wakeup_channel(int channel) * * @param irq the interrupt number * @param dev_id driver private data - * @param regs holds a snapshot of the processor's context before the - * processor entered the interrupt code * @return the function returns \b IRQ_RETVAL(1) - interrupt was handled */ -static irqreturn_t sdma_int_handler(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t sdma_int_handler(int irq, void *dev_id) { IRQ_Handler(); return IRQ_RETVAL(1); diff --git a/drivers/char/mxc_rtc.c b/drivers/char/mxc_rtc.c index ba2106eb9764..0a1c893215f5 100644 --- a/drivers/char/mxc_rtc.c +++ b/drivers/char/mxc_rtc.c @@ -206,14 +206,10 @@ static int rtc_update_alarm(struct rtc_time *alrm) * * @param irq RTC IRQ number * @param dev_id device ID which is not used - * @param regs pointer to a structure containing the processor - * registers and state prior to servicing the interrupt. - * It is not used in this function. * * @return IRQ_HANDLED as defined in the include/linux/interrupt.h file. */ -static irqreturn_t mxc_rtc_interrupt(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t mxc_rtc_interrupt(int irq, void *dev_id) { u32 status; u32 events = 0; diff --git a/drivers/i2c/busses/mxc_i2c.c b/drivers/i2c/busses/mxc_i2c.c index a1921a4a0349..f760ab2ff750 100644 --- a/drivers/i2c/busses/mxc_i2c.c +++ b/drivers/i2c/busses/mxc_i2c.c @@ -546,12 +546,10 @@ static struct i2c_algorithm mxc_i2c_algorithm = { * completion. Also sets a flag if bus arbitration is lost. * @param irq the interrupt number * @param dev_id driver private data - * @param regs holds a snapshot of the processor's context before the - * processor entered the interrupt code * * @return The function returns \b IRQ_HANDLED. */ -static irqreturn_t mxc_i2c_handler(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t mxc_i2c_handler(int irq, void *dev_id) { mxc_i2c_device *dev = dev_id; volatile unsigned int sr, cr; diff --git a/drivers/input/keyboard/mxc_keyb.c b/drivers/input/keyboard/mxc_keyb.c index 007066cd7a0c..f01cc2342df6 100644 --- a/drivers/input/keyboard/mxc_keyb.c +++ b/drivers/input/keyboard/mxc_keyb.c @@ -599,15 +599,12 @@ static void mxc_kpp_handle_timer(unsigned long data) * * @param irq The Interrupt number * @param dev_id Driver private data - * @param regs Holds a snapshot of the processors context before the - * processor entered the interrupt code * * @result The function returns \b IRQ_RETVAL(1) if interrupt was handled, * returns \b IRQ_RETVAL(0) if the interrupt was not handled. * \b IRQ_RETVAL is defined in include/linux/interrupt.h. */ -static irqreturn_t mxc_kpp_interrupt(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t mxc_kpp_interrupt(int irq, void *dev_id) { unsigned short reg_val; diff --git a/drivers/input/touchscreen/mxc_ts.c b/drivers/input/touchscreen/mxc_ts.c index 6b015349e731..889ad6e58b98 100644 --- a/drivers/input/touchscreen/mxc_ts.c +++ b/drivers/input/touchscreen/mxc_ts.c @@ -70,7 +70,6 @@ static int __init mxc_ts_init(void) return -ENOMEM; } - init_input_dev(mxc_inputdev); mxc_inputdev->name = MXC_TS_NAME; mxc_inputdev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); mxc_inputdev->keybit[LONG(BTN_TOUCH)] |= BIT(BTN_TOUCH); diff --git a/drivers/media/video/mxc/capture/ipu_prp_enc.c b/drivers/media/video/mxc/capture/ipu_prp_enc.c index 625228788f5a..c0cacafb944a 100644 --- a/drivers/media/video/mxc/capture/ipu_prp_enc.c +++ b/drivers/media/video/mxc/capture/ipu_prp_enc.c @@ -35,11 +35,10 @@ static ipu_rotate_mode_t grotation = IPU_ROTATE_NONE; * * @param irq int irq line * @param dev_id void * device id - * @param regs struct pt_regs * * * @return status IRQ_HANDLED for handled */ -static irqreturn_t prp_enc_callback(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t prp_enc_callback(int irq, void *dev_id) { cam_data *cam = (cam_data *) dev_id; diff --git a/drivers/media/video/mxc/capture/ipu_prp_vf_sdc_bg.c b/drivers/media/video/mxc/capture/ipu_prp_vf_sdc_bg.c index 73083b747762..c2451b894abd 100644 --- a/drivers/media/video/mxc/capture/ipu_prp_vf_sdc_bg.c +++ b/drivers/media/video/mxc/capture/ipu_prp_vf_sdc_bg.c @@ -36,12 +36,11 @@ static int buffer_ready = 0; * * @param irq int irq line * @param dev_id void * device id - * @param regs struct pt_regs * * * @return status IRQ_HANDLED for handled */ static irqreturn_t -prpvf_sdc_vsync_callback(int irq, void *dev_id, struct pt_regs *regs) +prpvf_sdc_vsync_callback(int irq, void *dev_id) { pr_debug("buffer_ready %d buffer_num %d\n", buffer_ready, buffer_num); if (buffer_ready > 0) { @@ -57,12 +56,11 @@ prpvf_sdc_vsync_callback(int irq, void *dev_id, struct pt_regs *regs) * * @param irq int irq line * @param dev_id void * device id - * @param regs struct pt_regs * * * @return status IRQ_HANDLED for handled */ static irqreturn_t -prpvf_vf_eof_callback(int irq, void *dev_id, struct pt_regs *regs) +prpvf_vf_eof_callback(int irq, void *dev_id) { pr_debug("buffer_ready %d buffer_num %d\n", buffer_ready, buffer_num); diff --git a/drivers/media/video/mxc/capture/ipu_still.c b/drivers/media/video/mxc/capture/ipu_still.c index 757b8c4fc01a..b50a8133f6b2 100644 --- a/drivers/media/video/mxc/capture/ipu_still.c +++ b/drivers/media/video/mxc/capture/ipu_still.c @@ -34,12 +34,11 @@ static int callback_flag; * * @param irq int irq line * @param dev_id void * device id - * @param regs struct pt_regs * * * @return status IRQ_HANDLED for handled */ static irqreturn_t -prp_csi_eof_callback(int irq, void *dev_id, struct pt_regs *regs) +prp_csi_eof_callback(int irq, void *dev_id) { if (callback_flag == 2) { ipu_select_buffer(CSI_MEM, IPU_OUTPUT_BUFFER, 0); @@ -55,12 +54,11 @@ prp_csi_eof_callback(int irq, void *dev_id, struct pt_regs *regs) * * @param irq int irq line * @param dev_id void * device id - * @param regs struct pt_regs * * * @return status IRQ_HANDLED for handled */ static irqreturn_t -prp_still_callback(int irq, void *dev_id, struct pt_regs *regs) +prp_still_callback(int irq, void *dev_id) { cam_data *cam = (cam_data *) dev_id; diff --git a/drivers/media/video/mxc/capture/mx27_csi.c b/drivers/media/video/mxc/capture/mx27_csi.c index 2c25beff5702..cc4853596195 100644 --- a/drivers/media/video/mxc/capture/mx27_csi.c +++ b/drivers/media/video/mxc/capture/mx27_csi.c @@ -55,7 +55,7 @@ static void csihw_read_status(csi_status_t * cs) cs->drdy = (__raw_readl(CSI_CSISR) & BIT_DRDY) ? 1 : 0; } -static irqreturn_t csi_irq_handler(int irq, void *data, struct pt_regs *pt) +static irqreturn_t csi_irq_handler(int irq, void *data) { csihw_read_status(&g_csi_status); diff --git a/drivers/media/video/mxc/capture/mx27_prpsw.c b/drivers/media/video/mxc/capture/mx27_prpsw.c index 11948abda78f..779d36342a34 100644 --- a/drivers/media/video/mxc/capture/mx27_prpsw.c +++ b/drivers/media/video/mxc/capture/mx27_prpsw.c @@ -64,7 +64,7 @@ static int prp_vf_start(void *private); static int prp_vf_stop(void *private); static int prp_still_start(void *private); static int prp_still_stop(void *private); -static irqreturn_t prp_isr(int irq, void *dev_id, struct pt_regs *regs); +static irqreturn_t prp_isr(int irq, void *dev_id); static void rotation(unsigned long private); static int prp_resize_check_ch1(emma_prp_cfg * cfg); static int prp_resize_check_ch2(emma_prp_cfg * cfg); @@ -271,7 +271,7 @@ static int prp_v4l2_cfg(emma_prp_cfg * cfg, cam_data * cam) /*! * @brief PrP interrupt handler */ -static irqreturn_t prp_isr(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t prp_isr(int irq, void *dev_id) { int status; cam_data *cam = (cam_data *) dev_id; diff --git a/drivers/media/video/mxc/capture/mx27_v4l2_capture.c b/drivers/media/video/mxc/capture/mx27_v4l2_capture.c index 390fff2e9c90..b37324ab2430 100644 --- a/drivers/media/video/mxc/capture/mx27_v4l2_capture.c +++ b/drivers/media/video/mxc/capture/mx27_v4l2_capture.c @@ -1332,7 +1332,7 @@ static int mxc_mmap(struct file *file, struct vm_area_struct *vma) int res = 0; cam_data *cam = dev->priv; - pr_debug("pgoff=0x%x, start=0x%x, end=0x%x\n", + pr_debug("pgoff=0x%lx, start=0x%lx, end=0x%lx\n", vma->vm_pgoff, vma->vm_start, vma->vm_end); /* make this _really_ smp-safe */ diff --git a/drivers/media/video/mxc/output/mx27_pp.c b/drivers/media/video/mxc/output/mx27_pp.c index 6f4869c9df28..876635398770 100644 --- a/drivers/media/video/mxc/output/mx27_pp.c +++ b/drivers/media/video/mxc/output/mx27_pp.c @@ -52,7 +52,7 @@ static int scale_1d(int inv, int outv, int k); static int scale_1d_smart(int *inv, int *outv, int index); static int scale_2d(emma_pp_scale * sz); -static irqreturn_t pp_isr(int irq, void *dev_id, struct pt_regs *regs); +static irqreturn_t pp_isr(int irq, void *dev_id); static int set_output_addr(emma_pp_cfg * cfg, vout_data * vout); static int pphw_reset(void); static int pphw_enable(int flag); @@ -245,13 +245,12 @@ int pp_cfg(vout_data * vout) return pphw_cfg(&g_pp_cfg); } -irqreturn_t mxc_v4l2out_pp_in_irq_handler(int irq, void *dev_id, - struct pt_regs * regs); +irqreturn_t mxc_v4l2out_pp_in_irq_handler(int irq, void *dev_id); /*! * @brief PP IRQ handler. */ -static irqreturn_t pp_isr(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t pp_isr(int irq, void *dev_id) { int status; vout_data *vout = dev_id; @@ -268,7 +267,7 @@ static irqreturn_t pp_isr(int irq, void *dev_id, struct pt_regs *regs) pphw_outptr(&g_pp_cfg); } - return mxc_v4l2out_pp_in_irq_handler(irq, dev_id, regs); + return mxc_v4l2out_pp_in_irq_handler(irq, dev_id); } /*! diff --git a/drivers/media/video/mxc/output/mx27_v4l2_output.c b/drivers/media/video/mxc/output/mx27_v4l2_output.c index 1b380bfe3988..10c55abacd49 100644 --- a/drivers/media/video/mxc/output/mx27_v4l2_output.c +++ b/drivers/media/video/mxc/output/mx27_v4l2_output.c @@ -263,8 +263,7 @@ static void mxc_v4l2out_timer_handler(unsigned long arg) spin_unlock_irqrestore(&g_lock, lock_flags); } -irqreturn_t mxc_v4l2out_pp_in_irq_handler(int irq, void *dev_id, - struct pt_regs *regs) +irqreturn_t mxc_v4l2out_pp_in_irq_handler(int irq, void *dev_id) { int last_buf; int index; diff --git a/drivers/media/video/mxc/output/mxc_v4l2_output.c b/drivers/media/video/mxc/output/mxc_v4l2_output.c index 8cfe2165b107..d5eaebe996d0 100644 --- a/drivers/media/video/mxc/output/mxc_v4l2_output.c +++ b/drivers/media/video/mxc/output/mxc_v4l2_output.c @@ -266,8 +266,7 @@ static void mxc_v4l2out_timer_handler(unsigned long arg) spin_unlock_irqrestore(&g_lock, lock_flags); } -static irqreturn_t mxc_v4l2out_pp_in_irq_handler(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t mxc_v4l2out_pp_in_irq_handler(int irq, void *dev_id) { int last_buf; int index; diff --git a/drivers/mmc/mxc_mmc.c b/drivers/mmc/mxc_mmc.c index 2c750ff5b5f0..d4dc716dc021 100644 --- a/drivers/mmc/mxc_mmc.c +++ b/drivers/mmc/mxc_mmc.c @@ -760,12 +760,10 @@ static int mxcmci_data_done(struct mxcmci_host *host, unsigned int stat) * * @param irq the interrupt number * @param devid driver private data - * @param regs holds a snapshot of the processor's context before the - * processor entered the interrupt code * * @return The function returns \b IRQ_RETVAL(1) */ -static irqreturn_t mxcmci_gpio_irq(int irq, void *devid, struct pt_regs *regs) +static irqreturn_t mxcmci_gpio_irq(int irq, void *devid) { struct mxcmci_host *host = devid; int card_gpio_status = host->plat_data->status(host->mmc->dev); @@ -803,13 +801,11 @@ static irqreturn_t mxcmci_gpio_irq(int irq, void *devid, struct pt_regs *regs) * * @param irq the interrupt number * @param devid driver private data - * @param regs holds a snapshot of the processor's context before the - * processor entered the interrupt code * * @return The function returns \b IRQ_RETVAL(1) if interrupt was handled, * returns \b IRQ_RETVAL(0) if the interrupt was not handled. */ -static irqreturn_t mxcmci_irq(int irq, void *devid, struct pt_regs *regs) +static irqreturn_t mxcmci_irq(int irq, void *devid) { struct mxcmci_host *host = devid; unsigned int status = 0; @@ -842,7 +838,7 @@ static irqreturn_t mxcmci_irq(int irq, void *devid, struct pt_regs *regs) printk(KERN_ERR "\nSDIO int unhandled\n"); BUG(); /* oops */ } - d->handle_irq(host->mmc->sdio_irq, d, regs); + d->handle_irq(host->mmc->sdio_irq, d); } } @@ -907,7 +903,7 @@ static void mxcmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) #if defined(CONFIG_MXC_MC13783_POWER) t_regulator_voltage voltage; #endif - pr_debug("%s: clock %u, bus %u, power %u, vdd %u\n", DRIVER_NAME, + pr_debug("%s: clock %u, bus %lu, power %u, vdd %u\n", DRIVER_NAME, ios->clock, 1UL << ios->bus_width, ios->power_mode, ios->vdd); host->dma_dir = DMA_NONE; diff --git a/drivers/mtd/nand/mxc_nd.c b/drivers/mtd/nand/mxc_nd.c index 29cd789afea2..751ed6620839 100644 --- a/drivers/mtd/nand/mxc_nd.c +++ b/drivers/mtd/nand/mxc_nd.c @@ -111,7 +111,7 @@ static const char *part_probes[] = { /* "RedBoot", */ "cmdlinepart", NULL }; static wait_queue_head_t irq_waitq; -static irqreturn_t mxc_nfc_irq(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t mxc_nfc_irq(int irq, void *dev_id) { NFC_CONFIG1 |= NFC_INT_MSK; /* Disable interrupt */ wake_up(&irq_waitq); diff --git a/drivers/mxc/dam/dam.h b/drivers/mxc/dam/dam.h index 3f9c4368b5c7..7fad5121f5ab 100644 --- a/drivers/mxc/dam/dam.h +++ b/drivers/mxc/dam/dam.h @@ -144,7 +144,7 @@ void dam_select_RxClk_direction(dam_port port, signal_direction direction); * the source port * @param p_source the source port */ -void dam_select_RxClk_source(dam_port p_config, int from_RxClk, +void dam_select_RxClk_source(dam_port p_config, bool from_RxClk, dam_port p_source); /*! @@ -171,7 +171,7 @@ void dam_select_RxFS_direction(dam_port port, signal_direction direction); * the source port * @param p_source the source port */ -void dam_select_RxFS_source(dam_port p_config, int from_RxFS, +void dam_select_RxFS_source(dam_port p_config, bool from_RxFS, dam_port p_source); /*! @@ -190,7 +190,7 @@ void dam_select_TxClk_direction(dam_port port, signal_direction direction); * the source port * @param p_source the source port */ -void dam_select_TxClk_source(dam_port p_config, int from_RxClk, +void dam_select_TxClk_source(dam_port p_config, bool from_RxClk, dam_port p_source); /*! @@ -209,7 +209,7 @@ void dam_select_TxFS_direction(dam_port port, signal_direction direction); * the source port * @param p_source the source port */ -void dam_select_TxFS_source(dam_port p_config, int from_RxFS, +void dam_select_TxFS_source(dam_port p_config, bool from_RxFS, dam_port p_source); /*! @@ -236,7 +236,7 @@ int dam_set_internal_network_mode_mask(dam_port port, unsigned char bit_mask); * @param port the DAM port to configure * @param synchronous the state to assign */ -void dam_set_synchronous(dam_port port, int synchronous); +void dam_set_synchronous(dam_port port, bool synchronous); /*! * This function swaps the transmit and receive signals from (Da-TxD, Db-RxD) to @@ -246,7 +246,7 @@ void dam_set_synchronous(dam_port port, int synchronous); * @param port the DAM port to configure * @param value the switch state */ -void dam_switch_Tx_Rx(dam_port port, int value); +void dam_switch_Tx_Rx(dam_port port, bool value); /*! * This function resets the two registers of the selected port. diff --git a/drivers/mxc/hmp4e/mxc_hmp4e.c b/drivers/mxc/hmp4e/mxc_hmp4e.c index 0e196eedfa65..af96818270c0 100644 --- a/drivers/mxc/hmp4e/mxc_hmp4e.c +++ b/drivers/mxc/hmp4e/mxc_hmp4e.c @@ -122,7 +122,7 @@ static void hmp4ehw_clock_disable(void); /*readable by other modules through ipc */ /*static int g_hmp4e_busy = 0;*/ -static irqreturn_t hmp4e_isr(int irq, void *dev_id, struct pt_regs *regs); +static irqreturn_t hmp4e_isr(int irq, void *dev_id); /* VM operations */ static struct page *hmp4e_vm_nopage(struct vm_area_struct *vma, @@ -630,7 +630,7 @@ static int MapHwRegs(struct file *filp, struct vm_area_struct *vma) return 0; } -static irqreturn_t hmp4e_isr(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t hmp4e_isr(int irq, void *dev_id) { hmp4e_t *dev = (hmp4e_t *) dev_id; u32 irq_status = __raw_readl(dev->hwregs + 5); diff --git a/drivers/mxc/ipu/ipu_common.c b/drivers/mxc/ipu/ipu_common.c index 20a385b336fb..206baac32868 100644 --- a/drivers/mxc/ipu/ipu_common.c +++ b/drivers/mxc/ipu/ipu_common.c @@ -39,7 +39,7 @@ * associated with the ISR and the actual ISR function pointer. */ struct ipu_irq_node { - irqreturn_t(*handler) (int, void *, struct pt_regs *); /*!< the ISR */ + irqreturn_t(*handler) (int, void *); /*!< the ISR */ const char *name; /*!< device associated with the interrupt */ void *dev_id; /*!< some unique information for the ISR */ __u32 flags; /*!< not used */ @@ -59,7 +59,7 @@ static struct ipu_irq_node ipu_irq_list[IPU_IRQ_COUNT]; static const char driver_name[] = "mxc_ipu"; /* Static functions */ -static irqreturn_t ipu_irq_handler(int irq, void *desc, struct pt_regs *regs); +static irqreturn_t ipu_irq_handler(int irq, void *desc); static void _ipu_pf_init(ipu_channel_params_t * params); static void _ipu_pf_uninit(void); @@ -1204,7 +1204,7 @@ int32_t ipu_disable_channel(ipu_channel_t channel, bool wait_for_stop) } static -irqreturn_t ipu_irq_handler(int irq, void *desc, struct pt_regs *regs) +irqreturn_t ipu_irq_handler(int irq, void *desc) { uint32_t line_base = 0; uint32_t line; @@ -1223,8 +1223,7 @@ irqreturn_t ipu_irq_handler(int irq, void *desc, struct pt_regs *regs) int_stat &= ~(1UL << (line - 1)); line += line_base - 1; result |= - ipu_irq_list[line].handler(line, ipu_irq_list[line].dev_id, - regs); + ipu_irq_list[line].handler(line, ipu_irq_list[line].dev_id); } line_base = 32; @@ -1235,8 +1234,7 @@ irqreturn_t ipu_irq_handler(int irq, void *desc, struct pt_regs *regs) int_stat &= ~(1UL << (line - 1)); line += line_base - 1; result |= - ipu_irq_list[line].handler(line, ipu_irq_list[line].dev_id, - regs); + ipu_irq_list[line].handler(line, ipu_irq_list[line].dev_id); } line_base = 64; @@ -1247,8 +1245,7 @@ irqreturn_t ipu_irq_handler(int irq, void *desc, struct pt_regs *regs) int_stat &= ~(1UL << (line - 1)); line += line_base - 1; result |= - ipu_irq_list[line].handler(line, ipu_irq_list[line].dev_id, - regs); + ipu_irq_list[line].handler(line, ipu_irq_list[line].dev_id); } line_base = 96; @@ -1259,8 +1256,7 @@ irqreturn_t ipu_irq_handler(int irq, void *desc, struct pt_regs *regs) int_stat &= ~(1UL << (line - 1)); line += line_base - 1; result |= - ipu_irq_list[line].handler(line, ipu_irq_list[line].dev_id, - regs); + ipu_irq_list[line].handler(line, ipu_irq_list[line].dev_id); } line_base = 128; @@ -1271,8 +1267,7 @@ irqreturn_t ipu_irq_handler(int irq, void *desc, struct pt_regs *regs) int_stat &= ~(1UL << (line - 1)); line += line_base - 1; result |= - ipu_irq_list[line].handler(line, ipu_irq_list[line].dev_id, - regs); + ipu_irq_list[line].handler(line, ipu_irq_list[line].dev_id); } if (g_ipu_irq[1]) { @@ -1376,7 +1371,7 @@ bool ipu_get_irq_status(uint32_t irq) * fail. */ int ipu_request_irq(uint32_t irq, - irqreturn_t(*handler) (int, void *, struct pt_regs *), + irqreturn_t(*handler) (int, void *), uint32_t irq_flags, const char *devname, void *dev_id) { uint32_t lock_flags; diff --git a/drivers/mxc/ipu/pf/mxc_pf.c b/drivers/mxc/ipu/pf/mxc_pf.c index 74b4e06cb36e..3f20ddb7b281 100644 --- a/drivers/mxc/ipu/pf/mxc_pf.c +++ b/drivers/mxc/ipu/pf/mxc_pf.c @@ -58,8 +58,7 @@ static struct class *mxc_pf_class; * Function definitions */ -static irqreturn_t mxc_pf_irq_handler(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t mxc_pf_irq_handler(int irq, void *dev_id) { struct mxc_pf_data *pf = dev_id; pf->done_flag++; diff --git a/drivers/mxc/pm/dptc_mx27.c b/drivers/mxc/pm/dptc_mx27.c index 65ef98495643..ee8153f8887d 100644 --- a/drivers/mxc/pm/dptc_mx27.c +++ b/drivers/mxc/pm/dptc_mx27.c @@ -93,7 +93,7 @@ static int dptc_mx27_open(struct inode *inode, struct file *filp); static int dptc_mx27_release(struct inode *inode, struct file *filp); static int dptc_mx27_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); -static irqreturn_t dptc_mx27_irq(int irq, void *dev_id, struct pt_regs *regs); +static irqreturn_t dptc_mx27_irq(int irq, void *dev_id); /* * Global variables @@ -1240,14 +1240,12 @@ static int dptc_mx27_ioctl(struct inode *inode, struct file *filp, * * @param irq The Interrupt number * @param dev_id Driver private data - * @param regs Holds a snapshot of the processors context before the - * processor entered the interrupt code * * @result The function returns \b IRQ_RETVAL(1) if interrupt was handled, * returns \b IRQ_RETVAL(0) if the interrupt was not handled. * \b IRQ_RETVAL is defined in include/linux/interrupt.h. */ -static irqreturn_t dptc_mx27_irq(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t dptc_mx27_irq(int irq, void *dev_id) { if (dptc_params.dptc_is_active == TRUE) { dptc_intr_status = __raw_readl(IO_ADDRESS(MX27_PMCR_BASE_ADDR)); diff --git a/drivers/mxc/pm/dvfs_dptc.c b/drivers/mxc/pm/dvfs_dptc.c index e6251a7e88e0..e6b5813bdab6 100644 --- a/drivers/mxc/pm/dvfs_dptc.c +++ b/drivers/mxc/pm/dvfs_dptc.c @@ -74,7 +74,7 @@ static ssize_t dvfs_dptc_read(struct file *filp, char __user * buf, #endif #ifndef CONFIG_MXC_DVFS_SDMA -static irqreturn_t dvfs_dptc_irq(int irq, void *dev_id, struct pt_regs *regs); +static irqreturn_t dvfs_dptc_irq(int irq, void *dev_id); #else static void dvfs_dptc_sdma_callback(dvfs_dptc_params_s * params); #endif @@ -1157,14 +1157,12 @@ static int dvfs_dptc_ioctl(struct inode *inode, struct file *filp, * * @param irq The Interrupt number * @param dev_id Driver private data - * @param regs Holds a snapshot of the processors context before the - * processor entered the interrupt code * * @result The function returns \b IRQ_RETVAL(1) if interrupt was handled, * returns \b IRQ_RETVAL(0) if the interrupt was not handled. * \b IRQ_RETVAL is defined in include/linux/interrupt.h. */ -static irqreturn_t dvfs_dptc_irq(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t dvfs_dptc_irq(int irq, void *dev_id) { #ifdef EVB_DEBUG printk("CCM interrupt (0x%x)!!!\n", diff --git a/drivers/mxc/pmic/core/pmic_core_spi.c b/drivers/mxc/pmic/core/pmic_core_spi.c index 9f2064479872..3d41f3d183ec 100644 --- a/drivers/mxc/pmic/core/pmic_core_spi.c +++ b/drivers/mxc/pmic/core/pmic_core_spi.c @@ -120,11 +120,10 @@ static void pmic_pdev_unregister(void) * * @param irq the irq number * @param dev_id the pointer on the device - * @param regs the interrupt parameters * * @return The function returns IRQ_HANDLED when handled. */ -static irqreturn_t pmic_irq_handler(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t pmic_irq_handler(int irq, void *dev_id) { /* prepare a task */ schedule_work(&pmic_ws); diff --git a/drivers/mxc/pmic/mc13783/pmic_convity.c b/drivers/mxc/pmic/mc13783/pmic_convity.c index d897fd18c724..0bdcc371d7f7 100644 --- a/drivers/mxc/pmic/mc13783/pmic_convity.c +++ b/drivers/mxc/pmic/mc13783/pmic_convity.c @@ -34,12 +34,13 @@ * @ingroup PMIC_CONNECTIVITY */ -#include <asm/arch/pmic_convity.h> /* For PMIC Connectivity driver interface. */ -#include <asm/arch/pmic_adc.h> /* For PMIC ADC driver interface. */ - #include <linux/interrupt.h> /* For tasklet interface. */ #include <linux/platform_device.h> /* For kernel module interface. */ #include <linux/spinlock.h> /* For spinlock interface. */ + +#include <asm/arch/pmic_convity.h> /* For PMIC Connectivity driver interface. */ +#include <asm/arch/pmic_adc.h> /* For PMIC ADC driver interface. */ + #include "../core/pmic_config.h" /* diff --git a/drivers/mxc/security/mxc_scc.c b/drivers/mxc/security/mxc_scc.c index 0a0d147190a7..dc81b63d2f36 100644 --- a/drivers/mxc/security/mxc_scc.c +++ b/drivers/mxc/security/mxc_scc.c @@ -871,10 +871,8 @@ scc_return_t scc_write_register(int register_offset, uint32_t value) * * @param irq Channel number for the IRQ. (@c SCC_INT_SMN or @c SCC_INT_SCM). * @param dev_id Pointer to the identification of the device. Ignored. - * @param regs Holds the snapshot of the processor's context before the - * processor entered the interrupt. Ignored. */ -static irqreturn_t scc_irq(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t scc_irq(int irq, void *dev_id) { uint32_t smn_status; uint32_t scm_status; diff --git a/drivers/mxc/security/mxc_scc_internals.h b/drivers/mxc/security/mxc_scc_internals.h index 3078d96519c3..2535c15e34e8 100644 --- a/drivers/mxc/security/mxc_scc_internals.h +++ b/drivers/mxc/security/mxc_scc_internals.h @@ -271,7 +271,7 @@ static int scc_init(void); static void scc_cleanup(void); /* Forward defines of internal functions */ -static irqreturn_t scc_irq(int irq, void *dev_id, struct pt_regs *regs); +static irqreturn_t scc_irq(int irq, void *dev_id); static void scc_perform_callbacks(void); static uint32_t copy_to_scc(const uint8_t * from, uint32_t to, unsigned long count_bytes, uint16_t * crc); diff --git a/drivers/mxc/security/sahara2/include/linux_port.h b/drivers/mxc/security/sahara2/include/linux_port.h index 44e1ea5b30bb..be8d33debfcd 100644 --- a/drivers/mxc/security/sahara2/include/linux_port.h +++ b/drivers/mxc/security/sahara2/include/linux_port.h @@ -193,7 +193,7 @@ typedef struct { * * @return Zero if not handled, non-zero if handled. */ -typedef int (*os_interrupt_handler_t) (int, void *, struct pt_regs *); +typedef int (*os_interrupt_handler_t) (int, void *); /*! * @name Driver-to-Kernel Operations @@ -1207,7 +1207,7 @@ function_name * @return A call to #os_dev_isr_return() */ #define OS_DEV_ISR(function_name) \ -static irqreturn_t function_name(int N1_, void* N2_, struct pt_regs* N3_) +static irqreturn_t function_name(int N1_, void* N2_) /*! * Declare prototype for an ISR function. @@ -1295,7 +1295,6 @@ do { \ /* Unused warnings */ \ (void)N1_; \ (void)N2_; \ - (void)N3_; \ \ return IRQ_RETVAL(code); \ } while (0) diff --git a/drivers/mxc/security/sahara2/sah_driver_interface.c b/drivers/mxc/security/sahara2/sah_driver_interface.c index 69293ce8b407..133a62a4a786 100644 --- a/drivers/mxc/security/sahara2/sah_driver_interface.c +++ b/drivers/mxc/security/sahara2/sah_driver_interface.c @@ -130,8 +130,8 @@ static struct file_operations Fops = { .fsync = NULL, .fasync = NULL, .lock = NULL, - .readv = NULL, - .writev = NULL, + .aio_read = NULL, + .aio_write = NULL, .sendpage = NULL, .get_unmapped_area = NULL }; diff --git a/drivers/mxc/security/sahara2/sah_interrupt_handler.c b/drivers/mxc/security/sahara2/sah_interrupt_handler.c index a1a6aa0b69c4..0e0b5dd25766 100644 --- a/drivers/mxc/security/sahara2/sah_interrupt_handler.c +++ b/drivers/mxc/security/sahara2/sah_interrupt_handler.c @@ -58,11 +58,10 @@ uint32_t interrupt_count; #endif /* Internal Prototypes */ -static irqreturn_t sah_Intr_Top_Half(int irq, - void *dev_id, struct pt_regs *regs); +static irqreturn_t sah_Intr_Top_Half(int irq, void *dev_id); #ifdef KERNEL_TEST -extern void (*SAHARA_INT_PTR) (int, void *, struct pt_regs *); +extern void (*SAHARA_INT_PTR) (int, void *); #endif unsigned long reset_flag; @@ -165,12 +164,10 @@ void sah_Intr_Release(void) * * @param irq Part of the kernel prototype. * @param dev_id Part of the kernel prototype. -* @param regs Part of the kernel prototype. * * @return An IRQ_RETVAL() -- non-zero to that function means 'handled' */ -static irqreturn_t sah_Intr_Top_Half(int irq, - void *dev_id, struct pt_regs *regs) +static irqreturn_t sah_Intr_Top_Half(int irq, void *dev_id) { #if defined(DIAG_DRV_INTERRUPT) && defined(DIAG_DURING_INTERRUPT) LOG_KDIAG("Top half of Sahara's interrupt handler called."); @@ -185,7 +182,6 @@ static irqreturn_t sah_Intr_Top_Half(int irq, /* To get rid of the unused parameter warnings. */ irq = 0; dev_id = NULL; - regs = NULL; return IRQ_RETVAL(1); } diff --git a/drivers/mxc/vpu/mxc_vpu.c b/drivers/mxc/vpu/mxc_vpu.c index 34aaddb58bb9..76a9172b63d7 100644 --- a/drivers/mxc/vpu/mxc_vpu.c +++ b/drivers/mxc/vpu/mxc_vpu.c @@ -93,7 +93,7 @@ static int vpu_free_buffers(vpu_mem_desc mem[], int num_buf) /*! * @brief vpu interrupt handler */ -static irqreturn_t vpu_irq_handler(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t vpu_irq_handler(int irq, void *dev_id) { struct vpu_t *dev; dev = (struct vpu_t *)dev_id; diff --git a/drivers/net/irda/mxc_ir.c b/drivers/net/irda/mxc_ir.c index 09572c316fd7..ffbc13218aac 100644 --- a/drivers/net/irda/mxc_ir.c +++ b/drivers/net/irda/mxc_ir.c @@ -725,7 +725,7 @@ static int mxc_irda_sir_rxirq(struct mxc_irda *si, struct net_device *dev) } -static irqreturn_t mxc_irda_irq(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t mxc_irda_irq(int irq, void *dev_id) { struct net_device *dev = dev_id; struct mxc_irda *si = dev->priv; @@ -746,7 +746,7 @@ static irqreturn_t mxc_irda_irq(int irq, void *dev_id, struct pt_regs *regs) return IRQ_HANDLED; } -static irqreturn_t mxc_irda_tx_irq(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t mxc_irda_tx_irq(int irq, void *dev_id) { struct net_device *dev = dev_id; @@ -757,7 +757,7 @@ static irqreturn_t mxc_irda_tx_irq(int irq, void *dev_id, struct pt_regs *regs) return IRQ_HANDLED; } -static irqreturn_t mxc_irda_rx_irq(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t mxc_irda_rx_irq(int irq, void *dev_id) { struct net_device *dev = dev_id; diff --git a/drivers/net/irda/mxc_sir.c b/drivers/net/irda/mxc_sir.c index 954906c4d082..ec1ed134a8c5 100644 --- a/drivers/net/irda/mxc_sir.c +++ b/drivers/net/irda/mxc_sir.c @@ -363,7 +363,7 @@ static int mxc_irda_sir_rxirq(struct mxc_irda *si, struct net_device *dev) /* * IrDA interrupt service routine */ -static irqreturn_t mxc_irda_irq(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t mxc_irda_irq(int irq, void *dev_id) { struct net_device *dev = dev_id; struct mxc_irda *si = netdev_priv(dev); diff --git a/drivers/pcmcia/mx31ads-pcmcia.c b/drivers/pcmcia/mx31ads-pcmcia.c index 25f2a40cf61a..facab9bb8d6c 100644 --- a/drivers/pcmcia/mx31ads-pcmcia.c +++ b/drivers/pcmcia/mx31ads-pcmcia.c @@ -1003,8 +1003,7 @@ static void mx31ads_common_check_status(struct mx31ads_pcmcia_socket *skt) * handling code performs scheduling operations which cannot be * executed from within an interrupt context. */ -static irqreturn_t mx31ads_common_pcmcia_interrupt(int irq, void *dev, - struct pt_regs *regs) +static irqreturn_t mx31ads_common_pcmcia_interrupt(int irq, void *dev) { struct mx31ads_pcmcia_socket *skt = dev; volatile u32 pscr, pgsr; diff --git a/drivers/serial/mxc_uart.c b/drivers/serial/mxc_uart.c index 7e86a734526f..2d9f0c40c29a 100644 --- a/drivers/serial/mxc_uart.c +++ b/drivers/serial/mxc_uart.c @@ -333,15 +333,9 @@ static void mxcuart_enable_ms(struct uart_port *port) * * @param umxc the MXC UART port structure, this includes the \b uart_port * structure and other members that are specific to MXC UARTs - * @param regs holds a snapshot of the processor's context before the - * processor entered the interrupt code */ static void -#ifdef SUPPORT_SYSRQ -mxcuart_rx_chars(uart_mxc_port * umxc, struct pt_regs *regs) -#else mxcuart_rx_chars(uart_mxc_port * umxc) -#endif { struct tty_struct *tty = umxc->port.info->tty; volatile unsigned int ch, sr2; @@ -394,7 +388,7 @@ mxcuart_rx_chars(uart_mxc_port * umxc) } } - if (uart_handle_sysrq_char(&umxc->port, ch, regs)) { + if (uart_handle_sysrq_char(&umxc->port, ch)) { goto ignore_char; } @@ -503,14 +497,12 @@ static void mxcuart_modem_status(uart_mxc_port * umxc, unsigned int sr1, * * @param irq the interrupt number * @param dev_id driver private data - * @param regs holds a snapshot of the processor's context before the - * processor entered the interrupt code * * @return The function returns \b IRQ_RETVAL(1) if interrupt was handled, * returns \b IRQ_RETVAL(0) if the interrupt was not handled. * \b IRQ_RETVAL is defined in \b include/linux/interrupt.h. */ -static irqreturn_t mxcuart_int(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t mxcuart_int(int irq, void *dev_id) { uart_mxc_port *umxc = dev_id; volatile unsigned int sr1, sr2, cr1, cr; @@ -530,11 +522,7 @@ static irqreturn_t mxcuart_int(int irq, void *dev_id, struct pt_regs *regs) * Read if there is data available */ if (sr2 & MXC_UARTUSR2_RDR) { -#ifdef SUPPORT_SYSRQ - mxcuart_rx_chars(umxc, regs); -#else mxcuart_rx_chars(umxc); -#endif } if ((sr1 & (MXC_UARTUSR1_RTSD | MXC_UARTUSR1_DTRD)) || @@ -600,14 +588,12 @@ static irqreturn_t mxcuart_int(int irq, void *dev_id, struct pt_regs *regs) * * @param irq the interrupt number * @param dev_id driver private data - * @param regs holds a snapshot of the processor's context before the - * processor entered the interrupt code * * @return The function returns \b IRQ_RETVAL(1) if interrupt was handled, * returns \b IRQ_RETVAL(0) if the interrupt was not handled. * \b IRQ_RETVAL is defined in include/linux/interrupt.h. */ -static irqreturn_t mxcuart_tx_int(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t mxcuart_tx_int(int irq, void *dev_id) { uart_mxc_port *umxc = dev_id; int handled = 0; @@ -653,25 +639,19 @@ static irqreturn_t mxcuart_tx_int(int irq, void *dev_id, struct pt_regs *regs) * * @param irq the interrupt number * @param dev_id driver private data - * @param regs holds a snapshot of the processor's context before the - * processor entered the interrupt code * * @return The function returns \b IRQ_RETVAL(1) if interrupt was handled, * returns \b IRQ_RETVAL(0) if the interrupt was not handled. * \b IRQ_RETVAL is defined in include/linux/interrupt.h. */ -static irqreturn_t mxcuart_rx_int(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t mxcuart_rx_int(int irq, void *dev_id) { uart_mxc_port *umxc = dev_id; int handled = 0; /* Clear the aging timer bit */ writel(MXC_UARTUSR1_AGTIM, umxc->port.membase + MXC_UARTUSR1); -#ifdef SUPPORT_SYSRQ - mxcuart_rx_chars(umxc, regs); -#else mxcuart_rx_chars(umxc); -#endif handled = 1; return IRQ_RETVAL(handled); @@ -684,14 +664,12 @@ static irqreturn_t mxcuart_rx_int(int irq, void *dev_id, struct pt_regs *regs) * * @param irq the interrupt number * @param dev_id driver private data - * @param regs holds a snapshot of the processor's context before the - * processor entered the interrupt code * * @return The function returns \b IRQ_RETVAL(1) if interrupt was handled, * returns \b IRQ_RETVAL(0) if the interrupt was not handled. * \b IRQ_RETVAL is defined in include/linux/interrupt.h. */ -static irqreturn_t mxcuart_mint_int(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t mxcuart_mint_int(int irq, void *dev_id) { uart_mxc_port *umxc = dev_id; int handled = 0; diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c index f38b79e0a028..73f1d894567a 100644 --- a/drivers/spi/mxc_spi.c +++ b/drivers/spi/mxc_spi.c @@ -411,11 +411,10 @@ void mxc_spi_chipselect(struct spi_device *spi, int is_active) * * @param irq the irq number * @param dev_id the pointer on the device - * @param regs the interrupt parameters * * @return The function returns IRQ_HANDLED when handled. */ -static irqreturn_t mxc_spi_isr(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t mxc_spi_isr(int irq, void *dev_id) { struct mxc_spi *master_drv_data = dev_id; irqreturn_t ret = IRQ_NONE; diff --git a/drivers/usb/gadget/arcotg_udc.c b/drivers/usb/gadget/arcotg_udc.c index 1661faca653f..10c2ec0c7a04 100644 --- a/drivers/usb/gadget/arcotg_udc.c +++ b/drivers/usb/gadget/arcotg_udc.c @@ -27,7 +27,6 @@ #define DUMP_QUEUES #endif -#include <linux/config.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/ioport.h> @@ -46,7 +45,7 @@ #include <linux/platform_device.h> #include <linux/usb_ch9.h> #include <linux/usb_gadget.h> -#include <linux/usb_otg.h> +#include <linux/usb/otg.h> #include <linux/dma-mapping.h> #include <asm/byteorder.h> @@ -2218,7 +2217,7 @@ static void reset_irq(struct arcotg_udc *udc) } } -static irqreturn_t arcotg_udc_irq(int irq, void *_udc, struct pt_regs *r) +static irqreturn_t arcotg_udc_irq(int irq, void *_udc) { struct arcotg_udc *udc = _udc; u32 irq_src; diff --git a/drivers/usb/host/ehci-arc.c b/drivers/usb/host/ehci-arc.c index 0bea0b0ac2c3..68920872101a 100644 --- a/drivers/usb/host/ehci-arc.c +++ b/drivers/usb/host/ehci-arc.c @@ -26,7 +26,7 @@ /* Note: this file is #included by ehci-hcd.c */ #include <linux/platform_device.h> -#include <linux/usb_otg.h> +#include <linux/usb/otg.h> #include <asm/arch/arc_otg.h> #include <asm/arch/isp1504.h> diff --git a/drivers/usb/otg/fsl_otg.c b/drivers/usb/otg/fsl_otg.c index 8b89be83f055..67fabb3313e8 100644 --- a/drivers/usb/otg/fsl_otg.c +++ b/drivers/usb/otg/fsl_otg.c @@ -11,7 +11,6 @@ * http://www.gnu.org/copyleft/gpl.html */ -#include <linux/config.h> #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/kernel.h> diff --git a/drivers/usb/otg/fsl_otg.h b/drivers/usb/otg/fsl_otg.h index 9abde69c5096..3513ef8aaa14 100644 --- a/drivers/usb/otg/fsl_otg.h +++ b/drivers/usb/otg/fsl_otg.h @@ -12,7 +12,7 @@ */ #include "otg_fsm.h" -#include <linux/usb_otg.h> +#include <linux/usb/otg.h> /* USB Command Register Bit Masks */ #define USB_CMD_RUN_STOP (0x1<<0 ) diff --git a/drivers/usb/otg/otg_fsm.c b/drivers/usb/otg/otg_fsm.c index 080748d8c024..e0efdcd1ebb1 100644 --- a/drivers/usb/otg/otg_fsm.c +++ b/drivers/usb/otg/otg_fsm.c @@ -13,7 +13,7 @@ #include <asm/types.h> #include <linux/kernel.h> -#include <linux/usb_otg.h> +#include <linux/usb/otg.h> #include <linux/spinlock.h> #include <linux/delay.h> #include <linux/usb.h> diff --git a/drivers/video/mxc/mx2fb_epson.c b/drivers/video/mxc/mx2fb_epson.c index c0d12e285c5d..9659f2a31c01 100644 --- a/drivers/video/mxc/mx2fb_epson.c +++ b/drivers/video/mxc/mx2fb_epson.c @@ -40,7 +40,6 @@ # define __KERNEL__ #endif -#include <linux/config.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/version.h> @@ -765,7 +764,7 @@ void slcdc_send_data(u32 length) * *@return 0 on success, any other value otherwise **/ -static irqreturn_t slcdc_isr(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t slcdc_isr(int irq, void *dev_id) { volatile u32 reg; reg = __raw_readl(IO_ADDRESS(SLCDC_BASE_ADDR + 0x20)); diff --git a/drivers/video/mxc/mxcfb.c b/drivers/video/mxc/mxcfb.c index ebde4ce2e4f2..f5315ae3325b 100644 --- a/drivers/video/mxc/mxcfb.c +++ b/drivers/video/mxc/mxcfb.c @@ -115,8 +115,7 @@ extern void gpio_lcd_inactive(void); extern int fs453_ioctl(unsigned int cmd, void *arg); #endif -static irqreturn_t mxcfb_irq_handler(int irq, void *dev_id, - struct pt_regs *regs); +static irqreturn_t mxcfb_irq_handler(int irq, void *dev_id); static int mxcfb_blank(int blank, struct fb_info *info); static int mxcfb_map_video_memory(struct fb_info *fbi, bool use_internal_ram); static int mxcfb_unmap_video_memory(struct fb_info *fbi); @@ -753,8 +752,7 @@ static struct fb_ops mxcfb_ovl_ops = { }; #endif -static irqreturn_t mxcfb_vsync_irq_handler(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t mxcfb_vsync_irq_handler(int irq, void *dev_id) { struct mxcfb_data *fb_data = dev_id; @@ -765,8 +763,7 @@ static irqreturn_t mxcfb_vsync_irq_handler(int irq, void *dev_id, return IRQ_HANDLED; } -static irqreturn_t mxcfb_irq_handler(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t mxcfb_irq_handler(int irq, void *dev_id) { struct fb_info *fbi = dev_id; struct mxcfb_info *mxc_fbi = fbi->par; diff --git a/drivers/video/mxc/mxcfb_epson.c b/drivers/video/mxc/mxcfb_epson.c index 2632249db366..744f5dc3ae7d 100644 --- a/drivers/video/mxc/mxcfb_epson.c +++ b/drivers/video/mxc/mxcfb_epson.c @@ -248,8 +248,7 @@ static void _init_panel(int disp) } #ifdef PARTIAL_REFRESH -static irqreturn_t mxcfb_sys2_eof_irq_handler(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t mxcfb_sys2_eof_irq_handler(int irq, void *dev_id) { ipu_channel_params_t params; struct fb_info *fbi = dev_id; @@ -323,8 +322,7 @@ static irqreturn_t mxcfb_sys2_eof_irq_handler(int irq, void *dev_id, return IRQ_HANDLED; } -static irqreturn_t mxcfb_sys1_eof_irq_handler(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t mxcfb_sys1_eof_irq_handler(int irq, void *dev_id) { ipu_disable_irq(IPU_IRQ_ADC_SYS1_EOF); ipu_disable_channel(ADC_SYS1, false); diff --git a/drivers/video/mxc/mxcfb_epson_qvga.c b/drivers/video/mxc/mxcfb_epson_qvga.c index c36fccf71b0f..8bdb6b2e6075 100644 --- a/drivers/video/mxc/mxcfb_epson_qvga.c +++ b/drivers/video/mxc/mxcfb_epson_qvga.c @@ -247,8 +247,7 @@ static void _init_panel(int disp) } #ifdef PARTIAL_REFRESH -static irqreturn_t mxcfb_sys2_eof_irq_handler(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t mxcfb_sys2_eof_irq_handler(int irq, void *dev_id) { ipu_channel_params_t params; struct fb_info *fbi = dev_id; @@ -322,8 +321,7 @@ static irqreturn_t mxcfb_sys2_eof_irq_handler(int irq, void *dev_id, return IRQ_HANDLED; } -static irqreturn_t mxcfb_sys1_eof_irq_handler(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t mxcfb_sys1_eof_irq_handler(int irq, void *dev_id) { ipu_disable_irq(IPU_IRQ_ADC_SYS1_EOF); ipu_disable_channel(ADC_SYS1, false); diff --git a/drivers/video/mxc/mxcfb_sharp_128x128.c b/drivers/video/mxc/mxcfb_sharp_128x128.c index 156f85acc350..0d7015c494c9 100644 --- a/drivers/video/mxc/mxcfb_sharp_128x128.c +++ b/drivers/video/mxc/mxcfb_sharp_128x128.c @@ -281,8 +281,7 @@ static void _init_panel(int disp) } #ifdef PARTIAL_REFRESH -static irqreturn_t mxcfb_sys2_eof_irq_handler(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t mxcfb_sys2_eof_irq_handler(int irq, void *dev_id) { ipu_channel_params_t params; struct fb_info *fbi = dev_id; @@ -356,8 +355,7 @@ static irqreturn_t mxcfb_sys2_eof_irq_handler(int irq, void *dev_id, return IRQ_HANDLED; } -static irqreturn_t mxcfb_sys1_eof_irq_handler(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t mxcfb_sys1_eof_irq_handler(int irq, void *dev_id) { ipu_disable_irq(IPU_IRQ_ADC_SYS1_EOF); ipu_disable_channel(ADC_SYS1, false); diff --git a/drivers/video/mxc/mxcfb_toshiba_qvga.c b/drivers/video/mxc/mxcfb_toshiba_qvga.c index 23e53fb0a8bb..6dd8e10fb128 100644 --- a/drivers/video/mxc/mxcfb_toshiba_qvga.c +++ b/drivers/video/mxc/mxcfb_toshiba_qvga.c @@ -303,8 +303,7 @@ static void _init_panel(int disp) } #ifdef PARTIAL_REFRESH -static irqreturn_t mxcfb_sys2_eof_irq_handler(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t mxcfb_sys2_eof_irq_handler(int irq, void *dev_id) { ipu_channel_params_t params; struct fb_info *fbi = dev_id; @@ -378,8 +377,7 @@ static irqreturn_t mxcfb_sys2_eof_irq_handler(int irq, void *dev_id, return IRQ_HANDLED; } -static irqreturn_t mxcfb_sys1_eof_irq_handler(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t mxcfb_sys1_eof_irq_handler(int irq, void *dev_id) { ipu_disable_irq(IPU_IRQ_ADC_SYS1_EOF); ipu_disable_channel(ADC_SYS1, false); diff --git a/include/asm-arm/arch-mxc/gpio.h b/include/asm-arm/arch-mxc/gpio.h index b72f13028b45..4557f7b13c9e 100644 --- a/include/asm-arm/arch-mxc/gpio.h +++ b/include/asm-arm/arch-mxc/gpio.h @@ -63,7 +63,7 @@ typedef enum gpio_int_cfg { #endif } gpio_edge_t; -typedef irqreturn_t(*gpio_irq_handler) (int, void *, struct pt_regs *); +typedef irqreturn_t(*gpio_irq_handler) (int, void *); /*! * This function configures the GPIO signal to be either input or output. For diff --git a/include/asm-arm/arch-mxc/hardware.h b/include/asm-arm/arch-mxc/hardware.h index b8eea8722831..83f52c7dc2d0 100644 --- a/include/asm-arm/arch-mxc/hardware.h +++ b/include/asm-arm/arch-mxc/hardware.h @@ -23,21 +23,6 @@ #include <asm/sizes.h> /*! - * makes bool as int type - */ -#define bool int - -/*! - * defines false as 0 - */ -#define false 0 - -/*! - * defines true as 1 - */ -#define true 1 - -/*! * defines PCIO_BASE (not used but needed for compilation) */ #define PCIO_BASE 0 diff --git a/include/asm-arm/arch-mxc/ipu.h b/include/asm-arm/arch-mxc/ipu.h index fbfd7b15dc63..60d0ec96430d 100644 --- a/include/asm-arm/arch-mxc/ipu.h +++ b/include/asm-arm/arch-mxc/ipu.h @@ -688,7 +688,7 @@ void ipu_enable_irq(uint32_t irq); void ipu_disable_irq(uint32_t irq); void ipu_clear_irq(uint32_t irq); int ipu_request_irq(uint32_t irq, - irqreturn_t(*handler) (int, void *, struct pt_regs *), + irqreturn_t(*handler) (int, void *), uint32_t irq_flags, const char *devname, void *dev_id); void ipu_free_irq(uint32_t irq, void *dev_id); bool ipu_get_irq_status(uint32_t irq); |