Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c7bec5aba52392aa8d675b8722735caf4a8b7265

Authored by Jeff Garzik
1 parent c31f28e778
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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: Jeff Garzik <jeff@garzik.org>

Showing 35 changed files with 59 additions and 98 deletions Side-by-side Diff

drivers/atm/ambassador.c
Diff comments   View file @ c7bec5a
... ... @@ -862,14 +862,9 @@
862 862 /********** interrupt handling **********/
863 863  
864 864 static irqreturn_t interrupt_handler(int irq, void *dev_id) {
865   - amb_dev * dev = (amb_dev *) dev_id;
  865 + amb_dev * dev = dev_id;
866 866  
867 867 PRINTD (DBG_IRQ|DBG_FLOW, "interrupt_handler: %p", dev_id);
868   -
869   - if (!dev_id) {
870   - PRINTD (DBG_IRQ|DBG_ERR, "irq with NULL dev_id: %d", irq);
871   - return IRQ_NONE;
872   - }
873 868  
874 869 {
875 870 u32 interrupt = rd_plain (dev, offsetof(amb_mem, interrupt));
drivers/atm/horizon.c
Diff comments   View file @ c7bec5a
... ... @@ -1389,15 +1389,6 @@
1389 1389  
1390 1390 PRINTD (DBG_FLOW, "interrupt_handler: %p", dev_id);
1391 1391  
1392   - if (!dev_id) {
1393   - PRINTD (DBG_IRQ|DBG_ERR, "irq with NULL dev_id: %d", irq);
1394   - return IRQ_NONE;
1395   - }
1396   - if (irq != dev->irq) {
1397   - PRINTD (DBG_IRQ|DBG_ERR, "irq mismatch: %d", irq);
1398   - return IRQ_NONE;
1399   - }
1400   -
1401 1392 // definitely for us
1402 1393 irq_ok = 0;
1403 1394 while ((int_source = rd_regl (dev, INT_SOURCE_REG_OFF)
... ... @@ -1892,10 +1892,8 @@
1892 1892  
1893 1893 static irqreturn_t lanai_int(int irq, void *devid)
1894 1894 {
1895   - struct lanai_dev *lanai = (struct lanai_dev *) devid;
  1895 + struct lanai_dev *lanai = devid;
1896 1896 u32 reason;
1897   -
1898   - (void) irq; /* unused variables */
1899 1897  
1900 1898 #ifdef USE_POWERDOWN
1901 1899 /*
drivers/block/DAC960.c
Diff comments   View file @ c7bec5a
... ... @@ -5254,7 +5254,7 @@
5254 5254 static irqreturn_t DAC960_GEM_InterruptHandler(int IRQ_Channel,
5255 5255 void *DeviceIdentifier)
5256 5256 {
5257   - DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier;
  5257 + DAC960_Controller_T *Controller = DeviceIdentifier;
5258 5258 void __iomem *ControllerBaseAddress = Controller->BaseAddress;
5259 5259 DAC960_V2_StatusMailbox_T *NextStatusMailbox;
5260 5260 unsigned long flags;
... ... @@ -5295,7 +5295,7 @@
5295 5295 static irqreturn_t DAC960_BA_InterruptHandler(int IRQ_Channel,
5296 5296 void *DeviceIdentifier)
5297 5297 {
5298   - DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier;
  5298 + DAC960_Controller_T *Controller = DeviceIdentifier;
5299 5299 void __iomem *ControllerBaseAddress = Controller->BaseAddress;
5300 5300 DAC960_V2_StatusMailbox_T *NextStatusMailbox;
5301 5301 unsigned long flags;
... ... @@ -5337,7 +5337,7 @@
5337 5337 static irqreturn_t DAC960_LP_InterruptHandler(int IRQ_Channel,
5338 5338 void *DeviceIdentifier)
5339 5339 {
5340   - DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier;
  5340 + DAC960_Controller_T *Controller = DeviceIdentifier;
5341 5341 void __iomem *ControllerBaseAddress = Controller->BaseAddress;
5342 5342 DAC960_V2_StatusMailbox_T *NextStatusMailbox;
5343 5343 unsigned long flags;
... ... @@ -5379,7 +5379,7 @@
5379 5379 static irqreturn_t DAC960_LA_InterruptHandler(int IRQ_Channel,
5380 5380 void *DeviceIdentifier)
5381 5381 {
5382   - DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier;
  5382 + DAC960_Controller_T *Controller = DeviceIdentifier;
5383 5383 void __iomem *ControllerBaseAddress = Controller->BaseAddress;
5384 5384 DAC960_V1_StatusMailbox_T *NextStatusMailbox;
5385 5385 unsigned long flags;
... ... @@ -5417,7 +5417,7 @@
5417 5417 static irqreturn_t DAC960_PG_InterruptHandler(int IRQ_Channel,
5418 5418 void *DeviceIdentifier)
5419 5419 {
5420   - DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier;
  5420 + DAC960_Controller_T *Controller = DeviceIdentifier;
5421 5421 void __iomem *ControllerBaseAddress = Controller->BaseAddress;
5422 5422 DAC960_V1_StatusMailbox_T *NextStatusMailbox;
5423 5423 unsigned long flags;
... ... @@ -5455,7 +5455,7 @@
5455 5455 static irqreturn_t DAC960_PD_InterruptHandler(int IRQ_Channel,
5456 5456 void *DeviceIdentifier)
5457 5457 {
5458   - DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier;
  5458 + DAC960_Controller_T *Controller = DeviceIdentifier;
5459 5459 void __iomem *ControllerBaseAddress = Controller->BaseAddress;
5460 5460 unsigned long flags;
5461 5461  
... ... @@ -5493,7 +5493,7 @@
5493 5493 static irqreturn_t DAC960_P_InterruptHandler(int IRQ_Channel,
5494 5494 void *DeviceIdentifier)
5495 5495 {
5496   - DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier;
  5496 + DAC960_Controller_T *Controller = DeviceIdentifier;
5497 5497 void __iomem *ControllerBaseAddress = Controller->BaseAddress;
5498 5498 unsigned long flags;
5499 5499  
drivers/cdrom/mcdx.c
Diff comments   View file @ c7bec5a
... ... @@ -850,10 +850,6 @@
850 850 struct s_drive_stuff *stuffp = dev_id;
851 851 unsigned char b;
852 852  
853   - if (stuffp == NULL) {
854   - xwarn("mcdx: no device for intr %d\n", irq);
855   - return IRQ_NONE;
856   - }
857 853 #ifdef AK2
858 854 if (!stuffp->busy && stuffp->pending)
859 855 stuffp->int_err = 1;
drivers/char/rio/func.h
Diff comments   View file @ c7bec5a
... ... @@ -88,7 +88,7 @@
88 88  
89 89 /* riointr.c */
90 90 void RIOTxEnable(char *);
91   -void RIOServiceHost(struct rio_info *, struct Host *, int);
  91 +void RIOServiceHost(struct rio_info *, struct Host *);
92 92 int riotproc(struct rio_info *, struct ttystatics *, int, int);
93 93  
94 94 /* rioparam.c */
drivers/char/rio/rio_linux.c
Diff comments   View file @ c7bec5a
... ... @@ -368,7 +368,7 @@
368 368 struct Host *HostP;
369 369 func_enter();
370 370  
371   - HostP = (struct Host *) ptr; /* &p->RIOHosts[(long)ptr]; */
  371 + HostP = ptr; /* &p->RIOHosts[(long)ptr]; */
372 372 rio_dprintk(RIO_DEBUG_IFLOW, "rio: enter rio_interrupt (%d/%d)\n", irq, HostP->Ivec);
373 373  
374 374 /* AAargh! The order in which to do these things is essential and
... ... @@ -402,7 +402,7 @@
402 402 return IRQ_HANDLED;
403 403 }
404 404  
405   - RIOServiceHost(p, HostP, irq);
  405 + RIOServiceHost(p, HostP);
406 406  
407 407 rio_dprintk(RIO_DEBUG_IFLOW, "riointr() doing host %p type %d\n", ptr, HostP->Type);
408 408  
drivers/char/rio/riointr.c
Diff comments   View file @ c7bec5a
... ... @@ -181,7 +181,7 @@
181 181 static int RxIntr;
182 182 static int TxIntr;
183 183  
184   -void RIOServiceHost(struct rio_info *p, struct Host *HostP, int From)
  184 +void RIOServiceHost(struct rio_info *p, struct Host *HostP)
185 185 {
186 186 rio_spin_lock(&HostP->HostLock);
187 187 if ((HostP->Flags & RUN_STATE) != RC_RUNNING) {
drivers/char/riscom8.c
Diff comments   View file @ c7bec5a
... ... @@ -559,11 +559,10 @@
559 559 int handled = 0;
560 560  
561 561 bp = IRQ_to_board[irq];
562   -
563   - if (!bp || !(bp->flags & RC_BOARD_ACTIVE)) {
  562 +
  563 + if (!(bp->flags & RC_BOARD_ACTIVE))
564 564 return IRQ_NONE;
565   - }
566   -
  565 +
567 566 while ((++loop < 16) && ((status = ~(rc_in(bp, RC_BSR))) &
568 567 (RC_BSR_TOUT | RC_BSR_TINT |
569 568 RC_BSR_MINT | RC_BSR_RINT))) {
drivers/char/specialix.c
Diff comments   View file @ c7bec5a
... ... @@ -912,7 +912,7 @@
912 912 spin_lock_irqsave(&bp->lock, flags);
913 913  
914 914 dprintk (SX_DEBUG_FLOW, "enter %s port %d room: %ld\n", __FUNCTION__, port_No(sx_get_port(bp, "INT")), SERIAL_XMIT_SIZE - sx_get_port(bp, "ITN")->xmit_cnt - 1);
915   - if (!bp || !(bp->flags & SX_BOARD_ACTIVE)) {
  915 + if (!(bp->flags & SX_BOARD_ACTIVE)) {
916 916 dprintk (SX_DEBUG_IRQ, "sx: False interrupt. irq %d.\n", irq);
917 917 spin_unlock_irqrestore(&bp->lock, flags);
918 918 func_exit();
drivers/media/video/zoran_device.c
Diff comments   View file @ c7bec5a
... ... @@ -1415,7 +1415,7 @@
1415 1415 struct zoran *zr;
1416 1416 unsigned long flags;
1417 1417  
1418   - zr = (struct zoran *) dev_id;
  1418 + zr = dev_id;
1419 1419 count = 0;
1420 1420  
1421 1421 if (zr->testing) {
drivers/pcmcia/at91_cf.c
Diff comments   View file @ c7bec5a
... ... @@ -66,7 +66,7 @@
66 66  
67 67 static irqreturn_t at91_cf_irq(int irq, void *_cf)
68 68 {
69   - struct at91_cf_socket *cf = (struct at91_cf_socket *) _cf;
  69 + struct at91_cf_socket *cf = _cf;
70 70  
71 71 if (irq == cf->board->det_pin) {
72 72 unsigned present = at91_cf_present(cf);
drivers/pcmcia/hd64465_ss.c
Diff comments   View file @ c7bec5a
... ... @@ -650,7 +650,7 @@
650 650 */
651 651 static int hs_irq_demux(int irq, void *dev)
652 652 {
653   - hs_socket_t *sp = (hs_socket_t *)dev;
  653 + hs_socket_t *sp = dev;
654 654 u_int cscr;
655 655  
656 656 DPRINTK("hs_irq_demux(irq=%d)\n", irq);
657 657  
... ... @@ -673,11 +673,10 @@
673 673  
674 674 static irqreturn_t hs_interrupt(int irq, void *dev)
675 675 {
676   - hs_socket_t *sp = (hs_socket_t *)dev;
  676 + hs_socket_t *sp = dev;
677 677 u_int events = 0;
678 678 u_int cscr;
679   -
680   -
  679 +
681 680 cscr = hs_in(sp, CSCR);
682 681  
683 682 DPRINTK("hs_interrupt, cscr=%04x\n", cscr);
drivers/scsi/NCR53c406a.c
Diff comments   View file @ c7bec5a
... ... @@ -168,7 +168,7 @@
168 168 };
169 169  
170 170 /* Static function prototypes */
171   -static void NCR53c406a_intr(int, void *);
  171 +static void NCR53c406a_intr(void *);
172 172 static irqreturn_t do_NCR53c406a_intr(int, void *);
173 173 static void chip_init(void);
174 174 static void calc_port_addr(void);
... ... @@ -685,7 +685,7 @@
685 685 return;
686 686 }
687 687  
688   - NCR53c406a_intr(0, NULL, NULL);
  688 + NCR53c406a_intr(NULL);
689 689 }
690 690 #endif
691 691  
692 692  
... ... @@ -767,12 +767,12 @@
767 767 struct Scsi_Host *dev = dev_id;
768 768  
769 769 spin_lock_irqsave(dev->host_lock, flags);
770   - NCR53c406a_intr(0, dev_id);
  770 + NCR53c406a_intr(dev_id);
771 771 spin_unlock_irqrestore(dev->host_lock, flags);
772 772 return IRQ_HANDLED;
773 773 }
774 774  
775   -static void NCR53c406a_intr(int unused, void *dev_id)
  775 +static void NCR53c406a_intr(void *dev_id)
776 776 {
777 777 DEB(unsigned char fifo_size;
778 778 )
drivers/scsi/aha152x.c
Diff comments   View file @ c7bec5a
... ... @@ -759,12 +759,7 @@
759 759  
760 760 static irqreturn_t swintr(int irqno, void *dev_id)
761 761 {
762   - struct Scsi_Host *shpnt = (struct Scsi_Host *)dev_id;
763   -
764   - if (!shpnt) {
765   - printk(KERN_ERR "aha152x: catched software interrupt %d for unknown controller.\n", irqno);
766   - return IRQ_NONE;
767   - }
  762 + struct Scsi_Host *shpnt = dev_id;
768 763  
769 764 HOSTDATA(shpnt)->swint++;
770 765  
drivers/scsi/aic7xxx_old.c
Diff comments   View file @ c7bec5a
... ... @@ -6345,12 +6345,12 @@
6345 6345 * SCSI controller interrupt handler.
6346 6346 *-F*************************************************************************/
6347 6347 static void
6348   -aic7xxx_isr(int irq, void *dev_id)
  6348 +aic7xxx_isr(void *dev_id)
6349 6349 {
6350 6350 struct aic7xxx_host *p;
6351 6351 unsigned char intstat;
6352 6352  
6353   - p = (struct aic7xxx_host *)dev_id;
  6353 + p = dev_id;
6354 6354  
6355 6355 /*
6356 6356 * Just a few sanity checks. Make sure that we have an int pending.
... ... @@ -6489,7 +6489,7 @@
6489 6489 p->flags |= AHC_IN_ISR;
6490 6490 do
6491 6491 {
6492   - aic7xxx_isr(irq, dev_id);
  6492 + aic7xxx_isr(dev_id);
6493 6493 } while ( (aic_inb(p, INTSTAT) & INT_PEND) );
6494 6494 aic7xxx_done_cmds_complete(p);
6495 6495 aic7xxx_run_waiting_queues(p);
... ... @@ -10377,7 +10377,7 @@
10377 10377  
10378 10378 hscb = scb->hscb;
10379 10379  
10380   - aic7xxx_isr(p->irq, (void *)p);
  10380 + aic7xxx_isr(p);
10381 10381 aic7xxx_done_cmds_complete(p);
10382 10382 /* If the command was already complete or just completed, then we didn't
10383 10383 * do a reset, return FAILED */
... ... @@ -10608,7 +10608,7 @@
10608 10608 else
10609 10609 return FAILED;
10610 10610  
10611   - aic7xxx_isr(p->irq, (void *)p);
  10611 + aic7xxx_isr(p);
10612 10612 aic7xxx_done_cmds_complete(p);
10613 10613 /* If the command was already complete or just completed, then we didn't
10614 10614 * do a reset, return FAILED */
... ... @@ -10863,7 +10863,7 @@
10863 10863  
10864 10864 while((aic_inb(p, INTSTAT) & INT_PEND) && !(p->flags & AHC_IN_ISR))
10865 10865 {
10866   - aic7xxx_isr(p->irq, p);
  10866 + aic7xxx_isr(p);
10867 10867 pause_sequencer(p);
10868 10868 }
10869 10869 aic7xxx_done_cmds_complete(p);
drivers/scsi/dc395x.c
Diff comments   View file @ c7bec5a
... ... @@ -1815,7 +1815,7 @@
1815 1815  
1816 1816 static irqreturn_t dc395x_interrupt(int irq, void *dev_id)
1817 1817 {
1818   - struct AdapterCtlBlk *acb = (struct AdapterCtlBlk *)dev_id;
  1818 + struct AdapterCtlBlk *acb = dev_id;
1819 1819 u16 scsi_status;
1820 1820 u8 dma_status;
1821 1821 irqreturn_t handled = IRQ_NONE;
drivers/scsi/qlogicfas408.c
Diff comments   View file @ c7bec5a
... ... @@ -405,10 +405,10 @@
405 405 * Interrupt handler
406 406 */
407 407  
408   -static void ql_ihandl(int irq, void *dev_id)
  408 +static void ql_ihandl(void *dev_id)
409 409 {
410 410 Scsi_Cmnd *icmd;
411   - struct Scsi_Host *host = (struct Scsi_Host *)dev_id;
  411 + struct Scsi_Host *host = dev_id;
412 412 struct qlogicfas408_priv *priv = get_priv_by_host(host);
413 413 int qbase = priv->qbase;
414 414 REG0;
... ... @@ -438,7 +438,7 @@
438 438 struct Scsi_Host *host = dev_id;
439 439  
440 440 spin_lock_irqsave(host->host_lock, flags);
441   - ql_ihandl(irq, dev_id);
  441 + ql_ihandl(dev_id);
442 442 spin_unlock_irqrestore(host->host_lock, flags);
443 443 return IRQ_HANDLED;
444 444 }
drivers/scsi/tmscsim.c
Diff comments   View file @ c7bec5a
... ... @@ -700,9 +700,9 @@
700 700  
701 701  
702 702 static irqreturn_t __inline__
703   -DC390_Interrupt(int irq, void *dev_id)
  703 +DC390_Interrupt(void *dev_id)
704 704 {
705   - struct dc390_acb *pACB = (struct dc390_acb*)dev_id;
  705 + struct dc390_acb *pACB = dev_id;
706 706 struct dc390_dcb *pDCB;
707 707 struct dc390_srb *pSRB;
708 708 u8 sstatus=0;
709 709  
... ... @@ -811,12 +811,12 @@
811 811 return IRQ_HANDLED;
812 812 }
813 813  
814   -static irqreturn_t do_DC390_Interrupt( int irq, void *dev_id)
  814 +static irqreturn_t do_DC390_Interrupt(int irq, void *dev_id)
815 815 {
816 816 irqreturn_t ret;
817 817 DEBUG1(printk (KERN_INFO "DC390: Irq (%i) caught: ", irq));
818 818 /* Locking is done in DC390_Interrupt */
819   - ret = DC390_Interrupt(irq, dev_id);
  819 + ret = DC390_Interrupt(dev_id);
820 820 DEBUG1(printk (".. IRQ returned\n"));
821 821 return ret;
822 822 }
drivers/scsi/ultrastor.c
Diff comments   View file @ c7bec5a
... ... @@ -287,7 +287,7 @@
287 287 };
288 288 #endif
289 289  
290   -static void ultrastor_interrupt(int, void *);
  290 +static void ultrastor_interrupt(void *);
291 291 static irqreturn_t do_ultrastor_interrupt(int, void *);
292 292 static inline void build_sg_list(struct mscp *, struct scsi_cmnd *SCpnt);
293 293  
... ... @@ -893,7 +893,7 @@
893 893  
894 894 spin_lock_irqsave(host->host_lock, flags);
895 895 /* FIXME: Ewww... need to think about passing host around properly */
896   - ultrastor_interrupt(0, NULL);
  896 + ultrastor_interrupt(NULL);
897 897 spin_unlock_irqrestore(host->host_lock, flags);
898 898 return SUCCESS;
899 899 }
... ... @@ -1039,7 +1039,7 @@
1039 1039 return 0;
1040 1040 }
1041 1041  
1042   -static void ultrastor_interrupt(int irq, void *dev_id)
  1042 +static void ultrastor_interrupt(void *dev_id)
1043 1043 {
1044 1044 unsigned int status;
1045 1045 #if ULTRASTOR_MAX_CMDS > 1
... ... @@ -1177,7 +1177,7 @@
1177 1177 struct Scsi_Host *dev = dev_id;
1178 1178  
1179 1179 spin_lock_irqsave(dev->host_lock, flags);
1180   - ultrastor_interrupt(irq, dev_id);
  1180 + ultrastor_interrupt(dev_id);
1181 1181 spin_unlock_irqrestore(dev->host_lock, flags);
1182 1182 return IRQ_HANDLED;
1183 1183 }
drivers/serial/68360serial.c
Diff comments   View file @ c7bec5a
... ... @@ -620,7 +620,7 @@
620 620 volatile struct smc_regs *smcp;
621 621 volatile struct scc_regs *sccp;
622 622  
623   - info = (ser_info_t *)dev_id;
  623 + info = dev_id;
624 624  
625 625 idx = PORT_NUM(info->state->smc_scc_num);
626 626 if (info->state->smc_scc_num & NUM_IS_SCC) {
drivers/serial/jsm/jsm_neo.c
Diff comments   View file @ c7bec5a
... ... @@ -1116,7 +1116,7 @@
1116 1116 */
1117 1117 static irqreturn_t neo_intr(int irq, void *voidbrd)
1118 1118 {
1119   - struct jsm_board *brd = (struct jsm_board *) voidbrd;
  1119 + struct jsm_board *brd = voidbrd;
1120 1120 struct jsm_channel *ch;
1121 1121 int port = 0;
1122 1122 int type = 0;
drivers/serial/mpc52xx_uart.c
Diff comments   View file @ c7bec5a
... ... @@ -512,18 +512,10 @@
512 512 static irqreturn_t
513 513 mpc52xx_uart_int(int irq, void *dev_id)
514 514 {
515   - struct uart_port *port = (struct uart_port *) dev_id;
  515 + struct uart_port *port = dev_id;
516 516 unsigned long pass = ISR_PASS_LIMIT;
517 517 unsigned int keepgoing;
518 518 unsigned short status;
519   -
520   - if ( irq != port->irq ) {
521   - printk( KERN_WARNING
522   - "mpc52xx_uart_int : " \
523   - "Received wrong int %d. Waiting for %d\n",
524   - irq, port->irq);
525   - return IRQ_NONE;
526   - }
527 519  
528 520 spin_lock(&port->lock);
529 521  
drivers/serial/netx-serial.c
Diff comments   View file @ c7bec5a
... ... @@ -247,7 +247,7 @@
247 247  
248 248 static irqreturn_t netx_int(int irq, void *dev_id)
249 249 {
250   - struct uart_port *port = (struct uart_port *)dev_id;
  250 + struct uart_port *port = dev_id;
251 251 unsigned long flags;
252 252 unsigned char status;
253 253  
drivers/serial/pxa.c
Diff comments   View file @ c7bec5a
... ... @@ -232,7 +232,7 @@
232 232 */
233 233 static inline irqreturn_t serial_pxa_irq(int irq, void *dev_id)
234 234 {
235   - struct uart_pxa_port *up = (struct uart_pxa_port *)dev_id;
  235 + struct uart_pxa_port *up = dev_id;
236 236 unsigned int iir, lsr;
237 237  
238 238 iir = serial_in(up, UART_IIR);
... ... @@ -401,7 +401,7 @@
401 401 static irqreturn_t ioc3_intr_io(int irq, void *arg)
402 402 {
403 403 unsigned long flags;
404   - struct ioc3_driver_data *idd = (struct ioc3_driver_data *)arg;
  404 + struct ioc3_driver_data *idd = arg;
405 405 int handled = 1, id;
406 406 unsigned int pending;
407 407  
drivers/spi/pxa2xx_spi.c
Diff comments   View file @ c7bec5a
... ... @@ -669,7 +669,7 @@
669 669  
670 670 static irqreturn_t ssp_int(int irq, void *dev_id)
671 671 {
672   - struct driver_data *drv_data = (struct driver_data *)dev_id;
  672 + struct driver_data *drv_data = dev_id;
673 673 void *reg = drv_data->ioaddr;
674 674  
675 675 if (!drv_data->cur_msg) {
sound/isa/gus/gusmax.c
Diff comments   View file @ c7bec5a
... ... @@ -107,7 +107,7 @@
107 107  
108 108 static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id)
109 109 {
110   - struct snd_gusmax *maxcard = (struct snd_gusmax *) dev_id;
  110 + struct snd_gusmax *maxcard = dev_id;
111 111 int loop, max = 5;
112 112 int handled = 0;
113 113  
sound/isa/gus/interwave.c
Diff comments   View file @ c7bec5a
... ... @@ -301,7 +301,7 @@
301 301  
302 302 static irqreturn_t snd_interwave_interrupt(int irq, void *dev_id)
303 303 {
304   - struct snd_interwave *iwcard = (struct snd_interwave *) dev_id;
  304 + struct snd_interwave *iwcard = dev_id;
305 305 int loop, max = 5;
306 306 int handled = 0;
307 307  
... ... @@ -1102,7 +1102,7 @@
1102 1102  
1103 1103 static irqreturn_t es1371_interrupt(int irq, void *dev_id)
1104 1104 {
1105   - struct es1371_state *s = (struct es1371_state *)dev_id;
  1105 + struct es1371_state *s = dev_id;
1106 1106 unsigned int intsrc, sctl;
1107 1107  
1108 1108 /* fastpath out, to ease interrupt sharing */
... ... @@ -372,7 +372,7 @@
372 372  
373 373 static irqreturn_t hal2_interrupt(int irq, void *dev_id)
374 374 {
375   - struct hal2_card *hal2 = (struct hal2_card*)dev_id;
  375 + struct hal2_card *hal2 = dev_id;
376 376 irqreturn_t ret = IRQ_NONE;
377 377  
378 378 /* decide what caused this interrupt */
sound/oss/i810_audio.c
Diff comments   View file @ c7bec5a
... ... @@ -1525,7 +1525,7 @@
1525 1525  
1526 1526 static irqreturn_t i810_interrupt(int irq, void *dev_id)
1527 1527 {
1528   - struct i810_card *card = (struct i810_card *)dev_id;
  1528 + struct i810_card *card = dev_id;
1529 1529 u32 status;
1530 1530  
1531 1531 spin_lock(&card->lock);
... ... @@ -435,7 +435,7 @@
435 435 static irqreturn_t mpuintr(int irq, void *dev_id)
436 436 {
437 437 struct mpu_config *devc;
438   - int dev = (int) dev_id;
  438 + int dev = (int)(unsigned long) dev_id;
439 439 int handled = 0;
440 440  
441 441 devc = &dev_conf[dev];
... ... @@ -2235,7 +2235,7 @@
2235 2235  
2236 2236 static irqreturn_t vwsnd_audio_intr(int irq, void *dev_id)
2237 2237 {
2238   - vwsnd_dev_t *devc = (vwsnd_dev_t *) dev_id;
  2238 + vwsnd_dev_t *devc = dev_id;
2239 2239 unsigned int status;
2240 2240  
2241 2241 DBGEV("(irq=%d, dev_id=0x%p)\n", irq, dev_id);
sound/pci/korg1212/korg1212.c
Diff comments   View file @ c7bec5a
... ... @@ -1124,9 +1124,6 @@
1124 1124 u32 doorbellValue;
1125 1125 struct snd_korg1212 *korg1212 = dev_id;
1126 1126  
1127   - if(irq != korg1212->irq)
1128   - return IRQ_NONE;
1129   -
1130 1127 doorbellValue = readl(korg1212->inDoorbellPtr);
1131 1128  
1132 1129 if (!doorbellValue)
... ... @@ -1139,7 +1136,6 @@
1139 1136 korg1212->irqcount++;
1140 1137  
1141 1138 korg1212->inIRQ++;
1142   -
1143 1139  
1144 1140 switch (doorbellValue) {
1145 1141 case K1212_DB_DSPDownloadDone: