Commit c7bec5ab authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Various drivers' irq handlers: kill dead code, needless casts 



- Eliminate casts to/from void*

- Eliminate checks for conditions that never occur.  These typically
  fall into two classes:

	1) Checking for 'dev_id == NULL', then it is never called with
	NULL as an argument.

	2) Checking for invalid irq number, when the only caller (the
	system) guarantees the irq handler is called with the proper
	'irq' number argument.

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent c31f28e7

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;

drivers/cdrom/mcdx.c

+0 −4
Original line number Diff line number Diff line
@@ -850,10 +850,6 @@ static irqreturn_t mcdx_intr(int irq, void *dev_id) 
	struct s_drive_stuff *stuffp = dev_id;

	unsigned char b;



	if (stuffp == NULL) {

		xwarn("mcdx: no device for intr %d\n", irq);

		return IRQ_NONE;

	}

#ifdef AK2

	if (!stuffp->busy && stuffp->pending)

		stuffp->int_err = 1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE