Skip to content

Commit

Permalink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Browse files Browse the repository at this point in the history
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
  drivers/char/ftape/lowlevel/fdc-io.c: Correct a comment
  Kconfig help: MTD_JEDECPROBE already supports Intel
  Remove ugly debugging stuff
  do_mounts.c: Minor ROOT_DEV comment cleanup
  BUG_ON() Conversion in drivers/s390/block/dasd_devmap.c
  BUG_ON() Conversion in mm/mempool.c
  BUG_ON() Conversion in mm/memory.c
  BUG_ON() Conversion in kernel/fork.c
  BUG_ON() Conversion in ipc/sem.c
  BUG_ON() Conversion in fs/ext2/
  BUG_ON() Conversion in fs/hfs/
  BUG_ON() Conversion in fs/dcache.c
  BUG_ON() Conversion in fs/buffer.c
  BUG_ON() Conversion in input/serio/hp_sdc_mlc.c
  BUG_ON() Conversion in md/dm-table.c
  BUG_ON() Conversion in md/dm-path-selector.c
  BUG_ON() Conversion in drivers/isdn
  BUG_ON() Conversion in drivers/char
  BUG_ON() Conversion in drivers/mtd/
  • Loading branch information
Linus Torvalds committed Mar 26, 2006
2 parents f9b4192 + e941577 commit 9ae21d1
Show file tree
Hide file tree
Showing 26 changed files with 50 additions and 98 deletions.
3 changes: 1 addition & 2 deletions drivers/char/epca.c
Original file line number Diff line number Diff line change
Expand Up @@ -486,8 +486,7 @@ static void pc_close(struct tty_struct * tty, struct file * filp)
} /* 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.
Expand Down
2 changes: 1 addition & 1 deletion drivers/char/ftape/lowlevel/fdc-io.c
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ void fdc_reset(void)

fdc_mode = fdc_idle;

/* maybe the cli()/sti() pair is not necessary, BUT:
/* maybe the spin_lock_irq* pair is not necessary, BUT:
* the following line MUST be here. Otherwise fdc_interrupt_wait()
* won't wait. Note that fdc_reset() is called from
* ftape_dumb_stop() when the fdc is busy transferring data. In this
Expand Down
11 changes: 4 additions & 7 deletions drivers/char/tty_io.c
Original file line number Diff line number Diff line change
Expand Up @@ -543,14 +543,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);
}
Expand Down Expand Up @@ -645,8 +643,7 @@ void tty_ldisc_deref(struct tty_ldisc *ld)
{
unsigned long flags;

if(ld == NULL)
BUG();
BUG_ON(ld == NULL);

spin_lock_irqsave(&tty_ldisc_lock, flags);
if(ld->refcount == 0)
Expand Down
7 changes: 4 additions & 3 deletions drivers/input/serio/hp_sdc_mlc.c
Original file line number Diff line number Diff line change
Expand Up @@ -270,9 +270,10 @@ static void hp_sdc_mlc_out (hil_mlc *mlc) {

do_control:
priv->emtestmode = mlc->opacket & HIL_CTRL_TEST;
if ((mlc->opacket & (HIL_CTRL_APE | HIL_CTRL_IPF)) == HIL_CTRL_APE) {
BUG(); /* we cannot emulate this, it should not be used. */
}

/* we cannot emulate this, it should not be used. */
BUG_ON((mlc->opacket & (HIL_CTRL_APE | HIL_CTRL_IPF)) == HIL_CTRL_APE);

if ((mlc->opacket & HIL_CTRL_ONLY) == HIL_CTRL_ONLY) goto control_only;
if (mlc->opacket & HIL_CTRL_APE) {
BUG(); /* Should not send command/data after engaging APE */
Expand Down
7 changes: 2 additions & 5 deletions drivers/isdn/hisax/hisax_fcpcipnp.c
Original file line number Diff line number Diff line change
Expand Up @@ -387,8 +387,7 @@ static void hdlc_fill_fifo(struct fritz_bcs *bcs)

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) {
Expand Down Expand Up @@ -630,9 +629,7 @@ static void fritz_b_l2l1(struct hisax_if *ifc, int pr, void *arg)

switch (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);
Expand Down
9 changes: 3 additions & 6 deletions drivers/isdn/hisax/hisax_isac.c
Original file line number Diff line number Diff line change
Expand Up @@ -476,12 +476,10 @@ static void isac_fill_fifo(struct isac *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);

Expand Down Expand Up @@ -859,8 +857,7 @@ void isac_d_l2l1(struct hisax_if *hisax_d_if, int pr, void *arg)
dev_kfree_skb(skb);
break;
}
if (isac->tx_skb)
BUG();
BUG_ON(isac->tx_skb);

isac->tx_skb = skb;
isac_fill_fifo(isac);
Expand Down
4 changes: 1 addition & 3 deletions drivers/isdn/hisax/st5481_b.c
Original file line number Diff line number Diff line change
Expand Up @@ -356,9 +356,7 @@ void st5481_b_l2l1(struct hisax_if *ifc, int pr, void *arg)

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:
Expand Down
4 changes: 1 addition & 3 deletions drivers/isdn/hisax/st5481_d.c
Original file line number Diff line number Diff line change
Expand Up @@ -596,9 +596,7 @@ void st5481_d_l2l1(struct hisax_if *hisax_d_if, int pr, void *arg)
break;
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;
Expand Down
6 changes: 2 additions & 4 deletions drivers/isdn/i4l/isdn_ppp.c
Original file line number Diff line number Diff line change
Expand Up @@ -974,8 +974,7 @@ void isdn_ppp_receive(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buf
int 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) {
Expand Down Expand Up @@ -2527,8 +2526,7 @@ static struct sk_buff *isdn_ppp_decompress(struct sk_buff *skb,struct ippp_struc
printk(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
Expand Down
3 changes: 1 addition & 2 deletions drivers/md/dm-path-selector.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ void dm_put_path_selector(struct path_selector_type *pst)
if (--psi->use == 0)
module_put(psi->pst.module);

if (psi->use < 0)
BUG();
BUG_ON(psi->use < 0);

out:
up_read(&_ps_lock);
Expand Down
6 changes: 2 additions & 4 deletions drivers/md/dm-table.c
Original file line number Diff line number Diff line change
Expand Up @@ -352,8 +352,7 @@ static int open_dev(struct dm_dev *d, dev_t dev)

int r;

if (d->bdev)
BUG();
BUG_ON(d->bdev);

bdev = open_by_devnum(dev, d->mode);
if (IS_ERR(bdev))
Expand Down Expand Up @@ -427,8 +426,7 @@ static int __table_get_device(struct dm_table *t, struct dm_target *ti,
struct dm_dev *dd;
unsigned int major, minor;

if (!t)
BUG();
BUG_ON(!t);

if (sscanf(path, "%u:%u", &major, &minor) == 2) {
/* Extract the major/minor numbers */
Expand Down
5 changes: 2 additions & 3 deletions drivers/mtd/chips/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ config MTD_JEDECPROBE
compatible with the Common Flash Interface, but will use the common
CFI-targetted flash drivers for any chips which are identified which
are in fact compatible in all but the probe method. This actually
covers most AMD/Fujitsu-compatible chips, and will shortly cover also
non-CFI Intel chips (that code is in MTD CVS and should shortly be sent
for inclusion in Linus' tree)
covers most AMD/Fujitsu-compatible chips and also non-CFI
Intel chips.

config MTD_GEN_PROBE
tristate
Expand Down
8 changes: 4 additions & 4 deletions drivers/mtd/maps/dilnetpc.c
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,8 @@ static void dnp_set_vpp(struct map_info *not_used, int on)
{
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);
}
Expand All @@ -240,8 +240,8 @@ static void adnp_set_vpp(struct map_info *not_used, int on)
{
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);
}
Expand Down
3 changes: 1 addition & 2 deletions drivers/mtd/mtd_blkdevs.c
Original file line number Diff line number Diff line change
Expand Up @@ -450,8 +450,7 @@ int deregister_mtd_blktrans(struct mtd_blktrans_ops *tr)

kfree(tr->blkcore_priv);

if (!list_empty(&tr->devs))
BUG();
BUG_ON(!list_empty(&tr->devs));
return 0;
}

Expand Down
6 changes: 2 additions & 4 deletions drivers/mtd/mtdconcat.c
Original file line number Diff line number Diff line change
Expand Up @@ -477,8 +477,7 @@ static int concat_erase(struct mtd_info *mtd, struct erase_info *instr)
}

/* 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;
Expand All @@ -500,8 +499,7 @@ static int concat_erase(struct mtd_info *mtd, struct erase_info *instr)
if ((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;
Expand Down
6 changes: 2 additions & 4 deletions drivers/s390/block/dasd_devmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -437,8 +437,7 @@ dasd_forget_ranges(void)
spin_lock(&dasd_devmap_lock);
for (i = 0; i < 256; i++) {
list_for_each_entry_safe(devmap, n, &dasd_hashlists[i], list) {
if (devmap->device != NULL)
BUG();
BUG_ON(devmap->device != NULL);
list_del(&devmap->list);
kfree(devmap);
}
Expand Down Expand Up @@ -547,8 +546,7 @@ dasd_delete_device(struct dasd_device *device)

/* First remove device pointer from devmap. */
devmap = dasd_find_busid(device->cdev->dev.bus_id);
if (IS_ERR(devmap))
BUG();
BUG_ON(IS_ERR(devmap));
spin_lock(&dasd_devmap_lock);
if (devmap->device != device) {
spin_unlock(&dasd_devmap_lock);
Expand Down
9 changes: 3 additions & 6 deletions fs/buffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -798,8 +798,7 @@ void mark_buffer_dirty_inode(struct buffer_head *bh, struct inode *inode)
if (!mapping->assoc_mapping) {
mapping->assoc_mapping = buffer_mapping;
} else {
if (mapping->assoc_mapping != buffer_mapping)
BUG();
BUG_ON(mapping->assoc_mapping != buffer_mapping);
}
if (list_empty(&bh->b_assoc_buffers)) {
spin_lock(&buffer_mapping->private_lock);
Expand Down Expand Up @@ -1116,8 +1115,7 @@ grow_dev_page(struct block_device *bdev, sector_t block,
if (!page)
return NULL;

if (!PageLocked(page))
BUG();
BUG_ON(!PageLocked(page));

if (page_has_buffers(page)) {
bh = page_buffers(page);
Expand Down Expand Up @@ -1524,8 +1522,7 @@ void set_bh_page(struct buffer_head *bh,
struct page *page, unsigned long offset)
{
bh->b_page = page;
if (offset >= PAGE_SIZE)
BUG();
BUG_ON(offset >= PAGE_SIZE);
if (PageHighMem(page))
/*
* This catches illegal uses and preserves the offset:
Expand Down
11 changes: 1 addition & 10 deletions fs/dcache.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
#include <linux/swap.h>
#include <linux/bootmem.h>

/* #define DCACHE_DEBUG 1 */

int sysctl_vfs_cache_pressure __read_mostly = 100;
EXPORT_SYMBOL_GPL(sysctl_vfs_cache_pressure);
Expand Down Expand Up @@ -603,10 +602,6 @@ static int select_parent(struct dentry * parent)
*/
if (!list_empty(&dentry->d_subdirs)) {
this_parent = dentry;
#ifdef DCACHE_DEBUG
printk(KERN_DEBUG "select_parent: descending to %s/%s, found=%d\n",
dentry->d_parent->d_name.name, dentry->d_name.name, found);
#endif
goto repeat;
}
}
Expand All @@ -616,10 +611,6 @@ dentry->d_parent->d_name.name, dentry->d_name.name, found);
if (this_parent != parent) {
next = this_parent->d_u.d_child.next;
this_parent = this_parent->d_parent;
#ifdef DCACHE_DEBUG
printk(KERN_DEBUG "select_parent: ascending to %s/%s, found=%d\n",
this_parent->d_parent->d_name.name, this_parent->d_name.name, found);
#endif
goto resume;
}
out:
Expand Down Expand Up @@ -798,7 +789,7 @@ struct dentry *d_alloc_name(struct dentry *parent, const char *name)

void d_instantiate(struct dentry *entry, struct inode * inode)
{
if (!list_empty(&entry->d_alias)) BUG();
BUG_ON(!list_empty(&entry->d_alias));
spin_lock(&dcache_lock);
if (inode)
list_add(&entry->d_alias, &inode->i_dentry);
Expand Down
6 changes: 2 additions & 4 deletions fs/ext2/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -416,8 +416,7 @@ void ext2_set_link(struct inode *dir, struct ext2_dir_entry_2 *de,

lock_page(page);
err = page->mapping->a_ops->prepare_write(NULL, page, from, to);
if (err)
BUG();
BUG_ON(err);
de->inode = cpu_to_le32(inode->i_ino);
ext2_set_de_type (de, inode);
err = ext2_commit_chunk(page, from, to);
Expand Down Expand Up @@ -554,8 +553,7 @@ int ext2_delete_entry (struct ext2_dir_entry_2 * dir, struct page * page )
from = (char*)pde - (char*)page_address(page);
lock_page(page);
err = mapping->a_ops->prepare_write(NULL, page, from, to);
if (err)
BUG();
BUG_ON(err);
if (pde)
pde->rec_len = cpu_to_le16(to-from);
dir->inode = 0;
Expand Down
9 changes: 3 additions & 6 deletions fs/hfs/bnode.c
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,7 @@ void hfs_bnode_unhash(struct hfs_bnode *node)
for (p = &node->tree->node_hash[hfs_bnode_hash(node->this)];
*p && *p != node; p = &(*p)->next_hash)
;
if (!*p)
BUG();
BUG_ON(!*p);
*p = node->next_hash;
node->tree->node_hash_cnt--;
}
Expand Down Expand Up @@ -415,8 +414,7 @@ struct hfs_bnode *hfs_bnode_create(struct hfs_btree *tree, u32 num)
spin_lock(&tree->hash_lock);
node = hfs_bnode_findhash(tree, num);
spin_unlock(&tree->hash_lock);
if (node)
BUG();
BUG_ON(node);
node = __hfs_bnode_create(tree, num);
if (!node)
return ERR_PTR(-ENOMEM);
Expand Down Expand Up @@ -459,8 +457,7 @@ void hfs_bnode_put(struct hfs_bnode *node)

dprint(DBG_BNODE_REFS, "put_node(%d:%d): %d\n",
node->tree->cnid, node->this, atomic_read(&node->refcnt));
if (!atomic_read(&node->refcnt))
BUG();
BUG_ON(!atomic_read(&node->refcnt));
if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock))
return;
for (i = 0; i < tree->pages_per_bnode; i++) {
Expand Down
3 changes: 1 addition & 2 deletions fs/hfs/btree.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke
tree->inode = iget_locked(sb, id);
if (!tree->inode)
goto free_tree;
if (!(tree->inode->i_state & I_NEW))
BUG();
BUG_ON(!(tree->inode->i_state & I_NEW));
{
struct hfs_mdb *mdb = HFS_SB(sb)->mdb;
HFS_I(tree->inode)->flags = 0;
Expand Down
1 change: 0 additions & 1 deletion init/do_mounts.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ int root_mountflags = MS_RDONLY | MS_SILENT;
char * __initdata root_device_name;
static char __initdata saved_root_name[64];

/* this is initialized in init/main.c */
dev_t ROOT_DEV;

static int __init load_ramdisk(char *str)
Expand Down
Loading

0 comments on commit 9ae21d1

Please sign in to comment.