19 files changed, 70 insertions, 81 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 82710ae39228..5cb96300eb0f 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -256,7 +256,8 @@ config ACPI_CUSTOM_DSDT_FILE
         depends on ACPI_CUSTOM_DSDT
         default ""
         help
-          Enter the full path name to the file wich includes the AmlCode declaration.
+          Enter the full path name to the file which includes the AmlCode
+          declaration.
 
 config ACPI_BLACKLIST_YEAR
         int "Disable ACPI for systems before Jan 1st this year" if X86_32
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 37b8cda3e8bc..9bdea2a5cf0e 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -228,8 +228,7 @@ static void *slice_dma_loaf(struct dma_loaf *loaf, size_t len,
         void *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;
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 1f2890989b56..71ec9e664383 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -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;
diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c
index 9e35de05d5c5..0e66e904bd8c 100644
--- a/drivers/block/cciss_scsi.c
+++ b/drivers/block/cciss_scsi.c
@@ -1316,7 +1316,7 @@ cciss_scsi_queue_command (struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd
 
         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;
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 862b9abac0ae..b6ea2f0c7276 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -906,8 +906,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;
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 090d154098bb..b2a11245fa95 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -45,56 +45,57 @@ obj-$(CONFIG_HVC_CONSOLE)	+= hvc_console.o hvc_vio.o hvsi.o
 obj-$(CONFIG_RAW_DRIVER)        += raw.o
 obj-$(CONFIG_SGI_SNSC)          += snsc.o snsc_event.o
 obj-$(CONFIG_MMTIMER)           += mmtimer.o
-obj-$(CONFIG_VIOCONS) += viocons.o
+obj-$(CONFIG_VIOCONS)           += viocons.o
 obj-$(CONFIG_VIOTAPE)           += viotape.o
 obj-$(CONFIG_HVCS)              += hvcs.o
 obj-$(CONFIG_SGI_MBCS)          += mbcs.o
 
-obj-$(CONFIG_PRINTER) += lp.o
-obj-$(CONFIG_TIPAR) += tipar.o
-
-obj-$(CONFIG_DTLK) += dtlk.o
-obj-$(CONFIG_R3964) += n_r3964.o
-obj-$(CONFIG_APPLICOM) += applicom.o
-obj-$(CONFIG_SONYPI) += sonypi.o
-obj-$(CONFIG_RTC) += rtc.o
-obj-$(CONFIG_HPET) += hpet.o
-obj-$(CONFIG_GEN_RTC) += genrtc.o
-obj-$(CONFIG_EFI_RTC) += efirtc.o
-obj-$(CONFIG_SGI_DS1286) += ds1286.o
-obj-$(CONFIG_SGI_IP27_RTC) += ip27-rtc.o
-obj-$(CONFIG_DS1302) += ds1302.o
-obj-$(CONFIG_S3C2410_RTC) += s3c2410-rtc.o
-obj-$(CONFIG_RTC_VR41XX) += vr41xx_rtc.o
+obj-$(CONFIG_PRINTER)           += lp.o
+obj-$(CONFIG_TIPAR)             += tipar.o
+
+obj-$(CONFIG_DTLK)              += dtlk.o
+obj-$(CONFIG_R3964)             += n_r3964.o
+obj-$(CONFIG_APPLICOM)          += applicom.o
+obj-$(CONFIG_SONYPI)            += sonypi.o
+obj-$(CONFIG_RTC)               += rtc.o
+obj-$(CONFIG_HPET)              += hpet.o
+obj-$(CONFIG_GEN_RTC)           += genrtc.o
+obj-$(CONFIG_EFI_RTC)           += efirtc.o
+obj-$(CONFIG_SGI_DS1286)        += ds1286.o
+obj-$(CONFIG_SGI_IP27_RTC)      += ip27-rtc.o
+obj-$(CONFIG_DS1302)            += ds1302.o
+obj-$(CONFIG_S3C2410_RTC)       += s3c2410-rtc.o
+obj-$(CONFIG_RTC_VR41XX)        += vr41xx_rtc.o
 ifeq ($(CONFIG_GENERIC_NVRAM),y)
-  obj-$(CONFIG_NVRAM) += generic_nvram.o
+  obj-$(CONFIG_NVRAM)   += generic_nvram.o
 else
-  obj-$(CONFIG_NVRAM) += nvram.o
+  obj-$(CONFIG_NVRAM)   += nvram.o
 endif
-obj-$(CONFIG_TOSHIBA) += toshiba.o
-obj-$(CONFIG_I8K) += i8k.o
-obj-$(CONFIG_DS1620) += ds1620.o
-obj-$(CONFIG_HW_RANDOM) += hw_random.o
-obj-$(CONFIG_FTAPE) += ftape/
-obj-$(CONFIG_COBALT_LCD) += lcd.o
-obj-$(CONFIG_PPDEV) += ppdev.o
-obj-$(CONFIG_NWBUTTON) += nwbutton.o
-obj-$(CONFIG_NWFLASH) += nwflash.o
-obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o
-obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio.o
-obj-$(CONFIG_GPIO_VR41XX) += vr41xx_giu.o
-obj-$(CONFIG_TANBAC_TB0219) += tb0219.o
-obj-$(CONFIG_TELCLOCK) += tlclk.o
-
-obj-$(CONFIG_WATCHDOG)  += watchdog/
-obj-$(CONFIG_MWAVE) += mwave/
-obj-$(CONFIG_AGP) += agp/
-obj-$(CONFIG_DRM) += drm/
-obj-$(CONFIG_PCMCIA) += pcmcia/
-obj-$(CONFIG_IPMI_HANDLER) += ipmi/
-
-obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o
-obj-$(CONFIG_TCG_TPM) += tpm/
+obj-$(CONFIG_TOSHIBA)           += toshiba.o
+obj-$(CONFIG_I8K)               += i8k.o
+obj-$(CONFIG_DS1620)            += ds1620.o
+obj-$(CONFIG_HW_RANDOM)         += hw_random.o
+obj-$(CONFIG_FTAPE)             += ftape/
+obj-$(CONFIG_COBALT_LCD)        += lcd.o
+obj-$(CONFIG_PPDEV)             += ppdev.o
+obj-$(CONFIG_NWBUTTON)          += nwbutton.o
+obj-$(CONFIG_NWFLASH)           += nwflash.o
+obj-$(CONFIG_SCx200_GPIO)       += scx200_gpio.o
+obj-$(CONFIG_CS5535_GPIO)       += cs5535_gpio.o
+obj-$(CONFIG_GPIO_VR41XX)       += vr41xx_giu.o
+obj-$(CONFIG_TANBAC_TB0219)     += tb0219.o
+obj-$(CONFIG_TELCLOCK)          += tlclk.o
+
+obj-$(CONFIG_WATCHDOG)          += watchdog/
+obj-$(CONFIG_MWAVE)             += mwave/
+obj-$(CONFIG_AGP)               += agp/
+obj-$(CONFIG_DRM)               += drm/
+obj-$(CONFIG_PCMCIA)            += pcmcia/
+obj-$(CONFIG_IPMI_HANDLER)      += ipmi/
+
+obj-$(CONFIG_HANGCHECK_TIMER)   += hangcheck-timer.o
+obj-$(CONFIG_TCG_TPM)           += tpm/
+
 # Files generated that shall be removed upon make clean
 clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c
 
diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c
index 5704204964a3..ea499783fb12 100644
--- a/drivers/input/serio/hil_mlc.c
+++ b/drivers/input/serio/hil_mlc.c
@@ -556,7 +556,7 @@ static inline void hilse_setup_input(hil_mlc *mlc, struct hilse_node *node) {
         do_gettimeofday(&(mlc->instart));
         mlc->icount = 15;
         memset(mlc->ipacket, 0, 16 * sizeof(hil_packet));
-        if (down_trylock(&(mlc->isem))) BUG();
+        BUG_ON(down_trylock(&(mlc->isem)));
 
         return;
 }
diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
index edf14a2aa3c8..743ac4077f35 100644
--- a/drivers/isdn/i4l/isdn_x25iface.c
+++ b/drivers/isdn/i4l/isdn_x25iface.c
@@ -7,7 +7,7 @@
  *
  * stuff needed to support the Linux X.25 PLP code on top of devices that
  * can provide a lab_b service using the concap_proto mechanism.
- * This module supports a network interface wich provides lapb_sematics
+ * This module supports a network interface which provides lapb_sematics
  * -- as defined in Documentation/networking/x25-iface.txt -- to
  * the upper layer and assumes that the lower layer provides a reliable
  * data link service by means of the concap_device_ops callbacks.
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 670eb01a5a23..e1c18aa1d712 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -1309,7 +1309,7 @@ int bitmap_startwrite(struct bitmap *bitmap, sector_t offset, unsigned long sect
                 case 1:
                         *bmc = 2;
                 }
-                if ((*bmc & COUNTER_MAX) == COUNTER_MAX) BUG();
+                BUG_ON((*bmc & COUNTER_MAX) == COUNTER_MAX);
                 (*bmc)++;
 
                 spin_unlock_irq(&bitmap->lock);
diff --git a/drivers/md/dm-hw-handler.c b/drivers/md/dm-hw-handler.c
index 4cc0010e0156..baafaaba4d4b 100644
--- a/drivers/md/dm-hw-handler.c
+++ b/drivers/md/dm-hw-handler.c
@@ -83,8 +83,7 @@ void dm_put_hw_handler(struct hw_handler_type *hwht)
         if (--hwhi->use == 0)
                 module_put(hwhi->hwht.module);
 
-        if (hwhi->use < 0)
-                BUG();
+        BUG_ON(hwhi->use < 0);
 
       out:
         up_read(&_hwh_lock);
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index 5d47c5965c51..0821747e44cf 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -1724,9 +1724,7 @@ printk("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n", PAGE0->mem_boot.hpa,
                 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;
@@ -2185,8 +2183,7 @@ void sba_directed_lmmio(struct parisc_device *pci_hba, struct resource *r)
         int 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;
 
@@ -2228,8 +2225,7 @@ void sba_distributed_lmmio(struct parisc_device *pci_hba, struct resource *r )
         int 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;
 
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c
index ba971fecd0d8..ad6d3b28a3a6 100644
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
@@ -157,8 +157,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;
@@ -474,8 +474,7 @@ superio_probe(struct pci_dev *dev, const struct pci_device_id *id)
                 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();
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 7967916bda18..0a9f12c4e911 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -541,9 +541,8 @@ dasd_kmalloc_request(char *magic, int cplength, int datasize,
         struct dasd_ccw_req *cqr;
 
         /* Sanity checks */
-        if ( magic == NULL || datasize > PAGE_SIZE ||
-             (cplength*sizeof(struct ccw1)) > PAGE_SIZE)
-                BUG();
+        BUG_ON( magic == NULL || datasize > PAGE_SIZE ||
+             (cplength*sizeof(struct ccw1)) > PAGE_SIZE);
 
         cqr = kzalloc(sizeof(struct dasd_ccw_req), GFP_ATOMIC);
         if (cqr == NULL)
@@ -583,9 +582,8 @@ dasd_smalloc_request(char *magic, int cplength, int datasize,
         int size;
 
         /* Sanity checks */
-        if ( magic == NULL || datasize > PAGE_SIZE ||
-             (cplength*sizeof(struct ccw1)) > PAGE_SIZE)
-                BUG();
+        BUG_ON( magic == NULL || datasize > PAGE_SIZE ||
+             (cplength*sizeof(struct ccw1)) > PAGE_SIZE);
 
         size = (sizeof(struct dasd_ccw_req) + 7L) & -8L;
         if (cplength > 0)
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 928e6cf12dca..6459edc7f5c5 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -40,7 +40,7 @@
  * and so on). So the PSC1 is mapped to /dev/ttyPSC0, PSC2 to /dev/ttyPSC1 and
  * so on. But be warned, it's an ABSOLUTE REQUIREMENT ! This is needed mainly
  * fpr the console code : without this 1:1 mapping, at early boot time, when we
- * are parsing the kernel args console=ttyPSC?, we wouldn't know wich PSC it
+ * are parsing the kernel args console=ttyPSC?, we wouldn't know which PSC it
  * will be mapped to.
  */
 
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index a8455c9e79dd..495db5755df9 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -102,7 +102,7 @@ static struct usb_driver option_driver = {
         .no_dynamic_id =        1,
 };
 
-/* The card has three separate interfaces, wich the serial driver
+/* The card has three separate interfaces, which the serial driver
  * recognizes separately, thus num_port=1.
  */
 static struct usb_serial_driver option_3port_device = {
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index c029db4646f6..6577fdfdfc16 100644
--- a/drivers/video/bw2.c
+++ b/drivers/video/bw2.c
@@ -327,8 +327,7 @@ static void bw2_init_one(struct sbus_dev *sdev)
         } 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);
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index 9c9b21d469a1..7633e41adda1 100644
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -466,8 +466,7 @@ static void ffb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
         unsigned 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];
 
diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c
index 99921df35474..8c1a8b5135c6 100644
--- a/drivers/video/sstfb.c
+++ b/drivers/video/sstfb.c
@@ -32,7 +32,7 @@
 
 -TODO: at one time or another test that the mode is acceptable by the monitor
 -ASK: Can I choose different ordering for the color bitfields (rgba argb ...)
-      wich one should i use ? is there any preferred one ? It seems ARGB is
+      which one should i use ? is there any preferred one ? It seems ARGB is
       the one ...
 -TODO: in  set_var check the validity of timings (hsync vsync)...
 -TODO: check and recheck the use of sst_wait_idle : we don't flush the fifo via
diff --git a/drivers/w1/masters/matrox_w1.c b/drivers/w1/masters/matrox_w1.c
index 591809cbbb97..2788b8ca9bb1 100644
--- a/drivers/w1/masters/matrox_w1.c
+++ b/drivers/w1/masters/matrox_w1.c
@@ -98,7 +98,7 @@ static void matrox_w1_write_ddc_bit(void *, u8);
  *
  * Using tristate pins, since i can't find any open-drain pin in whole motherboard.
  * Unfortunately we can't connect to Intel's 82801xx IO controller
- * since we don't know motherboard schema, wich has pretty unused(may be not) GPIO.
+ * since we don't know motherboard schema, which has pretty unused(may be not) GPIO.
  *
  * I've heard that PIIX also has open drain pin.
  *