Merge branch 'submit1' of viper:/spare/repo/irq-remove-2.6 into irqcleanups (5d347c8a) · Commits · e / devices / android_kernel_teracube_emerald

arch/i386/kernel/time.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -201,8 +201,8 @@ irqreturn_t timer_interrupt(int irq, void *dev_id)
		high bit of the PPI port B (0x61). Note that some PS/2s,
		notably the 55SX, work fine if this is removed. */

		irq = inb_p( 0x61 ); /* read the current state */
		outb_p( irq\|0x80, 0x61 ); /* reset the IRQ */
		u8 irq_v = inb_p( 0x61 ); /* read the current state */
		outb_p( irq_v\|0x80, 0x61 ); /* reset the IRQ */
		}

		write_sequnlock(&xtime_lock);

drivers/atm/ambassador.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -862,15 +862,10 @@ static inline void interrupts_off (amb_dev * dev) {
		/******** interrupt handling ********/

		static irqreturn_t interrupt_handler(int irq, void *dev_id) {
		amb_dev * dev = (amb_dev *) dev_id;
		amb_dev * dev = dev_id;

		PRINTD (DBG_IRQ\|DBG_FLOW, "interrupt_handler: %p", dev_id);

		if (!dev_id) {
		PRINTD (DBG_IRQ\|DBG_ERR, "irq with NULL dev_id: %d", irq);
		return IRQ_NONE;
		}

		{
		u32 interrupt = rd_plain (dev, offsetof(amb_mem, interrupt));

drivers/atm/horizon.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -1389,15 +1389,6 @@ static irqreturn_t interrupt_handler(int irq, void *dev_id) {

		PRINTD (DBG_FLOW, "interrupt_handler: %p", dev_id);

		if (!dev_id) {
		PRINTD (DBG_IRQ\|DBG_ERR, "irq with NULL dev_id: %d", irq);
		return IRQ_NONE;
		}
		if (irq != dev->irq) {
		PRINTD (DBG_IRQ\|DBG_ERR, "irq mismatch: %d", irq);
		return IRQ_NONE;
		}

		// definitely for us
		irq_ok = 0;
		while ((int_source = rd_regl (dev, INT_SOURCE_REG_OFF)

drivers/atm/lanai.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1892,11 +1892,9 @@ static inline void lanai_int_1(struct lanai_dev *lanai, u32 reason)

		static irqreturn_t lanai_int(int irq, void *devid)
		{
		struct lanai_dev lanai = (struct lanai_dev ) devid;
		struct lanai_dev *lanai = devid;
		u32 reason;

		(void) irq; /* unused variables */

		#ifdef USE_POWERDOWN
		/*
		* If we're powered down we shouldn't be generating any interrupts -

drivers/block/DAC960.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -5254,7 +5254,7 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)
		static irqreturn_t DAC960_GEM_InterruptHandler(int IRQ_Channel,
		void *DeviceIdentifier)
		{
		DAC960_Controller_T Controller = (DAC960_Controller_T ) DeviceIdentifier;
		DAC960_Controller_T *Controller = DeviceIdentifier;
		void __iomem *ControllerBaseAddress = Controller->BaseAddress;
		DAC960_V2_StatusMailbox_T *NextStatusMailbox;
		unsigned long flags;
		@@ -5295,7 +5295,7 @@ static irqreturn_t DAC960_GEM_InterruptHandler(int IRQ_Channel,
		static irqreturn_t DAC960_BA_InterruptHandler(int IRQ_Channel,
		void *DeviceIdentifier)
		{
		DAC960_Controller_T Controller = (DAC960_Controller_T ) DeviceIdentifier;
		DAC960_Controller_T *Controller = DeviceIdentifier;
		void __iomem *ControllerBaseAddress = Controller->BaseAddress;
		DAC960_V2_StatusMailbox_T *NextStatusMailbox;
		unsigned long flags;
		@@ -5337,7 +5337,7 @@ static irqreturn_t DAC960_BA_InterruptHandler(int IRQ_Channel,
		static irqreturn_t DAC960_LP_InterruptHandler(int IRQ_Channel,
		void *DeviceIdentifier)
		{
		DAC960_Controller_T Controller = (DAC960_Controller_T ) DeviceIdentifier;
		DAC960_Controller_T *Controller = DeviceIdentifier;
		void __iomem *ControllerBaseAddress = Controller->BaseAddress;
		DAC960_V2_StatusMailbox_T *NextStatusMailbox;
		unsigned long flags;
		@@ -5379,7 +5379,7 @@ static irqreturn_t DAC960_LP_InterruptHandler(int IRQ_Channel,
		static irqreturn_t DAC960_LA_InterruptHandler(int IRQ_Channel,
		void *DeviceIdentifier)
		{
		DAC960_Controller_T Controller = (DAC960_Controller_T ) DeviceIdentifier;
		DAC960_Controller_T *Controller = DeviceIdentifier;
		void __iomem *ControllerBaseAddress = Controller->BaseAddress;
		DAC960_V1_StatusMailbox_T *NextStatusMailbox;
		unsigned long flags;
		@@ -5417,7 +5417,7 @@ static irqreturn_t DAC960_LA_InterruptHandler(int IRQ_Channel,
		static irqreturn_t DAC960_PG_InterruptHandler(int IRQ_Channel,
		void *DeviceIdentifier)
		{
		DAC960_Controller_T Controller = (DAC960_Controller_T ) DeviceIdentifier;
		DAC960_Controller_T *Controller = DeviceIdentifier;
		void __iomem *ControllerBaseAddress = Controller->BaseAddress;
		DAC960_V1_StatusMailbox_T *NextStatusMailbox;
		unsigned long flags;
		@@ -5455,7 +5455,7 @@ static irqreturn_t DAC960_PG_InterruptHandler(int IRQ_Channel,
		static irqreturn_t DAC960_PD_InterruptHandler(int IRQ_Channel,
		void *DeviceIdentifier)
		{
		DAC960_Controller_T Controller = (DAC960_Controller_T ) DeviceIdentifier;
		DAC960_Controller_T *Controller = DeviceIdentifier;
		void __iomem *ControllerBaseAddress = Controller->BaseAddress;
		unsigned long flags;

		@@ -5493,7 +5493,7 @@ static irqreturn_t DAC960_PD_InterruptHandler(int IRQ_Channel,
		static irqreturn_t DAC960_P_InterruptHandler(int IRQ_Channel,
		void *DeviceIdentifier)
		{
		DAC960_Controller_T Controller = (DAC960_Controller_T ) DeviceIdentifier;
		DAC960_Controller_T *Controller = DeviceIdentifier;
		void __iomem *ControllerBaseAddress = Controller->BaseAddress;
		unsigned long flags;