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

[media] lirc_parallel: avoid name conflict on mn10300 arch

The "irq_handler" name is already defined there on a header
file:

/devel/v4l/temp/drivers/staging/media/lirc/lirc_parallel.c:223:13: error: conflicting types for ‘irq_handler’
static void irq_handler(void *blah)
^
In file included from /devel/v4l/temp/arch/mn10300/include/asm/reset-regs.h:16:0,
from /devel/v4l/temp/arch/mn10300/include/asm/irq.h:18,
from /devel/v4l/temp/include/linux/irq.h:24,
from /devel/v4l/temp/arch/mn10300/include/asm/hardirq.h:16,
from /devel/v4l/temp/include/linux/preempt_mask.h:5,
from /devel/v4l/temp/include/linux/sched.h:25,
from /devel/v4l/temp/include/linux/utsname.h:5,
from /devel/v4l/temp/arch/mn10300/include/asm/elf.h:15,
from /devel/v4l/temp/include/linux/elf.h:4,
from /devel/v4l/temp/include/linux/module.h:14,
from /devel/v4l/temp/drivers/staging/media/lirc/lirc_parallel.c:29:
/devel/v4l/temp/arch/mn10300/include/asm/exceptions.h:107:24: note: previous declaration of ‘irq_handler’ was here
extern asmlinkage void irq_handler(void);

/devel/v4l/patchwork/drivers/staging/media/lirc/lirc_serial.c:653:20: error: conflicting types for ‘irq_handler’
static irqreturn_t irq_handler(int i, void *blah)
^
In file included from /devel/v4l/patchwork/arch/mn10300/include/asm/reset-regs.h:16:0,
from /devel/v4l/patchwork/arch/mn10300/include/asm/irq.h:18,
from /devel/v4l/patchwork/include/linux/irq.h:24,
from /devel/v4l/patchwork/arch/mn10300/include/asm/hardirq.h:16,
from /devel/v4l/patchwork/include/linux/preempt_mask.h:5,
from /devel/v4l/patchwork/include/linux/sched.h:25,
from /devel/v4l/patchwork/include/linux/utsname.h:5,
from /devel/v4l/patchwork/arch/mn10300/include/asm/elf.h:15,
from /devel/v4l/patchwork/include/linux/elf.h:4,
from /devel/v4l/patchwork/include/linux/module.h:14,
from /devel/v4l/patchwork/drivers/staging/media/lirc/lirc_serial.c:53:
/devel/v4l/patchwork/arch/mn10300/include/asm/exceptions.h:107:24: note: previous declaration of ‘irq_handler’ was here
extern asmlinkage void irq_handler(void);

So, rename it, to avoid namespace conflicts.

This patch fixes building media drivers with allyesconfig/almodconfig on
mn10300 arch.

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

+4 -4
+2 -2
drivers/staging/media/lirc/lirc_parallel.c
··· 220 220 wptr = nwptr; 221 221 } 222 222 223 - static void irq_handler(void *blah) 223 + static void lirc_lirc_irq_handler(void *blah) 224 224 { 225 225 struct timeval tv; 226 226 static struct timeval lasttv; ··· 659 659 goto exit_device_put; 660 660 } 661 661 ppdevice = parport_register_device(pport, LIRC_DRIVER_NAME, 662 - pf, kf, irq_handler, 0, NULL); 662 + pf, kf, lirc_lirc_irq_handler, 0, NULL); 663 663 parport_put_port(pport); 664 664 if (ppdevice == NULL) { 665 665 pr_notice("parport_register_device() failed\n");
+2 -2
drivers/staging/media/lirc/lirc_serial.c
··· 650 650 rbwrite(l); 651 651 } 652 652 653 - static irqreturn_t irq_handler(int i, void *blah) 653 + static irqreturn_t lirc_irq_handler(int i, void *blah) 654 654 { 655 655 struct timeval tv; 656 656 int counter, dcd; ··· 852 852 return result; 853 853 #endif 854 854 855 - result = request_irq(irq, irq_handler, 855 + result = request_irq(irq, lirc_irq_handler, 856 856 (share_irq ? IRQF_SHARED : 0), 857 857 LIRC_DRIVER_NAME, (void *)&hardware); 858 858 if (result < 0) {