m68k/irq: Remove obsolete IRQ_FLG_* users (5a239453) · Commits · EulixOS / Software / Kernel

arch/m68k/amiga/amiints.c

+0 −29

Original line number	Diff line number	Diff line
		@@ -4,35 +4,6 @@
		* This file is subject to the terms and conditions of the GNU General Public
		* License. See the file COPYING in the main directory of this archive
		* for more details.
		*
		* 11/07/96: rewritten interrupt handling, irq lists are exists now only for
		* this sources where it makes sense (VERTB/PORTS/EXTER) and you must
		* be careful that dev_id for this sources is unique since this the
		* only possibility to distinguish between different handlers for
		* free_irq. irq lists also have different irq flags:
		* - IRQ_FLG_FAST: handler is inserted at top of list (after other
		* fast handlers)
		* - IRQ_FLG_SLOW: handler is inserted at bottom of list and before
		* they're executed irq level is set to the previous
		* one, but handlers don't need to be reentrant, if
		* reentrance occurred, slow handlers will be just
		* called again.
		* The whole interrupt handling for CIAs is moved to cia.c
		* /Roman Zippel
		*
		* 07/08/99: rewamp of the interrupt handling - we now have two types of
		* interrupts, normal and fast handlers, fast handlers being
		* marked with IRQF_DISABLED and runs with all other interrupts
		* disabled. Normal interrupts disable their own source but
		* run with all other interrupt sources enabled.
		* PORTS and EXTER interrupts are always shared even if the
		* drivers do not explicitly mark this when calling
		* request_irq which they really should do.
		* This is similar to the way interrupts are handled on all
		* other architectures and makes a ton of sense besides
		* having the advantage of making it easier to share
		* drivers.
		* /Jes
		*/

		#include <linux/init.h>

arch/m68k/hp300/time.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ void __init hp300_sched_init(irq_handler_t vector)

		asm volatile(" movpw %0,%1@(5)" : : "d" (INTVAL), "a" (CLOCKBASE));

		if (request_irq(IRQ_AUTO_6, hp300_tick, IRQ_FLG_STD, "timer tick", vector))
		if (request_irq(IRQ_AUTO_6, hp300_tick, 0, "timer tick", vector))
		pr_err("Couldn't register timer interrupt\n");

		out_8(CLOCKBASE + CLKCR2, 0x1); /* select CR1 */

arch/m68k/kernel/ints.c

+0 −19

Original line number	Diff line number	Diff line
		@@ -4,25 +4,6 @@
		* This file is subject to the terms and conditions of the GNU General Public
		* License. See the file COPYING in the main directory of this archive
		* for more details.
		*
		* 07/03/96: Timer initialization, and thus mach_sched_init(),
		* removed from request_irq() and moved to init_time().
		* We should therefore consider renaming our add_isr() and
		* remove_isr() to request_irq() and free_irq()
		* respectively, so they are compliant with the other
		* architectures. /Jes
		* 11/07/96: Changed all add_/remove_isr() to request_/free_irq() calls.
		* Removed irq list support, if any machine needs an irq server
		* it must implement this itself (as it's already done), instead
		* only default handler are used with mach_default_handler.
		* request_irq got some flags different from other architectures:
		* - IRQ_FLG_REPLACE : Replace an existing handler (the default one
		* can be replaced without this flag)
		* - IRQ_FLG_LOCK : handler can't be replaced
		* There are other machine depending flags, see there
		* If you want to replace a default handler you should know what
		* you're doing, since it might handle different other irq sources
		* which must be served /Roman Zippel
		*/

		#include <linux/module.h>

arch/m68k/mac/iop.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -305,14 +305,12 @@ void __init iop_register_interrupts(void)
		{
		if (iop_ism_present) {
		if (oss_present) {
		if (request_irq(OSS_IRQLEV_IOPISM, iop_ism_irq,
		IRQ_FLG_LOCK, "ISM IOP",
		(void *) IOP_NUM_ISM))
		if (request_irq(OSS_IRQLEV_IOPISM, iop_ism_irq, 0,
		"ISM IOP", (void *)IOP_NUM_ISM))
		pr_err("Couldn't register ISM IOP interrupt\n");
		oss_irq_enable(IRQ_MAC_ADB);
		} else {
		if (request_irq(IRQ_VIA2_0, iop_ism_irq,
		IRQ_FLG_LOCK\|IRQ_FLG_FAST, "ISM IOP",
		if (request_irq(IRQ_VIA2_0, iop_ism_irq, 0, "ISM IOP",
		(void *)IOP_NUM_ISM))
		pr_err("Couldn't register ISM IOP interrupt\n");
		}

arch/m68k/mac/oss.c

+5 −8

Original line number	Diff line number	Diff line
		@@ -65,17 +65,14 @@ void __init oss_init(void)

		void __init oss_register_interrupts(void)
		{
		if (request_irq(OSS_IRQLEV_SCSI, oss_irq, IRQ_FLG_LOCK,
		"scsi", (void *) oss))
		if (request_irq(OSS_IRQLEV_SCSI, oss_irq, 0, "scsi", (void *)oss))
		pr_err("Couldn't register %s interrupt\n", "scsi");
		if (request_irq(OSS_IRQLEV_NUBUS, oss_nubus_irq, IRQ_FLG_LOCK,
		"nubus", (void *) oss))
		if (request_irq(OSS_IRQLEV_NUBUS, oss_nubus_irq, 0, "nubus",
		(void *)oss))
		pr_err("Couldn't register %s interrupt\n", "nubus");
		if (request_irq(OSS_IRQLEV_SOUND, oss_irq, IRQ_FLG_LOCK,
		"sound", (void *) oss))
		if (request_irq(OSS_IRQLEV_SOUND, oss_irq, 0, "sound", (void *)oss))
		pr_err("Couldn't register %s interrupt\n", "sound");
		if (request_irq(OSS_IRQLEV_VIA1, via1_irq, IRQ_FLG_LOCK,
		"via1", (void *) via1))
		if (request_irq(OSS_IRQLEV_VIA1, via1_irq, 0, "via1", (void *)via1))
		pr_err("Couldn't register %s interrupt\n", "via1");
		}