BUG_ON() Conversion in drivers/block/
Subsystems (16)
PATCH 1/1 BUG_ON() Conversion in drivers/block/
hi,
this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away.
drivers/block/cciss.c renamed from drivers/block/cciss.c.orig +1 -2
@@ -2361,8 +2361,7 @@ queue:if (!creq) goto startio; -if (creq->nr_phys_segments >MAXSGENTRIES ) -BUG (); +BUG_ON (creq->nr_phys_segments >MAXSGENTRIES );if (( c =cmd_alloc (h,1 )) ==NULL ) goto full;
drivers/block/cciss_scsi.c renamed from drivers/block/cciss_scsi.c.orig +1 -1
@@ -1316,7 +1316,7 @@ cciss_scsi_queue_command (struct scsi_cm cp->Request.Timeout =0 ;memset (cp->Request.CDB,0 ,sizeof (cp->Request.CDB)); -if (cmd->cmd_len >sizeof (cp->Request.CDB))BUG (); +BUG_ON (cmd->cmd_len >sizeof (cp->Request.CDB)); cp->Request.CDBLen = cmd->cmd_len;memcpy (cp->Request.CDB, cmd->cmnd, cmd->cmd_len); cp->Request.Type.Type =TYPE_CMD ;
drivers/block/cpqarray.c renamed from drivers/block/cpqarray.c.orig +1 -2
@@ -910,8 +910,7 @@ queue_next:if (!creq) goto startio; -if (creq->nr_phys_segments >SG_MAX ) -BUG (); +BUG_ON (creq->nr_phys_segments >SG_MAX );if ((c =cmd_alloc (h,1 )) ==NULL ) goto startio;
drivers/block/DAC960.c renamed from drivers/block/DAC960.c.orig +1 -2
@@ -229,8 +229,7 @@ static void *slice_dma_loaf(struct dma_lvoid *cpu_end = loaf->cpu_free + len;void *cpu_addr = loaf->cpu_free; -if (cpu_end > loaf->cpu_base + loaf->length) -BUG (); +BUG_ON (cpu_end > loaf->cpu_base + loaf->length); *dma_handle = loaf->dma_free; loaf->cpu_free = cpu_end; loaf->dma_free += len;
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
PATCH 1/1 BUG_ON() Conversion in drivers/ide/
hi,
this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away.
drivers/ide/ide.c renamed from drivers/ide/ide.c.orig +1 -2
@@ -1367,8 +1367,7 @@ int generic_ide_ioctl(ide_drive_t *driveide_abort (drive,"drive reset" ); -if (HWGROUP (drive)->handler) -BUG (); +BUG_ON (HWGROUP (drive)->handler);/* Ensure nothing gets queued after we drop the lock. Reset will clear the busy */
drivers/ide/ide-cd.c renamed from drivers/ide/ide-cd.c.orig +1 -2
@@ -1721,8 +1721,7 @@ static ide_startstop_t cdrom_newpc_intr( } } -if (HWGROUP (drive)->handler !=NULL ) -BUG (); +BUG_ON (HWGROUP (drive)->handler !=NULL );ide_set_handler (drive, cdrom_newpc_intr, rq->timeout,NULL );return ide_started;
drivers/ide/ide-dma.c renamed from drivers/ide/ide-dma.c.orig +2 -4
@@ -206,8 +206,7 @@ int ide_build_sglist(ide_drive_t *drive,ide_hwif_t *hwif =HWIF (drive);struct scatterlist *sg = hwif->sg_table; -if ((rq->flags &REQ_DRIVE_TASKFILE ) && rq->nr_sectors >256 ) -BUG (); +BUG_ON ((rq->flags &REQ_DRIVE_TASKFILE ) && rq->nr_sectors >256 );ide_map_sg (drive, rq);
@@ -947,8 +946,7 @@ void ide_setup_dma (ide_hwif_t *hwif, un }printk ("\n" ); -if (!(hwif->dma_master)) -BUG (); +BUG_ON (!(hwif->dma_master)); }EXPORT_SYMBOL_GPL (ide_setup_dma);
drivers/ide/ide-floppy.c renamed from drivers/ide/ide-floppy.c.orig +4 -8
@@ -897,8 +897,7 @@ static ide_startstop_t idefloppy_pc_intr"to send us more data than expected " "- discarding data\n");idefloppy_discard_data (drive,bcount.all); -if (HWGROUP (drive)->handler !=NULL ) -BUG (); +BUG_ON (HWGROUP (drive)->handler !=NULL ); ide_set_handler(drive, &idefloppy_pc_intr, IDEFLOPPY_WAIT_CMD,
@@ -931,8 +930,7 @@ static ide_startstop_t idefloppy_pc_intr pc->actually_transferred += bcount.all; pc->current_position += bcount.all; -if (HWGROUP (drive)->handler !=NULL ) -BUG (); +BUG_ON (HWGROUP (drive)->handler !=NULL );ide_set_handler (drive, &idefloppy_pc_intr,IDEFLOPPY_WAIT_CMD ,NULL );/* And set the interrupt handler again */ return ide_started; }
@@ -959,8 +957,7 @@ static ide_startstop_t idefloppy_transfe "issuing a packet command\n");return ide_do_reset (drive); } -if (HWGROUP (drive)->handler !=NULL ) -BUG (); +BUG_ON (HWGROUP (drive)->handler !=NULL );/* Set the interrupt routine */ ide_set_handler (drive, &idefloppy_pc_intr,IDEFLOPPY_WAIT_CMD ,NULL );/* Send the actual packet */
@@ -1016,8 +1013,7 @@ static ide_startstop_t idefloppy_transfe* 40 and 50msec work well. idefloppy_pc_intr will not be actually * used until after the packet is moved in about 50 msec. */ -if (HWGROUP (drive)->handler !=NULL ) -BUG (); +BUG_ON (HWGROUP (drive)->handler !=NULL ); ide_set_handler(drive, &idefloppy_pc_intr, /* service routine for packet command */ floppy->ticks, /* wait this long before "failing" */
drivers/ide/ide-iops.c renamed from drivers/ide/ide-iops.c.orig +4 -8
@@ -939,8 +939,7 @@ void ide_execute_command(ide_drive_t *drspin_lock_irqsave (&ide_lock, flags); -if (hwgroup->handler) -BUG (); +BUG_ON (hwgroup->handler); hwgroup->handler = handler; hwgroup->expiry = expiry; hwgroup->timer.expires = jiffies + timeout;
@@ -981,8 +980,7 @@ static ide_startstop_t atapi_reset_pollfprintk ("%s: ATAPI reset complete\n" , drive->name); }else {if (time_before (jiffies, hwgroup->poll_timeout)) { -if (HWGROUP (drive)->handler !=NULL ) -BUG (); +BUG_ON (HWGROUP (drive)->handler !=NULL );ide_set_handler (drive, &atapi_reset_pollfunc,HZ /20 ,NULL );/* continue polling */ return ide_started;
@@ -1021,8 +1019,7 @@ static ide_startstop_t reset_pollfunc (iif (!OK_STAT (tmp = hwif->INB (IDE_STATUS_REG ),0 ,BUSY_STAT )) {if (time_before (jiffies, hwgroup->poll_timeout)) { -if (HWGROUP (drive)->handler !=NULL ) -BUG (); +BUG_ON (HWGROUP (drive)->handler !=NULL );ide_set_handler (drive, &reset_pollfunc,HZ /20 ,NULL );/* continue polling */ return ide_started;
@@ -1138,8 +1135,7 @@ static ide_startstop_t do_reset1 (ide_dr hwgroup =HWGROUP (drive);/* We must not reset with running handlers */ -if (hwgroup->handler !=NULL ) -BUG (); +BUG_ON (hwgroup->handler !=NULL );/* For an ATAPI device, first try an ATAPI SRST. */ if (drive->media != ide_disk && !do_not_try_atapi) {
drivers/ide/ide-lib.c renamed from drivers/ide/ide-lib.c.orig +1 -2
@@ -164,8 +164,7 @@ u8 ide_rate_filter (u8 mode, u8 speed)// printk("%s: mode 0x%02x, speed 0x%02x\n", __FUNCTION__, mode, speed); /* So that we remember to update this if new modes appear */ -if (mode >4 ) -BUG (); +BUG_ON (mode >4 );return min (speed, speed_max[mode]);#else /* !CONFIG_BLK_DEV_IDEDMA */ return min (speed, (u8 )XFER_PIO_4 );
drivers/ide/ide-taskfile.c renamed from drivers/ide/ide-taskfile.c.orig +1 -2
@@ -195,8 +195,7 @@ ide_startstop_t set_geometry_intr (ide_dif (stat & (ERR_STAT |DRQ_STAT ))return ide_error (drive,"set_geometry_intr" , stat); -if (HWGROUP (drive)->handler !=NULL ) -BUG (); +BUG_ON (HWGROUP (drive)->handler !=NULL );ide_set_handler (drive, &set_geometry_intr,WAIT_WORSTCASE ,NULL );return ide_started; }
drivers/ide/pci/trm290.c renamed from drivers/ide/pci/trm290.c.orig +1 -2
@@ -183,8 +183,7 @@ static void trm290_ide_dma_exec_cmd(ide_ {ide_hwif_t *hwif =HWIF (drive); -if (HWGROUP (drive)->handler !=NULL )/* paranoia check */ -BUG (); +BUG_ON (HWGROUP (drive)->handler !=NULL );/* paranoia check */ ide_set_handler (drive, &ide_dma_intr,WAIT_CMD ,NULL );/* issue cmd to drive */ hwif->OUTB (command,IDE_COMMAND_REG );
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
PATCH 1/1 BUG_ON() Conversion in drivers/media/
In reply to Eric Sesterhenn / snakebytehi,
this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away.
drivers/media/video/saa7134/saa7134-alsa.c renamed from drivers/media/video/saa7134/saa7134-alsa.c.orig +1 -2
@@ -306,8 +306,7 @@ static int dsp_buffer_init(struct saa713static int dsp_buffer_free (struct saa7134_dev *dev) { -if (!dev->dmasound.blksize) -BUG (); +BUG_ON (!dev->dmasound.blksize);videobuf_dma_free (&dev->dmasound.dma);
drivers/media/video/saa7134/saa7134-oss.c renamed from drivers/media/video/saa7134/saa7134-oss.c.orig +2 -4
@@ -84,8 +84,7 @@ static int dsp_buffer_init(struct saa713 {int err; -if (!dev->dmasound.bufsize) -BUG (); +BUG_ON (!dev->dmasound.bufsize);videobuf_dma_init (&dev->dmasound.dma); err =videobuf_dma_init_kernel (&dev->dmasound.dma,PCI_DMA_FROMDEVICE , (dev->dmasound.bufsize +PAGE_SIZE ) >>PAGE_SHIFT );
@@ -96,8 +95,7 @@ static int dsp_buffer_init(struct saa713static int dsp_buffer_free (struct saa7134_dev *dev) { -if (!dev->dmasound.blksize) -BUG (); +BUG_ON (!dev->dmasound.blksize);videobuf_dma_free (&dev->dmasound.dma); dev->dmasound.blocks =0 ; dev->dmasound.blksize =0 ;
drivers/media/video/bttv-risc.c renamed from drivers/media/video/bttv-risc.c.orig +1 -2
@@ -507,8 +507,7 @@ bttv_risc_hook(struct bttv *btv, int slovoid bttv_dma_free (struct bttv *btv,struct bttv_buffer *buf) { -if (in_interrupt ()) -BUG (); +BUG_ON (in_interrupt ());videobuf_waiton (&buf->vb,0 ,0 );videobuf_dma_pci_unmap (btv->c.pci, &buf->vb.dma);videobuf_dma_free (&buf->vb.dma);
drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c renamed from drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c.orig +1 -2
@@ -689,8 +689,7 @@ static void ttusb_process_frame(struct tmemcpy (ttusb->muxpack + ttusb->muxpack_ptr, data, avail); ttusb->muxpack_ptr += avail; -if (ttusb->muxpack_ptr >264 ) -BUG (); +BUG_ON (ttusb->muxpack_ptr >264 ); data += avail; len -= avail;/* determine length */
drivers/media/dvb/ttpci/av7110.c renamed from drivers/media/dvb/ttpci/av7110.c.orig +2 -4
@@ -1088,11 +1088,9 @@ static int dvb_get_stc(struct dmx_demuxstruct av7110 *av7110;/* pointer casting paranoia... */ -if (!demux) -BUG (); +BUG_ON (!demux); dvbdemux = (struct dvb_demux *) demux->priv; -if (!dvbdemux) -BUG (); +BUG_ON (!dvbdemux); av7110 = (struct av7110 *) dvbdemux->priv;dprintk (4 ,"%p\n" , av7110);
drivers/media/common/saa7146_fops.c renamed from drivers/media/common/saa7146_fops.c.orig +2 -4
@@ -37,8 +37,7 @@ void saa7146_res_free(struct saa7146_fhstruct saa7146_dev *dev = fh->dev;struct saa7146_vv *vv = dev->vv_data; -if ((fh->resources & bits) != bits) -BUG (); +BUG_ON ((fh->resources & bits) != bits);down (&dev->lock); fh->resources &= ~bits;
@@ -55,8 +54,7 @@ void saa7146_dma_free(struct saa7146_dev {DEB_EE (("dev:%p, buf:%p\n" ,dev,buf)); -if (in_interrupt ()) -BUG (); +BUG_ON (in_interrupt ());videobuf_waiton (&buf->vb,0 ,0 );videobuf_dma_pci_unmap (dev->pci, &buf->vb.dma);
drivers/media/common/saa7146_core.c renamed from drivers/media/common/saa7146_core.c.orig +1 -2
@@ -116,8 +116,7 @@ static struct scatterlist* vmalloc_to_sg pg =vmalloc_to_page (virt);if (NULL == pg) goto err; -if (PageHighMem (pg)) -BUG (); +BUG_ON (PageHighMem (pg)); sglist[i].page = pg; sglist[i].length =PAGE_SIZE ; }
drivers/media/video/video-buf.c renamed from drivers/media/video/video-buf.c.orig +1 -2
@@ -59,8 +59,7 @@ videobuf_vmalloc_to_sg(unsigned char *vi pg =vmalloc_to_page (virt);if (NULL == pg) goto err; -if (PageHighMem (pg)) -BUG (); +BUG_ON (PageHighMem (pg)); sglist[i].page = pg; sglist[i].length =PAGE_SIZE ; }
drivers/media/video/cx88/cx88-core.c renamed from drivers/media/video/cx88/cx88-core.c.orig +1 -2
@@ -215,8 +215,7 @@ int cx88_risc_stopper(struct pci_dev *pcvoid cx88_free_buffer (struct pci_dev *pci,struct cx88_buffer *buf) { -if (in_interrupt ()) -BUG (); +BUG_ON (in_interrupt ());videobuf_waiton (&buf->vb,0 ,0 );videobuf_dma_pci_unmap (pci, &buf->vb.dma);videobuf_dma_free (&buf->vb.dma);
drivers/media/video/cx88/cx88-video.c renamed from drivers/media/video/cx88/cx88-video.c.orig +1 -2
@@ -366,8 +366,7 @@ staticvoid res_free (struct cx8800_dev *dev,struct cx8800_fh *fh,unsigned int bits) {struct cx88_core *core = dev->core; -if ((fh->resources & bits) != bits) -BUG (); +BUG_ON ((fh->resources & bits) != bits);down (&core->lock); fh->resources &= ~bits;
drivers/media/video/saa7134/saa7134-video.c renamed from drivers/media/video/saa7134/saa7134-video.c.orig +1 -2
@@ -489,8 +489,7 @@ int res_locked(struct saa7134_dev *dev,static void res_free (struct saa7134_dev *dev,struct saa7134_fh *fh,unsigned int bits) { -if ((fh->resources & bits) != bits) -BUG (); +BUG_ON ((fh->resources & bits) != bits);down (&dev->lock); fh->resources &= ~bits;
drivers/media/video/saa7134/saa7134-core.c renamed from drivers/media/video/saa7134/saa7134-core.c.orig +1 -2
@@ -251,8 +251,7 @@ void saa7134_pgtable_free(struct pci_devvoid saa7134_dma_free (struct saa7134_dev *dev,struct saa7134_buf *buf) { -if (in_interrupt ()) -BUG (); +BUG_ON (in_interrupt ());videobuf_waiton (&buf->vb,0 ,0 );videobuf_dma_pci_unmap (dev->pci, &buf->vb.dma);
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
PATCH 1/1 BUG_ON() Conversion in drivers/parisc/
In reply to Eric Sesterhenn / snakebytehi,
this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away.
drivers/parisc/sba_iommu.c renamed from drivers/parisc/sba_iommu.c.orig +3 -7
@@ -1722,9 +1722,7 @@ printk("sba_hw_init(): mem_boot 0x%x 0x% sba_dev->chip_resv.start =PCI_F_EXTEND |0xfef00000UL ; sba_dev->chip_resv.end =PCI_F_EXTEND | (0xff000000UL -1 ) ; err =request_resource (&iomem_resource, &(sba_dev->chip_resv)); -if (err <0 ) { -BUG (); - } +BUG_ON (err <0 ); }else if (IS_PLUTO (sba_dev->iodc)) {int err;
@@ -2155,8 +2153,7 @@ void sba_directed_lmmio(struct parisc_deint i;int rope = (pci_hba->hw_path & (ROPES_PER_IOC -1 ));/* rope # */ -if ((t!=HPHW_IOA ) && (t!=HPHW_BCPORT )) -BUG (); +BUG_ON ((t!=HPHW_IOA ) && (t!=HPHW_BCPORT )); r->start = r->end =0 ;
@@ -2198,8 +2195,7 @@ void sba_distributed_lmmio(struct pariscint base, size;int rope = (pci_hba->hw_path & (ROPES_PER_IOC -1 ));/* rope # */ -if ((t!=HPHW_IOA ) && (t!=HPHW_BCPORT )) -BUG (); +BUG_ON ((t!=HPHW_IOA ) && (t!=HPHW_BCPORT )); r->start = r->end =0 ;
drivers/parisc/superio.c renamed from drivers/parisc/superio.c.orig +3 -4
@@ -154,8 +154,8 @@ superio_init(struct pci_dev *pcidev)if (sio->suckyio_irq_enabled)return ; -if (!pdev)BUG (); -if (!sio->usb_pdev)BUG (); +BUG_ON (!pdev); +BUG_ON (!sio->usb_pdev);/* use the IRQ iosapic found for USB INT D... */ pdev->irq = sio->usb_pdev->irq;
@@ -471,8 +471,7 @@ superio_probe(struct pci_dev *dev, const dev->subsystem_vendor, dev->subsystem_device, dev->class); -if (!sio->suckyio_irq_enabled) -BUG ();/* Enabled by PCI_FIXUP_FINAL */ +BUG_ON (!sio->suckyio_irq_enabled);/* Enabled by PCI_FIXUP_FINAL */ if (dev->device ==PCI_DEVICE_ID_NS_87560_LIO ) {/* Function 1 */ superio_parport_init ();
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
PATCH 1/1 BUG_ON() Conversion in drivers/video/
In reply to Eric Sesterhenn / snakebytehi,
this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away.
drivers/video/bw2.c renamed from drivers/video/bw2.c.orig +1 -2
@@ -327,8 +327,7 @@ static void bw2_init_one(struct sbus_dev } else#else { -if (!sdev) -BUG (); +BUG_ON (!sdev); all->par.physbase = sdev->reg_addrs[0 ].phys_addr; resp = &sdev->resource[0 ];sbusfb_fill_var (&all->info.var, (sdev ? sdev->prom_node :0 ),1 );
drivers/video/ffb.c renamed from drivers/video/ffb.c.orig +1 -2
@@ -466,8 +466,7 @@ static void ffb_fillrect(struct fb_infounsigned long flags;u32 fg; -if (rect->rop !=ROP_COPY && rect->rop !=ROP_XOR ) -BUG (); +BUG_ON (rect->rop !=ROP_COPY && rect->rop !=ROP_XOR ); fg = ((u32 *)info->pseudo_palette)[rect->color];
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
PATCH 1/1 BUG_ON() Conversion in drivers/net/
In reply to Eric Sesterhenn / snakebytehi,
this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away.
drivers/net/e1000/e1000_main.c renamed from drivers/net/e1000/e1000_main.c.orig +1 -2
@@ -3419,8 +3419,7 @@ e1000_clean(struct net_device *poll_dev,while (poll_dev != &adapter->polling_netdev[i]) { i++; -if (unlikely (i == adapter->num_rx_queues)) -BUG (); +BUG_ON (i == adapter->num_rx_queues); }if (likely (adapter->num_tx_queues ==1 )) {
drivers/net/tg3.c renamed from drivers/net/tg3.c.orig +6 -12
@@ -1038,8 +1038,7 @@ static void tg3_frob_aux_power(struct tgstruct net_device *dev_peer; dev_peer =pci_get_drvdata (tp->pdev_peer); -if (!dev_peer) -BUG (); +BUG_ON (!dev_peer); tp_peer =netdev_priv (dev_peer); }
@@ -2913,9 +2912,7 @@ static void tg3_tx(struct tg3 *tp)struct sk_buff *skb = ri->skb;int i; -if (unlikely (skb ==NULL )) -BUG (); - +BUG_ON (skb ==NULL ); pci_unmap_single(tp->pdev, pci_unmap_addr(ri, mapping), skb_headlen(skb),
@@ -2926,12 +2923,10 @@ static void tg3_tx(struct tg3 *tp) sw_idx =NEXT_TX (sw_idx);for (i =0 ; i <skb_shinfo (skb)->nr_frags; i++) { -if (unlikely (sw_idx == hw_idx)) -BUG (); +BUG_ON (sw_idx == hw_idx); ri = &tp->tx_buffers[sw_idx]; -if (unlikely (ri->skb !=NULL )) -BUG (); +BUG_ON (ri->skb !=NULL ); pci_unmap_page(tp->pdev, pci_unmap_addr(ri, mapping),
@@ -4715,9 +4710,8 @@ static int tg3_halt_cpu(struct tg3 *tp, {int i; -if (offset ==TX_CPU_BASE && - (tp->tg3_flags2 &TG3_FLG2_5705_PLUS )) -BUG (); +BUG_ON (offset ==TX_CPU_BASE && + (tp->tg3_flags2 &TG3_FLG2_5705_PLUS ));if (offset ==RX_CPU_BASE ) {for (i =0 ; i <10000 ; i++) {
drivers/net/eql.c renamed from drivers/net/eql.c.orig +1 -2
@@ -203,8 +203,7 @@ static int eql_open(struct net_device *dprintk (KERN_INFO "%s: remember to turn off Van-Jacobson compression on " "your slave devices.\n" , dev->name); -if (!list_empty (&eql->queue.all_slaves)) -BUG (); +BUG_ON (!list_empty (&eql->queue.all_slaves)); eql->min_slaves =1 ; eql->max_slaves =EQL_DEFAULT_MAX_SLAVES ;/* 4 usually... */
drivers/net/yellowfin.c renamed from drivers/net/yellowfin.c.orig +1 -2
@@ -1441,8 +1441,7 @@ static void __devexit yellowfin_remove_ostruct net_device *dev =pci_get_drvdata (pdev);struct yellowfin_private *np; -if (!dev) -BUG (); +BUG_ON (!dev); np =netdev_priv (dev); pci_free_consistent(pdev, STATUS_TOTAL_SIZE, np->tx_status,
drivers/net/ne2k-pci.c renamed from drivers/net/ne2k-pci.c.orig +1 -3
@@ -645,9 +645,7 @@ static void __devexit ne2k_pci_remove_on {struct net_device *dev =pci_get_drvdata (pdev); -if (!dev) -BUG (); - +BUG_ON (!dev);unregister_netdev (dev);release_region (dev->base_addr,NE_IO_EXTENT );free_netdev (dev);
drivers/net/irda/sa1100_ir.c renamed from drivers/net/irda/sa1100_ir.c.orig +1 -2
@@ -695,8 +695,7 @@ static int sa1100_irda_hard_xmit(struct/* * We must not be transmitting... */ -if (si->txskb) -BUG (); +BUG_ON (si->txskb);netif_stop_queue (dev);
drivers/net/chelsio/sge.c renamed from drivers/net/chelsio/sge.c.orig +1 -2
@@ -1093,8 +1093,7 @@ static int process_responses(struct adapif (likely (e->DataValid)) {struct freelQ *fl = &sge->freelQ[e->FreelistQid]; -if (unlikely (!e->Sop || !e->Eop)) -BUG (); +BUG_ON (!e->Sop || !e->Eop);if (unlikely (e->Offload))unexpected_offload (adapter, fl);else
drivers/net/b44.c renamed from drivers/net/b44.c.orig +1 -2
@@ -608,8 +608,7 @@ static void b44_tx(struct b44 *bp)struct ring_info *rp = &bp->tx_buffers[cons];struct sk_buff *skb = rp->skb; -if (unlikely (skb ==NULL )) -BUG (); + BUG_ON(unlikely(skb == NULL); pci_unmap_single(bp->pdev, pci_unmap_addr(rp, mapping),
drivers/net/arcnet/arcnet.c renamed from drivers/net/arcnet/arcnet.c.orig +1 -2
@@ -761,8 +761,7 @@ irqreturn_t arcnet_interrupt(int irq, voBUGMSG (D_DURING ,"in arcnet_interrupt\n" ); lp = dev->priv; -if (!lp) -BUG (); +BUG_ON (!lp);spin_lock (&lp->lock);
drivers/net/tokenring/madgemc.c renamed from drivers/net/tokenring/madgemc.c.orig +1 -2
@@ -735,8 +735,7 @@ static int __devexit madgemc_remove(strustruct net_local *tp;struct card_info *card; -if (!dev) -BUG (); +BUG_ON (!dev); tp = dev->priv; card = tp->tmspriv;
drivers/net/tokenring/abyss.c renamed from drivers/net/tokenring/abyss.c.orig +1 -2
@@ -438,8 +438,7 @@ static void __devexit abyss_detach (stru {struct net_device *dev =pci_get_drvdata (pdev); -if (!dev) -BUG (); +BUG_ON (!dev);unregister_netdev (dev);release_region (dev->base_addr-0x10 ,ABYSS_IO_EXTENT );free_irq (dev->irq, dev);
drivers/net/arcnet/arcnet.c renamed from drivers/net/arcnet/arcnet.c.orig +1 -2
@@ -761,8 +761,7 @@ irqreturn_t arcnet_interrupt(int irq, voBUGMSG (D_DURING ,"in arcnet_interrupt\n" ); lp = dev->priv; -if (!lp) -BUG (); +BUG_ON (!lp);spin_lock (&lp->lock);
drivers/net/ns83820.c renamed from drivers/net/ns83820.c.orig +1 -2
@@ -567,8 +567,7 @@ static inline int ns83820_add_rx_skb(str#endif sg = dev->rx_info.descs + (next_empty *DESC_SIZE ); -if (unlikely (NULL != dev->rx_info.skbs[next_empty])) -BUG (); +BUG_ON (NULL != dev->rx_info.skbs[next_empty]); dev->rx_info.skbs[next_empty] = skb; dev->rx_info.next_empty = (next_empty +1 ) %NR_RX_DESC ;
drivers/net/wireless/ipw2200.c renamed from drivers/net/wireless/ipw2200.c.orig +3 -6
@@ -5603,8 +5603,7 @@ static void ipw_adhoc_create(struct ipw_case IEEE80211_52GHZ_BAND : network->mode =IEEE_A ; i =ipw_channel_to_index (priv->ieee, priv->channel); -if (i ==-1 ) -BUG (); +BUG_ON (i ==-1 );if (geo->a[i].flags &IEEE80211_CH_PASSIVE_ONLY ) {IPW_WARNING ("Overriding invalid channel\n" ); priv->channel = geo->a[0 ].channel;
@@ -5617,8 +5616,7 @@ static void ipw_adhoc_create(struct ipw_else network->mode =IEEE_B ; i =ipw_channel_to_index (priv->ieee, priv->channel); -if (i ==-1 ) -BUG (); +BUG_ON (i ==-1 );if (geo->bg[i].flags &IEEE80211_CH_PASSIVE_ONLY ) {IPW_WARNING ("Overriding invalid channel\n" ); priv->channel = geo->bg[0 ].channel;
@@ -6756,8 +6754,7 @@ static int ipw_qos_association(struct ipswitch (priv->ieee->iw_mode) {case IW_MODE_ADHOC : -if (!(network->capability &WLAN_CAPABILITY_IBSS )) -BUG (); +BUG_ON (!(network->capability &WLAN_CAPABILITY_IBSS )); qos_data = &ibss_data;break ;
drivers/net/8139cp.c renamed from drivers/net/8139cp.c.orig +4 -8
@@ -539,8 +539,7 @@ rx_status_loop:unsigned buflen; skb = cp->rx_skb[rx_tail].skb; -if (!skb) -BUG (); +BUG_ON (!skb); desc = &cp->rx_ring[rx_tail]; status =le32_to_cpu (desc->opts1);
@@ -723,8 +722,7 @@ static void cp_tx (struct cp_private *cpbreak ; skb = cp->tx_skb[tx_tail].skb; -if (!skb) -BUG (); +BUG_ON (!skb);pci_unmap_single (cp->pdev, cp->tx_skb[tx_tail].mapping, cp->tx_skb[tx_tail].len,PCI_DMA_TODEVICE );
@@ -1545,8 +1543,7 @@ static void cp_get_ethtool_stats (struct tmp_stats[i++] =le16_to_cpu (nic_stats->tx_abort); tmp_stats[i++] =le16_to_cpu (nic_stats->tx_underrun); tmp_stats[i++] = cp->cp_stats.rx_frags; -if (i !=CP_NUM_STATS ) -BUG (); +BUG_ON (i !=CP_NUM_STATS );pci_free_consistent (cp->pdev,sizeof (*nic_stats), nic_stats, dma); }
@@ -1851,8 +1848,7 @@ static void cp_remove_one (struct pci_destruct net_device *dev =pci_get_drvdata (pdev);struct cp_private *cp =netdev_priv (dev); -if (!dev) -BUG (); +BUG_ON (!dev);unregister_netdev (dev);iounmap (cp->regs);if (cp->wol_enabled)pci_set_power_state (pdev,PCI_D0 );
drivers/net/starfire.c renamed from drivers/net/starfire.c.orig +1 -2
@@ -2090,8 +2090,7 @@ static void __devexit starfire_remove_onstruct net_device *dev =pci_get_drvdata (pdev);struct netdev_private *np =netdev_priv (dev); -if (!dev) -BUG (); +BUG_ON (!dev);unregister_netdev (dev);
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
PATCH 1/1 BUG_ON() Conversion in drivers/mtd/
In reply to Eric Sesterhenn / snakebytehi,
this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away.
drivers/mtd/mtd_blkdevs.c renamed from drivers/mtd/mtd_blkdevs.c.orig +1 -2
@@ -450,8 +450,7 @@ int deregister_mtd_blktrans(struct mtd_bkfree (tr->blkcore_priv); -if (!list_empty (&tr->devs)) -BUG (); +BUG_ON (!list_empty (&tr->devs));return 0 ; }
drivers/mtd/maps/dilnetpc.c renamed from drivers/mtd/maps/dilnetpc.c.orig +4 -4
@@ -218,8 +218,8 @@ static void dnp_set_vpp(struct map_info {if (--vpp_counter ==0 )setcsc (CSC_RBWR ,getcsc (CSC_RBWR ) |0x4 ); -else if (vpp_counter <0 ) -BUG (); +else +BUG_ON (vpp_counter <0 ); }spin_unlock_irq (&dnpc_spin); }
@@ -240,8 +240,8 @@ static void adnp_set_vpp(struct map_info {if (--vpp_counter ==0 )setcsc (CSC_RBWR ,getcsc (CSC_RBWR ) |0x8 ); -else if (vpp_counter <0 ) -BUG (); +else +BUG_ON (vpp_counter <0 ); }spin_unlock_irq (&dnpc_spin); }
drivers/mtd/mtdconcat.c renamed from drivers/mtd/mtdconcat.c.orig +2 -4
@@ -477,8 +477,7 @@ static int concat_erase(struct mtd_info }/* must never happen since size limit has been verified above */ -if (i >= concat->num_subdev) -BUG (); +BUG_ON (i >= concat->num_subdev);/* now do the erase: */ err =0 ;
@@ -500,8 +499,7 @@ static int concat_erase(struct mtd_infoif ((err =concat_dev_erase (subdev, erase))) {/* sanity check: should never happen since * block alignment has been checked above */ -if (err == -EINVAL ) -BUG (); +BUG_ON (err == -EINVAL );if (erase->fail_addr !=0xffffffff ) instr->fail_addr = erase->fail_addr + offset;break ;
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
Re: [KJ] [Patch] BUG_ON() Conversion in drivers/net/
In reply to Eric Sesterhenn / snakebytedrivers/net/b44.c 2006-02-07 21:46:11.000000000 +0100 static void b44_tx(struct b44 *bp) · line 614
Quoted 12 lines · Eric Sesterhenn
drivers/net/b44.c 2006-02-07 21:46:11.000000000 +0100 renamed from drivers/net/b44.c.orig 2006-02-07 21:46:01.000000000 +0100 +1
-2@@ -608,8 +608,7 @@ static void b44_tx(struct b44 *bp) struct ring_info *rp = &bp->tx_buffers[cons]; struct sk_buff *skb = rp->skb; - if (unlikely(skb = NULL)) - BUG(); + BUG_ON(unlikely(skb = NULL); pci_unmap_single(bp->pdev, pci_unmap_addr(rp, mapping),
I think unlikely can be removed here.
BR Håkon Løvdal
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
Re: [KJ] [Patch] BUG_ON() Conversion in drivers/net/
In reply to Eric Sesterhenn / snakebytehi,
Quoted 1 line
I think unlikely can be removed here.
thanks, shouldnt do trivial patches after a day of studying :)
Here is the updated version.
drivers/net/e1000/e1000_main.c renamed from drivers/net/e1000/e1000_main.c.orig +1 -2
@@ -3419,8 +3419,7 @@ e1000_clean(struct net_device *poll_dev,while (poll_dev != &adapter->polling_netdev[i]) { i++; -if (unlikely (i == adapter->num_rx_queues)) -BUG (); +BUG_ON (i == adapter->num_rx_queues); }if (likely (adapter->num_tx_queues ==1 )) {
drivers/net/tg3.c renamed from drivers/net/tg3.c.orig +6 -12
@@ -1038,8 +1038,7 @@ static void tg3_frob_aux_power(struct tgstruct net_device *dev_peer; dev_peer =pci_get_drvdata (tp->pdev_peer); -if (!dev_peer) -BUG (); +BUG_ON (!dev_peer); tp_peer =netdev_priv (dev_peer); }
@@ -2913,9 +2912,7 @@ static void tg3_tx(struct tg3 *tp)struct sk_buff *skb = ri->skb;int i; -if (unlikely (skb ==NULL )) -BUG (); - +BUG_ON (skb ==NULL ); pci_unmap_single(tp->pdev, pci_unmap_addr(ri, mapping), skb_headlen(skb),
@@ -2926,12 +2923,10 @@ static void tg3_tx(struct tg3 *tp) sw_idx =NEXT_TX (sw_idx);for (i =0 ; i <skb_shinfo (skb)->nr_frags; i++) { -if (unlikely (sw_idx == hw_idx)) -BUG (); +BUG_ON (sw_idx == hw_idx); ri = &tp->tx_buffers[sw_idx]; -if (unlikely (ri->skb !=NULL )) -BUG (); +BUG_ON (ri->skb !=NULL ); pci_unmap_page(tp->pdev, pci_unmap_addr(ri, mapping),
@@ -4715,9 +4710,8 @@ static int tg3_halt_cpu(struct tg3 *tp, {int i; -if (offset ==TX_CPU_BASE && - (tp->tg3_flags2 &TG3_FLG2_5705_PLUS )) -BUG (); +BUG_ON (offset ==TX_CPU_BASE && + (tp->tg3_flags2 &TG3_FLG2_5705_PLUS ));if (offset ==RX_CPU_BASE ) {for (i =0 ; i <10000 ; i++) {
drivers/net/eql.c renamed from drivers/net/eql.c.orig +1 -2
@@ -203,8 +203,7 @@ static int eql_open(struct net_device *dprintk (KERN_INFO "%s: remember to turn off Van-Jacobson compression on " "your slave devices.\n" , dev->name); -if (!list_empty (&eql->queue.all_slaves)) -BUG (); +BUG_ON (!list_empty (&eql->queue.all_slaves)); eql->min_slaves =1 ; eql->max_slaves =EQL_DEFAULT_MAX_SLAVES ;/* 4 usually... */
drivers/net/yellowfin.c renamed from drivers/net/yellowfin.c.orig +1 -2
@@ -1441,8 +1441,7 @@ static void __devexit yellowfin_remove_ostruct net_device *dev =pci_get_drvdata (pdev);struct yellowfin_private *np; -if (!dev) -BUG (); +BUG_ON (!dev); np =netdev_priv (dev); pci_free_consistent(pdev, STATUS_TOTAL_SIZE, np->tx_status,
drivers/net/ne2k-pci.c renamed from drivers/net/ne2k-pci.c.orig +1 -3
@@ -645,9 +645,7 @@ static void __devexit ne2k_pci_remove_on {struct net_device *dev =pci_get_drvdata (pdev); -if (!dev) -BUG (); - +BUG_ON (!dev);unregister_netdev (dev);release_region (dev->base_addr,NE_IO_EXTENT );free_netdev (dev);
drivers/net/irda/sa1100_ir.c renamed from drivers/net/irda/sa1100_ir.c.orig +1 -2
@@ -695,8 +695,7 @@ static int sa1100_irda_hard_xmit(struct/* * We must not be transmitting... */ -if (si->txskb) -BUG (); +BUG_ON (si->txskb);netif_stop_queue (dev);
drivers/net/chelsio/sge.c renamed from drivers/net/chelsio/sge.c.orig +1 -2
@@ -1093,8 +1093,7 @@ static int process_responses(struct adapif (likely (e->DataValid)) {struct freelQ *fl = &sge->freelQ[e->FreelistQid]; -if (unlikely (!e->Sop || !e->Eop)) -BUG (); +BUG_ON (!e->Sop || !e->Eop);if (unlikely (e->Offload))unexpected_offload (adapter, fl);else
drivers/net/b44.c renamed from drivers/net/b44.c.orig +1 -2
@@ -608,8 +608,7 @@ static void b44_tx(struct b44 *bp)struct ring_info *rp = &bp->tx_buffers[cons];struct sk_buff *skb = rp->skb; -if (unlikely (skb ==NULL )) -BUG (); +BUG_ON (skb ==NULL ); pci_unmap_single(bp->pdev, pci_unmap_addr(rp, mapping),
drivers/net/arcnet/arcnet.c renamed from drivers/net/arcnet/arcnet.c.orig +1 -2
@@ -761,8 +761,7 @@ irqreturn_t arcnet_interrupt(int irq, voBUGMSG (D_DURING ,"in arcnet_interrupt\n" ); lp = dev->priv; -if (!lp) -BUG (); +BUG_ON (!lp);spin_lock (&lp->lock);
drivers/net/tokenring/madgemc.c renamed from drivers/net/tokenring/madgemc.c.orig +1 -2
@@ -735,8 +735,7 @@ static int __devexit madgemc_remove(strustruct net_local *tp;struct card_info *card; -if (!dev) -BUG (); +BUG_ON (!dev); tp = dev->priv; card = tp->tmspriv;
drivers/net/tokenring/abyss.c renamed from drivers/net/tokenring/abyss.c.orig +1 -2
@@ -438,8 +438,7 @@ static void __devexit abyss_detach (stru {struct net_device *dev =pci_get_drvdata (pdev); -if (!dev) -BUG (); +BUG_ON (!dev);unregister_netdev (dev);release_region (dev->base_addr-0x10 ,ABYSS_IO_EXTENT );free_irq (dev->irq, dev);
drivers/net/arcnet/arcnet.c renamed from drivers/net/arcnet/arcnet.c.orig +1 -2
@@ -761,8 +761,7 @@ irqreturn_t arcnet_interrupt(int irq, voBUGMSG (D_DURING ,"in arcnet_interrupt\n" ); lp = dev->priv; -if (!lp) -BUG (); +BUG_ON (!lp);spin_lock (&lp->lock);
drivers/net/ns83820.c renamed from drivers/net/ns83820.c.orig +1 -2
@@ -567,8 +567,7 @@ static inline int ns83820_add_rx_skb(str#endif sg = dev->rx_info.descs + (next_empty *DESC_SIZE ); -if (unlikely (NULL != dev->rx_info.skbs[next_empty])) -BUG (); +BUG_ON (NULL != dev->rx_info.skbs[next_empty]); dev->rx_info.skbs[next_empty] = skb; dev->rx_info.next_empty = (next_empty +1 ) %NR_RX_DESC ;
drivers/net/wireless/ipw2200.c renamed from drivers/net/wireless/ipw2200.c.orig +3 -6
@@ -5603,8 +5603,7 @@ static void ipw_adhoc_create(struct ipw_case IEEE80211_52GHZ_BAND : network->mode =IEEE_A ; i =ipw_channel_to_index (priv->ieee, priv->channel); -if (i ==-1 ) -BUG (); +BUG_ON (i ==-1 );if (geo->a[i].flags &IEEE80211_CH_PASSIVE_ONLY ) {IPW_WARNING ("Overriding invalid channel\n" ); priv->channel = geo->a[0 ].channel;
@@ -5617,8 +5616,7 @@ static void ipw_adhoc_create(struct ipw_else network->mode =IEEE_B ; i =ipw_channel_to_index (priv->ieee, priv->channel); -if (i ==-1 ) -BUG (); +BUG_ON (i ==-1 );if (geo->bg[i].flags &IEEE80211_CH_PASSIVE_ONLY ) {IPW_WARNING ("Overriding invalid channel\n" ); priv->channel = geo->bg[0 ].channel;
@@ -6756,8 +6754,7 @@ static int ipw_qos_association(struct ipswitch (priv->ieee->iw_mode) {case IW_MODE_ADHOC : -if (!(network->capability &WLAN_CAPABILITY_IBSS )) -BUG (); +BUG_ON (!(network->capability &WLAN_CAPABILITY_IBSS )); qos_data = &ibss_data;break ;
drivers/net/8139cp.c renamed from drivers/net/8139cp.c.orig +4 -8
@@ -539,8 +539,7 @@ rx_status_loop:unsigned buflen; skb = cp->rx_skb[rx_tail].skb; -if (!skb) -BUG (); +BUG_ON (!skb); desc = &cp->rx_ring[rx_tail]; status =le32_to_cpu (desc->opts1);
@@ -723,8 +722,7 @@ static void cp_tx (struct cp_private *cpbreak ; skb = cp->tx_skb[tx_tail].skb; -if (!skb) -BUG (); +BUG_ON (!skb);pci_unmap_single (cp->pdev, cp->tx_skb[tx_tail].mapping, cp->tx_skb[tx_tail].len,PCI_DMA_TODEVICE );
@@ -1545,8 +1543,7 @@ static void cp_get_ethtool_stats (struct tmp_stats[i++] =le16_to_cpu (nic_stats->tx_abort); tmp_stats[i++] =le16_to_cpu (nic_stats->tx_underrun); tmp_stats[i++] = cp->cp_stats.rx_frags; -if (i !=CP_NUM_STATS ) -BUG (); +BUG_ON (i !=CP_NUM_STATS );pci_free_consistent (cp->pdev,sizeof (*nic_stats), nic_stats, dma); }
@@ -1851,8 +1848,7 @@ static void cp_remove_one (struct pci_destruct net_device *dev =pci_get_drvdata (pdev);struct cp_private *cp =netdev_priv (dev); -if (!dev) -BUG (); +BUG_ON (!dev);unregister_netdev (dev);iounmap (cp->regs);if (cp->wol_enabled)pci_set_power_state (pdev,PCI_D0 );
drivers/net/starfire.c renamed from drivers/net/starfire.c.orig +1 -2
@@ -2090,8 +2090,7 @@ static void __devexit starfire_remove_onstruct net_device *dev =pci_get_drvdata (pdev);struct netdev_private *np =netdev_priv (dev); -if (!dev) -BUG (); +BUG_ON (!dev);unregister_netdev (dev);
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
PATCH 1/1 BUG_ON() Conversion in drivers/scsi
In reply to Eric Sesterhenn / snakebytehi,
this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away.
drivers/scsi/arm/queue.c renamed from drivers/scsi/arm/queue.c.orig +2 -4
@@ -118,8 +118,7 @@ int __queue_add(Queue_t *queue, Scsi_Cmnlist_del (l); q =list_entry (l, QE_t, list); -if (BAD_MAGIC (q,QUEUE_MAGIC_FREE )) -BUG (); +BUG_ON (BAD_MAGIC (q,QUEUE_MAGIC_FREE ));SET_MAGIC (q,QUEUE_MAGIC_USED ); q->SCpnt = SCpnt;
@@ -144,8 +143,7 @@ static Scsi_Cmnd *__queue_remove(Queue_t*/ list_del (ent); q =list_entry (ent, QE_t, list); -if (BAD_MAGIC (q,QUEUE_MAGIC_USED )) -BUG (); +BUG_ON (BAD_MAGIC (q,QUEUE_MAGIC_USED ));SET_MAGIC (q,QUEUE_MAGIC_FREE );list_add (ent, &queue->free);
drivers/scsi/ibmmca.c renamed from drivers/scsi/ibmmca.c.orig +1 -2
@@ -2243,8 +2243,7 @@ static int __ibmmca_host_reset(Scsi_Cmndint host_index;unsigned long imm_command; -if (cmd ==NULL ) -BUG (); +BUG_ON (cmd ==NULL ); ticks =IM_RESET_DELAY *HZ ; shpnt = cmd->device->host;
drivers/scsi/aacraid/aachba.c renamed from drivers/scsi/aacraid/aachba.c.orig +5 -10
@@ -388,8 +388,7 @@ static void get_container_name_callback( scsicmd = (struct scsi_cmnd *) context;dprintk ((KERN_DEBUG "get_container_name_callback[cpu %d]: t = %ld.\n" ,smp_processor_id (), jiffies)); -if (fibptr ==NULL ) -BUG (); +BUG_ON (fibptr ==NULL ); get_name_reply = (struct aac_get_name_resp *)fib_data (fibptr);/* Failure is irrelevant, using default value instead */
@@ -945,8 +944,7 @@ static void io_callback(void *context, s smp_processor_id(), (unsigned long long)lba, jiffies); } -if (fibptr ==NULL ) -BUG (); +BUG_ON (fibptr ==NULL );if (scsicmd->use_sg) pci_unmap_sg(dev->pdev,
@@ -1081,8 +1079,7 @@ static int aac_read(struct scsi_cmnd * saac_build_sgraw (scsicmd, &readcmd->sg); fibsize =sizeof (struct aac_raw_io ) + ((le32_to_cpu (readcmd->sg.count) -1 ) *sizeof (struct sgentryraw )); -if (fibsize > (dev->max_fib_size -sizeof (struct aac_fibhdr ))) -BUG (); +BUG_ON (fibsize > (dev->max_fib_size -sizeof (struct aac_fibhdr )));/* * Now send the Fib to the adapter */
@@ -1248,8 +1245,7 @@ static int aac_write(struct scsi_cmnd *aac_build_sgraw (scsicmd, &writecmd->sg); fibsize =sizeof (struct aac_raw_io ) + ((le32_to_cpu (writecmd->sg.count) -1 ) *sizeof (struct sgentryraw )); -if (fibsize > (dev->max_fib_size -sizeof (struct aac_fibhdr ))) -BUG (); +BUG_ON (fibsize > (dev->max_fib_size -sizeof (struct aac_fibhdr )));/* * Now send the Fib to the adapter */
@@ -1891,8 +1887,7 @@ static void aac_srb_callback(void *conte scsicmd = (struct scsi_cmnd *) context; dev = (struct aac_dev *)scsicmd->device->host->hostdata; -if (fibptr ==NULL ) -BUG (); +BUG_ON (fibptr ==NULL ); srbreply = (struct aac_srb_reply *)fib_data (fibptr);
drivers/scsi/aacraid/commsup.c renamed from drivers/scsi/aacraid/commsup.c.orig +4 -6
@@ -228,9 +228,8 @@ void fib_init(struct fib *fibptr)static void fib_dealloc (struct fib * fibptr) {struct hw_fib *hw_fib = fibptr->hw_fib; -if (hw_fib->header.StructType !=FIB_MAGIC ) -BUG (); - hw_fib->header.XferState =0 ; +BUG_ON (hw_fib->header.StructType !=FIB_MAGIC ); + hw_fib->header.XferState =0 ; }/*
@@ -531,9 +530,8 @@ int fib_send(u16 command, struct fib * f } }else down (&fibptr->event_wait); -if (fibptr->done ==0 ) -BUG (); - +BUG_ON (fibptr->done ==0 ); +if ((fibptr->flags &FIB_CONTEXT_FLAG_TIMED_OUT )){return -ETIMEDOUT ; }else {
drivers/scsi/53c700.h renamed from drivers/scsi/53c700.h.orig +2 -4
@@ -472,8 +472,7 @@ NCR_700_readl(struct Scsi_Host *host, __ioread32 (hostdata->base + reg);#if 1 /* sanity check the register */ -if ((reg &0x3 ) !=0 ) -BUG (); +BUG_ON ((reg &0x3 ) !=0 );#endif return value;
@@ -496,8 +495,7 @@ NCR_700_writel(__u32 value, struct Scsi_#if 1 /* sanity check the register */ -if ((reg &0x3 ) !=0 ) -BUG (); +BUG_ON ((reg &0x3 ) !=0 );#endif bEBus ? iowrite32be(value, hostdata->base + reg):
drivers/scsi/megaraid.c renamed from drivers/scsi/megaraid.c.orig +1 -1
@@ -1827,7 +1827,7 @@ mega_build_sglist(adapter_t *adapter, sc scb->dma_type =MEGA_SGLIST ; -if ( sgcnt > adapter->sglen )BUG (); +BUG_ON ( sgcnt > adapter->sglen ); *len =0 ;
drivers/scsi/ide-scsi.c renamed from drivers/scsi/ide-scsi.c.orig +2 -4
@@ -599,8 +599,7 @@ static ide_startstop_t idescsi_transfer_ "issuing a packet command\n");return ide_do_reset (drive); } -if (HWGROUP (drive)->handler !=NULL ) -BUG (); +BUG_ON (HWGROUP (drive)->handler !=NULL );/* Set the interrupt routine */ ide_set_handler (drive, &idescsi_pc_intr,get_timeout (pc), idescsi_expiry);/* Send the actual packet */
@@ -690,8 +689,7 @@ static ide_startstop_t idescsi_issue_pcset_bit (PC_DMA_OK , &pc->flags);if (test_bit (IDESCSI_DRQ_INTERRUPT , &scsi->flags)) { -if (HWGROUP (drive)->handler !=NULL ) -BUG (); +BUG_ON (HWGROUP (drive)->handler !=NULL );ide_set_handler (drive, &idescsi_transfer_pc,get_timeout (pc), idescsi_expiry);/* Issue the packet command */
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
PATCH 1/1 BUG_ON() Conversion in drivers/char
In reply to Eric Sesterhenn / snakebytehi,
this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away.
drivers/char/tty_io.c renamed from drivers/char/tty_io.c.orig +4 -7
@@ -538,14 +538,12 @@ void tty_ldisc_put(int disc)struct tty_ldisc *ld;unsigned long flags; -if (disc <N_TTY || disc >=NR_LDISCS ) -BUG (); +BUG_ON (disc <N_TTY || disc >=NR_LDISCS );spin_lock_irqsave (&tty_ldisc_lock, flags); ld = &tty_ldiscs[disc]; -if (ld->refcount ==0 ) -BUG (); - ld->refcount --; +BUG_ON (ld->refcount ==0 ); + ld->refcount--;module_put (ld->owner);spin_unlock_irqrestore (&tty_ldisc_lock, flags); }
@@ -640,8 +638,7 @@ void tty_ldisc_deref(struct tty_ldisc *l {unsigned long flags; -if (ld ==NULL ) -BUG (); +BUG_ON (ld ==NULL );spin_lock_irqsave (&tty_ldisc_lock, flags);if (ld->refcount ==0 )
drivers/char/epca.c renamed from drivers/char/epca.c.orig +1 -2
@@ -486,8 +486,7 @@ static void pc_close(struct tty_struct * }/* End channel is open more than once */ /* Port open only once go ahead with shutdown & reset */ -if (ch->count <0 ) -BUG (); +BUG_ON (ch->count <0 );/* --------------------------------------------------------------- Let the rest of the driver know the channel is being closed.
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
PATCH 1/1 BUG_ON() Conversion in drivers/isdn
In reply to Eric Sesterhenn / snakebytehi,
this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away.
drivers/isdn/hisax/hisax_isac.c renamed from drivers/isdn/hisax/hisax_isac.c.orig +3 -6
@@ -476,12 +476,10 @@ static void isac_fill_fifo(struct isac *unsigned char cmd;u_char *ptr; -if (!isac->tx_skb) -BUG (); +BUG_ON (!isac->tx_skb); count = isac->tx_skb->len; -if (count <=0 ) -BUG (); +BUG_ON (count <=0 );DBG (DBG_IRQ ,"count %d" , count);
@@ -859,8 +857,7 @@ void isac_d_l2l1(struct hisax_if *hisax_dev_kfree_skb (skb);break ; } -if (isac->tx_skb) -BUG (); +BUG_ON (isac->tx_skb); isac->tx_skb = skb;isac_fill_fifo (isac);
drivers/isdn/hisax/st5481_b.c renamed from drivers/isdn/hisax/st5481_b.c.orig +1 -3
@@ -356,9 +356,7 @@ void st5481_b_l2l1(struct hisax_if *ifc,switch (pr) {case PH_DATA |REQUEST : -if (bcs->b_out.tx_skb) -BUG (); - +BUG_ON (bcs->b_out.tx_skb); bcs->b_out.tx_skb = skb;break ;case PH_ACTIVATE |REQUEST :
drivers/isdn/hisax/hisax_fcpcipnp.c renamed from drivers/isdn/hisax/hisax_fcpcipnp.c.orig +2 -5
@@ -387,8 +387,7 @@ static void hdlc_fill_fifo(struct fritz_DBG (0x40 ,"hdlc_fill_fifo" ); -if (skb->len ==0 ) -BUG (); +BUG_ON (skb->len ==0 ); bcs->ctrl.sr.cmd &= ~HDLC_CMD_XME ;if (bcs->tx_skb->len > bcs->fifo_size) {
@@ -630,9 +629,7 @@ static void fritz_b_l2l1(struct hisax_ifswitch (pr) {case PH_DATA |REQUEST : -if (bcs->tx_skb) -BUG (); - +BUG_ON (bcs->tx_skb); bcs->tx_skb = skb;DBG_SKB (1 , skb);hdlc_fill_fifo (bcs);
drivers/isdn/hisax/st5481_d.c renamed from drivers/isdn/hisax/st5481_d.c.orig +1 -3
@@ -596,9 +596,7 @@ void st5481_d_l2l1(struct hisax_if *hisabreak ;case PH_DATA |REQUEST :DBG (2 ,"PH_DATA REQUEST len %d" , skb->len); -if (adapter->d_out.tx_skb) -BUG (); - +BUG_ON (adapter->d_out.tx_skb); adapter->d_out.tx_skb = skb;FsmEvent (&adapter->d_out.fsm,EV_DOUT_START_XMIT ,NULL );break ;
drivers/isdn/i4l/isdn_ppp.c renamed from drivers/isdn/i4l/isdn_ppp.c.orig +2 -4
@@ -973,8 +973,7 @@ void isdn_ppp_receive(isdn_net_dev * netint slot;int proto; -if (net_dev->local->master) -BUG ();// we're called with the master device always +BUG_ON (net_dev->local->master);// we're called with the master device always slot = lp->ppp_slot;if (slot <0 || slot >=ISDN_MAX_CHANNELS ) {
@@ -2526,8 +2525,7 @@ static struct sk_buff *isdn_ppp_decompreprintk (KERN_DEBUG "ippp: no decompressor defined!\n" );return skb; } -if (!stat)// if we have a compressor, stat has been set as well -BUG (); +BUG_ON (!stat);// if we have a compressor, stat has been set as well if ((master && *proto ==PPP_COMP ) || (!master && *proto ==PPP_COMPFRAG ) ) {// compressed packets are compressed by their protocol type
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
Alexey Dobriyan
AppliedRe: [KJ] [Patch] BUG_ON() Conversion in drivers/net/
In reply to Eric Sesterhenn / snakebyteApplied. Some of these BUG()s can be removed because there would an Oops few lines below anyway.
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
Alexey Dobriyan
AppliedRe: [KJ] [Patch] BUG_ON() Conversion in drivers/scsi
In reply to Eric Sesterhenn / snakebyteQuoted 2 lines · Eric Sesterhenn
this changes
if()BUG(); constructs toBUG_ON()which is cleaner, containsunlikely()and can better optimized away.
Applied.
drivers/scsi/ibmmca.c static int __ibmmca_host_reset(Scsi_Cmnd · line 2249
Quoted 12 lines
drivers/scsi/ibmmca.c renamed from drivers/scsi/ibmmca.c.orig +1
-2@@ -2243,8 +2243,7 @@ static int __ibmmca_host_reset(Scsi_Cmndint host_index;unsigned long imm_command; -if (cmd ==NULL ) -BUG (); +BUG_ON (cmd ==NULL ); ticks =IM_RESET_DELAY *HZ ; shpnt = cmd->device->host;
This one can be removed.
Quoted 23 lines
drivers/scsi/aacraid/aachba.c renamed from drivers/scsi/aacraid/aachba.c.orig +2
-4@@ -388,8 +388,7 @@ static void get_container_name_callback( scsicmd = (struct scsi_cmnd *) context;dprintk ((KERN_DEBUG "get_container_name_callback[cpu %d]: t = %ld.\n" ,smp_processor_id (), jiffies)); -if (fibptr ==NULL ) -BUG (); +BUG_ON (fibptr ==NULL ); get_name_reply = (struct aac_get_name_resp *)fib_data (fibptr);@@ -945,8 +944,7 @@ static void io_callback(void *context, s smp_processor_id(), (unsigned long long)lba, jiffies); } -if (fibptr ==NULL ) -BUG (); +BUG_ON (fibptr ==NULL );if (scsicmd->use_sg) pci_unmap_sg(dev->pdev,
drivers/scsi/aacraid/aachba.c static void aac_srb_callback(void *conte · line 1892
Quoted 8 lines
drivers/scsi/aacraid/aachba.c renamed from drivers/scsi/aacraid/aachba.c.orig +1
-2@@ -1891,8 +1887,7 @@ static void aac_srb_callback(void *conte scsicmd = (struct scsi_cmnd *) context; dev = (struct aac_dev *)scsicmd->device->host->hostdata; -if (fibptr ==NULL ) -BUG (); +BUG_ON (fibptr ==NULL ); srbreply = (struct aac_srb_reply *)fib_data (fibptr);
Almost certainly these too. Haven't checked deeply.
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors