aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/apei/ghes.c2
-rw-r--r--drivers/acpi/processor_throttling.c2
-rw-r--r--drivers/acpi/video.c4
-rw-r--r--drivers/amba/bus.c2
-rw-r--r--drivers/ata/ahci.c2
-rw-r--r--drivers/ata/ahci.h4
-rw-r--r--drivers/ata/ata_piix.c10
-rw-r--r--drivers/ata/libata-core.c2
-rw-r--r--drivers/ata/libata-eh.c10
-rw-r--r--drivers/ata/libata-scsi.c2
-rw-r--r--drivers/ata/libata-sff.c4
-rw-r--r--drivers/ata/pata_amd.c2
-rw-r--r--drivers/ata/pata_arasan_cf.c8
-rw-r--r--drivers/ata/pata_bf54x.c2
-rw-r--r--drivers/ata/pata_cs5520.c2
-rw-r--r--drivers/ata/pata_mpiix.c2
-rw-r--r--drivers/ata/pata_rz1000.c2
-rw-r--r--drivers/ata/pata_sil680.c4
-rw-r--r--drivers/ata/pata_sis.c4
-rw-r--r--drivers/ata/pata_triflex.c2
-rw-r--r--drivers/ata/sata_fsl.c4
-rw-r--r--drivers/ata/sata_mv.c4
-rw-r--r--drivers/ata/sata_nv.c2
-rw-r--r--drivers/ata/sata_via.c2
-rw-r--r--drivers/atm/ambassador.c2
-rw-r--r--drivers/atm/firestream.c2
-rw-r--r--drivers/atm/fore200e.h4
-rw-r--r--drivers/atm/horizon.c10
-rw-r--r--drivers/atm/idt77252.c2
-rw-r--r--drivers/atm/idt77252.h2
-rw-r--r--drivers/atm/iphase.c6
-rw-r--r--drivers/atm/lanai.c4
-rw-r--r--drivers/auxdisplay/cfag12864b.c4
-rw-r--r--drivers/base/power/runtime.c2
-rw-r--r--drivers/base/sys.c14
-rw-r--r--drivers/block/DAC960.c2
-rw-r--r--drivers/block/drbd/drbd_actlog.c2
-rw-r--r--drivers/block/drbd/drbd_int.h10
-rw-r--r--drivers/block/drbd/drbd_main.c4
-rw-r--r--drivers/block/drbd/drbd_receiver.c2
-rw-r--r--drivers/block/drbd/drbd_vli.h2
-rw-r--r--drivers/block/hd.c2
-rw-r--r--drivers/block/viodasd.c2
-rw-r--r--drivers/block/xsysace.c8
-rw-r--r--drivers/bluetooth/hci_ll.c2
-rw-r--r--drivers/cdrom/cdrom.c4
-rw-r--r--drivers/char/agp/agp.h2
-rw-r--r--drivers/char/agp/amd-k7-agp.c2
-rw-r--r--drivers/char/agp/sworks-agp.c2
-rw-r--r--drivers/char/agp/via-agp.c2
-rw-r--r--drivers/char/ipmi/ipmi_poweroff.c2
-rw-r--r--drivers/char/ipmi/ipmi_si_intf.c4
-rw-r--r--drivers/char/mbcs.h4
-rw-r--r--drivers/char/mwave/3780i.h2
-rw-r--r--drivers/char/nwbutton.c2
-rw-r--r--drivers/char/pcmcia/cm4000_cs.c2
-rw-r--r--drivers/char/pcmcia/synclink_cs.c4
-rw-r--r--drivers/char/random.c2
-rw-r--r--drivers/char/sonypi.c4
-rw-r--r--drivers/char/xilinx_hwicap/xilinx_hwicap.c2
-rw-r--r--drivers/cpufreq/cpufreq.c2
-rw-r--r--drivers/crypto/amcc/crypto4xx_sa.c2
-rw-r--r--drivers/crypto/amcc/crypto4xx_sa.h2
-rw-r--r--drivers/crypto/ixp4xx_crypto.c2
-rw-r--r--drivers/dma/at_hdmac.c2
-rw-r--r--drivers/dma/coh901318.c2
-rw-r--r--drivers/dma/intel_mid_dma.c8
-rw-r--r--drivers/dma/intel_mid_dma_regs.h4
-rw-r--r--drivers/dma/mpc512x_dma.c2
-rw-r--r--drivers/dma/ste_dma40.c4
-rw-r--r--drivers/edac/Kconfig2
-rw-r--r--drivers/edac/cpc925_edac.c2
-rw-r--r--drivers/edac/edac_core.h8
-rw-r--r--drivers/edac/edac_device.c4
-rw-r--r--drivers/edac/edac_device_sysfs.c4
-rw-r--r--drivers/edac/edac_mc.c2
-rw-r--r--drivers/edac/edac_mc_sysfs.c2
-rw-r--r--drivers/edac/edac_pci_sysfs.c4
-rw-r--r--drivers/edac/i5000_edac.c2
-rw-r--r--drivers/edac/i5100_edac.c2
-rw-r--r--drivers/edac/i5400_edac.c4
-rw-r--r--drivers/edac/i7300_edac.c2
-rw-r--r--drivers/edac/i7core_edac.c2
-rw-r--r--drivers/edac/i82443bxgx_edac.c4
-rw-r--r--drivers/edac/mce_amd_inj.c2
-rw-r--r--drivers/edac/r82600_edac.c6
-rw-r--r--drivers/firewire/net.c2
-rw-r--r--drivers/gpio/mc33880.c2
-rw-r--r--drivers/gpu/drm/drm_crtc.c4
-rw-r--r--drivers/gpu/drm/drm_mm.c2
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h2
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c2
-rw-r--r--drivers/gpu/drm/i915/intel_sdvo_regs.h2
-rw-r--r--drivers/gpu/drm/mga/mga_dma.c2
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_channel.c4
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drv.h2
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_state.c2
-rw-r--r--drivers/gpu/drm/nouveau/nv04_crtc.c4
-rw-r--r--drivers/gpu/drm/nouveau/nv40_graph.c2
-rw-r--r--drivers/gpu/drm/radeon/atombios.h34
-rw-r--r--drivers/gpu/drm/radeon/evergreen_cs.c2
-rw-r--r--drivers/gpu/drm/radeon/r300.c2
-rw-r--r--drivers/gpu/drm/radeon/r300_reg.h4
-rw-r--r--drivers/gpu/drm/radeon/r600_cs.c2
-rw-r--r--drivers/gpu/drm/radeon/r600_hdmi.c2
-rw-r--r--drivers/gpu/drm/radeon/radeon.h4
-rw-r--r--drivers/gpu/drm/radeon/radeon_cp.c2
-rw-r--r--drivers/gpu/drm/radeon/radeon_cursor.c2
-rw-r--r--drivers/gpu/drm/radeon/radeon_device.c2
-rw-r--r--drivers/gpu/drm/radeon/radeon_display.c2
-rw-r--r--drivers/gpu/drm/radeon/radeon_drv.h2
-rw-r--r--drivers/gpu/drm/radeon/radeon_object.h2
-rw-r--r--drivers/gpu/drm/radeon/radeon_state.c2
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_kms.c2
-rw-r--r--drivers/gpu/vga/vgaarb.c4
-rw-r--r--drivers/hid/Kconfig13
-rw-r--r--drivers/hid/hid-core.c6
-rw-r--r--drivers/hid/hid-debug.c2
-rw-r--r--drivers/hid/hid-ids.h4
-rw-r--r--drivers/hid/hid-lgff.c2
-rw-r--r--drivers/hid/hid-magicmouse.c4
-rw-r--r--drivers/hid/hid-ortek.c16
-rw-r--r--drivers/hid/hid-picolcd.c4
-rw-r--r--drivers/hid/hid-roccat-kone.h2
-rw-r--r--drivers/hid/hid-roccat-pyra.c3
-rw-r--r--drivers/hid/usbhid/hid-quirks.c1
-rw-r--r--drivers/hwmon/abituguru.c2
-rw-r--r--drivers/hwmon/abituguru3.c2
-rw-r--r--drivers/hwmon/adm1026.c2
-rw-r--r--drivers/hwmon/lm85.c2
-rw-r--r--drivers/hwmon/lm90.c2
-rw-r--r--drivers/hwmon/sht15.c6
-rw-r--r--drivers/hwmon/tmp102.c2
-rw-r--r--drivers/hwmon/w83791d.c2
-rw-r--r--drivers/hwmon/w83792d.c2
-rw-r--r--drivers/hwmon/w83793.c2
-rw-r--r--drivers/i2c/algos/i2c-algo-pca.c2
-rw-r--r--drivers/i2c/busses/i2c-ali1535.c2
-rw-r--r--drivers/i2c/busses/i2c-ali15x3.c2
-rw-r--r--drivers/i2c/busses/i2c-davinci.c2
-rw-r--r--drivers/i2c/busses/i2c-designware.c2
-rw-r--r--drivers/i2c/busses/i2c-elektor.c2
-rw-r--r--drivers/i2c/busses/i2c-i801.c2
-rw-r--r--drivers/i2c/busses/i2c-ibm_iic.c4
-rw-r--r--drivers/i2c/busses/i2c-intel-mid.c14
-rw-r--r--drivers/i2c/busses/i2c-isch.c2
-rw-r--r--drivers/i2c/busses/i2c-mxs.c2
-rw-r--r--drivers/i2c/busses/i2c-nomadik.c8
-rw-r--r--drivers/i2c/busses/i2c-s6000.c2
-rw-r--r--drivers/i2c/busses/i2c-stu300.c4
-rw-r--r--drivers/i2c/busses/i2c-tegra.c2
-rw-r--r--drivers/i2c/busses/i2c-xiic.c2
-rw-r--r--drivers/i2c/i2c-core.c2
-rw-r--r--drivers/ide/cy82c693.c2
-rw-r--r--drivers/ide/ide-floppy.c2
-rw-r--r--drivers/ide/ide-taskfile.c2
-rw-r--r--drivers/ide/piix.c4
-rw-r--r--drivers/ide/sis5513.c4
-rw-r--r--drivers/ide/triflex.c2
-rw-r--r--drivers/ide/via82cxxx.c2
-rw-r--r--drivers/infiniband/hw/amso1100/c2_ae.c2
-rw-r--r--drivers/infiniband/hw/amso1100/c2_qp.c2
-rw-r--r--drivers/infiniband/hw/amso1100/c2_wr.h4
-rw-r--r--drivers/infiniband/hw/ipath/ipath_driver.c2
-rw-r--r--drivers/infiniband/hw/ipath/ipath_file_ops.c2
-rw-r--r--drivers/infiniband/hw/ipath/ipath_init_chip.c2
-rw-r--r--drivers/infiniband/hw/ipath/ipath_ud.c4
-rw-r--r--drivers/infiniband/hw/ipath/ipath_user_sdma.c2
-rw-r--r--drivers/infiniband/hw/nes/nes_cm.c2
-rw-r--r--drivers/infiniband/hw/nes/nes_hw.c4
-rw-r--r--drivers/infiniband/hw/nes/nes_nic.c2
-rw-r--r--drivers/infiniband/hw/qib/qib.h2
-rw-r--r--drivers/infiniband/hw/qib/qib_file_ops.c4
-rw-r--r--drivers/infiniband/hw/qib/qib_iba6120.c4
-rw-r--r--drivers/infiniband/hw/qib/qib_iba7220.c6
-rw-r--r--drivers/infiniband/hw/qib/qib_iba7322.c8
-rw-r--r--drivers/infiniband/hw/qib/qib_init.c2
-rw-r--r--drivers/infiniband/hw/qib/qib_mad.h2
-rw-r--r--drivers/infiniband/hw/qib/qib_twsi.c2
-rw-r--r--drivers/infiniband/hw/qib/qib_ud.c4
-rw-r--r--drivers/infiniband/hw/qib/qib_user_sdma.c2
-rw-r--r--drivers/infiniband/ulp/iser/iscsi_iser.h2
-rw-r--r--drivers/input/joydev.c4
-rw-r--r--drivers/input/joystick/a3d.c4
-rw-r--r--drivers/input/keyboard/davinci_keyscan.c2
-rw-r--r--drivers/input/misc/adxl34x.c2
-rw-r--r--drivers/input/misc/keyspan_remote.c2
-rw-r--r--drivers/input/misc/wistron_btns.c2
-rw-r--r--drivers/input/mouse/bcm5974.c2
-rw-r--r--drivers/input/mouse/synaptics_i2c.c2
-rw-r--r--drivers/input/mouse/vsxxxaa.c2
-rw-r--r--drivers/input/serio/hp_sdc.c2
-rw-r--r--drivers/input/serio/xilinx_ps2.c2
-rw-r--r--drivers/input/touchscreen/intel-mid-touch.c2
-rw-r--r--drivers/input/touchscreen/ucb1400_ts.c2
-rw-r--r--drivers/input/touchscreen/wm9705.c2
-rw-r--r--drivers/input/touchscreen/wm9712.c2
-rw-r--r--drivers/input/touchscreen/wm9713.c2
-rw-r--r--drivers/input/touchscreen/wm97xx-core.c4
-rw-r--r--drivers/isdn/hardware/eicon/divacapi.h2
-rw-r--r--drivers/isdn/hardware/eicon/io.h2
-rw-r--r--drivers/isdn/hardware/eicon/message.c4
-rw-r--r--drivers/isdn/hardware/eicon/pc.h2
-rw-r--r--drivers/isdn/hardware/eicon/um_idi.c2
-rw-r--r--drivers/isdn/hardware/mISDN/hfcmulti.c4
-rw-r--r--drivers/isdn/hardware/mISDN/hfcpci.c2
-rw-r--r--drivers/isdn/hisax/hfc_pci.c2
-rw-r--r--drivers/isdn/hisax/hfc_sx.c2
-rw-r--r--drivers/isdn/hisax/hfc_usb.h2
-rw-r--r--drivers/isdn/hisax/l3dss1.c4
-rw-r--r--drivers/isdn/hisax/l3ni1.c4
-rw-r--r--drivers/isdn/hisax/nj_s.c2
-rw-r--r--drivers/isdn/hisax/st5481_b.c2
-rw-r--r--drivers/isdn/hisax/st5481_usb.c2
-rw-r--r--drivers/isdn/hisax/teles_cs.c2
-rw-r--r--drivers/isdn/hysdn/hysdn_sched.c2
-rw-r--r--drivers/isdn/i4l/isdn_net.c4
-rw-r--r--drivers/isdn/i4l/isdn_ppp.c4
-rw-r--r--drivers/isdn/i4l/isdn_tty.c2
-rw-r--r--drivers/isdn/isdnloop/isdnloop.c2
-rw-r--r--drivers/isdn/mISDN/dsp.h2
-rw-r--r--drivers/isdn/mISDN/dsp_cmx.c4
-rw-r--r--drivers/isdn/mISDN/dsp_core.c8
-rw-r--r--drivers/isdn/mISDN/dsp_dtmf.c4
-rw-r--r--drivers/isdn/mISDN/dsp_tones.c2
-rw-r--r--drivers/isdn/mISDN/l1oip_core.c6
-rw-r--r--drivers/isdn/mISDN/layer2.c4
-rw-r--r--drivers/leds/leds-pca9532.c2
-rw-r--r--drivers/leds/leds-wm8350.c4
-rw-r--r--drivers/lguest/lguest_user.c2
-rw-r--r--drivers/macintosh/adbhid.c2
-rw-r--r--drivers/macintosh/macio-adb.c2
-rw-r--r--drivers/macintosh/therm_adt746x.c2
-rw-r--r--drivers/macintosh/therm_pm72.c6
-rw-r--r--drivers/macintosh/therm_windtunnel.c2
-rw-r--r--drivers/md/bitmap.h2
-rw-r--r--drivers/md/dm-region-hash.c2
-rw-r--r--drivers/md/faulty.c2
-rw-r--r--drivers/md/md.c2
-rw-r--r--drivers/md/md.h2
-rw-r--r--drivers/md/raid10.c6
-rw-r--r--drivers/md/raid10.h4
-rw-r--r--drivers/media/common/saa7146_i2c.c8
-rw-r--r--drivers/media/common/tuners/mxl5005s.c2
-rw-r--r--drivers/media/common/tuners/tda18271.h2
-rw-r--r--drivers/media/dvb/b2c2/flexcop-pci.c2
-rw-r--r--drivers/media/dvb/bt8xx/dvb-bt8xx.c4
-rw-r--r--drivers/media/dvb/dvb-core/dvb_frontend.c4
-rw-r--r--drivers/media/dvb/dvb-usb/af9005-fe.c8
-rw-r--r--drivers/media/dvb/dvb-usb/friio.h2
-rw-r--r--drivers/media/dvb/dvb-usb/lmedm04.c12
-rw-r--r--drivers/media/dvb/frontends/atbm8830.h2
-rw-r--r--drivers/media/dvb/frontends/au8522_dig.c6
-rw-r--r--drivers/media/dvb/frontends/bcm3510.c6
-rw-r--r--drivers/media/dvb/frontends/cx22700.c2
-rw-r--r--drivers/media/dvb/frontends/cx22702.c6
-rw-r--r--drivers/media/dvb/frontends/cx24110.c2
-rw-r--r--drivers/media/dvb/frontends/cx24113.h2
-rw-r--r--drivers/media/dvb/frontends/cx24123.c2
-rw-r--r--drivers/media/dvb/frontends/drx397xD.c2
-rw-r--r--drivers/media/dvb/frontends/mb86a16.c2
-rw-r--r--drivers/media/dvb/frontends/mb86a20s.c2
-rw-r--r--drivers/media/dvb/frontends/mt312.c2
-rw-r--r--drivers/media/dvb/frontends/s5h1420.c2
-rw-r--r--drivers/media/dvb/frontends/stb6100.c2
-rw-r--r--drivers/media/dvb/frontends/stv0297.c2
-rw-r--r--drivers/media/dvb/frontends/stv0367.c2
-rw-r--r--drivers/media/dvb/frontends/stv0900_priv.h2
-rw-r--r--drivers/media/dvb/frontends/stv090x.c12
-rw-r--r--drivers/media/dvb/mantis/mantis_uart.c2
-rw-r--r--drivers/media/dvb/ngene/ngene-core.c4
-rw-r--r--drivers/media/dvb/pluto2/pluto2.c10
-rw-r--r--drivers/media/dvb/siano/smsdvb.c2
-rw-r--r--drivers/media/dvb/ttpci/av7110.c2
-rw-r--r--drivers/media/dvb/ttpci/budget-patch.c2
-rw-r--r--drivers/media/dvb/ttusb-dec/ttusb_dec.c2
-rw-r--r--drivers/media/radio/radio-mr800.c2
-rw-r--r--drivers/media/radio/si4713-i2c.c2
-rw-r--r--drivers/media/radio/wl128x/fmdrv_common.c6
-rw-r--r--drivers/media/radio/wl128x/fmdrv_common.h2
-rw-r--r--drivers/media/rc/ene_ir.c4
-rw-r--r--drivers/media/rc/imon.c2
-rw-r--r--drivers/media/rc/ir-raw.c2
-rw-r--r--drivers/media/rc/keymaps/rc-lme2510.c4
-rw-r--r--drivers/media/rc/keymaps/rc-msi-tvanywhere.c2
-rw-r--r--drivers/media/rc/keymaps/rc-norwood.c2
-rw-r--r--drivers/media/rc/rc-main.c4
-rw-r--r--drivers/media/video/au0828/au0828-video.c2
-rw-r--r--drivers/media/video/bt8xx/bttv-cards.c6
-rw-r--r--drivers/media/video/bt8xx/bttv-gpio.c2
-rw-r--r--drivers/media/video/cafe_ccic.c2
-rw-r--r--drivers/media/video/cx18/cx18-av-core.h2
-rw-r--r--drivers/media/video/cx18/cx18-ioctl.c2
-rw-r--r--drivers/media/video/cx18/cx18-vbi.c2
-rw-r--r--drivers/media/video/cx231xx/cx231xx-avcore.c2
-rw-r--r--drivers/media/video/cx231xx/cx231xx-vbi.c2
-rw-r--r--drivers/media/video/cx231xx/cx231xx-video.c2
-rw-r--r--drivers/media/video/cx23885/cimax2.c2
-rw-r--r--drivers/media/video/cx23885/cx23885.h2
-rw-r--r--drivers/media/video/cx25840/cx25840-core.c10
-rw-r--r--drivers/media/video/davinci/dm644x_ccdc.c4
-rw-r--r--drivers/media/video/davinci/vpfe_capture.c2
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c4
-rw-r--r--drivers/media/video/gspca/gl860/gl860-mi1320.c2
-rw-r--r--drivers/media/video/gspca/gspca.c4
-rw-r--r--drivers/media/video/gspca/mars.c2
-rw-r--r--drivers/media/video/gspca/mr97310a.c2
-rw-r--r--drivers/media/video/gspca/ov519.c4
-rw-r--r--drivers/media/video/gspca/sonixb.c2
-rw-r--r--drivers/media/video/gspca/spca500.c4
-rw-r--r--drivers/media/video/gspca/spca508.c2
-rw-r--r--drivers/media/video/gspca/sq905.c2
-rw-r--r--drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c2
-rw-r--r--drivers/media/video/hexium_gemini.c2
-rw-r--r--drivers/media/video/ivtv/ivtv-firmware.c4
-rw-r--r--drivers/media/video/ivtv/ivtvfb.c2
-rw-r--r--drivers/media/video/msp3400-driver.c4
-rw-r--r--drivers/media/video/msp3400-kthreads.c2
-rw-r--r--drivers/media/video/omap/omap_vout.c4
-rw-r--r--drivers/media/video/omap/omap_voutlib.c6
-rw-r--r--drivers/media/video/omap1_camera.c4
-rw-r--r--drivers/media/video/omap3isp/isp.c8
-rw-r--r--drivers/media/video/omap3isp/ispccdc.h4
-rw-r--r--drivers/media/video/omap3isp/ispccp2.c2
-rw-r--r--drivers/media/video/omap3isp/ispcsi2.c2
-rw-r--r--drivers/media/video/omap3isp/isppreview.c20
-rw-r--r--drivers/media/video/omap3isp/isppreview.h2
-rw-r--r--drivers/media/video/omap3isp/ispqueue.h4
-rw-r--r--drivers/media/video/omap3isp/ispresizer.c4
-rw-r--r--drivers/media/video/omap3isp/ispvideo.c6
-rw-r--r--drivers/media/video/ov6650.c2
-rw-r--r--drivers/media/video/ov9640.c2
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-eeprom.c2
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-hdw.h2
-rw-r--r--drivers/media/video/pxa_camera.c2
-rw-r--r--drivers/media/video/s5p-fimc/fimc-reg.c2
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c4
-rw-r--r--drivers/media/video/saa7164/saa7164-cmd.c2
-rw-r--r--drivers/media/video/saa7164/saa7164-fw.c2
-rw-r--r--drivers/media/video/saa7164/saa7164-types.h2
-rw-r--r--drivers/media/video/sn9c102/sn9c102_core.c2
-rw-r--r--drivers/media/video/sn9c102/sn9c102_sensor.h2
-rw-r--r--drivers/media/video/tcm825x.c4
-rw-r--r--drivers/media/video/tvaudio.c10
-rw-r--r--drivers/media/video/uvc/uvc_video.c8
-rw-r--r--drivers/media/video/v4l2-ioctl.c2
-rw-r--r--drivers/media/video/vpx3220.c2
-rw-r--r--drivers/media/video/zoran/videocodec.h2
-rw-r--r--drivers/media/video/zoran/zoran.h2
-rw-r--r--drivers/media/video/zoran/zoran_driver.c2
-rw-r--r--drivers/memstick/core/mspro_block.c2
-rw-r--r--drivers/memstick/host/r592.c2
-rw-r--r--drivers/memstick/host/r592.h6
-rw-r--r--drivers/message/fusion/lsi/mpi_log_fc.h4
-rw-r--r--drivers/message/fusion/lsi/mpi_log_sas.h14
-rw-r--r--drivers/message/fusion/mptbase.c6
-rw-r--r--drivers/message/fusion/mptctl.c4
-rw-r--r--drivers/message/fusion/mptsas.c8
-rw-r--r--drivers/message/i2o/README2
-rw-r--r--drivers/message/i2o/device.c8
-rw-r--r--drivers/message/i2o/i2o_block.c4
-rw-r--r--drivers/message/i2o/i2o_block.h2
-rw-r--r--drivers/message/i2o/i2o_scsi.c2
-rw-r--r--drivers/mfd/Kconfig2
-rw-r--r--drivers/mfd/ab8500-gpadc.c2
-rw-r--r--drivers/mfd/ezx-pcap.c4
-rw-r--r--drivers/mfd/omap-usb-host.c2
-rw-r--r--drivers/mfd/pcf50633-core.c4
-rw-r--r--drivers/mfd/twl6030-irq.c4
-rw-r--r--drivers/mfd/ucb1400_core.c2
-rw-r--r--drivers/misc/bmp085.c4
-rw-r--r--drivers/misc/c2port/c2port-duramar2150.c2
-rw-r--r--drivers/misc/ibmasm/remote.h2
-rw-r--r--drivers/misc/iwmc3200top/main.c2
-rw-r--r--drivers/misc/kgdbts.c2
-rw-r--r--drivers/misc/sgi-gru/grukservices.c2
-rw-r--r--drivers/misc/sgi-gru/grutables.h2
-rw-r--r--drivers/misc/ti-st/st_kim.c2
-rw-r--r--drivers/mmc/card/mmc_test.c2
-rw-r--r--drivers/mmc/core/mmc.c2
-rw-r--r--drivers/mmc/core/mmc_ops.c2
-rw-r--r--drivers/mmc/core/sdio_irq.c2
-rw-r--r--drivers/mmc/host/atmel-mci.c4
-rw-r--r--drivers/mmc/host/mmc_spi.c2
-rw-r--r--drivers/mmc/host/s3cmci.c6
-rw-r--r--drivers/mmc/host/tmio_mmc_pio.c2
-rw-r--r--drivers/mmc/host/wbsd.c6
-rw-r--r--drivers/mtd/chips/Kconfig2
-rw-r--r--drivers/mtd/chips/cfi_cmdset_0001.c4
-rw-r--r--drivers/mtd/chips/cfi_cmdset_0002.c10
-rw-r--r--drivers/mtd/chips/cfi_util.c2
-rw-r--r--drivers/mtd/chips/jedec_probe.c2
-rw-r--r--drivers/mtd/devices/block2mtd.c2
-rw-r--r--drivers/mtd/devices/doc2001plus.c2
-rw-r--r--drivers/mtd/devices/docecc.c4
-rw-r--r--drivers/mtd/devices/lart.c4
-rw-r--r--drivers/mtd/devices/pmc551.c4
-rw-r--r--drivers/mtd/lpddr/lpddr_cmds.c4
-rw-r--r--drivers/mtd/maps/ceiva.c4
-rw-r--r--drivers/mtd/maps/cfi_flagadm.c2
-rw-r--r--drivers/mtd/maps/pcmciamtd.c2
-rw-r--r--drivers/mtd/maps/pmcmsp-flash.c2
-rw-r--r--drivers/mtd/maps/sc520cdp.c2
-rw-r--r--drivers/mtd/maps/tqm8xxl.c2
-rw-r--r--drivers/mtd/mtdblock.c2
-rw-r--r--drivers/mtd/mtdchar.c2
-rw-r--r--drivers/mtd/nand/Kconfig2
-rw-r--r--drivers/mtd/nand/ams-delta.c2
-rw-r--r--drivers/mtd/nand/autcpu12.c2
-rw-r--r--drivers/mtd/nand/cs553x_nand.c2
-rw-r--r--drivers/mtd/nand/denali.c6
-rw-r--r--drivers/mtd/nand/diskonchip.c8
-rw-r--r--drivers/mtd/nand/fsl_elbc_nand.c2
-rw-r--r--drivers/mtd/nand/fsmc_nand.c10
-rw-r--r--drivers/mtd/nand/nand_base.c2
-rw-r--r--drivers/mtd/nand/nand_bbt.c2
-rw-r--r--drivers/mtd/nand/nandsim.c2
-rw-r--r--drivers/mtd/nand/nomadik_nand.c2
-rw-r--r--drivers/mtd/nand/pasemi_nand.c2
-rw-r--r--drivers/mtd/nand/plat_nand.c2
-rw-r--r--drivers/mtd/nand/pxa3xx_nand.c2
-rw-r--r--drivers/mtd/nand/r852.c10
-rw-r--r--drivers/mtd/nand/sh_flctl.c2
-rw-r--r--drivers/mtd/nand/sm_common.c2
-rw-r--r--drivers/mtd/nand/tmio_nand.c2
-rw-r--r--drivers/mtd/onenand/omap2.c4
-rw-r--r--drivers/mtd/onenand/onenand_sim.c4
-rw-r--r--drivers/mtd/sm_ftl.c4
-rw-r--r--drivers/mtd/ubi/Kconfig2
-rw-r--r--drivers/mtd/ubi/io.c8
-rw-r--r--drivers/mtd/ubi/scan.c2
-rw-r--r--drivers/mtd/ubi/vmt.c5
-rw-r--r--drivers/net/3c501.c6
-rw-r--r--drivers/net/3c523.c2
-rw-r--r--drivers/net/3c527.c4
-rw-r--r--drivers/net/3c59x.c2
-rw-r--r--drivers/net/acenic.c4
-rw-r--r--drivers/net/amd8111e.c2
-rw-r--r--drivers/net/at1700.c2
-rw-r--r--drivers/net/atl1e/atl1e_main.c2
-rw-r--r--drivers/net/atlx/atl2.c2
-rw-r--r--drivers/net/bcm63xx_enet.c2
-rw-r--r--drivers/net/benet/be_cmds.c2
-rw-r--r--drivers/net/benet/be_main.c2
-rw-r--r--drivers/net/bna/bna_hw.h2
-rw-r--r--drivers/net/bnx2x/bnx2x.h2
-rw-r--r--drivers/net/bnx2x/bnx2x_hsi.h2
-rw-r--r--drivers/net/bnx2x/bnx2x_link.c14
-rw-r--r--drivers/net/bnx2x/bnx2x_main.c10
-rw-r--r--drivers/net/bnx2x/bnx2x_reg.h44
-rw-r--r--drivers/net/bonding/bond_alb.h2
-rw-r--r--drivers/net/caif/caif_shmcore.c2
-rw-r--r--drivers/net/caif/caif_spi.c2
-rw-r--r--drivers/net/caif/caif_spi_slave.c4
-rw-r--r--drivers/net/can/at91_can.c4
-rw-r--r--drivers/net/can/c_can/c_can.c4
-rw-r--r--drivers/net/can/janz-ican3.c8
-rw-r--r--drivers/net/can/mscan/mscan.c2
-rw-r--r--drivers/net/can/sja1000/sja1000.c2
-rw-r--r--drivers/net/can/softing/softing.h2
-rw-r--r--drivers/net/can/softing/softing_main.c2
-rw-r--r--drivers/net/can/ti_hecc.c2
-rw-r--r--drivers/net/can/usb/ems_usb.c2
-rw-r--r--drivers/net/can/usb/esd_usb2.c2
-rw-r--r--drivers/net/cassini.c4
-rw-r--r--drivers/net/cassini.h2
-rw-r--r--drivers/net/chelsio/mv88e1xxx.c2
-rw-r--r--drivers/net/chelsio/pm3393.c2
-rw-r--r--drivers/net/chelsio/sge.c2
-rw-r--r--drivers/net/chelsio/vsc7326.c2
-rw-r--r--drivers/net/cris/eth_v10.c2
-rw-r--r--drivers/net/cxgb3/sge.c2
-rw-r--r--drivers/net/cxgb3/t3_hw.c6
-rw-r--r--drivers/net/cxgb4/t4_hw.c2
-rw-r--r--drivers/net/cxgb4vf/cxgb4vf_main.c2
-rw-r--r--drivers/net/cxgb4vf/sge.c8
-rw-r--r--drivers/net/davinci_emac.c8
-rw-r--r--drivers/net/e1000/e1000_ethtool.c2
-rw-r--r--drivers/net/e1000/e1000_hw.h2
-rw-r--r--drivers/net/e1000/e1000_main.c2
-rw-r--r--drivers/net/e1000e/netdev.c2
-rw-r--r--drivers/net/enc28j60_hw.h2
-rw-r--r--drivers/net/eth16i.c2
-rw-r--r--drivers/net/ethoc.c2
-rw-r--r--drivers/net/fec.h4
-rw-r--r--drivers/net/forcedeth.c14
-rw-r--r--drivers/net/gianfar.h2
-rw-r--r--drivers/net/hamradio/Makefile2
-rw-r--r--drivers/net/hamradio/yam.c2
-rw-r--r--drivers/net/hp100.c16
-rw-r--r--drivers/net/hp100.h2
-rw-r--r--drivers/net/ibm_newemac/tah.c2
-rw-r--r--drivers/net/ibmlana.c4
-rw-r--r--drivers/net/ibmlana.h2
-rw-r--r--drivers/net/igb/e1000_mac.c4
-rw-r--r--drivers/net/igb/e1000_phy.c2
-rw-r--r--drivers/net/igb/igb_main.c14
-rw-r--r--drivers/net/igbvf/netdev.c2
-rw-r--r--drivers/net/ipg.c28
-rw-r--r--drivers/net/irda/ali-ircc.c4
-rw-r--r--drivers/net/irda/donauboe.c2
-rw-r--r--drivers/net/irda/donauboe.h2
-rw-r--r--drivers/net/irda/girbil-sir.c2
-rw-r--r--drivers/net/irda/irda-usb.c4
-rw-r--r--drivers/net/irda/mcs7780.c6
-rw-r--r--drivers/net/irda/nsc-ircc.c2
-rw-r--r--drivers/net/irda/nsc-ircc.h2
-rw-r--r--drivers/net/irda/pxaficp_ir.c4
-rw-r--r--drivers/net/irda/smsc-ircc2.c2
-rw-r--r--drivers/net/irda/via-ircc.c4
-rw-r--r--drivers/net/irda/vlsi_ir.h4
-rw-r--r--drivers/net/ixgbe/ixgbe_dcb.c2
-rw-r--r--drivers/net/ixgbe/ixgbe_dcb_nl.c4
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c8
-rw-r--r--drivers/net/ixgbe/ixgbe_phy.c2
-rw-r--r--drivers/net/ixgbe/ixgbe_x540.c2
-rw-r--r--drivers/net/ixgbevf/ixgbevf_main.c2
-rw-r--r--drivers/net/ks8842.c2
-rw-r--r--drivers/net/ks8851.c8
-rw-r--r--drivers/net/ks8851_mll.c4
-rw-r--r--drivers/net/lib8390.c4
-rw-r--r--drivers/net/lp486e.c2
-rw-r--r--drivers/net/meth.h4
-rw-r--r--drivers/net/mlx4/en_main.c2
-rw-r--r--drivers/net/mlx4/en_netdev.c10
-rw-r--r--drivers/net/mlx4/en_rx.c2
-rw-r--r--drivers/net/mlx4/en_selftest.c2
-rw-r--r--drivers/net/mlx4/en_tx.c2
-rw-r--r--drivers/net/mlx4/mcg.c2
-rw-r--r--drivers/net/mlx4/port.c4
-rw-r--r--drivers/net/myri10ge/myri10ge.c2
-rw-r--r--drivers/net/myri_sbus.c2
-rw-r--r--drivers/net/natsemi.c6
-rw-r--r--drivers/net/netxen/netxen_nic_hdr.h2
-rw-r--r--drivers/net/ns83820.c4
-rw-r--r--drivers/net/pch_gbe/pch_gbe.h14
-rw-r--r--drivers/net/pch_gbe/pch_gbe_ethtool.c2
-rw-r--r--drivers/net/pch_gbe/pch_gbe_main.c4
-rw-r--r--drivers/net/pci-skeleton.c2
-rw-r--r--drivers/net/pcmcia/3c574_cs.c2
-rw-r--r--drivers/net/pcmcia/axnet_cs.c4
-rw-r--r--drivers/net/pcmcia/smc91c92_cs.c2
-rw-r--r--drivers/net/pcnet32.c2
-rw-r--r--drivers/net/phy/phy_device.c4
-rw-r--r--drivers/net/ppp_generic.c2
-rw-r--r--drivers/net/ppp_synctty.c2
-rw-r--r--drivers/net/pppoe.c2
-rw-r--r--drivers/net/ps3_gelic_net.c4
-rw-r--r--drivers/net/ps3_gelic_net.h2
-rw-r--r--drivers/net/ps3_gelic_wireless.c2
-rw-r--r--drivers/net/pxa168_eth.c2
-rw-r--r--drivers/net/qla3xxx.h2
-rw-r--r--drivers/net/qlge/qlge_main.c10
-rw-r--r--drivers/net/r6040.c2
-rw-r--r--drivers/net/s2io.c6
-rw-r--r--drivers/net/s2io.h2
-rw-r--r--drivers/net/sfc/falcon.c4
-rw-r--r--drivers/net/sfc/mcdi.c2
-rw-r--r--drivers/net/sfc/mcdi_pcol.h6
-rw-r--r--drivers/net/sfc/mcdi_phy.c2
-rw-r--r--drivers/net/sfc/net_driver.h2
-rw-r--r--drivers/net/sgiseeq.c4
-rw-r--r--drivers/net/sh_eth.c2
-rw-r--r--drivers/net/sis190.c4
-rw-r--r--drivers/net/sis900.c6
-rw-r--r--drivers/net/skfp/ess.c8
-rw-r--r--drivers/net/skfp/fplustm.c6
-rw-r--r--drivers/net/skfp/h/cmtdef.h4
-rw-r--r--drivers/net/skfp/h/fplustm.h4
-rw-r--r--drivers/net/skfp/h/smc.h2
-rw-r--r--drivers/net/skfp/h/smt.h2
-rw-r--r--drivers/net/skfp/h/supern_2.h4
-rw-r--r--drivers/net/skfp/hwmtm.c2
-rw-r--r--drivers/net/skfp/pcmplc.c6
-rw-r--r--drivers/net/skfp/smt.c2
-rw-r--r--drivers/net/skge.h8
-rw-r--r--drivers/net/sky2.c4
-rw-r--r--drivers/net/sky2.h6
-rw-r--r--drivers/net/smc91x.h2
-rw-r--r--drivers/net/smsc911x.c2
-rw-r--r--drivers/net/smsc9420.c2
-rw-r--r--drivers/net/stmmac/norm_desc.c2
-rw-r--r--drivers/net/sunbmac.h2
-rw-r--r--drivers/net/sungem.c2
-rw-r--r--drivers/net/sunhme.h2
-rw-r--r--drivers/net/tc35815.c38
-rw-r--r--drivers/net/tehuti.c12
-rw-r--r--drivers/net/tehuti.h2
-rw-r--r--drivers/net/tg3.c2
-rw-r--r--drivers/net/tg3.h4
-rw-r--r--drivers/net/tokenring/3c359.c2
-rw-r--r--drivers/net/tokenring/madgemc.c6
-rw-r--r--drivers/net/tokenring/smctr.c12
-rw-r--r--drivers/net/tokenring/tms380tr.h2
-rw-r--r--drivers/net/tsi108_eth.h8
-rw-r--r--drivers/net/tulip/de4x5.c6
-rw-r--r--drivers/net/tulip/dmfe.c2
-rw-r--r--drivers/net/tulip/eeprom.c2
-rw-r--r--drivers/net/typhoon.c2
-rw-r--r--drivers/net/ucc_geth.h4
-rw-r--r--drivers/net/usb/cdc_eem.c2
-rw-r--r--drivers/net/usb/kaweth.c2
-rw-r--r--drivers/net/via-rhine.c4
-rw-r--r--drivers/net/via-velocity.c4
-rw-r--r--drivers/net/vmxnet3/vmxnet3_drv.c4
-rw-r--r--drivers/net/vxge/vxge-config.c2
-rw-r--r--drivers/net/vxge/vxge-main.c8
-rw-r--r--drivers/net/vxge/vxge-traffic.c4
-rw-r--r--drivers/net/vxge/vxge-traffic.h2
-rw-r--r--drivers/net/wan/cosa.c2
-rw-r--r--drivers/net/wan/dscc4.c8
-rw-r--r--drivers/net/wan/hostess_sv11.c2
-rw-r--r--drivers/net/wan/ixp4xx_hss.c4
-rw-r--r--drivers/net/wan/lmc/lmc_main.c2
-rw-r--r--drivers/net/wan/lmc/lmc_var.h6
-rw-r--r--drivers/net/wan/z85230.c8
-rw-r--r--drivers/net/wimax/i2400m/control.c4
-rw-r--r--drivers/net/wimax/i2400m/driver.c4
-rw-r--r--drivers/net/wimax/i2400m/fw.c4
-rw-r--r--drivers/net/wimax/i2400m/i2400m-usb.h6
-rw-r--r--drivers/net/wimax/i2400m/i2400m.h4
-rw-r--r--drivers/net/wimax/i2400m/netdev.c2
-rw-r--r--drivers/net/wimax/i2400m/op-rfkill.c4
-rw-r--r--drivers/net/wimax/i2400m/rx.c4
-rw-r--r--drivers/net/wimax/i2400m/tx.c4
-rw-r--r--drivers/net/wimax/i2400m/usb-fw.c2
-rw-r--r--drivers/net/wimax/i2400m/usb-rx.c2
-rw-r--r--drivers/net/wimax/i2400m/usb-tx.c2
-rw-r--r--drivers/net/wireless/airo.c14
-rw-r--r--drivers/net/wireless/ath/ar9170/main.c2
-rw-r--r--drivers/net/wireless/ath/ar9170/phy.c2
-rw-r--r--drivers/net/wireless/ath/ath5k/ani.h2
-rw-r--r--drivers/net/wireless/ath/ath5k/base.c6
-rw-r--r--drivers/net/wireless/ath/ath5k/desc.c14
-rw-r--r--drivers/net/wireless/ath/ath5k/eeprom.c4
-rw-r--r--drivers/net/wireless/ath/ath5k/pci.c2
-rw-r--r--drivers/net/wireless/ath/ath5k/pcu.c6
-rw-r--r--drivers/net/wireless/ath/ath5k/phy.c22
-rw-r--r--drivers/net/wireless/ath/ath5k/reg.h12
-rw-r--r--drivers/net/wireless/ath/ath9k/ar5008_phy.c2
-rw-r--r--drivers/net/wireless/ath/ath9k/ar9003_eeprom.c2
-rw-r--r--drivers/net/wireless/ath/ath9k/htc_hst.c2
-rw-r--r--drivers/net/wireless/ath/ath9k/pci.c2
-rw-r--r--drivers/net/wireless/ath/ath9k/rc.c2
-rw-r--r--drivers/net/wireless/ath/ath9k/xmit.c4
-rw-r--r--drivers/net/wireless/ath/carl9170/carl9170.h2
-rw-r--r--drivers/net/wireless/ath/carl9170/phy.c2
-rw-r--r--drivers/net/wireless/ath/carl9170/rx.c2
-rw-r--r--drivers/net/wireless/ath/carl9170/usb.c2
-rw-r--r--drivers/net/wireless/ath/hw.c2
-rw-r--r--drivers/net/wireless/ath/regd.c4
-rw-r--r--drivers/net/wireless/atmel.c4
-rw-r--r--drivers/net/wireless/atmel_cs.c2
-rw-r--r--drivers/net/wireless/b43/b43.h2
-rw-r--r--drivers/net/wireless/b43/main.c2
-rw-r--r--drivers/net/wireless/b43/phy_g.h2
-rw-r--r--drivers/net/wireless/b43/phy_n.h2
-rw-r--r--drivers/net/wireless/b43legacy/b43legacy.h2
-rw-r--r--drivers/net/wireless/hostap/hostap_ap.c2
-rw-r--r--drivers/net/wireless/hostap/hostap_ap.h2
-rw-r--r--drivers/net/wireless/hostap/hostap_ioctl.c4
-rw-r--r--drivers/net/wireless/hostap/hostap_wlan.h2
-rw-r--r--drivers/net/wireless/ipw2x00/ipw2100.c2
-rw-r--r--drivers/net/wireless/ipw2x00/ipw2200.c18
-rw-r--r--drivers/net/wireless/ipw2x00/libipw_rx.c2
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-core.c2
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-fh.h2
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-scan.c2
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-sta.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-ict.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-fh.h2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-scan.c2
-rw-r--r--drivers/net/wireless/iwmc3200wifi/hal.c4
-rw-r--r--drivers/net/wireless/iwmc3200wifi/tx.c2
-rw-r--r--drivers/net/wireless/libertas/README4
-rw-r--r--drivers/net/wireless/libertas/cfg.c2
-rw-r--r--drivers/net/wireless/libertas/if_cs.c2
-rw-r--r--drivers/net/wireless/libertas/if_spi.h2
-rw-r--r--drivers/net/wireless/mac80211_hwsim.c2
-rw-r--r--drivers/net/wireless/orinoco/hw.c2
-rw-r--r--drivers/net/wireless/p54/main.c2
-rw-r--r--drivers/net/wireless/p54/p54spi.c2
-rw-r--r--drivers/net/wireless/prism54/islpci_eth.c4
-rw-r--r--drivers/net/wireless/rayctl.h2
-rw-r--r--drivers/net/wireless/rt2x00/rt2800.h2
-rw-r--r--drivers/net/wireless/rt2x00/rt2800lib.c2
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00.h8
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00config.c2
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00crypto.c2
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00dump.h2
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00link.c2
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00queue.c6
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00queue.h12
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00usb.c2
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00usb.h2
-rw-r--r--drivers/net/wireless/rtlwifi/base.c2
-rw-r--r--drivers/net/wireless/rtlwifi/pci.c2
-rw-r--r--drivers/net/wireless/rtlwifi/regd.c2
-rw-r--r--drivers/net/wireless/rtlwifi/wifi.h2
-rw-r--r--drivers/net/wireless/wl1251/cmd.c2
-rw-r--r--drivers/net/wireless/wl1251/rx.c2
-rw-r--r--drivers/net/wireless/wl12xx/cmd.c2
-rw-r--r--drivers/net/wireless/wl12xx/conf.h8
-rw-r--r--drivers/net/wireless/wl12xx/io.h2
-rw-r--r--drivers/net/wireless/wl3501_cs.c4
-rw-r--r--drivers/net/wireless/zd1211rw/zd_rf_rf2959.c2
-rw-r--r--drivers/net/wireless/zd1211rw/zd_rf_uw2453.c2
-rw-r--r--drivers/net/xilinx_emaclite.c2
-rw-r--r--drivers/net/znet.c2
-rw-r--r--drivers/of/fdt.c2
-rw-r--r--drivers/of/of_mdio.c2
-rw-r--r--drivers/parisc/pdc_stable.c4
-rw-r--r--drivers/parport/Kconfig2
-rw-r--r--drivers/parport/ieee1284.c2
-rw-r--r--drivers/parport/parport_pc.c6
-rw-r--r--drivers/pci/hotplug/acpi_pcihp.c2
-rw-r--r--drivers/pci/hotplug/acpiphp_glue.c2
-rw-r--r--drivers/pci/hotplug/rpaphp_core.c2
-rw-r--r--drivers/pci/intel-iommu.c2
-rw-r--r--drivers/pci/intr_remapping.c2
-rw-r--r--drivers/pci/iova.c2
-rw-r--r--drivers/pci/pci-sysfs.c2
-rw-r--r--drivers/pci/quirks.c4
-rw-r--r--drivers/pcmcia/i82092.c2
-rw-r--r--drivers/pcmcia/pcmcia_resource.c2
-rw-r--r--drivers/pcmcia/pxa2xx_lubbock.c2
-rw-r--r--drivers/pcmcia/ti113x.h2
-rw-r--r--drivers/platform/x86/intel_mid_thermal.c2
-rw-r--r--drivers/pnp/card.c4
-rw-r--r--drivers/pnp/pnpbios/bioscalls.c2
-rw-r--r--drivers/pps/Kconfig2
-rw-r--r--drivers/ps3/ps3-lpm.c6
-rw-r--r--drivers/ps3/ps3-sys-manager.c2
-rw-r--r--drivers/rapidio/rio-scan.c2
-rw-r--r--drivers/regulator/core.c2
-rw-r--r--drivers/regulator/max8952.c2
-rw-r--r--drivers/rtc/interface.c2
-rw-r--r--drivers/rtc/rtc-at91rm9200.c2
-rw-r--r--drivers/rtc/rtc-bfin.c4
-rw-r--r--drivers/rtc/rtc-lpc32xx.c2
-rw-r--r--drivers/rtc/rtc-x1205.c2
-rw-r--r--drivers/s390/block/dasd_3990_erp.c6
-rw-r--r--drivers/s390/block/dasd_devmap.c2
-rw-r--r--drivers/s390/block/dasd_eckd.c2
-rw-r--r--drivers/s390/char/raw3270.c2
-rw-r--r--drivers/s390/char/tape_char.c2
-rw-r--r--drivers/s390/char/tty3270.c2
-rw-r--r--drivers/s390/cio/device_fsm.c4
-rw-r--r--drivers/s390/crypto/zcrypt_api.h2
-rw-r--r--drivers/s390/net/claw.c2
-rw-r--r--drivers/s390/net/ctcm_fsms.c2
-rw-r--r--drivers/s390/net/lcs.c2
-rw-r--r--drivers/s390/net/qeth_core_main.c2
-rw-r--r--drivers/s390/scsi/zfcp_fsf.c2
-rw-r--r--drivers/s390/scsi/zfcp_qdio.c2
-rw-r--r--drivers/sbus/char/jsflash.c2
-rw-r--r--drivers/sbus/char/max1617.h2
-rw-r--r--drivers/scsi/3w-9xxx.h2
-rw-r--r--drivers/scsi/3w-xxxx.h2
-rw-r--r--drivers/scsi/53c700.scr2
-rw-r--r--drivers/scsi/53c700_d.h_shipped2
-rw-r--r--drivers/scsi/FlashPoint.c4
-rw-r--r--drivers/scsi/NCR5380.c8
-rw-r--r--drivers/scsi/aacraid/aachba.c4
-rw-r--r--drivers/scsi/aacraid/aacraid.h2
-rw-r--r--drivers/scsi/aacraid/commsup.c2
-rw-r--r--drivers/scsi/advansys.c2
-rw-r--r--drivers/scsi/aha1740.c2
-rw-r--r--drivers/scsi/aic7xxx/aic79xx.h4
-rw-r--r--drivers/scsi/aic7xxx/aic79xx.reg24
-rw-r--r--drivers/scsi/aic7xxx/aic79xx.seq18
-rw-r--r--drivers/scsi/aic7xxx/aic79xx_core.c24
-rw-r--r--drivers/scsi/aic7xxx/aic79xx_osm.c2
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx.h4
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx.reg2
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx.seq10
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx_core.c18
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx_osm.c4
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx_pci.c6
-rw-r--r--drivers/scsi/aic7xxx/aicasm/aicasm_gram.y8
-rw-r--r--drivers/scsi/aic7xxx/aicasm/aicasm_macro_gram.y2
-rw-r--r--drivers/scsi/aic7xxx_old.c12
-rw-r--r--drivers/scsi/aic7xxx_old/aic7xxx.seq8
-rw-r--r--drivers/scsi/aic94xx/aic94xx_reg_def.h2
-rw-r--r--drivers/scsi/arm/acornscsi.c4
-rw-r--r--drivers/scsi/arm/acornscsi.h6
-rw-r--r--drivers/scsi/arm/arxescsi.c2
-rw-r--r--drivers/scsi/arm/cumana_2.c2
-rw-r--r--drivers/scsi/arm/eesox.c2
-rw-r--r--drivers/scsi/arm/fas216.c4
-rw-r--r--drivers/scsi/arm/fas216.h10
-rw-r--r--drivers/scsi/arm/powertec.c2
-rw-r--r--drivers/scsi/atari_NCR5380.c6
-rw-r--r--drivers/scsi/atp870u.c2
-rw-r--r--drivers/scsi/be2iscsi/be_cmds.h18
-rw-r--r--drivers/scsi/bfa/bfa_core.c2
-rw-r--r--drivers/scsi/bfa/bfa_defs_svc.h6
-rw-r--r--drivers/scsi/bfa/bfa_fc.h2
-rw-r--r--drivers/scsi/bfa/bfa_fcs.c2
-rw-r--r--drivers/scsi/bfa/bfa_fcs.h2
-rw-r--r--drivers/scsi/bfa/bfa_fcs_lport.c2
-rw-r--r--drivers/scsi/bfa/bfa_svc.c4
-rw-r--r--drivers/scsi/bfa/bfa_svc.h2
-rw-r--r--drivers/scsi/bfa/bfad.c2
-rw-r--r--drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h2
-rw-r--r--drivers/scsi/bnx2fc/bnx2fc_els.c2
-rw-r--r--drivers/scsi/bnx2fc/bnx2fc_io.c4
-rw-r--r--drivers/scsi/bnx2fc/bnx2fc_tgt.c2
-rw-r--r--drivers/scsi/bnx2i/bnx2i_hwi.c2
-rw-r--r--drivers/scsi/cxgbi/libcxgbi.h6
-rw-r--r--drivers/scsi/dc395x.c14
-rw-r--r--drivers/scsi/dc395x.h2
-rw-r--r--drivers/scsi/device_handler/scsi_dh_alua.c4
-rw-r--r--drivers/scsi/dpt/sys_info.h6
-rw-r--r--drivers/scsi/eata.c2
-rw-r--r--drivers/scsi/fcoe/fcoe_ctlr.c4
-rw-r--r--drivers/scsi/fdomain.c2
-rw-r--r--drivers/scsi/fnic/fnic_fcs.c2
-rw-r--r--drivers/scsi/fnic/fnic_scsi.c4
-rw-r--r--drivers/scsi/g_NCR5380.c4
-rw-r--r--drivers/scsi/gdth.h2
-rw-r--r--drivers/scsi/gvp11.c2
-rw-r--r--drivers/scsi/imm.c2
-rw-r--r--drivers/scsi/initio.c4
-rw-r--r--drivers/scsi/initio.h4
-rw-r--r--drivers/scsi/ips.c4
-rw-r--r--drivers/scsi/ips.h2
-rw-r--r--drivers/scsi/iscsi_tcp.c2
-rw-r--r--drivers/scsi/libfc/fc_exch.c4
-rw-r--r--drivers/scsi/libfc/fc_fcp.c4
-rw-r--r--drivers/scsi/libfc/fc_lport.c18
-rw-r--r--drivers/scsi/libsas/sas_expander.c2
-rw-r--r--drivers/scsi/lpfc/lpfc_attr.c2
-rw-r--r--drivers/scsi/lpfc/lpfc_bsg.c2
-rw-r--r--drivers/scsi/lpfc/lpfc_debugfs.c8
-rw-r--r--drivers/scsi/lpfc/lpfc_els.c4
-rw-r--r--drivers/scsi/lpfc/lpfc_hbadisc.c16
-rw-r--r--drivers/scsi/lpfc/lpfc_init.c20
-rw-r--r--drivers/scsi/lpfc/lpfc_mbox.c2
-rw-r--r--drivers/scsi/lpfc/lpfc_nl.h2
-rw-r--r--drivers/scsi/lpfc/lpfc_nportdisc.c2
-rw-r--r--drivers/scsi/lpfc/lpfc_scsi.c10
-rw-r--r--drivers/scsi/lpfc/lpfc_scsi.h2
-rw-r--r--drivers/scsi/lpfc/lpfc_sli.c26
-rw-r--r--drivers/scsi/megaraid.c4
-rw-r--r--drivers/scsi/megaraid.h6
-rw-r--r--drivers/scsi/megaraid/mbox_defs.h8
-rw-r--r--drivers/scsi/megaraid/megaraid_mbox.c6
-rw-r--r--drivers/scsi/megaraid/megaraid_sas.h2
-rw-r--r--drivers/scsi/megaraid/megaraid_sas_base.c2
-rw-r--r--drivers/scsi/mpt2sas/mpi/mpi2_init.h2
-rw-r--r--drivers/scsi/mpt2sas/mpt2sas_base.c12
-rw-r--r--drivers/scsi/mpt2sas/mpt2sas_config.c2
-rw-r--r--drivers/scsi/mpt2sas/mpt2sas_ctl.c2
-rw-r--r--drivers/scsi/mpt2sas/mpt2sas_scsih.c20
-rw-r--r--drivers/scsi/ncr53c8xx.c2
-rw-r--r--drivers/scsi/nsp32.c6
-rw-r--r--drivers/scsi/nsp32.h2
-rw-r--r--drivers/scsi/osst.c6
-rw-r--r--drivers/scsi/osst.h2
-rw-r--r--drivers/scsi/pcmcia/nsp_cs.c2
-rw-r--r--drivers/scsi/pm8001/pm8001_hwi.c2
-rw-r--r--drivers/scsi/pm8001/pm8001_hwi.h4
-rw-r--r--drivers/scsi/pm8001/pm8001_sas.h2
-rw-r--r--drivers/scsi/pmcraid.c10
-rw-r--r--drivers/scsi/pmcraid.h2
-rw-r--r--drivers/scsi/qla1280.c2
-rw-r--r--drivers/scsi/qla2xxx/qla_def.h2
-rw-r--r--drivers/scsi/qla2xxx/qla_fw.h2
-rw-r--r--drivers/scsi/qla2xxx/qla_isr.c2
-rw-r--r--drivers/scsi/qla2xxx/qla_mbx.c6
-rw-r--r--drivers/scsi/qla2xxx/qla_nx.c2
-rw-r--r--drivers/scsi/qla2xxx/qla_os.c6
-rw-r--r--drivers/scsi/qla4xxx/ql4_def.h2
-rw-r--r--drivers/scsi/qla4xxx/ql4_init.c2
-rw-r--r--drivers/scsi/qla4xxx/ql4_nvram.h2
-rw-r--r--drivers/scsi/qla4xxx/ql4_os.c8
-rw-r--r--drivers/scsi/scsi_debug.c2
-rw-r--r--drivers/scsi/scsi_netlink.c2
-rw-r--r--drivers/scsi/scsi_tgt_lib.c2
-rw-r--r--drivers/scsi/scsi_transport_fc.c4
-rw-r--r--drivers/scsi/sd.c2
-rw-r--r--drivers/scsi/sr.c2
-rw-r--r--drivers/scsi/sun3_NCR5380.c6
-rw-r--r--drivers/scsi/sym53c416.c2
-rw-r--r--drivers/scsi/sym53c8xx_2/sym_fw1.h2
-rw-r--r--drivers/scsi/sym53c8xx_2/sym_fw2.h2
-rw-r--r--drivers/scsi/sym53c8xx_2/sym_hipd.c4
-rw-r--r--drivers/scsi/sym53c8xx_2/sym_malloc.c2
-rw-r--r--drivers/scsi/wd33c93.c2
-rw-r--r--drivers/scsi/wd7000.c2
-rw-r--r--drivers/sfi/sfi_core.c2
-rw-r--r--drivers/spi/amba-pl022.c16
-rw-r--r--drivers/spi/au1550_spi.c2
-rw-r--r--drivers/spi/dw_spi.c2
-rw-r--r--drivers/spi/dw_spi.h2
-rw-r--r--drivers/spi/ep93xx_spi.c2
-rw-r--r--drivers/spi/pxa2xx_spi.c4
-rw-r--r--drivers/spi/spi.c2
-rw-r--r--drivers/spi/spi_bfin5xx.c2
-rw-r--r--drivers/spi/spi_fsl_espi.c2
-rw-r--r--drivers/ssb/pci.c2
-rw-r--r--drivers/ssb/sprom.c2
-rw-r--r--drivers/staging/Kconfig2
-rw-r--r--drivers/staging/Makefile1
-rw-r--r--drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c6
-rw-r--r--drivers/staging/ath6kl/include/aggr_recv_api.h2
-rw-r--r--drivers/staging/ath6kl/include/common/a_hci.h4
-rw-r--r--drivers/staging/ath6kl/include/common/dbglog.h2
-rw-r--r--drivers/staging/ath6kl/include/common/epping_test.h2
-rw-r--r--drivers/staging/ath6kl/include/common/ini_dset.h2
-rw-r--r--drivers/staging/ath6kl/include/common/testcmd.h4
-rw-r--r--drivers/staging/ath6kl/include/common/wmi.h8
-rw-r--r--drivers/staging/ath6kl/include/common/wmix.h2
-rw-r--r--drivers/staging/ath6kl/include/htc_api.h6
-rw-r--r--drivers/staging/ath6kl/miscdrv/credit_dist.c6
-rw-r--r--drivers/staging/ath6kl/os/linux/ar6000_android.c2
-rw-r--r--drivers/staging/ath6kl/os/linux/ar6000_drv.c8
-rw-r--r--drivers/staging/ath6kl/wmi/wmi.c2
-rw-r--r--drivers/staging/bcm/Adapter.h10
-rw-r--r--drivers/staging/bcm/CmHost.c16
-rw-r--r--drivers/staging/bcm/HostMIBSInterface.h2
-rw-r--r--drivers/staging/bcm/IPv6Protocol.c4
-rw-r--r--drivers/staging/bcm/InterfaceIdleMode.c4
-rw-r--r--drivers/staging/bcm/InterfaceIsr.c4
-rw-r--r--drivers/staging/bcm/InterfaceRx.c10
-rw-r--r--drivers/staging/bcm/Ioctl.h2
-rw-r--r--drivers/staging/bcm/LeakyBucket.c2
-rw-r--r--drivers/staging/bcm/Misc.c6
-rw-r--r--drivers/staging/bcm/Qos.c2
-rw-r--r--drivers/staging/bcm/cntrl_SignalingInterface.h6
-rw-r--r--drivers/staging/bcm/nvm.c54
-rw-r--r--drivers/staging/brcm80211/README2
-rw-r--r--drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c2
-rw-r--r--drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c2
-rw-r--r--drivers/staging/brcm80211/brcmfmac/dhd_linux.c2
-rw-r--r--drivers/staging/brcm80211/brcmfmac/dhd_sdio.c4
-rw-r--r--drivers/staging/brcm80211/brcmsmac/wl_mac80211.c2
-rw-r--r--drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c6
-rw-r--r--drivers/staging/brcm80211/brcmsmac/wlc_bmac.c2
-rw-r--r--drivers/staging/brcm80211/brcmsmac/wlc_main.c13
-rw-r--r--drivers/staging/brcm80211/brcmsmac/wlc_rate.c2
-rw-r--r--drivers/staging/brcm80211/include/bcmsrom_fmt.h2
-rw-r--r--drivers/staging/brcm80211/include/hndsoc.h2
-rw-r--r--drivers/staging/brcm80211/util/bcmotp.c4
-rw-r--r--drivers/staging/brcm80211/util/bcmsrom.c2
-rw-r--r--drivers/staging/brcm80211/util/hnddma.c6
-rw-r--r--drivers/staging/brcm80211/util/sbpcmcia.h2
-rw-r--r--drivers/staging/brcm80211/util/siutils.c2
-rw-r--r--drivers/staging/comedi/comedi_fops.c2
-rw-r--r--drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c8
-rw-r--r--drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c2
-rw-r--r--drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c2
-rw-r--r--drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c18
-rw-r--r--drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h2
-rw-r--r--drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c4
-rw-r--r--drivers/staging/comedi/drivers/adl_pci9118.c6
-rw-r--r--drivers/staging/comedi/drivers/adq12b.c4
-rw-r--r--drivers/staging/comedi/drivers/adv_pci1710.c8
-rw-r--r--drivers/staging/comedi/drivers/cb_pcidas.c6
-rw-r--r--drivers/staging/comedi/drivers/cb_pcidas64.c14
-rw-r--r--drivers/staging/comedi/drivers/comedi_test.c2
-rw-r--r--drivers/staging/comedi/drivers/das1800.c2
-rw-r--r--drivers/staging/comedi/drivers/das800.c2
-rw-r--r--drivers/staging/comedi/drivers/dmm32at.c2
-rw-r--r--drivers/staging/comedi/drivers/dt2811.c2
-rw-r--r--drivers/staging/comedi/drivers/dt9812.c2
-rw-r--r--drivers/staging/comedi/drivers/gsc_hpdi.c4
-rw-r--r--drivers/staging/comedi/drivers/icp_multi.c6
-rw-r--r--drivers/staging/comedi/drivers/me4000.c4
-rw-r--r--drivers/staging/comedi/drivers/mpc624.c14
-rw-r--r--drivers/staging/comedi/drivers/ni_at_a2150.c12
-rw-r--r--drivers/staging/comedi/drivers/ni_labpc.c14
-rw-r--r--drivers/staging/comedi/drivers/ni_pcidio.c2
-rw-r--r--drivers/staging/comedi/drivers/pcl812.c2
-rw-r--r--drivers/staging/comedi/drivers/pcl816.c6
-rw-r--r--drivers/staging/comedi/drivers/pcl818.c6
-rw-r--r--drivers/staging/comedi/drivers/pcmmio.c4
-rw-r--r--drivers/staging/comedi/drivers/pcmuio.c2
-rw-r--r--drivers/staging/comedi/drivers/quatech_daqp_cs.c4
-rw-r--r--drivers/staging/comedi/drivers/rtd520.c12
-rw-r--r--drivers/staging/comedi/drivers/s626.c18
-rw-r--r--drivers/staging/comedi/drivers/usbdux.c22
-rw-r--r--drivers/staging/comedi/drivers/usbduxfast.c8
-rw-r--r--drivers/staging/cptm1217/clearpad_tm1217.c2
-rw-r--r--drivers/staging/crystalhd/crystalhd_cmds.c2
-rw-r--r--drivers/staging/crystalhd/crystalhd_hw.c6
-rw-r--r--drivers/staging/cxt1e1/musycc.c2
-rw-r--r--drivers/staging/cxt1e1/musycc.h4
-rw-r--r--drivers/staging/cxt1e1/pmcc4_defs.h4
-rw-r--r--drivers/staging/cxt1e1/sbecrc.c2
-rw-r--r--drivers/staging/cxt1e1/sbeproc.c2
-rw-r--r--drivers/staging/et131x/et1310_address_map.h4
-rw-r--r--drivers/staging/et131x/et1310_phy.h2
-rw-r--r--drivers/staging/et131x/et1310_rx.c2
-rw-r--r--drivers/staging/et131x/et131x_isr.c2
-rw-r--r--drivers/staging/et131x/et131x_netdev.c2
-rw-r--r--drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h4
-rw-r--r--drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c78
-rw-r--r--drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c44
-rw-r--r--drivers/staging/ft1000/ft1000-usb/ft1000_download.c8
-rw-r--r--drivers/staging/ft1000/ft1000-usb/ft1000_hw.c16
-rw-r--r--drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h2
-rw-r--r--drivers/staging/ft1000/ft1000-usb/ft1000_usb.h2
-rw-r--r--drivers/staging/generic_serial/generic_serial.c2
-rw-r--r--drivers/staging/generic_serial/rio/map.h2
-rw-r--r--drivers/staging/generic_serial/rio/rioboot.c8
-rw-r--r--drivers/staging/generic_serial/rio/riocmd.c2
-rw-r--r--drivers/staging/generic_serial/rio/rioroute.c4
-rw-r--r--drivers/staging/generic_serial/rio/riotty.c4
-rw-r--r--drivers/staging/generic_serial/sx.c8
-rw-r--r--drivers/staging/gma500/psb_drm.h2
-rw-r--r--drivers/staging/gma500/psb_drv.c2
-rw-r--r--drivers/staging/gma500/psb_intel_bios.c2
-rw-r--r--drivers/staging/gma500/psb_intel_sdvo.c2
-rw-r--r--drivers/staging/gma500/psb_intel_sdvo_regs.h2
-rw-r--r--drivers/staging/gma500/psb_ttm_fence_user.h2
-rw-r--r--drivers/staging/go7007/go7007.txt2
-rw-r--r--drivers/staging/hv/blkvsc_drv.c2
-rw-r--r--drivers/staging/hv/channel.c8
-rw-r--r--drivers/staging/hv/channel_mgmt.c2
-rw-r--r--drivers/staging/hv/connection.c4
-rw-r--r--drivers/staging/hv/hv.c2
-rw-r--r--drivers/staging/hv/hv_api.h4
-rw-r--r--drivers/staging/hv/hv_kvp.h2
-rw-r--r--drivers/staging/hv/hv_mouse.c6
-rw-r--r--drivers/staging/hv/hv_util.c2
-rw-r--r--drivers/staging/hv/netvsc_drv.c24
-rw-r--r--drivers/staging/hv/rndis_filter.c2
-rw-r--r--drivers/staging/hv/tools/hv_kvp_daemon.c92
-rw-r--r--drivers/staging/hv/vmbus_drv.c2
-rw-r--r--drivers/staging/hv/vmbus_private.h1
-rw-r--r--drivers/staging/iio/Documentation/iio_utils.h2
-rw-r--r--drivers/staging/iio/accel/adis16201.h2
-rw-r--r--drivers/staging/iio/accel/adis16203.h2
-rw-r--r--drivers/staging/iio/accel/adis16204.h2
-rw-r--r--drivers/staging/iio/accel/adis16209.h2
-rw-r--r--drivers/staging/iio/accel/adis16220.h2
-rw-r--r--drivers/staging/iio/accel/adis16240.h2
-rw-r--r--drivers/staging/iio/accel/lis3l02dq.h26
-rw-r--r--drivers/staging/iio/accel/lis3l02dq_core.c2
-rw-r--r--drivers/staging/iio/accel/lis3l02dq_ring.c4
-rw-r--r--drivers/staging/iio/accel/sca3000.h4
-rw-r--r--drivers/staging/iio/accel/sca3000_ring.c2
-rw-r--r--drivers/staging/iio/adc/ad7298_ring.c2
-rw-r--r--drivers/staging/iio/adc/ad7476_ring.c2
-rw-r--r--drivers/staging/iio/adc/ad7887_ring.c2
-rw-r--r--drivers/staging/iio/adc/ad799x_core.c2
-rw-r--r--drivers/staging/iio/adc/ad799x_ring.c2
-rw-r--r--drivers/staging/iio/adc/max1363_core.c4
-rw-r--r--drivers/staging/iio/adc/max1363_ring.c2
-rw-r--r--drivers/staging/iio/chrdev.h6
-rw-r--r--drivers/staging/iio/gyro/adis16060_core.c2
-rw-r--r--drivers/staging/iio/gyro/adis16080_core.c2
-rw-r--r--drivers/staging/iio/gyro/adis16260.h2
-rw-r--r--drivers/staging/iio/iio.h2
-rw-r--r--drivers/staging/iio/imu/adis16300.h2
-rw-r--r--drivers/staging/iio/imu/adis16350.h2
-rw-r--r--drivers/staging/iio/imu/adis16400.h5
-rw-r--r--drivers/staging/iio/imu/adis16400_core.c20
-rw-r--r--drivers/staging/iio/imu/adis16400_ring.c12
-rw-r--r--drivers/staging/iio/industrialio-core.c2
-rw-r--r--drivers/staging/iio/meter/ade7753.h2
-rw-r--r--drivers/staging/iio/meter/ade7754.h2
-rw-r--r--drivers/staging/iio/meter/ade7758.h2
-rw-r--r--drivers/staging/iio/meter/ade7759.h2
-rw-r--r--drivers/staging/iio/meter/ade7854.h2
-rw-r--r--drivers/staging/iio/ring_generic.h2
-rw-r--r--drivers/staging/intel_sst/TODO2
-rw-r--r--drivers/staging/intel_sst/intel_sst.c4
-rw-r--r--drivers/staging/intel_sst/intel_sst_app_interface.c16
-rw-r--r--drivers/staging/intel_sst/intel_sst_drv_interface.c2
-rw-r--r--drivers/staging/intel_sst/intel_sst_dsp.c4
-rw-r--r--drivers/staging/intel_sst/intel_sst_fw_ipc.h2
-rw-r--r--drivers/staging/intel_sst/intel_sst_stream.c2
-rw-r--r--drivers/staging/intel_sst/intel_sst_stream_encoded.c2
-rw-r--r--drivers/staging/intel_sst/intelmid.c2
-rw-r--r--drivers/staging/intel_sst/intelmid.h2
-rw-r--r--drivers/staging/keucr/init.c4
-rw-r--r--drivers/staging/keucr/smilmain.c8
-rw-r--r--drivers/staging/keucr/smilsub.c6
-rw-r--r--drivers/staging/lirc/lirc_ene0100.h4
-rw-r--r--drivers/staging/memrar/Kconfig15
-rw-r--r--drivers/staging/memrar/Makefile2
-rw-r--r--drivers/staging/memrar/TODO43
-rw-r--r--drivers/staging/memrar/memrar-abi89
-rw-r--r--drivers/staging/memrar/memrar.h174
-rw-r--r--drivers/staging/memrar/memrar_allocator.c432
-rw-r--r--drivers/staging/memrar/memrar_allocator.h149
-rw-r--r--drivers/staging/memrar/memrar_handler.c1007
-rw-r--r--drivers/staging/msm/mdp4_overlay.c2
-rw-r--r--drivers/staging/msm/mdp_ppp_dq.c2
-rw-r--r--drivers/staging/msm/msm_fb.c6
-rw-r--r--drivers/staging/octeon/cvmx-cmd-queue.h2
-rw-r--r--drivers/staging/octeon/cvmx-fpa.h2
-rw-r--r--drivers/staging/octeon/cvmx-helper-board.h2
-rw-r--r--drivers/staging/octeon/cvmx-helper-util.c2
-rw-r--r--drivers/staging/octeon/cvmx-helper.c2
-rw-r--r--drivers/staging/octeon/cvmx-mdio.h2
-rw-r--r--drivers/staging/octeon/cvmx-pko.h4
-rw-r--r--drivers/staging/octeon/cvmx-pow.h12
-rw-r--r--drivers/staging/octeon/ethernet-util.h2
-rw-r--r--drivers/staging/olpc_dcon/Kconfig2
-rw-r--r--drivers/staging/olpc_dcon/olpc_dcon_xo_1.c2
-rw-r--r--drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c1
-rw-r--r--drivers/staging/pohmelfs/crypto.c2
-rw-r--r--drivers/staging/quatech_usb2/quatech_usb2.c12
-rw-r--r--drivers/staging/rt2860/chip/rtmp_phy.h2
-rw-r--r--drivers/staging/rt2860/common/ba_action.c4
-rw-r--r--drivers/staging/rt2860/common/cmm_aes.c2
-rw-r--r--drivers/staging/rt2860/common/cmm_cfg.c2
-rw-r--r--drivers/staging/rt2860/common/cmm_data.c4
-rw-r--r--drivers/staging/rt2860/common/cmm_data_pci.c6
-rw-r--r--drivers/staging/rt2860/common/cmm_data_usb.c6
-rw-r--r--drivers/staging/rt2860/common/cmm_mac_pci.c2
-rw-r--r--drivers/staging/rt2860/common/cmm_sanity.c4
-rw-r--r--drivers/staging/rt2860/common/cmm_sync.c2
-rw-r--r--drivers/staging/rt2860/common/cmm_wpa.c4
-rw-r--r--drivers/staging/rt2860/common/mlme.c16
-rw-r--r--drivers/staging/rt2860/common/rtmp_init.c14
-rw-r--r--drivers/staging/rt2860/common/spectrum.c12
-rw-r--r--drivers/staging/rt2860/mlme.h8
-rw-r--r--drivers/staging/rt2860/rt_linux.c2
-rw-r--r--drivers/staging/rt2860/rt_pci_rbus.c2
-rw-r--r--drivers/staging/rt2860/rtmp.h4
-rw-r--r--drivers/staging/rt2860/sta_ioctl.c2
-rw-r--r--drivers/staging/rt2870/common/rtusb_bulk.c6
-rw-r--r--drivers/staging/rt2870/common/rtusb_data.c2
-rw-r--r--drivers/staging/rtl8187se/Kconfig1
-rw-r--r--drivers/staging/rtl8187se/ieee80211/ieee80211.h6
-rw-r--r--drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c2
-rw-r--r--drivers/staging/rtl8187se/r8180_core.c4
-rw-r--r--drivers/staging/rtl8187se/r8180_dm.c4
-rw-r--r--drivers/staging/rtl8187se/r8180_rtl8225z2.c2
-rw-r--r--drivers/staging/rtl8187se/r8185b_init.c2
-rw-r--r--drivers/staging/rtl8192e/Kconfig1
-rw-r--r--drivers/staging/rtl8192e/ieee80211/ieee80211.h8
-rw-r--r--drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c2
-rw-r--r--drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c4
-rw-r--r--drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h2
-rw-r--r--drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c8
-rw-r--r--drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h2
-rw-r--r--drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c2
-rw-r--r--drivers/staging/rtl8192e/r819xE_phy.c6
-rw-r--r--drivers/staging/rtl8192u/Kconfig1
-rw-r--r--drivers/staging/rtl8192u/ieee80211/ieee80211.h8
-rw-r--r--drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c2
-rw-r--r--drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c4
-rw-r--r--drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h2
-rw-r--r--drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c8
-rw-r--r--drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h2
-rw-r--r--drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c2
-rw-r--r--drivers/staging/rtl8192u/ieee80211/scatterwalk.c2
-rw-r--r--drivers/staging/rtl8192u/r8192U_core.c6
-rw-r--r--drivers/staging/rtl8192u/r819xU_HTType.h2
-rw-r--r--drivers/staging/rtl8192u/r819xU_phy.c6
-rw-r--r--drivers/staging/rtl8712/rtl871x_cmd.h2
-rw-r--r--drivers/staging/rtl8712/rtl871x_led.h4
-rw-r--r--drivers/staging/rtl8712/rtl871x_mlme.c6
-rw-r--r--drivers/staging/rtl8712/rtl871x_mlme.h2
-rw-r--r--drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h2
-rw-r--r--drivers/staging/rtl8712/usb_halinit.c2
-rw-r--r--drivers/staging/rts_pstor/rtsx.c14
-rw-r--r--drivers/staging/rts_pstor/rtsx_chip.c11
-rw-r--r--drivers/staging/rts_pstor/rtsx_chip.h10
-rw-r--r--drivers/staging/rts_pstor/rtsx_scsi.h2
-rw-r--r--drivers/staging/rts_pstor/sd.c2
-rw-r--r--drivers/staging/sep/sep_driver.c25
-rw-r--r--drivers/staging/sep/sep_driver_config.h4
-rw-r--r--drivers/staging/slicoss/README2
-rw-r--r--drivers/staging/sm7xx/smtcfb.c10
-rw-r--r--drivers/staging/speakup/keyhelp.c2
-rw-r--r--drivers/staging/speakup/spkguide.txt2
-rw-r--r--drivers/staging/spectra/ffsport.c4
-rw-r--r--drivers/staging/spectra/flash.c6
-rw-r--r--drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c20
-rw-r--r--drivers/staging/tidspbridge/core/_tiomap.h2
-rw-r--r--drivers/staging/tidspbridge/core/chnl_sm.c2
-rw-r--r--drivers/staging/tidspbridge/dynload/cload.c2
-rw-r--r--drivers/staging/tidspbridge/hw/hw_mmu.c6
-rw-r--r--drivers/staging/tidspbridge/include/dspbridge/_chnl_sm.h4
-rw-r--r--drivers/staging/tidspbridge/include/dspbridge/clk.h6
-rw-r--r--drivers/staging/tidspbridge/include/dspbridge/cmm.h2
-rw-r--r--drivers/staging/tidspbridge/include/dspbridge/cod.h2
-rw-r--r--drivers/staging/tidspbridge/include/dspbridge/dev.h2
-rw-r--r--drivers/staging/tidspbridge/include/dspbridge/drv.h6
-rw-r--r--drivers/staging/tidspbridge/include/dspbridge/dspdefs.h14
-rw-r--r--drivers/staging/tidspbridge/include/dspbridge/mgr.h4
-rw-r--r--drivers/staging/tidspbridge/include/dspbridge/node.h2
-rw-r--r--drivers/staging/tidspbridge/include/dspbridge/proc.h6
-rw-r--r--drivers/staging/tidspbridge/include/dspbridge/pwr.h8
-rw-r--r--drivers/staging/tidspbridge/pmgr/dev.c6
-rw-r--r--drivers/staging/tidspbridge/rmgr/drv.c2
-rw-r--r--drivers/staging/tidspbridge/rmgr/nldr.c6
-rw-r--r--drivers/staging/tidspbridge/rmgr/proc.c4
-rw-r--r--drivers/staging/tm6000/tm6000-video.c2
-rw-r--r--drivers/staging/tty/cd1865.h2
-rw-r--r--drivers/staging/tty/epca.c16
-rw-r--r--drivers/staging/tty/ip2/i2hw.h4
-rw-r--r--drivers/staging/tty/ip2/i2lib.c8
-rw-r--r--drivers/staging/tty/ip2/ip2main.c2
-rw-r--r--drivers/staging/tty/specialix.c4
-rw-r--r--drivers/staging/tty/specialix_io8.h4
-rw-r--r--drivers/staging/usbip/stub_dev.c6
-rw-r--r--drivers/staging/usbip/stub_rx.c40
-rw-r--r--drivers/staging/usbip/stub_tx.c74
-rw-r--r--drivers/staging/usbip/usbip_common.c64
-rw-r--r--drivers/staging/usbip/usbip_common.h2
-rw-r--r--drivers/staging/usbip/vhci_hcd.c2
-rw-r--r--drivers/staging/usbip/vhci_rx.c3
-rw-r--r--drivers/staging/vme/bridges/vme_ca91cx42.c6
-rw-r--r--drivers/staging/vme/bridges/vme_tsi148.c4
-rw-r--r--drivers/staging/vme/bridges/vme_tsi148.h8
-rw-r--r--drivers/staging/vme/vme_api.txt6
-rw-r--r--drivers/staging/vt6655/Kconfig2
-rw-r--r--drivers/staging/vt6655/card.c2
-rw-r--r--drivers/staging/vt6655/device_main.c2
-rw-r--r--drivers/staging/vt6655/wcmd.c2
-rw-r--r--drivers/staging/vt6655/wmgr.h4
-rw-r--r--drivers/staging/vt6656/Kconfig2
-rw-r--r--drivers/staging/vt6656/rxtx.c2
-rw-r--r--drivers/staging/vt6656/wcmd.c4
-rw-r--r--drivers/staging/vt6656/wmgr.h4
-rw-r--r--drivers/staging/westbridge/astoria/api/src/cyasdma.c2
-rw-r--r--drivers/staging/westbridge/astoria/api/src/cyaslep2pep.c2
-rw-r--r--drivers/staging/westbridge/astoria/api/src/cyaslowlevel.c2
-rw-r--r--drivers/staging/westbridge/astoria/api/src/cyasmisc.c6
-rw-r--r--drivers/staging/westbridge/astoria/api/src/cyasmtp.c4
-rw-r--r--drivers/staging/westbridge/astoria/api/src/cyasstorage.c6
-rw-r--r--drivers/staging/westbridge/astoria/api/src/cyasusb.c4
-rw-r--r--drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c12
-rw-r--r--drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h2
-rw-r--r--drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h4
-rw-r--r--drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c2
-rw-r--r--drivers/staging/westbridge/astoria/gadget/cyasgadget.c1
-rw-r--r--drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdevice.h6
-rw-r--r--drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdma.h10
-rw-r--r--drivers/staging/westbridge/astoria/include/linux/westbridge/cyaserr.h4
-rw-r--r--drivers/staging/westbridge/astoria/include/linux/westbridge/cyashaldoc.h2
-rw-r--r--drivers/staging/westbridge/astoria/include/linux/westbridge/cyasintr.h2
-rw-r--r--drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmisc.h8
-rw-r--r--drivers/staging/westbridge/astoria/include/linux/westbridge/cyasprotocol.h4
-rw-r--r--drivers/staging/westbridge/astoria/include/linux/westbridge/cyasstorage.h34
-rw-r--r--drivers/staging/westbridge/astoria/include/linux/westbridge/cyasusb.h40
-rw-r--r--drivers/staging/winbond/mds.c2
-rw-r--r--drivers/staging/wlags49_h2/README.ubuntu2
-rw-r--r--drivers/staging/wlags49_h2/TODO4
-rw-r--r--drivers/staging/wlags49_h2/hcf.c24
-rw-r--r--drivers/staging/wlags49_h2/hcfdef.h2
-rw-r--r--drivers/staging/wlags49_h2/wl_wext.c6
-rw-r--r--drivers/staging/wlags49_h25/TODO4
-rw-r--r--drivers/staging/wlan-ng/prism2sta.c2
-rw-r--r--drivers/staging/xgifb/vb_setmode.c2
-rw-r--r--drivers/staging/xgifb/vgatypes.h2
-rw-r--r--drivers/target/target_core_alua.c10
-rw-r--r--drivers/target/target_core_device.c2
-rw-r--r--drivers/target/target_core_fabric_lib.c2
-rw-r--r--drivers/target/target_core_file.c2
-rw-r--r--drivers/target/target_core_pr.c6
-rw-r--r--drivers/target/target_core_transport.c14
-rw-r--r--drivers/target/target_core_ua.c4
-rw-r--r--drivers/telephony/ixj.c8
-rw-r--r--drivers/telephony/ixj.h2
-rw-r--r--drivers/tty/hvc/hvc_iucv.c4
-rw-r--r--drivers/tty/hvc/hvc_vio.c2
-rw-r--r--drivers/tty/hvc/hvcs.c8
-rw-r--r--drivers/tty/mxser.h2
-rw-r--r--drivers/tty/n_gsm.c10
-rw-r--r--drivers/tty/nozomi.c2
-rw-r--r--drivers/tty/rocket.c4
-rw-r--r--drivers/tty/serial/8250.c2
-rw-r--r--drivers/tty/serial/8250_pci.c2
-rw-r--r--drivers/tty/serial/amba-pl011.c2
-rw-r--r--drivers/tty/serial/icom.c2
-rw-r--r--drivers/tty/serial/imx.c2
-rw-r--r--drivers/tty/serial/ip22zilog.c2
-rw-r--r--drivers/tty/serial/jsm/jsm.h2
-rw-r--r--drivers/tty/serial/jsm/jsm_neo.c4
-rw-r--r--drivers/tty/serial/max3107.h2
-rw-r--r--drivers/tty/serial/mrst_max3110.c2
-rw-r--r--drivers/tty/serial/mrst_max3110.h2
-rw-r--r--drivers/tty/serial/msm_serial_hs.c4
-rw-r--r--drivers/tty/serial/omap-serial.c2
-rw-r--r--drivers/tty/serial/pmac_zilog.c6
-rw-r--r--drivers/tty/serial/samsung.c4
-rw-r--r--drivers/tty/serial/sh-sci.c2
-rw-r--r--drivers/tty/serial/sn_console.c4
-rw-r--r--drivers/tty/serial/sunzilog.c2
-rw-r--r--drivers/tty/synclink.c10
-rw-r--r--drivers/tty/synclink_gt.c2
-rw-r--r--drivers/tty/synclinkmp.c10
-rw-r--r--drivers/tty/tty_io.c8
-rw-r--r--drivers/tty/tty_ioctl.c6
-rw-r--r--drivers/tty/vt/vt.c2
-rw-r--r--drivers/uio/uio_pruss.c2
-rw-r--r--drivers/usb/atm/ueagle-atm.c8
-rw-r--r--drivers/usb/c67x00/c67x00-drv.c2
-rw-r--r--drivers/usb/c67x00/c67x00-hcd.h2
-rw-r--r--drivers/usb/c67x00/c67x00-sched.c2
-rw-r--r--drivers/usb/class/cdc-acm.h2
-rw-r--r--drivers/usb/class/usbtmc.c2
-rw-r--r--drivers/usb/core/hcd.c2
-rw-r--r--drivers/usb/core/hub.c2
-rw-r--r--drivers/usb/early/ehci-dbgp.c2
-rw-r--r--drivers/usb/gadget/amd5536udc.c14
-rw-r--r--drivers/usb/gadget/amd5536udc.h2
-rw-r--r--drivers/usb/gadget/at91_udc.c2
-rw-r--r--drivers/usb/gadget/composite.c6
-rw-r--r--drivers/usb/gadget/f_audio.c2
-rw-r--r--drivers/usb/gadget/f_ncm.c2
-rw-r--r--drivers/usb/gadget/fsl_qe_udc.h6
-rw-r--r--drivers/usb/gadget/fsl_udc_core.c6
-rw-r--r--drivers/usb/gadget/fsl_usb2_udc.h4
-rw-r--r--drivers/usb/gadget/gmidi.c2
-rw-r--r--drivers/usb/gadget/langwell_udc.c2
-rw-r--r--drivers/usb/gadget/mv_udc_core.c6
-rw-r--r--drivers/usb/gadget/net2280.c2
-rw-r--r--drivers/usb/gadget/nokia.c2
-rw-r--r--drivers/usb/gadget/printer.c2
-rw-r--r--drivers/usb/gadget/pxa27x_udc.c12
-rw-r--r--drivers/usb/gadget/s3c-hsotg.c18
-rw-r--r--drivers/usb/host/Kconfig2
-rw-r--r--drivers/usb/host/ehci.h2
-rw-r--r--drivers/usb/host/fhci-hcd.c2
-rw-r--r--drivers/usb/host/fhci-tds.c8
-rw-r--r--drivers/usb/host/fhci.h4
-rw-r--r--drivers/usb/host/imx21-hcd.c2
-rw-r--r--drivers/usb/host/isp116x.h2
-rw-r--r--drivers/usb/host/isp1362-hcd.c2
-rw-r--r--drivers/usb/host/ohci-hcd.c2
-rw-r--r--drivers/usb/host/oxu210hp-hcd.c4
-rw-r--r--drivers/usb/host/whci/qset.c2
-rw-r--r--drivers/usb/host/xhci.c4
-rw-r--r--drivers/usb/host/xhci.h2
-rw-r--r--drivers/usb/image/microtek.c8
-rw-r--r--drivers/usb/misc/iowarrior.c2
-rw-r--r--drivers/usb/otg/isp1301_omap.c2
-rw-r--r--drivers/usb/otg/langwell_otg.c4
-rw-r--r--drivers/usb/serial/aircable.c4
-rw-r--r--drivers/usb/serial/cp210x.c2
-rw-r--r--drivers/usb/serial/cypress_m8.c2
-rw-r--r--drivers/usb/serial/ftdi_sio.c2
-rw-r--r--drivers/usb/serial/io_edgeport.c2
-rw-r--r--drivers/usb/serial/io_edgeport.h2
-rw-r--r--drivers/usb/serial/io_ti.c2
-rw-r--r--drivers/usb/serial/opticon.c2
-rw-r--r--drivers/usb/storage/ene_ub6250.c4
-rw-r--r--drivers/usb/storage/isd200.c2
-rw-r--r--drivers/usb/storage/scsiglue.c2
-rw-r--r--drivers/usb/storage/shuttle_usbat.c2
-rw-r--r--drivers/usb/wusbcore/crypto.c4
-rw-r--r--drivers/usb/wusbcore/reservation.c2
-rw-r--r--drivers/usb/wusbcore/rh.c2
-rw-r--r--drivers/usb/wusbcore/wa-rpipe.c2
-rw-r--r--drivers/usb/wusbcore/wa-xfer.c8
-rw-r--r--drivers/usb/wusbcore/wusbhc.h2
-rw-r--r--drivers/uwb/driver.c2
-rw-r--r--drivers/uwb/drp.c6
-rw-r--r--drivers/uwb/lc-rc.c2
-rw-r--r--drivers/uwb/reset.c2
-rw-r--r--drivers/uwb/umc-dev.c2
-rw-r--r--drivers/video/atmel_lcdfb.c2
-rw-r--r--drivers/video/aty/atyfb_base.c4
-rw-r--r--drivers/video/aty/mach64_cursor.c2
-rw-r--r--drivers/video/au1200fb.c2
-rw-r--r--drivers/video/backlight/corgi_lcd.c2
-rw-r--r--drivers/video/backlight/locomolcd.c2
-rw-r--r--drivers/video/bfin_adv7393fb.h24
-rw-r--r--drivers/video/console/font_mini_4x6.c2
-rw-r--r--drivers/video/da8xx-fb.c2
-rw-r--r--drivers/video/display/display-sysfs.c2
-rw-r--r--drivers/video/ep93xx-fb.c2
-rw-r--r--drivers/video/fbsysfs.c2
-rw-r--r--drivers/video/fm2fb.c2
-rw-r--r--drivers/video/fsl-diu-fb.c2
-rw-r--r--drivers/video/gbefb.c2
-rw-r--r--drivers/video/geode/lxfb.h2
-rw-r--r--drivers/video/i810/i810_accel.c2
-rw-r--r--drivers/video/kyro/STG4000OverlayDevice.c2
-rw-r--r--drivers/video/kyro/STG4000Reg.h2
-rw-r--r--drivers/video/matrox/matroxfb_DAC1064.h2
-rw-r--r--drivers/video/matrox/matroxfb_Ti3026.c4
-rw-r--r--drivers/video/matrox/matroxfb_base.c2
-rw-r--r--drivers/video/matrox/matroxfb_base.h2
-rw-r--r--drivers/video/nuc900fb.h2
-rw-r--r--drivers/video/omap/Kconfig2
-rw-r--r--drivers/video/omap2/dss/hdmi.c2
-rw-r--r--drivers/video/pxa3xx-gcu.c2
-rw-r--r--drivers/video/savage/savagefb.h2
-rw-r--r--drivers/video/savage/savagefb_driver.c4
-rw-r--r--drivers/video/sm501fb.c4
-rw-r--r--drivers/video/sstfb.c8
-rw-r--r--drivers/video/sticore.h2
-rw-r--r--drivers/video/tdfxfb.c18
-rw-r--r--drivers/video/tmiofb.c2
-rw-r--r--drivers/video/udlfb.c2
-rw-r--r--drivers/video/vga16fb.c2
-rw-r--r--drivers/video/via/via_utility.c2
-rw-r--r--drivers/video/via/via_utility.h2
-rw-r--r--drivers/video/via/viafbdev.c2
-rw-r--r--drivers/video/w100fb.c2
-rw-r--r--drivers/w1/masters/omap_hdq.c2
-rw-r--r--drivers/watchdog/Kconfig2
-rw-r--r--drivers/watchdog/Makefile4
-rw-r--r--drivers/watchdog/acquirewdt.c2
-rw-r--r--drivers/watchdog/pc87413_wdt.c2
-rw-r--r--drivers/watchdog/sbc7240_wdt.c2
-rw-r--r--drivers/watchdog/sch311x_wdt.c2
-rw-r--r--drivers/watchdog/shwdt.c2
-rw-r--r--drivers/watchdog/smsc37b787_wdt.c2
-rw-r--r--drivers/watchdog/sp805_wdt.c2
-rw-r--r--drivers/xen/events.c4
1413 files changed, 3047 insertions, 4784 deletions
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index d1d484d4a06a..f703b2881153 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -241,7 +241,7 @@ static inline int ghes_severity(int severity)
241 case CPER_SEV_FATAL: 241 case CPER_SEV_FATAL:
242 return GHES_SEV_PANIC; 242 return GHES_SEV_PANIC;
243 default: 243 default:
244 /* Unkown, go panic */ 244 /* Unknown, go panic */
245 return GHES_SEV_PANIC; 245 return GHES_SEV_PANIC;
246 } 246 }
247} 247}
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index fa84e9744330..ad3501739563 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -1164,7 +1164,7 @@ int acpi_processor_set_throttling(struct acpi_processor *pr,
1164 */ 1164 */
1165 if (!match_pr->flags.throttling) { 1165 if (!match_pr->flags.throttling) {
1166 ACPI_DEBUG_PRINT((ACPI_DB_INFO, 1166 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
1167 "Throttling Controll is unsupported " 1167 "Throttling Control is unsupported "
1168 "on CPU %d\n", i)); 1168 "on CPU %d\n", i));
1169 continue; 1169 continue;
1170 } 1170 }
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 31e9e10f657e..ec574fc8fbc6 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1354,7 +1354,7 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video,
1354 status = acpi_video_bus_get_one_device(dev, video); 1354 status = acpi_video_bus_get_one_device(dev, video);
1355 if (ACPI_FAILURE(status)) { 1355 if (ACPI_FAILURE(status)) {
1356 printk(KERN_WARNING PREFIX 1356 printk(KERN_WARNING PREFIX
1357 "Cant attach device\n"); 1357 "Can't attach device\n");
1358 continue; 1358 continue;
1359 } 1359 }
1360 } 1360 }
@@ -1373,7 +1373,7 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device)
1373 acpi_video_device_notify); 1373 acpi_video_device_notify);
1374 if (ACPI_FAILURE(status)) { 1374 if (ACPI_FAILURE(status)) {
1375 printk(KERN_WARNING PREFIX 1375 printk(KERN_WARNING PREFIX
1376 "Cant remove video notify handler\n"); 1376 "Can't remove video notify handler\n");
1377 } 1377 }
1378 if (device->backlight) { 1378 if (device->backlight) {
1379 backlight_device_unregister(device->backlight); 1379 backlight_device_unregister(device->backlight);
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 6d2bb2524b6e..821040503154 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -760,7 +760,7 @@ int amba_request_regions(struct amba_device *dev, const char *name)
760} 760}
761 761
762/** 762/**
763 * amba_release_regions - release mem regions assoicated with device 763 * amba_release_regions - release mem regions associated with device
764 * @dev: amba_device structure for device 764 * @dev: amba_device structure for device
765 * 765 *
766 * Release regions claimed by a successful call to amba_request_regions. 766 * Release regions claimed by a successful call to amba_request_regions.
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index e62f693be8ea..39d829cd82dd 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -926,7 +926,7 @@ static bool ahci_broken_suspend(struct pci_dev *pdev)
926 /* 926 /*
927 * Acer eMachines G725 has the same problem. BIOS 927 * Acer eMachines G725 has the same problem. BIOS
928 * V1.03 is known to be broken. V3.04 is known to 928 * V1.03 is known to be broken. V3.04 is known to
929 * work. Inbetween, there are V1.06, V2.06 and V3.03 929 * work. Between, there are V1.06, V2.06 and V3.03
930 * that we don't have much idea about. For now, 930 * that we don't have much idea about. For now,
931 * blacklist anything older than V3.04. 931 * blacklist anything older than V3.04.
932 * 932 *
diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
index ccaf08122058..39865009c251 100644
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
@@ -225,7 +225,7 @@ enum {
225 /* em_ctl bits */ 225 /* em_ctl bits */
226 EM_CTL_RST = (1 << 9), /* Reset */ 226 EM_CTL_RST = (1 << 9), /* Reset */
227 EM_CTL_TM = (1 << 8), /* Transmit Message */ 227 EM_CTL_TM = (1 << 8), /* Transmit Message */
228 EM_CTL_MR = (1 << 0), /* Message Recieved */ 228 EM_CTL_MR = (1 << 0), /* Message Received */
229 EM_CTL_ALHD = (1 << 26), /* Activity LED */ 229 EM_CTL_ALHD = (1 << 26), /* Activity LED */
230 EM_CTL_XMT = (1 << 25), /* Transmit Only */ 230 EM_CTL_XMT = (1 << 25), /* Transmit Only */
231 EM_CTL_SMB = (1 << 24), /* Single Message Buffer */ 231 EM_CTL_SMB = (1 << 24), /* Single Message Buffer */
@@ -281,7 +281,7 @@ struct ahci_port_priv {
281}; 281};
282 282
283struct ahci_host_priv { 283struct ahci_host_priv {
284 void __iomem * mmio; /* bus-independant mem map */ 284 void __iomem * mmio; /* bus-independent mem map */
285 unsigned int flags; /* AHCI_HFLAG_* */ 285 unsigned int flags; /* AHCI_HFLAG_* */
286 u32 cap; /* cap to use */ 286 u32 cap; /* cap to use */
287 u32 cap2; /* cap2 to use */ 287 u32 cap2; /* cap2 to use */
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index cdec4ab3b159..0bc3fd6c3fdb 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -38,16 +38,16 @@
38 * Hardware documentation available at http://developer.intel.com/ 38 * Hardware documentation available at http://developer.intel.com/
39 * 39 *
40 * Documentation 40 * Documentation
41 * Publically available from Intel web site. Errata documentation 41 * Publicly available from Intel web site. Errata documentation
42 * is also publically available. As an aide to anyone hacking on this 42 * is also publicly available. As an aide to anyone hacking on this
43 * driver the list of errata that are relevant is below, going back to 43 * driver the list of errata that are relevant is below, going back to
44 * PIIX4. Older device documentation is now a bit tricky to find. 44 * PIIX4. Older device documentation is now a bit tricky to find.
45 * 45 *
46 * The chipsets all follow very much the same design. The original Triton 46 * The chipsets all follow very much the same design. The original Triton
47 * series chipsets do _not_ support independant device timings, but this 47 * series chipsets do _not_ support independent device timings, but this
48 * is fixed in Triton II. With the odd mobile exception the chips then 48 * is fixed in Triton II. With the odd mobile exception the chips then
49 * change little except in gaining more modes until SATA arrives. This 49 * change little except in gaining more modes until SATA arrives. This
50 * driver supports only the chips with independant timing (that is those 50 * driver supports only the chips with independent timing (that is those
51 * with SITRE and the 0x44 timing register). See pata_oldpiix and pata_mpiix 51 * with SITRE and the 0x44 timing register). See pata_oldpiix and pata_mpiix
52 * for the early chip drivers. 52 * for the early chip drivers.
53 * 53 *
@@ -122,7 +122,7 @@ enum {
122 P2 = 2, /* port 2 */ 122 P2 = 2, /* port 2 */
123 P3 = 3, /* port 3 */ 123 P3 = 3, /* port 3 */
124 IDE = -1, /* IDE */ 124 IDE = -1, /* IDE */
125 NA = -2, /* not avaliable */ 125 NA = -2, /* not available */
126 RV = -3, /* reserved */ 126 RV = -3, /* reserved */
127 127
128 PIIX_AHCI_DEVICE = 6, 128 PIIX_AHCI_DEVICE = 6,
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index b91e19cab102..423c0a6952b2 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -5340,7 +5340,7 @@ int ata_host_suspend(struct ata_host *host, pm_message_t mesg)
5340 * 5340 *
5341 * Resume @host. Actual operation is performed by EH. This 5341 * Resume @host. Actual operation is performed by EH. This
5342 * function requests EH to perform PM operations and returns. 5342 * function requests EH to perform PM operations and returns.
5343 * Note that all resume operations are performed parallely. 5343 * Note that all resume operations are performed parallelly.
5344 * 5344 *
5345 * LOCKING: 5345 * LOCKING:
5346 * Kernel thread context (may sleep). 5346 * Kernel thread context (may sleep).
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index df3f3140c9c7..88cd22fa65cd 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -771,7 +771,7 @@ void ata_scsi_port_error_handler(struct Scsi_Host *host, struct ata_port *ap)
771 /* process port suspend request */ 771 /* process port suspend request */
772 ata_eh_handle_port_suspend(ap); 772 ata_eh_handle_port_suspend(ap);
773 773
774 /* Exception might have happend after ->error_handler 774 /* Exception might have happened after ->error_handler
775 * recovered the port but before this point. Repeat 775 * recovered the port but before this point. Repeat
776 * EH in such case. 776 * EH in such case.
777 */ 777 */
@@ -1742,7 +1742,7 @@ void ata_eh_analyze_ncq_error(struct ata_link *link)
1742 * 1742 *
1743 * Analyze taskfile of @qc and further determine cause of 1743 * Analyze taskfile of @qc and further determine cause of
1744 * failure. This function also requests ATAPI sense data if 1744 * failure. This function also requests ATAPI sense data if
1745 * avaliable. 1745 * available.
1746 * 1746 *
1747 * LOCKING: 1747 * LOCKING:
1748 * Kernel thread context (may sleep). 1748 * Kernel thread context (may sleep).
@@ -1893,7 +1893,7 @@ static int speed_down_verdict_cb(struct ata_ering_entry *ent, void *void_arg)
1893 * occurred during last 5 mins, NCQ_OFF. 1893 * occurred during last 5 mins, NCQ_OFF.
1894 * 1894 *
1895 * 3. If more than 8 ATA_BUS, TOUT_HSM or UNK_DEV errors 1895 * 3. If more than 8 ATA_BUS, TOUT_HSM or UNK_DEV errors
1896 * ocurred during last 5 mins, FALLBACK_TO_PIO 1896 * occurred during last 5 mins, FALLBACK_TO_PIO
1897 * 1897 *
1898 * 4. If more than 3 TOUT_HSM or UNK_DEV errors occurred 1898 * 4. If more than 3 TOUT_HSM or UNK_DEV errors occurred
1899 * during last 10 mins, NCQ_OFF. 1899 * during last 10 mins, NCQ_OFF.
@@ -2577,7 +2577,7 @@ int ata_eh_reset(struct ata_link *link, int classify,
2577 if (link->flags & ATA_LFLAG_NO_SRST) 2577 if (link->flags & ATA_LFLAG_NO_SRST)
2578 softreset = NULL; 2578 softreset = NULL;
2579 2579
2580 /* make sure each reset attemp is at least COOL_DOWN apart */ 2580 /* make sure each reset attempt is at least COOL_DOWN apart */
2581 if (ehc->i.flags & ATA_EHI_DID_RESET) { 2581 if (ehc->i.flags & ATA_EHI_DID_RESET) {
2582 now = jiffies; 2582 now = jiffies;
2583 WARN_ON(time_after(ehc->last_reset, now)); 2583 WARN_ON(time_after(ehc->last_reset, now));
@@ -2736,7 +2736,7 @@ int ata_eh_reset(struct ata_link *link, int classify,
2736 if (!reset) { 2736 if (!reset) {
2737 ata_link_printk(link, KERN_ERR, 2737 ata_link_printk(link, KERN_ERR,
2738 "follow-up softreset required " 2738 "follow-up softreset required "
2739 "but no softreset avaliable\n"); 2739 "but no softreset available\n");
2740 failed_link = link; 2740 failed_link = link;
2741 rc = -EINVAL; 2741 rc = -EINVAL;
2742 goto fail; 2742 goto fail;
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index a83419991357..e2f57e9e12f0 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -999,7 +999,7 @@ static void ata_gen_passthru_sense(struct ata_queued_cmd *qc)
999 * @qc: Command that we are erroring out 999 * @qc: Command that we are erroring out
1000 * 1000 *
1001 * Generate sense block for a failed ATA command @qc. Descriptor 1001 * Generate sense block for a failed ATA command @qc. Descriptor
1002 * format is used to accomodate LBA48 block address. 1002 * format is used to accommodate LBA48 block address.
1003 * 1003 *
1004 * LOCKING: 1004 * LOCKING:
1005 * None. 1005 * None.
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index cf7acbc0cfcb..f8380ce0f4d1 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -2839,7 +2839,7 @@ unsigned int ata_bmdma_port_intr(struct ata_port *ap, struct ata_queued_cmd *qc)
2839 bmdma_stopped = true; 2839 bmdma_stopped = true;
2840 2840
2841 if (unlikely(host_stat & ATA_DMA_ERR)) { 2841 if (unlikely(host_stat & ATA_DMA_ERR)) {
2842 /* error when transfering data to/from memory */ 2842 /* error when transferring data to/from memory */
2843 qc->err_mask |= AC_ERR_HOST_BUS; 2843 qc->err_mask |= AC_ERR_HOST_BUS;
2844 ap->hsm_task_state = HSM_ST_ERR; 2844 ap->hsm_task_state = HSM_ST_ERR;
2845 } 2845 }
@@ -3032,7 +3032,7 @@ void ata_bmdma_start(struct ata_queued_cmd *qc)
3032 * Or maybe I'm just being paranoid. 3032 * Or maybe I'm just being paranoid.
3033 * 3033 *
3034 * FIXME: The posting of this write means I/O starts are 3034 * FIXME: The posting of this write means I/O starts are
3035 * unneccessarily delayed for MMIO 3035 * unnecessarily delayed for MMIO
3036 */ 3036 */
3037} 3037}
3038EXPORT_SYMBOL_GPL(ata_bmdma_start); 3038EXPORT_SYMBOL_GPL(ata_bmdma_start);
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index 620a07cabe31..b0975a5ad8c4 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -11,7 +11,7 @@
11 * Power management on ports 11 * Power management on ports
12 * 12 *
13 * 13 *
14 * Documentation publically available. 14 * Documentation publicly available.
15 */ 15 */
16 16
17#include <linux/kernel.h> 17#include <linux/kernel.h>
diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
index 65cee74605b4..719bb73a73e0 100644
--- a/drivers/ata/pata_arasan_cf.c
+++ b/drivers/ata/pata_arasan_cf.c
@@ -385,7 +385,7 @@ static inline int wait4buf(struct arasan_cf_dev *acdev)
385 return -ETIMEDOUT; 385 return -ETIMEDOUT;
386 } 386 }
387 387
388 /* Check if PIO Error interrupt has occured */ 388 /* Check if PIO Error interrupt has occurred */
389 if (acdev->dma_status & ATA_DMA_ERR) 389 if (acdev->dma_status & ATA_DMA_ERR)
390 return -EAGAIN; 390 return -EAGAIN;
391 391
@@ -450,7 +450,7 @@ static int sg_xfer(struct arasan_cf_dev *acdev, struct scatterlist *sg)
450 /* 450 /*
451 * For each sg: 451 * For each sg:
452 * MAX_XFER_COUNT data will be transferred before we get transfer 452 * MAX_XFER_COUNT data will be transferred before we get transfer
453 * complete interrupt. Inbetween after FIFO_SIZE data 453 * complete interrupt. Between after FIFO_SIZE data
454 * buffer available interrupt will be generated. At this time we will 454 * buffer available interrupt will be generated. At this time we will
455 * fill FIFO again: max FIFO_SIZE data. 455 * fill FIFO again: max FIFO_SIZE data.
456 */ 456 */
@@ -463,7 +463,7 @@ static int sg_xfer(struct arasan_cf_dev *acdev, struct scatterlist *sg)
463 acdev->vbase + XFER_CTR); 463 acdev->vbase + XFER_CTR);
464 spin_unlock_irqrestore(&acdev->host->lock, flags); 464 spin_unlock_irqrestore(&acdev->host->lock, flags);
465 465
466 /* continue dma xfers untill current sg is completed */ 466 /* continue dma xfers until current sg is completed */
467 while (xfer_cnt) { 467 while (xfer_cnt) {
468 /* wait for read to complete */ 468 /* wait for read to complete */
469 if (!write) { 469 if (!write) {
@@ -563,7 +563,7 @@ static void data_xfer(struct work_struct *work)
563 563
564chan_request_fail: 564chan_request_fail:
565 spin_lock_irqsave(&acdev->host->lock, flags); 565 spin_lock_irqsave(&acdev->host->lock, flags);
566 /* error when transfering data to/from memory */ 566 /* error when transferring data to/from memory */
567 qc->err_mask |= AC_ERR_HOST_BUS; 567 qc->err_mask |= AC_ERR_HOST_BUS;
568 qc->ap->hsm_task_state = HSM_ST_ERR; 568 qc->ap->hsm_task_state = HSM_ST_ERR;
569 569
diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
index e0b58b8dfe6f..ea64967000ff 100644
--- a/drivers/ata/pata_bf54x.c
+++ b/drivers/ata/pata_bf54x.c
@@ -1342,7 +1342,7 @@ static unsigned int bfin_ata_host_intr(struct ata_port *ap,
1342 ap->ops->bmdma_stop(qc); 1342 ap->ops->bmdma_stop(qc);
1343 1343
1344 if (unlikely(host_stat & ATA_DMA_ERR)) { 1344 if (unlikely(host_stat & ATA_DMA_ERR)) {
1345 /* error when transfering data to/from memory */ 1345 /* error when transferring data to/from memory */
1346 qc->err_mask |= AC_ERR_HOST_BUS; 1346 qc->err_mask |= AC_ERR_HOST_BUS;
1347 ap->hsm_task_state = HSM_ST_ERR; 1347 ap->hsm_task_state = HSM_ST_ERR;
1348 } 1348 }
diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
index 030952f1f97c..e3254fcff0f1 100644
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -29,7 +29,7 @@
29 * General Public License for more details. 29 * General Public License for more details.
30 * 30 *
31 * Documentation: 31 * Documentation:
32 * Not publically available. 32 * Not publicly available.
33 */ 33 */
34#include <linux/kernel.h> 34#include <linux/kernel.h>
35#include <linux/module.h> 35#include <linux/module.h>
diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c
index b21f0021f54a..d8d9c5807740 100644
--- a/drivers/ata/pata_mpiix.c
+++ b/drivers/ata/pata_mpiix.c
@@ -15,7 +15,7 @@
15 * with PCI IDE and also that we do not disable the device when our driver is 15 * with PCI IDE and also that we do not disable the device when our driver is
16 * unloaded (as it has many other functions). 16 * unloaded (as it has many other functions).
17 * 17 *
18 * The driver conciously keeps this logic internally to avoid pushing quirky 18 * The driver consciously keeps this logic internally to avoid pushing quirky
19 * PATA history into the clean libata layer. 19 * PATA history into the clean libata layer.
20 * 20 *
21 * Thinkpad specific note: If you boot an MPIIX using a thinkpad with a PCMCIA 21 * Thinkpad specific note: If you boot an MPIIX using a thinkpad with a PCMCIA
diff --git a/drivers/ata/pata_rz1000.c b/drivers/ata/pata_rz1000.c
index 4a454a88aa9d..4d04471794b6 100644
--- a/drivers/ata/pata_rz1000.c
+++ b/drivers/ata/pata_rz1000.c
@@ -112,7 +112,7 @@ static int rz1000_reinit_one(struct pci_dev *pdev)
112 if (rc) 112 if (rc)
113 return rc; 113 return rc;
114 114
115 /* If this fails on resume (which is a "cant happen" case), we 115 /* If this fails on resume (which is a "can't happen" case), we
116 must stop as any progress risks data loss */ 116 must stop as any progress risks data loss */
117 if (rz1000_fifo_disable(pdev)) 117 if (rz1000_fifo_disable(pdev))
118 panic("rz1000 fifo"); 118 panic("rz1000 fifo");
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 00eefbd84b33..118787caa93f 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -11,7 +11,7 @@
11 * 11 *
12 * May be copied or modified under the terms of the GNU General Public License 12 * May be copied or modified under the terms of the GNU General Public License
13 * 13 *
14 * Documentation publically available. 14 * Documentation publicly available.
15 * 15 *
16 * If you have strange problems with nVidia chipset systems please 16 * If you have strange problems with nVidia chipset systems please
17 * see the SI support documentation and update your system BIOS 17 * see the SI support documentation and update your system BIOS
@@ -43,7 +43,7 @@
43 * 43 *
44 * Turn a config register offset into the right address in either 44 * Turn a config register offset into the right address in either
45 * PCI space or MMIO space to access the control register in question 45 * PCI space or MMIO space to access the control register in question
46 * Thankfully this is a configuration operation so isnt performance 46 * Thankfully this is a configuration operation so isn't performance
47 * criticial. 47 * criticial.
48 */ 48 */
49 49
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index c04abc393fc5..be08ff92db17 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -331,7 +331,7 @@ static void sis_old_set_dmamode (struct ata_port *ap, struct ata_device *adev)
331 331
332 if (adev->dma_mode < XFER_UDMA_0) { 332 if (adev->dma_mode < XFER_UDMA_0) {
333 /* bits 3-0 hold recovery timing bits 8-10 active timing and 333 /* bits 3-0 hold recovery timing bits 8-10 active timing and
334 the higher bits are dependant on the device */ 334 the higher bits are dependent on the device */
335 timing &= ~0x870F; 335 timing &= ~0x870F;
336 timing |= mwdma_bits[speed]; 336 timing |= mwdma_bits[speed];
337 } else { 337 } else {
@@ -371,7 +371,7 @@ static void sis_66_set_dmamode (struct ata_port *ap, struct ata_device *adev)
371 371
372 if (adev->dma_mode < XFER_UDMA_0) { 372 if (adev->dma_mode < XFER_UDMA_0) {
373 /* bits 3-0 hold recovery timing bits 8-10 active timing and 373 /* bits 3-0 hold recovery timing bits 8-10 active timing and
374 the higher bits are dependant on the device, bit 15 udma */ 374 the higher bits are dependent on the device, bit 15 udma */
375 timing &= ~0x870F; 375 timing &= ~0x870F;
376 timing |= mwdma_bits[speed]; 376 timing |= mwdma_bits[speed];
377 } else { 377 } else {
diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c
index 0d1f89e571dd..03b6d69d6197 100644
--- a/drivers/ata/pata_triflex.c
+++ b/drivers/ata/pata_triflex.c
@@ -30,7 +30,7 @@
30 * Loosely based on the piix & svwks drivers. 30 * Loosely based on the piix & svwks drivers.
31 * 31 *
32 * Documentation: 32 * Documentation:
33 * Not publically available. 33 * Not publicly available.
34 */ 34 */
35 35
36#include <linux/kernel.h> 36#include <linux/kernel.h>
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index 0f91e583892e..35a71d875d0e 100644
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -42,7 +42,7 @@ enum {
42 42
43 /* 43 /*
44 * SATA-FSL host controller supports a max. of (15+1) direct PRDEs, and 44 * SATA-FSL host controller supports a max. of (15+1) direct PRDEs, and
45 * chained indirect PRDEs upto a max count of 63. 45 * chained indirect PRDEs up to a max count of 63.
46 * We are allocating an array of 63 PRDEs contiguously, but PRDE#15 will 46 * We are allocating an array of 63 PRDEs contiguously, but PRDE#15 will
47 * be setup as an indirect descriptor, pointing to it's next 47 * be setup as an indirect descriptor, pointing to it's next
48 * (contiguous) PRDE. Though chained indirect PRDE arrays are 48 * (contiguous) PRDE. Though chained indirect PRDE arrays are
@@ -907,7 +907,7 @@ static int sata_fsl_softreset(struct ata_link *link, unsigned int *class,
907 ata_msleep(ap, 1); 907 ata_msleep(ap, 1);
908 908
909 /* 909 /*
910 * SATA device enters reset state after receving a Control register 910 * SATA device enters reset state after receiving a Control register
911 * FIS with SRST bit asserted and it awaits another H2D Control reg. 911 * FIS with SRST bit asserted and it awaits another H2D Control reg.
912 * FIS with SRST bit cleared, then the device does internal diags & 912 * FIS with SRST bit cleared, then the device does internal diags &
913 * initialization, followed by indicating it's initialization status 913 * initialization, followed by indicating it's initialization status
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index cd40651e9b72..b52c0519ad0b 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -1352,7 +1352,7 @@ static int mv_scr_write(struct ata_link *link, unsigned int sc_reg_in, u32 val)
1352 /* 1352 /*
1353 * Workaround for 88SX60x1 FEr SATA#26: 1353 * Workaround for 88SX60x1 FEr SATA#26:
1354 * 1354 *
1355 * COMRESETs have to take care not to accidently 1355 * COMRESETs have to take care not to accidentally
1356 * put the drive to sleep when writing SCR_CONTROL. 1356 * put the drive to sleep when writing SCR_CONTROL.
1357 * Setting bits 12..15 prevents this problem. 1357 * Setting bits 12..15 prevents this problem.
1358 * 1358 *
@@ -2044,7 +2044,7 @@ static void mv_qc_prep(struct ata_queued_cmd *qc)
2044 2044
2045 cw = &pp->crqb[in_index].ata_cmd[0]; 2045 cw = &pp->crqb[in_index].ata_cmd[0];
2046 2046
2047 /* Sadly, the CRQB cannot accomodate all registers--there are 2047 /* Sadly, the CRQB cannot accommodate all registers--there are
2048 * only 11 bytes...so we must pick and choose required 2048 * only 11 bytes...so we must pick and choose required
2049 * registers based on the command. So, we drop feature and 2049 * registers based on the command. So, we drop feature and
2050 * hob_feature for [RW] DMA commands, but they are needed for 2050 * hob_feature for [RW] DMA commands, but they are needed for
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 42344e3c686d..f173ef3bfc10 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -2121,7 +2121,7 @@ static int nv_swncq_sdbfis(struct ata_port *ap)
2121 2121
2122 host_stat = ap->ops->bmdma_status(ap); 2122 host_stat = ap->ops->bmdma_status(ap);
2123 if (unlikely(host_stat & ATA_DMA_ERR)) { 2123 if (unlikely(host_stat & ATA_DMA_ERR)) {
2124 /* error when transfering data to/from memory */ 2124 /* error when transferring data to/from memory */
2125 ata_ehi_clear_desc(ehi); 2125 ata_ehi_clear_desc(ehi);
2126 ata_ehi_push_desc(ehi, "BMDMA stat 0x%x", host_stat); 2126 ata_ehi_push_desc(ehi, "BMDMA stat 0x%x", host_stat);
2127 ehi->err_mask |= AC_ERR_HOST_BUS; 2127 ehi->err_mask |= AC_ERR_HOST_BUS;
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index 21242c5709a0..54434db15b12 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -582,7 +582,7 @@ static void svia_configure(struct pci_dev *pdev, int board_id)
582 * When host issues HOLD, device may send up to 20DW of data 582 * When host issues HOLD, device may send up to 20DW of data
583 * before acknowledging it with HOLDA and the host should be 583 * before acknowledging it with HOLDA and the host should be
584 * able to buffer them in FIFO. Unfortunately, some WD drives 584 * able to buffer them in FIFO. Unfortunately, some WD drives
585 * send upto 40DW before acknowledging HOLD and, in the 585 * send up to 40DW before acknowledging HOLD and, in the
586 * default configuration, this ends up overflowing vt6421's 586 * default configuration, this ends up overflowing vt6421's
587 * FIFO, making the controller abort the transaction with 587 * FIFO, making the controller abort the transaction with
588 * R_ERR. 588 * R_ERR.
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
index 9f47e8625266..a5fcb1eb862f 100644
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
@@ -497,7 +497,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
497 // VC layer stats 497 // VC layer stats
498 atomic_inc(&atm_vcc->stats->rx); 498 atomic_inc(&atm_vcc->stats->rx);
499 __net_timestamp(skb); 499 __net_timestamp(skb);
500 // end of our responsability 500 // end of our responsibility
501 atm_vcc->push (atm_vcc, skb); 501 atm_vcc->push (atm_vcc, skb);
502 return; 502 return;
503 503
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 049650d42c88..ef7a658312a6 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -1782,7 +1782,7 @@ static int __devinit fs_init (struct fs_dev *dev)
1782 write_fs (dev, RAS0, RAS0_DCD_XHLT 1782 write_fs (dev, RAS0, RAS0_DCD_XHLT
1783 | (((1 << FS155_VPI_BITS) - 1) * RAS0_VPSEL) 1783 | (((1 << FS155_VPI_BITS) - 1) * RAS0_VPSEL)
1784 | (((1 << FS155_VCI_BITS) - 1) * RAS0_VCSEL)); 1784 | (((1 << FS155_VCI_BITS) - 1) * RAS0_VCSEL));
1785 /* We can chose the split arbitarily. We might be able to 1785 /* We can chose the split arbitrarily. We might be able to
1786 support more. Whatever. This should do for now. */ 1786 support more. Whatever. This should do for now. */
1787 dev->atm_dev->ci_range.vpi_bits = FS155_VPI_BITS; 1787 dev->atm_dev->ci_range.vpi_bits = FS155_VPI_BITS;
1788 dev->atm_dev->ci_range.vci_bits = FS155_VCI_BITS; 1788 dev->atm_dev->ci_range.vci_bits = FS155_VCI_BITS;
diff --git a/drivers/atm/fore200e.h b/drivers/atm/fore200e.h
index 7f97c09aaea5..ba34a02b717d 100644
--- a/drivers/atm/fore200e.h
+++ b/drivers/atm/fore200e.h
@@ -263,7 +263,7 @@ typedef enum opcode {
263} opcode_t; 263} opcode_t;
264 264
265 265
266/* virtual path / virtual channel identifers */ 266/* virtual path / virtual channel identifiers */
267 267
268typedef struct vpvc { 268typedef struct vpvc {
269 BITFIELD3( 269 BITFIELD3(
@@ -926,7 +926,7 @@ typedef struct fore200e_vcc {
926 926
927#define PCA200E_PCI_LATENCY 0x40 /* maximum slave latenty */ 927#define PCA200E_PCI_LATENCY 0x40 /* maximum slave latenty */
928#define PCA200E_PCI_MASTER_CTRL 0x41 /* master control */ 928#define PCA200E_PCI_MASTER_CTRL 0x41 /* master control */
929#define PCA200E_PCI_THRESHOLD 0x42 /* burst / continous req threshold */ 929#define PCA200E_PCI_THRESHOLD 0x42 /* burst / continuous req threshold */
930 930
931/* PBI master control register */ 931/* PBI master control register */
932 932
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
index 24761e1d6642..d58e3fcb9db3 100644
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
@@ -169,13 +169,13 @@ static inline void __init show_version (void) {
169 Real Time (cdv and max CDT given) 169 Real Time (cdv and max CDT given)
170 170
171 CBR(pcr) pcr bandwidth always available 171 CBR(pcr) pcr bandwidth always available
172 rtVBR(pcr,scr,mbs) scr bandwidth always available, upto pcr at mbs too 172 rtVBR(pcr,scr,mbs) scr bandwidth always available, up to pcr at mbs too
173 173
174 Non Real Time 174 Non Real Time
175 175
176 nrtVBR(pcr,scr,mbs) scr bandwidth always available, upto pcr at mbs too 176 nrtVBR(pcr,scr,mbs) scr bandwidth always available, up to pcr at mbs too
177 UBR() 177 UBR()
178 ABR(mcr,pcr) mcr bandwidth always available, upto pcr (depending) too 178 ABR(mcr,pcr) mcr bandwidth always available, up to pcr (depending) too
179 179
180 mbs is max burst size (bucket) 180 mbs is max burst size (bucket)
181 pcr and scr have associated cdvt values 181 pcr and scr have associated cdvt values
@@ -944,7 +944,7 @@ static void hrz_close_rx (hrz_dev * dev, u16 vc) {
944// to be fixed soon, so do not define TAILRECUSRIONWORKS unless you 944// to be fixed soon, so do not define TAILRECUSRIONWORKS unless you
945// are sure it does as you may otherwise overflow the kernel stack. 945// are sure it does as you may otherwise overflow the kernel stack.
946 946
947// giving this fn a return value would help GCC, alledgedly 947// giving this fn a return value would help GCC, allegedly
948 948
949static void rx_schedule (hrz_dev * dev, int irq) { 949static void rx_schedule (hrz_dev * dev, int irq) {
950 unsigned int rx_bytes; 950 unsigned int rx_bytes;
@@ -1036,7 +1036,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
1036 // VC layer stats 1036 // VC layer stats
1037 atomic_inc(&vcc->stats->rx); 1037 atomic_inc(&vcc->stats->rx);
1038 __net_timestamp(skb); 1038 __net_timestamp(skb);
1039 // end of our responsability 1039 // end of our responsibility
1040 vcc->push (vcc, skb); 1040 vcc->push (vcc, skb);
1041 } 1041 }
1042 } 1042 }
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index bfb7feee0400..048f99fe6f83 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -3495,7 +3495,7 @@ init_card(struct atm_dev *dev)
3495 return -1; 3495 return -1;
3496 } 3496 }
3497 if (dev->phy->ioctl == NULL) { 3497 if (dev->phy->ioctl == NULL) {
3498 printk("%s: LT had no IOCTL funtion defined.\n", card->name); 3498 printk("%s: LT had no IOCTL function defined.\n", card->name);
3499 deinit_card(card); 3499 deinit_card(card);
3500 return -1; 3500 return -1;
3501 } 3501 }
diff --git a/drivers/atm/idt77252.h b/drivers/atm/idt77252.h
index f53a43ae2bbe..3a82cc23a053 100644
--- a/drivers/atm/idt77252.h
+++ b/drivers/atm/idt77252.h
@@ -766,7 +766,7 @@ struct idt77252_dev
766#define SAR_RCTE_BUFFSTAT_MASK 0x00003000 /* buffer status */ 766#define SAR_RCTE_BUFFSTAT_MASK 0x00003000 /* buffer status */
767#define SAR_RCTE_EFCI 0x00000800 /* EFCI Congestion flag */ 767#define SAR_RCTE_EFCI 0x00000800 /* EFCI Congestion flag */
768#define SAR_RCTE_CLP 0x00000400 /* Cell Loss Priority flag */ 768#define SAR_RCTE_CLP 0x00000400 /* Cell Loss Priority flag */
769#define SAR_RCTE_CRC 0x00000200 /* Recieved CRC Error */ 769#define SAR_RCTE_CRC 0x00000200 /* Received CRC Error */
770#define SAR_RCTE_CELLCNT_MASK 0x000001FF /* cell Count */ 770#define SAR_RCTE_CELLCNT_MASK 0x000001FF /* cell Count */
771 771
772#define SAR_RCTE_AAL0 0x00000000 /* AAL types for ALL field */ 772#define SAR_RCTE_AAL0 0x00000000 /* AAL types for ALL field */
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index d80d51b62a1a..1c674a91f146 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -1025,7 +1025,7 @@ static void desc_dbg(IADEV *iadev) {
1025} 1025}
1026 1026
1027 1027
1028/*----------------------------- Recieving side stuff --------------------------*/ 1028/*----------------------------- Receiving side stuff --------------------------*/
1029 1029
1030static void rx_excp_rcvd(struct atm_dev *dev) 1030static void rx_excp_rcvd(struct atm_dev *dev)
1031{ 1031{
@@ -1195,7 +1195,7 @@ static void rx_intr(struct atm_dev *dev)
1195 if (status & RX_PKT_RCVD) 1195 if (status & RX_PKT_RCVD)
1196 { 1196 {
1197 /* do something */ 1197 /* do something */
1198 /* Basically recvd an interrupt for receving a packet. 1198 /* Basically recvd an interrupt for receiving a packet.
1199 A descriptor would have been written to the packet complete 1199 A descriptor would have been written to the packet complete
1200 queue. Get all the descriptors and set up dma to move the 1200 queue. Get all the descriptors and set up dma to move the
1201 packets till the packet complete queue is empty.. 1201 packets till the packet complete queue is empty..
@@ -1855,7 +1855,7 @@ static int open_tx(struct atm_vcc *vcc)
1855 return -EINVAL; 1855 return -EINVAL;
1856 } 1856 }
1857 if (vcc->qos.txtp.max_pcr > iadev->LineRate) { 1857 if (vcc->qos.txtp.max_pcr > iadev->LineRate) {
1858 IF_CBR(printk("PCR is not availble\n");) 1858 IF_CBR(printk("PCR is not available\n");)
1859 return -1; 1859 return -1;
1860 } 1860 }
1861 vc->type = CBR; 1861 vc->type = CBR;
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index 52880c8387d8..4e8ba56f75d3 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -1255,7 +1255,7 @@ static inline void lanai_endtx(struct lanai_dev *lanai,
1255 /* 1255 /*
1256 * Since the "butt register" is a shared resounce on the card we 1256 * Since the "butt register" is a shared resounce on the card we
1257 * serialize all accesses to it through this spinlock. This is 1257 * serialize all accesses to it through this spinlock. This is
1258 * mostly just paranoia sicne the register is rarely "busy" anyway 1258 * mostly just paranoia since the register is rarely "busy" anyway
1259 * but is needed for correctness. 1259 * but is needed for correctness.
1260 */ 1260 */
1261 spin_lock(&lanai->endtxlock); 1261 spin_lock(&lanai->endtxlock);
@@ -1990,7 +1990,7 @@ static int __devinit lanai_pci_start(struct lanai_dev *lanai)
1990 1990
1991/* 1991/*
1992 * We _can_ use VCI==0 for normal traffic, but only for UBR (or we'll 1992 * We _can_ use VCI==0 for normal traffic, but only for UBR (or we'll
1993 * get a CBRZERO interrupt), and we can use it only if noone is receiving 1993 * get a CBRZERO interrupt), and we can use it only if no one is receiving
1994 * AAL0 traffic (since they will use the same queue) - according to the 1994 * AAL0 traffic (since they will use the same queue) - according to the
1995 * docs we shouldn't even use it for AAL0 traffic 1995 * docs we shouldn't even use it for AAL0 traffic
1996 */ 1996 */
diff --git a/drivers/auxdisplay/cfag12864b.c b/drivers/auxdisplay/cfag12864b.c
index 49758593a5ba..41ce4bd96813 100644
--- a/drivers/auxdisplay/cfag12864b.c
+++ b/drivers/auxdisplay/cfag12864b.c
@@ -49,7 +49,7 @@
49static unsigned int cfag12864b_rate = CONFIG_CFAG12864B_RATE; 49static unsigned int cfag12864b_rate = CONFIG_CFAG12864B_RATE;
50module_param(cfag12864b_rate, uint, S_IRUGO); 50module_param(cfag12864b_rate, uint, S_IRUGO);
51MODULE_PARM_DESC(cfag12864b_rate, 51MODULE_PARM_DESC(cfag12864b_rate,
52 "Refresh rate (hertzs)"); 52 "Refresh rate (hertz)");
53 53
54unsigned int cfag12864b_getrate(void) 54unsigned int cfag12864b_getrate(void)
55{ 55{
@@ -60,7 +60,7 @@ unsigned int cfag12864b_getrate(void)
60 * cfag12864b Commands 60 * cfag12864b Commands
61 * 61 *
62 * E = Enable signal 62 * E = Enable signal
63 * Everytime E switch from low to high, 63 * Every time E switch from low to high,
64 * cfag12864b/ks0108 reads the command/data. 64 * cfag12864b/ks0108 reads the command/data.
65 * 65 *
66 * CS1 = First ks0108controller. 66 * CS1 = First ks0108controller.
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 54597c859ecb..3172c60d23a9 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -443,7 +443,7 @@ static int rpm_suspend(struct device *dev, int rpmflags)
443 * 443 *
444 * Check if the device's run-time PM status allows it to be resumed. Cancel 444 * Check if the device's run-time PM status allows it to be resumed. Cancel
445 * any scheduled or pending requests. If another resume has been started 445 * any scheduled or pending requests. If another resume has been started
446 * earlier, either return imediately or wait for it to finish, depending on the 446 * earlier, either return immediately or wait for it to finish, depending on the
447 * RPM_NOWAIT and RPM_ASYNC flags. Similarly, if there's a suspend running in 447 * RPM_NOWAIT and RPM_ASYNC flags. Similarly, if there's a suspend running in
448 * parallel with this function, either tell the other process to resume after 448 * parallel with this function, either tell the other process to resume after
449 * suspending (deferred_resume) or wait for it to finish. If the RPM_ASYNC 449 * suspending (deferred_resume) or wait for it to finish. If the RPM_ASYNC
diff --git a/drivers/base/sys.c b/drivers/base/sys.c
index fbe72da6c414..acde9b5ee131 100644
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
@@ -197,7 +197,7 @@ kset_put:
197} 197}
198 198
199/** 199/**
200 * sysdev_driver_register - Register auxillary driver 200 * sysdev_driver_register - Register auxiliary driver
201 * @cls: Device class driver belongs to. 201 * @cls: Device class driver belongs to.
202 * @drv: Driver. 202 * @drv: Driver.
203 * 203 *
@@ -250,7 +250,7 @@ unlock:
250} 250}
251 251
252/** 252/**
253 * sysdev_driver_unregister - Remove an auxillary driver. 253 * sysdev_driver_unregister - Remove an auxiliary driver.
254 * @cls: Class driver belongs to. 254 * @cls: Class driver belongs to.
255 * @drv: Driver. 255 * @drv: Driver.
256 */ 256 */
@@ -302,7 +302,7 @@ int sysdev_register(struct sys_device *sysdev)
302 * code that should have called us. 302 * code that should have called us.
303 */ 303 */
304 304
305 /* Notify class auxillary drivers */ 305 /* Notify class auxiliary drivers */
306 list_for_each_entry(drv, &cls->drivers, entry) { 306 list_for_each_entry(drv, &cls->drivers, entry) {
307 if (drv->add) 307 if (drv->add)
308 drv->add(sysdev); 308 drv->add(sysdev);
@@ -335,7 +335,7 @@ void sysdev_unregister(struct sys_device *sysdev)
335 * 335 *
336 * Loop over each class of system devices, and the devices in each 336 * Loop over each class of system devices, and the devices in each
337 * of those classes. For each device, we call the shutdown method for 337 * of those classes. For each device, we call the shutdown method for
338 * each driver registered for the device - the auxillaries, 338 * each driver registered for the device - the auxiliaries,
339 * and the class driver. 339 * and the class driver.
340 * 340 *
341 * Note: The list is iterated in reverse order, so that we shut down 341 * Note: The list is iterated in reverse order, so that we shut down
@@ -360,7 +360,7 @@ void sysdev_shutdown(void)
360 struct sysdev_driver *drv; 360 struct sysdev_driver *drv;
361 pr_debug(" %s\n", kobject_name(&sysdev->kobj)); 361 pr_debug(" %s\n", kobject_name(&sysdev->kobj));
362 362
363 /* Call auxillary drivers first */ 363 /* Call auxiliary drivers first */
364 list_for_each_entry(drv, &cls->drivers, entry) { 364 list_for_each_entry(drv, &cls->drivers, entry) {
365 if (drv->shutdown) 365 if (drv->shutdown)
366 drv->shutdown(sysdev); 366 drv->shutdown(sysdev);
@@ -385,7 +385,7 @@ static void __sysdev_resume(struct sys_device *dev)
385 WARN_ONCE(!irqs_disabled(), 385 WARN_ONCE(!irqs_disabled(),
386 "Interrupts enabled after %pF\n", cls->resume); 386 "Interrupts enabled after %pF\n", cls->resume);
387 387
388 /* Call auxillary drivers next. */ 388 /* Call auxiliary drivers next. */
389 list_for_each_entry(drv, &cls->drivers, entry) { 389 list_for_each_entry(drv, &cls->drivers, entry) {
390 if (drv->resume) 390 if (drv->resume)
391 drv->resume(dev); 391 drv->resume(dev);
@@ -432,7 +432,7 @@ int sysdev_suspend(pm_message_t state)
432 list_for_each_entry(sysdev, &cls->kset.list, kobj.entry) { 432 list_for_each_entry(sysdev, &cls->kset.list, kobj.entry) {
433 pr_debug(" %s\n", kobject_name(&sysdev->kobj)); 433 pr_debug(" %s\n", kobject_name(&sysdev->kobj));
434 434
435 /* Call auxillary drivers first */ 435 /* Call auxiliary drivers first */
436 list_for_each_entry(drv, &cls->drivers, entry) { 436 list_for_each_entry(drv, &cls->drivers, entry) {
437 if (drv->suspend) { 437 if (drv->suspend) {
438 ret = drv->suspend(sysdev, state); 438 ret = drv->suspend(sysdev, state);
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 79882104e431..8066d086578a 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -1790,7 +1790,7 @@ static bool DAC960_V2_ReadControllerConfiguration(DAC960_Controller_T
1790 unsigned short LogicalDeviceNumber = 0; 1790 unsigned short LogicalDeviceNumber = 0;
1791 int ModelNameLength; 1791 int ModelNameLength;
1792 1792
1793 /* Get data into dma-able area, then copy into permanant location */ 1793 /* Get data into dma-able area, then copy into permanent location */
1794 if (!DAC960_V2_NewControllerInfo(Controller)) 1794 if (!DAC960_V2_NewControllerInfo(Controller))
1795 return DAC960_Failure(Controller, "GET CONTROLLER INFO"); 1795 return DAC960_Failure(Controller, "GET CONTROLLER INFO");
1796 memcpy(ControllerInfo, Controller->V2.NewControllerInformation, 1796 memcpy(ControllerInfo, Controller->V2.NewControllerInformation,
diff --git a/drivers/block/drbd/drbd_actlog.c b/drivers/block/drbd/drbd_actlog.c
index 2a1642bc451d..c6828b68d77b 100644
--- a/drivers/block/drbd/drbd_actlog.c
+++ b/drivers/block/drbd/drbd_actlog.c
@@ -30,7 +30,7 @@
30 30
31/* We maintain a trivial check sum in our on disk activity log. 31/* We maintain a trivial check sum in our on disk activity log.
32 * With that we can ensure correct operation even when the storage 32 * With that we can ensure correct operation even when the storage
33 * device might do a partial (last) sector write while loosing power. 33 * device might do a partial (last) sector write while losing power.
34 */ 34 */
35struct __packed al_transaction { 35struct __packed al_transaction {
36 u32 magic; 36 u32 magic;
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 81030d8d654b..b2699bb2e530 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -622,7 +622,7 @@ DCBP_set_pad_bits(struct p_compressed_bm *p, int n)
622/* one bitmap packet, including the p_header, 622/* one bitmap packet, including the p_header,
623 * should fit within one _architecture independend_ page. 623 * should fit within one _architecture independend_ page.
624 * so we need to use the fixed size 4KiB page size 624 * so we need to use the fixed size 4KiB page size
625 * most architechtures have used for a long time. 625 * most architectures have used for a long time.
626 */ 626 */
627#define BM_PACKET_PAYLOAD_BYTES (4096 - sizeof(struct p_header80)) 627#define BM_PACKET_PAYLOAD_BYTES (4096 - sizeof(struct p_header80))
628#define BM_PACKET_WORDS (BM_PACKET_PAYLOAD_BYTES/sizeof(long)) 628#define BM_PACKET_WORDS (BM_PACKET_PAYLOAD_BYTES/sizeof(long))
@@ -810,7 +810,7 @@ enum {
810 810
811/* global flag bits */ 811/* global flag bits */
812enum { 812enum {
813 CREATE_BARRIER, /* next P_DATA is preceeded by a P_BARRIER */ 813 CREATE_BARRIER, /* next P_DATA is preceded by a P_BARRIER */
814 SIGNAL_ASENDER, /* whether asender wants to be interrupted */ 814 SIGNAL_ASENDER, /* whether asender wants to be interrupted */
815 SEND_PING, /* whether asender should send a ping asap */ 815 SEND_PING, /* whether asender should send a ping asap */
816 816
@@ -1126,7 +1126,7 @@ struct drbd_conf {
1126 int c_sync_rate; /* current resync rate after syncer throttle magic */ 1126 int c_sync_rate; /* current resync rate after syncer throttle magic */
1127 struct fifo_buffer rs_plan_s; /* correction values of resync planer */ 1127 struct fifo_buffer rs_plan_s; /* correction values of resync planer */
1128 int rs_in_flight; /* resync sectors in flight (to proxy, in proxy and from proxy) */ 1128 int rs_in_flight; /* resync sectors in flight (to proxy, in proxy and from proxy) */
1129 int rs_planed; /* resync sectors already planed */ 1129 int rs_planed; /* resync sectors already planned */
1130 atomic_t ap_in_flight; /* App sectors in flight (waiting for ack) */ 1130 atomic_t ap_in_flight; /* App sectors in flight (waiting for ack) */
1131}; 1131};
1132 1132
@@ -1144,7 +1144,7 @@ static inline unsigned int mdev_to_minor(struct drbd_conf *mdev)
1144 return mdev->minor; 1144 return mdev->minor;
1145} 1145}
1146 1146
1147/* returns 1 if it was successfull, 1147/* returns 1 if it was successful,
1148 * returns 0 if there was no data socket. 1148 * returns 0 if there was no data socket.
1149 * so wherever you are going to use the data.socket, e.g. do 1149 * so wherever you are going to use the data.socket, e.g. do
1150 * if (!drbd_get_data_sock(mdev)) 1150 * if (!drbd_get_data_sock(mdev))
@@ -2079,7 +2079,7 @@ static inline void inc_ap_pending(struct drbd_conf *mdev)
2079/* counts how many resync-related answers we still expect from the peer 2079/* counts how many resync-related answers we still expect from the peer
2080 * increase decrease 2080 * increase decrease
2081 * C_SYNC_TARGET sends P_RS_DATA_REQUEST (and expects P_RS_DATA_REPLY) 2081 * C_SYNC_TARGET sends P_RS_DATA_REQUEST (and expects P_RS_DATA_REPLY)
2082 * C_SYNC_SOURCE sends P_RS_DATA_REPLY (and expects P_WRITE_ACK whith ID_SYNCER) 2082 * C_SYNC_SOURCE sends P_RS_DATA_REPLY (and expects P_WRITE_ACK with ID_SYNCER)
2083 * (or P_NEG_ACK with ID_SYNCER) 2083 * (or P_NEG_ACK with ID_SYNCER)
2084 */ 2084 */
2085static inline void inc_rs_pending(struct drbd_conf *mdev) 2085static inline void inc_rs_pending(struct drbd_conf *mdev)
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index dfc85f32d317..5b525c179f39 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -1561,7 +1561,7 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os,
1561 if (drbd_send_state(mdev)) 1561 if (drbd_send_state(mdev))
1562 dev_warn(DEV, "Notified peer that I'm now diskless.\n"); 1562 dev_warn(DEV, "Notified peer that I'm now diskless.\n");
1563 /* corresponding get_ldev in __drbd_set_state 1563 /* corresponding get_ldev in __drbd_set_state
1564 * this may finaly trigger drbd_ldev_destroy. */ 1564 * this may finally trigger drbd_ldev_destroy. */
1565 put_ldev(mdev); 1565 put_ldev(mdev);
1566 } 1566 }
1567 1567
@@ -3706,7 +3706,7 @@ int drbd_md_read(struct drbd_conf *mdev, struct drbd_backing_dev *bdev)
3706 buffer = (struct meta_data_on_disk *)page_address(mdev->md_io_page); 3706 buffer = (struct meta_data_on_disk *)page_address(mdev->md_io_page);
3707 3707
3708 if (!drbd_md_sync_page_io(mdev, bdev, bdev->md.md_offset, READ)) { 3708 if (!drbd_md_sync_page_io(mdev, bdev, bdev->md.md_offset, READ)) {
3709 /* NOTE: cant do normal error processing here as this is 3709 /* NOTE: can't do normal error processing here as this is
3710 called BEFORE disk is attached */ 3710 called BEFORE disk is attached */
3711 dev_err(DEV, "Error while reading metadata.\n"); 3711 dev_err(DEV, "Error while reading metadata.\n");
3712 rv = ERR_IO_MD_DISK; 3712 rv = ERR_IO_MD_DISK;
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index fe1564c7d8b6..fd26666c0b08 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -862,7 +862,7 @@ retry:
862 msock->sk->sk_rcvtimeo = mdev->net_conf->ping_int*HZ; 862 msock->sk->sk_rcvtimeo = mdev->net_conf->ping_int*HZ;
863 863
864 /* we don't want delays. 864 /* we don't want delays.
865 * we use TCP_CORK where apropriate, though */ 865 * we use TCP_CORK where appropriate, though */
866 drbd_tcp_nodelay(sock); 866 drbd_tcp_nodelay(sock);
867 drbd_tcp_nodelay(msock); 867 drbd_tcp_nodelay(msock);
868 868
diff --git a/drivers/block/drbd/drbd_vli.h b/drivers/block/drbd/drbd_vli.h
index fc824006e721..8cb1532a3816 100644
--- a/drivers/block/drbd/drbd_vli.h
+++ b/drivers/block/drbd/drbd_vli.h
@@ -32,7 +32,7 @@
32 * the bitmap transfer time can take much too long, 32 * the bitmap transfer time can take much too long,
33 * if transmitted in plain text. 33 * if transmitted in plain text.
34 * 34 *
35 * We try to reduce the transfered bitmap information 35 * We try to reduce the transferred bitmap information
36 * by encoding runlengths of bit polarity. 36 * by encoding runlengths of bit polarity.
37 * 37 *
38 * We never actually need to encode a "zero" (runlengths are positive). 38 * We never actually need to encode a "zero" (runlengths are positive).
diff --git a/drivers/block/hd.c b/drivers/block/hd.c
index 30ec6b37424e..007c630904c1 100644
--- a/drivers/block/hd.c
+++ b/drivers/block/hd.c
@@ -733,7 +733,7 @@ static int __init hd_init(void)
733 * the BIOS or CMOS. This doesn't work all that well, 733 * the BIOS or CMOS. This doesn't work all that well,
734 * since this assumes that this is a primary or secondary 734 * since this assumes that this is a primary or secondary
735 * drive, and if we're using this legacy driver, it's 735 * drive, and if we're using this legacy driver, it's
736 * probably an auxilliary controller added to recover 736 * probably an auxiliary controller added to recover
737 * legacy data off an ST-506 drive. Either way, it's 737 * legacy data off an ST-506 drive. Either way, it's
738 * definitely safest to have the user explicitly specify 738 * definitely safest to have the user explicitly specify
739 * the information. 739 * the information.
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index e2ff697697c2..9a5b2a2d616d 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -94,7 +94,7 @@ static const struct vio_error_entry viodasd_err_table[] = {
94 { 0x0204, EIO, "Use Error" }, 94 { 0x0204, EIO, "Use Error" },
95 { 0x0205, EIO, "Release Error" }, 95 { 0x0205, EIO, "Release Error" },
96 { 0x0206, EINVAL, "Invalid Disk" }, 96 { 0x0206, EINVAL, "Invalid Disk" },
97 { 0x0207, EBUSY, "Cant Lock" }, 97 { 0x0207, EBUSY, "Can't Lock" },
98 { 0x0208, EIO, "Already Locked" }, 98 { 0x0208, EIO, "Already Locked" },
99 { 0x0209, EIO, "Already Unlocked" }, 99 { 0x0209, EIO, "Already Unlocked" },
100 { 0x020A, EIO, "Invalid Arg" }, 100 { 0x020A, EIO, "Invalid Arg" },
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index 73354b081ed3..645ff765cd12 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -621,7 +621,7 @@ static void ace_fsm_dostate(struct ace_device *ace)
621 ace_dump_mem(ace->cf_id, 512); /* Debug: Dump out disk ID */ 621 ace_dump_mem(ace->cf_id, 512); /* Debug: Dump out disk ID */
622 622
623 if (ace->data_result) { 623 if (ace->data_result) {
624 /* Error occured, disable the disk */ 624 /* Error occurred, disable the disk */
625 ace->media_change = 1; 625 ace->media_change = 1;
626 set_capacity(ace->gd, 0); 626 set_capacity(ace->gd, 0);
627 dev_err(ace->dev, "error fetching CF id (%i)\n", 627 dev_err(ace->dev, "error fetching CF id (%i)\n",
@@ -801,7 +801,7 @@ static int ace_interrupt_checkstate(struct ace_device *ace)
801 u32 sreg = ace_in32(ace, ACE_STATUS); 801 u32 sreg = ace_in32(ace, ACE_STATUS);
802 u16 creg = ace_in(ace, ACE_CTRL); 802 u16 creg = ace_in(ace, ACE_CTRL);
803 803
804 /* Check for error occurance */ 804 /* Check for error occurrence */
805 if ((sreg & (ACE_STATUS_CFGERROR | ACE_STATUS_CFCERROR)) && 805 if ((sreg & (ACE_STATUS_CFGERROR | ACE_STATUS_CFCERROR)) &&
806 (creg & ACE_CTRL_ERRORIRQ)) { 806 (creg & ACE_CTRL_ERRORIRQ)) {
807 dev_err(ace->dev, "transfer failure\n"); 807 dev_err(ace->dev, "transfer failure\n");
@@ -1169,7 +1169,7 @@ static int __devinit ace_probe(struct platform_device *dev)
1169 irq = dev->resource[i].start; 1169 irq = dev->resource[i].start;
1170 } 1170 }
1171 1171
1172 /* Call the bus-independant setup code */ 1172 /* Call the bus-independent setup code */
1173 return ace_alloc(&dev->dev, id, physaddr, irq, bus_width); 1173 return ace_alloc(&dev->dev, id, physaddr, irq, bus_width);
1174} 1174}
1175 1175
@@ -1222,7 +1222,7 @@ static int __devinit ace_of_probe(struct platform_device *op)
1222 if (of_find_property(op->dev.of_node, "8-bit", NULL)) 1222 if (of_find_property(op->dev.of_node, "8-bit", NULL))
1223 bus_width = ACE_BUS_WIDTH_8; 1223 bus_width = ACE_BUS_WIDTH_8;
1224 1224
1225 /* Call the bus-independant setup code */ 1225 /* Call the bus-independent setup code */
1226 return ace_alloc(&op->dev, id ? be32_to_cpup(id) : 0, 1226 return ace_alloc(&op->dev, id ? be32_to_cpup(id) : 0,
1227 physaddr, irq, bus_width); 1227 physaddr, irq, bus_width);
1228} 1228}
diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c
index 38595e782d02..7e4b435f79f0 100644
--- a/drivers/bluetooth/hci_ll.c
+++ b/drivers/bluetooth/hci_ll.c
@@ -207,7 +207,7 @@ static void ll_device_want_to_wakeup(struct hci_uart *hu)
207 /* 207 /*
208 * This state means that both the host and the BRF chip 208 * This state means that both the host and the BRF chip
209 * have simultaneously sent a wake-up-indication packet. 209 * have simultaneously sent a wake-up-indication packet.
210 * Traditionaly, in this case, receiving a wake-up-indication 210 * Traditionally, in this case, receiving a wake-up-indication
211 * was enough and an additional wake-up-ack wasn't needed. 211 * was enough and an additional wake-up-ack wasn't needed.
212 * This has changed with the BRF6350, which does require an 212 * This has changed with the BRF6350, which does require an
213 * explicit wake-up-ack. Other BRF versions, which do not 213 * explicit wake-up-ack. Other BRF versions, which do not
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index e2c48a7eccff..514dd8efaf73 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -30,7 +30,7 @@
30 changelog for the 1.x series, David? 30 changelog for the 1.x series, David?
31 31
322.00 Dec 2, 1997 -- Erik Andersen <andersee@debian.org> 322.00 Dec 2, 1997 -- Erik Andersen <andersee@debian.org>
33 -- New maintainer! As David A. van Leeuwen has been too busy to activly 33 -- New maintainer! As David A. van Leeuwen has been too busy to actively
34 maintain and improve this driver, I am now carrying on the torch. If 34 maintain and improve this driver, I am now carrying on the torch. If
35 you have a problem with this driver, please feel free to contact me. 35 you have a problem with this driver, please feel free to contact me.
36 36
@@ -2520,7 +2520,7 @@ static int cdrom_ioctl_drive_status(struct cdrom_device_info *cdi,
2520/* 2520/*
2521 * Ok, this is where problems start. The current interface for the 2521 * Ok, this is where problems start. The current interface for the
2522 * CDROM_DISC_STATUS ioctl is flawed. It makes the false assumption that 2522 * CDROM_DISC_STATUS ioctl is flawed. It makes the false assumption that
2523 * CDs are all CDS_DATA_1 or all CDS_AUDIO, etc. Unfortunatly, while this 2523 * CDs are all CDS_DATA_1 or all CDS_AUDIO, etc. Unfortunately, while this
2524 * is often the case, it is also very common for CDs to have some tracks 2524 * is often the case, it is also very common for CDs to have some tracks
2525 * with data, and some tracks with audio. Just because I feel like it, 2525 * with data, and some tracks with audio. Just because I feel like it,
2526 * I declare the following to be the best way to cope. If the CD has ANY 2526 * I declare the following to be the best way to cope. If the CD has ANY
diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h
index 3e67ddde9e16..923f99df4f1c 100644
--- a/drivers/char/agp/agp.h
+++ b/drivers/char/agp/agp.h
@@ -237,7 +237,7 @@ extern int agp_try_unsupported_boot;
237 237
238long compat_agp_ioctl(struct file *file, unsigned int cmd, unsigned long arg); 238long compat_agp_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
239 239
240/* Chipset independant registers (from AGP Spec) */ 240/* Chipset independent registers (from AGP Spec) */
241#define AGP_APBASE 0x10 241#define AGP_APBASE 0x10
242 242
243#define AGPSTAT 0x4 243#define AGPSTAT 0x4
diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
index 45681c0ff3b6..f7e88787af97 100644
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
@@ -272,7 +272,7 @@ static void amd_irongate_cleanup(void)
272 * This routine could be implemented by taking the addresses 272 * This routine could be implemented by taking the addresses
273 * written to the GATT, and flushing them individually. However 273 * written to the GATT, and flushing them individually. However
274 * currently it just flushes the whole table. Which is probably 274 * currently it just flushes the whole table. Which is probably
275 * more efficent, since agp_memory blocks can be a large number of 275 * more efficient, since agp_memory blocks can be a large number of
276 * entries. 276 * entries.
277 */ 277 */
278 278
diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
index 13acaaf64edb..f02f9b07fd4c 100644
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
@@ -229,7 +229,7 @@ static int serverworks_fetch_size(void)
229 * This routine could be implemented by taking the addresses 229 * This routine could be implemented by taking the addresses
230 * written to the GATT, and flushing them individually. However 230 * written to the GATT, and flushing them individually. However
231 * currently it just flushes the whole table. Which is probably 231 * currently it just flushes the whole table. Which is probably
232 * more efficent, since agp_memory blocks can be a large number of 232 * more efficient, since agp_memory blocks can be a large number of
233 * entries. 233 * entries.
234 */ 234 */
235static void serverworks_tlbflush(struct agp_memory *temp) 235static void serverworks_tlbflush(struct agp_memory *temp)
diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
index df67e80019d2..8bc384937401 100644
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
@@ -400,7 +400,7 @@ static struct agp_device_ids via_agp_device_ids[] __devinitdata =
400 * the traditional AGP which resides only in chipset. AGP is used 400 * the traditional AGP which resides only in chipset. AGP is used
401 * by 3D driver which wasn't available for the VT3336 and VT3364 401 * by 3D driver which wasn't available for the VT3336 and VT3364
402 * generation until now. Unfortunately, by testing, VT3364 works 402 * generation until now. Unfortunately, by testing, VT3364 works
403 * but VT3336 doesn't. - explaination from via, just leave this as 403 * but VT3336 doesn't. - explanation from via, just leave this as
404 * as a placeholder to avoid future patches adding it back in. 404 * as a placeholder to avoid future patches adding it back in.
405 */ 405 */
406#if 0 406#if 0
diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c
index 0dec5da000ef..2efa176beab0 100644
--- a/drivers/char/ipmi/ipmi_poweroff.c
+++ b/drivers/char/ipmi/ipmi_poweroff.c
@@ -122,7 +122,7 @@ static struct ipmi_recv_msg halt_recv_msg = {
122 122
123 123
124/* 124/*
125 * Code to send a message and wait for the reponse. 125 * Code to send a message and wait for the response.
126 */ 126 */
127 127
128static void receive_handler(struct ipmi_recv_msg *recv_msg, void *handler_data) 128static void receive_handler(struct ipmi_recv_msg *recv_msg, void *handler_data)
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index d28b484aee45..cc6c9b2546a3 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -339,7 +339,7 @@ static void return_hosed_msg(struct smi_info *smi_info, int cCode)
339 cCode = IPMI_ERR_UNSPECIFIED; 339 cCode = IPMI_ERR_UNSPECIFIED;
340 /* else use it as is */ 340 /* else use it as is */
341 341
342 /* Make it a reponse */ 342 /* Make it a response */
343 msg->rsp[0] = msg->data[0] | 4; 343 msg->rsp[0] = msg->data[0] | 4;
344 msg->rsp[1] = msg->data[1]; 344 msg->rsp[1] = msg->data[1];
345 msg->rsp[2] = cCode; 345 msg->rsp[2] = cCode;
@@ -2927,7 +2927,7 @@ static void return_hosed_msg_badsize(struct smi_info *smi_info)
2927{ 2927{
2928 struct ipmi_smi_msg *msg = smi_info->curr_msg; 2928 struct ipmi_smi_msg *msg = smi_info->curr_msg;
2929 2929
2930 /* Make it a reponse */ 2930 /* Make it a response */
2931 msg->rsp[0] = msg->data[0] | 4; 2931 msg->rsp[0] = msg->data[0] | 4;
2932 msg->rsp[1] = msg->data[1]; 2932 msg->rsp[1] = msg->data[1];
2933 msg->rsp[2] = CANNOT_RETURN_REQUESTED_LENGTH; 2933 msg->rsp[2] = CANNOT_RETURN_REQUESTED_LENGTH;
diff --git a/drivers/char/mbcs.h b/drivers/char/mbcs.h
index ba671589f4cb..1a36884c48b5 100644
--- a/drivers/char/mbcs.h
+++ b/drivers/char/mbcs.h
@@ -36,13 +36,13 @@
36#define MBCS_RD_DMA_CTRL 0x0110 /* Read DMA Control */ 36#define MBCS_RD_DMA_CTRL 0x0110 /* Read DMA Control */
37#define MBCS_RD_DMA_AMO_DEST 0x0118 /* Read DMA AMO Destination */ 37#define MBCS_RD_DMA_AMO_DEST 0x0118 /* Read DMA AMO Destination */
38#define MBCS_RD_DMA_INT_DEST 0x0120 /* Read DMA Interrupt Destination */ 38#define MBCS_RD_DMA_INT_DEST 0x0120 /* Read DMA Interrupt Destination */
39#define MBCS_RD_DMA_AUX_STAT 0x0130 /* Read DMA Auxillary Status */ 39#define MBCS_RD_DMA_AUX_STAT 0x0130 /* Read DMA Auxiliary Status */
40#define MBCS_WR_DMA_SYS_ADDR 0x0200 /* Write DMA System Address */ 40#define MBCS_WR_DMA_SYS_ADDR 0x0200 /* Write DMA System Address */
41#define MBCS_WR_DMA_LOC_ADDR 0x0208 /* Write DMA Local Address */ 41#define MBCS_WR_DMA_LOC_ADDR 0x0208 /* Write DMA Local Address */
42#define MBCS_WR_DMA_CTRL 0x0210 /* Write DMA Control */ 42#define MBCS_WR_DMA_CTRL 0x0210 /* Write DMA Control */
43#define MBCS_WR_DMA_AMO_DEST 0x0218 /* Write DMA AMO Destination */ 43#define MBCS_WR_DMA_AMO_DEST 0x0218 /* Write DMA AMO Destination */
44#define MBCS_WR_DMA_INT_DEST 0x0220 /* Write DMA Interrupt Destination */ 44#define MBCS_WR_DMA_INT_DEST 0x0220 /* Write DMA Interrupt Destination */
45#define MBCS_WR_DMA_AUX_STAT 0x0230 /* Write DMA Auxillary Status */ 45#define MBCS_WR_DMA_AUX_STAT 0x0230 /* Write DMA Auxiliary Status */
46#define MBCS_ALG_AMO_DEST 0x0300 /* Algorithm AMO Destination */ 46#define MBCS_ALG_AMO_DEST 0x0300 /* Algorithm AMO Destination */
47#define MBCS_ALG_INT_DEST 0x0308 /* Algorithm Interrupt Destination */ 47#define MBCS_ALG_INT_DEST 0x0308 /* Algorithm Interrupt Destination */
48#define MBCS_ALG_OFFSETS 0x0310 48#define MBCS_ALG_OFFSETS 0x0310
diff --git a/drivers/char/mwave/3780i.h b/drivers/char/mwave/3780i.h
index 270431ca7dae..fba6ab1160ce 100644
--- a/drivers/char/mwave/3780i.h
+++ b/drivers/char/mwave/3780i.h
@@ -122,7 +122,7 @@ typedef struct {
122typedef struct { 122typedef struct {
123 unsigned char Dma:3; /* RW: DMA channel selection */ 123 unsigned char Dma:3; /* RW: DMA channel selection */
124 unsigned char NumTransfers:2; /* RW: Maximum # of transfers once being granted the ISA bus */ 124 unsigned char NumTransfers:2; /* RW: Maximum # of transfers once being granted the ISA bus */
125 unsigned char ReRequest:2; /* RW: Minumum delay between releasing the ISA bus and requesting it again */ 125 unsigned char ReRequest:2; /* RW: Minimum delay between releasing the ISA bus and requesting it again */
126 unsigned char MEMCS16:1; /* RW: ISA signal MEMCS16: 0=disabled, 1=enabled */ 126 unsigned char MEMCS16:1; /* RW: ISA signal MEMCS16: 0=disabled, 1=enabled */
127} DSP_BUSMASTER_CFG_1; 127} DSP_BUSMASTER_CFG_1;
128 128
diff --git a/drivers/char/nwbutton.c b/drivers/char/nwbutton.c
index 8994ce32e6c7..04a480f86c6c 100644
--- a/drivers/char/nwbutton.c
+++ b/drivers/char/nwbutton.c
@@ -75,7 +75,7 @@ int button_add_callback (void (*callback) (void), int count)
75 * with -EINVAL. If there is more than one entry with the same address, 75 * with -EINVAL. If there is more than one entry with the same address,
76 * because it searches the list from end to beginning, it will unregister the 76 * because it searches the list from end to beginning, it will unregister the
77 * last one to be registered first (FILO- First In Last Out). 77 * last one to be registered first (FILO- First In Last Out).
78 * Note that this is not neccessarily true if the entries are not submitted 78 * Note that this is not necessarily true if the entries are not submitted
79 * at the same time, because another driver could have unregistered a callback 79 * at the same time, because another driver could have unregistered a callback
80 * between the submissions creating a gap earlier in the list, which would 80 * between the submissions creating a gap earlier in the list, which would
81 * be filled first at submission time. 81 * be filled first at submission time.
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index bcbbc71febb7..90bd01671c70 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -806,7 +806,7 @@ static void monitor_card(unsigned long p)
806 dev->flags1 = 0x01; 806 dev->flags1 = 0x01;
807 xoutb(dev->flags1, REG_FLAGS1(iobase)); 807 xoutb(dev->flags1, REG_FLAGS1(iobase));
808 808
809 /* atr is present (which doesnt mean it's valid) */ 809 /* atr is present (which doesn't mean it's valid) */
810 set_bit(IS_ATR_PRESENT, &dev->flags); 810 set_bit(IS_ATR_PRESENT, &dev->flags);
811 if (dev->atr[0] == 0x03) 811 if (dev->atr[0] == 0x03)
812 str_invert_revert(dev->atr, dev->atr_len); 812 str_invert_revert(dev->atr, dev->atr_len);
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index beca80bb9bdb..b575411c69b2 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -1290,7 +1290,7 @@ static int startup(MGSLPC_INFO * info, struct tty_struct *tty)
1290 /* Allocate and claim adapter resources */ 1290 /* Allocate and claim adapter resources */
1291 retval = claim_resources(info); 1291 retval = claim_resources(info);
1292 1292
1293 /* perform existance check and diagnostics */ 1293 /* perform existence check and diagnostics */
1294 if ( !retval ) 1294 if ( !retval )
1295 retval = adapter_test(info); 1295 retval = adapter_test(info);
1296 1296
@@ -2680,7 +2680,7 @@ static void rx_free_buffers(MGSLPC_INFO *info)
2680static int claim_resources(MGSLPC_INFO *info) 2680static int claim_resources(MGSLPC_INFO *info)
2681{ 2681{
2682 if (rx_alloc_buffers(info) < 0 ) { 2682 if (rx_alloc_buffers(info) < 0 ) {
2683 printk( "Cant allocate rx buffer %s\n", info->device_name); 2683 printk( "Can't allocate rx buffer %s\n", info->device_name);
2684 release_resources(info); 2684 release_resources(info);
2685 return -ENODEV; 2685 return -ENODEV;
2686 } 2686 }
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 5e29e8031bbc..d4ddeba56682 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -732,7 +732,7 @@ static ssize_t extract_entropy(struct entropy_store *r, void *buf,
732 size_t nbytes, int min, int rsvd); 732 size_t nbytes, int min, int rsvd);
733 733
734/* 734/*
735 * This utility inline function is responsible for transfering entropy 735 * This utility inline function is responsible for transferring entropy
736 * from the primary pool to the secondary extraction pool. We make 736 * from the primary pool to the secondary extraction pool. We make
737 * sure we pull enough for a 'catastrophic reseed'. 737 * sure we pull enough for a 'catastrophic reseed'.
738 */ 738 */
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 79e36c878a4c..1ee8ce7d2762 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -1241,7 +1241,7 @@ static int __devinit sonypi_setup_ioports(struct sonypi_device *dev,
1241 while (check_ioport && check->port1) { 1241 while (check_ioport && check->port1) {
1242 if (!request_region(check->port1, 1242 if (!request_region(check->port1,
1243 sonypi_device.region_size, 1243 sonypi_device.region_size,
1244 "Sony Programable I/O Device Check")) { 1244 "Sony Programmable I/O Device Check")) {
1245 printk(KERN_ERR "sonypi: ioport 0x%.4x busy, using sony-laptop? " 1245 printk(KERN_ERR "sonypi: ioport 0x%.4x busy, using sony-laptop? "
1246 "if not use check_ioport=0\n", 1246 "if not use check_ioport=0\n",
1247 check->port1); 1247 check->port1);
@@ -1255,7 +1255,7 @@ static int __devinit sonypi_setup_ioports(struct sonypi_device *dev,
1255 1255
1256 if (request_region(ioport_list->port1, 1256 if (request_region(ioport_list->port1,
1257 sonypi_device.region_size, 1257 sonypi_device.region_size,
1258 "Sony Programable I/O Device")) { 1258 "Sony Programmable I/O Device")) {
1259 dev->ioport1 = ioport_list->port1; 1259 dev->ioport1 = ioport_list->port1;
1260 dev->ioport2 = ioport_list->port2; 1260 dev->ioport2 = ioport_list->port2;
1261 return 0; 1261 return 0;
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index d3c9d755ed98..d6412c16385f 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -67,7 +67,7 @@
67 * cp foo.bit /dev/icap0 67 * cp foo.bit /dev/icap0
68 * 68 *
69 * Note that unless foo.bit is an appropriately constructed partial 69 * Note that unless foo.bit is an appropriately constructed partial
70 * bitstream, this has a high likelyhood of overwriting the design 70 * bitstream, this has a high likelihood of overwriting the design
71 * currently programmed in the FPGA. 71 * currently programmed in the FPGA.
72 */ 72 */
73 73
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index b03771d4787c..2dafc5c38ae7 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1782,7 +1782,7 @@ error_out:
1782 * cpufreq_update_policy - re-evaluate an existing cpufreq policy 1782 * cpufreq_update_policy - re-evaluate an existing cpufreq policy
1783 * @cpu: CPU which shall be re-evaluated 1783 * @cpu: CPU which shall be re-evaluated
1784 * 1784 *
1785 * Usefull for policy notifiers which have different necessities 1785 * Useful for policy notifiers which have different necessities
1786 * at different times. 1786 * at different times.
1787 */ 1787 */
1788int cpufreq_update_policy(unsigned int cpu) 1788int cpufreq_update_policy(unsigned int cpu)
diff --git a/drivers/crypto/amcc/crypto4xx_sa.c b/drivers/crypto/amcc/crypto4xx_sa.c
index 466fd94cd4a3..de8a7a48775a 100644
--- a/drivers/crypto/amcc/crypto4xx_sa.c
+++ b/drivers/crypto/amcc/crypto4xx_sa.c
@@ -17,7 +17,7 @@
17 * @file crypto4xx_sa.c 17 * @file crypto4xx_sa.c
18 * 18 *
19 * This file implements the security context 19 * This file implements the security context
20 * assoicate format. 20 * associate format.
21 */ 21 */
22#include <linux/kernel.h> 22#include <linux/kernel.h>
23#include <linux/module.h> 23#include <linux/module.h>
diff --git a/drivers/crypto/amcc/crypto4xx_sa.h b/drivers/crypto/amcc/crypto4xx_sa.h
index 4b83ed7e5570..1352d58d4e34 100644
--- a/drivers/crypto/amcc/crypto4xx_sa.h
+++ b/drivers/crypto/amcc/crypto4xx_sa.h
@@ -15,7 +15,7 @@
15 * GNU General Public License for more details. 15 * GNU General Public License for more details.
16 * 16 *
17 * This file defines the security context 17 * This file defines the security context
18 * assoicate format. 18 * associate format.
19 */ 19 */
20 20
21#ifndef __CRYPTO4XX_SA_H__ 21#ifndef __CRYPTO4XX_SA_H__
diff --git a/drivers/crypto/ixp4xx_crypto.c b/drivers/crypto/ixp4xx_crypto.c
index 0d662213c066..4c20c5bf6058 100644
--- a/drivers/crypto/ixp4xx_crypto.c
+++ b/drivers/crypto/ixp4xx_crypto.c
@@ -1044,7 +1044,7 @@ static int aead_perform(struct aead_request *req, int encrypt,
1044 memcpy(crypt->iv, req->iv, ivsize); 1044 memcpy(crypt->iv, req->iv, ivsize);
1045 1045
1046 if (req->src != req->dst) { 1046 if (req->src != req->dst) {
1047 BUG(); /* -ENOTSUP because of my lazyness */ 1047 BUG(); /* -ENOTSUP because of my laziness */
1048 } 1048 }
1049 1049
1050 /* ASSOC data */ 1050 /* ASSOC data */
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index 3d7d705f026f..235f53bf494e 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -167,7 +167,7 @@ static void atc_desc_put(struct at_dma_chan *atchan, struct at_desc *desc)
167/** 167/**
168 * atc_assign_cookie - compute and assign new cookie 168 * atc_assign_cookie - compute and assign new cookie
169 * @atchan: channel we work on 169 * @atchan: channel we work on
170 * @desc: descriptor to asign cookie for 170 * @desc: descriptor to assign cookie for
171 * 171 *
172 * Called with atchan->lock held and bh disabled 172 * Called with atchan->lock held and bh disabled
173 */ 173 */
diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c
index 00deabd9a04b..f48e54006518 100644
--- a/drivers/dma/coh901318.c
+++ b/drivers/dma/coh901318.c
@@ -529,7 +529,7 @@ static void coh901318_pause(struct dma_chan *chan)
529 val = readl(virtbase + COH901318_CX_CFG + 529 val = readl(virtbase + COH901318_CX_CFG +
530 COH901318_CX_CFG_SPACING * channel); 530 COH901318_CX_CFG_SPACING * channel);
531 531
532 /* Stopping infinit transfer */ 532 /* Stopping infinite transfer */
533 if ((val & COH901318_CX_CTRL_TC_ENABLE) == 0 && 533 if ((val & COH901318_CX_CTRL_TC_ENABLE) == 0 &&
534 (val & COH901318_CX_CFG_CH_ENABLE)) 534 (val & COH901318_CX_CFG_CH_ENABLE))
535 cohc->stopped = 1; 535 cohc->stopped = 1;
diff --git a/drivers/dma/intel_mid_dma.c b/drivers/dma/intel_mid_dma.c
index 798f46a4590d..3d4ec38b9b62 100644
--- a/drivers/dma/intel_mid_dma.c
+++ b/drivers/dma/intel_mid_dma.c
@@ -911,8 +911,8 @@ static int intel_mid_dma_alloc_chan_resources(struct dma_chan *chan)
911 911
912/** 912/**
913 * midc_handle_error - Handle DMA txn error 913 * midc_handle_error - Handle DMA txn error
914 * @mid: controller where error occured 914 * @mid: controller where error occurred
915 * @midc: chan where error occured 915 * @midc: chan where error occurred
916 * 916 *
917 * Scan the descriptor for error 917 * Scan the descriptor for error
918 */ 918 */
@@ -1099,7 +1099,7 @@ static int mid_setup_dma(struct pci_dev *pdev)
1099 dma->mask_reg = ioremap(LNW_PERIPHRAL_MASK_BASE, 1099 dma->mask_reg = ioremap(LNW_PERIPHRAL_MASK_BASE,
1100 LNW_PERIPHRAL_MASK_SIZE); 1100 LNW_PERIPHRAL_MASK_SIZE);
1101 if (dma->mask_reg == NULL) { 1101 if (dma->mask_reg == NULL) {
1102 pr_err("ERR_MDMA:Cant map periphral intr space !!\n"); 1102 pr_err("ERR_MDMA:Can't map periphral intr space !!\n");
1103 return -ENOMEM; 1103 return -ENOMEM;
1104 } 1104 }
1105 } else 1105 } else
@@ -1373,7 +1373,7 @@ int dma_resume(struct pci_dev *pci)
1373 pci_restore_state(pci); 1373 pci_restore_state(pci);
1374 ret = pci_enable_device(pci); 1374 ret = pci_enable_device(pci);
1375 if (ret) { 1375 if (ret) {
1376 pr_err("MDMA: device cant be enabled for %x\n", pci->device); 1376 pr_err("MDMA: device can't be enabled for %x\n", pci->device);
1377 return ret; 1377 return ret;
1378 } 1378 }
1379 device->state = RUNNING; 1379 device->state = RUNNING;
diff --git a/drivers/dma/intel_mid_dma_regs.h b/drivers/dma/intel_mid_dma_regs.h
index 709fecbdde79..aea5ee88ce03 100644
--- a/drivers/dma/intel_mid_dma_regs.h
+++ b/drivers/dma/intel_mid_dma_regs.h
@@ -174,8 +174,8 @@ union intel_mid_dma_cfg_hi {
174 * @dma: dma device struture pointer 174 * @dma: dma device struture pointer
175 * @busy: bool representing if ch is busy (active txn) or not 175 * @busy: bool representing if ch is busy (active txn) or not
176 * @in_use: bool representing if ch is in use or not 176 * @in_use: bool representing if ch is in use or not
177 * @raw_tfr: raw trf interrupt recieved 177 * @raw_tfr: raw trf interrupt received
178 * @raw_block: raw block interrupt recieved 178 * @raw_block: raw block interrupt received
179 */ 179 */
180struct intel_mid_dma_chan { 180struct intel_mid_dma_chan {
181 struct dma_chan chan; 181 struct dma_chan chan;
diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c
index 4f95d31f5a20..b9bae94f2015 100644
--- a/drivers/dma/mpc512x_dma.c
+++ b/drivers/dma/mpc512x_dma.c
@@ -328,7 +328,7 @@ static irqreturn_t mpc_dma_irq(int irq, void *data)
328 return IRQ_HANDLED; 328 return IRQ_HANDLED;
329} 329}
330 330
331/* proccess completed descriptors */ 331/* process completed descriptors */
332static void mpc_dma_process_completed(struct mpc_dma *mdma) 332static void mpc_dma_process_completed(struct mpc_dma *mdma)
333{ 333{
334 dma_cookie_t last_cookie = 0; 334 dma_cookie_t last_cookie = 0;
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index af955de035f4..94ee15dd3aed 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -90,7 +90,7 @@ struct d40_lli_pool {
90 * @lli_log: Same as above but for logical channels. 90 * @lli_log: Same as above but for logical channels.
91 * @lli_pool: The pool with two entries pre-allocated. 91 * @lli_pool: The pool with two entries pre-allocated.
92 * @lli_len: Number of llis of current descriptor. 92 * @lli_len: Number of llis of current descriptor.
93 * @lli_current: Number of transfered llis. 93 * @lli_current: Number of transferred llis.
94 * @lcla_alloc: Number of LCLA entries allocated. 94 * @lcla_alloc: Number of LCLA entries allocated.
95 * @txd: DMA engine struct. Used for among other things for communication 95 * @txd: DMA engine struct. Used for among other things for communication
96 * during a transfer. 96 * during a transfer.
@@ -1214,7 +1214,7 @@ static void dma_tasklet(unsigned long data)
1214 return; 1214 return;
1215 1215
1216 err: 1216 err:
1217 /* Rescue manouver if receiving double interrupts */ 1217 /* Rescue manoeuvre if receiving double interrupts */
1218 if (d40c->pending_tx > 0) 1218 if (d40c->pending_tx > 0)
1219 d40c->pending_tx--; 1219 d40c->pending_tx--;
1220 spin_unlock_irqrestore(&d40c->lock, flags); 1220 spin_unlock_irqrestore(&d40c->lock, flags);
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index fac1a2002e67..af1a17d42bd7 100644
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -45,7 +45,7 @@ config EDAC_DECODE_MCE
45 default y 45 default y
46 ---help--- 46 ---help---
47 Enable this option if you want to decode Machine Check Exceptions 47 Enable this option if you want to decode Machine Check Exceptions
48 occuring on your machine in human-readable form. 48 occurring on your machine in human-readable form.
49 49
50 You should definitely say Y here in case you want to decode MCEs 50 You should definitely say Y here in case you want to decode MCEs
51 which occur really early upon boot, before the module infrastructure 51 which occur really early upon boot, before the module infrastructure
diff --git a/drivers/edac/cpc925_edac.c b/drivers/edac/cpc925_edac.c
index b9a781c47e3c..837ad8f85b48 100644
--- a/drivers/edac/cpc925_edac.c
+++ b/drivers/edac/cpc925_edac.c
@@ -817,7 +817,7 @@ static void cpc925_del_edac_devices(void)
817 } 817 }
818} 818}
819 819
820/* Convert current back-ground scrub rate into byte/sec bandwith */ 820/* Convert current back-ground scrub rate into byte/sec bandwidth */
821static int cpc925_get_sdram_scrub_rate(struct mem_ctl_info *mci) 821static int cpc925_get_sdram_scrub_rate(struct mem_ctl_info *mci)
822{ 822{
823 struct cpc925_mc_pdata *pdata = mci->pvt_info; 823 struct cpc925_mc_pdata *pdata = mci->pvt_info;
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
index 3d965347a673..eefa3501916b 100644
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
@@ -164,7 +164,7 @@ enum mem_type {
164/* chipset Error Detection and Correction capabilities and mode */ 164/* chipset Error Detection and Correction capabilities and mode */
165enum edac_type { 165enum edac_type {
166 EDAC_UNKNOWN = 0, /* Unknown if ECC is available */ 166 EDAC_UNKNOWN = 0, /* Unknown if ECC is available */
167 EDAC_NONE, /* Doesnt support ECC */ 167 EDAC_NONE, /* Doesn't support ECC */
168 EDAC_RESERVED, /* Reserved ECC type */ 168 EDAC_RESERVED, /* Reserved ECC type */
169 EDAC_PARITY, /* Detects parity errors */ 169 EDAC_PARITY, /* Detects parity errors */
170 EDAC_EC, /* Error Checking - no correction */ 170 EDAC_EC, /* Error Checking - no correction */
@@ -233,7 +233,7 @@ enum scrub_type {
233 * of these in parallel provides 64 bits which is common 233 * of these in parallel provides 64 bits which is common
234 * for a memory stick. 234 * for a memory stick.
235 * 235 *
236 * Memory Stick: A printed circuit board that agregates multiple 236 * Memory Stick: A printed circuit board that aggregates multiple
237 * memory devices in parallel. This is the atomic 237 * memory devices in parallel. This is the atomic
238 * memory component that is purchaseable by Joe consumer 238 * memory component that is purchaseable by Joe consumer
239 * and loaded into a memory socket. 239 * and loaded into a memory socket.
@@ -385,7 +385,7 @@ struct mem_ctl_info {
385 385
386 /* Get the current sdram memory scrub rate from the internal 386 /* Get the current sdram memory scrub rate from the internal
387 representation and converts it to the closest matching 387 representation and converts it to the closest matching
388 bandwith in bytes/sec. 388 bandwidth in bytes/sec.
389 */ 389 */
390 int (*get_sdram_scrub_rate) (struct mem_ctl_info * mci); 390 int (*get_sdram_scrub_rate) (struct mem_ctl_info * mci);
391 391
@@ -823,7 +823,7 @@ extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,
823 * There are a limited number of error logging registers that can 823 * There are a limited number of error logging registers that can
824 * be exausted. When all registers are exhausted and an additional 824 * be exausted. When all registers are exhausted and an additional
825 * error occurs then an error overflow register records that an 825 * error occurs then an error overflow register records that an
826 * error occured and the type of error, but doesn't have any 826 * error occurred and the type of error, but doesn't have any
827 * further information. The ce/ue versions make for cleaner 827 * further information. The ce/ue versions make for cleaner
828 * reporting logic and function interface - reduces conditional 828 * reporting logic and function interface - reduces conditional
829 * statement clutter and extra function arguments. 829 * statement clutter and extra function arguments.
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
index d5e13c94714f..a7408cf86f37 100644
--- a/drivers/edac/edac_device.c
+++ b/drivers/edac/edac_device.c
@@ -672,7 +672,7 @@ void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev,
672 block->counters.ce_count++; 672 block->counters.ce_count++;
673 } 673 }
674 674
675 /* Propogate the count up the 'totals' tree */ 675 /* Propagate the count up the 'totals' tree */
676 instance->counters.ce_count++; 676 instance->counters.ce_count++;
677 edac_dev->counters.ce_count++; 677 edac_dev->counters.ce_count++;
678 678
@@ -718,7 +718,7 @@ void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev,
718 block->counters.ue_count++; 718 block->counters.ue_count++;
719 } 719 }
720 720
721 /* Propogate the count up the 'totals' tree */ 721 /* Propagate the count up the 'totals' tree */
722 instance->counters.ue_count++; 722 instance->counters.ue_count++;
723 edac_dev->counters.ue_count++; 723 edac_dev->counters.ue_count++;
724 724
diff --git a/drivers/edac/edac_device_sysfs.c b/drivers/edac/edac_device_sysfs.c
index 400de071cabc..86649df00285 100644
--- a/drivers/edac/edac_device_sysfs.c
+++ b/drivers/edac/edac_device_sysfs.c
@@ -533,7 +533,7 @@ static int edac_device_create_block(struct edac_device_ctl_info *edac_dev,
533 memset(&block->kobj, 0, sizeof(struct kobject)); 533 memset(&block->kobj, 0, sizeof(struct kobject));
534 534
535 /* bump the main kobject's reference count for this controller 535 /* bump the main kobject's reference count for this controller
536 * and this instance is dependant on the main 536 * and this instance is dependent on the main
537 */ 537 */
538 main_kobj = kobject_get(&edac_dev->kobj); 538 main_kobj = kobject_get(&edac_dev->kobj);
539 if (!main_kobj) { 539 if (!main_kobj) {
@@ -635,7 +635,7 @@ static int edac_device_create_instance(struct edac_device_ctl_info *edac_dev,
635 instance->ctl = edac_dev; 635 instance->ctl = edac_dev;
636 636
637 /* bump the main kobject's reference count for this controller 637 /* bump the main kobject's reference count for this controller
638 * and this instance is dependant on the main 638 * and this instance is dependent on the main
639 */ 639 */
640 main_kobj = kobject_get(&edac_dev->kobj); 640 main_kobj = kobject_get(&edac_dev->kobj);
641 if (!main_kobj) { 641 if (!main_kobj) {
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index a4e9db2d6524..1d8056049072 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -724,7 +724,7 @@ void edac_mc_handle_ce(struct mem_ctl_info *mci,
724 * Some MC's can remap memory so that it is still available 724 * Some MC's can remap memory so that it is still available
725 * at a different address when PCI devices map into memory. 725 * at a different address when PCI devices map into memory.
726 * MC's that can't do this lose the memory where PCI devices 726 * MC's that can't do this lose the memory where PCI devices
727 * are mapped. This mapping is MC dependant and so we call 727 * are mapped. This mapping is MC dependent and so we call
728 * back into the MC driver for it to map the MC page to 728 * back into the MC driver for it to map the MC page to
729 * a physical (CPU) page which can then be mapped to a virtual 729 * a physical (CPU) page which can then be mapped to a virtual
730 * page - which can then be scrubbed. 730 * page - which can then be scrubbed.
diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index 73196f7b7229..26343fd46596 100644
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -850,7 +850,7 @@ static void edac_remove_mci_instance_attributes(struct mem_ctl_info *mci,
850 850
851 /* 851 /*
852 * loop if there are attributes and until we hit a NULL entry 852 * loop if there are attributes and until we hit a NULL entry
853 * Remove first all the atributes 853 * Remove first all the attributes
854 */ 854 */
855 while (sysfs_attrib) { 855 while (sysfs_attrib) {
856 debugf4("%s() sysfs_attrib = %p\n",__func__, sysfs_attrib); 856 debugf4("%s() sysfs_attrib = %p\n",__func__, sysfs_attrib);
diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
index 023b01cb5175..495198ad059c 100644
--- a/drivers/edac/edac_pci_sysfs.c
+++ b/drivers/edac/edac_pci_sysfs.c
@@ -352,7 +352,7 @@ static int edac_pci_main_kobj_setup(void)
352 return 0; 352 return 0;
353 353
354 /* First time, so create the main kobject and its 354 /* First time, so create the main kobject and its
355 * controls and atributes 355 * controls and attributes
356 */ 356 */
357 edac_class = edac_get_sysfs_class(); 357 edac_class = edac_get_sysfs_class();
358 if (edac_class == NULL) { 358 if (edac_class == NULL) {
@@ -551,7 +551,7 @@ static void edac_pci_dev_parity_clear(struct pci_dev *dev)
551/* 551/*
552 * PCI Parity polling 552 * PCI Parity polling
553 * 553 *
554 * Fucntion to retrieve the current parity status 554 * Function to retrieve the current parity status
555 * and decode it 555 * and decode it
556 * 556 *
557 */ 557 */
diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
index a5cefab8d65d..87f427c2ce5c 100644
--- a/drivers/edac/i5000_edac.c
+++ b/drivers/edac/i5000_edac.c
@@ -1372,7 +1372,7 @@ static int i5000_probe1(struct pci_dev *pdev, int dev_idx)
1372 * actual number of slots/dimms per channel, we thus utilize the 1372 * actual number of slots/dimms per channel, we thus utilize the
1373 * resource as specified by the chipset. Thus, we might have 1373 * resource as specified by the chipset. Thus, we might have
1374 * have more DIMMs per channel than actually on the mobo, but this 1374 * have more DIMMs per channel than actually on the mobo, but this
1375 * allows the driver to support upto the chipset max, without 1375 * allows the driver to support up to the chipset max, without
1376 * some fancy mobo determination. 1376 * some fancy mobo determination.
1377 */ 1377 */
1378 i5000_get_dimm_and_channel_counts(pdev, &num_dimms_per_channel, 1378 i5000_get_dimm_and_channel_counts(pdev, &num_dimms_per_channel,
diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
index 0448da0af75d..bcbdeeca48b8 100644
--- a/drivers/edac/i5100_edac.c
+++ b/drivers/edac/i5100_edac.c
@@ -11,7 +11,7 @@
11 * 11 *
12 * The intel 5100 has two independent channels. EDAC core currently 12 * The intel 5100 has two independent channels. EDAC core currently
13 * can not reflect this configuration so instead the chip-select 13 * can not reflect this configuration so instead the chip-select
14 * rows for each respective channel are layed out one after another, 14 * rows for each respective channel are laid out one after another,
15 * the first half belonging to channel 0, the second half belonging 15 * the first half belonging to channel 0, the second half belonging
16 * to channel 1. 16 * to channel 1.
17 */ 17 */
diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c
index 38a9be9e1c7c..80a465efbae8 100644
--- a/drivers/edac/i5400_edac.c
+++ b/drivers/edac/i5400_edac.c
@@ -648,7 +648,7 @@ static void i5400_process_nonfatal_error_info(struct mem_ctl_info *mci,
648 return; 648 return;
649 } 649 }
650 650
651 /* Miscelaneous errors */ 651 /* Miscellaneous errors */
652 errnum = find_first_bit(&allErrors, ARRAY_SIZE(error_name)); 652 errnum = find_first_bit(&allErrors, ARRAY_SIZE(error_name));
653 653
654 branch = extract_fbdchan_indx(info->ferr_nf_fbd); 654 branch = extract_fbdchan_indx(info->ferr_nf_fbd);
@@ -1240,7 +1240,7 @@ static int i5400_probe1(struct pci_dev *pdev, int dev_idx)
1240 * actual number of slots/dimms per channel, we thus utilize the 1240 * actual number of slots/dimms per channel, we thus utilize the
1241 * resource as specified by the chipset. Thus, we might have 1241 * resource as specified by the chipset. Thus, we might have
1242 * have more DIMMs per channel than actually on the mobo, but this 1242 * have more DIMMs per channel than actually on the mobo, but this
1243 * allows the driver to support upto the chipset max, without 1243 * allows the driver to support up to the chipset max, without
1244 * some fancy mobo determination. 1244 * some fancy mobo determination.
1245 */ 1245 */
1246 num_dimms_per_channel = MAX_DIMMS_PER_CHANNEL; 1246 num_dimms_per_channel = MAX_DIMMS_PER_CHANNEL;
diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c
index 76d1f576cdc8..363cc1602944 100644
--- a/drivers/edac/i7300_edac.c
+++ b/drivers/edac/i7300_edac.c
@@ -1065,7 +1065,7 @@ static int __devinit i7300_init_one(struct pci_dev *pdev,
1065 * actual number of slots/dimms per channel, we thus utilize the 1065 * actual number of slots/dimms per channel, we thus utilize the
1066 * resource as specified by the chipset. Thus, we might have 1066 * resource as specified by the chipset. Thus, we might have
1067 * have more DIMMs per channel than actually on the mobo, but this 1067 * have more DIMMs per channel than actually on the mobo, but this
1068 * allows the driver to support upto the chipset max, without 1068 * allows the driver to support up to the chipset max, without
1069 * some fancy mobo determination. 1069 * some fancy mobo determination.
1070 */ 1070 */
1071 num_dimms_per_channel = MAX_SLOTS; 1071 num_dimms_per_channel = MAX_SLOTS;
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index 81154ab296b6..465cbc25149f 100644
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -1772,7 +1772,7 @@ static void i7core_check_error(struct mem_ctl_info *mci)
1772 /* 1772 /*
1773 * MCE first step: Copy all mce errors into a temporary buffer 1773 * MCE first step: Copy all mce errors into a temporary buffer
1774 * We use a double buffering here, to reduce the risk of 1774 * We use a double buffering here, to reduce the risk of
1775 * loosing an error. 1775 * losing an error.
1776 */ 1776 */
1777 smp_rmb(); 1777 smp_rmb();
1778 count = (pvt->mce_out + MCE_LOG_LEN - pvt->mce_in) 1778 count = (pvt->mce_out + MCE_LOG_LEN - pvt->mce_in)
diff --git a/drivers/edac/i82443bxgx_edac.c b/drivers/edac/i82443bxgx_edac.c
index 678405ab04e4..4329d39f902c 100644
--- a/drivers/edac/i82443bxgx_edac.c
+++ b/drivers/edac/i82443bxgx_edac.c
@@ -203,7 +203,7 @@ static void i82443bxgx_init_csrows(struct mem_ctl_info *mci,
203 row_high_limit = ((u32) drbar << 23); 203 row_high_limit = ((u32) drbar << 23);
204 /* find the DRAM Chip Select Base address and mask */ 204 /* find the DRAM Chip Select Base address and mask */
205 debugf1("MC%d: %s: %s() Row=%d, " 205 debugf1("MC%d: %s: %s() Row=%d, "
206 "Boundry Address=%#0x, Last = %#0x\n", 206 "Boundary Address=%#0x, Last = %#0x\n",
207 mci->mc_idx, __FILE__, __func__, index, row_high_limit, 207 mci->mc_idx, __FILE__, __func__, index, row_high_limit,
208 row_high_limit_last); 208 row_high_limit_last);
209 209
@@ -305,7 +305,7 @@ static int i82443bxgx_edacmc_probe1(struct pci_dev *pdev, int dev_idx)
305 i82443bxgx_init_csrows(mci, pdev, edac_mode, mtype); 305 i82443bxgx_init_csrows(mci, pdev, edac_mode, mtype);
306 306
307 /* Many BIOSes don't clear error flags on boot, so do this 307 /* Many BIOSes don't clear error flags on boot, so do this
308 * here, or we get "phantom" errors occuring at module-load 308 * here, or we get "phantom" errors occurring at module-load
309 * time. */ 309 * time. */
310 pci_write_bits32(pdev, I82443BXGX_EAP, 310 pci_write_bits32(pdev, I82443BXGX_EAP,
311 (I82443BXGX_EAP_OFFSET_SBE | 311 (I82443BXGX_EAP_OFFSET_SBE |
diff --git a/drivers/edac/mce_amd_inj.c b/drivers/edac/mce_amd_inj.c
index 733a7e7a8d6f..a4987e03f59e 100644
--- a/drivers/edac/mce_amd_inj.c
+++ b/drivers/edac/mce_amd_inj.c
@@ -90,7 +90,7 @@ static ssize_t edac_inject_bank_store(struct kobject *kobj,
90 90
91 if (value > 5) 91 if (value > 5)
92 if (boot_cpu_data.x86 != 0x15 || value > 6) { 92 if (boot_cpu_data.x86 != 0x15 || value > 6) {
93 printk(KERN_ERR "Non-existant MCE bank: %lu\n", value); 93 printk(KERN_ERR "Non-existent MCE bank: %lu\n", value);
94 return -EINVAL; 94 return -EINVAL;
95 } 95 }
96 96
diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c
index 6a822c631ef5..678513738c33 100644
--- a/drivers/edac/r82600_edac.c
+++ b/drivers/edac/r82600_edac.c
@@ -120,7 +120,7 @@
120 * write 0=NOP 120 * write 0=NOP
121 */ 121 */
122 122
123#define R82600_DRBA 0x60 /* + 0x60..0x63 SDRAM Row Boundry Address 123#define R82600_DRBA 0x60 /* + 0x60..0x63 SDRAM Row Boundary Address
124 * Registers 124 * Registers
125 * 125 *
126 * 7:0 Address lines 30:24 - upper limit of 126 * 7:0 Address lines 30:24 - upper limit of
@@ -217,7 +217,7 @@ static void r82600_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev,
217{ 217{
218 struct csrow_info *csrow; 218 struct csrow_info *csrow;
219 int index; 219 int index;
220 u8 drbar; /* SDRAM Row Boundry Address Register */ 220 u8 drbar; /* SDRAM Row Boundary Address Register */
221 u32 row_high_limit, row_high_limit_last; 221 u32 row_high_limit, row_high_limit_last;
222 u32 reg_sdram, ecc_on, row_base; 222 u32 reg_sdram, ecc_on, row_base;
223 223
@@ -236,7 +236,7 @@ static void r82600_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev,
236 row_high_limit = ((u32) drbar << 24); 236 row_high_limit = ((u32) drbar << 24);
237/* row_high_limit = ((u32)drbar << 24) | 0xffffffUL; */ 237/* row_high_limit = ((u32)drbar << 24) | 0xffffffUL; */
238 238
239 debugf1("%s() Row=%d, Boundry Address=%#0x, Last = %#0x\n", 239 debugf1("%s() Row=%d, Boundary Address=%#0x, Last = %#0x\n",
240 __func__, index, row_high_limit, row_high_limit_last); 240 __func__, index, row_high_limit, row_high_limit_last);
241 241
242 /* Empty row [p.57] */ 242 /* Empty row [p.57] */
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 7ed08fd1214e..3f04dd3681cf 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -453,7 +453,7 @@ static bool fwnet_pd_update(struct fwnet_peer *peer,
453 memcpy(pd->pbuf + frag_off, frag_buf, frag_len); 453 memcpy(pd->pbuf + frag_off, frag_buf, frag_len);
454 454
455 /* 455 /*
456 * Move list entry to beginnig of list so that oldest partial 456 * Move list entry to beginning of list so that oldest partial
457 * datagrams percolate to the end of the list 457 * datagrams percolate to the end of the list
458 */ 458 */
459 list_move_tail(&pd->pd_link, &peer->pd_list); 459 list_move_tail(&pd->pd_link, &peer->pd_list);
diff --git a/drivers/gpio/mc33880.c b/drivers/gpio/mc33880.c
index 00f6d24c669d..4ec797593bdb 100644
--- a/drivers/gpio/mc33880.c
+++ b/drivers/gpio/mc33880.c
@@ -45,7 +45,7 @@
45 * To save time we cache them here in memory 45 * To save time we cache them here in memory
46 */ 46 */
47struct mc33880 { 47struct mc33880 {
48 struct mutex lock; /* protect from simultanous accesses */ 48 struct mutex lock; /* protect from simultaneous accesses */
49 u8 port_config; 49 u8 port_config;
50 struct gpio_chip chip; 50 struct gpio_chip chip;
51 struct spi_device *spi; 51 struct spi_device *spi;
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 799e1490cf24..872747c5a544 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -1699,7 +1699,7 @@ int drm_mode_addfb(struct drm_device *dev,
1699 1699
1700 mutex_lock(&dev->mode_config.mutex); 1700 mutex_lock(&dev->mode_config.mutex);
1701 1701
1702 /* TODO check buffer is sufficently large */ 1702 /* TODO check buffer is sufficiently large */
1703 /* TODO setup destructor callback */ 1703 /* TODO setup destructor callback */
1704 1704
1705 fb = dev->mode_config.funcs->fb_create(dev, file_priv, r); 1705 fb = dev->mode_config.funcs->fb_create(dev, file_priv, r);
@@ -1750,7 +1750,7 @@ int drm_mode_rmfb(struct drm_device *dev,
1750 1750
1751 mutex_lock(&dev->mode_config.mutex); 1751 mutex_lock(&dev->mode_config.mutex);
1752 obj = drm_mode_object_find(dev, *id, DRM_MODE_OBJECT_FB); 1752 obj = drm_mode_object_find(dev, *id, DRM_MODE_OBJECT_FB);
1753 /* TODO check that we realy get a framebuffer back. */ 1753 /* TODO check that we really get a framebuffer back. */
1754 if (!obj) { 1754 if (!obj) {
1755 DRM_ERROR("mode invalid framebuffer id\n"); 1755 DRM_ERROR("mode invalid framebuffer id\n");
1756 ret = -EINVAL; 1756 ret = -EINVAL;
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
index add1737dae0d..5d00b0fc0d91 100644
--- a/drivers/gpu/drm/drm_mm.c
+++ b/drivers/gpu/drm/drm_mm.c
@@ -551,7 +551,7 @@ EXPORT_SYMBOL(drm_mm_scan_add_block);
551 * corrupted. 551 * corrupted.
552 * 552 *
553 * When the scan list is empty, the selected memory nodes can be freed. An 553 * When the scan list is empty, the selected memory nodes can be freed. An
554 * immediatly following drm_mm_search_free with best_match = 0 will then return 554 * immediately following drm_mm_search_free with best_match = 0 will then return
555 * the just freed block (because its at the top of the free_stack list). 555 * the just freed block (because its at the top of the free_stack list).
556 * 556 *
557 * Returns one if this block should be evicted, zero otherwise. Will always 557 * Returns one if this block should be evicted, zero otherwise. Will always
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 5004724ea57e..1c1b27c97e5c 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -630,7 +630,7 @@ typedef struct drm_i915_private {
630 * Flag if the hardware appears to be wedged. 630 * Flag if the hardware appears to be wedged.
631 * 631 *
632 * This is set when attempts to idle the device timeout. 632 * This is set when attempts to idle the device timeout.
633 * It prevents command submission from occuring and makes 633 * It prevents command submission from occurring and makes
634 * every pending request fail 634 * every pending request fail
635 */ 635 */
636 atomic_t wedged; 636 atomic_t wedged;
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 0daefca5cbb8..cb8578b7e443 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -213,7 +213,7 @@ intel_dp_mode_valid(struct drm_connector *connector,
213 return MODE_PANEL; 213 return MODE_PANEL;
214 } 214 }
215 215
216 /* only refuse the mode on non eDP since we have seen some wierd eDP panels 216 /* only refuse the mode on non eDP since we have seen some weird eDP panels
217 which are outside spec tolerances but somehow work by magic */ 217 which are outside spec tolerances but somehow work by magic */
218 if (!is_edp(intel_dp) && 218 if (!is_edp(intel_dp) &&
219 (intel_dp_link_required(connector->dev, intel_dp, mode->clock) 219 (intel_dp_link_required(connector->dev, intel_dp, mode->clock)
diff --git a/drivers/gpu/drm/i915/intel_sdvo_regs.h b/drivers/gpu/drm/i915/intel_sdvo_regs.h
index a386b022e538..4f4e23bc2d16 100644
--- a/drivers/gpu/drm/i915/intel_sdvo_regs.h
+++ b/drivers/gpu/drm/i915/intel_sdvo_regs.h
@@ -230,7 +230,7 @@ struct intel_sdvo_set_target_input_args {
230} __attribute__((packed)); 230} __attribute__((packed));
231 231
232/** 232/**
233 * Takes a struct intel_sdvo_output_flags of which outputs are targetted by 233 * Takes a struct intel_sdvo_output_flags of which outputs are targeted by
234 * future output commands. 234 * future output commands.
235 * 235 *
236 * Affected commands inclue SET_OUTPUT_TIMINGS_PART[12], 236 * Affected commands inclue SET_OUTPUT_TIMINGS_PART[12],
diff --git a/drivers/gpu/drm/mga/mga_dma.c b/drivers/gpu/drm/mga/mga_dma.c
index 1e1eb1d7e971..5ccb65deb83c 100644
--- a/drivers/gpu/drm/mga/mga_dma.c
+++ b/drivers/gpu/drm/mga/mga_dma.c
@@ -426,7 +426,7 @@ int mga_driver_load(struct drm_device *dev, unsigned long flags)
426 * Bootstrap the driver for AGP DMA. 426 * Bootstrap the driver for AGP DMA.
427 * 427 *
428 * \todo 428 * \todo
429 * Investigate whether there is any benifit to storing the WARP microcode in 429 * Investigate whether there is any benefit to storing the WARP microcode in
430 * AGP memory. If not, the microcode may as well always be put in PCI 430 * AGP memory. If not, the microcode may as well always be put in PCI
431 * memory. 431 * memory.
432 * 432 *
diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
index 3837090d66af..4cea35c57d15 100644
--- a/drivers/gpu/drm/nouveau/nouveau_channel.c
+++ b/drivers/gpu/drm/nouveau/nouveau_channel.c
@@ -200,7 +200,7 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret,
200 /* disable the fifo caches */ 200 /* disable the fifo caches */
201 pfifo->reassign(dev, false); 201 pfifo->reassign(dev, false);
202 202
203 /* Construct inital RAMFC for new channel */ 203 /* Construct initial RAMFC for new channel */
204 ret = pfifo->create_context(chan); 204 ret = pfifo->create_context(chan);
205 if (ret) { 205 if (ret) {
206 nouveau_channel_put(&chan); 206 nouveau_channel_put(&chan);
@@ -278,7 +278,7 @@ nouveau_channel_put_unlocked(struct nouveau_channel **pchan)
278 return; 278 return;
279 } 279 }
280 280
281 /* noone wants the channel anymore */ 281 /* no one wants the channel anymore */
282 NV_DEBUG(dev, "freeing channel %d\n", chan->id); 282 NV_DEBUG(dev, "freeing channel %d\n", chan->id);
283 nouveau_debugfs_channel_fini(chan); 283 nouveau_debugfs_channel_fini(chan);
284 284
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index fff180a99867..57e5302503db 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -216,7 +216,7 @@ struct nouveau_channel {
216 /* mapping of the fifo itself */ 216 /* mapping of the fifo itself */
217 struct drm_local_map *map; 217 struct drm_local_map *map;
218 218
219 /* mapping of the regs controling the fifo */ 219 /* mapping of the regs controlling the fifo */
220 void __iomem *user; 220 void __iomem *user;
221 uint32_t user_get; 221 uint32_t user_get;
222 uint32_t user_put; 222 uint32_t user_put;
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index 4fcbd091a117..5bb2859001e2 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -963,7 +963,7 @@ int nouveau_load(struct drm_device *dev, unsigned long flags)
963 if (ret) 963 if (ret)
964 goto err_mmio; 964 goto err_mmio;
965 965
966 /* Map PRAMIN BAR, or on older cards, the aperture withing BAR0 */ 966 /* Map PRAMIN BAR, or on older cards, the aperture within BAR0 */
967 if (dev_priv->card_type >= NV_40) { 967 if (dev_priv->card_type >= NV_40) {
968 int ramin_bar = 2; 968 int ramin_bar = 2;
969 if (pci_resource_len(dev->pdev, ramin_bar) == 0) 969 if (pci_resource_len(dev->pdev, ramin_bar) == 0)
diff --git a/drivers/gpu/drm/nouveau/nv04_crtc.c b/drivers/gpu/drm/nouveau/nv04_crtc.c
index a260fbbe3d9b..748b9d9c2949 100644
--- a/drivers/gpu/drm/nouveau/nv04_crtc.c
+++ b/drivers/gpu/drm/nouveau/nv04_crtc.c
@@ -164,7 +164,7 @@ nv_crtc_dpms(struct drm_crtc *crtc, int mode)
164 NV_DEBUG_KMS(dev, "Setting dpms mode %d on CRTC %d\n", mode, 164 NV_DEBUG_KMS(dev, "Setting dpms mode %d on CRTC %d\n", mode,
165 nv_crtc->index); 165 nv_crtc->index);
166 166
167 if (nv_crtc->last_dpms == mode) /* Don't do unnecesary mode changes. */ 167 if (nv_crtc->last_dpms == mode) /* Don't do unnecessary mode changes. */
168 return; 168 return;
169 169
170 nv_crtc->last_dpms = mode; 170 nv_crtc->last_dpms = mode;
@@ -677,7 +677,7 @@ static void nv_crtc_prepare(struct drm_crtc *crtc)
677 677
678 NVBlankScreen(dev, nv_crtc->index, true); 678 NVBlankScreen(dev, nv_crtc->index, true);
679 679
680 /* Some more preperation. */ 680 /* Some more preparation. */
681 NVWriteCRTC(dev, nv_crtc->index, NV_PCRTC_CONFIG, NV_PCRTC_CONFIG_START_ADDRESS_NON_VGA); 681 NVWriteCRTC(dev, nv_crtc->index, NV_PCRTC_CONFIG, NV_PCRTC_CONFIG_START_ADDRESS_NON_VGA);
682 if (dev_priv->card_type == NV_40) { 682 if (dev_priv->card_type == NV_40) {
683 uint32_t reg900 = NVReadRAMDAC(dev, nv_crtc->index, NV_PRAMDAC_900); 683 uint32_t reg900 = NVReadRAMDAC(dev, nv_crtc->index, NV_PRAMDAC_900);
diff --git a/drivers/gpu/drm/nouveau/nv40_graph.c b/drivers/gpu/drm/nouveau/nv40_graph.c
index 18d30c2c1aa6..fceb44c0ec74 100644
--- a/drivers/gpu/drm/nouveau/nv40_graph.c
+++ b/drivers/gpu/drm/nouveau/nv40_graph.c
@@ -181,7 +181,7 @@ nv40_graph_load_context(struct nouveau_channel *chan)
181 NV40_PGRAPH_CTXCTL_CUR_LOADED); 181 NV40_PGRAPH_CTXCTL_CUR_LOADED);
182 /* 0x32E0 records the instance address of the active FIFO's PGRAPH 182 /* 0x32E0 records the instance address of the active FIFO's PGRAPH
183 * context. If at any time this doesn't match 0x40032C, you will 183 * context. If at any time this doesn't match 0x40032C, you will
184 * recieve PGRAPH_INTR_CONTEXT_SWITCH 184 * receive PGRAPH_INTR_CONTEXT_SWITCH
185 */ 185 */
186 nv_wr32(dev, NV40_PFIFO_GRCTX_INSTANCE, inst); 186 nv_wr32(dev, NV40_PFIFO_GRCTX_INSTANCE, inst);
187 return 0; 187 return 0;
diff --git a/drivers/gpu/drm/radeon/atombios.h b/drivers/gpu/drm/radeon/atombios.h
index 04b269d14a59..7fd88497b930 100644
--- a/drivers/gpu/drm/radeon/atombios.h
+++ b/drivers/gpu/drm/radeon/atombios.h
@@ -738,13 +738,13 @@ typedef struct _ATOM_DIG_ENCODER_CONFIG_V3
738{ 738{
739#if ATOM_BIG_ENDIAN 739#if ATOM_BIG_ENDIAN
740 UCHAR ucReserved1:1; 740 UCHAR ucReserved1:1;
741 UCHAR ucDigSel:3; // =0/1/2/3/4/5: DIG0/1/2/3/4/5 (In register spec also refered as DIGA/B/C/D/E/F) 741 UCHAR ucDigSel:3; // =0/1/2/3/4/5: DIG0/1/2/3/4/5 (In register spec also referred as DIGA/B/C/D/E/F)
742 UCHAR ucReserved:3; 742 UCHAR ucReserved:3;
743 UCHAR ucDPLinkRate:1; // =0: 1.62Ghz, =1: 2.7Ghz 743 UCHAR ucDPLinkRate:1; // =0: 1.62Ghz, =1: 2.7Ghz
744#else 744#else
745 UCHAR ucDPLinkRate:1; // =0: 1.62Ghz, =1: 2.7Ghz 745 UCHAR ucDPLinkRate:1; // =0: 1.62Ghz, =1: 2.7Ghz
746 UCHAR ucReserved:3; 746 UCHAR ucReserved:3;
747 UCHAR ucDigSel:3; // =0/1/2/3/4/5: DIG0/1/2/3/4/5 (In register spec also refered as DIGA/B/C/D/E/F) 747 UCHAR ucDigSel:3; // =0/1/2/3/4/5: DIG0/1/2/3/4/5 (In register spec also referred as DIGA/B/C/D/E/F)
748 UCHAR ucReserved1:1; 748 UCHAR ucReserved1:1;
749#endif 749#endif
750}ATOM_DIG_ENCODER_CONFIG_V3; 750}ATOM_DIG_ENCODER_CONFIG_V3;
@@ -785,13 +785,13 @@ typedef struct _ATOM_DIG_ENCODER_CONFIG_V4
785{ 785{
786#if ATOM_BIG_ENDIAN 786#if ATOM_BIG_ENDIAN
787 UCHAR ucReserved1:1; 787 UCHAR ucReserved1:1;
788 UCHAR ucDigSel:3; // =0/1/2/3/4/5: DIG0/1/2/3/4/5 (In register spec also refered as DIGA/B/C/D/E/F) 788 UCHAR ucDigSel:3; // =0/1/2/3/4/5: DIG0/1/2/3/4/5 (In register spec also referred as DIGA/B/C/D/E/F)
789 UCHAR ucReserved:2; 789 UCHAR ucReserved:2;
790 UCHAR ucDPLinkRate:2; // =0: 1.62Ghz, =1: 2.7Ghz, 2=5.4Ghz <= Changed comparing to previous version 790 UCHAR ucDPLinkRate:2; // =0: 1.62Ghz, =1: 2.7Ghz, 2=5.4Ghz <= Changed comparing to previous version
791#else 791#else
792 UCHAR ucDPLinkRate:2; // =0: 1.62Ghz, =1: 2.7Ghz, 2=5.4Ghz <= Changed comparing to previous version 792 UCHAR ucDPLinkRate:2; // =0: 1.62Ghz, =1: 2.7Ghz, 2=5.4Ghz <= Changed comparing to previous version
793 UCHAR ucReserved:2; 793 UCHAR ucReserved:2;
794 UCHAR ucDigSel:3; // =0/1/2/3/4/5: DIG0/1/2/3/4/5 (In register spec also refered as DIGA/B/C/D/E/F) 794 UCHAR ucDigSel:3; // =0/1/2/3/4/5: DIG0/1/2/3/4/5 (In register spec also referred as DIGA/B/C/D/E/F)
795 UCHAR ucReserved1:1; 795 UCHAR ucReserved1:1;
796#endif 796#endif
797}ATOM_DIG_ENCODER_CONFIG_V4; 797}ATOM_DIG_ENCODER_CONFIG_V4;
@@ -2126,7 +2126,7 @@ typedef struct _ATOM_MULTIMEDIA_CONFIG_INFO
2126// Structures used in FirmwareInfoTable 2126// Structures used in FirmwareInfoTable
2127/****************************************************************************/ 2127/****************************************************************************/
2128 2128
2129// usBIOSCapability Defintion: 2129// usBIOSCapability Definition:
2130// Bit 0 = 0: Bios image is not Posted, =1:Bios image is Posted; 2130// Bit 0 = 0: Bios image is not Posted, =1:Bios image is Posted;
2131// Bit 1 = 0: Dual CRTC is not supported, =1: Dual CRTC is supported; 2131// Bit 1 = 0: Dual CRTC is not supported, =1: Dual CRTC is supported;
2132// Bit 2 = 0: Extended Desktop is not supported, =1: Extended Desktop is supported; 2132// Bit 2 = 0: Extended Desktop is not supported, =1: Extended Desktop is supported;
@@ -3341,7 +3341,7 @@ typedef struct _ATOM_SPREAD_SPECTRUM_INFO
3341/****************************************************************************/ 3341/****************************************************************************/
3342// Structure used in AnalogTV_InfoTable (Top level) 3342// Structure used in AnalogTV_InfoTable (Top level)
3343/****************************************************************************/ 3343/****************************************************************************/
3344//ucTVBootUpDefaultStd definiton: 3344//ucTVBootUpDefaultStd definition:
3345 3345
3346//ATOM_TV_NTSC 1 3346//ATOM_TV_NTSC 1
3347//ATOM_TV_NTSCJ 2 3347//ATOM_TV_NTSCJ 2
@@ -3816,7 +3816,7 @@ typedef struct _ATOM_EXTERNAL_DISPLAY_CONNECTION_INFO
3816 UCHAR Reserved [6]; // for potential expansion 3816 UCHAR Reserved [6]; // for potential expansion
3817}ATOM_EXTERNAL_DISPLAY_CONNECTION_INFO; 3817}ATOM_EXTERNAL_DISPLAY_CONNECTION_INFO;
3818 3818
3819//Related definitions, all records are differnt but they have a commond header 3819//Related definitions, all records are different but they have a commond header
3820typedef struct _ATOM_COMMON_RECORD_HEADER 3820typedef struct _ATOM_COMMON_RECORD_HEADER
3821{ 3821{
3822 UCHAR ucRecordType; //An emun to indicate the record type 3822 UCHAR ucRecordType; //An emun to indicate the record type
@@ -4365,14 +4365,14 @@ ucUMAChannelNumber: System memory channel numbers.
4365ulCSR_M3_ARB_CNTL_DEFAULT[10]: Arrays with values for CSR M3 arbiter for default 4365ulCSR_M3_ARB_CNTL_DEFAULT[10]: Arrays with values for CSR M3 arbiter for default
4366ulCSR_M3_ARB_CNTL_UVD[10]: Arrays with values for CSR M3 arbiter for UVD playback. 4366ulCSR_M3_ARB_CNTL_UVD[10]: Arrays with values for CSR M3 arbiter for UVD playback.
4367ulCSR_M3_ARB_CNTL_FS3D[10]: Arrays with values for CSR M3 arbiter for Full Screen 3D applications. 4367ulCSR_M3_ARB_CNTL_FS3D[10]: Arrays with values for CSR M3 arbiter for Full Screen 3D applications.
4368sAvail_SCLK[5]: Arrays to provide availabe list of SLCK and corresponding voltage, order from low to high 4368sAvail_SCLK[5]: Arrays to provide available list of SLCK and corresponding voltage, order from low to high
4369ulGMCRestoreResetTime: GMC power restore and GMC reset time to calculate data reconnection latency. Unit in ns. 4369ulGMCRestoreResetTime: GMC power restore and GMC reset time to calculate data reconnection latency. Unit in ns.
4370ulMinimumNClk: Minimum NCLK speed among all NB-Pstates to calcualte data reconnection latency. Unit in 10kHz. 4370ulMinimumNClk: Minimum NCLK speed among all NB-Pstates to calcualte data reconnection latency. Unit in 10kHz.
4371ulIdleNClk: NCLK speed while memory runs in self-refresh state. Unit in 10kHz. 4371ulIdleNClk: NCLK speed while memory runs in self-refresh state. Unit in 10kHz.
4372ulDDR_DLL_PowerUpTime: DDR PHY DLL power up time. Unit in ns. 4372ulDDR_DLL_PowerUpTime: DDR PHY DLL power up time. Unit in ns.
4373ulDDR_PLL_PowerUpTime: DDR PHY PLL power up time. Unit in ns. 4373ulDDR_PLL_PowerUpTime: DDR PHY PLL power up time. Unit in ns.
4374usPCIEClkSSPercentage: PCIE Clock Spred Spectrum Percentage in unit 0.01%; 100 mean 1%. 4374usPCIEClkSSPercentage: PCIE Clock Spread Spectrum Percentage in unit 0.01%; 100 mean 1%.
4375usPCIEClkSSType: PCIE Clock Spred Spectrum Type. 0 for Down spread(default); 1 for Center spread. 4375usPCIEClkSSType: PCIE Clock Spread Spectrum Type. 0 for Down spread(default); 1 for Center spread.
4376usLvdsSSPercentage: LVDS panel ( not include eDP ) Spread Spectrum Percentage in unit of 0.01%, =0, use VBIOS default setting. 4376usLvdsSSPercentage: LVDS panel ( not include eDP ) Spread Spectrum Percentage in unit of 0.01%, =0, use VBIOS default setting.
4377usLvdsSSpreadRateIn10Hz: LVDS panel ( not include eDP ) Spread Spectrum frequency in unit of 10Hz, =0, use VBIOS default setting. 4377usLvdsSSpreadRateIn10Hz: LVDS panel ( not include eDP ) Spread Spectrum frequency in unit of 10Hz, =0, use VBIOS default setting.
4378usHDMISSPercentage: HDMI Spread Spectrum Percentage in unit 0.01%; 100 mean 1%, =0, use VBIOS default setting. 4378usHDMISSPercentage: HDMI Spread Spectrum Percentage in unit 0.01%; 100 mean 1%, =0, use VBIOS default setting.
@@ -4555,7 +4555,7 @@ typedef struct _ATOM_ASIC_INTERNAL_SS_INFO_V3
4555#define ATOM_S0_SYSTEM_POWER_STATE_VALUE_LITEAC 3 4555#define ATOM_S0_SYSTEM_POWER_STATE_VALUE_LITEAC 3
4556#define ATOM_S0_SYSTEM_POWER_STATE_VALUE_LIT2AC 4 4556#define ATOM_S0_SYSTEM_POWER_STATE_VALUE_LIT2AC 4
4557 4557
4558//Byte aligned defintion for BIOS usage 4558//Byte aligned definition for BIOS usage
4559#define ATOM_S0_CRT1_MONOb0 0x01 4559#define ATOM_S0_CRT1_MONOb0 0x01
4560#define ATOM_S0_CRT1_COLORb0 0x02 4560#define ATOM_S0_CRT1_COLORb0 0x02
4561#define ATOM_S0_CRT1_MASKb0 (ATOM_S0_CRT1_MONOb0+ATOM_S0_CRT1_COLORb0) 4561#define ATOM_S0_CRT1_MASKb0 (ATOM_S0_CRT1_MONOb0+ATOM_S0_CRT1_COLORb0)
@@ -4621,7 +4621,7 @@ typedef struct _ATOM_ASIC_INTERNAL_SS_INFO_V3
4621#define ATOM_S2_DISPLAY_ROTATION_ANGLE_MASK 0xC0000000L 4621#define ATOM_S2_DISPLAY_ROTATION_ANGLE_MASK 0xC0000000L
4622 4622
4623 4623
4624//Byte aligned defintion for BIOS usage 4624//Byte aligned definition for BIOS usage
4625#define ATOM_S2_TV1_STANDARD_MASKb0 0x0F 4625#define ATOM_S2_TV1_STANDARD_MASKb0 0x0F
4626#define ATOM_S2_CURRENT_BL_LEVEL_MASKb1 0xFF 4626#define ATOM_S2_CURRENT_BL_LEVEL_MASKb1 0xFF
4627#define ATOM_S2_DEVICE_DPMS_STATEb2 0x01 4627#define ATOM_S2_DEVICE_DPMS_STATEb2 0x01
@@ -4671,7 +4671,7 @@ typedef struct _ATOM_ASIC_INTERNAL_SS_INFO_V3
4671#define ATOM_S3_ALLOW_FAST_PWR_SWITCH 0x40000000L 4671#define ATOM_S3_ALLOW_FAST_PWR_SWITCH 0x40000000L
4672#define ATOM_S3_RQST_GPU_USE_MIN_PWR 0x80000000L 4672#define ATOM_S3_RQST_GPU_USE_MIN_PWR 0x80000000L
4673 4673
4674//Byte aligned defintion for BIOS usage 4674//Byte aligned definition for BIOS usage
4675#define ATOM_S3_CRT1_ACTIVEb0 0x01 4675#define ATOM_S3_CRT1_ACTIVEb0 0x01
4676#define ATOM_S3_LCD1_ACTIVEb0 0x02 4676#define ATOM_S3_LCD1_ACTIVEb0 0x02
4677#define ATOM_S3_TV1_ACTIVEb0 0x04 4677#define ATOM_S3_TV1_ACTIVEb0 0x04
@@ -4707,7 +4707,7 @@ typedef struct _ATOM_ASIC_INTERNAL_SS_INFO_V3
4707#define ATOM_S4_LCD1_REFRESH_MASK 0x0000FF00L 4707#define ATOM_S4_LCD1_REFRESH_MASK 0x0000FF00L
4708#define ATOM_S4_LCD1_REFRESH_SHIFT 8 4708#define ATOM_S4_LCD1_REFRESH_SHIFT 8
4709 4709
4710//Byte aligned defintion for BIOS usage 4710//Byte aligned definition for BIOS usage
4711#define ATOM_S4_LCD1_PANEL_ID_MASKb0 0x0FF 4711#define ATOM_S4_LCD1_PANEL_ID_MASKb0 0x0FF
4712#define ATOM_S4_LCD1_REFRESH_MASKb1 ATOM_S4_LCD1_PANEL_ID_MASKb0 4712#define ATOM_S4_LCD1_REFRESH_MASKb1 ATOM_S4_LCD1_PANEL_ID_MASKb0
4713#define ATOM_S4_VRAM_INFO_MASKb2 ATOM_S4_LCD1_PANEL_ID_MASKb0 4713#define ATOM_S4_VRAM_INFO_MASKb2 ATOM_S4_LCD1_PANEL_ID_MASKb0
@@ -4786,7 +4786,7 @@ typedef struct _ATOM_ASIC_INTERNAL_SS_INFO_V3
4786#define ATOM_S6_VRI_BRIGHTNESS_CHANGE 0x40000000L 4786#define ATOM_S6_VRI_BRIGHTNESS_CHANGE 0x40000000L
4787#define ATOM_S6_CONFIG_DISPLAY_CHANGE_MASK 0x80000000L 4787#define ATOM_S6_CONFIG_DISPLAY_CHANGE_MASK 0x80000000L
4788 4788
4789//Byte aligned defintion for BIOS usage 4789//Byte aligned definition for BIOS usage
4790#define ATOM_S6_DEVICE_CHANGEb0 0x01 4790#define ATOM_S6_DEVICE_CHANGEb0 0x01
4791#define ATOM_S6_SCALER_CHANGEb0 0x02 4791#define ATOM_S6_SCALER_CHANGEb0 0x02
4792#define ATOM_S6_LID_CHANGEb0 0x04 4792#define ATOM_S6_LID_CHANGEb0 0x04
@@ -5027,7 +5027,7 @@ typedef struct _ENABLE_GRAPH_SURFACE_PS_ALLOCATION
5027 5027
5028typedef struct _MEMORY_CLEAN_UP_PARAMETERS 5028typedef struct _MEMORY_CLEAN_UP_PARAMETERS
5029{ 5029{
5030 USHORT usMemoryStart; //in 8Kb boundry, offset from memory base address 5030 USHORT usMemoryStart; //in 8Kb boundary, offset from memory base address
5031 USHORT usMemorySize; //8Kb blocks aligned 5031 USHORT usMemorySize; //8Kb blocks aligned
5032}MEMORY_CLEAN_UP_PARAMETERS; 5032}MEMORY_CLEAN_UP_PARAMETERS;
5033#define MEMORY_CLEAN_UP_PS_ALLOCATION MEMORY_CLEAN_UP_PARAMETERS 5033#define MEMORY_CLEAN_UP_PS_ALLOCATION MEMORY_CLEAN_UP_PARAMETERS
@@ -6855,7 +6855,7 @@ typedef struct _ATOM_PPLIB_Clock_Voltage_Limit_Table
6855/**************************************************************************/ 6855/**************************************************************************/
6856 6856
6857 6857
6858// Following definitions are for compatiblity issue in different SW components. 6858// Following definitions are for compatibility issue in different SW components.
6859#define ATOM_MASTER_DATA_TABLE_REVISION 0x01 6859#define ATOM_MASTER_DATA_TABLE_REVISION 0x01
6860#define Object_Info Object_Header 6860#define Object_Info Object_Header
6861#define AdjustARB_SEQ MC_InitParameter 6861#define AdjustARB_SEQ MC_InitParameter
diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c
index edde90b37554..23d36417158d 100644
--- a/drivers/gpu/drm/radeon/evergreen_cs.c
+++ b/drivers/gpu/drm/radeon/evergreen_cs.c
@@ -442,7 +442,7 @@ static inline int evergreen_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u3
442 } 442 }
443 ib = p->ib->ptr; 443 ib = p->ib->ptr;
444 switch (reg) { 444 switch (reg) {
445 /* force following reg to 0 in an attemp to disable out buffer 445 /* force following reg to 0 in an attempt to disable out buffer
446 * which will need us to better understand how it works to perform 446 * which will need us to better understand how it works to perform
447 * security check on it (Jerome) 447 * security check on it (Jerome)
448 */ 448 */
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index 8713731fa014..55a7f190027e 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -437,7 +437,7 @@ int r300_asic_reset(struct radeon_device *rdev)
437 status = RREG32(R_000E40_RBBM_STATUS); 437 status = RREG32(R_000E40_RBBM_STATUS);
438 dev_info(rdev->dev, "(%s:%d) RBBM_STATUS=0x%08X\n", __func__, __LINE__, status); 438 dev_info(rdev->dev, "(%s:%d) RBBM_STATUS=0x%08X\n", __func__, __LINE__, status);
439 /* resetting the CP seems to be problematic sometimes it end up 439 /* resetting the CP seems to be problematic sometimes it end up
440 * hard locking the computer, but it's necessary for successfull 440 * hard locking the computer, but it's necessary for successful
441 * reset more test & playing is needed on R3XX/R4XX to find a 441 * reset more test & playing is needed on R3XX/R4XX to find a
442 * reliable (if any solution) 442 * reliable (if any solution)
443 */ 443 */
diff --git a/drivers/gpu/drm/radeon/r300_reg.h b/drivers/gpu/drm/radeon/r300_reg.h
index f0bce399c9f3..00c0d2ba22d3 100644
--- a/drivers/gpu/drm/radeon/r300_reg.h
+++ b/drivers/gpu/drm/radeon/r300_reg.h
@@ -608,7 +608,7 @@
608 * My guess is that there are two bits for each zbias primitive 608 * My guess is that there are two bits for each zbias primitive
609 * (FILL, LINE, POINT). 609 * (FILL, LINE, POINT).
610 * One to enable depth test and one for depth write. 610 * One to enable depth test and one for depth write.
611 * Yet this doesnt explain why depth writes work ... 611 * Yet this doesn't explain why depth writes work ...
612 */ 612 */
613#define R300_RE_OCCLUSION_CNTL 0x42B4 613#define R300_RE_OCCLUSION_CNTL 0x42B4
614# define R300_OCCLUSION_ON (1<<1) 614# define R300_OCCLUSION_ON (1<<1)
@@ -817,7 +817,7 @@
817# define R300_TX_MIN_FILTER_LINEAR_MIP_NEAREST (6 << 11) 817# define R300_TX_MIN_FILTER_LINEAR_MIP_NEAREST (6 << 11)
818# define R300_TX_MIN_FILTER_LINEAR_MIP_LINEAR (10 << 11) 818# define R300_TX_MIN_FILTER_LINEAR_MIP_LINEAR (10 << 11)
819 819
820/* NOTE: NEAREST doesnt seem to exist. 820/* NOTE: NEAREST doesn't seem to exist.
821 * Im not seting MAG_FILTER_MASK and (3 << 11) on for all 821 * Im not seting MAG_FILTER_MASK and (3 << 11) on for all
822 * anisotropy modes because that would void selected mag filter 822 * anisotropy modes because that would void selected mag filter
823 */ 823 */
diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c
index 3324620b2db6..fd18be9871ab 100644
--- a/drivers/gpu/drm/radeon/r600_cs.c
+++ b/drivers/gpu/drm/radeon/r600_cs.c
@@ -921,7 +921,7 @@ static inline int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx
921 return 0; 921 return 0;
922 ib = p->ib->ptr; 922 ib = p->ib->ptr;
923 switch (reg) { 923 switch (reg) {
924 /* force following reg to 0 in an attemp to disable out buffer 924 /* force following reg to 0 in an attempt to disable out buffer
925 * which will need us to better understand how it works to perform 925 * which will need us to better understand how it works to perform
926 * security check on it (Jerome) 926 * security check on it (Jerome)
927 */ 927 */
diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
index 50db6d62eec2..f5ac7e788d81 100644
--- a/drivers/gpu/drm/radeon/r600_hdmi.c
+++ b/drivers/gpu/drm/radeon/r600_hdmi.c
@@ -334,7 +334,7 @@ void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mod
334 r600_hdmi_videoinfoframe(encoder, RGB, 0, 0, 0, 0, 334 r600_hdmi_videoinfoframe(encoder, RGB, 0, 0, 0, 0,
335 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); 335 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
336 336
337 /* it's unknown what these bits do excatly, but it's indeed quite usefull for debugging */ 337 /* it's unknown what these bits do excatly, but it's indeed quite useful for debugging */
338 WREG32(offset+R600_HDMI_AUDIO_DEBUG_0, 0x00FFFFFF); 338 WREG32(offset+R600_HDMI_AUDIO_DEBUG_0, 0x00FFFFFF);
339 WREG32(offset+R600_HDMI_AUDIO_DEBUG_1, 0x007FFFFF); 339 WREG32(offset+R600_HDMI_AUDIO_DEBUG_1, 0x007FFFFF);
340 WREG32(offset+R600_HDMI_AUDIO_DEBUG_2, 0x00000001); 340 WREG32(offset+R600_HDMI_AUDIO_DEBUG_2, 0x00000001);
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index cfe3af1a7935..93f536594c73 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -679,11 +679,11 @@ struct radeon_wb {
679 * @sideport_bandwidth: sideport bandwidth the gpu has (MByte/s) (IGP) 679 * @sideport_bandwidth: sideport bandwidth the gpu has (MByte/s) (IGP)
680 * @ht_bandwidth: ht bandwidth the gpu has (MByte/s) (IGP) 680 * @ht_bandwidth: ht bandwidth the gpu has (MByte/s) (IGP)
681 * @core_bandwidth: core GPU bandwidth the gpu has (MByte/s) (IGP) 681 * @core_bandwidth: core GPU bandwidth the gpu has (MByte/s) (IGP)
682 * @sclk: GPU clock Mhz (core bandwith depends of this clock) 682 * @sclk: GPU clock Mhz (core bandwidth depends of this clock)
683 * @needed_bandwidth: current bandwidth needs 683 * @needed_bandwidth: current bandwidth needs
684 * 684 *
685 * It keeps track of various data needed to take powermanagement decision. 685 * It keeps track of various data needed to take powermanagement decision.
686 * Bandwith need is used to determine minimun clock of the GPU and memory. 686 * Bandwidth need is used to determine minimun clock of the GPU and memory.
687 * Equation between gpu/memory clock and available bandwidth is hw dependent 687 * Equation between gpu/memory clock and available bandwidth is hw dependent
688 * (type of memory, bus size, efficiency, ...) 688 * (type of memory, bus size, efficiency, ...)
689 */ 689 */
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
index 3d599e33b9cc..75867792a4e2 100644
--- a/drivers/gpu/drm/radeon/radeon_cp.c
+++ b/drivers/gpu/drm/radeon/radeon_cp.c
@@ -244,7 +244,7 @@ void radeon_write_agp_base(drm_radeon_private_t *dev_priv, u64 agp_base)
244 u32 agp_base_lo = agp_base & 0xffffffff; 244 u32 agp_base_lo = agp_base & 0xffffffff;
245 u32 r6xx_agp_base = (agp_base >> 22) & 0x3ffff; 245 u32 r6xx_agp_base = (agp_base >> 22) & 0x3ffff;
246 246
247 /* R6xx/R7xx must be aligned to a 4MB boundry */ 247 /* R6xx/R7xx must be aligned to a 4MB boundary */
248 if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV770) 248 if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV770)
249 RADEON_WRITE(R700_MC_VM_AGP_BASE, r6xx_agp_base); 249 RADEON_WRITE(R700_MC_VM_AGP_BASE, r6xx_agp_base);
250 else if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600) 250 else if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
diff --git a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c
index 017ac54920fb..bdf2fa1189ae 100644
--- a/drivers/gpu/drm/radeon/radeon_cursor.c
+++ b/drivers/gpu/drm/radeon/radeon_cursor.c
@@ -226,7 +226,7 @@ int radeon_crtc_cursor_move(struct drm_crtc *crtc,
226 y += crtc->y; 226 y += crtc->y;
227 DRM_DEBUG("x %d y %d c->x %d c->y %d\n", x, y, crtc->x, crtc->y); 227 DRM_DEBUG("x %d y %d c->x %d c->y %d\n", x, y, crtc->x, crtc->y);
228 228
229 /* avivo cursor image can't end on 128 pixel boundry or 229 /* avivo cursor image can't end on 128 pixel boundary or
230 * go past the end of the frame if both crtcs are enabled 230 * go past the end of the frame if both crtcs are enabled
231 */ 231 */
232 list_for_each_entry(crtc_p, &crtc->dev->mode_config.crtc_list, head) { 232 list_for_each_entry(crtc_p, &crtc->dev->mode_config.crtc_list, head) {
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index f0209be7a34b..890217e678d3 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -262,7 +262,7 @@ int radeon_wb_init(struct radeon_device *rdev)
262 * Note: GTT start, end, size should be initialized before calling this 262 * Note: GTT start, end, size should be initialized before calling this
263 * function on AGP platform. 263 * function on AGP platform.
264 * 264 *
265 * Note: We don't explictly enforce VRAM start to be aligned on VRAM size, 265 * Note: We don't explicitly enforce VRAM start to be aligned on VRAM size,
266 * this shouldn't be a problem as we are using the PCI aperture as a reference. 266 * this shouldn't be a problem as we are using the PCI aperture as a reference.
267 * Otherwise this would be needed for rv280, all r3xx, and all r4xx, but 267 * Otherwise this would be needed for rv280, all r3xx, and all r4xx, but
268 * not IGP. 268 * not IGP.
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 4be58793dc17..bdbab5c43bdc 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -1492,7 +1492,7 @@ bool radeon_crtc_scaling_mode_fixup(struct drm_crtc *crtc,
1492 * 1492 *
1493 * \return Flags, or'ed together as follows: 1493 * \return Flags, or'ed together as follows:
1494 * 1494 *
1495 * DRM_SCANOUTPOS_VALID = Query successfull. 1495 * DRM_SCANOUTPOS_VALID = Query successful.
1496 * DRM_SCANOUTPOS_INVBL = Inside vblank. 1496 * DRM_SCANOUTPOS_INVBL = Inside vblank.
1497 * DRM_SCANOUTPOS_ACCURATE = Returned position is accurate. A lack of 1497 * DRM_SCANOUTPOS_ACCURATE = Returned position is accurate. A lack of
1498 * this flag means that returned position may be offset by a constant but 1498 * this flag means that returned position may be offset by a constant but
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
index 5cba46b9779a..a1b59ca96d01 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.h
+++ b/drivers/gpu/drm/radeon/radeon_drv.h
@@ -271,7 +271,7 @@ typedef struct drm_radeon_private {
271 271
272 int have_z_offset; 272 int have_z_offset;
273 273
274 /* starting from here on, data is preserved accross an open */ 274 /* starting from here on, data is preserved across an open */
275 uint32_t flags; /* see radeon_chip_flags */ 275 uint32_t flags; /* see radeon_chip_flags */
276 resource_size_t fb_aper_offset; 276 resource_size_t fb_aper_offset;
277 277
diff --git a/drivers/gpu/drm/radeon/radeon_object.h b/drivers/gpu/drm/radeon/radeon_object.h
index 7f8e778dba46..ede6c13628f2 100644
--- a/drivers/gpu/drm/radeon/radeon_object.h
+++ b/drivers/gpu/drm/radeon/radeon_object.h
@@ -87,7 +87,7 @@ static inline void radeon_bo_unreserve(struct radeon_bo *bo)
87 * Returns current GPU offset of the object. 87 * Returns current GPU offset of the object.
88 * 88 *
89 * Note: object should either be pinned or reserved when calling this 89 * Note: object should either be pinned or reserved when calling this
90 * function, it might be usefull to add check for this for debugging. 90 * function, it might be useful to add check for this for debugging.
91 */ 91 */
92static inline u64 radeon_bo_gpu_offset(struct radeon_bo *bo) 92static inline u64 radeon_bo_gpu_offset(struct radeon_bo *bo)
93{ 93{
diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
index 4ae5a3d1074e..92e7ea73b7c5 100644
--- a/drivers/gpu/drm/radeon/radeon_state.c
+++ b/drivers/gpu/drm/radeon/radeon_state.c
@@ -980,7 +980,7 @@ static void radeon_cp_dispatch_clear(struct drm_device * dev,
980 } 980 }
981 981
982 /* hyper z clear */ 982 /* hyper z clear */
983 /* no docs available, based on reverse engeneering by Stephane Marchesin */ 983 /* no docs available, based on reverse engineering by Stephane Marchesin */
984 if ((flags & (RADEON_DEPTH | RADEON_STENCIL)) 984 if ((flags & (RADEON_DEPTH | RADEON_STENCIL))
985 && (flags & RADEON_CLEAR_FASTZ)) { 985 && (flags & RADEON_CLEAR_FASTZ)) {
986 986
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index cceeb42789b6..dfe32e62bd90 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -245,7 +245,7 @@ void vmw_kms_cursor_snoop(struct vmw_surface *srf,
245 /* TODO handle none page aligned offsets */ 245 /* TODO handle none page aligned offsets */
246 /* TODO handle partial uploads and pitch != 256 */ 246 /* TODO handle partial uploads and pitch != 256 */
247 /* TODO handle more then one copy (size != 64) */ 247 /* TODO handle more then one copy (size != 64) */
248 DRM_ERROR("lazy programer, cant handle wierd stuff\n"); 248 DRM_ERROR("lazy programmer, can't handle weird stuff\n");
249 return; 249 return;
250 } 250 }
251 251
diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
index ace2b1623b21..be8d4cb5861c 100644
--- a/drivers/gpu/vga/vgaarb.c
+++ b/drivers/gpu/vga/vgaarb.c
@@ -151,7 +151,7 @@ static inline void vga_irq_set_state(struct vga_device *vgadev, bool state)
151static void vga_check_first_use(void) 151static void vga_check_first_use(void)
152{ 152{
153 /* we should inform all GPUs in the system that 153 /* we should inform all GPUs in the system that
154 * VGA arb has occured and to try and disable resources 154 * VGA arb has occurred and to try and disable resources
155 * if they can */ 155 * if they can */
156 if (!vga_arbiter_used) { 156 if (!vga_arbiter_used) {
157 vga_arbiter_used = true; 157 vga_arbiter_used = true;
@@ -774,7 +774,7 @@ static ssize_t vga_arb_read(struct file *file, char __user * buf,
774 */ 774 */
775 spin_lock_irqsave(&vga_lock, flags); 775 spin_lock_irqsave(&vga_lock, flags);
776 776
777 /* If we are targetting the default, use it */ 777 /* If we are targeting the default, use it */
778 pdev = priv->target; 778 pdev = priv->target;
779 if (pdev == NULL || pdev == PCI_INVALID_CARD) { 779 if (pdev == NULL || pdev == PCI_INVALID_CARD) {
780 spin_unlock_irqrestore(&vga_lock, flags); 780 spin_unlock_irqrestore(&vga_lock, flags);
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index b7ec4057841d..9de9e97149ec 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -185,7 +185,7 @@ config HID_EZKEY
185 Support for Ezkey BTC 8193 keyboard. 185 Support for Ezkey BTC 8193 keyboard.
186 186
187config HID_KEYTOUCH 187config HID_KEYTOUCH
188 tristate "Keyoutch HID devices" 188 tristate "Keytouch HID devices"
189 depends on USB_HID 189 depends on USB_HID
190 ---help--- 190 ---help---
191 Support for Keytouch HID devices not fully compliant with 191 Support for Keytouch HID devices not fully compliant with
@@ -340,10 +340,17 @@ config HID_NTRIG
340 Support for N-Trig touch screen. 340 Support for N-Trig touch screen.
341 341
342config HID_ORTEK 342config HID_ORTEK
343 tristate "Ortek PKB-1700/WKB-2000 wireless keyboard and mouse trackpad" 343 tristate "Ortek PKB-1700/WKB-2000/Skycable wireless keyboard and mouse trackpad"
344 depends on USB_HID 344 depends on USB_HID
345 ---help--- 345 ---help---
346 Support for Ortek PKB-1700/WKB-2000 wireless keyboard + mouse trackpad. 346 There are certain devices which have LogicalMaximum wrong in the keyboard
347 usage page of their report descriptor. The most prevailing ones so far
348 are manufactured by Ortek, thus the name of the driver. Currently
349 supported devices by this driver are
350
351 - Ortek PKB-1700
352 - Ortek WKB-2000
353 - Skycable wireless presenter
347 354
348config HID_PANTHERLORD 355config HID_PANTHERLORD
349 tristate "Pantherlord/GreenAsia game controller" 356 tristate "Pantherlord/GreenAsia game controller"
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index e9687768a335..408c4bea4d8d 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -306,7 +306,7 @@ static int hid_parser_global(struct hid_parser *parser, struct hid_item *item)
306 case HID_GLOBAL_ITEM_TAG_PUSH: 306 case HID_GLOBAL_ITEM_TAG_PUSH:
307 307
308 if (parser->global_stack_ptr == HID_GLOBAL_STACK_SIZE) { 308 if (parser->global_stack_ptr == HID_GLOBAL_STACK_SIZE) {
309 dbg_hid("global enviroment stack overflow\n"); 309 dbg_hid("global environment stack overflow\n");
310 return -1; 310 return -1;
311 } 311 }
312 312
@@ -317,7 +317,7 @@ static int hid_parser_global(struct hid_parser *parser, struct hid_item *item)
317 case HID_GLOBAL_ITEM_TAG_POP: 317 case HID_GLOBAL_ITEM_TAG_POP:
318 318
319 if (!parser->global_stack_ptr) { 319 if (!parser->global_stack_ptr) {
320 dbg_hid("global enviroment stack underflow\n"); 320 dbg_hid("global environment stack underflow\n");
321 return -1; 321 return -1;
322 } 322 }
323 323
@@ -1449,8 +1449,10 @@ static const struct hid_device_id hid_have_special_driver[] = {
1449 { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPLUS) }, 1449 { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPLUS) },
1450 { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KOVAPLUS) }, 1450 { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KOVAPLUS) },
1451 { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_PYRA_WIRED) }, 1451 { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_PYRA_WIRED) },
1452 { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_PYRA_WIRELESS) },
1452 { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) }, 1453 { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
1453 { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) }, 1454 { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) },
1455 { HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) },
1454 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) }, 1456 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
1455 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) }, 1457 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
1456 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) }, 1458 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index 555382fc7417..bae48745bb42 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -341,7 +341,7 @@ static const struct hid_usage_entry hid_usage_table[] = {
341 { 0x85, 0x83, "DesignCapacity" }, 341 { 0x85, 0x83, "DesignCapacity" },
342 { 0x85, 0x85, "ManufacturerDate" }, 342 { 0x85, 0x85, "ManufacturerDate" },
343 { 0x85, 0x89, "iDeviceChemistry" }, 343 { 0x85, 0x89, "iDeviceChemistry" },
344 { 0x85, 0x8b, "Rechargable" }, 344 { 0x85, 0x8b, "Rechargeable" },
345 { 0x85, 0x8f, "iOEMInformation" }, 345 { 0x85, 0x8f, "iOEMInformation" },
346 { 0x85, 0x8d, "CapacityGranularity1" }, 346 { 0x85, 0x8d, "CapacityGranularity1" },
347 { 0x85, 0xd0, "ACPresent" }, 347 { 0x85, 0xd0, "ACPresent" },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 65ac53d7aecc..00a94b535d28 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -150,6 +150,7 @@
150#define USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6 0x0f01 150#define USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6 0x0f01
151 151
152#define USB_VENDOR_ID_CH 0x068e 152#define USB_VENDOR_ID_CH 0x068e
153#define USB_DEVICE_ID_CH_PRO_THROTTLE 0x00f1
153#define USB_DEVICE_ID_CH_PRO_PEDALS 0x00f2 154#define USB_DEVICE_ID_CH_PRO_PEDALS 0x00f2
154#define USB_DEVICE_ID_CH_COMBATSTICK 0x00f4 155#define USB_DEVICE_ID_CH_COMBATSTICK 0x00f4
155#define USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE 0x0051 156#define USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE 0x0051
@@ -524,6 +525,9 @@
524#define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001 525#define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001
525#define USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE 0x0600 526#define USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE 0x0600
526 527
528#define USB_VENDOR_ID_SKYCABLE 0x1223
529#define USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER 0x3F07
530
527#define USB_VENDOR_ID_SONY 0x054c 531#define USB_VENDOR_ID_SONY 0x054c
528#define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE 0x024b 532#define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE 0x024b
529#define USB_DEVICE_ID_SONY_PS3_CONTROLLER 0x0268 533#define USB_DEVICE_ID_SONY_PS3_CONTROLLER 0x0268
diff --git a/drivers/hid/hid-lgff.c b/drivers/hid/hid-lgff.c
index 90d0ef2c92be..f099079ca6b9 100644
--- a/drivers/hid/hid-lgff.c
+++ b/drivers/hid/hid-lgff.c
@@ -73,6 +73,8 @@ static const struct dev_type devices[] = {
73 { 0x046d, 0xc293, ff_joystick }, 73 { 0x046d, 0xc293, ff_joystick },
74 { 0x046d, 0xc294, ff_wheel }, 74 { 0x046d, 0xc294, ff_wheel },
75 { 0x046d, 0xc295, ff_joystick }, 75 { 0x046d, 0xc295, ff_joystick },
76 { 0x046d, 0xc298, ff_wheel },
77 { 0x046d, 0xc299, ff_wheel },
76 { 0x046d, 0xca03, ff_wheel }, 78 { 0x046d, 0xca03, ff_wheel },
77}; 79};
78 80
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index 318cc40df92d..0ec91c18a421 100644
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -76,7 +76,7 @@ MODULE_PARM_DESC(report_undeciphered, "Report undeciphered multi-touch state fie
76 * This is true when single_touch_id is equal to NO_TOUCHES. If multiple touches 76 * This is true when single_touch_id is equal to NO_TOUCHES. If multiple touches
77 * are down and the touch providing for single touch emulation is lifted, 77 * are down and the touch providing for single touch emulation is lifted,
78 * single_touch_id is equal to SINGLE_TOUCH_UP. While single touch emulation is 78 * single_touch_id is equal to SINGLE_TOUCH_UP. While single touch emulation is
79 * occuring, single_touch_id corresponds with the tracking id of the touch used. 79 * occurring, single_touch_id corresponds with the tracking id of the touch used.
80 */ 80 */
81#define NO_TOUCHES -1 81#define NO_TOUCHES -1
82#define SINGLE_TOUCH_UP -2 82#define SINGLE_TOUCH_UP -2
@@ -418,6 +418,8 @@ static void magicmouse_setup_input(struct input_dev *input, struct hid_device *h
418 input_set_abs_params(input, ABS_MT_POSITION_Y, -2456, 418 input_set_abs_params(input, ABS_MT_POSITION_Y, -2456,
419 2565, 4, 0); 419 2565, 4, 0);
420 } 420 }
421
422 input_set_events_per_packet(input, 60);
421 } 423 }
422 424
423 if (report_undeciphered) { 425 if (report_undeciphered) {
diff --git a/drivers/hid/hid-ortek.c b/drivers/hid/hid-ortek.c
index f9b7dd4f607f..0ffa1d2d64f0 100644
--- a/drivers/hid/hid-ortek.c
+++ b/drivers/hid/hid-ortek.c
@@ -1,8 +1,14 @@
1/* 1/*
2 * HID driver for Ortek PKB-1700/WKB-2000 (wireless keyboard + mouse trackpad). 2 * HID driver for various devices which are apparently based on the same chipset
3 * Fixes LogicalMaximum error in HID report description. 3 * from certain vendor which produces chips that contain wrong LogicalMaximum
4 * value in their HID report descriptor. Currently supported devices are:
5 *
6 * Ortek PKB-1700
7 * Ortek WKB-2000
8 * Skycable wireless presenter
4 * 9 *
5 * Copyright (c) 2010 Johnathon Harris <jmharris@gmail.com> 10 * Copyright (c) 2010 Johnathon Harris <jmharris@gmail.com>
11 * Copyright (c) 2011 Jiri Kosina
6 */ 12 */
7 13
8/* 14/*
@@ -22,8 +28,11 @@ static __u8 *ortek_report_fixup(struct hid_device *hdev, __u8 *rdesc,
22 unsigned int *rsize) 28 unsigned int *rsize)
23{ 29{
24 if (*rsize >= 56 && rdesc[54] == 0x25 && rdesc[55] == 0x01) { 30 if (*rsize >= 56 && rdesc[54] == 0x25 && rdesc[55] == 0x01) {
25 hid_info(hdev, "Fixing up Ortek WKB-2000 report descriptor\n"); 31 hid_info(hdev, "Fixing up logical minimum in report descriptor (Ortek)\n");
26 rdesc[55] = 0x92; 32 rdesc[55] = 0x92;
33 } else if (*rsize >= 54 && rdesc[52] == 0x25 && rdesc[53] == 0x01) {
34 hid_info(hdev, "Fixing up logical minimum in report descriptor (Skycable)\n");
35 rdesc[53] = 0x65;
27 } 36 }
28 return rdesc; 37 return rdesc;
29} 38}
@@ -31,6 +40,7 @@ static __u8 *ortek_report_fixup(struct hid_device *hdev, __u8 *rdesc,
31static const struct hid_device_id ortek_devices[] = { 40static const struct hid_device_id ortek_devices[] = {
32 { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) }, 41 { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) },
33 { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) }, 42 { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
43 { HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) },
34 { } 44 { }
35}; 45};
36MODULE_DEVICE_TABLE(hid, ortek_devices); 46MODULE_DEVICE_TABLE(hid, ortek_devices);
diff --git a/drivers/hid/hid-picolcd.c b/drivers/hid/hid-picolcd.c
index 657da5a3d5c6..b2f56a13bcf5 100644
--- a/drivers/hid/hid-picolcd.c
+++ b/drivers/hid/hid-picolcd.c
@@ -1806,13 +1806,13 @@ static ssize_t picolcd_debug_flash_write(struct file *f, const char __user *u,
1806/* 1806/*
1807 * Notes: 1807 * Notes:
1808 * - concurrent writing is prevented by mutex and all writes must be 1808 * - concurrent writing is prevented by mutex and all writes must be
1809 * n*64 bytes and 64-byte aligned, each write being preceeded by an 1809 * n*64 bytes and 64-byte aligned, each write being preceded by an
1810 * ERASE which erases a 64byte block. 1810 * ERASE which erases a 64byte block.
1811 * If less than requested was written or an error is returned for an 1811 * If less than requested was written or an error is returned for an
1812 * otherwise correct write request the next 64-byte block which should 1812 * otherwise correct write request the next 64-byte block which should
1813 * have been written is in undefined state (mostly: original, erased, 1813 * have been written is in undefined state (mostly: original, erased,
1814 * (half-)written with write error) 1814 * (half-)written with write error)
1815 * - reading can happend without special restriction 1815 * - reading can happen without special restriction
1816 */ 1816 */
1817static const struct file_operations picolcd_debug_flash_fops = { 1817static const struct file_operations picolcd_debug_flash_fops = {
1818 .owner = THIS_MODULE, 1818 .owner = THIS_MODULE,
diff --git a/drivers/hid/hid-roccat-kone.h b/drivers/hid/hid-roccat-kone.h
index 64abb5b8a59a..4109a028e138 100644
--- a/drivers/hid/hid-roccat-kone.h
+++ b/drivers/hid/hid-roccat-kone.h
@@ -166,7 +166,7 @@ enum kone_mouse_events {
166 /* osd events are thought to be display on screen */ 166 /* osd events are thought to be display on screen */
167 kone_mouse_event_osd_dpi = 0xa0, 167 kone_mouse_event_osd_dpi = 0xa0,
168 kone_mouse_event_osd_profile = 0xb0, 168 kone_mouse_event_osd_profile = 0xb0,
169 /* TODO clarify meaning and occurence of kone_mouse_event_calibration */ 169 /* TODO clarify meaning and occurrence of kone_mouse_event_calibration */
170 kone_mouse_event_calibration = 0xc0, 170 kone_mouse_event_calibration = 0xc0,
171 kone_mouse_event_call_overlong_macro = 0xe0, 171 kone_mouse_event_call_overlong_macro = 0xe0,
172 /* switch events notify if user changed values with mousebutton click */ 172 /* switch events notify if user changed values with mousebutton click */
diff --git a/drivers/hid/hid-roccat-pyra.c b/drivers/hid/hid-roccat-pyra.c
index 160f481344f6..38280c055a19 100644
--- a/drivers/hid/hid-roccat-pyra.c
+++ b/drivers/hid/hid-roccat-pyra.c
@@ -652,7 +652,8 @@ static int pyra_raw_event(struct hid_device *hdev, struct hid_report *report,
652static const struct hid_device_id pyra_devices[] = { 652static const struct hid_device_id pyra_devices[] = {
653 { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, 653 { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT,
654 USB_DEVICE_ID_ROCCAT_PYRA_WIRED) }, 654 USB_DEVICE_ID_ROCCAT_PYRA_WIRED) },
655 /* TODO add USB_DEVICE_ID_ROCCAT_PYRA_WIRELESS after testing */ 655 { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT,
656 USB_DEVICE_ID_ROCCAT_PYRA_WIRELESS) },
656 { } 657 { }
657}; 658};
658 659
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 9a94b643ccde..a8426f15e9ab 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -59,6 +59,7 @@ static const struct hid_blacklist {
59 { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_COMBATSTICK, HID_QUIRK_NOGET }, 59 { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_COMBATSTICK, HID_QUIRK_NOGET },
60 { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE, HID_QUIRK_NOGET }, 60 { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE, HID_QUIRK_NOGET },
61 { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE, HID_QUIRK_NOGET }, 61 { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE, HID_QUIRK_NOGET },
62 { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_PRO_THROTTLE, HID_QUIRK_NOGET },
62 { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_PRO_PEDALS, HID_QUIRK_NOGET }, 63 { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_PRO_PEDALS, HID_QUIRK_NOGET },
63 { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_3AXIS_5BUTTON_STICK, HID_QUIRK_NOGET }, 64 { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_3AXIS_5BUTTON_STICK, HID_QUIRK_NOGET },
64 { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET }, 65 { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET },
diff --git a/drivers/hwmon/abituguru.c b/drivers/hwmon/abituguru.c
index 0e05aa179eaa..e7d4c4687f02 100644
--- a/drivers/hwmon/abituguru.c
+++ b/drivers/hwmon/abituguru.c
@@ -1422,7 +1422,7 @@ static int __init abituguru_detect(void)
1422 at DATA and 0xAC, when this driver has already been loaded once 1422 at DATA and 0xAC, when this driver has already been loaded once
1423 DATA will hold 0x08. For most uGuru's CMD will hold 0xAC in either 1423 DATA will hold 0x08. For most uGuru's CMD will hold 0xAC in either
1424 scenario but some will hold 0x00. 1424 scenario but some will hold 0x00.
1425 Some uGuru's initally hold 0x09 at DATA and will only hold 0x08 1425 Some uGuru's initially hold 0x09 at DATA and will only hold 0x08
1426 after reading CMD first, so CMD must be read first! */ 1426 after reading CMD first, so CMD must be read first! */
1427 u8 cmd_val = inb_p(ABIT_UGURU_BASE + ABIT_UGURU_CMD); 1427 u8 cmd_val = inb_p(ABIT_UGURU_BASE + ABIT_UGURU_CMD);
1428 u8 data_val = inb_p(ABIT_UGURU_BASE + ABIT_UGURU_DATA); 1428 u8 data_val = inb_p(ABIT_UGURU_BASE + ABIT_UGURU_DATA);
diff --git a/drivers/hwmon/abituguru3.c b/drivers/hwmon/abituguru3.c
index 034cebfcd273..e89d572e3320 100644
--- a/drivers/hwmon/abituguru3.c
+++ b/drivers/hwmon/abituguru3.c
@@ -151,7 +151,7 @@ struct abituguru3_data {
151 /* Pointer to the sensors info for the detected motherboard */ 151 /* Pointer to the sensors info for the detected motherboard */
152 const struct abituguru3_sensor_info *sensors; 152 const struct abituguru3_sensor_info *sensors;
153 153
154 /* The abituguru3 supports upto 48 sensors, and thus has registers 154 /* The abituguru3 supports up to 48 sensors, and thus has registers
155 sets for 48 sensors, for convienence reasons / simplicity of the 155 sets for 48 sensors, for convienence reasons / simplicity of the
156 code we always read and store all registers for all 48 sensors */ 156 code we always read and store all registers for all 48 sensors */
157 157
diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c
index be0fdd58aa29..0531867484f4 100644
--- a/drivers/hwmon/adm1026.c
+++ b/drivers/hwmon/adm1026.c
@@ -175,7 +175,7 @@ static u16 ADM1026_REG_TEMP_OFFSET[] = { 0x1e, 0x6e, 0x6f };
175 * these macros are called: arguments may be evaluated more than once. 175 * these macros are called: arguments may be evaluated more than once.
176 */ 176 */
177 177
178/* IN are scaled acording to built-in resistors. These are the 178/* IN are scaled according to built-in resistors. These are the
179 * voltages corresponding to 3/4 of full scale (192 or 0xc0) 179 * voltages corresponding to 3/4 of full scale (192 or 0xc0)
180 * NOTE: The -12V input needs an additional factor to account 180 * NOTE: The -12V input needs an additional factor to account
181 * for the Vref pullup resistor. 181 * for the Vref pullup resistor.
diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c
index cf47e6e476ed..250d099ca398 100644
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.c
@@ -130,7 +130,7 @@ enum chips {
130 these macros are called: arguments may be evaluated more than once. 130 these macros are called: arguments may be evaluated more than once.
131 */ 131 */
132 132
133/* IN are scaled acording to built-in resistors */ 133/* IN are scaled according to built-in resistors */
134static const int lm85_scaling[] = { /* .001 Volts */ 134static const int lm85_scaling[] = { /* .001 Volts */
135 2500, 2250, 3300, 5000, 12000, 135 2500, 2250, 3300, 5000, 12000,
136 3300, 1500, 1800 /*EMC6D100*/ 136 3300, 1500, 1800 /*EMC6D100*/
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index 812781c655a7..c43b4e9f96a9 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -356,7 +356,7 @@ static int lm90_read16(struct i2c_client *client, u8 regh, u8 regl, u16 *value)
356 /* 356 /*
357 * There is a trick here. We have to read two registers to have the 357 * There is a trick here. We have to read two registers to have the
358 * sensor temperature, but we have to beware a conversion could occur 358 * sensor temperature, but we have to beware a conversion could occur
359 * inbetween the readings. The datasheet says we should either use 359 * between the readings. The datasheet says we should either use
360 * the one-shot conversion register, which we don't want to do 360 * the one-shot conversion register, which we don't want to do
361 * (disables hardware monitoring) or monitor the busy bit, which is 361 * (disables hardware monitoring) or monitor the busy bit, which is
362 * impossible (we can't read the values and monitor that bit at the 362 * impossible (we can't read the values and monitor that bit at the
diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
index 1a9c32d6893a..f4e617adb220 100644
--- a/drivers/hwmon/sht15.c
+++ b/drivers/hwmon/sht15.c
@@ -52,7 +52,7 @@
52#define SHT15_TSU 150 /* data setup time */ 52#define SHT15_TSU 150 /* data setup time */
53 53
54/** 54/**
55 * struct sht15_temppair - elements of voltage dependant temp calc 55 * struct sht15_temppair - elements of voltage dependent temp calc
56 * @vdd: supply voltage in microvolts 56 * @vdd: supply voltage in microvolts
57 * @d1: see data sheet 57 * @d1: see data sheet
58 */ 58 */
@@ -251,7 +251,7 @@ static inline int sht15_update_single_val(struct sht15_data *data,
251 enable_irq(gpio_to_irq(data->pdata->gpio_data)); 251 enable_irq(gpio_to_irq(data->pdata->gpio_data));
252 if (gpio_get_value(data->pdata->gpio_data) == 0) { 252 if (gpio_get_value(data->pdata->gpio_data) == 0) {
253 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data)); 253 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
254 /* Only relevant if the interrupt hasn't occured. */ 254 /* Only relevant if the interrupt hasn't occurred. */
255 if (!atomic_read(&data->interrupt_handled)) 255 if (!atomic_read(&data->interrupt_handled))
256 schedule_work(&data->read_work); 256 schedule_work(&data->read_work);
257 } 257 }
@@ -452,7 +452,7 @@ static void sht15_bh_read_data(struct work_struct *work_s)
452 */ 452 */
453 atomic_set(&data->interrupt_handled, 0); 453 atomic_set(&data->interrupt_handled, 0);
454 enable_irq(gpio_to_irq(data->pdata->gpio_data)); 454 enable_irq(gpio_to_irq(data->pdata->gpio_data));
455 /* If still not occured or another handler has been scheduled */ 455 /* If still not occurred or another handler has been scheduled */
456 if (gpio_get_value(data->pdata->gpio_data) 456 if (gpio_get_value(data->pdata->gpio_data)
457 || atomic_read(&data->interrupt_handled)) 457 || atomic_read(&data->interrupt_handled))
458 return; 458 return;
diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c
index 93187c3cb5e7..5bd194968801 100644
--- a/drivers/hwmon/tmp102.c
+++ b/drivers/hwmon/tmp102.c
@@ -166,7 +166,7 @@ static int __devinit tmp102_probe(struct i2c_client *client,
166 166
167 if (!i2c_check_functionality(client->adapter, 167 if (!i2c_check_functionality(client->adapter,
168 I2C_FUNC_SMBUS_WORD_DATA)) { 168 I2C_FUNC_SMBUS_WORD_DATA)) {
169 dev_err(&client->dev, "adapter doesnt support SMBus word " 169 dev_err(&client->dev, "adapter doesn't support SMBus word "
170 "transactions\n"); 170 "transactions\n");
171 return -ENODEV; 171 return -ENODEV;
172 } 172 }
diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c
index 400a88bde278..17cf1ab95521 100644
--- a/drivers/hwmon/w83791d.c
+++ b/drivers/hwmon/w83791d.c
@@ -556,7 +556,7 @@ static ssize_t show_fan_div(struct device *dev, struct device_attribute *attr,
556 556
557/* Note: we save and restore the fan minimum here, because its value is 557/* Note: we save and restore the fan minimum here, because its value is
558 determined in part by the fan divisor. This follows the principle of 558 determined in part by the fan divisor. This follows the principle of
559 least suprise; the user doesn't expect the fan minimum to change just 559 least surprise; the user doesn't expect the fan minimum to change just
560 because the divisor changed. */ 560 because the divisor changed. */
561static ssize_t store_fan_div(struct device *dev, struct device_attribute *attr, 561static ssize_t store_fan_div(struct device *dev, struct device_attribute *attr,
562 const char *buf, size_t count) 562 const char *buf, size_t count)
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c
index 63841f8cec07..f3e7130c4cda 100644
--- a/drivers/hwmon/w83792d.c
+++ b/drivers/hwmon/w83792d.c
@@ -244,7 +244,7 @@ FAN_TO_REG(long rpm, int div)
244#define TEMP1_TO_REG(val) (SENSORS_LIMIT(((val) < 0 ? (val)+0x100*1000 \ 244#define TEMP1_TO_REG(val) (SENSORS_LIMIT(((val) < 0 ? (val)+0x100*1000 \
245 : (val)) / 1000, 0, 0xff)) 245 : (val)) / 1000, 0, 0xff))
246#define TEMP1_FROM_REG(val) (((val) & 0x80 ? (val)-0x100 : (val)) * 1000) 246#define TEMP1_FROM_REG(val) (((val) & 0x80 ? (val)-0x100 : (val)) * 1000)
247/* for temp2 and temp3, because they need addtional resolution */ 247/* for temp2 and temp3, because they need additional resolution */
248#define TEMP_ADD_FROM_REG(val1, val2) \ 248#define TEMP_ADD_FROM_REG(val1, val2) \
249 ((((val1) & 0x80 ? (val1)-0x100 \ 249 ((((val1) & 0x80 ? (val1)-0x100 \
250 : (val1)) * 1000) + ((val2 & 0x80) ? 500 : 0)) 250 : (val1)) * 1000) + ((val2 & 0x80) ? 500 : 0))
diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c
index e3bdedfb5347..854f9117f1aa 100644
--- a/drivers/hwmon/w83793.c
+++ b/drivers/hwmon/w83793.c
@@ -1921,7 +1921,7 @@ static void w83793_update_nonvolatile(struct device *dev)
1921 struct w83793_data *data = i2c_get_clientdata(client); 1921 struct w83793_data *data = i2c_get_clientdata(client);
1922 int i, j; 1922 int i, j;
1923 /* 1923 /*
1924 They are somewhat "stable" registers, and to update them everytime 1924 They are somewhat "stable" registers, and to update them every time
1925 takes so much time, it's just not worthy. Update them in a long 1925 takes so much time, it's just not worthy. Update them in a long
1926 interval to avoid exception. 1926 interval to avoid exception.
1927 */ 1927 */
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c
index 2b9a8f54bb2c..4ca9cf9cde73 100644
--- a/drivers/i2c/algos/i2c-algo-pca.c
+++ b/drivers/i2c/algos/i2c-algo-pca.c
@@ -343,7 +343,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
343 343
344 ret = curmsg; 344 ret = curmsg;
345 out: 345 out:
346 DEB1("}}} transfered %d/%d messages. " 346 DEB1("}}} transferred %d/%d messages. "
347 "status is %#04x. control is %#04x\n", 347 "status is %#04x. control is %#04x\n",
348 curmsg, num, pca_status(adap), 348 curmsg, num, pca_status(adap),
349 pca_get_con(adap)); 349 pca_get_con(adap));
diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c
index 906a3ca50db6..dd364171f9c5 100644
--- a/drivers/i2c/busses/i2c-ali1535.c
+++ b/drivers/i2c/busses/i2c-ali1535.c
@@ -295,7 +295,7 @@ static int ali1535_transaction(struct i2c_adapter *adap)
295 } 295 }
296 296
297 /* Unfortunately the ALI SMB controller maps "no response" and "bus 297 /* Unfortunately the ALI SMB controller maps "no response" and "bus
298 * collision" into a single bit. No reponse is the usual case so don't 298 * collision" into a single bit. No response is the usual case so don't
299 * do a printk. This means that bus collisions go unreported. 299 * do a printk. This means that bus collisions go unreported.
300 */ 300 */
301 if (temp & ALI1535_STS_BUSERR) { 301 if (temp & ALI1535_STS_BUSERR) {
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c
index b14f6d68221d..83e8a60cdc86 100644
--- a/drivers/i2c/busses/i2c-ali15x3.c
+++ b/drivers/i2c/busses/i2c-ali15x3.c
@@ -318,7 +318,7 @@ static int ali15x3_transaction(struct i2c_adapter *adap)
318 318
319 /* 319 /*
320 Unfortunately the ALI SMB controller maps "no response" and "bus 320 Unfortunately the ALI SMB controller maps "no response" and "bus
321 collision" into a single bit. No reponse is the usual case so don't 321 collision" into a single bit. No response is the usual case so don't
322 do a printk. 322 do a printk.
323 This means that bus collisions go unreported. 323 This means that bus collisions go unreported.
324 */ 324 */
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
index 5795c8398c7c..a76d85fa3ad7 100644
--- a/drivers/i2c/busses/i2c-davinci.c
+++ b/drivers/i2c/busses/i2c-davinci.c
@@ -355,7 +355,7 @@ i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop)
355 /* 355 /*
356 * Write mode register first as needed for correct behaviour 356 * Write mode register first as needed for correct behaviour
357 * on OMAP-L138, but don't set STT yet to avoid a race with XRDY 357 * on OMAP-L138, but don't set STT yet to avoid a race with XRDY
358 * occuring before we have loaded DXR 358 * occurring before we have loaded DXR
359 */ 359 */
360 davinci_i2c_write_reg(dev, DAVINCI_I2C_MDR_REG, flag); 360 davinci_i2c_write_reg(dev, DAVINCI_I2C_MDR_REG, flag);
361 361
diff --git a/drivers/i2c/busses/i2c-designware.c b/drivers/i2c/busses/i2c-designware.c
index b664ed8bbdb3..b7a51c43b185 100644
--- a/drivers/i2c/busses/i2c-designware.c
+++ b/drivers/i2c/busses/i2c-designware.c
@@ -178,7 +178,7 @@ static char *abort_sources[] = {
178 * @lock: protect this struct and IO registers 178 * @lock: protect this struct and IO registers
179 * @clk: input reference clock 179 * @clk: input reference clock
180 * @cmd_err: run time hadware error code 180 * @cmd_err: run time hadware error code
181 * @msgs: points to an array of messages currently being transfered 181 * @msgs: points to an array of messages currently being transferred
182 * @msgs_num: the number of elements in msgs 182 * @msgs_num: the number of elements in msgs
183 * @msg_write_idx: the element index of the current tx message in the msgs 183 * @msg_write_idx: the element index of the current tx message in the msgs
184 * array 184 * array
diff --git a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c
index e5b1a3bf5b80..37e2e82a9c88 100644
--- a/drivers/i2c/busses/i2c-elektor.c
+++ b/drivers/i2c/busses/i2c-elektor.c
@@ -22,7 +22,7 @@
22/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and even 22/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and even
23 Frodo Looijaard <frodol@dds.nl> */ 23 Frodo Looijaard <frodol@dds.nl> */
24 24
25/* Partialy rewriten by Oleg I. Vdovikin for mmapped support of 25/* Partially rewriten by Oleg I. Vdovikin for mmapped support of
26 for Alpha Processor Inc. UP-2000(+) boards */ 26 for Alpha Processor Inc. UP-2000(+) boards */
27 27
28#include <linux/kernel.h> 28#include <linux/kernel.h>
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index ed2e0c5ea37c..72c0415f6f94 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -96,7 +96,7 @@
96#define SMBHSTCFG_SMB_SMI_EN 2 96#define SMBHSTCFG_SMB_SMI_EN 2
97#define SMBHSTCFG_I2C_EN 4 97#define SMBHSTCFG_I2C_EN 4
98 98
99/* Auxillary control register bits, ICH4+ only */ 99/* Auxiliary control register bits, ICH4+ only */
100#define SMBAUXCTL_CRC 1 100#define SMBAUXCTL_CRC 1
101#define SMBAUXCTL_E32B 2 101#define SMBAUXCTL_E32B 2
102 102
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index e4f88dca99b5..3c110fbc409b 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -494,7 +494,7 @@ static int iic_xfer_bytes(struct ibm_iic_private* dev, struct i2c_msg* pm,
494 if (unlikely(ret < 0)) 494 if (unlikely(ret < 0))
495 break; 495 break;
496 else if (unlikely(ret != count)){ 496 else if (unlikely(ret != count)){
497 DBG("%d: xfer_bytes, requested %d, transfered %d\n", 497 DBG("%d: xfer_bytes, requested %d, transferred %d\n",
498 dev->idx, count, ret); 498 dev->idx, count, ret);
499 499
500 /* If it's not a last part of xfer, abort it */ 500 /* If it's not a last part of xfer, abort it */
@@ -593,7 +593,7 @@ static int iic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
593 if (unlikely((in_8(&iic->extsts) & EXTSTS_BCS_MASK) != EXTSTS_BCS_FREE)){ 593 if (unlikely((in_8(&iic->extsts) & EXTSTS_BCS_MASK) != EXTSTS_BCS_FREE)){
594 DBG("%d: iic_xfer, bus is not free\n", dev->idx); 594 DBG("%d: iic_xfer, bus is not free\n", dev->idx);
595 595
596 /* Usually it means something serious has happend. 596 /* Usually it means something serious has happened.
597 * We *cannot* have unfinished previous transfer 597 * We *cannot* have unfinished previous transfer
598 * so it doesn't make any sense to try to stop it. 598 * so it doesn't make any sense to try to stop it.
599 * Probably we were not able to recover from the 599 * Probably we were not able to recover from the
diff --git a/drivers/i2c/busses/i2c-intel-mid.c b/drivers/i2c/busses/i2c-intel-mid.c
index c71492782bbd..e828ac85cfa7 100644
--- a/drivers/i2c/busses/i2c-intel-mid.c
+++ b/drivers/i2c/busses/i2c-intel-mid.c
@@ -170,8 +170,8 @@ struct intel_mid_i2c_private {
170/* Raw Interrupt Status Register */ 170/* Raw Interrupt Status Register */
171#define IC_RAW_INTR_STAT 0x34 /* Read Only */ 171#define IC_RAW_INTR_STAT 0x34 /* Read Only */
172#define GEN_CALL (1 << 11) /* General call */ 172#define GEN_CALL (1 << 11) /* General call */
173#define START_DET (1 << 10) /* (RE)START occured */ 173#define START_DET (1 << 10) /* (RE)START occurred */
174#define STOP_DET (1 << 9) /* STOP occured */ 174#define STOP_DET (1 << 9) /* STOP occurred */
175#define ACTIVITY (1 << 8) /* Bus busy */ 175#define ACTIVITY (1 << 8) /* Bus busy */
176#define RX_DONE (1 << 7) /* Not used in Master mode */ 176#define RX_DONE (1 << 7) /* Not used in Master mode */
177#define TX_ABRT (1 << 6) /* Transmit Abort */ 177#define TX_ABRT (1 << 6) /* Transmit Abort */
@@ -375,7 +375,7 @@ static int intel_mid_i2c_disable(struct i2c_adapter *adap)
375 * I2C should be disabled prior to other register operation. If failed, an 375 * I2C should be disabled prior to other register operation. If failed, an
376 * errno is returned. Mask and Clear all interrpts, this should be done at 376 * errno is returned. Mask and Clear all interrpts, this should be done at
377 * first. Set common registers which will not be modified during normal 377 * first. Set common registers which will not be modified during normal
378 * transfers, including: controll register, FIFO threshold and clock freq. 378 * transfers, including: control register, FIFO threshold and clock freq.
379 * Check APB data width at last. 379 * Check APB data width at last.
380 */ 380 */
381static int intel_mid_i2c_hwinit(struct intel_mid_i2c_private *i2c) 381static int intel_mid_i2c_hwinit(struct intel_mid_i2c_private *i2c)
@@ -455,7 +455,7 @@ static inline bool intel_mid_i2c_address_neq(const struct i2c_msg *p1,
455 * 455 *
456 * By reading register IC_TX_ABRT_SOURCE, various transfer errors can be 456 * By reading register IC_TX_ABRT_SOURCE, various transfer errors can be
457 * distingushed. At present, no circumstances have been found out that 457 * distingushed. At present, no circumstances have been found out that
458 * multiple errors would be occured simutaneously, so we simply use the 458 * multiple errors would be occurred simutaneously, so we simply use the
459 * register value directly. 459 * register value directly.
460 * 460 *
461 * At last the error bits are cleared. (Note clear ABRT_SBYTE_NORSTRT bit need 461 * At last the error bits are cleared. (Note clear ABRT_SBYTE_NORSTRT bit need
@@ -469,7 +469,7 @@ static void intel_mid_i2c_abort(struct intel_mid_i2c_private *i2c)
469 469
470 /* Single transfer error check: 470 /* Single transfer error check:
471 * According to databook, TX/RX FIFOs would be flushed when 471 * According to databook, TX/RX FIFOs would be flushed when
472 * the abort interrupt occured. 472 * the abort interrupt occurred.
473 */ 473 */
474 if (abort & ABRT_MASTER_DIS) 474 if (abort & ABRT_MASTER_DIS)
475 dev_err(&adap->dev, 475 dev_err(&adap->dev,
@@ -569,7 +569,7 @@ static int xfer_read(struct i2c_adapter *adap, unsigned char *buf, int length)
569 * Return Values: 569 * Return Values:
570 * 0 if the read transfer succeeds 570 * 0 if the read transfer succeeds
571 * -ETIMEDOUT if we cannot read the "raw" interrupt register 571 * -ETIMEDOUT if we cannot read the "raw" interrupt register
572 * -EINVAL if a transfer abort occured 572 * -EINVAL if a transfer abort occurred
573 * 573 *
574 * For every byte, a "WRITE" command will be loaded into IC_DATA_CMD prior to 574 * For every byte, a "WRITE" command will be loaded into IC_DATA_CMD prior to
575 * data transfer. The actual "write" operation will be performed when the 575 * data transfer. The actual "write" operation will be performed when the
@@ -697,7 +697,7 @@ static int intel_mid_i2c_setup(struct i2c_adapter *adap, struct i2c_msg *pmsg)
697 * @num: number of i2c_msg 697 * @num: number of i2c_msg
698 * 698 *
699 * Return Values: 699 * Return Values:
700 * + number of messages transfered 700 * + number of messages transferred
701 * -ETIMEDOUT If cannot disable I2C controller or read IC_STATUS 701 * -ETIMEDOUT If cannot disable I2C controller or read IC_STATUS
702 * -EINVAL If the address in i2c_msg is invalid 702 * -EINVAL If the address in i2c_msg is invalid
703 * 703 *
diff --git a/drivers/i2c/busses/i2c-isch.c b/drivers/i2c/busses/i2c-isch.c
index ddc258edb34f..0682f8f277b0 100644
--- a/drivers/i2c/busses/i2c-isch.c
+++ b/drivers/i2c/busses/i2c-isch.c
@@ -141,7 +141,7 @@ static int sch_transaction(void)
141 * This is the main access entry for i2c-sch access 141 * This is the main access entry for i2c-sch access
142 * adap is i2c_adapter pointer, addr is the i2c device bus address, read_write 142 * adap is i2c_adapter pointer, addr is the i2c device bus address, read_write
143 * (0 for read and 1 for write), size is i2c transaction type and data is the 143 * (0 for read and 1 for write), size is i2c transaction type and data is the
144 * union of transaction for data to be transfered or data read from bus. 144 * union of transaction for data to be transferred or data read from bus.
145 * return 0 for success and others for failure. 145 * return 0 for success and others for failure.
146 */ 146 */
147static s32 sch_access(struct i2c_adapter *adap, u16 addr, 147static s32 sch_access(struct i2c_adapter *adap, u16 addr,
diff --git a/drivers/i2c/busses/i2c-mxs.c b/drivers/i2c/busses/i2c-mxs.c
index caf96dc8ca1b..7e78f7c87857 100644
--- a/drivers/i2c/busses/i2c-mxs.c
+++ b/drivers/i2c/busses/i2c-mxs.c
@@ -149,7 +149,7 @@ static void mxs_i2c_pioq_setup_write(struct mxs_i2c_dev *i2c,
149 * We have to copy the slave address (u8) and buffer (arbitrary number 149 * We have to copy the slave address (u8) and buffer (arbitrary number
150 * of u8) into the data register (u32). To achieve that, the u8 are put 150 * of u8) into the data register (u32). To achieve that, the u8 are put
151 * into the MSBs of 'data' which is then shifted for the next u8. When 151 * into the MSBs of 'data' which is then shifted for the next u8. When
152 * apropriate, 'data' is written to MXS_I2C_DATA. So, the first u32 152 * appropriate, 'data' is written to MXS_I2C_DATA. So, the first u32
153 * looks like this: 153 * looks like this:
154 * 154 *
155 * 3 2 1 0 155 * 3 2 1 0
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index 594ed5059c4a..e10e5cf3751a 100644
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -126,9 +126,9 @@ enum i2c_operation {
126/** 126/**
127 * struct i2c_nmk_client - client specific data 127 * struct i2c_nmk_client - client specific data
128 * @slave_adr: 7-bit slave address 128 * @slave_adr: 7-bit slave address
129 * @count: no. bytes to be transfered 129 * @count: no. bytes to be transferred
130 * @buffer: client data buffer 130 * @buffer: client data buffer
131 * @xfer_bytes: bytes transfered till now 131 * @xfer_bytes: bytes transferred till now
132 * @operation: current I2C operation 132 * @operation: current I2C operation
133 */ 133 */
134struct i2c_nmk_client { 134struct i2c_nmk_client {
@@ -330,7 +330,7 @@ static void setup_i2c_controller(struct nmk_i2c_dev *dev)
330 * slsu defines the data setup time after SCL clock 330 * slsu defines the data setup time after SCL clock
331 * stretching in terms of i2c clk cycles. The 331 * stretching in terms of i2c clk cycles. The
332 * needed setup time for the three modes are 250ns, 332 * needed setup time for the three modes are 250ns,
333 * 100ns, 10ns repectively thus leading to the values 333 * 100ns, 10ns respectively thus leading to the values
334 * of 14, 6, 2 for a 48 MHz i2c clk. 334 * of 14, 6, 2 for a 48 MHz i2c clk.
335 */ 335 */
336 writel(dev->cfg.slsu << 16, dev->virtbase + I2C_SCR); 336 writel(dev->cfg.slsu << 16, dev->virtbase + I2C_SCR);
@@ -364,7 +364,7 @@ static void setup_i2c_controller(struct nmk_i2c_dev *dev)
364 /* 364 /*
365 * set the speed mode. Currently we support 365 * set the speed mode. Currently we support
366 * only standard and fast mode of operation 366 * only standard and fast mode of operation
367 * TODO - support for fast mode plus (upto 1Mb/s) 367 * TODO - support for fast mode plus (up to 1Mb/s)
368 * and high speed (up to 3.4 Mb/s) 368 * and high speed (up to 3.4 Mb/s)
369 */ 369 */
370 if (dev->cfg.sm > I2C_FREQ_MODE_FAST) { 370 if (dev->cfg.sm > I2C_FREQ_MODE_FAST) {
diff --git a/drivers/i2c/busses/i2c-s6000.c b/drivers/i2c/busses/i2c-s6000.c
index cadc0216e02f..cb5d01e279c6 100644
--- a/drivers/i2c/busses/i2c-s6000.c
+++ b/drivers/i2c/busses/i2c-s6000.c
@@ -318,7 +318,7 @@ static int __devinit s6i2c_probe(struct platform_device *dev)
318 rc = request_irq(iface->irq, s6i2c_interrupt_entry, 318 rc = request_irq(iface->irq, s6i2c_interrupt_entry,
319 IRQF_SHARED, dev->name, iface); 319 IRQF_SHARED, dev->name, iface);
320 if (rc) { 320 if (rc) {
321 dev_err(&p_adap->dev, "s6i2c: cant get IRQ %d\n", iface->irq); 321 dev_err(&p_adap->dev, "s6i2c: can't get IRQ %d\n", iface->irq);
322 goto err_clk_dis; 322 goto err_clk_dis;
323 } 323 }
324 324
diff --git a/drivers/i2c/busses/i2c-stu300.c b/drivers/i2c/busses/i2c-stu300.c
index 266135ddf7fa..99879617e686 100644
--- a/drivers/i2c/busses/i2c-stu300.c
+++ b/drivers/i2c/busses/i2c-stu300.c
@@ -497,7 +497,7 @@ static int stu300_set_clk(struct stu300_dev *dev, unsigned long clkrate)
497 u32 val; 497 u32 val;
498 int i = 0; 498 int i = 0;
499 499
500 /* Locate the apropriate clock setting */ 500 /* Locate the appropriate clock setting */
501 while (i < ARRAY_SIZE(stu300_clktable) - 1 && 501 while (i < ARRAY_SIZE(stu300_clktable) - 1 &&
502 stu300_clktable[i].rate < clkrate) 502 stu300_clktable[i].rate < clkrate)
503 i++; 503 i++;
@@ -644,7 +644,7 @@ static int stu300_send_address(struct stu300_dev *dev,
644 ret = stu300_await_event(dev, STU300_EVENT_6); 644 ret = stu300_await_event(dev, STU300_EVENT_6);
645 645
646 /* 646 /*
647 * Clear any pending EVENT 6 no matter what happend during 647 * Clear any pending EVENT 6 no matter what happened during
648 * await_event. 648 * await_event.
649 */ 649 */
650 val = stu300_r8(dev->virtbase + I2C_CR); 650 val = stu300_r8(dev->virtbase + I2C_CR);
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 3921f664c9c3..b4ab39b741eb 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -386,7 +386,7 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id)
386 dvc_writel(i2c_dev, DVC_STATUS_I2C_DONE_INTR, DVC_STATUS); 386 dvc_writel(i2c_dev, DVC_STATUS_I2C_DONE_INTR, DVC_STATUS);
387 return IRQ_HANDLED; 387 return IRQ_HANDLED;
388err: 388err:
389 /* An error occured, mask all interrupts */ 389 /* An error occurred, mask all interrupts */
390 tegra_i2c_mask_irq(i2c_dev, I2C_INT_NO_ACK | I2C_INT_ARBITRATION_LOST | 390 tegra_i2c_mask_irq(i2c_dev, I2C_INT_NO_ACK | I2C_INT_ARBITRATION_LOST |
391 I2C_INT_PACKET_XFER_COMPLETE | I2C_INT_TX_FIFO_DATA_REQ | 391 I2C_INT_PACKET_XFER_COMPLETE | I2C_INT_TX_FIFO_DATA_REQ |
392 I2C_INT_RX_FIFO_DATA_REQ); 392 I2C_INT_RX_FIFO_DATA_REQ);
diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c
index 9fbd7e6fe32e..e9d5ff4d1496 100644
--- a/drivers/i2c/busses/i2c-xiic.c
+++ b/drivers/i2c/busses/i2c-xiic.c
@@ -21,7 +21,7 @@
21 * to the automotive development board Russellville. The copyright holder 21 * to the automotive development board Russellville. The copyright holder
22 * as seen in the header is Intel corporation. 22 * as seen in the header is Intel corporation.
23 * Mocean Laboratories forked off the GNU/Linux platform work into a 23 * Mocean Laboratories forked off the GNU/Linux platform work into a
24 * separate company called Pelagicore AB, which commited the code to the 24 * separate company called Pelagicore AB, which committed the code to the
25 * kernel. 25 * kernel.
26 */ 26 */
27 27
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index e5f76a0372fd..70c30e6bce0b 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -348,7 +348,7 @@ EXPORT_SYMBOL(i2c_verify_client);
348 348
349 349
350/* This is a permissive address validity check, I2C address map constraints 350/* This is a permissive address validity check, I2C address map constraints
351 * are purposedly not enforced, except for the general call address. */ 351 * are purposely not enforced, except for the general call address. */
352static int i2c_check_client_addr_validity(const struct i2c_client *client) 352static int i2c_check_client_addr_validity(const struct i2c_client *client)
353{ 353{
354 if (client->flags & I2C_CLIENT_TEN) { 354 if (client->flags & I2C_CLIENT_TEN) {
diff --git a/drivers/ide/cy82c693.c b/drivers/ide/cy82c693.c
index 9383f67deae1..3be60da52123 100644
--- a/drivers/ide/cy82c693.c
+++ b/drivers/ide/cy82c693.c
@@ -67,7 +67,7 @@ static void cy82c693_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
67 67
68 /* 68 /*
69 * note: below we set the value for Bus Master IDE TimeOut Register 69 * note: below we set the value for Bus Master IDE TimeOut Register
70 * I'm not absolutly sure what this does, but it solved my problem 70 * I'm not absolutely sure what this does, but it solved my problem
71 * with IDE DMA and sound, so I now can play sound and work with 71 * with IDE DMA and sound, so I now can play sound and work with
72 * my IDE driver at the same time :-) 72 * my IDE driver at the same time :-)
73 * 73 *
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 5406b6ea3ad1..5a702d02c848 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -107,7 +107,7 @@ static int ide_floppy_callback(ide_drive_t *drive, int dsc)
107static void ide_floppy_report_error(struct ide_disk_obj *floppy, 107static void ide_floppy_report_error(struct ide_disk_obj *floppy,
108 struct ide_atapi_pc *pc) 108 struct ide_atapi_pc *pc)
109{ 109{
110 /* supress error messages resulting from Medium not present */ 110 /* suppress error messages resulting from Medium not present */
111 if (floppy->sense_key == 0x02 && 111 if (floppy->sense_key == 0x02 &&
112 floppy->asc == 0x3a && 112 floppy->asc == 0x3a &&
113 floppy->ascq == 0x00) 113 floppy->ascq == 0x00)
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 34b9872f35d1..600c89a3d137 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -201,7 +201,7 @@ static u8 wait_drive_not_busy(ide_drive_t *drive)
201 u8 stat; 201 u8 stat;
202 202
203 /* 203 /*
204 * Last sector was transfered, wait until device is ready. This can 204 * Last sector was transferred, wait until device is ready. This can
205 * take up to 6 ms on some ATAPI devices, so we will wait max 10 ms. 205 * take up to 6 ms on some ATAPI devices, so we will wait max 10 ms.
206 */ 206 */
207 for (retries = 0; retries < 1000; retries++) { 207 for (retries = 0; retries < 1000; retries++) {
diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c
index 1bdca49e5a03..b59d04c72051 100644
--- a/drivers/ide/piix.c
+++ b/drivers/ide/piix.c
@@ -8,8 +8,8 @@
8 * 8 *
9 * Documentation: 9 * Documentation:
10 * 10 *
11 * Publically available from Intel web site. Errata documentation 11 * Publicly available from Intel web site. Errata documentation
12 * is also publically available. As an aide to anyone hacking on this 12 * is also publicly available. As an aide to anyone hacking on this
13 * driver the list of errata that are relevant is below.going back to 13 * driver the list of errata that are relevant is below.going back to
14 * PIIX4. Older device documentation is now a bit tricky to find. 14 * PIIX4. Older device documentation is now a bit tricky to find.
15 * 15 *
diff --git a/drivers/ide/sis5513.c b/drivers/ide/sis5513.c
index db7f4e761dbc..4a0022567758 100644
--- a/drivers/ide/sis5513.c
+++ b/drivers/ide/sis5513.c
@@ -53,7 +53,7 @@
53 53
54#define DRV_NAME "sis5513" 54#define DRV_NAME "sis5513"
55 55
56/* registers layout and init values are chipset family dependant */ 56/* registers layout and init values are chipset family dependent */
57 57
58#define ATA_16 0x01 58#define ATA_16 0x01
59#define ATA_33 0x02 59#define ATA_33 0x02
@@ -406,7 +406,7 @@ static int __devinit sis_find_family(struct pci_dev *dev)
406 pci_name(dev)); 406 pci_name(dev));
407 chipset_family = ATA_133; 407 chipset_family = ATA_133;
408 408
409 /* Check for 5513 compability mapping 409 /* Check for 5513 compatibility mapping
410 * We must use this, else the port enabled code will fail, 410 * We must use this, else the port enabled code will fail,
411 * as it expects the enablebits at 0x4a. 411 * as it expects the enablebits at 0x4a.
412 */ 412 */
diff --git a/drivers/ide/triflex.c b/drivers/ide/triflex.c
index 7953447eae0f..e53a1b78378b 100644
--- a/drivers/ide/triflex.c
+++ b/drivers/ide/triflex.c
@@ -22,7 +22,7 @@
22 * Loosely based on the piix & svwks drivers. 22 * Loosely based on the piix & svwks drivers.
23 * 23 *
24 * Documentation: 24 * Documentation:
25 * Not publically available. 25 * Not publicly available.
26 */ 26 */
27 27
28#include <linux/types.h> 28#include <linux/types.h>
diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c
index d2a0997b78f8..f46f49cfcc28 100644
--- a/drivers/ide/via82cxxx.c
+++ b/drivers/ide/via82cxxx.c
@@ -14,7 +14,7 @@
14 * Andre Hedrick 14 * Andre Hedrick
15 * 15 *
16 * Documentation: 16 * Documentation:
17 * Obsolete device documentation publically available from via.com.tw 17 * Obsolete device documentation publicly available from via.com.tw
18 * Current device documentation available under NDA only 18 * Current device documentation available under NDA only
19 */ 19 */
20 20
diff --git a/drivers/infiniband/hw/amso1100/c2_ae.c b/drivers/infiniband/hw/amso1100/c2_ae.c
index 62af74295dbe..24f9e3a90e8e 100644
--- a/drivers/infiniband/hw/amso1100/c2_ae.c
+++ b/drivers/infiniband/hw/amso1100/c2_ae.c
@@ -157,7 +157,7 @@ void c2_ae_event(struct c2_dev *c2dev, u32 mq_index)
157 int status; 157 int status;
158 158
159 /* 159 /*
160 * retreive the message 160 * retrieve the message
161 */ 161 */
162 wr = c2_mq_consume(mq); 162 wr = c2_mq_consume(mq);
163 if (!wr) 163 if (!wr)
diff --git a/drivers/infiniband/hw/amso1100/c2_qp.c b/drivers/infiniband/hw/amso1100/c2_qp.c
index d8f4bb8bf42e..0d7b6f23caff 100644
--- a/drivers/infiniband/hw/amso1100/c2_qp.c
+++ b/drivers/infiniband/hw/amso1100/c2_qp.c
@@ -612,7 +612,7 @@ void c2_free_qp(struct c2_dev *c2dev, struct c2_qp *qp)
612 c2_unlock_cqs(send_cq, recv_cq); 612 c2_unlock_cqs(send_cq, recv_cq);
613 613
614 /* 614 /*
615 * Destory qp in the rnic... 615 * Destroy qp in the rnic...
616 */ 616 */
617 destroy_qp(c2dev, qp); 617 destroy_qp(c2dev, qp);
618 618
diff --git a/drivers/infiniband/hw/amso1100/c2_wr.h b/drivers/infiniband/hw/amso1100/c2_wr.h
index c65fbdd6e469..8d4b4ca463ca 100644
--- a/drivers/infiniband/hw/amso1100/c2_wr.h
+++ b/drivers/infiniband/hw/amso1100/c2_wr.h
@@ -131,7 +131,7 @@ enum c2wr_ids {
131 * All the preceding IDs are fixed, and must not change. 131 * All the preceding IDs are fixed, and must not change.
132 * You can add new IDs, but must not remove or reorder 132 * You can add new IDs, but must not remove or reorder
133 * any IDs. If you do, YOU will ruin any hope of 133 * any IDs. If you do, YOU will ruin any hope of
134 * compatability between versions. 134 * compatibility between versions.
135 */ 135 */
136 CCWR_LAST, 136 CCWR_LAST,
137 137
@@ -242,7 +242,7 @@ enum c2_acf {
242/* 242/*
243 * to fix bug 1815 we define the max size allowable of the 243 * to fix bug 1815 we define the max size allowable of the
244 * terminate message (per the IETF spec).Refer to the IETF 244 * terminate message (per the IETF spec).Refer to the IETF
245 * protocal specification, section 12.1.6, page 64) 245 * protocol specification, section 12.1.6, page 64)
246 * The message is prefixed by 20 types of DDP info. 246 * The message is prefixed by 20 types of DDP info.
247 * 247 *
248 * Then the message has 6 bytes for the terminate control 248 * Then the message has 6 bytes for the terminate control
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c
index 47db4bf34628..58c0e417bc30 100644
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -2392,7 +2392,7 @@ void ipath_shutdown_device(struct ipath_devdata *dd)
2392 /* 2392 /*
2393 * clear SerdesEnable and turn the leds off; do this here because 2393 * clear SerdesEnable and turn the leds off; do this here because
2394 * we are unloading, so don't count on interrupts to move along 2394 * we are unloading, so don't count on interrupts to move along
2395 * Turn the LEDs off explictly for the same reason. 2395 * Turn the LEDs off explicitly for the same reason.
2396 */ 2396 */
2397 dd->ipath_f_quiet_serdes(dd); 2397 dd->ipath_f_quiet_serdes(dd);
2398 2398
diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c
index 6d4b29c4cd89..ee79a2d97b14 100644
--- a/drivers/infiniband/hw/ipath/ipath_file_ops.c
+++ b/drivers/infiniband/hw/ipath/ipath_file_ops.c
@@ -1972,7 +1972,7 @@ static int ipath_do_user_init(struct file *fp,
1972 * 0 to 1. So for those chips, we turn it off and then back on. 1972 * 0 to 1. So for those chips, we turn it off and then back on.
1973 * This will (very briefly) affect any other open ports, but the 1973 * This will (very briefly) affect any other open ports, but the
1974 * duration is very short, and therefore isn't an issue. We 1974 * duration is very short, and therefore isn't an issue. We
1975 * explictly set the in-memory tail copy to 0 beforehand, so we 1975 * explicitly set the in-memory tail copy to 0 beforehand, so we
1976 * don't have to wait to be sure the DMA update has happened 1976 * don't have to wait to be sure the DMA update has happened
1977 * (chip resets head/tail to 0 on transition to enable). 1977 * (chip resets head/tail to 0 on transition to enable).
1978 */ 1978 */
diff --git a/drivers/infiniband/hw/ipath/ipath_init_chip.c b/drivers/infiniband/hw/ipath/ipath_init_chip.c
index fef0f4201257..7c1eebe8c7c9 100644
--- a/drivers/infiniband/hw/ipath/ipath_init_chip.c
+++ b/drivers/infiniband/hw/ipath/ipath_init_chip.c
@@ -335,7 +335,7 @@ done:
335 * @dd: the infinipath device 335 * @dd: the infinipath device
336 * 336 *
337 * sanity check at least some of the values after reset, and 337 * sanity check at least some of the values after reset, and
338 * ensure no receive or transmit (explictly, in case reset 338 * ensure no receive or transmit (explicitly, in case reset
339 * failed 339 * failed
340 */ 340 */
341static int init_chip_reset(struct ipath_devdata *dd) 341static int init_chip_reset(struct ipath_devdata *dd)
diff --git a/drivers/infiniband/hw/ipath/ipath_ud.c b/drivers/infiniband/hw/ipath/ipath_ud.c
index 7420715256a9..e8a2a915251e 100644
--- a/drivers/infiniband/hw/ipath/ipath_ud.c
+++ b/drivers/infiniband/hw/ipath/ipath_ud.c
@@ -86,7 +86,7 @@ static void ipath_ud_loopback(struct ipath_qp *sqp, struct ipath_swqe *swqe)
86 } 86 }
87 87
88 /* 88 /*
89 * A GRH is expected to preceed the data even if not 89 * A GRH is expected to precede the data even if not
90 * present on the wire. 90 * present on the wire.
91 */ 91 */
92 length = swqe->length; 92 length = swqe->length;
@@ -515,7 +515,7 @@ void ipath_ud_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
515 } 515 }
516 516
517 /* 517 /*
518 * A GRH is expected to preceed the data even if not 518 * A GRH is expected to precede the data even if not
519 * present on the wire. 519 * present on the wire.
520 */ 520 */
521 wc.byte_len = tlen + sizeof(struct ib_grh); 521 wc.byte_len = tlen + sizeof(struct ib_grh);
diff --git a/drivers/infiniband/hw/ipath/ipath_user_sdma.c b/drivers/infiniband/hw/ipath/ipath_user_sdma.c
index be78f6643c06..f5cb13b21445 100644
--- a/drivers/infiniband/hw/ipath/ipath_user_sdma.c
+++ b/drivers/infiniband/hw/ipath/ipath_user_sdma.c
@@ -236,7 +236,7 @@ static int ipath_user_sdma_num_pages(const struct iovec *iov)
236 return 1 + ((epage - spage) >> PAGE_SHIFT); 236 return 1 + ((epage - spage) >> PAGE_SHIFT);
237} 237}
238 238
239/* truncate length to page boundry */ 239/* truncate length to page boundary */
240static int ipath_user_sdma_page_length(unsigned long addr, unsigned long len) 240static int ipath_user_sdma_page_length(unsigned long addr, unsigned long len)
241{ 241{
242 const unsigned long offset = addr & ~PAGE_MASK; 242 const unsigned long offset = addr & ~PAGE_MASK;
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index cfa3a2b22232..33c7eedaba6c 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -1397,7 +1397,7 @@ static void handle_fin_pkt(struct nes_cm_node *cm_node)
1397 cleanup_retrans_entry(cm_node); 1397 cleanup_retrans_entry(cm_node);
1398 cm_node->state = NES_CM_STATE_CLOSING; 1398 cm_node->state = NES_CM_STATE_CLOSING;
1399 send_ack(cm_node, NULL); 1399 send_ack(cm_node, NULL);
1400 /* Wait for ACK as this is simultanous close.. 1400 /* Wait for ACK as this is simultaneous close..
1401 * After we receive ACK, do not send anything.. 1401 * After we receive ACK, do not send anything..
1402 * Just rm the node.. Done.. */ 1402 * Just rm the node.. Done.. */
1403 break; 1403 break;
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
index 08c194861af5..10d0a5ec9add 100644
--- a/drivers/infiniband/hw/nes/nes_hw.c
+++ b/drivers/infiniband/hw/nes/nes_hw.c
@@ -80,7 +80,7 @@ static void nes_terminate_start_timer(struct nes_qp *nesqp);
80 80
81#ifdef CONFIG_INFINIBAND_NES_DEBUG 81#ifdef CONFIG_INFINIBAND_NES_DEBUG
82static unsigned char *nes_iwarp_state_str[] = { 82static unsigned char *nes_iwarp_state_str[] = {
83 "Non-Existant", 83 "Non-Existent",
84 "Idle", 84 "Idle",
85 "RTS", 85 "RTS",
86 "Closing", 86 "Closing",
@@ -91,7 +91,7 @@ static unsigned char *nes_iwarp_state_str[] = {
91}; 91};
92 92
93static unsigned char *nes_tcp_state_str[] = { 93static unsigned char *nes_tcp_state_str[] = {
94 "Non-Existant", 94 "Non-Existent",
95 "Closed", 95 "Closed",
96 "Listen", 96 "Listen",
97 "SYN Sent", 97 "SYN Sent",
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 2c9c1933bbe3..e96b8fb5d44c 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -902,7 +902,7 @@ static void nes_netdev_set_multicast_list(struct net_device *netdev)
902 nes_write_indexed(nesdev, NES_IDX_NIC_UNICAST_ALL, nic_active); 902 nes_write_indexed(nesdev, NES_IDX_NIC_UNICAST_ALL, nic_active);
903 } 903 }
904 904
905 nes_debug(NES_DBG_NIC_RX, "Number of MC entries = %d, Promiscous = %d, All Multicast = %d.\n", 905 nes_debug(NES_DBG_NIC_RX, "Number of MC entries = %d, Promiscuous = %d, All Multicast = %d.\n",
906 mc_count, !!(netdev->flags & IFF_PROMISC), 906 mc_count, !!(netdev->flags & IFF_PROMISC),
907 !!(netdev->flags & IFF_ALLMULTI)); 907 !!(netdev->flags & IFF_ALLMULTI));
908 if (!mc_all_on) { 908 if (!mc_all_on) {
diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
index 73225eee3cc6..769a1d9da4b7 100644
--- a/drivers/infiniband/hw/qib/qib.h
+++ b/drivers/infiniband/hw/qib/qib.h
@@ -653,7 +653,7 @@ struct diag_observer_list_elt;
653 653
654/* device data struct now contains only "general per-device" info. 654/* device data struct now contains only "general per-device" info.
655 * fields related to a physical IB port are in a qib_pportdata struct, 655 * fields related to a physical IB port are in a qib_pportdata struct,
656 * described above) while fields only used by a particualr chip-type are in 656 * described above) while fields only used by a particular chip-type are in
657 * a qib_chipdata struct, whose contents are opaque to this file. 657 * a qib_chipdata struct, whose contents are opaque to this file.
658 */ 658 */
659struct qib_devdata { 659struct qib_devdata {
diff --git a/drivers/infiniband/hw/qib/qib_file_ops.c b/drivers/infiniband/hw/qib/qib_file_ops.c
index 75bfad16c114..406fca50d036 100644
--- a/drivers/infiniband/hw/qib/qib_file_ops.c
+++ b/drivers/infiniband/hw/qib/qib_file_ops.c
@@ -1539,7 +1539,7 @@ done_chk_sdma:
1539 1539
1540 /* 1540 /*
1541 * If process has NOT already set it's affinity, select and 1541 * If process has NOT already set it's affinity, select and
1542 * reserve a processor for it, as a rendevous for all 1542 * reserve a processor for it, as a rendezvous for all
1543 * users of the driver. If they don't actually later 1543 * users of the driver. If they don't actually later
1544 * set affinity to this cpu, or set it to some other cpu, 1544 * set affinity to this cpu, or set it to some other cpu,
1545 * it just means that sooner or later we don't recommend 1545 * it just means that sooner or later we don't recommend
@@ -1657,7 +1657,7 @@ static int qib_do_user_init(struct file *fp,
1657 * 0 to 1. So for those chips, we turn it off and then back on. 1657 * 0 to 1. So for those chips, we turn it off and then back on.
1658 * This will (very briefly) affect any other open ctxts, but the 1658 * This will (very briefly) affect any other open ctxts, but the
1659 * duration is very short, and therefore isn't an issue. We 1659 * duration is very short, and therefore isn't an issue. We
1660 * explictly set the in-memory tail copy to 0 beforehand, so we 1660 * explicitly set the in-memory tail copy to 0 beforehand, so we
1661 * don't have to wait to be sure the DMA update has happened 1661 * don't have to wait to be sure the DMA update has happened
1662 * (chip resets head/tail to 0 on transition to enable). 1662 * (chip resets head/tail to 0 on transition to enable).
1663 */ 1663 */
diff --git a/drivers/infiniband/hw/qib/qib_iba6120.c b/drivers/infiniband/hw/qib/qib_iba6120.c
index 774dea897e9c..7de4b7ebffc5 100644
--- a/drivers/infiniband/hw/qib/qib_iba6120.c
+++ b/drivers/infiniband/hw/qib/qib_iba6120.c
@@ -1799,7 +1799,7 @@ static int qib_6120_setup_reset(struct qib_devdata *dd)
1799 /* 1799 /*
1800 * Keep chip from being accessed until we are ready. Use 1800 * Keep chip from being accessed until we are ready. Use
1801 * writeq() directly, to allow the write even though QIB_PRESENT 1801 * writeq() directly, to allow the write even though QIB_PRESENT
1802 * isnt' set. 1802 * isn't' set.
1803 */ 1803 */
1804 dd->flags &= ~(QIB_INITTED | QIB_PRESENT); 1804 dd->flags &= ~(QIB_INITTED | QIB_PRESENT);
1805 dd->int_counter = 0; /* so we check interrupts work again */ 1805 dd->int_counter = 0; /* so we check interrupts work again */
@@ -2171,7 +2171,7 @@ static void rcvctrl_6120_mod(struct qib_pportdata *ppd, unsigned int op,
2171 * Init the context registers also; if we were 2171 * Init the context registers also; if we were
2172 * disabled, tail and head should both be zero 2172 * disabled, tail and head should both be zero
2173 * already from the enable, but since we don't 2173 * already from the enable, but since we don't
2174 * know, we have to do it explictly. 2174 * know, we have to do it explicitly.
2175 */ 2175 */
2176 val = qib_read_ureg32(dd, ur_rcvegrindextail, ctxt); 2176 val = qib_read_ureg32(dd, ur_rcvegrindextail, ctxt);
2177 qib_write_ureg(dd, ur_rcvegrindexhead, val, ctxt); 2177 qib_write_ureg(dd, ur_rcvegrindexhead, val, ctxt);
diff --git a/drivers/infiniband/hw/qib/qib_iba7220.c b/drivers/infiniband/hw/qib/qib_iba7220.c
index de799f17cb9e..74fe0360bec7 100644
--- a/drivers/infiniband/hw/qib/qib_iba7220.c
+++ b/drivers/infiniband/hw/qib/qib_iba7220.c
@@ -2111,7 +2111,7 @@ static int qib_setup_7220_reset(struct qib_devdata *dd)
2111 /* 2111 /*
2112 * Keep chip from being accessed until we are ready. Use 2112 * Keep chip from being accessed until we are ready. Use
2113 * writeq() directly, to allow the write even though QIB_PRESENT 2113 * writeq() directly, to allow the write even though QIB_PRESENT
2114 * isnt' set. 2114 * isn't' set.
2115 */ 2115 */
2116 dd->flags &= ~(QIB_INITTED | QIB_PRESENT); 2116 dd->flags &= ~(QIB_INITTED | QIB_PRESENT);
2117 dd->int_counter = 0; /* so we check interrupts work again */ 2117 dd->int_counter = 0; /* so we check interrupts work again */
@@ -2479,7 +2479,7 @@ static int qib_7220_set_ib_cfg(struct qib_pportdata *ppd, int which, u32 val)
2479 * we command the link down. As with width, only write the 2479 * we command the link down. As with width, only write the
2480 * actual register if the link is currently down, otherwise 2480 * actual register if the link is currently down, otherwise
2481 * takes effect on next link change. Since setting is being 2481 * takes effect on next link change. Since setting is being
2482 * explictly requested (via MAD or sysfs), clear autoneg 2482 * explicitly requested (via MAD or sysfs), clear autoneg
2483 * failure status if speed autoneg is enabled. 2483 * failure status if speed autoneg is enabled.
2484 */ 2484 */
2485 ppd->link_speed_enabled = val; 2485 ppd->link_speed_enabled = val;
@@ -2778,7 +2778,7 @@ static void rcvctrl_7220_mod(struct qib_pportdata *ppd, unsigned int op,
2778 * Init the context registers also; if we were 2778 * Init the context registers also; if we were
2779 * disabled, tail and head should both be zero 2779 * disabled, tail and head should both be zero
2780 * already from the enable, but since we don't 2780 * already from the enable, but since we don't
2781 * know, we have to do it explictly. 2781 * know, we have to do it explicitly.
2782 */ 2782 */
2783 val = qib_read_ureg32(dd, ur_rcvegrindextail, ctxt); 2783 val = qib_read_ureg32(dd, ur_rcvegrindextail, ctxt);
2784 qib_write_ureg(dd, ur_rcvegrindexhead, val, ctxt); 2784 qib_write_ureg(dd, ur_rcvegrindexhead, val, ctxt);
diff --git a/drivers/infiniband/hw/qib/qib_iba7322.c b/drivers/infiniband/hw/qib/qib_iba7322.c
index 4a2d21e15a70..55de3cf3441c 100644
--- a/drivers/infiniband/hw/qib/qib_iba7322.c
+++ b/drivers/infiniband/hw/qib/qib_iba7322.c
@@ -3299,7 +3299,7 @@ static int qib_do_7322_reset(struct qib_devdata *dd)
3299 /* 3299 /*
3300 * Keep chip from being accessed until we are ready. Use 3300 * Keep chip from being accessed until we are ready. Use
3301 * writeq() directly, to allow the write even though QIB_PRESENT 3301 * writeq() directly, to allow the write even though QIB_PRESENT
3302 * isnt' set. 3302 * isn't' set.
3303 */ 3303 */
3304 dd->flags &= ~(QIB_INITTED | QIB_PRESENT | QIB_BADINTR); 3304 dd->flags &= ~(QIB_INITTED | QIB_PRESENT | QIB_BADINTR);
3305 dd->flags |= QIB_DOING_RESET; 3305 dd->flags |= QIB_DOING_RESET;
@@ -3727,7 +3727,7 @@ static int qib_7322_set_ib_cfg(struct qib_pportdata *ppd, int which, u32 val)
3727 /* 3727 /*
3728 * As with width, only write the actual register if the 3728 * As with width, only write the actual register if the
3729 * link is currently down, otherwise takes effect on next 3729 * link is currently down, otherwise takes effect on next
3730 * link change. Since setting is being explictly requested 3730 * link change. Since setting is being explicitly requested
3731 * (via MAD or sysfs), clear autoneg failure status if speed 3731 * (via MAD or sysfs), clear autoneg failure status if speed
3732 * autoneg is enabled. 3732 * autoneg is enabled.
3733 */ 3733 */
@@ -4163,7 +4163,7 @@ static void rcvctrl_7322_mod(struct qib_pportdata *ppd, unsigned int op,
4163 * Init the context registers also; if we were 4163 * Init the context registers also; if we were
4164 * disabled, tail and head should both be zero 4164 * disabled, tail and head should both be zero
4165 * already from the enable, but since we don't 4165 * already from the enable, but since we don't
4166 * know, we have to do it explictly. 4166 * know, we have to do it explicitly.
4167 */ 4167 */
4168 val = qib_read_ureg32(dd, ur_rcvegrindextail, ctxt); 4168 val = qib_read_ureg32(dd, ur_rcvegrindextail, ctxt);
4169 qib_write_ureg(dd, ur_rcvegrindexhead, val, ctxt); 4169 qib_write_ureg(dd, ur_rcvegrindexhead, val, ctxt);
@@ -7483,7 +7483,7 @@ static int serdes_7322_init_new(struct qib_pportdata *ppd)
7483 /* Baseline Wander Correction Gain [13:4-0] (leave as default) */ 7483 /* Baseline Wander Correction Gain [13:4-0] (leave as default) */
7484 /* Baseline Wander Correction Gain [3:7-5] (leave as default) */ 7484 /* Baseline Wander Correction Gain [3:7-5] (leave as default) */
7485 /* Data Rate Select [5:7-6] (leave as default) */ 7485 /* Data Rate Select [5:7-6] (leave as default) */
7486 /* RX Parralel Word Width [3:10-8] (leave as default) */ 7486 /* RX Parallel Word Width [3:10-8] (leave as default) */
7487 7487
7488 /* RX REST */ 7488 /* RX REST */
7489 /* Single- or Multi-channel reset */ 7489 /* Single- or Multi-channel reset */
diff --git a/drivers/infiniband/hw/qib/qib_init.c b/drivers/infiniband/hw/qib/qib_init.c
index ffefb78b8949..a01f3fce8eb3 100644
--- a/drivers/infiniband/hw/qib/qib_init.c
+++ b/drivers/infiniband/hw/qib/qib_init.c
@@ -346,7 +346,7 @@ done:
346 * @dd: the qlogic_ib device 346 * @dd: the qlogic_ib device
347 * 347 *
348 * sanity check at least some of the values after reset, and 348 * sanity check at least some of the values after reset, and
349 * ensure no receive or transmit (explictly, in case reset 349 * ensure no receive or transmit (explicitly, in case reset
350 * failed 350 * failed
351 */ 351 */
352static int init_after_reset(struct qib_devdata *dd) 352static int init_after_reset(struct qib_devdata *dd)
diff --git a/drivers/infiniband/hw/qib/qib_mad.h b/drivers/infiniband/hw/qib/qib_mad.h
index 147aff9117d7..7840ab593bcf 100644
--- a/drivers/infiniband/hw/qib/qib_mad.h
+++ b/drivers/infiniband/hw/qib/qib_mad.h
@@ -73,7 +73,7 @@ struct ib_mad_notice_attr {
73 73
74 struct { 74 struct {
75 __be16 reserved; 75 __be16 reserved;
76 __be16 lid; /* LID where change occured */ 76 __be16 lid; /* LID where change occurred */
77 u8 reserved2; 77 u8 reserved2;
78 u8 local_changes; /* low bit - local changes */ 78 u8 local_changes; /* low bit - local changes */
79 __be32 new_cap_mask; /* new capability mask */ 79 __be32 new_cap_mask; /* new capability mask */
diff --git a/drivers/infiniband/hw/qib/qib_twsi.c b/drivers/infiniband/hw/qib/qib_twsi.c
index 6f31ca5039db..ddde72e11edb 100644
--- a/drivers/infiniband/hw/qib/qib_twsi.c
+++ b/drivers/infiniband/hw/qib/qib_twsi.c
@@ -41,7 +41,7 @@
41 * QLogic_IB "Two Wire Serial Interface" driver. 41 * QLogic_IB "Two Wire Serial Interface" driver.
42 * Originally written for a not-quite-i2c serial eeprom, which is 42 * Originally written for a not-quite-i2c serial eeprom, which is
43 * still used on some supported boards. Later boards have added a 43 * still used on some supported boards. Later boards have added a
44 * variety of other uses, most board-specific, so teh bit-boffing 44 * variety of other uses, most board-specific, so the bit-boffing
45 * part has been split off to this file, while the other parts 45 * part has been split off to this file, while the other parts
46 * have been moved to chip-specific files. 46 * have been moved to chip-specific files.
47 * 47 *
diff --git a/drivers/infiniband/hw/qib/qib_ud.c b/drivers/infiniband/hw/qib/qib_ud.c
index 4a51fd1e9cb7..828609fa4d28 100644
--- a/drivers/infiniband/hw/qib/qib_ud.c
+++ b/drivers/infiniband/hw/qib/qib_ud.c
@@ -116,7 +116,7 @@ static void qib_ud_loopback(struct qib_qp *sqp, struct qib_swqe *swqe)
116 } 116 }
117 117
118 /* 118 /*
119 * A GRH is expected to preceed the data even if not 119 * A GRH is expected to precede the data even if not
120 * present on the wire. 120 * present on the wire.
121 */ 121 */
122 length = swqe->length; 122 length = swqe->length;
@@ -520,7 +520,7 @@ void qib_ud_rcv(struct qib_ibport *ibp, struct qib_ib_header *hdr,
520 goto drop; 520 goto drop;
521 521
522 /* 522 /*
523 * A GRH is expected to preceed the data even if not 523 * A GRH is expected to precede the data even if not
524 * present on the wire. 524 * present on the wire.
525 */ 525 */
526 wc.byte_len = tlen + sizeof(struct ib_grh); 526 wc.byte_len = tlen + sizeof(struct ib_grh);
diff --git a/drivers/infiniband/hw/qib/qib_user_sdma.c b/drivers/infiniband/hw/qib/qib_user_sdma.c
index 66208bcd7c13..82442085cbe6 100644
--- a/drivers/infiniband/hw/qib/qib_user_sdma.c
+++ b/drivers/infiniband/hw/qib/qib_user_sdma.c
@@ -239,7 +239,7 @@ static int qib_user_sdma_num_pages(const struct iovec *iov)
239} 239}
240 240
241/* 241/*
242 * Truncate length to page boundry. 242 * Truncate length to page boundary.
243 */ 243 */
244static int qib_user_sdma_page_length(unsigned long addr, unsigned long len) 244static int qib_user_sdma_page_length(unsigned long addr, unsigned long len)
245{ 245{
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h
index f1df01567bb6..2f02ab0ccc1e 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.h
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.h
@@ -91,7 +91,7 @@
91#define SIZE_4K (1UL << SHIFT_4K) 91#define SIZE_4K (1UL << SHIFT_4K)
92#define MASK_4K (~(SIZE_4K-1)) 92#define MASK_4K (~(SIZE_4K-1))
93 93
94 /* support upto 512KB in one RDMA */ 94 /* support up to 512KB in one RDMA */
95#define ISCSI_ISER_SG_TABLESIZE (0x80000 >> SHIFT_4K) 95#define ISCSI_ISER_SG_TABLESIZE (0x80000 >> SHIFT_4K)
96#define ISER_DEF_CMD_PER_LUN 128 96#define ISER_DEF_CMD_PER_LUN 128
97 97
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 3182c9cd1b0e..5688b5c88f24 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -758,7 +758,7 @@ static void joydev_remove_chrdev(struct joydev *joydev)
758} 758}
759 759
760/* 760/*
761 * Mark device non-existant. This disables writes, ioctls and 761 * Mark device non-existent. This disables writes, ioctls and
762 * prevents new users from opening the device. Already posted 762 * prevents new users from opening the device. Already posted
763 * blocking reads will stay, however new ones will fail. 763 * blocking reads will stay, however new ones will fail.
764 */ 764 */
@@ -777,7 +777,7 @@ static void joydev_cleanup(struct joydev *joydev)
777 joydev_hangup(joydev); 777 joydev_hangup(joydev);
778 joydev_remove_chrdev(joydev); 778 joydev_remove_chrdev(joydev);
779 779
780 /* joydev is marked dead so noone else accesses joydev->open */ 780 /* joydev is marked dead so no one else accesses joydev->open */
781 if (joydev->open) 781 if (joydev->open)
782 input_close_device(handle); 782 input_close_device(handle);
783} 783}
diff --git a/drivers/input/joystick/a3d.c b/drivers/input/joystick/a3d.c
index d259b41354b8..1639ab2b94b7 100644
--- a/drivers/input/joystick/a3d.c
+++ b/drivers/input/joystick/a3d.c
@@ -3,7 +3,7 @@
3 */ 3 */
4 4
5/* 5/*
6 * FP-Gaming Assasin 3D joystick driver for Linux 6 * FP-Gaming Assassin 3D joystick driver for Linux
7 */ 7 */
8 8
9/* 9/*
@@ -34,7 +34,7 @@
34#include <linux/input.h> 34#include <linux/input.h>
35#include <linux/jiffies.h> 35#include <linux/jiffies.h>
36 36
37#define DRIVER_DESC "FP-Gaming Assasin 3D joystick driver" 37#define DRIVER_DESC "FP-Gaming Assassin 3D joystick driver"
38 38
39MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>"); 39MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
40MODULE_DESCRIPTION(DRIVER_DESC); 40MODULE_DESCRIPTION(DRIVER_DESC);
diff --git a/drivers/input/keyboard/davinci_keyscan.c b/drivers/input/keyboard/davinci_keyscan.c
index a91ee941b5c1..cd89d17162a3 100644
--- a/drivers/input/keyboard/davinci_keyscan.c
+++ b/drivers/input/keyboard/davinci_keyscan.c
@@ -5,7 +5,7 @@
5 * 5 *
6 * Author: Miguel Aguilar <miguel.aguilar@ridgerun.com> 6 * Author: Miguel Aguilar <miguel.aguilar@ridgerun.com>
7 * 7 *
8 * Intial Code: Sandeep Paulraj <s-paulraj@ti.com> 8 * Initial Code: Sandeep Paulraj <s-paulraj@ti.com>
9 * 9 *
10 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License as published by
diff --git a/drivers/input/misc/adxl34x.c b/drivers/input/misc/adxl34x.c
index de5900d50788..144ddbdeb9b3 100644
--- a/drivers/input/misc/adxl34x.c
+++ b/drivers/input/misc/adxl34x.c
@@ -716,7 +716,7 @@ struct adxl34x *adxl34x_probe(struct device *dev, int irq,
716 pdata = dev->platform_data; 716 pdata = dev->platform_data;
717 if (!pdata) { 717 if (!pdata) {
718 dev_dbg(dev, 718 dev_dbg(dev,
719 "No platfrom data: Using default initialization\n"); 719 "No platform data: Using default initialization\n");
720 pdata = &adxl34x_default_init; 720 pdata = &adxl34x_default_init;
721 } 721 }
722 722
diff --git a/drivers/input/misc/keyspan_remote.c b/drivers/input/misc/keyspan_remote.c
index a93c525475c6..fc62256c963f 100644
--- a/drivers/input/misc/keyspan_remote.c
+++ b/drivers/input/misc/keyspan_remote.c
@@ -312,7 +312,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
312 remote->data.tester = remote->data.tester >> 5; 312 remote->data.tester = remote->data.tester >> 5;
313 remote->data.bits_left -= 5; 313 remote->data.bits_left -= 5;
314 } else { 314 } else {
315 err("Bad message recieved, no stop bit found.\n"); 315 err("Bad message received, no stop bit found.\n");
316 } 316 }
317 317
318 dev_dbg(&remote->udev->dev, 318 dev_dbg(&remote->udev->dev,
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c
index 12501de0c5cd..52b419348983 100644
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
@@ -274,7 +274,7 @@ static struct key_entry keymap_fs_amilo_pro_v3505[] __initdata = {
274 { KE_BLUETOOTH, 0x30 }, /* Fn+F10 */ 274 { KE_BLUETOOTH, 0x30 }, /* Fn+F10 */
275 { KE_KEY, 0x31, {KEY_MAIL} }, /* mail button */ 275 { KE_KEY, 0x31, {KEY_MAIL} }, /* mail button */
276 { KE_KEY, 0x36, {KEY_WWW} }, /* www button */ 276 { KE_KEY, 0x36, {KEY_WWW} }, /* www button */
277 { KE_WIFI, 0x78 }, /* satelite dish button */ 277 { KE_WIFI, 0x78 }, /* satellite dish button */
278 { KE_END, 0 } 278 { KE_END, 0 }
279}; 279};
280 280
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index 3aead91bacc8..3126983c004a 100644
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
@@ -639,7 +639,7 @@ exit:
639 * device, resulting in trackpad malfunction under certain 639 * device, resulting in trackpad malfunction under certain
640 * circumstances. To get around this problem, there is at least one 640 * circumstances. To get around this problem, there is at least one
641 * example that utilizes the USB_QUIRK_RESET_RESUME quirk in order to 641 * example that utilizes the USB_QUIRK_RESET_RESUME quirk in order to
642 * recieve a reset_resume request rather than the normal resume. 642 * receive a reset_resume request rather than the normal resume.
643 * Since the implementation of reset_resume is equal to mode switch 643 * Since the implementation of reset_resume is equal to mode switch
644 * plus start_traffic, it seems easier to always do the switch when 644 * plus start_traffic, it seems easier to always do the switch when
645 * starting traffic on the device. 645 * starting traffic on the device.
diff --git a/drivers/input/mouse/synaptics_i2c.c b/drivers/input/mouse/synaptics_i2c.c
index f6aa26d305ed..cba3c84d2f21 100644
--- a/drivers/input/mouse/synaptics_i2c.c
+++ b/drivers/input/mouse/synaptics_i2c.c
@@ -462,7 +462,7 @@ static void synaptics_i2c_work_handler(struct work_struct *work)
462 * While interrupt driven, there is no real need to poll the device. 462 * While interrupt driven, there is no real need to poll the device.
463 * But touchpads are very sensitive, so there could be errors 463 * But touchpads are very sensitive, so there could be errors
464 * related to physical environment and the attention line isn't 464 * related to physical environment and the attention line isn't
465 * neccesarily asserted. In such case we can lose the touchpad. 465 * necessarily asserted. In such case we can lose the touchpad.
466 * We poll the device once in THREAD_IRQ_SLEEP_SECS and 466 * We poll the device once in THREAD_IRQ_SLEEP_SECS and
467 * if error is detected, we try to reset and reconfigure the touchpad. 467 * if error is detected, we try to reset and reconfigure the touchpad.
468 */ 468 */
diff --git a/drivers/input/mouse/vsxxxaa.c b/drivers/input/mouse/vsxxxaa.c
index bf2c0c80d6cc..eb9a3cfbeefa 100644
--- a/drivers/input/mouse/vsxxxaa.c
+++ b/drivers/input/mouse/vsxxxaa.c
@@ -334,7 +334,7 @@ static void vsxxxaa_handle_POR_packet(struct vsxxxaa *mouse)
334 * M: manufacturer location code 334 * M: manufacturer location code
335 * R: revision code 335 * R: revision code
336 * E: Error code. If it's in the range of 0x00..0x1f, only some 336 * E: Error code. If it's in the range of 0x00..0x1f, only some
337 * minor problem occured. Errors >= 0x20 are considered bad 337 * minor problem occurred. Errors >= 0x20 are considered bad
338 * and the device may not work properly... 338 * and the device may not work properly...
339 * D: <0010> == mouse, <0100> == tablet 339 * D: <0010> == mouse, <0100> == tablet
340 */ 340 */
diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c
index 8c0b51c31424..42206205e4f5 100644
--- a/drivers/input/serio/hp_sdc.c
+++ b/drivers/input/serio/hp_sdc.c
@@ -955,7 +955,7 @@ static int __init hp_sdc_init_hppa(struct parisc_device *d)
955 INIT_DELAYED_WORK(&moduleloader_work, request_module_delayed); 955 INIT_DELAYED_WORK(&moduleloader_work, request_module_delayed);
956 956
957 ret = hp_sdc_init(); 957 ret = hp_sdc_init();
958 /* after successfull initialization give SDC some time to settle 958 /* after successful initialization give SDC some time to settle
959 * and then load the hp_sdc_mlc upper layer driver */ 959 * and then load the hp_sdc_mlc upper layer driver */
960 if (!ret) 960 if (!ret)
961 schedule_delayed_work(&moduleloader_work, 961 schedule_delayed_work(&moduleloader_work,
diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c
index 7540bafc95cf..80baa53da5b1 100644
--- a/drivers/input/serio/xilinx_ps2.c
+++ b/drivers/input/serio/xilinx_ps2.c
@@ -225,7 +225,7 @@ static void sxps2_close(struct serio *pserio)
225/** 225/**
226 * xps2_of_probe - probe method for the PS/2 device. 226 * xps2_of_probe - probe method for the PS/2 device.
227 * @of_dev: pointer to OF device structure 227 * @of_dev: pointer to OF device structure
228 * @match: pointer to the stucture used for matching a device 228 * @match: pointer to the structure used for matching a device
229 * 229 *
230 * This function probes the PS/2 device in the device tree. 230 * This function probes the PS/2 device in the device tree.
231 * It initializes the driver data structure and the hardware. 231 * It initializes the driver data structure and the hardware.
diff --git a/drivers/input/touchscreen/intel-mid-touch.c b/drivers/input/touchscreen/intel-mid-touch.c
index c0307b22d86f..66c96bfc5522 100644
--- a/drivers/input/touchscreen/intel-mid-touch.c
+++ b/drivers/input/touchscreen/intel-mid-touch.c
@@ -542,7 +542,7 @@ static int __devinit mrstouch_adc_init(struct mrstouch_dev *tsdev)
542 * ADC power on, start, enable PENDET and set loop delay 542 * ADC power on, start, enable PENDET and set loop delay
543 * ADC loop delay is set to 4.5 ms approximately 543 * ADC loop delay is set to 4.5 ms approximately
544 * Loop delay more than this results in jitter in adc readings 544 * Loop delay more than this results in jitter in adc readings
545 * Setting loop delay to 0 (continous loop) in MAXIM stops PENDET 545 * Setting loop delay to 0 (continuous loop) in MAXIM stops PENDET
546 * interrupt generation sometimes. 546 * interrupt generation sometimes.
547 */ 547 */
548 548
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c
index 028a5363eea1..3b5b5df04dd6 100644
--- a/drivers/input/touchscreen/ucb1400_ts.c
+++ b/drivers/input/touchscreen/ucb1400_ts.c
@@ -6,7 +6,7 @@
6 * Copyright: MontaVista Software, Inc. 6 * Copyright: MontaVista Software, Inc.
7 * 7 *
8 * Spliting done by: Marek Vasut <marek.vasut@gmail.com> 8 * Spliting done by: Marek Vasut <marek.vasut@gmail.com>
9 * If something doesnt work and it worked before spliting, e-mail me, 9 * If something doesn't work and it worked before spliting, e-mail me,
10 * dont bother Nicolas please ;-) 10 * dont bother Nicolas please ;-)
11 * 11 *
12 * This program is free software; you can redistribute it and/or modify 12 * This program is free software; you can redistribute it and/or modify
diff --git a/drivers/input/touchscreen/wm9705.c b/drivers/input/touchscreen/wm9705.c
index 6b5be742c27d..98e61175d3f5 100644
--- a/drivers/input/touchscreen/wm9705.c
+++ b/drivers/input/touchscreen/wm9705.c
@@ -306,7 +306,7 @@ static int wm9705_acc_enable(struct wm97xx *wm, int enable)
306 dig2 = wm->dig[2]; 306 dig2 = wm->dig[2];
307 307
308 if (enable) { 308 if (enable) {
309 /* continous mode */ 309 /* continuous mode */
310 if (wm->mach_ops->acc_startup && 310 if (wm->mach_ops->acc_startup &&
311 (ret = wm->mach_ops->acc_startup(wm)) < 0) 311 (ret = wm->mach_ops->acc_startup(wm)) < 0)
312 return ret; 312 return ret;
diff --git a/drivers/input/touchscreen/wm9712.c b/drivers/input/touchscreen/wm9712.c
index 7490b05c3566..2bc2fb801009 100644
--- a/drivers/input/touchscreen/wm9712.c
+++ b/drivers/input/touchscreen/wm9712.c
@@ -419,7 +419,7 @@ static int wm9712_acc_enable(struct wm97xx *wm, int enable)
419 dig2 = wm->dig[2]; 419 dig2 = wm->dig[2];
420 420
421 if (enable) { 421 if (enable) {
422 /* continous mode */ 422 /* continuous mode */
423 if (wm->mach_ops->acc_startup) { 423 if (wm->mach_ops->acc_startup) {
424 ret = wm->mach_ops->acc_startup(wm); 424 ret = wm->mach_ops->acc_startup(wm);
425 if (ret < 0) 425 if (ret < 0)
diff --git a/drivers/input/touchscreen/wm9713.c b/drivers/input/touchscreen/wm9713.c
index 238b5132712e..73ec99568f12 100644
--- a/drivers/input/touchscreen/wm9713.c
+++ b/drivers/input/touchscreen/wm9713.c
@@ -431,7 +431,7 @@ static int wm9713_acc_enable(struct wm97xx *wm, int enable)
431 dig3 = wm->dig[2]; 431 dig3 = wm->dig[2];
432 432
433 if (enable) { 433 if (enable) {
434 /* continous mode */ 434 /* continuous mode */
435 if (wm->mach_ops->acc_startup && 435 if (wm->mach_ops->acc_startup &&
436 (ret = wm->mach_ops->acc_startup(wm)) < 0) 436 (ret = wm->mach_ops->acc_startup(wm)) < 0)
437 return ret; 437 return ret;
diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c
index 6b75c9f660ae..5dbe73af2f8f 100644
--- a/drivers/input/touchscreen/wm97xx-core.c
+++ b/drivers/input/touchscreen/wm97xx-core.c
@@ -335,7 +335,7 @@ static void wm97xx_pen_irq_worker(struct work_struct *work)
335 */ 335 */
336 if (!wm->mach_ops->acc_enabled || wm->mach_ops->acc_pen_down) { 336 if (!wm->mach_ops->acc_enabled || wm->mach_ops->acc_pen_down) {
337 if (wm->pen_is_down && !pen_was_down) { 337 if (wm->pen_is_down && !pen_was_down) {
338 /* Data is not availiable immediately on pen down */ 338 /* Data is not available immediately on pen down */
339 queue_delayed_work(wm->ts_workq, &wm->ts_reader, 1); 339 queue_delayed_work(wm->ts_workq, &wm->ts_reader, 1);
340 } 340 }
341 341
@@ -354,7 +354,7 @@ static void wm97xx_pen_irq_worker(struct work_struct *work)
354 * Codec PENDOWN irq handler 354 * Codec PENDOWN irq handler
355 * 355 *
356 * We have to disable the codec interrupt in the handler because it 356 * We have to disable the codec interrupt in the handler because it
357 * can take upto 1ms to clear the interrupt source. We schedule a task 357 * can take up to 1ms to clear the interrupt source. We schedule a task
358 * in a work queue to do the actual interaction with the chip. The 358 * in a work queue to do the actual interaction with the chip. The
359 * interrupt is then enabled again in the slow handler when the source 359 * interrupt is then enabled again in the slow handler when the source
360 * has been cleared. 360 * has been cleared.
diff --git a/drivers/isdn/hardware/eicon/divacapi.h b/drivers/isdn/hardware/eicon/divacapi.h
index 9f5b68037a26..e330da0c5fc0 100644
--- a/drivers/isdn/hardware/eicon/divacapi.h
+++ b/drivers/isdn/hardware/eicon/divacapi.h
@@ -673,7 +673,7 @@ struct async_s {
673 673
674 674
675/*------------------------------------------------------------------*/ 675/*------------------------------------------------------------------*/
676/* auxilliary states for supplementary services */ 676/* auxiliary states for supplementary services */
677/*------------------------------------------------------------------*/ 677/*------------------------------------------------------------------*/
678 678
679#define IDLE 0 679#define IDLE 0
diff --git a/drivers/isdn/hardware/eicon/io.h b/drivers/isdn/hardware/eicon/io.h
index 0c6c650d76bb..a6f175596364 100644
--- a/drivers/isdn/hardware/eicon/io.h
+++ b/drivers/isdn/hardware/eicon/io.h
@@ -60,7 +60,7 @@ typedef struct _diva_xdi_capi_cfg {
60 -------------------------------------------------------------------------- */ 60 -------------------------------------------------------------------------- */
61struct _ISDN_ADAPTER { 61struct _ISDN_ADAPTER {
62 void (* DIRequest)(PISDN_ADAPTER, ENTITY *) ; 62 void (* DIRequest)(PISDN_ADAPTER, ENTITY *) ;
63 int State ; /* from NT4 1.srv, a good idea, but a poor achievment */ 63 int State ; /* from NT4 1.srv, a good idea, but a poor achievement */
64 int Initialized ; 64 int Initialized ;
65 int RegisteredWithDidd ; 65 int RegisteredWithDidd ;
66 int Unavailable ; /* callback function possible? */ 66 int Unavailable ; /* callback function possible? */
diff --git a/drivers/isdn/hardware/eicon/message.c b/drivers/isdn/hardware/eicon/message.c
index 341ef17c22ac..8c5c563c4f12 100644
--- a/drivers/isdn/hardware/eicon/message.c
+++ b/drivers/isdn/hardware/eicon/message.c
@@ -2639,7 +2639,7 @@ static byte connect_b3_req(dword Id, word Number, DIVA_CAPI_ADAPTER *a,
2639 } 2639 }
2640 else 2640 else
2641 { 2641 {
2642 /* local reply if assign unsuccessfull 2642 /* local reply if assign unsuccessful
2643 or B3 protocol allows only one layer 3 connection 2643 or B3 protocol allows only one layer 3 connection
2644 and already connected 2644 and already connected
2645 or B2 protocol not any LAPD 2645 or B2 protocol not any LAPD
@@ -8189,7 +8189,7 @@ static word add_b23(PLCI *plci, API_PARSE *bp)
8189 dlc[ 0] = 15; 8189 dlc[ 0] = 15;
8190 if(b2_config->length >= 8) { /* PIAFS control abilities */ 8190 if(b2_config->length >= 8) { /* PIAFS control abilities */
8191 dlc[ 7] = 10; 8191 dlc[ 7] = 10;
8192 dlc[16] = 2; /* Length of PIAFS extention */ 8192 dlc[16] = 2; /* Length of PIAFS extension */
8193 dlc[17] = PIAFS_UDATA_ABILITIES; /* control (UDATA) ability */ 8193 dlc[17] = PIAFS_UDATA_ABILITIES; /* control (UDATA) ability */
8194 dlc[18] = b2_config_parms[4].info[0]; /* value */ 8194 dlc[18] = b2_config_parms[4].info[0]; /* value */
8195 dlc[ 0] = 18; 8195 dlc[ 0] = 18;
diff --git a/drivers/isdn/hardware/eicon/pc.h b/drivers/isdn/hardware/eicon/pc.h
index 1c6945768a35..bf6b01812400 100644
--- a/drivers/isdn/hardware/eicon/pc.h
+++ b/drivers/isdn/hardware/eicon/pc.h
@@ -701,7 +701,7 @@ Byte | 8 7 6 5 4 3 2 1
701#define PROTCAP_FREE12 0x1000 /* not used */ 701#define PROTCAP_FREE12 0x1000 /* not used */
702#define PROTCAP_FREE13 0x2000 /* not used */ 702#define PROTCAP_FREE13 0x2000 /* not used */
703#define PROTCAP_FREE14 0x4000 /* not used */ 703#define PROTCAP_FREE14 0x4000 /* not used */
704#define PROTCAP_EXTENSION 0x8000 /* used for future extentions */ 704#define PROTCAP_EXTENSION 0x8000 /* used for future extensions */
705/* -----------------------------------------------------------* */ 705/* -----------------------------------------------------------* */
706/* Onhook data transmission ETS30065901 */ 706/* Onhook data transmission ETS30065901 */
707/* Message Type */ 707/* Message Type */
diff --git a/drivers/isdn/hardware/eicon/um_idi.c b/drivers/isdn/hardware/eicon/um_idi.c
index 6563db998d06..ac0bdd1f23fa 100644
--- a/drivers/isdn/hardware/eicon/um_idi.c
+++ b/drivers/isdn/hardware/eicon/um_idi.c
@@ -363,7 +363,7 @@ int diva_um_idi_read(void *entity,
363 363
364 if ((ret = (*cp_fn) (os_handle, dst, data, length)) >= 0) { 364 if ((ret = (*cp_fn) (os_handle, dst, data, length)) >= 0) {
365 /* 365 /*
366 Acknowledge only if read was successfull 366 Acknowledge only if read was successful
367 */ 367 */
368 diva_data_q_ack_segment4read(q); 368 diva_data_q_ack_segment4read(q);
369 } 369 }
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index 4e3780d78ac7..f6f3c87cc7c2 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -118,7 +118,7 @@
118 * -> See hfc_multi.h for HFC_IO_MODE_* values 118 * -> See hfc_multi.h for HFC_IO_MODE_* values
119 * By default, the IO mode is pci memory IO (MEMIO). 119 * By default, the IO mode is pci memory IO (MEMIO).
120 * Some cards require specific IO mode, so it cannot be changed. 120 * Some cards require specific IO mode, so it cannot be changed.
121 * It may be usefull to set IO mode to register io (REGIO) to solve 121 * It may be useful to set IO mode to register io (REGIO) to solve
122 * PCI bridge problems. 122 * PCI bridge problems.
123 * If unsure, don't give this parameter. 123 * If unsure, don't give this parameter.
124 * 124 *
@@ -903,7 +903,7 @@ vpm_echocan_off(struct hfc_multi *hc, int ch)
903/* 903/*
904 * Speech Design resync feature 904 * Speech Design resync feature
905 * NOTE: This is called sometimes outside interrupt handler. 905 * NOTE: This is called sometimes outside interrupt handler.
906 * We must lock irqsave, so no other interrupt (other card) will occurr! 906 * We must lock irqsave, so no other interrupt (other card) will occur!
907 * Also multiple interrupts may nest, so must lock each access (lists, card)! 907 * Also multiple interrupts may nest, so must lock each access (lists, card)!
908 */ 908 */
909static inline void 909static inline void
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index 15d323b8be60..4343abac0b13 100644
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -272,7 +272,7 @@ reset_hfcpci(struct hfc_pci *hc)
272 * D- and monitor/CI channel are not enabled 272 * D- and monitor/CI channel are not enabled
273 * STIO1 is used as output for data, B1+B2 from ST->IOM+HFC 273 * STIO1 is used as output for data, B1+B2 from ST->IOM+HFC
274 * STIO2 is used as data input, B1+B2 from IOM->ST 274 * STIO2 is used as data input, B1+B2 from IOM->ST
275 * ST B-channel send disabled -> continous 1s 275 * ST B-channel send disabled -> continuous 1s
276 * The IOM slots are always enabled 276 * The IOM slots are always enabled
277 */ 277 */
278 if (test_bit(HFC_CFG_PCM, &hc->cfg)) { 278 if (test_bit(HFC_CFG_PCM, &hc->cfg)) {
diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c
index 3147020d188b..0cb0546ead88 100644
--- a/drivers/isdn/hisax/hfc_pci.c
+++ b/drivers/isdn/hisax/hfc_pci.c
@@ -146,7 +146,7 @@ reset_hfcpci(struct IsdnCardState *cs)
146 /* D- and monitor/CI channel are not enabled */ 146 /* D- and monitor/CI channel are not enabled */
147 /* STIO1 is used as output for data, B1+B2 from ST->IOM+HFC */ 147 /* STIO1 is used as output for data, B1+B2 from ST->IOM+HFC */
148 /* STIO2 is used as data input, B1+B2 from IOM->ST */ 148 /* STIO2 is used as data input, B1+B2 from IOM->ST */
149 /* ST B-channel send disabled -> continous 1s */ 149 /* ST B-channel send disabled -> continuous 1s */
150 /* The IOM slots are always enabled */ 150 /* The IOM slots are always enabled */
151 cs->hw.hfcpci.conn = 0x36; /* set data flow directions */ 151 cs->hw.hfcpci.conn = 0x36; /* set data flow directions */
152 Write_hfc(cs, HFCPCI_CONNECT, cs->hw.hfcpci.conn); 152 Write_hfc(cs, HFCPCI_CONNECT, cs->hw.hfcpci.conn);
diff --git a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c
index 1235b7131ae1..156d7c63d944 100644
--- a/drivers/isdn/hisax/hfc_sx.c
+++ b/drivers/isdn/hisax/hfc_sx.c
@@ -399,7 +399,7 @@ reset_hfcsx(struct IsdnCardState *cs)
399 /* D- and monitor/CI channel are not enabled */ 399 /* D- and monitor/CI channel are not enabled */
400 /* STIO1 is used as output for data, B1+B2 from ST->IOM+HFC */ 400 /* STIO1 is used as output for data, B1+B2 from ST->IOM+HFC */
401 /* STIO2 is used as data input, B1+B2 from IOM->ST */ 401 /* STIO2 is used as data input, B1+B2 from IOM->ST */
402 /* ST B-channel send disabled -> continous 1s */ 402 /* ST B-channel send disabled -> continuous 1s */
403 /* The IOM slots are always enabled */ 403 /* The IOM slots are always enabled */
404 cs->hw.hfcsx.conn = 0x36; /* set data flow directions */ 404 cs->hw.hfcsx.conn = 0x36; /* set data flow directions */
405 Write_hfc(cs, HFCSX_CONNECT, cs->hw.hfcsx.conn); 405 Write_hfc(cs, HFCSX_CONNECT, cs->hw.hfcsx.conn);
diff --git a/drivers/isdn/hisax/hfc_usb.h b/drivers/isdn/hisax/hfc_usb.h
index e79f56568d30..2f581c0b4693 100644
--- a/drivers/isdn/hisax/hfc_usb.h
+++ b/drivers/isdn/hisax/hfc_usb.h
@@ -126,7 +126,7 @@ static struct hfcusb_symbolic_list urb_errlist[] = {
126 126
127 127
128/* 128/*
129 * device dependant information to support different 129 * device dependent information to support different
130 * ISDN Ta's using the HFC-S USB chip 130 * ISDN Ta's using the HFC-S USB chip
131 */ 131 */
132 132
diff --git a/drivers/isdn/hisax/l3dss1.c b/drivers/isdn/hisax/l3dss1.c
index cc6ee2d39880..8e2fd02ecce0 100644
--- a/drivers/isdn/hisax/l3dss1.c
+++ b/drivers/isdn/hisax/l3dss1.c
@@ -1595,7 +1595,7 @@ l3dss1_setup(struct l3_process *pc, u_char pr, void *arg)
1595 * Bearer Capabilities 1595 * Bearer Capabilities
1596 */ 1596 */
1597 p = skb->data; 1597 p = skb->data;
1598 /* only the first occurence 'll be detected ! */ 1598 /* only the first occurrence 'll be detected ! */
1599 if ((p = findie(p, skb->len, 0x04, 0))) { 1599 if ((p = findie(p, skb->len, 0x04, 0))) {
1600 if ((p[1] < 2) || (p[1] > 11)) 1600 if ((p[1] < 2) || (p[1] > 11))
1601 err = 1; 1601 err = 1;
@@ -2161,7 +2161,7 @@ static void l3dss1_redir_req_early(struct l3_process *pc, u_char pr, void *arg)
2161 2161
2162/***********************************************/ 2162/***********************************************/
2163/* handle special commands for this protocol. */ 2163/* handle special commands for this protocol. */
2164/* Examples are call independant services like */ 2164/* Examples are call independent services like */
2165/* remote operations with dummy callref. */ 2165/* remote operations with dummy callref. */
2166/***********************************************/ 2166/***********************************************/
2167static int l3dss1_cmd_global(struct PStack *st, isdn_ctrl *ic) 2167static int l3dss1_cmd_global(struct PStack *st, isdn_ctrl *ic)
diff --git a/drivers/isdn/hisax/l3ni1.c b/drivers/isdn/hisax/l3ni1.c
index f9584491fe8e..7b229c0ce115 100644
--- a/drivers/isdn/hisax/l3ni1.c
+++ b/drivers/isdn/hisax/l3ni1.c
@@ -1449,7 +1449,7 @@ l3ni1_setup(struct l3_process *pc, u_char pr, void *arg)
1449 * Bearer Capabilities 1449 * Bearer Capabilities
1450 */ 1450 */
1451 p = skb->data; 1451 p = skb->data;
1452 /* only the first occurence 'll be detected ! */ 1452 /* only the first occurrence 'll be detected ! */
1453 if ((p = findie(p, skb->len, 0x04, 0))) { 1453 if ((p = findie(p, skb->len, 0x04, 0))) {
1454 if ((p[1] < 2) || (p[1] > 11)) 1454 if ((p[1] < 2) || (p[1] > 11))
1455 err = 1; 1455 err = 1;
@@ -2017,7 +2017,7 @@ static void l3ni1_redir_req_early(struct l3_process *pc, u_char pr, void *arg)
2017 2017
2018/***********************************************/ 2018/***********************************************/
2019/* handle special commands for this protocol. */ 2019/* handle special commands for this protocol. */
2020/* Examples are call independant services like */ 2020/* Examples are call independent services like */
2021/* remote operations with dummy callref. */ 2021/* remote operations with dummy callref. */
2022/***********************************************/ 2022/***********************************************/
2023static int l3ni1_cmd_global(struct PStack *st, isdn_ctrl *ic) 2023static int l3ni1_cmd_global(struct PStack *st, isdn_ctrl *ic)
diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c
index 2344e7b33448..a1b89524b505 100644
--- a/drivers/isdn/hisax/nj_s.c
+++ b/drivers/isdn/hisax/nj_s.c
@@ -167,7 +167,7 @@ static int __devinit njs_pci_probe(struct pci_dev *dev_netjet,
167 return(0); 167 return(0);
168 } 168 }
169 /* the TJ300 and TJ320 must be detected, the IRQ handling is different 169 /* the TJ300 and TJ320 must be detected, the IRQ handling is different
170 * unfortunatly the chips use the same device ID, but the TJ320 has 170 * unfortunately the chips use the same device ID, but the TJ320 has
171 * the bit20 in status PCI cfg register set 171 * the bit20 in status PCI cfg register set
172 */ 172 */
173 pci_read_config_dword(dev_netjet, 0x04, &cfg); 173 pci_read_config_dword(dev_netjet, 0x04, &cfg);
diff --git a/drivers/isdn/hisax/st5481_b.c b/drivers/isdn/hisax/st5481_b.c
index e56e5af889b6..ed4bc564dc63 100644
--- a/drivers/isdn/hisax/st5481_b.c
+++ b/drivers/isdn/hisax/st5481_b.c
@@ -124,7 +124,7 @@ static void usb_b_out(struct st5481_bcs *bcs,int buf_nr)
124} 124}
125 125
126/* 126/*
127 * Start transfering (flags or data) on the B channel, since 127 * Start transferring (flags or data) on the B channel, since
128 * FIFO counters has been set to a non-zero value. 128 * FIFO counters has been set to a non-zero value.
129 */ 129 */
130static void st5481B_start_xfer(void *context) 130static void st5481B_start_xfer(void *context)
diff --git a/drivers/isdn/hisax/st5481_usb.c b/drivers/isdn/hisax/st5481_usb.c
index 10d41c5d73ed..159e8fa00fd6 100644
--- a/drivers/isdn/hisax/st5481_usb.c
+++ b/drivers/isdn/hisax/st5481_usb.c
@@ -470,7 +470,7 @@ void st5481_release_isocpipes(struct urb* urb[2])
470 470
471/* 471/*
472 * Decode frames received on the B/D channel. 472 * Decode frames received on the B/D channel.
473 * Note that this function will be called continously 473 * Note that this function will be called continuously
474 * with 64Kbit/s / 16Kbit/s of data and hence it will be 474 * with 64Kbit/s / 16Kbit/s of data and hence it will be
475 * called 50 times per second with 20 ISOC descriptors. 475 * called 50 times per second with 20 ISOC descriptors.
476 * Called at interrupt. 476 * Called at interrupt.
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c
index 282a4467ef19..aa25e183bf79 100644
--- a/drivers/isdn/hisax/teles_cs.c
+++ b/drivers/isdn/hisax/teles_cs.c
@@ -9,7 +9,7 @@
9 Also inspired by ELSA PCMCIA driver 9 Also inspired by ELSA PCMCIA driver
10 by Klaus Lichtenwalder <Lichtenwalder@ACM.org> 10 by Klaus Lichtenwalder <Lichtenwalder@ACM.org>
11 11
12 Extentions to new hisax_pcmcia by Karsten Keil 12 Extensions to new hisax_pcmcia by Karsten Keil
13 13
14 minor changes to be compatible with kernel 2.4.x 14 minor changes to be compatible with kernel 2.4.x
15 by Jan.Schubert@GMX.li 15 by Jan.Schubert@GMX.li
diff --git a/drivers/isdn/hysdn/hysdn_sched.c b/drivers/isdn/hysdn/hysdn_sched.c
index 81db4a190d41..3674d30d6a03 100644
--- a/drivers/isdn/hysdn/hysdn_sched.c
+++ b/drivers/isdn/hysdn/hysdn_sched.c
@@ -143,7 +143,7 @@ hysdn_sched_tx(hysdn_card *card, unsigned char *buf,
143/* send one config line to the card and return 0 if successful, otherwise a */ 143/* send one config line to the card and return 0 if successful, otherwise a */
144/* negative error code. */ 144/* negative error code. */
145/* The function works with timeouts perhaps not giving the greatest speed */ 145/* The function works with timeouts perhaps not giving the greatest speed */
146/* sending the line, but this should be meaningless beacuse only some lines */ 146/* sending the line, but this should be meaningless because only some lines */
147/* are to be sent and this happens very seldom. */ 147/* are to be sent and this happens very seldom. */
148/*****************************************************************************/ 148/*****************************************************************************/
149int 149int
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index afeede7ee295..2a7d17c19489 100644
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -1530,7 +1530,7 @@ isdn_net_ciscohdlck_slarp_send_keepalive(unsigned long data)
1530 printk (KERN_WARNING 1530 printk (KERN_WARNING
1531 "UPDOWN: Line protocol on Interface %s," 1531 "UPDOWN: Line protocol on Interface %s,"
1532 " changed state to down\n", lp->netdev->dev->name); 1532 " changed state to down\n", lp->netdev->dev->name);
1533 /* should stop routing higher-level data accross */ 1533 /* should stop routing higher-level data across */
1534 } else if ((!lp->cisco_line_state) && 1534 } else if ((!lp->cisco_line_state) &&
1535 (myseq_diff >= 0) && (myseq_diff <= 2)) { 1535 (myseq_diff >= 0) && (myseq_diff <= 2)) {
1536 /* line down -> up */ 1536 /* line down -> up */
@@ -1538,7 +1538,7 @@ isdn_net_ciscohdlck_slarp_send_keepalive(unsigned long data)
1538 printk (KERN_WARNING 1538 printk (KERN_WARNING
1539 "UPDOWN: Line protocol on Interface %s," 1539 "UPDOWN: Line protocol on Interface %s,"
1540 " changed state to up\n", lp->netdev->dev->name); 1540 " changed state to up\n", lp->netdev->dev->name);
1541 /* restart routing higher-level data accross */ 1541 /* restart routing higher-level data across */
1542 } 1542 }
1543 1543
1544 if (lp->cisco_debserint) 1544 if (lp->cisco_debserint)
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index 9e8162c80bb0..1b002b0002a4 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -1514,7 +1514,7 @@ int isdn_ppp_autodial_filter(struct sk_buff *skb, isdn_net_local *lp)
1514#define MP_LONGSEQ_MAXBIT ((MP_LONGSEQ_MASK+1)>>1) 1514#define MP_LONGSEQ_MAXBIT ((MP_LONGSEQ_MASK+1)>>1)
1515#define MP_SHORTSEQ_MAXBIT ((MP_SHORTSEQ_MASK+1)>>1) 1515#define MP_SHORTSEQ_MAXBIT ((MP_SHORTSEQ_MASK+1)>>1)
1516 1516
1517/* sequence-wrap safe comparisions (for long sequence)*/ 1517/* sequence-wrap safe comparisons (for long sequence)*/
1518#define MP_LT(a,b) ((a-b)&MP_LONGSEQ_MAXBIT) 1518#define MP_LT(a,b) ((a-b)&MP_LONGSEQ_MAXBIT)
1519#define MP_LE(a,b) !((b-a)&MP_LONGSEQ_MAXBIT) 1519#define MP_LE(a,b) !((b-a)&MP_LONGSEQ_MAXBIT)
1520#define MP_GT(a,b) ((b-a)&MP_LONGSEQ_MAXBIT) 1520#define MP_GT(a,b) ((b-a)&MP_LONGSEQ_MAXBIT)
@@ -1746,7 +1746,7 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,
1746 * then next fragment should be the start of new reassembly 1746 * then next fragment should be the start of new reassembly
1747 * if sequence is contiguous, but we haven't reassembled yet, 1747 * if sequence is contiguous, but we haven't reassembled yet,
1748 * keep going. 1748 * keep going.
1749 * if sequence is not contiguous, either clear everyting 1749 * if sequence is not contiguous, either clear everything
1750 * below low watermark and set start to the next frag or 1750 * below low watermark and set start to the next frag or
1751 * clear start ptr. 1751 * clear start ptr.
1752 */ 1752 */
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index 3d88f15aa218..607d846ae063 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -792,7 +792,7 @@ isdn_tty_suspend(char *id, modem_info * info, atemu * m)
792} 792}
793 793
794/* isdn_tty_resume() tries to resume a suspended call 794/* isdn_tty_resume() tries to resume a suspended call
795 * setup of the lower levels before that. unfortunatly here is no 795 * setup of the lower levels before that. unfortunately here is no
796 * checking for compatibility of used protocols implemented by Q931 796 * checking for compatibility of used protocols implemented by Q931
797 * It does the same things like isdn_tty_dial, the last command 797 * It does the same things like isdn_tty_dial, the last command
798 * is different, may be we can merge it. 798 * is different, may be we can merge it.
diff --git a/drivers/isdn/isdnloop/isdnloop.c b/drivers/isdn/isdnloop/isdnloop.c
index b8a1098b66ed..d497db0a26d0 100644
--- a/drivers/isdn/isdnloop/isdnloop.c
+++ b/drivers/isdn/isdnloop/isdnloop.c
@@ -954,7 +954,7 @@ isdnloop_parse_cmd(isdnloop_card * card)
954/* 954/*
955 * Put command-strings into the of the 'card'. In reality, execute them 955 * Put command-strings into the of the 'card'. In reality, execute them
956 * right in place by calling isdnloop_parse_cmd(). Also copy every 956 * right in place by calling isdnloop_parse_cmd(). Also copy every
957 * command to the read message ringbuffer, preceeding it with a '>'. 957 * command to the read message ringbuffer, preceding it with a '>'.
958 * These mesagges can be read at /dev/isdnctrl. 958 * These mesagges can be read at /dev/isdnctrl.
959 * 959 *
960 * Parameter: 960 * Parameter:
diff --git a/drivers/isdn/mISDN/dsp.h b/drivers/isdn/mISDN/dsp.h
index 18af86879c05..8549431430f0 100644
--- a/drivers/isdn/mISDN/dsp.h
+++ b/drivers/isdn/mISDN/dsp.h
@@ -21,7 +21,7 @@
21/* options may be: 21/* options may be:
22 * 22 *
23 * bit 0 = use ulaw instead of alaw 23 * bit 0 = use ulaw instead of alaw
24 * bit 1 = enable hfc hardware accelleration for all channels 24 * bit 1 = enable hfc hardware acceleration for all channels
25 * 25 *
26 */ 26 */
27#define DSP_OPT_ULAW (1<<0) 27#define DSP_OPT_ULAW (1<<0)
diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
index 309bacf1fadc..4d395dea32f3 100644
--- a/drivers/isdn/mISDN/dsp_cmx.c
+++ b/drivers/isdn/mISDN/dsp_cmx.c
@@ -1513,7 +1513,7 @@ dsp_cmx_send_member(struct dsp *dsp, int len, s32 *c, int members)
1513 /* -> if echo is NOT enabled */ 1513 /* -> if echo is NOT enabled */
1514 if (!dsp->echo.software) { 1514 if (!dsp->echo.software) {
1515 /* 1515 /*
1516 * -> substract rx-data from conf-data, 1516 * -> subtract rx-data from conf-data,
1517 * if tx-data is available, mix 1517 * if tx-data is available, mix
1518 */ 1518 */
1519 while (r != rr && t != tt) { 1519 while (r != rr && t != tt) {
@@ -1572,7 +1572,7 @@ dsp_cmx_send_member(struct dsp *dsp, int len, s32 *c, int members)
1572send_packet: 1572send_packet:
1573 /* 1573 /*
1574 * send tx-data if enabled - don't filter, 1574 * send tx-data if enabled - don't filter,
1575 * becuase we want what we send, not what we filtered 1575 * because we want what we send, not what we filtered
1576 */ 1576 */
1577 if (dsp->tx_data) { 1577 if (dsp->tx_data) {
1578 if (tx_data_only) { 1578 if (tx_data_only) {
diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c
index 6f5b54864283..2877291a9ed8 100644
--- a/drivers/isdn/mISDN/dsp_core.c
+++ b/drivers/isdn/mISDN/dsp_core.c
@@ -115,7 +115,7 @@
115 * 115 *
116 * The CMX has special functions for conferences with one, two and more 116 * The CMX has special functions for conferences with one, two and more
117 * members. It will allow different types of data flow. Receive and transmit 117 * members. It will allow different types of data flow. Receive and transmit
118 * data to/form upper layer may be swithed on/off individually without loosing 118 * data to/form upper layer may be swithed on/off individually without losing
119 * features of CMX, Tones and DTMF. 119 * features of CMX, Tones and DTMF.
120 * 120 *
121 * Echo Cancellation: Sometimes we like to cancel echo from the interface. 121 * Echo Cancellation: Sometimes we like to cancel echo from the interface.
@@ -127,9 +127,9 @@
127 * 127 *
128 * If all used features can be realized in hardware, and if transmit and/or 128 * If all used features can be realized in hardware, and if transmit and/or
129 * receive data ist disabled, the card may not send/receive any data at all. 129 * receive data ist disabled, the card may not send/receive any data at all.
130 * Not receiving is usefull if only announcements are played. Not sending is 130 * Not receiving is useful if only announcements are played. Not sending is
131 * usefull if an answering machine records audio. Not sending and receiving is 131 * useful if an answering machine records audio. Not sending and receiving is
132 * usefull during most states of the call. If supported by hardware, tones 132 * useful during most states of the call. If supported by hardware, tones
133 * will be played without cpu load. Small PBXs and NT-Mode applications will 133 * will be played without cpu load. Small PBXs and NT-Mode applications will
134 * not need expensive hardware when processing calls. 134 * not need expensive hardware when processing calls.
135 * 135 *
diff --git a/drivers/isdn/mISDN/dsp_dtmf.c b/drivers/isdn/mISDN/dsp_dtmf.c
index 9ae2d33b06f7..5b484c3f4af6 100644
--- a/drivers/isdn/mISDN/dsp_dtmf.c
+++ b/drivers/isdn/mISDN/dsp_dtmf.c
@@ -106,7 +106,7 @@ void dsp_dtmf_hardware(struct dsp *dsp)
106 * tested it allot. it even works with very short tones (40ms). the only 106 * tested it allot. it even works with very short tones (40ms). the only
107 * disadvantage is, that it doesn't work good with different volumes of both 107 * disadvantage is, that it doesn't work good with different volumes of both
108 * tones. this will happen, if accoustically coupled dialers are used. 108 * tones. this will happen, if accoustically coupled dialers are used.
109 * it sometimes detects tones during speach, which is normal for decoders. 109 * it sometimes detects tones during speech, which is normal for decoders.
110 * use sequences to given commands during calls. 110 * use sequences to given commands during calls.
111 * 111 *
112 * dtmf - points to a structure of the current dtmf state 112 * dtmf - points to a structure of the current dtmf state
@@ -244,7 +244,7 @@ coefficients:
244 if (result[i] < tresh) { 244 if (result[i] < tresh) {
245 lowgroup = -1; 245 lowgroup = -1;
246 highgroup = -1; 246 highgroup = -1;
247 break; /* noise inbetween */ 247 break; /* noise in between */
248 } 248 }
249 /* good level found. This is allowed only one time per group */ 249 /* good level found. This is allowed only one time per group */
250 if (i < NCOEFF/2) { 250 if (i < NCOEFF/2) {
diff --git a/drivers/isdn/mISDN/dsp_tones.c b/drivers/isdn/mISDN/dsp_tones.c
index 7dbe54ed1deb..4e4440e8bae5 100644
--- a/drivers/isdn/mISDN/dsp_tones.c
+++ b/drivers/isdn/mISDN/dsp_tones.c
@@ -394,7 +394,7 @@ void dsp_tone_copy(struct dsp *dsp, u8 *data, int len)
394 while (len) { 394 while (len) {
395 /* find sample to start with */ 395 /* find sample to start with */
396 while (42) { 396 while (42) {
397 /* warp arround */ 397 /* wrap around */
398 if (!pat->seq[index]) { 398 if (!pat->seq[index]) {
399 count = 0; 399 count = 0;
400 index = 0; 400 index = 0;
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c
index bd526f664a39..22f8ec8b9247 100644
--- a/drivers/isdn/mISDN/l1oip_core.c
+++ b/drivers/isdn/mISDN/l1oip_core.c
@@ -179,7 +179,7 @@ NOTE: A value of 0 equals 256 bytes of data.
179- Time Base = Timestamp of first sample in frame 179- Time Base = Timestamp of first sample in frame
180The "Time Base" is used to rearange packets and to detect packet loss. 180The "Time Base" is used to rearange packets and to detect packet loss.
181The 16 bits are sent in network order (MSB first) and count 1/8000 th of a 181The 16 bits are sent in network order (MSB first) and count 1/8000 th of a
182second. This causes a wrap arround each 8,192 seconds. There is no requirement 182second. This causes a wrap around each 8,192 seconds. There is no requirement
183for the initial "Time Base", but 0 should be used for the first packet. 183for the initial "Time Base", but 0 should be used for the first packet.
184In case of HDLC data, this timestamp counts the packet or byte number. 184In case of HDLC data, this timestamp counts the packet or byte number.
185 185
@@ -205,7 +205,7 @@ On Demand:
205 205
206If the ondemand parameter is given, the remote IP is set to 0 on timeout. 206If the ondemand parameter is given, the remote IP is set to 0 on timeout.
207This will stop keepalive traffic to remote. If the remote is online again, 207This will stop keepalive traffic to remote. If the remote is online again,
208traffic will continue to the remote address. This is usefull for road warriors. 208traffic will continue to the remote address. This is useful for road warriors.
209This feature only works with ID set, otherwhise it is highly unsecure. 209This feature only works with ID set, otherwhise it is highly unsecure.
210 210
211 211
@@ -590,7 +590,7 @@ multiframe:
590 return; 590 return;
591 } 591 }
592 } else 592 } else
593 mlen = len-2; /* single frame, substract timebase */ 593 mlen = len-2; /* single frame, subtract timebase */
594 594
595 if (len < 2) { 595 if (len < 2) {
596 printk(KERN_WARNING "%s: packet error - packet too short, time " 596 printk(KERN_WARNING "%s: packet error - packet too short, time "
diff --git a/drivers/isdn/mISDN/layer2.c b/drivers/isdn/mISDN/layer2.c
index 4ae75053c9d2..d0aeb44ee7c0 100644
--- a/drivers/isdn/mISDN/layer2.c
+++ b/drivers/isdn/mISDN/layer2.c
@@ -1864,7 +1864,7 @@ ph_data_indication(struct layer2 *l2, struct mISDNhead *hh, struct sk_buff *skb)
1864 psapi >>= 2; 1864 psapi >>= 2;
1865 ptei >>= 1; 1865 ptei >>= 1;
1866 if (psapi != l2->sapi) { 1866 if (psapi != l2->sapi) {
1867 /* not our bussiness */ 1867 /* not our business */
1868 if (*debug & DEBUG_L2) 1868 if (*debug & DEBUG_L2)
1869 printk(KERN_DEBUG "%s: sapi %d/%d mismatch\n", 1869 printk(KERN_DEBUG "%s: sapi %d/%d mismatch\n",
1870 __func__, psapi, l2->sapi); 1870 __func__, psapi, l2->sapi);
@@ -1872,7 +1872,7 @@ ph_data_indication(struct layer2 *l2, struct mISDNhead *hh, struct sk_buff *skb)
1872 return 0; 1872 return 0;
1873 } 1873 }
1874 if ((ptei != l2->tei) && (ptei != GROUP_TEI)) { 1874 if ((ptei != l2->tei) && (ptei != GROUP_TEI)) {
1875 /* not our bussiness */ 1875 /* not our business */
1876 if (*debug & DEBUG_L2) 1876 if (*debug & DEBUG_L2)
1877 printk(KERN_DEBUG "%s: tei %d/%d mismatch\n", 1877 printk(KERN_DEBUG "%s: tei %d/%d mismatch\n",
1878 __func__, ptei, l2->tei); 1878 __func__, ptei, l2->tei);
diff --git a/drivers/leds/leds-pca9532.c b/drivers/leds/leds-pca9532.c
index afac338d5025..5bf63af09ddf 100644
--- a/drivers/leds/leds-pca9532.c
+++ b/drivers/leds/leds-pca9532.c
@@ -58,7 +58,7 @@ static struct i2c_driver pca9532_driver = {
58 .id_table = pca9532_id, 58 .id_table = pca9532_id,
59}; 59};
60 60
61/* We have two pwm/blinkers, but 16 possible leds to drive. Additionaly, 61/* We have two pwm/blinkers, but 16 possible leds to drive. Additionally,
62 * the clever Thecus people are using one pwm to drive the beeper. So, 62 * the clever Thecus people are using one pwm to drive the beeper. So,
63 * as a compromise we average one pwm to the values requested by all 63 * as a compromise we average one pwm to the values requested by all
64 * leds that are not ON/OFF. 64 * leds that are not ON/OFF.
diff --git a/drivers/leds/leds-wm8350.c b/drivers/leds/leds-wm8350.c
index a04523273282..f14edd82cb00 100644
--- a/drivers/leds/leds-wm8350.c
+++ b/drivers/leds/leds-wm8350.c
@@ -215,13 +215,13 @@ static int wm8350_led_probe(struct platform_device *pdev)
215 215
216 isink = regulator_get(&pdev->dev, "led_isink"); 216 isink = regulator_get(&pdev->dev, "led_isink");
217 if (IS_ERR(isink)) { 217 if (IS_ERR(isink)) {
218 printk(KERN_ERR "%s: cant get ISINK\n", __func__); 218 printk(KERN_ERR "%s: can't get ISINK\n", __func__);
219 return PTR_ERR(isink); 219 return PTR_ERR(isink);
220 } 220 }
221 221
222 dcdc = regulator_get(&pdev->dev, "led_vcc"); 222 dcdc = regulator_get(&pdev->dev, "led_vcc");
223 if (IS_ERR(dcdc)) { 223 if (IS_ERR(dcdc)) {
224 printk(KERN_ERR "%s: cant get DCDC\n", __func__); 224 printk(KERN_ERR "%s: can't get DCDC\n", __func__);
225 ret = PTR_ERR(dcdc); 225 ret = PTR_ERR(dcdc);
226 goto err_isink; 226 goto err_isink;
227 } 227 }
diff --git a/drivers/lguest/lguest_user.c b/drivers/lguest/lguest_user.c
index 3c781cdddda9..948c547b8e9e 100644
--- a/drivers/lguest/lguest_user.c
+++ b/drivers/lguest/lguest_user.c
@@ -130,7 +130,7 @@ static int add_eventfd(struct lguest *lg, unsigned long addr, int fd)
130 rcu_assign_pointer(lg->eventfds, new); 130 rcu_assign_pointer(lg->eventfds, new);
131 131
132 /* 132 /*
133 * We're not in a big hurry. Wait until noone's looking at old 133 * We're not in a big hurry. Wait until no one's looking at old
134 * version, then free it. 134 * version, then free it.
135 */ 135 */
136 synchronize_rcu(); 136 synchronize_rcu();
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
index 5396c67ba0a4..09d72bb00d12 100644
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@ -328,7 +328,7 @@ adbhid_input_keycode(int id, int scancode, int repeat)
328 switch (keycode) { 328 switch (keycode) {
329 case ADB_KEY_CAPSLOCK: 329 case ADB_KEY_CAPSLOCK:
330 if (!restore_capslock_events) { 330 if (!restore_capslock_events) {
331 /* Generate down/up events for CapsLock everytime. */ 331 /* Generate down/up events for CapsLock every time. */
332 input_report_key(ahid->input, KEY_CAPSLOCK, 1); 332 input_report_key(ahid->input, KEY_CAPSLOCK, 1);
333 input_sync(ahid->input); 333 input_sync(ahid->input);
334 input_report_key(ahid->input, KEY_CAPSLOCK, 0); 334 input_report_key(ahid->input, KEY_CAPSLOCK, 0);
diff --git a/drivers/macintosh/macio-adb.c b/drivers/macintosh/macio-adb.c
index bd6da7a9c55b..b6ef8f590764 100644
--- a/drivers/macintosh/macio-adb.c
+++ b/drivers/macintosh/macio-adb.c
@@ -147,7 +147,7 @@ static int macio_adb_reset_bus(void)
147 147
148 /* Hrm... we may want to not lock interrupts for so 148 /* Hrm... we may want to not lock interrupts for so
149 * long ... oh well, who uses that chip anyway ? :) 149 * long ... oh well, who uses that chip anyway ? :)
150 * That function will be seldomly used during boot 150 * That function will be seldom used during boot
151 * on rare machines, so... 151 * on rare machines, so...
152 */ 152 */
153 spin_lock_irqsave(&macio_lock, flags); 153 spin_lock_irqsave(&macio_lock, flags);
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c
index 9e3e2c566598..02367308ff2e 100644
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -662,7 +662,7 @@ static void thermostat_create_files(void)
662 err |= device_create_file(&of_dev->dev, &dev_attr_sensor2_fan_speed); 662 err |= device_create_file(&of_dev->dev, &dev_attr_sensor2_fan_speed);
663 if (err) 663 if (err)
664 printk(KERN_WARNING 664 printk(KERN_WARNING
665 "Failed to create tempertaure attribute file(s).\n"); 665 "Failed to create temperature attribute file(s).\n");
666} 666}
667 667
668static void thermostat_remove_files(void) 668static void thermostat_remove_files(void)
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index c987033714f6..bb8b722a9783 100644
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -91,7 +91,7 @@
91 * 91 *
92 * Mar. 10, 2005 : 1.2 92 * Mar. 10, 2005 : 1.2
93 * - Add basic support for Xserve G5 93 * - Add basic support for Xserve G5
94 * - Retreive pumps min/max from EEPROM image in device-tree (broken) 94 * - Retrieve pumps min/max from EEPROM image in device-tree (broken)
95 * - Use min/max macros here or there 95 * - Use min/max macros here or there
96 * - Latest darwin updated U3H min fan speed to 20% PWM 96 * - Latest darwin updated U3H min fan speed to 20% PWM
97 * 97 *
@@ -375,7 +375,7 @@ static int read_smon_adc(struct cpu_pid_state *state, int chan)
375 rc = i2c_master_send(state->monitor, buf, 2); 375 rc = i2c_master_send(state->monitor, buf, 2);
376 if (rc <= 0) 376 if (rc <= 0)
377 goto error; 377 goto error;
378 /* Wait for convertion */ 378 /* Wait for conversion */
379 msleep(1); 379 msleep(1);
380 /* Switch to data register */ 380 /* Switch to data register */
381 buf[0] = 4; 381 buf[0] = 4;
@@ -1192,7 +1192,7 @@ static int init_processor_state(struct cpu_pid_state *state, int index)
1192 err |= device_create_file(&of_dev->dev, &dev_attr_cpu1_intake_fan_rpm); 1192 err |= device_create_file(&of_dev->dev, &dev_attr_cpu1_intake_fan_rpm);
1193 } 1193 }
1194 if (err) 1194 if (err)
1195 printk(KERN_WARNING "Failed to create some of the atribute" 1195 printk(KERN_WARNING "Failed to create some of the attribute"
1196 "files for CPU %d\n", index); 1196 "files for CPU %d\n", index);
1197 1197
1198 return 0; 1198 return 0;
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index d37819fd5ad3..46c4e95f10d6 100644
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -45,7 +45,7 @@
45#include <asm/sections.h> 45#include <asm/sections.h>
46#include <asm/macio.h> 46#include <asm/macio.h>
47 47
48#define LOG_TEMP 0 /* continously log temperature */ 48#define LOG_TEMP 0 /* continuously log temperature */
49 49
50static struct { 50static struct {
51 volatile int running; 51 volatile int running;
diff --git a/drivers/md/bitmap.h b/drivers/md/bitmap.h
index 931a7a7c3796..d0aeaf46d932 100644
--- a/drivers/md/bitmap.h
+++ b/drivers/md/bitmap.h
@@ -45,7 +45,7 @@
45 * 45 *
46 * The counter counts pending write requests, plus the on-disk bit. 46 * The counter counts pending write requests, plus the on-disk bit.
47 * When the counter is '1' and the resync bits are clear, the on-disk 47 * When the counter is '1' and the resync bits are clear, the on-disk
48 * bit can be cleared aswell, thus setting the counter to 0. 48 * bit can be cleared as well, thus setting the counter to 0.
49 * When we set a bit, or in the counter (to start a write), if the fields is 49 * When we set a bit, or in the counter (to start a write), if the fields is
50 * 0, we first set the disk bit and set the counter to 1. 50 * 0, we first set the disk bit and set the counter to 1.
51 * 51 *
diff --git a/drivers/md/dm-region-hash.c b/drivers/md/dm-region-hash.c
index dad011aed0c9..7771ed212182 100644
--- a/drivers/md/dm-region-hash.c
+++ b/drivers/md/dm-region-hash.c
@@ -419,7 +419,7 @@ void dm_rh_mark_nosync(struct dm_region_hash *rh, struct bio *bio)
419 /* 419 /*
420 * Possible cases: 420 * Possible cases:
421 * 1) DM_RH_DIRTY 421 * 1) DM_RH_DIRTY
422 * 2) DM_RH_NOSYNC: was dirty, other preceeding writes failed 422 * 2) DM_RH_NOSYNC: was dirty, other preceding writes failed
423 * 3) DM_RH_RECOVERING: flushing pending writes 423 * 3) DM_RH_RECOVERING: flushing pending writes
424 * Either case, the region should have not been connected to list. 424 * Either case, the region should have not been connected to list.
425 */ 425 */
diff --git a/drivers/md/faulty.c b/drivers/md/faulty.c
index 339fdc670751..23078dabb6df 100644
--- a/drivers/md/faulty.c
+++ b/drivers/md/faulty.c
@@ -30,7 +30,7 @@
30 * 30 *
31 * Different modes can be active at a time, but only 31 * Different modes can be active at a time, but only
32 * one can be set at array creation. Others can be added later. 32 * one can be set at array creation. Others can be added later.
33 * A mode can be one-shot or recurrent with the recurrance being 33 * A mode can be one-shot or recurrent with the recurrence being
34 * once in every N requests. 34 * once in every N requests.
35 * The bottom 5 bits of the "layout" indicate the mode. The 35 * The bottom 5 bits of the "layout" indicate the mode. The
36 * remainder indicate a period, or 0 for one-shot. 36 * remainder indicate a period, or 0 for one-shot.
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 8b66e04c2ea6..b12b3776c0c0 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -6266,7 +6266,7 @@ static void status_resync(struct seq_file *seq, mddev_t * mddev)
6266 * rt is a sector_t, so could be 32bit or 64bit. 6266 * rt is a sector_t, so could be 32bit or 64bit.
6267 * So we divide before multiply in case it is 32bit and close 6267 * So we divide before multiply in case it is 32bit and close
6268 * to the limit. 6268 * to the limit.
6269 * We scale the divisor (db) by 32 to avoid loosing precision 6269 * We scale the divisor (db) by 32 to avoid losing precision
6270 * near the end of resync when the number of remaining sectors 6270 * near the end of resync when the number of remaining sectors
6271 * is close to 'db'. 6271 * is close to 'db'.
6272 * We then divide rt by 32 after multiplying by db to compensate. 6272 * We then divide rt by 32 after multiplying by db to compensate.
diff --git a/drivers/md/md.h b/drivers/md/md.h
index 12215d437fcc..52b407369e13 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -94,7 +94,7 @@ struct mdk_rdev_s
94#define In_sync 2 /* device is in_sync with rest of array */ 94#define In_sync 2 /* device is in_sync with rest of array */
95#define WriteMostly 4 /* Avoid reading if at all possible */ 95#define WriteMostly 4 /* Avoid reading if at all possible */
96#define AutoDetected 7 /* added by auto-detect */ 96#define AutoDetected 7 /* added by auto-detect */
97#define Blocked 8 /* An error occured on an externally 97#define Blocked 8 /* An error occurred on an externally
98 * managed array, don't allow writes 98 * managed array, don't allow writes
99 * until it is cleared */ 99 * until it is cleared */
100 wait_queue_head_t blocked_wait; 100 wait_queue_head_t blocked_wait;
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index f7b62370b374..2da83d566592 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -5,7 +5,7 @@
5 * 5 *
6 * RAID-10 support for md. 6 * RAID-10 support for md.
7 * 7 *
8 * Base on code in raid1.c. See raid1.c for futher copyright information. 8 * Base on code in raid1.c. See raid1.c for further copyright information.
9 * 9 *
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify 11 * This program is free software; you can redistribute it and/or modify
@@ -340,14 +340,14 @@ static void raid10_end_write_request(struct bio *bio, int error)
340 340
341/* 341/*
342 * RAID10 layout manager 342 * RAID10 layout manager
343 * Aswell as the chunksize and raid_disks count, there are two 343 * As well as the chunksize and raid_disks count, there are two
344 * parameters: near_copies and far_copies. 344 * parameters: near_copies and far_copies.
345 * near_copies * far_copies must be <= raid_disks. 345 * near_copies * far_copies must be <= raid_disks.
346 * Normally one of these will be 1. 346 * Normally one of these will be 1.
347 * If both are 1, we get raid0. 347 * If both are 1, we get raid0.
348 * If near_copies == raid_disks, we get raid1. 348 * If near_copies == raid_disks, we get raid1.
349 * 349 *
350 * Chunks are layed out in raid0 style with near_copies copies of the 350 * Chunks are laid out in raid0 style with near_copies copies of the
351 * first chunk, followed by near_copies copies of the next chunk and 351 * first chunk, followed by near_copies copies of the next chunk and
352 * so on. 352 * so on.
353 * If far_copies > 1, then after 1/far_copies of the array has been assigned 353 * If far_copies > 1, then after 1/far_copies of the array has been assigned
diff --git a/drivers/md/raid10.h b/drivers/md/raid10.h
index 2316ac2e8e21..944b1104d3b4 100644
--- a/drivers/md/raid10.h
+++ b/drivers/md/raid10.h
@@ -17,8 +17,8 @@ struct r10_private_data_s {
17 spinlock_t device_lock; 17 spinlock_t device_lock;
18 18
19 /* geometry */ 19 /* geometry */
20 int near_copies; /* number of copies layed out raid0 style */ 20 int near_copies; /* number of copies laid out raid0 style */
21 int far_copies; /* number of copies layed out 21 int far_copies; /* number of copies laid out
22 * at large strides across drives 22 * at large strides across drives
23 */ 23 */
24 int far_offset; /* far_copies are offset by 1 stripe 24 int far_offset; /* far_copies are offset by 1 stripe
diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c
index 74ee172b5bc9..b2ba9dc0dd6d 100644
--- a/drivers/media/common/saa7146_i2c.c
+++ b/drivers/media/common/saa7146_i2c.c
@@ -161,7 +161,7 @@ static int saa7146_i2c_reset(struct saa7146_dev *dev)
161 msleep(SAA7146_I2C_DELAY); 161 msleep(SAA7146_I2C_DELAY);
162 } 162 }
163 163
164 /* if any error is still present, a fatal error has occured ... */ 164 /* if any error is still present, a fatal error has occurred ... */
165 status = saa7146_i2c_status(dev); 165 status = saa7146_i2c_status(dev);
166 if ( dev->i2c_bitrate != status ) { 166 if ( dev->i2c_bitrate != status ) {
167 DEB_I2C(("fatal error. status:0x%08x\n",status)); 167 DEB_I2C(("fatal error. status:0x%08x\n",status));
@@ -326,9 +326,9 @@ static int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *m
326 if ( 0 != err) { 326 if ( 0 != err) {
327 /* this one is unsatisfying: some i2c slaves on some 327 /* this one is unsatisfying: some i2c slaves on some
328 dvb cards don't acknowledge correctly, so the saa7146 328 dvb cards don't acknowledge correctly, so the saa7146
329 thinks that an address error occured. in that case, the 329 thinks that an address error occurred. in that case, the
330 transaction should be retrying, even if an address error 330 transaction should be retrying, even if an address error
331 occured. analog saa7146 based cards extensively rely on 331 occurred. analog saa7146 based cards extensively rely on
332 i2c address probing, however, and address errors indicate that a 332 i2c address probing, however, and address errors indicate that a
333 device is really *not* there. retrying in that case 333 device is really *not* there. retrying in that case
334 increases the time the device needs to probe greatly, so 334 increases the time the device needs to probe greatly, so
@@ -365,7 +365,7 @@ static int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *m
365 DEB_I2C(("transmission successful. (msg:%d).\n",err)); 365 DEB_I2C(("transmission successful. (msg:%d).\n",err));
366out: 366out:
367 /* another bug in revision 0: the i2c-registers get uploaded randomly by other 367 /* another bug in revision 0: the i2c-registers get uploaded randomly by other
368 uploads, so we better clear them out before continueing */ 368 uploads, so we better clear them out before continuing */
369 if( 0 == dev->revision ) { 369 if( 0 == dev->revision ) {
370 __le32 zero = 0; 370 __le32 zero = 0;
371 saa7146_i2c_reset(dev); 371 saa7146_i2c_reset(dev);
diff --git a/drivers/media/common/tuners/mxl5005s.c b/drivers/media/common/tuners/mxl5005s.c
index 605e28b73263..0d6e09419044 100644
--- a/drivers/media/common/tuners/mxl5005s.c
+++ b/drivers/media/common/tuners/mxl5005s.c
@@ -106,7 +106,7 @@ enum {
106/* MXL5005 Tuner Register Struct */ 106/* MXL5005 Tuner Register Struct */
107struct TunerReg { 107struct TunerReg {
108 u16 Reg_Num; /* Tuner Register Address */ 108 u16 Reg_Num; /* Tuner Register Address */
109 u16 Reg_Val; /* Current sw programmed value waiting to be writen */ 109 u16 Reg_Val; /* Current sw programmed value waiting to be written */
110}; 110};
111 111
112enum { 112enum {
diff --git a/drivers/media/common/tuners/tda18271.h b/drivers/media/common/tuners/tda18271.h
index 3abb221f3d07..50cfa8cebb93 100644
--- a/drivers/media/common/tuners/tda18271.h
+++ b/drivers/media/common/tuners/tda18271.h
@@ -98,7 +98,7 @@ struct tda18271_config {
98 /* output options that can be disabled */ 98 /* output options that can be disabled */
99 enum tda18271_output_options output_opt; 99 enum tda18271_output_options output_opt;
100 100
101 /* some i2c providers cant write all 39 registers at once */ 101 /* some i2c providers can't write all 39 registers at once */
102 enum tda18271_small_i2c small_i2c; 102 enum tda18271_small_i2c small_i2c;
103 103
104 /* force rf tracking filter calibration on startup */ 104 /* force rf tracking filter calibration on startup */
diff --git a/drivers/media/dvb/b2c2/flexcop-pci.c b/drivers/media/dvb/b2c2/flexcop-pci.c
index 227c0200b70a..955254090a0e 100644
--- a/drivers/media/dvb/b2c2/flexcop-pci.c
+++ b/drivers/media/dvb/b2c2/flexcop-pci.c
@@ -58,7 +58,7 @@ struct flexcop_pci {
58 58
59 int active_dma1_addr; /* 0 = addr0 of dma1; 1 = addr1 of dma1 */ 59 int active_dma1_addr; /* 0 = addr0 of dma1; 1 = addr1 of dma1 */
60 u32 last_dma1_cur_pos; 60 u32 last_dma1_cur_pos;
61 /* position of the pointer last time the timer/packet irq occured */ 61 /* position of the pointer last time the timer/packet irq occurred */
62 int count; 62 int count;
63 int count_prev; 63 int count_prev;
64 int stream_problem; 64 int stream_problem;
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 78fc469f0f69..1e1106dcd063 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -427,10 +427,10 @@ static void or51211_reset(struct dvb_frontend * fe)
427 struct dvb_bt8xx_card *bt = fe->dvb->priv; 427 struct dvb_bt8xx_card *bt = fe->dvb->priv;
428 428
429 /* RESET DEVICE 429 /* RESET DEVICE
430 * reset is controled by GPIO-0 430 * reset is controlled by GPIO-0
431 * when set to 0 causes reset and when to 1 for normal op 431 * when set to 0 causes reset and when to 1 for normal op
432 * must remain reset for 128 clock cycles on a 50Mhz clock 432 * must remain reset for 128 clock cycles on a 50Mhz clock
433 * also PRM1 PRM2 & PRM4 are controled by GPIO-1,GPIO-2 & GPIO-4 433 * also PRM1 PRM2 & PRM4 are controlled by GPIO-1,GPIO-2 & GPIO-4
434 * We assume that the reset has be held low long enough or we 434 * We assume that the reset has be held low long enough or we
435 * have been reset by a power on. When the driver is unloaded 435 * have been reset by a power on. When the driver is unloaded
436 * reset set to 0 so if reloaded we have been reset. 436 * reset set to 0 so if reloaded we have been reset.
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index cad6634610ea..31e2c0d45db3 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -1638,7 +1638,7 @@ static int dvb_frontend_ioctl_legacy(struct file *file,
1638 case FE_READ_STATUS: { 1638 case FE_READ_STATUS: {
1639 fe_status_t* status = parg; 1639 fe_status_t* status = parg;
1640 1640
1641 /* if retune was requested but hasn't occured yet, prevent 1641 /* if retune was requested but hasn't occurred yet, prevent
1642 * that user get signal state from previous tuning */ 1642 * that user get signal state from previous tuning */
1643 if (fepriv->state == FESTATE_RETUNE || 1643 if (fepriv->state == FESTATE_RETUNE ||
1644 fepriv->state == FESTATE_ERROR) { 1644 fepriv->state == FESTATE_ERROR) {
@@ -1729,7 +1729,7 @@ static int dvb_frontend_ioctl_legacy(struct file *file,
1729 * Dish network legacy switches (as used by Dish500) 1729 * Dish network legacy switches (as used by Dish500)
1730 * are controlled by sending 9-bit command words 1730 * are controlled by sending 9-bit command words
1731 * spaced 8msec apart. 1731 * spaced 8msec apart.
1732 * the actual command word is switch/port dependant 1732 * the actual command word is switch/port dependent
1733 * so it is up to the userspace application to send 1733 * so it is up to the userspace application to send
1734 * the right command. 1734 * the right command.
1735 * The command must always start with a '0' after 1735 * The command must always start with a '0' after
diff --git a/drivers/media/dvb/dvb-usb/af9005-fe.c b/drivers/media/dvb/dvb-usb/af9005-fe.c
index 199ece0d4883..6ad94745bbdd 100644
--- a/drivers/media/dvb/dvb-usb/af9005-fe.c
+++ b/drivers/media/dvb/dvb-usb/af9005-fe.c
@@ -580,7 +580,7 @@ static int af9005_fe_program_cfoe(struct dvb_usb_device *d, fe_bandwidth_t bw)
580 NS_coeff2_8k = 0x724925; 580 NS_coeff2_8k = 0x724925;
581 break; 581 break;
582 default: 582 default:
583 err("Invalid bandwith %d.", bw); 583 err("Invalid bandwidth %d.", bw);
584 return -EINVAL; 584 return -EINVAL;
585 } 585 }
586 586
@@ -789,7 +789,7 @@ static int af9005_fe_select_bw(struct dvb_usb_device *d, fe_bandwidth_t bw)
789 temp = 2; 789 temp = 2;
790 break; 790 break;
791 default: 791 default:
792 err("Invalid bandwith %d.", bw); 792 err("Invalid bandwidth %d.", bw);
793 return -EINVAL; 793 return -EINVAL;
794 } 794 }
795 return af9005_write_register_bits(d, xd_g_reg_bw, reg_bw_pos, 795 return af9005_write_register_bits(d, xd_g_reg_bw, reg_bw_pos,
@@ -930,7 +930,7 @@ static int af9005_fe_init(struct dvb_frontend *fe)
930 if (ret) 930 if (ret)
931 return ret; 931 return ret;
932 932
933 /* init other parameters: program cfoe and select bandwith */ 933 /* init other parameters: program cfoe and select bandwidth */
934 deb_info("program cfoe\n"); 934 deb_info("program cfoe\n");
935 if ((ret = af9005_fe_program_cfoe(state->d, BANDWIDTH_6_MHZ))) 935 if ((ret = af9005_fe_program_cfoe(state->d, BANDWIDTH_6_MHZ)))
936 return ret; 936 return ret;
@@ -1167,7 +1167,7 @@ static int af9005_fe_set_frontend(struct dvb_frontend *fe,
1167 if (ret) 1167 if (ret)
1168 return ret; 1168 return ret;
1169 1169
1170 /* select bandwith */ 1170 /* select bandwidth */
1171 deb_info("select bandwidth"); 1171 deb_info("select bandwidth");
1172 ret = af9005_fe_select_bw(state->d, fep->u.ofdm.bandwidth); 1172 ret = af9005_fe_select_bw(state->d, fep->u.ofdm.bandwidth);
1173 if (ret) 1173 if (ret)
diff --git a/drivers/media/dvb/dvb-usb/friio.h b/drivers/media/dvb/dvb-usb/friio.h
index af8d55e390fb..0f461ca10cb9 100644
--- a/drivers/media/dvb/dvb-usb/friio.h
+++ b/drivers/media/dvb/dvb-usb/friio.h
@@ -20,7 +20,7 @@
20 * Frontend: comtech JDVBT-90502 20 * Frontend: comtech JDVBT-90502
21 * (tuner PLL: tua6034, I2C addr:(0xC0 >> 1)) 21 * (tuner PLL: tua6034, I2C addr:(0xC0 >> 1))
22 * (OFDM demodulator: TC90502, I2C addr:(0x30 >> 1)) 22 * (OFDM demodulator: TC90502, I2C addr:(0x30 >> 1))
23 * LED x3 (+LNB) controll: PIC 16F676 23 * LED x3 (+LNB) control: PIC 16F676
24 * EEPROM: 24C08 24 * EEPROM: 24C08
25 * 25 *
26 * (USB smart card reader: AU9522) 26 * (USB smart card reader: AU9522)
diff --git a/drivers/media/dvb/dvb-usb/lmedm04.c b/drivers/media/dvb/dvb-usb/lmedm04.c
index cd26e7c1536a..f2db01212ca1 100644
--- a/drivers/media/dvb/dvb-usb/lmedm04.c
+++ b/drivers/media/dvb/dvb-usb/lmedm04.c
@@ -321,7 +321,7 @@ static int lme2510_int_read(struct dvb_usb_adapter *adap)
321 lme_int->lme_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; 321 lme_int->lme_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
322 322
323 usb_submit_urb(lme_int->lme_urb, GFP_ATOMIC); 323 usb_submit_urb(lme_int->lme_urb, GFP_ATOMIC);
324 info("INT Interupt Service Started"); 324 info("INT Interrupt Service Started");
325 325
326 return 0; 326 return 0;
327} 327}
@@ -482,7 +482,7 @@ static int lme2510_msg(struct dvb_usb_device *d,
482 break; 482 break;
483 } 483 }
484 484
485 deb_info(4, "I2C From Interupt Message out(%02x) in(%02x)", 485 deb_info(4, "I2C From Interrupt Message out(%02x) in(%02x)",
486 wbuf[3], rbuf[1]); 486 wbuf[3], rbuf[1]);
487 487
488 } 488 }
@@ -632,11 +632,11 @@ static int lme2510_int_service(struct dvb_usb_adapter *adap)
632 } 632 }
633 d->rc_dev = rc; 633 d->rc_dev = rc;
634 634
635 /* Start the Interupt */ 635 /* Start the Interrupt */
636 ret = lme2510_int_read(adap); 636 ret = lme2510_int_read(adap);
637 if (ret < 0) { 637 if (ret < 0) {
638 rc_unregister_device(rc); 638 rc_unregister_device(rc);
639 info("INT Unable to start Interupt Service"); 639 info("INT Unable to start Interrupt Service");
640 return -ENODEV; 640 return -ENODEV;
641 } 641 }
642 642
@@ -1003,7 +1003,7 @@ static int dm04_lme2510_tuner(struct dvb_usb_adapter *adap)
1003 return -ENODEV; 1003 return -ENODEV;
1004 } 1004 }
1005 1005
1006 /* Start the Interupt & Remote*/ 1006 /* Start the Interrupt & Remote*/
1007 ret = lme2510_int_service(adap); 1007 ret = lme2510_int_service(adap);
1008 1008
1009 return ret; 1009 return ret;
@@ -1171,7 +1171,7 @@ void *lme2510_exit_int(struct dvb_usb_device *d)
1171 usb_kill_urb(st->lme_urb); 1171 usb_kill_urb(st->lme_urb);
1172 usb_free_coherent(d->udev, 5000, st->buffer, 1172 usb_free_coherent(d->udev, 5000, st->buffer,
1173 st->lme_urb->transfer_dma); 1173 st->lme_urb->transfer_dma);
1174 info("Interupt Service Stopped"); 1174 info("Interrupt Service Stopped");
1175 rc_unregister_device(d->rc_dev); 1175 rc_unregister_device(d->rc_dev);
1176 info("Remote Stopped"); 1176 info("Remote Stopped");
1177 } 1177 }
diff --git a/drivers/media/dvb/frontends/atbm8830.h b/drivers/media/dvb/frontends/atbm8830.h
index e8149f393300..024273374bd8 100644
--- a/drivers/media/dvb/frontends/atbm8830.h
+++ b/drivers/media/dvb/frontends/atbm8830.h
@@ -39,7 +39,7 @@ struct atbm8830_config {
39 /* parallel or serial transport stream */ 39 /* parallel or serial transport stream */
40 u8 serial_ts; 40 u8 serial_ts;
41 41
42 /* transport stream clock output only when receving valid stream */ 42 /* transport stream clock output only when receiving valid stream */
43 u8 ts_clk_gated; 43 u8 ts_clk_gated;
44 44
45 /* Decoder sample TS data at rising edge of clock */ 45 /* Decoder sample TS data at rising edge of clock */
diff --git a/drivers/media/dvb/frontends/au8522_dig.c b/drivers/media/dvb/frontends/au8522_dig.c
index 65f6a36dfb21..1d572940e243 100644
--- a/drivers/media/dvb/frontends/au8522_dig.c
+++ b/drivers/media/dvb/frontends/au8522_dig.c
@@ -635,7 +635,7 @@ static int au8522_led_gpio_enable(struct au8522_state *state, int onoff)
635 struct au8522_led_config *led_config = state->config->led_cfg; 635 struct au8522_led_config *led_config = state->config->led_cfg;
636 u8 val; 636 u8 val;
637 637
638 /* bail out if we cant control an LED */ 638 /* bail out if we can't control an LED */
639 if (!led_config || !led_config->gpio_output || 639 if (!led_config || !led_config->gpio_output ||
640 !led_config->gpio_output_enable || !led_config->gpio_output_disable) 640 !led_config->gpio_output_enable || !led_config->gpio_output_disable)
641 return 0; 641 return 0;
@@ -665,7 +665,7 @@ static int au8522_led_ctrl(struct au8522_state *state, int led)
665 struct au8522_led_config *led_config = state->config->led_cfg; 665 struct au8522_led_config *led_config = state->config->led_cfg;
666 int i, ret = 0; 666 int i, ret = 0;
667 667
668 /* bail out if we cant control an LED */ 668 /* bail out if we can't control an LED */
669 if (!led_config || !led_config->gpio_leds || 669 if (!led_config || !led_config->gpio_leds ||
670 !led_config->num_led_states || !led_config->led_states) 670 !led_config->num_led_states || !led_config->led_states)
671 return 0; 671 return 0;
@@ -803,7 +803,7 @@ static int au8522_led_status(struct au8522_state *state, const u16 *snr)
803 int led; 803 int led;
804 u16 strong; 804 u16 strong;
805 805
806 /* bail out if we cant control an LED */ 806 /* bail out if we can't control an LED */
807 if (!led_config) 807 if (!led_config)
808 return 0; 808 return 0;
809 809
diff --git a/drivers/media/dvb/frontends/bcm3510.c b/drivers/media/dvb/frontends/bcm3510.c
index cf5e576dfdcf..8aff5868a5e1 100644
--- a/drivers/media/dvb/frontends/bcm3510.c
+++ b/drivers/media/dvb/frontends/bcm3510.c
@@ -155,7 +155,7 @@ static int bcm3510_hab_send_request(struct bcm3510_state *st, u8 *buf, int len)
155 unsigned long t; 155 unsigned long t;
156 156
157/* Check if any previous HAB request still needs to be serviced by the 157/* Check if any previous HAB request still needs to be serviced by the
158 * Aquisition Processor before sending new request */ 158 * Acquisition Processor before sending new request */
159 if ((ret = bcm3510_readB(st,0xa8,&v)) < 0) 159 if ((ret = bcm3510_readB(st,0xa8,&v)) < 0)
160 return ret; 160 return ret;
161 if (v.HABSTAT_a8.HABR) { 161 if (v.HABSTAT_a8.HABR) {
@@ -361,7 +361,7 @@ static int bcm3510_tuner_cmd(struct bcm3510_state* st,u8 bc, u16 n, u8 a)
361/* Set duration of the initial state of TUNCTL = 3.34 micro Sec */ 361/* Set duration of the initial state of TUNCTL = 3.34 micro Sec */
362 c.TUNCTL_state = 0x40; 362 c.TUNCTL_state = 0x40;
363 363
364/* PRESCALER DEVIDE RATIO | BC1_2_3_4; (band switch), 1stosc REFERENCE COUNTER REF_S12 and REF_S11 */ 364/* PRESCALER DIVIDE RATIO | BC1_2_3_4; (band switch), 1stosc REFERENCE COUNTER REF_S12 and REF_S11 */
365 c.ctl_dat[0].ctrl.size = BITS_8; 365 c.ctl_dat[0].ctrl.size = BITS_8;
366 c.ctl_dat[0].data = 0x80 | bc; 366 c.ctl_dat[0].data = 0x80 | bc;
367 367
@@ -397,7 +397,7 @@ static int bcm3510_tuner_cmd(struct bcm3510_state* st,u8 bc, u16 n, u8 a)
397 c.ctl_dat[7].ctrl.cs0 = 1; 397 c.ctl_dat[7].ctrl.cs0 = 1;
398 c.ctl_dat[7].data = 0x40; 398 c.ctl_dat[7].data = 0x40;
399 399
400/* PRESCALER DEVIDE RATIO, 2ndosc REFERENCE COUNTER REF_S12 and REF_S11 */ 400/* PRESCALER DIVIDE RATIO, 2ndosc REFERENCE COUNTER REF_S12 and REF_S11 */
401 c.ctl_dat[8].ctrl.size = BITS_8; 401 c.ctl_dat[8].ctrl.size = BITS_8;
402 c.ctl_dat[8].data = 0x80; 402 c.ctl_dat[8].data = 0x80;
403 403
diff --git a/drivers/media/dvb/frontends/cx22700.c b/drivers/media/dvb/frontends/cx22700.c
index 5fbc0fc37ecd..0142214b0133 100644
--- a/drivers/media/dvb/frontends/cx22700.c
+++ b/drivers/media/dvb/frontends/cx22700.c
@@ -179,7 +179,7 @@ static int cx22700_set_tps (struct cx22700_state *state, struct dvb_ofdm_paramet
179 cx22700_writereg (state, 0x06, val); 179 cx22700_writereg (state, 0x06, val);
180 180
181 cx22700_writereg (state, 0x08, 0x04 | 0x02); /* use user tps parameters */ 181 cx22700_writereg (state, 0x08, 0x04 | 0x02); /* use user tps parameters */
182 cx22700_writereg (state, 0x08, 0x04); /* restart aquisition */ 182 cx22700_writereg (state, 0x08, 0x04); /* restart acquisition */
183 183
184 return 0; 184 return 0;
185} 185}
diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c
index ff6c4983051c..3139558148ba 100644
--- a/drivers/media/dvb/frontends/cx22702.c
+++ b/drivers/media/dvb/frontends/cx22702.c
@@ -55,7 +55,7 @@ MODULE_PARM_DESC(debug, "Enable verbose debug messages");
55 55
56/* Register values to initialise the demod */ 56/* Register values to initialise the demod */
57static const u8 init_tab[] = { 57static const u8 init_tab[] = {
58 0x00, 0x00, /* Stop aquisition */ 58 0x00, 0x00, /* Stop acquisition */
59 0x0B, 0x06, 59 0x0B, 0x06,
60 0x09, 0x01, 60 0x09, 0x01,
61 0x0D, 0x41, 61 0x0D, 0x41,
@@ -310,7 +310,7 @@ static int cx22702_set_tps(struct dvb_frontend *fe,
310 & 0xfc); 310 & 0xfc);
311 cx22702_writereg(state, 0x0C, 311 cx22702_writereg(state, 0x0C,
312 (cx22702_readreg(state, 0x0C) & 0xBF) | 0x40); 312 (cx22702_readreg(state, 0x0C) & 0xBF) | 0x40);
313 cx22702_writereg(state, 0x00, 0x01); /* Begin aquisition */ 313 cx22702_writereg(state, 0x00, 0x01); /* Begin acquisition */
314 dprintk("%s: Autodetecting\n", __func__); 314 dprintk("%s: Autodetecting\n", __func__);
315 return 0; 315 return 0;
316 } 316 }
@@ -424,7 +424,7 @@ static int cx22702_set_tps(struct dvb_frontend *fe,
424 cx22702_writereg(state, 0x0C, 424 cx22702_writereg(state, 0x0C,
425 (cx22702_readreg(state, 0x0C) & 0xBF) | 0x40); 425 (cx22702_readreg(state, 0x0C) & 0xBF) | 0x40);
426 426
427 /* Begin channel aquisition */ 427 /* Begin channel acquisition */
428 cx22702_writereg(state, 0x00, 0x01); 428 cx22702_writereg(state, 0x00, 0x01);
429 429
430 return 0; 430 return 0;
diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c
index 7a1a5bc337d8..bf9c999aa470 100644
--- a/drivers/media/dvb/frontends/cx24110.c
+++ b/drivers/media/dvb/frontends/cx24110.c
@@ -544,7 +544,7 @@ static int cx24110_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
544 cx24110_set_inversion (state, p->inversion); 544 cx24110_set_inversion (state, p->inversion);
545 cx24110_set_fec (state, p->u.qpsk.fec_inner); 545 cx24110_set_fec (state, p->u.qpsk.fec_inner);
546 cx24110_set_symbolrate (state, p->u.qpsk.symbol_rate); 546 cx24110_set_symbolrate (state, p->u.qpsk.symbol_rate);
547 cx24110_writereg(state,0x04,0x05); /* start aquisition */ 547 cx24110_writereg(state,0x04,0x05); /* start acquisition */
548 548
549 return 0; 549 return 0;
550} 550}
diff --git a/drivers/media/dvb/frontends/cx24113.h b/drivers/media/dvb/frontends/cx24113.h
index 5de0f7ffd8d2..01eb7b9c28f4 100644
--- a/drivers/media/dvb/frontends/cx24113.h
+++ b/drivers/media/dvb/frontends/cx24113.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Driver for Conexant CX24113/CX24128 Tuner (Satelite) 2 * Driver for Conexant CX24113/CX24128 Tuner (Satellite)
3 * 3 *
4 * Copyright (C) 2007-8 Patrick Boettcher <pb@linuxtv.org> 4 * Copyright (C) 2007-8 Patrick Boettcher <pb@linuxtv.org>
5 * 5 *
diff --git a/drivers/media/dvb/frontends/cx24123.c b/drivers/media/dvb/frontends/cx24123.c
index fad6a990a39b..b1dd8acc607a 100644
--- a/drivers/media/dvb/frontends/cx24123.c
+++ b/drivers/media/dvb/frontends/cx24123.c
@@ -949,7 +949,7 @@ static int cx24123_set_frontend(struct dvb_frontend *fe,
949 else 949 else
950 err("it seems I don't have a tuner..."); 950 err("it seems I don't have a tuner...");
951 951
952 /* Enable automatic aquisition and reset cycle */ 952 /* Enable automatic acquisition and reset cycle */
953 cx24123_writereg(state, 0x03, (cx24123_readreg(state, 0x03) | 0x07)); 953 cx24123_writereg(state, 0x03, (cx24123_readreg(state, 0x03) | 0x07));
954 cx24123_writereg(state, 0x00, 0x10); 954 cx24123_writereg(state, 0x00, 0x10);
955 cx24123_writereg(state, 0x00, 0); 955 cx24123_writereg(state, 0x00, 0);
diff --git a/drivers/media/dvb/frontends/drx397xD.c b/drivers/media/dvb/frontends/drx397xD.c
index a05007c80985..536f02b17338 100644
--- a/drivers/media/dvb/frontends/drx397xD.c
+++ b/drivers/media/dvb/frontends/drx397xD.c
@@ -1097,7 +1097,7 @@ static int drx397x_init(struct dvb_frontend *fe)
1097 s->config.ifagc.w0A = 0x3ff; 1097 s->config.ifagc.w0A = 0x3ff;
1098 s->config.ifagc.w0C = 0x388; 1098 s->config.ifagc.w0C = 0x388;
1099 1099
1100 /* for signal strenght calculations */ 1100 /* for signal strength calculations */
1101 s->config.ss76 = 820; 1101 s->config.ss76 = 820;
1102 s->config.ss78 = 2200; 1102 s->config.ss78 = 2200;
1103 s->config.ss7A = 150; 1103 s->config.ss7A = 150;
diff --git a/drivers/media/dvb/frontends/mb86a16.c b/drivers/media/dvb/frontends/mb86a16.c
index 33b63235b86e..c283112051b1 100644
--- a/drivers/media/dvb/frontends/mb86a16.c
+++ b/drivers/media/dvb/frontends/mb86a16.c
@@ -1630,7 +1630,7 @@ static enum dvbfe_search mb86a16_search(struct dvb_frontend *fe,
1630 state->srate = p->u.qpsk.symbol_rate / 1000; 1630 state->srate = p->u.qpsk.symbol_rate / 1000;
1631 1631
1632 if (!mb86a16_set_fe(state)) { 1632 if (!mb86a16_set_fe(state)) {
1633 dprintk(verbose, MB86A16_ERROR, 1, "Succesfully acquired LOCK"); 1633 dprintk(verbose, MB86A16_ERROR, 1, "Successfully acquired LOCK");
1634 return DVBFE_ALGO_SEARCH_SUCCESS; 1634 return DVBFE_ALGO_SEARCH_SUCCESS;
1635 } 1635 }
1636 1636
diff --git a/drivers/media/dvb/frontends/mb86a20s.c b/drivers/media/dvb/frontends/mb86a20s.c
index cc4acd2f920d..0f867a5055fb 100644
--- a/drivers/media/dvb/frontends/mb86a20s.c
+++ b/drivers/media/dvb/frontends/mb86a20s.c
@@ -406,7 +406,7 @@ err:
406 printk(KERN_INFO "mb86a20s: Init failed. Will try again later\n"); 406 printk(KERN_INFO "mb86a20s: Init failed. Will try again later\n");
407 } else { 407 } else {
408 state->need_init = false; 408 state->need_init = false;
409 dprintk("Initialization succeded.\n"); 409 dprintk("Initialization succeeded.\n");
410 } 410 }
411 return rc; 411 return rc;
412} 412}
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c
index 472907d43460..83e6f1a1b700 100644
--- a/drivers/media/dvb/frontends/mt312.c
+++ b/drivers/media/dvb/frontends/mt312.c
@@ -670,7 +670,7 @@ static int mt312_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
670 if (ret < 0) 670 if (ret < 0)
671 goto error; 671 goto error;
672 672
673 /* preserve this bit to not accidently shutdown ADC */ 673 /* preserve this bit to not accidentally shutdown ADC */
674 val &= 0x80; 674 val &= 0x80;
675 break; 675 break;
676 } 676 }
diff --git a/drivers/media/dvb/frontends/s5h1420.c b/drivers/media/dvb/frontends/s5h1420.c
index e87b747ea99c..17f8cdf8afef 100644
--- a/drivers/media/dvb/frontends/s5h1420.c
+++ b/drivers/media/dvb/frontends/s5h1420.c
@@ -225,7 +225,7 @@ static int s5h1420_recv_slave_reply (struct dvb_frontend* fe,
225 unsigned long timeout; 225 unsigned long timeout;
226 int result = 0; 226 int result = 0;
227 227
228 /* setup for DISEQC recieve */ 228 /* setup for DISEQC receive */
229 val = s5h1420_readreg(state, 0x3b); 229 val = s5h1420_readreg(state, 0x3b);
230 s5h1420_writereg(state, 0x3b, 0x82); /* FIXME: guess - do we need to set DIS_RDY(0x08) in receive mode? */ 230 s5h1420_writereg(state, 0x3b, 0x82); /* FIXME: guess - do we need to set DIS_RDY(0x08) in receive mode? */
231 msleep(15); 231 msleep(15);
diff --git a/drivers/media/dvb/frontends/stb6100.c b/drivers/media/dvb/frontends/stb6100.c
index 64673b8b64a2..bc1a8af4f6e1 100644
--- a/drivers/media/dvb/frontends/stb6100.c
+++ b/drivers/media/dvb/frontends/stb6100.c
@@ -360,7 +360,7 @@ static int stb6100_set_frequency(struct dvb_frontend *fe, u32 frequency)
360 else 360 else
361 odiv = 0; 361 odiv = 0;
362 362
363 /* VCO enabled, seach clock off as per LL3.7, 3.4.1 */ 363 /* VCO enabled, search clock off as per LL3.7, 3.4.1 */
364 regs[STB6100_VCO] = 0xe0 | (odiv << STB6100_VCO_ODIV_SHIFT); 364 regs[STB6100_VCO] = 0xe0 | (odiv << STB6100_VCO_ODIV_SHIFT);
365 365
366 /* OSM */ 366 /* OSM */
diff --git a/drivers/media/dvb/frontends/stv0297.c b/drivers/media/dvb/frontends/stv0297.c
index 4fd7479bb62b..84d88f33275e 100644
--- a/drivers/media/dvb/frontends/stv0297.c
+++ b/drivers/media/dvb/frontends/stv0297.c
@@ -435,7 +435,7 @@ static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
435 return -EINVAL; 435 return -EINVAL;
436 } 436 }
437 437
438 // determine inversion dependant parameters 438 // determine inversion dependent parameters
439 inversion = p->inversion; 439 inversion = p->inversion;
440 if (state->config->invert) 440 if (state->config->invert)
441 inversion = (inversion == INVERSION_ON) ? INVERSION_OFF : INVERSION_ON; 441 inversion = (inversion == INVERSION_ON) ? INVERSION_OFF : INVERSION_ON;
diff --git a/drivers/media/dvb/frontends/stv0367.c b/drivers/media/dvb/frontends/stv0367.c
index 4e0e6a873b8c..e57ab53e2e27 100644
--- a/drivers/media/dvb/frontends/stv0367.c
+++ b/drivers/media/dvb/frontends/stv0367.c
@@ -1328,7 +1328,7 @@ stv0367_ter_signal_type stv0367ter_lock_algo(struct stv0367_state *state)
1328 1328
1329 /*guard=stv0367_readbits(state,F367TER_SYR_GUARD); */ 1329 /*guard=stv0367_readbits(state,F367TER_SYR_GUARD); */
1330 1330
1331 /*supress EPQ auto for SYR_GARD 1/16 or 1/32 1331 /*suppress EPQ auto for SYR_GARD 1/16 or 1/32
1332 and set channel predictor in automatic */ 1332 and set channel predictor in automatic */
1333#if 0 1333#if 0
1334 switch (guard) { 1334 switch (guard) {
diff --git a/drivers/media/dvb/frontends/stv0900_priv.h b/drivers/media/dvb/frontends/stv0900_priv.h
index b62b0f0a4fef..e0ea74c8e093 100644
--- a/drivers/media/dvb/frontends/stv0900_priv.h
+++ b/drivers/media/dvb/frontends/stv0900_priv.h
@@ -238,7 +238,7 @@ enum fe_stv0900_demod_mode {
238}; 238};
239 239
240struct stv0900_init_params{ 240struct stv0900_init_params{
241 u32 dmd_ref_clk;/* Refrence,Input clock for the demod in Hz */ 241 u32 dmd_ref_clk;/* Reference,Input clock for the demod in Hz */
242 242
243 /* Demodulator Type (single demod or dual demod) */ 243 /* Demodulator Type (single demod or dual demod) */
244 enum fe_stv0900_demod_mode demod_mode; 244 enum fe_stv0900_demod_mode demod_mode;
diff --git a/drivers/media/dvb/frontends/stv090x.c b/drivers/media/dvb/frontends/stv090x.c
index 41d0f0a6655d..52d8712411e5 100644
--- a/drivers/media/dvb/frontends/stv090x.c
+++ b/drivers/media/dvb/frontends/stv090x.c
@@ -1424,7 +1424,7 @@ static int stv090x_start_search(struct stv090x_state *state)
1424 if (STV090x_WRITE_DEMOD(state, CFRLOW0, 0x00) < 0) 1424 if (STV090x_WRITE_DEMOD(state, CFRLOW0, 0x00) < 0)
1425 goto err; 1425 goto err;
1426 1426
1427 /*enlarge the timing bandwith for Low SR*/ 1427 /*enlarge the timing bandwidth for Low SR*/
1428 if (STV090x_WRITE_DEMOD(state, RTCS2, 0x68) < 0) 1428 if (STV090x_WRITE_DEMOD(state, RTCS2, 0x68) < 0)
1429 goto err; 1429 goto err;
1430 } else { 1430 } else {
@@ -1432,17 +1432,17 @@ static int stv090x_start_search(struct stv090x_state *state)
1432 Set The carrier search up and low to auto mode */ 1432 Set The carrier search up and low to auto mode */
1433 if (STV090x_WRITE_DEMOD(state, CARCFG, 0xc4) < 0) 1433 if (STV090x_WRITE_DEMOD(state, CARCFG, 0xc4) < 0)
1434 goto err; 1434 goto err;
1435 /*reduce the timing bandwith for high SR*/ 1435 /*reduce the timing bandwidth for high SR*/
1436 if (STV090x_WRITE_DEMOD(state, RTCS2, 0x44) < 0) 1436 if (STV090x_WRITE_DEMOD(state, RTCS2, 0x44) < 0)
1437 goto err; 1437 goto err;
1438 } 1438 }
1439 } else { 1439 } else {
1440 /* >= Cut 3 */ 1440 /* >= Cut 3 */
1441 if (state->srate <= 5000000) { 1441 if (state->srate <= 5000000) {
1442 /* enlarge the timing bandwith for Low SR */ 1442 /* enlarge the timing bandwidth for Low SR */
1443 STV090x_WRITE_DEMOD(state, RTCS2, 0x68); 1443 STV090x_WRITE_DEMOD(state, RTCS2, 0x68);
1444 } else { 1444 } else {
1445 /* reduce timing bandwith for high SR */ 1445 /* reduce timing bandwidth for high SR */
1446 STV090x_WRITE_DEMOD(state, RTCS2, 0x44); 1446 STV090x_WRITE_DEMOD(state, RTCS2, 0x44);
1447 } 1447 }
1448 1448
@@ -2482,7 +2482,7 @@ static int stv090x_sw_algo(struct stv090x_state *state)
2482 dvbs2_fly_wheel = STV090x_GETFIELD_Px(reg, FLYWHEEL_CPT_FIELD); 2482 dvbs2_fly_wheel = STV090x_GETFIELD_Px(reg, FLYWHEEL_CPT_FIELD);
2483 } 2483 }
2484 if (dvbs2_fly_wheel < 0xd) { 2484 if (dvbs2_fly_wheel < 0xd) {
2485 /*FALSE lock, The demod is loosing lock */ 2485 /*FALSE lock, The demod is losing lock */
2486 lock = 0; 2486 lock = 0;
2487 if (trials < 2) { 2487 if (trials < 2) {
2488 if (state->internal->dev_ver >= 0x20) { 2488 if (state->internal->dev_ver >= 0x20) {
@@ -3202,7 +3202,7 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state)
3202 goto err; 3202 goto err;
3203 if (STV090x_WRITE_DEMOD(state, CORRELMANT, 0x70) < 0) 3203 if (STV090x_WRITE_DEMOD(state, CORRELMANT, 0x70) < 0)
3204 goto err; 3204 goto err;
3205 if (stv090x_set_srate(state, 1000000) < 0) /* inital srate = 1Msps */ 3205 if (stv090x_set_srate(state, 1000000) < 0) /* initial srate = 1Msps */
3206 goto err; 3206 goto err;
3207 } else { 3207 } else {
3208 /* known srate */ 3208 /* known srate */
diff --git a/drivers/media/dvb/mantis/mantis_uart.c b/drivers/media/dvb/mantis/mantis_uart.c
index 97b889e8a341..f807c8ba26e4 100644
--- a/drivers/media/dvb/mantis/mantis_uart.c
+++ b/drivers/media/dvb/mantis/mantis_uart.c
@@ -172,7 +172,7 @@ int mantis_uart_init(struct mantis_pci *mantis)
172 mmwrite(mmread(MANTIS_UART_CTL) | MANTIS_UART_RXINT, MANTIS_UART_CTL); 172 mmwrite(mmread(MANTIS_UART_CTL) | MANTIS_UART_RXINT, MANTIS_UART_CTL);
173 173
174 schedule_work(&mantis->uart_work); 174 schedule_work(&mantis->uart_work);
175 dprintk(MANTIS_DEBUG, 1, "UART succesfully initialized"); 175 dprintk(MANTIS_DEBUG, 1, "UART successfully initialized");
176 176
177 return 0; 177 return 0;
178} 178}
diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/dvb/ngene/ngene-core.c
index 175a0f6c2a4c..ccc2d1af49d4 100644
--- a/drivers/media/dvb/ngene/ngene-core.c
+++ b/drivers/media/dvb/ngene/ngene-core.c
@@ -122,7 +122,7 @@ static void demux_tasklet(unsigned long data)
122 Cur->ngeneBuffer.SR.Flags &= 122 Cur->ngeneBuffer.SR.Flags &=
123 ~0x40; 123 ~0x40;
124 break; 124 break;
125 /* Stop proccessing stream */ 125 /* Stop processing stream */
126 } 126 }
127 } else { 127 } else {
128 /* We got a valid buffer, 128 /* We got a valid buffer,
@@ -133,7 +133,7 @@ static void demux_tasklet(unsigned long data)
133 printk(KERN_ERR DEVICE_NAME ": OOPS\n"); 133 printk(KERN_ERR DEVICE_NAME ": OOPS\n");
134 if (chan->HWState == HWSTATE_RUN) { 134 if (chan->HWState == HWSTATE_RUN) {
135 Cur->ngeneBuffer.SR.Flags &= ~0x40; 135 Cur->ngeneBuffer.SR.Flags &= ~0x40;
136 break; /* Stop proccessing stream */ 136 break; /* Stop processing stream */
137 } 137 }
138 } 138 }
139 if (chan->AudioDTOUpdated) { 139 if (chan->AudioDTOUpdated) {
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c
index 6ca6713d527a..7cb79ec685f0 100644
--- a/drivers/media/dvb/pluto2/pluto2.c
+++ b/drivers/media/dvb/pluto2/pluto2.c
@@ -294,13 +294,13 @@ static void pluto_dma_end(struct pluto *pluto, unsigned int nbpackets)
294 294
295 /* Workaround for broken hardware: 295 /* Workaround for broken hardware:
296 * [1] On startup NBPACKETS seems to contain an uninitialized value, 296 * [1] On startup NBPACKETS seems to contain an uninitialized value,
297 * but no packets have been transfered. 297 * but no packets have been transferred.
298 * [2] Sometimes (actually very often) NBPACKETS stays at zero 298 * [2] Sometimes (actually very often) NBPACKETS stays at zero
299 * although one packet has been transfered. 299 * although one packet has been transferred.
300 * [3] Sometimes (actually rarely), the card gets into an erroneous 300 * [3] Sometimes (actually rarely), the card gets into an erroneous
301 * mode where it continuously generates interrupts, claiming it 301 * mode where it continuously generates interrupts, claiming it
302 * has recieved nbpackets>TS_DMA_PACKETS packets, but no packet 302 * has received nbpackets>TS_DMA_PACKETS packets, but no packet
303 * has been transfered. Only a reset seems to solve this 303 * has been transferred. Only a reset seems to solve this
304 */ 304 */
305 if ((nbpackets == 0) || (nbpackets > TS_DMA_PACKETS)) { 305 if ((nbpackets == 0) || (nbpackets > TS_DMA_PACKETS)) {
306 unsigned int i = 0; 306 unsigned int i = 0;
@@ -332,7 +332,7 @@ static irqreturn_t pluto_irq(int irq, void *dev_id)
332 struct pluto *pluto = dev_id; 332 struct pluto *pluto = dev_id;
333 u32 tscr; 333 u32 tscr;
334 334
335 /* check whether an interrupt occured on this device */ 335 /* check whether an interrupt occurred on this device */
336 tscr = pluto_readreg(pluto, REG_TSCR); 336 tscr = pluto_readreg(pluto, REG_TSCR);
337 if (!(tscr & (TSCR_DE | TSCR_OVR))) 337 if (!(tscr & (TSCR_DE | TSCR_OVR)))
338 return IRQ_NONE; 338 return IRQ_NONE;
diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c
index b80d09b035a1..37c594f82782 100644
--- a/drivers/media/dvb/siano/smsdvb.c
+++ b/drivers/media/dvb/siano/smsdvb.c
@@ -650,7 +650,7 @@ static int smsdvb_dvbt_set_frontend(struct dvb_frontend *fe,
650 if (status & FE_HAS_LOCK) 650 if (status & FE_HAS_LOCK)
651 return ret; 651 return ret;
652 652
653 /* previous tune didnt lock - enable LNA and tune again */ 653 /* previous tune didn't lock - enable LNA and tune again */
654 sms_board_lna_control(client->coredev, 1); 654 sms_board_lna_control(client->coredev, 1);
655 } 655 }
656 656
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index fc0a60f8a1e1..3d20719fce1a 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -2332,7 +2332,7 @@ static int frontend_init(struct av7110 *av7110)
2332 * increment. That's how the 7146 is programmed to do event 2332 * increment. That's how the 7146 is programmed to do event
2333 * counting in this budget-patch.c 2333 * counting in this budget-patch.c
2334 * I *think* HPS setting has something to do with the phase 2334 * I *think* HPS setting has something to do with the phase
2335 * of HS but I cant be 100% sure in that. 2335 * of HS but I can't be 100% sure in that.
2336 * 2336 *
2337 * hardware debug note: a working budget card (including budget patch) 2337 * hardware debug note: a working budget card (including budget patch)
2338 * with vpeirq() interrupt setup in mode "0x90" (every 64K) will 2338 * with vpeirq() interrupt setup in mode "0x90" (every 64K) will
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c
index 579835590690..3395d1a90516 100644
--- a/drivers/media/dvb/ttpci/budget-patch.c
+++ b/drivers/media/dvb/ttpci/budget-patch.c
@@ -539,7 +539,7 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
539** increment. That's how the 7146 is programmed to do event 539** increment. That's how the 7146 is programmed to do event
540** counting in this budget-patch.c 540** counting in this budget-patch.c
541** I *think* HPS setting has something to do with the phase 541** I *think* HPS setting has something to do with the phase
542** of HS but I cant be 100% sure in that. 542** of HS but I can't be 100% sure in that.
543 543
544** hardware debug note: a working budget card (including budget patch) 544** hardware debug note: a working budget card (including budget patch)
545** with vpeirq() interrupt setup in mode "0x90" (every 64K) will 545** with vpeirq() interrupt setup in mode "0x90" (every 64K) will
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index fe1b8037b247..f893bffa08a3 100644
--- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -234,7 +234,7 @@ static void ttusb_dec_handle_irq( struct urb *urb)
234 * (with buffer[3] == 0x40) in an intervall of ~100ms. 234 * (with buffer[3] == 0x40) in an intervall of ~100ms.
235 * But to handle this correctly we had to imlemenent some 235 * But to handle this correctly we had to imlemenent some
236 * kind of timer which signals a 'key up' event if no 236 * kind of timer which signals a 'key up' event if no
237 * keyrepeat signal is recieved for lets say 200ms. 237 * keyrepeat signal is received for lets say 200ms.
238 * this should/could be added later ... 238 * this should/could be added later ...
239 * for now lets report each signal as a key down and up*/ 239 * for now lets report each signal as a key down and up*/
240 dprintk("%s:rc signal:%d\n", __func__, buffer[4]); 240 dprintk("%s:rc signal:%d\n", __func__, buffer[4]);
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c
index e6b2d085a449..b3a635b95820 100644
--- a/drivers/media/radio/radio-mr800.c
+++ b/drivers/media/radio/radio-mr800.c
@@ -99,7 +99,7 @@ devices, that would be 76 and 91. */
99 99
100/* 100/*
101 * Commands that device should understand 101 * Commands that device should understand
102 * List isnt full and will be updated with implementation of new functions 102 * List isn't full and will be updated with implementation of new functions
103 */ 103 */
104#define AMRADIO_SET_FREQ 0xa4 104#define AMRADIO_SET_FREQ 0xa4
105#define AMRADIO_SET_MUTE 0xab 105#define AMRADIO_SET_MUTE 0xab
diff --git a/drivers/media/radio/si4713-i2c.c b/drivers/media/radio/si4713-i2c.c
index 0fab6f8f7e24..deca2e06ff22 100644
--- a/drivers/media/radio/si4713-i2c.c
+++ b/drivers/media/radio/si4713-i2c.c
@@ -481,7 +481,7 @@ unlock:
481} 481}
482 482
483/* 483/*
484 * si4713_wait_stc - Waits STC interrupt and clears status bits. Usefull 484 * si4713_wait_stc - Waits STC interrupt and clears status bits. Useful
485 * for TX_TUNE_POWER, TX_TUNE_FREQ and TX_TUNE_MEAS 485 * for TX_TUNE_POWER, TX_TUNE_FREQ and TX_TUNE_MEAS
486 * @sdev: si4713_device structure for the device we are communicating 486 * @sdev: si4713_device structure for the device we are communicating
487 * @usecs: timeout to wait for STC interrupt signal 487 * @usecs: timeout to wait for STC interrupt signal
diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
index ecfd9fb167d8..5991ab60303d 100644
--- a/drivers/media/radio/wl128x/fmdrv_common.c
+++ b/drivers/media/radio/wl128x/fmdrv_common.c
@@ -352,7 +352,7 @@ static void send_tasklet(unsigned long arg)
352 if (!atomic_read(&fmdev->tx_cnt)) 352 if (!atomic_read(&fmdev->tx_cnt))
353 return; 353 return;
354 354
355 /* Check, is there any timeout happenned to last transmitted packet */ 355 /* Check, is there any timeout happened to last transmitted packet */
356 if ((jiffies - fmdev->last_tx_jiffies) > FM_DRV_TX_TIMEOUT) { 356 if ((jiffies - fmdev->last_tx_jiffies) > FM_DRV_TX_TIMEOUT) {
357 fmerr("TX timeout occurred\n"); 357 fmerr("TX timeout occurred\n");
358 atomic_set(&fmdev->tx_cnt, 1); 358 atomic_set(&fmdev->tx_cnt, 1);
@@ -478,7 +478,7 @@ u32 fmc_send_cmd(struct fmdev *fmdev, u8 fm_op, u16 type, void *payload,
478 return -ETIMEDOUT; 478 return -ETIMEDOUT;
479 } 479 }
480 if (!fmdev->resp_skb) { 480 if (!fmdev->resp_skb) {
481 fmerr("Reponse SKB is missing\n"); 481 fmerr("Response SKB is missing\n");
482 return -EFAULT; 482 return -EFAULT;
483 } 483 }
484 spin_lock_irqsave(&fmdev->resp_skb_lock, flags); 484 spin_lock_irqsave(&fmdev->resp_skb_lock, flags);
@@ -1598,7 +1598,7 @@ u32 fmc_release(struct fmdev *fmdev)
1598 fmdbg("FM Core is already down\n"); 1598 fmdbg("FM Core is already down\n");
1599 return 0; 1599 return 0;
1600 } 1600 }
1601 /* Sevice pending read */ 1601 /* Service pending read */
1602 wake_up_interruptible(&fmdev->rx.rds.read_queue); 1602 wake_up_interruptible(&fmdev->rx.rds.read_queue);
1603 1603
1604 tasklet_kill(&fmdev->tx_task); 1604 tasklet_kill(&fmdev->tx_task);
diff --git a/drivers/media/radio/wl128x/fmdrv_common.h b/drivers/media/radio/wl128x/fmdrv_common.h
index 427c4164cece..aee243bb6630 100644
--- a/drivers/media/radio/wl128x/fmdrv_common.h
+++ b/drivers/media/radio/wl128x/fmdrv_common.h
@@ -362,7 +362,7 @@ struct fm_event_msg_hdr {
362#define FM_TX_PREEMPH_50US 0 362#define FM_TX_PREEMPH_50US 0
363#define FM_TX_PREEMPH_75US 2 363#define FM_TX_PREEMPH_75US 2
364 364
365/* FM TX antenna impedence values */ 365/* FM TX antenna impedance values */
366#define FM_TX_ANT_IMP_50 0 366#define FM_TX_ANT_IMP_50 0
367#define FM_TX_ANT_IMP_200 1 367#define FM_TX_ANT_IMP_200 1
368#define FM_TX_ANT_IMP_500 2 368#define FM_TX_ANT_IMP_500 2
diff --git a/drivers/media/rc/ene_ir.c b/drivers/media/rc/ene_ir.c
index 1ac49139158d..a43ed6c41bfc 100644
--- a/drivers/media/rc/ene_ir.c
+++ b/drivers/media/rc/ene_ir.c
@@ -520,7 +520,7 @@ static void ene_rx_disable(struct ene_device *dev)
520 dev->rx_enabled = false; 520 dev->rx_enabled = false;
521} 521}
522 522
523/* This resets the receiver. Usefull to stop stream of spaces at end of 523/* This resets the receiver. Useful to stop stream of spaces at end of
524 * transmission 524 * transmission
525 */ 525 */
526static void ene_rx_reset(struct ene_device *dev) 526static void ene_rx_reset(struct ene_device *dev)
@@ -1089,7 +1089,7 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
1089 if (error < 0) 1089 if (error < 0)
1090 goto error; 1090 goto error;
1091 1091
1092 ene_notice("driver has been succesfully loaded"); 1092 ene_notice("driver has been successfully loaded");
1093 return 0; 1093 return 0;
1094error: 1094error:
1095 if (dev && dev->irq >= 0) 1095 if (dev && dev->irq >= 0)
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index f714e1a22c92..ebd68edf5b24 100644
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -1293,7 +1293,7 @@ static void imon_pad_to_keys(struct imon_context *ictx, unsigned char *buf)
1293 * contain a position coordinate (x,y), with each component ranging 1293 * contain a position coordinate (x,y), with each component ranging
1294 * from -14 to 14. We want to down-sample this to only 4 discrete values 1294 * from -14 to 14. We want to down-sample this to only 4 discrete values
1295 * for up/down/left/right arrow keys. Also, when you get too close to 1295 * for up/down/left/right arrow keys. Also, when you get too close to
1296 * diagonals, it has a tendancy to jump back and forth, so lets try to 1296 * diagonals, it has a tendency to jump back and forth, so lets try to
1297 * ignore when they get too close. 1297 * ignore when they get too close.
1298 */ 1298 */
1299 if (ictx->product != 0xffdc) { 1299 if (ictx->product != 0xffdc) {
diff --git a/drivers/media/rc/ir-raw.c b/drivers/media/rc/ir-raw.c
index 01f258a2a57a..11c19d8d0ee0 100644
--- a/drivers/media/rc/ir-raw.c
+++ b/drivers/media/rc/ir-raw.c
@@ -153,7 +153,7 @@ EXPORT_SYMBOL_GPL(ir_raw_event_store_edge);
153 * @type: the type of the event that has occurred 153 * @type: the type of the event that has occurred
154 * 154 *
155 * This routine (which may be called from an interrupt context) works 155 * This routine (which may be called from an interrupt context) works
156 * in similiar manner to ir_raw_event_store_edge. 156 * in similar manner to ir_raw_event_store_edge.
157 * This routine is intended for devices with limited internal buffer 157 * This routine is intended for devices with limited internal buffer
158 * It automerges samples of same type, and handles timeouts 158 * It automerges samples of same type, and handles timeouts
159 */ 159 */
diff --git a/drivers/media/rc/keymaps/rc-lme2510.c b/drivers/media/rc/keymaps/rc-lme2510.c
index 3c1913926c1a..afae14fd152e 100644
--- a/drivers/media/rc/keymaps/rc-lme2510.c
+++ b/drivers/media/rc/keymaps/rc-lme2510.c
@@ -55,7 +55,7 @@ static struct rc_map_table lme2510_rc[] = {
55 { 0xff40fb04, KEY_MEDIA_REPEAT}, /* Recall */ 55 { 0xff40fb04, KEY_MEDIA_REPEAT}, /* Recall */
56 { 0xff40e51a, KEY_PAUSE }, /* Timeshift */ 56 { 0xff40e51a, KEY_PAUSE }, /* Timeshift */
57 { 0xff40fd02, KEY_VOLUMEUP }, /* 2 x -/+ Keys not marked */ 57 { 0xff40fd02, KEY_VOLUMEUP }, /* 2 x -/+ Keys not marked */
58 { 0xff40f906, KEY_VOLUMEDOWN }, /* Volumne defined as right hand*/ 58 { 0xff40f906, KEY_VOLUMEDOWN }, /* Volume defined as right hand*/
59 { 0xff40fe01, KEY_CHANNELUP }, 59 { 0xff40fe01, KEY_CHANNELUP },
60 { 0xff40fa05, KEY_CHANNELDOWN }, 60 { 0xff40fa05, KEY_CHANNELDOWN },
61 { 0xff40eb14, KEY_ZOOM }, 61 { 0xff40eb14, KEY_ZOOM },
@@ -76,7 +76,7 @@ static struct rc_map_table lme2510_rc[] = {
76 { 0xff00bb44, KEY_MEDIA_REPEAT}, /* Recall */ 76 { 0xff00bb44, KEY_MEDIA_REPEAT}, /* Recall */
77 { 0xff00b54a, KEY_PAUSE }, /* Timeshift */ 77 { 0xff00b54a, KEY_PAUSE }, /* Timeshift */
78 { 0xff00b847, KEY_VOLUMEUP }, /* 2 x -/+ Keys not marked */ 78 { 0xff00b847, KEY_VOLUMEUP }, /* 2 x -/+ Keys not marked */
79 { 0xff00bc43, KEY_VOLUMEDOWN }, /* Volumne defined as right hand*/ 79 { 0xff00bc43, KEY_VOLUMEDOWN }, /* Volume defined as right hand*/
80 { 0xff00b946, KEY_CHANNELUP }, 80 { 0xff00b946, KEY_CHANNELUP },
81 { 0xff00bf40, KEY_CHANNELDOWN }, 81 { 0xff00bf40, KEY_CHANNELDOWN },
82 { 0xff00f708, KEY_ZOOM }, 82 { 0xff00f708, KEY_ZOOM },
diff --git a/drivers/media/rc/keymaps/rc-msi-tvanywhere.c b/drivers/media/rc/keymaps/rc-msi-tvanywhere.c
index 18b37facb0dd..fdd213ff1adf 100644
--- a/drivers/media/rc/keymaps/rc-msi-tvanywhere.c
+++ b/drivers/media/rc/keymaps/rc-msi-tvanywhere.c
@@ -29,7 +29,7 @@ static struct rc_map_table msi_tvanywhere[] = {
29 29
30 { 0x0c, KEY_MUTE }, 30 { 0x0c, KEY_MUTE },
31 { 0x0f, KEY_SCREEN }, /* Full Screen */ 31 { 0x0f, KEY_SCREEN }, /* Full Screen */
32 { 0x10, KEY_FN }, /* Funtion */ 32 { 0x10, KEY_FN }, /* Function */
33 { 0x11, KEY_TIME }, /* Time shift */ 33 { 0x11, KEY_TIME }, /* Time shift */
34 { 0x12, KEY_POWER }, 34 { 0x12, KEY_POWER },
35 { 0x13, KEY_MEDIA }, /* MTS */ 35 { 0x13, KEY_MEDIA }, /* MTS */
diff --git a/drivers/media/rc/keymaps/rc-norwood.c b/drivers/media/rc/keymaps/rc-norwood.c
index f1c1281fbc17..f9f2fa2819b8 100644
--- a/drivers/media/rc/keymaps/rc-norwood.c
+++ b/drivers/media/rc/keymaps/rc-norwood.c
@@ -49,7 +49,7 @@ static struct rc_map_table norwood[] = {
49 { 0x37, KEY_PLAY }, /* Play */ 49 { 0x37, KEY_PLAY }, /* Play */
50 { 0x36, KEY_PAUSE }, /* Pause */ 50 { 0x36, KEY_PAUSE }, /* Pause */
51 { 0x2b, KEY_STOP }, /* Stop */ 51 { 0x2b, KEY_STOP }, /* Stop */
52 { 0x67, KEY_FASTFORWARD }, /* Foward */ 52 { 0x67, KEY_FASTFORWARD }, /* Forward */
53 { 0x66, KEY_REWIND }, /* Rewind */ 53 { 0x66, KEY_REWIND }, /* Rewind */
54 { 0x3e, KEY_SEARCH }, /* Auto Scan */ 54 { 0x3e, KEY_SEARCH }, /* Auto Scan */
55 { 0x2e, KEY_CAMERA }, /* Capture Video */ 55 { 0x2e, KEY_CAMERA }, /* Capture Video */
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 5ac1baf45c8e..f53f9c68d38d 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -255,7 +255,7 @@ static unsigned int ir_update_mapping(struct rc_dev *dev,
255 * @rc_map: scancode table to be searched 255 * @rc_map: scancode table to be searched
256 * @scancode: the desired scancode 256 * @scancode: the desired scancode
257 * @resize: controls whether we allowed to resize the table to 257 * @resize: controls whether we allowed to resize the table to
258 * accomodate not yet present scancodes 258 * accommodate not yet present scancodes
259 * @return: index of the mapping containing scancode in question 259 * @return: index of the mapping containing scancode in question
260 * or -1U in case of failure. 260 * or -1U in case of failure.
261 * 261 *
@@ -1037,7 +1037,7 @@ int rc_register_device(struct rc_dev *dev)
1037 goto out_table; 1037 goto out_table;
1038 1038
1039 /* 1039 /*
1040 * Default delay of 250ms is too short for some protocols, expecially 1040 * Default delay of 250ms is too short for some protocols, especially
1041 * since the timeout is currently set to 250ms. Increase it to 500ms, 1041 * since the timeout is currently set to 250ms. Increase it to 500ms,
1042 * to avoid wrong repetition of the keycodes. Note that this must be 1042 * to avoid wrong repetition of the keycodes. Note that this must be
1043 * set after the call to input_register_device(). 1043 * set after the call to input_register_device().
diff --git a/drivers/media/video/au0828/au0828-video.c b/drivers/media/video/au0828/au0828-video.c
index 6ad83a15d073..c03eb29a9ee6 100644
--- a/drivers/media/video/au0828/au0828-video.c
+++ b/drivers/media/video/au0828/au0828-video.c
@@ -502,7 +502,7 @@ static inline void vbi_get_next_buf(struct au0828_dmaqueue *dma_q,
502 502
503 /* Get the next buffer */ 503 /* Get the next buffer */
504 *buf = list_entry(dma_q->active.next, struct au0828_buffer, vb.queue); 504 *buf = list_entry(dma_q->active.next, struct au0828_buffer, vb.queue);
505 /* Cleans up buffer - Usefull for testing for frame/URB loss */ 505 /* Cleans up buffer - Useful for testing for frame/URB loss */
506 outp = videobuf_to_vmalloc(&(*buf)->vb); 506 outp = videobuf_to_vmalloc(&(*buf)->vb);
507 memset(outp, 0x00, (*buf)->vb.size); 507 memset(outp, 0x00, (*buf)->vb.size);
508 508
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 242f0d512238..3c9e6c7e7b52 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -2244,8 +2244,8 @@ struct tvcard bttv_tvcards[] = {
2244 }, 2244 },
2245 [BTTV_BOARD_PICOLO_TETRA_CHIP] = { 2245 [BTTV_BOARD_PICOLO_TETRA_CHIP] = {
2246 /*Eric DEBIEF <debief@telemsa.com>*/ 2246 /*Eric DEBIEF <debief@telemsa.com>*/
2247 /*EURESYS Picolo Tetra : 4 Conexant Fusion 878A, no audio, video input set with analog multiplexers GPIO controled*/ 2247 /*EURESYS Picolo Tetra : 4 Conexant Fusion 878A, no audio, video input set with analog multiplexers GPIO controlled*/
2248 /* adds picolo_tetra_muxsel(), picolo_tetra_init(), the folowing declaration strucure, and #define BTTV_BOARD_PICOLO_TETRA_CHIP*/ 2248 /* adds picolo_tetra_muxsel(), picolo_tetra_init(), the following declaration strucure, and #define BTTV_BOARD_PICOLO_TETRA_CHIP*/
2249 /*0x79 in bttv.h*/ 2249 /*0x79 in bttv.h*/
2250 .name = "Euresys Picolo Tetra", 2250 .name = "Euresys Picolo Tetra",
2251 .video_inputs = 4, 2251 .video_inputs = 4,
@@ -4567,7 +4567,7 @@ static void picolo_tetra_muxsel (struct bttv* btv, unsigned int input)
4567 * at one input while the monitor is looking at another. 4567 * at one input while the monitor is looking at another.
4568 * 4568 *
4569 * Since I've couldn't be bothered figuring out how to add an 4569 * Since I've couldn't be bothered figuring out how to add an
4570 * independant muxsel for the monitor bus, I've just set it to 4570 * independent muxsel for the monitor bus, I've just set it to
4571 * whatever the card is looking at. 4571 * whatever the card is looking at.
4572 * 4572 *
4573 * OUT0 of the TDA8540's is connected to MUX0 (0x03) 4573 * OUT0 of the TDA8540's is connected to MUX0 (0x03)
diff --git a/drivers/media/video/bt8xx/bttv-gpio.c b/drivers/media/video/bt8xx/bttv-gpio.c
index fd604d32bbb9..13ce72c04b33 100644
--- a/drivers/media/video/bt8xx/bttv-gpio.c
+++ b/drivers/media/video/bt8xx/bttv-gpio.c
@@ -3,7 +3,7 @@
3 bttv-gpio.c -- gpio sub drivers 3 bttv-gpio.c -- gpio sub drivers
4 4
5 sysfs-based sub driver interface for bttv 5 sysfs-based sub driver interface for bttv
6 mainly intented for gpio access 6 mainly intended for gpio access
7 7
8 8
9 Copyright (C) 1996,97,98 Ralph Metzler (rjkm@thp.uni-koeln.de) 9 Copyright (C) 1996,97,98 Ralph Metzler (rjkm@thp.uni-koeln.de)
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index 55ffd60ffa7f..664703398493 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -383,7 +383,7 @@ static int cafe_smbus_write_data(struct cafe_camera *cam,
383 * causes the device to die. 383 * causes the device to die.
384 * Use a busy-wait because we often send a large quantity of small 384 * Use a busy-wait because we often send a large quantity of small
385 * commands at-once; using msleep() would cause a lot of context 385 * commands at-once; using msleep() would cause a lot of context
386 * switches which take longer than 2ms, resulting in a noticable 386 * switches which take longer than 2ms, resulting in a noticeable
387 * boot-time and capture-start delays. 387 * boot-time and capture-start delays.
388 */ 388 */
389 mdelay(2); 389 mdelay(2);
diff --git a/drivers/media/video/cx18/cx18-av-core.h b/drivers/media/video/cx18/cx18-av-core.h
index 188c9c3d2db1..e9c69d9c9e4a 100644
--- a/drivers/media/video/cx18/cx18-av-core.h
+++ b/drivers/media/video/cx18/cx18-av-core.h
@@ -109,7 +109,7 @@ struct cx18_av_state {
109 int is_initialized; 109 int is_initialized;
110 110
111 /* 111 /*
112 * The VBI slicer starts operating and counting lines, begining at 112 * The VBI slicer starts operating and counting lines, beginning at
113 * slicer line count of 1, at D lines after the deassertion of VRESET. 113 * slicer line count of 1, at D lines after the deassertion of VRESET.
114 * This staring field line, S, is 6 (& 319) or 10 (& 273) for 625 or 525 114 * This staring field line, S, is 6 (& 319) or 10 (& 273) for 625 or 525
115 * line systems respectively. Sliced ancillary data captured on VBI 115 * line systems respectively. Sliced ancillary data captured on VBI
diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c
index 86c30b9963e5..4f041c033c54 100644
--- a/drivers/media/video/cx18/cx18-ioctl.c
+++ b/drivers/media/video/cx18/cx18-ioctl.c
@@ -312,7 +312,7 @@ static int cx18_s_fmt_vbi_cap(struct file *file, void *fh,
312 312
313 /* 313 /*
314 * Set the digitizer registers for raw active VBI. 314 * Set the digitizer registers for raw active VBI.
315 * Note cx18_av_vbi_wipes out alot of the passed in fmt under valid 315 * Note cx18_av_vbi_wipes out a lot of the passed in fmt under valid
316 * calling conditions 316 * calling conditions
317 */ 317 */
318 ret = v4l2_subdev_call(cx->sd_av, vbi, s_raw_fmt, &fmt->fmt.vbi); 318 ret = v4l2_subdev_call(cx->sd_av, vbi, s_raw_fmt, &fmt->fmt.vbi);
diff --git a/drivers/media/video/cx18/cx18-vbi.c b/drivers/media/video/cx18/cx18-vbi.c
index 582227522cf0..6d3121ff45a2 100644
--- a/drivers/media/video/cx18/cx18-vbi.c
+++ b/drivers/media/video/cx18/cx18-vbi.c
@@ -29,7 +29,7 @@
29/* 29/*
30 * Raster Reference/Protection (RP) bytes, used in Start/End Active 30 * Raster Reference/Protection (RP) bytes, used in Start/End Active
31 * Video codes emitted from the digitzer in VIP 1.x mode, that flag the start 31 * Video codes emitted from the digitzer in VIP 1.x mode, that flag the start
32 * of VBI sample or VBI ancilliary data regions in the digitial ratser line. 32 * of VBI sample or VBI ancillary data regions in the digitial ratser line.
33 * 33 *
34 * Task FieldEven VerticalBlank HorizontalBlank 0 0 0 0 34 * Task FieldEven VerticalBlank HorizontalBlank 0 0 0 0
35 */ 35 */
diff --git a/drivers/media/video/cx231xx/cx231xx-avcore.c b/drivers/media/video/cx231xx/cx231xx-avcore.c
index 62843d39817c..280df43ca446 100644
--- a/drivers/media/video/cx231xx/cx231xx-avcore.c
+++ b/drivers/media/video/cx231xx/cx231xx-avcore.c
@@ -2577,7 +2577,7 @@ int cx231xx_initialize_stream_xfer(struct cx231xx *dev, u32 media_type)
2577 break; 2577 break;
2578 2578
2579 case 6: /* ts1 parallel mode */ 2579 case 6: /* ts1 parallel mode */
2580 cx231xx_info("%s: set ts1 parrallel mode registers\n", 2580 cx231xx_info("%s: set ts1 parallel mode registers\n",
2581 __func__); 2581 __func__);
2582 status = cx231xx_mode_register(dev, TS_MODE_REG, 0x100); 2582 status = cx231xx_mode_register(dev, TS_MODE_REG, 0x100);
2583 status = cx231xx_mode_register(dev, TS1_CFG_REG, 0x400); 2583 status = cx231xx_mode_register(dev, TS1_CFG_REG, 0x400);
diff --git a/drivers/media/video/cx231xx/cx231xx-vbi.c b/drivers/media/video/cx231xx/cx231xx-vbi.c
index 1d914488dbb3..1c7a4daafecf 100644
--- a/drivers/media/video/cx231xx/cx231xx-vbi.c
+++ b/drivers/media/video/cx231xx/cx231xx-vbi.c
@@ -631,7 +631,7 @@ static inline void get_next_vbi_buf(struct cx231xx_dmaqueue *dma_q,
631 /* Get the next buffer */ 631 /* Get the next buffer */
632 *buf = list_entry(dma_q->active.next, struct cx231xx_buffer, vb.queue); 632 *buf = list_entry(dma_q->active.next, struct cx231xx_buffer, vb.queue);
633 633
634 /* Cleans up buffer - Usefull for testing for frame/URB loss */ 634 /* Cleans up buffer - Useful for testing for frame/URB loss */
635 outp = videobuf_to_vmalloc(&(*buf)->vb); 635 outp = videobuf_to_vmalloc(&(*buf)->vb);
636 memset(outp, 0, (*buf)->vb.size); 636 memset(outp, 0, (*buf)->vb.size);
637 637
diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c
index ffd5af914c44..a69c24d8db06 100644
--- a/drivers/media/video/cx231xx/cx231xx-video.c
+++ b/drivers/media/video/cx231xx/cx231xx-video.c
@@ -309,7 +309,7 @@ static inline void get_next_buf(struct cx231xx_dmaqueue *dma_q,
309 /* Get the next buffer */ 309 /* Get the next buffer */
310 *buf = list_entry(dma_q->active.next, struct cx231xx_buffer, vb.queue); 310 *buf = list_entry(dma_q->active.next, struct cx231xx_buffer, vb.queue);
311 311
312 /* Cleans up buffer - Usefull for testing for frame/URB loss */ 312 /* Cleans up buffer - Useful for testing for frame/URB loss */
313 outp = videobuf_to_vmalloc(&(*buf)->vb); 313 outp = videobuf_to_vmalloc(&(*buf)->vb);
314 memset(outp, 0, (*buf)->vb.size); 314 memset(outp, 0, (*buf)->vb.size);
315 315
diff --git a/drivers/media/video/cx23885/cimax2.c b/drivers/media/video/cx23885/cimax2.c
index 209b971bd267..c9f15d6dec40 100644
--- a/drivers/media/video/cx23885/cimax2.c
+++ b/drivers/media/video/cx23885/cimax2.c
@@ -449,7 +449,7 @@ int netup_ci_init(struct cx23885_tsport *port)
449 0x04, /* ack active low */ 449 0x04, /* ack active low */
450 0x00, /* LOCK = 0 */ 450 0x00, /* LOCK = 0 */
451 0x33, /* serial mode, rising in, rising out, MSB first*/ 451 0x33, /* serial mode, rising in, rising out, MSB first*/
452 0x31, /* syncronization */ 452 0x31, /* synchronization */
453 }; 453 };
454 int ret; 454 int ret;
455 455
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 8db2797bc7c3..c186473fc570 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -214,7 +214,7 @@ struct cx23885_board {
214 214
215 /* Vendors can and do run the PCIe bridge at different 215 /* Vendors can and do run the PCIe bridge at different
216 * clock rates, driven physically by crystals on the PCBs. 216 * clock rates, driven physically by crystals on the PCBs.
217 * The core has to accomodate this. This allows the user 217 * The core has to accommodate this. This allows the user
218 * to add new boards with new frequencys. The value is 218 * to add new boards with new frequencys. The value is
219 * expressed in Hz. 219 * expressed in Hz.
220 * 220 *
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 35796e035247..b7ee2ae70583 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -2,7 +2,7 @@
2 * 2 *
3 * Copyright (C) 2004 Ulf Eklund 3 * Copyright (C) 2004 Ulf Eklund
4 * 4 *
5 * Based on the saa7115 driver and on the first verison of Chris Kennedy's 5 * Based on the saa7115 driver and on the first version of Chris Kennedy's
6 * cx25840 driver. 6 * cx25840 driver.
7 * 7 *
8 * Changes by Tyler Trafford <tatrafford@comcast.net> 8 * Changes by Tyler Trafford <tatrafford@comcast.net>
@@ -445,7 +445,7 @@ static void cx25840_initialize(struct i2c_client *client)
445 cx25840_write(client, 0x918, 0xa0); 445 cx25840_write(client, 0x918, 0xa0);
446 cx25840_write(client, 0x919, 0x01); 446 cx25840_write(client, 0x919, 0x01);
447 447
448 /* stereo prefered */ 448 /* stereo preferred */
449 cx25840_write(client, 0x809, 0x04); 449 cx25840_write(client, 0x809, 0x04);
450 /* AC97 shift */ 450 /* AC97 shift */
451 cx25840_write(client, 0x8cf, 0x0f); 451 cx25840_write(client, 0x8cf, 0x0f);
@@ -546,7 +546,7 @@ static void cx23885_initialize(struct i2c_client *client)
546 * Aux PLL 546 * Aux PLL
547 * Initial setup for audio sample clock: 547 * Initial setup for audio sample clock:
548 * 48 ksps, 16 bits/sample, x160 multiplier = 122.88 MHz 548 * 48 ksps, 16 bits/sample, x160 multiplier = 122.88 MHz
549 * Intial I2S output/master clock(?): 549 * Initial I2S output/master clock(?):
550 * 48 ksps, 16 bits/sample, x16 multiplier = 12.288 MHz 550 * 48 ksps, 16 bits/sample, x16 multiplier = 12.288 MHz
551 */ 551 */
552 switch (state->id) { 552 switch (state->id) {
@@ -903,7 +903,7 @@ static void input_change(struct i2c_client *client)
903 } else if (std & V4L2_STD_PAL) { 903 } else if (std & V4L2_STD_PAL) {
904 /* Autodetect audio standard and audio system */ 904 /* Autodetect audio standard and audio system */
905 cx25840_write(client, 0x808, 0xff); 905 cx25840_write(client, 0x808, 0xff);
906 /* Since system PAL-L is pretty much non-existant and 906 /* Since system PAL-L is pretty much non-existent and
907 not used by any public broadcast network, force 907 not used by any public broadcast network, force
908 6.5 MHz carrier to be interpreted as System DK, 908 6.5 MHz carrier to be interpreted as System DK,
909 this avoids DK audio detection instability */ 909 this avoids DK audio detection instability */
@@ -1851,7 +1851,7 @@ static u32 get_cx2388x_ident(struct i2c_client *client)
1851 ret = V4L2_IDENT_CX23885_AV; 1851 ret = V4L2_IDENT_CX23885_AV;
1852 } else { 1852 } else {
1853 /* CX23887 has a broken DIF, but the registers 1853 /* CX23887 has a broken DIF, but the registers
1854 * appear valid (but unsed), good enough to detect. */ 1854 * appear valid (but unused), good enough to detect. */
1855 ret = V4L2_IDENT_CX23887_AV; 1855 ret = V4L2_IDENT_CX23887_AV;
1856 } 1856 }
1857 } else if (cx25840_read4(client, 0x300) & 0x0fffffff) { 1857 } else if (cx25840_read4(client, 0x300) & 0x0fffffff) {
diff --git a/drivers/media/video/davinci/dm644x_ccdc.c b/drivers/media/video/davinci/dm644x_ccdc.c
index 490aafb34e2f..c8b32c1c7386 100644
--- a/drivers/media/video/davinci/dm644x_ccdc.c
+++ b/drivers/media/video/davinci/dm644x_ccdc.c
@@ -258,7 +258,7 @@ static int ccdc_update_raw_params(struct ccdc_config_params_raw *raw_params)
258 /* 258 /*
259 * Allocate memory for FPC table if current 259 * Allocate memory for FPC table if current
260 * FPC table buffer is not big enough to 260 * FPC table buffer is not big enough to
261 * accomodate FPC Number requested 261 * accommodate FPC Number requested
262 */ 262 */
263 if (raw_params->fault_pxl.fp_num != config_params->fault_pxl.fp_num) { 263 if (raw_params->fault_pxl.fp_num != config_params->fault_pxl.fp_num) {
264 if (fpc_physaddr != NULL) { 264 if (fpc_physaddr != NULL) {
@@ -436,7 +436,7 @@ void ccdc_config_ycbcr(void)
436 436
437 /* 437 /*
438 * configure the horizontal line offset. This should be a 438 * configure the horizontal line offset. This should be a
439 * on 32 byte bondary. So clear LSB 5 bits 439 * on 32 byte boundary. So clear LSB 5 bits
440 */ 440 */
441 regw(((params->win.width * 2 + 31) & ~0x1f), CCDC_HSIZE_OFF); 441 regw(((params->win.width * 2 + 31) & ~0x1f), CCDC_HSIZE_OFF);
442 442
diff --git a/drivers/media/video/davinci/vpfe_capture.c b/drivers/media/video/davinci/vpfe_capture.c
index 71e961e53a56..5b38fc93ff28 100644
--- a/drivers/media/video/davinci/vpfe_capture.c
+++ b/drivers/media/video/davinci/vpfe_capture.c
@@ -1691,7 +1691,7 @@ static int vpfe_s_crop(struct file *file, void *priv,
1691 goto unlock_out; 1691 goto unlock_out;
1692 } 1692 }
1693 1693
1694 /* adjust the width to 16 pixel boundry */ 1694 /* adjust the width to 16 pixel boundary */
1695 crop->c.width = ((crop->c.width + 15) & ~0xf); 1695 crop->c.width = ((crop->c.width + 15) & ~0xf);
1696 1696
1697 /* make sure parameters are valid */ 1697 /* make sure parameters are valid */
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index a83131bd00b2..7b6461d2d1ff 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -377,7 +377,7 @@ static inline void get_next_buf(struct em28xx_dmaqueue *dma_q,
377 /* Get the next buffer */ 377 /* Get the next buffer */
378 *buf = list_entry(dma_q->active.next, struct em28xx_buffer, vb.queue); 378 *buf = list_entry(dma_q->active.next, struct em28xx_buffer, vb.queue);
379 379
380 /* Cleans up buffer - Usefull for testing for frame/URB loss */ 380 /* Cleans up buffer - Useful for testing for frame/URB loss */
381 outp = videobuf_to_vmalloc(&(*buf)->vb); 381 outp = videobuf_to_vmalloc(&(*buf)->vb);
382 memset(outp, 0, (*buf)->vb.size); 382 memset(outp, 0, (*buf)->vb.size);
383 383
@@ -404,7 +404,7 @@ static inline void vbi_get_next_buf(struct em28xx_dmaqueue *dma_q,
404 404
405 /* Get the next buffer */ 405 /* Get the next buffer */
406 *buf = list_entry(dma_q->active.next, struct em28xx_buffer, vb.queue); 406 *buf = list_entry(dma_q->active.next, struct em28xx_buffer, vb.queue);
407 /* Cleans up buffer - Usefull for testing for frame/URB loss */ 407 /* Cleans up buffer - Useful for testing for frame/URB loss */
408 outp = videobuf_to_vmalloc(&(*buf)->vb); 408 outp = videobuf_to_vmalloc(&(*buf)->vb);
409 memset(outp, 0x00, (*buf)->vb.size); 409 memset(outp, 0x00, (*buf)->vb.size);
410 410
diff --git a/drivers/media/video/gspca/gl860/gl860-mi1320.c b/drivers/media/video/gspca/gl860/gl860-mi1320.c
index c276a7debdec..b57160e04866 100644
--- a/drivers/media/video/gspca/gl860/gl860-mi1320.c
+++ b/drivers/media/video/gspca/gl860/gl860-mi1320.c
@@ -201,7 +201,7 @@ void mi1320_init_settings(struct gspca_dev *gspca_dev)
201 sd->vmax.backlight = 2; 201 sd->vmax.backlight = 2;
202 sd->vmax.brightness = 8; 202 sd->vmax.brightness = 8;
203 sd->vmax.sharpness = 7; 203 sd->vmax.sharpness = 7;
204 sd->vmax.contrast = 0; /* 10 but not working with tihs driver */ 204 sd->vmax.contrast = 0; /* 10 but not working with this driver */
205 sd->vmax.gamma = 40; 205 sd->vmax.gamma = 40;
206 sd->vmax.hue = 5 + 1; 206 sd->vmax.hue = 5 + 1;
207 sd->vmax.saturation = 8; 207 sd->vmax.saturation = 8;
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 9c6a643caf01..e526aa3dedaf 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -857,7 +857,7 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)
857 } 857 }
858 858
859 /* the bandwidth is not wide enough 859 /* the bandwidth is not wide enough
860 * negociate or try a lower alternate setting */ 860 * negotiate or try a lower alternate setting */
861 PDEBUG(D_ERR|D_STREAM, 861 PDEBUG(D_ERR|D_STREAM,
862 "bandwidth not wide enough - trying again"); 862 "bandwidth not wide enough - trying again");
863 msleep(20); /* wait for kill complete */ 863 msleep(20); /* wait for kill complete */
@@ -2346,7 +2346,7 @@ void gspca_disconnect(struct usb_interface *intf)
2346 usb_set_intfdata(intf, NULL); 2346 usb_set_intfdata(intf, NULL);
2347 2347
2348 /* release the device */ 2348 /* release the device */
2349 /* (this will call gspca_release() immediatly or on last close) */ 2349 /* (this will call gspca_release() immediately or on last close) */
2350 video_unregister_device(&gspca_dev->vdev); 2350 video_unregister_device(&gspca_dev->vdev);
2351 2351
2352/* PDEBUG(D_PROBE, "disconnect complete"); */ 2352/* PDEBUG(D_PROBE, "disconnect complete"); */
diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c
index cb4d0bf0d784..0196209a948a 100644
--- a/drivers/media/video/gspca/mars.c
+++ b/drivers/media/video/gspca/mars.c
@@ -361,7 +361,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
361 mi_w(gspca_dev, i + 1, mi_data[i]); 361 mi_w(gspca_dev, i + 1, mi_data[i]);
362 362
363 data[0] = 0x00; 363 data[0] = 0x00;
364 data[1] = 0x4d; /* ISOC transfering enable... */ 364 data[1] = 0x4d; /* ISOC transferring enable... */
365 reg_w(gspca_dev, 2); 365 reg_w(gspca_dev, 2);
366 366
367 gspca_dev->ctrl_inac = 0; /* activate the illuminator controls */ 367 gspca_dev->ctrl_inac = 0; /* activate the illuminator controls */
diff --git a/drivers/media/video/gspca/mr97310a.c b/drivers/media/video/gspca/mr97310a.c
index 3884c9d300c5..97e507967434 100644
--- a/drivers/media/video/gspca/mr97310a.c
+++ b/drivers/media/video/gspca/mr97310a.c
@@ -469,7 +469,7 @@ static void lcd_stop(struct gspca_dev *gspca_dev)
469static int isoc_enable(struct gspca_dev *gspca_dev) 469static int isoc_enable(struct gspca_dev *gspca_dev)
470{ 470{
471 gspca_dev->usb_buf[0] = 0x00; 471 gspca_dev->usb_buf[0] = 0x00;
472 gspca_dev->usb_buf[1] = 0x4d; /* ISOC transfering enable... */ 472 gspca_dev->usb_buf[1] = 0x4d; /* ISOC transferring enable... */
473 return mr_write(gspca_dev, 2); 473 return mr_write(gspca_dev, 2);
474} 474}
475 475
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c
index fd1b6082c96d..36a46fc78734 100644
--- a/drivers/media/video/gspca/ov519.c
+++ b/drivers/media/video/gspca/ov519.c
@@ -381,7 +381,7 @@ static const struct v4l2_pix_format ov519_sif_mode[] = {
381 larger then necessary, however they need to be this big as the ov511 / 381 larger then necessary, however they need to be this big as the ov511 /
382 ov518 always fills the entire isoc frame, using 0 padding bytes when 382 ov518 always fills the entire isoc frame, using 0 padding bytes when
383 it doesn't have any data. So with low framerates the amount of data 383 it doesn't have any data. So with low framerates the amount of data
384 transfered can become quite large (libv4l will remove all the 0 padding 384 transferred can become quite large (libv4l will remove all the 0 padding
385 in userspace). */ 385 in userspace). */
386static const struct v4l2_pix_format ov518_vga_mode[] = { 386static const struct v4l2_pix_format ov518_vga_mode[] = {
387 {320, 240, V4L2_PIX_FMT_OV518, V4L2_FIELD_NONE, 387 {320, 240, V4L2_PIX_FMT_OV518, V4L2_FIELD_NONE,
@@ -4368,7 +4368,7 @@ static void ov511_pkt_scan(struct gspca_dev *gspca_dev,
4368 gspca_dev->last_packet_type = DISCARD_PACKET; 4368 gspca_dev->last_packet_type = DISCARD_PACKET;
4369 return; 4369 return;
4370 } 4370 }
4371 /* Add 11 byte footer to frame, might be usefull */ 4371 /* Add 11 byte footer to frame, might be useful */
4372 gspca_frame_add(gspca_dev, LAST_PACKET, in, 11); 4372 gspca_frame_add(gspca_dev, LAST_PACKET, in, 11);
4373 return; 4373 return;
4374 } else { 4374 } else {
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index 5a08738fba30..146b459b08d5 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -827,7 +827,7 @@ static void setexposure(struct gspca_dev *gspca_dev)
827 possible to use less exposure then what the fps maximum 827 possible to use less exposure then what the fps maximum
828 allows by setting register 10. register 10 configures the 828 allows by setting register 10. register 10 configures the
829 actual exposure as quotient of the full exposure, with 0 829 actual exposure as quotient of the full exposure, with 0
830 being no exposure at all (not very usefull) and reg10_max 830 being no exposure at all (not very useful) and reg10_max
831 being max exposure possible at that framerate. 831 being max exposure possible at that framerate.
832 832
833 The code maps our 0 - 510 ms exposure ctrl to these 2 833 The code maps our 0 - 510 ms exposure ctrl to these 2
diff --git a/drivers/media/video/gspca/spca500.c b/drivers/media/video/gspca/spca500.c
index 45552c3ff8d9..3e76951e3c19 100644
--- a/drivers/media/video/gspca/spca500.c
+++ b/drivers/media/video/gspca/spca500.c
@@ -607,7 +607,7 @@ static void spca500_reinit(struct gspca_dev *gspca_dev)
607 reg_w(gspca_dev, 0x00, 0x8880, 2); 607 reg_w(gspca_dev, 0x00, 0x8880, 2);
608 /* family cam Quicksmart stuff */ 608 /* family cam Quicksmart stuff */
609 reg_w(gspca_dev, 0x00, 0x800a, 0x00); 609 reg_w(gspca_dev, 0x00, 0x800a, 0x00);
610 /* Set agc transfer: synced inbetween frames */ 610 /* Set agc transfer: synced between frames */
611 reg_w(gspca_dev, 0x00, 0x820f, 0x01); 611 reg_w(gspca_dev, 0x00, 0x820f, 0x01);
612 /* Init SDRAM - needed for SDRAM access */ 612 /* Init SDRAM - needed for SDRAM access */
613 reg_w(gspca_dev, 0x00, 0x870a, 0x04); 613 reg_w(gspca_dev, 0x00, 0x870a, 0x04);
@@ -831,7 +831,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
831 831
832 /* familycam Quicksmart pocketDV stuff */ 832 /* familycam Quicksmart pocketDV stuff */
833 reg_w(gspca_dev, 0x00, 0x800a, 0x00); 833 reg_w(gspca_dev, 0x00, 0x800a, 0x00);
834 /* Set agc transfer: synced inbetween frames */ 834 /* Set agc transfer: synced between frames */
835 reg_w(gspca_dev, 0x00, 0x820f, 0x01); 835 reg_w(gspca_dev, 0x00, 0x820f, 0x01);
836 /* Init SDRAM - needed for SDRAM access */ 836 /* Init SDRAM - needed for SDRAM access */
837 reg_w(gspca_dev, 0x00, 0x870a, 0x04); 837 reg_w(gspca_dev, 0x00, 0x870a, 0x04);
diff --git a/drivers/media/video/gspca/spca508.c b/drivers/media/video/gspca/spca508.c
index 348319371523..41dce49fb43d 100644
--- a/drivers/media/video/gspca/spca508.c
+++ b/drivers/media/video/gspca/spca508.c
@@ -592,7 +592,7 @@ static const u16 spca508_sightcam_init_data[][2] = {
592/* This line seems to setup the frame/canvas */ 592/* This line seems to setup the frame/canvas */
593 {0x000f, 0x8402}, 593 {0x000f, 0x8402},
594 594
595/* Theese 6 lines are needed to startup the webcam */ 595/* These 6 lines are needed to startup the webcam */
596 {0x0090, 0x8110}, 596 {0x0090, 0x8110},
597 {0x0001, 0x8114}, 597 {0x0001, 0x8114},
598 {0x0001, 0x8114}, 598 {0x0001, 0x8114},
diff --git a/drivers/media/video/gspca/sq905.c b/drivers/media/video/gspca/sq905.c
index 2e9c06175192..5ba96aff2252 100644
--- a/drivers/media/video/gspca/sq905.c
+++ b/drivers/media/video/gspca/sq905.c
@@ -22,7 +22,7 @@
22 * History and Acknowledgments 22 * History and Acknowledgments
23 * 23 *
24 * The original Linux driver for SQ905 based cameras was written by 24 * The original Linux driver for SQ905 based cameras was written by
25 * Marcell Lengyel and furter developed by many other contributers 25 * Marcell Lengyel and furter developed by many other contributors
26 * and is available from http://sourceforge.net/projects/sqcam/ 26 * and is available from http://sourceforge.net/projects/sqcam/
27 * 27 *
28 * This driver takes advantage of the reverse engineering work done for 28 * This driver takes advantage of the reverse engineering work done for
diff --git a/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c b/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c
index 17531b41a073..b8156855f2b7 100644
--- a/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c
+++ b/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c
@@ -569,7 +569,7 @@ static int hdcs_init(struct sd *sd)
569 if (err < 0) 569 if (err < 0)
570 return err; 570 return err;
571 571
572 /* Enable continous frame capture, bit 2: stop when frame complete */ 572 /* Enable continuous frame capture, bit 2: stop when frame complete */
573 err = stv06xx_write_sensor(sd, HDCS_REG_CONFIG(sd), BIT(3)); 573 err = stv06xx_write_sensor(sd, HDCS_REG_CONFIG(sd), BIT(3));
574 if (err < 0) 574 if (err < 0)
575 return err; 575 return err;
diff --git a/drivers/media/video/hexium_gemini.c b/drivers/media/video/hexium_gemini.c
index cdf8b191f710..cbc505a2fc29 100644
--- a/drivers/media/video/hexium_gemini.c
+++ b/drivers/media/video/hexium_gemini.c
@@ -261,7 +261,7 @@ static int vidioc_s_input(struct file *file, void *fh, unsigned int input)
261 261
262/* the saa7146 provides some controls (brightness, contrast, saturation) 262/* the saa7146 provides some controls (brightness, contrast, saturation)
263 which gets registered *after* this function. because of this we have 263 which gets registered *after* this function. because of this we have
264 to return with a value != 0 even if the function succeded.. */ 264 to return with a value != 0 even if the function succeeded.. */
265static int vidioc_queryctrl(struct file *file, void *fh, struct v4l2_queryctrl *qc) 265static int vidioc_queryctrl(struct file *file, void *fh, struct v4l2_queryctrl *qc)
266{ 266{
267 struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev; 267 struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;
diff --git a/drivers/media/video/ivtv/ivtv-firmware.c b/drivers/media/video/ivtv/ivtv-firmware.c
index 4df01947a7df..14a1cea1d70d 100644
--- a/drivers/media/video/ivtv/ivtv-firmware.c
+++ b/drivers/media/video/ivtv/ivtv-firmware.c
@@ -179,7 +179,7 @@ static volatile struct ivtv_mailbox __iomem *ivtv_search_mailbox(const volatile
179{ 179{
180 int i; 180 int i;
181 181
182 /* mailbox is preceeded by a 16 byte 'magic cookie' starting at a 256-byte 182 /* mailbox is preceded by a 16 byte 'magic cookie' starting at a 256-byte
183 address boundary */ 183 address boundary */
184 for (i = 0; i < size; i += 0x100) { 184 for (i = 0; i < size; i += 0x100) {
185 if (readl(mem + i) == 0x12345678 && 185 if (readl(mem + i) == 0x12345678 &&
@@ -377,7 +377,7 @@ int ivtv_firmware_check(struct ivtv *itv, char *where)
377 "Reloading\n", where); 377 "Reloading\n", where);
378 res = ivtv_firmware_restart(itv); 378 res = ivtv_firmware_restart(itv);
379 /* 379 /*
380 * Even if restarted ok, still signal a problem had occured. 380 * Even if restarted ok, still signal a problem had occurred.
381 * The caller can come through this function again to check 381 * The caller can come through this function again to check
382 * if things are really ok after the restart. 382 * if things are really ok after the restart.
383 */ 383 */
diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c
index f0316d02f09f..17247451c693 100644
--- a/drivers/media/video/ivtv/ivtvfb.c
+++ b/drivers/media/video/ivtv/ivtvfb.c
@@ -1080,7 +1080,7 @@ static int ivtvfb_init_vidmode(struct ivtv *itv)
1080 kmalloc(sizeof(u32) * 16, GFP_KERNEL|__GFP_NOWARN); 1080 kmalloc(sizeof(u32) * 16, GFP_KERNEL|__GFP_NOWARN);
1081 1081
1082 if (!oi->ivtvfb_info.pseudo_palette) { 1082 if (!oi->ivtvfb_info.pseudo_palette) {
1083 IVTVFB_ERR("abort, unable to alloc pseudo pallete\n"); 1083 IVTVFB_ERR("abort, unable to alloc pseudo palette\n");
1084 return -ENOMEM; 1084 return -ENOMEM;
1085 } 1085 }
1086 1086
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c
index b1763ac93ab3..8126622fb4f5 100644
--- a/drivers/media/video/msp3400-driver.c
+++ b/drivers/media/video/msp3400-driver.c
@@ -69,7 +69,7 @@ MODULE_LICENSE("GPL");
69/* module parameters */ 69/* module parameters */
70static int opmode = OPMODE_AUTO; 70static int opmode = OPMODE_AUTO;
71int msp_debug; /* msp_debug output */ 71int msp_debug; /* msp_debug output */
72int msp_once; /* no continous stereo monitoring */ 72int msp_once; /* no continuous stereo monitoring */
73int msp_amsound; /* hard-wire AM sound at 6.5 Hz (france), 73int msp_amsound; /* hard-wire AM sound at 6.5 Hz (france),
74 the autoscan seems work well only with FM... */ 74 the autoscan seems work well only with FM... */
75int msp_standard = 1; /* Override auto detect of audio msp_standard, 75int msp_standard = 1; /* Override auto detect of audio msp_standard,
@@ -551,7 +551,7 @@ static int msp_log_status(struct v4l2_subdev *sd)
551 switch (state->mode) { 551 switch (state->mode) {
552 case MSP_MODE_AM_DETECT: p = "AM (for carrier detect)"; break; 552 case MSP_MODE_AM_DETECT: p = "AM (for carrier detect)"; break;
553 case MSP_MODE_FM_RADIO: p = "FM Radio"; break; 553 case MSP_MODE_FM_RADIO: p = "FM Radio"; break;
554 case MSP_MODE_FM_TERRA: p = "Terrestial FM-mono/stereo"; break; 554 case MSP_MODE_FM_TERRA: p = "Terrestrial FM-mono/stereo"; break;
555 case MSP_MODE_FM_SAT: p = "Satellite FM-mono"; break; 555 case MSP_MODE_FM_SAT: p = "Satellite FM-mono"; break;
556 case MSP_MODE_FM_NICAM1: p = "NICAM/FM (B/G, D/K)"; break; 556 case MSP_MODE_FM_NICAM1: p = "NICAM/FM (B/G, D/K)"; break;
557 case MSP_MODE_FM_NICAM2: p = "NICAM/FM (I)"; break; 557 case MSP_MODE_FM_NICAM2: p = "NICAM/FM (I)"; break;
diff --git a/drivers/media/video/msp3400-kthreads.c b/drivers/media/video/msp3400-kthreads.c
index b376fcdee652..80387e2c3eca 100644
--- a/drivers/media/video/msp3400-kthreads.c
+++ b/drivers/media/video/msp3400-kthreads.c
@@ -87,7 +87,7 @@ static struct msp3400c_init_data_dem {
87 {-8, -8, 4, 6, 78, 107}, 87 {-8, -8, 4, 6, 78, 107},
88 MSP_CARRIER(10.7), MSP_CARRIER(10.7), 88 MSP_CARRIER(10.7), MSP_CARRIER(10.7),
89 0x00d0, 0x0480, 0x0020, 0x3000 89 0x00d0, 0x0480, 0x0020, 0x3000
90 }, { /* Terrestial FM-mono + FM-stereo */ 90 }, { /* Terrestrial FM-mono + FM-stereo */
91 {3, 18, 27, 48, 66, 72}, 91 {3, 18, 27, 48, 66, 72},
92 {3, 18, 27, 48, 66, 72}, 92 {3, 18, 27, 48, 66, 72},
93 MSP_CARRIER(5.5), MSP_CARRIER(5.5), 93 MSP_CARRIER(5.5), MSP_CARRIER(5.5),
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
index 029a4babfd61..d4fe7bc92a1d 100644
--- a/drivers/media/video/omap/omap_vout.c
+++ b/drivers/media/video/omap/omap_vout.c
@@ -473,7 +473,7 @@ static int omap_vout_vrfb_buffer_setup(struct omap_vout_device *vout,
473/* 473/*
474 * Convert V4L2 rotation to DSS rotation 474 * Convert V4L2 rotation to DSS rotation
475 * V4L2 understand 0, 90, 180, 270. 475 * V4L2 understand 0, 90, 180, 270.
476 * Convert to 0, 1, 2 and 3 repsectively for DSS 476 * Convert to 0, 1, 2 and 3 respectively for DSS
477 */ 477 */
478static int v4l2_rot_to_dss_rot(int v4l2_rotation, 478static int v4l2_rot_to_dss_rot(int v4l2_rotation,
479 enum dss_rotation *rotation, bool mirror) 479 enum dss_rotation *rotation, bool mirror)
@@ -1142,7 +1142,7 @@ static int omap_vout_buffer_prepare(struct videobuf_queue *q,
1142} 1142}
1143 1143
1144/* 1144/*
1145 * Buffer queue funtion will be called from the videobuf layer when _QBUF 1145 * Buffer queue function will be called from the videobuf layer when _QBUF
1146 * ioctl is called. It is used to enqueue buffer, which is ready to be 1146 * ioctl is called. It is used to enqueue buffer, which is ready to be
1147 * displayed. 1147 * displayed.
1148 */ 1148 */
diff --git a/drivers/media/video/omap/omap_voutlib.c b/drivers/media/video/omap/omap_voutlib.c
index b941c761eef9..2aa6a76c5e59 100644
--- a/drivers/media/video/omap/omap_voutlib.c
+++ b/drivers/media/video/omap/omap_voutlib.c
@@ -53,7 +53,7 @@ EXPORT_SYMBOL_GPL(omap_vout_default_crop);
53/* Given a new render window in new_win, adjust the window to the 53/* Given a new render window in new_win, adjust the window to the
54 * nearest supported configuration. The adjusted window parameters are 54 * nearest supported configuration. The adjusted window parameters are
55 * returned in new_win. 55 * returned in new_win.
56 * Returns zero if succesful, or -EINVAL if the requested window is 56 * Returns zero if successful, or -EINVAL if the requested window is
57 * impossible and cannot reasonably be adjusted. 57 * impossible and cannot reasonably be adjusted.
58 */ 58 */
59int omap_vout_try_window(struct v4l2_framebuffer *fbuf, 59int omap_vout_try_window(struct v4l2_framebuffer *fbuf,
@@ -101,7 +101,7 @@ EXPORT_SYMBOL_GPL(omap_vout_try_window);
101 * will also be adjusted if necessary. Preference is given to keeping the 101 * will also be adjusted if necessary. Preference is given to keeping the
102 * the window as close to the requested configuration as possible. If 102 * the window as close to the requested configuration as possible. If
103 * successful, new_win, vout->win, and crop are updated. 103 * successful, new_win, vout->win, and crop are updated.
104 * Returns zero if succesful, or -EINVAL if the requested preview window is 104 * Returns zero if successful, or -EINVAL if the requested preview window is
105 * impossible and cannot reasonably be adjusted. 105 * impossible and cannot reasonably be adjusted.
106 */ 106 */
107int omap_vout_new_window(struct v4l2_rect *crop, 107int omap_vout_new_window(struct v4l2_rect *crop,
@@ -155,7 +155,7 @@ EXPORT_SYMBOL_GPL(omap_vout_new_window);
155 * window would fall outside the display boundaries, the cropping rectangle 155 * window would fall outside the display boundaries, the cropping rectangle
156 * will also be adjusted to maintain the rescaling ratios. If successful, crop 156 * will also be adjusted to maintain the rescaling ratios. If successful, crop
157 * and win are updated. 157 * and win are updated.
158 * Returns zero if succesful, or -EINVAL if the requested cropping rectangle is 158 * Returns zero if successful, or -EINVAL if the requested cropping rectangle is
159 * impossible and cannot reasonably be adjusted. 159 * impossible and cannot reasonably be adjusted.
160 */ 160 */
161int omap_vout_new_crop(struct v4l2_pix_format *pix, 161int omap_vout_new_crop(struct v4l2_pix_format *pix,
diff --git a/drivers/media/video/omap1_camera.c b/drivers/media/video/omap1_camera.c
index eab31cbd68eb..5954b9306630 100644
--- a/drivers/media/video/omap1_camera.c
+++ b/drivers/media/video/omap1_camera.c
@@ -687,7 +687,7 @@ static void videobuf_done(struct omap1_cam_dev *pcdev,
687 * In CONTIG mode, the current buffer parameters had already 687 * In CONTIG mode, the current buffer parameters had already
688 * been entered into the DMA programming register set while the 688 * been entered into the DMA programming register set while the
689 * buffer was fetched with prepare_next_vb(), they may have also 689 * buffer was fetched with prepare_next_vb(), they may have also
690 * been transfered into the runtime set and already active if 690 * been transferred into the runtime set and already active if
691 * the DMA still running. 691 * the DMA still running.
692 */ 692 */
693 } else { 693 } else {
@@ -835,7 +835,7 @@ static irqreturn_t cam_isr(int irq, void *data)
835 /* 835 /*
836 * If exactly 2 sgbufs from the next sglist have 836 * If exactly 2 sgbufs from the next sglist have
837 * been programmed into the DMA engine (the 837 * been programmed into the DMA engine (the
838 * frist one already transfered into the DMA 838 * first one already transferred into the DMA
839 * runtime register set, the second one still 839 * runtime register set, the second one still
840 * in the programming set), then we are in sync. 840 * in the programming set), then we are in sync.
841 */ 841 */
diff --git a/drivers/media/video/omap3isp/isp.c b/drivers/media/video/omap3isp/isp.c
index 1a9963bd6d40..503bd7922bd6 100644
--- a/drivers/media/video/omap3isp/isp.c
+++ b/drivers/media/video/omap3isp/isp.c
@@ -715,7 +715,7 @@ static int isp_pipeline_link_notify(struct media_pad *source,
715 * Walk the entities chain starting at the pipeline output video node and start 715 * Walk the entities chain starting at the pipeline output video node and start
716 * all modules in the chain in the given mode. 716 * all modules in the chain in the given mode.
717 * 717 *
718 * Return 0 if successfull, or the return value of the failed video::s_stream 718 * Return 0 if successful, or the return value of the failed video::s_stream
719 * operation otherwise. 719 * operation otherwise.
720 */ 720 */
721static int isp_pipeline_enable(struct isp_pipeline *pipe, 721static int isp_pipeline_enable(struct isp_pipeline *pipe,
@@ -883,7 +883,7 @@ static int isp_pipeline_disable(struct isp_pipeline *pipe)
883 * Set the pipeline to the given stream state. Pipelines can be started in 883 * Set the pipeline to the given stream state. Pipelines can be started in
884 * single-shot or continuous mode. 884 * single-shot or continuous mode.
885 * 885 *
886 * Return 0 if successfull, or the return value of the failed video::s_stream 886 * Return 0 if successful, or the return value of the failed video::s_stream
887 * operation otherwise. 887 * operation otherwise.
888 */ 888 */
889int omap3isp_pipeline_set_stream(struct isp_pipeline *pipe, 889int omap3isp_pipeline_set_stream(struct isp_pipeline *pipe,
@@ -1283,7 +1283,7 @@ static void __isp_subclk_update(struct isp_device *isp)
1283 clk |= ISPCTRL_RSZ_CLK_EN; 1283 clk |= ISPCTRL_RSZ_CLK_EN;
1284 1284
1285 /* NOTE: For CCDC & Preview submodules, we need to affect internal 1285 /* NOTE: For CCDC & Preview submodules, we need to affect internal
1286 * RAM aswell. 1286 * RAM as well.
1287 */ 1287 */
1288 if (isp->subclk_resources & OMAP3_ISP_SUBCLK_CCDC) 1288 if (isp->subclk_resources & OMAP3_ISP_SUBCLK_CCDC)
1289 clk |= ISPCTRL_CCDC_CLK_EN | ISPCTRL_CCDC_RAM_EN; 1289 clk |= ISPCTRL_CCDC_CLK_EN | ISPCTRL_CCDC_RAM_EN;
@@ -1431,7 +1431,7 @@ static int isp_get_clocks(struct isp_device *isp)
1431 * Increment the reference count on the ISP. If the first reference is taken, 1431 * Increment the reference count on the ISP. If the first reference is taken,
1432 * enable clocks and power-up all submodules. 1432 * enable clocks and power-up all submodules.
1433 * 1433 *
1434 * Return a pointer to the ISP device structure, or NULL if an error occured. 1434 * Return a pointer to the ISP device structure, or NULL if an error occurred.
1435 */ 1435 */
1436struct isp_device *omap3isp_get(struct isp_device *isp) 1436struct isp_device *omap3isp_get(struct isp_device *isp)
1437{ 1437{
diff --git a/drivers/media/video/omap3isp/ispccdc.h b/drivers/media/video/omap3isp/ispccdc.h
index d403af5d31d2..483a19cac1ad 100644
--- a/drivers/media/video/omap3isp/ispccdc.h
+++ b/drivers/media/video/omap3isp/ispccdc.h
@@ -150,7 +150,7 @@ struct ispccdc_lsc {
150 * @input: Active input 150 * @input: Active input
151 * @output: Active outputs 151 * @output: Active outputs
152 * @video_out: Output video node 152 * @video_out: Output video node
153 * @error: A hardware error occured during capture 153 * @error: A hardware error occurred during capture
154 * @alaw: A-law compression enabled (1) or disabled (0) 154 * @alaw: A-law compression enabled (1) or disabled (0)
155 * @lpf: Low pass filter enabled (1) or disabled (0) 155 * @lpf: Low pass filter enabled (1) or disabled (0)
156 * @obclamp: Optical-black clamp enabled (1) or disabled (0) 156 * @obclamp: Optical-black clamp enabled (1) or disabled (0)
@@ -163,7 +163,7 @@ struct ispccdc_lsc {
163 * @shadow_update: Controls update in progress by userspace 163 * @shadow_update: Controls update in progress by userspace
164 * @syncif: Interface synchronization configuration 164 * @syncif: Interface synchronization configuration
165 * @vpcfg: Video port configuration 165 * @vpcfg: Video port configuration
166 * @underrun: A buffer underrun occured and a new buffer has been queued 166 * @underrun: A buffer underrun occurred and a new buffer has been queued
167 * @state: Streaming state 167 * @state: Streaming state
168 * @lock: Serializes shadow_update with interrupt handler 168 * @lock: Serializes shadow_update with interrupt handler
169 * @wait: Wait queue used to stop the module 169 * @wait: Wait queue used to stop the module
diff --git a/drivers/media/video/omap3isp/ispccp2.c b/drivers/media/video/omap3isp/ispccp2.c
index 0efef2e78d93..0e16cab8e089 100644
--- a/drivers/media/video/omap3isp/ispccp2.c
+++ b/drivers/media/video/omap3isp/ispccp2.c
@@ -772,7 +772,7 @@ static int ccp2_enum_frame_size(struct v4l2_subdev *sd,
772 * @sd : pointer to v4l2 subdev structure 772 * @sd : pointer to v4l2 subdev structure
773 * @fh : V4L2 subdev file handle 773 * @fh : V4L2 subdev file handle
774 * @fmt : pointer to v4l2 subdev format structure 774 * @fmt : pointer to v4l2 subdev format structure
775 * return -EINVAL or zero on sucess 775 * return -EINVAL or zero on success
776 */ 776 */
777static int ccp2_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, 777static int ccp2_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
778 struct v4l2_subdev_format *fmt) 778 struct v4l2_subdev_format *fmt)
diff --git a/drivers/media/video/omap3isp/ispcsi2.c b/drivers/media/video/omap3isp/ispcsi2.c
index fb503f3db3be..69161a682b3d 100644
--- a/drivers/media/video/omap3isp/ispcsi2.c
+++ b/drivers/media/video/omap3isp/ispcsi2.c
@@ -969,7 +969,7 @@ static int csi2_enum_frame_size(struct v4l2_subdev *sd,
969 * @sd : pointer to v4l2 subdev structure 969 * @sd : pointer to v4l2 subdev structure
970 * @fh : V4L2 subdev file handle 970 * @fh : V4L2 subdev file handle
971 * @fmt: pointer to v4l2 subdev format structure 971 * @fmt: pointer to v4l2 subdev format structure
972 * return -EINVAL or zero on sucess 972 * return -EINVAL or zero on success
973 */ 973 */
974static int csi2_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, 974static int csi2_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
975 struct v4l2_subdev_format *fmt) 975 struct v4l2_subdev_format *fmt)
diff --git a/drivers/media/video/omap3isp/isppreview.c b/drivers/media/video/omap3isp/isppreview.c
index baf9374201dc..2b16988a501d 100644
--- a/drivers/media/video/omap3isp/isppreview.c
+++ b/drivers/media/video/omap3isp/isppreview.c
@@ -34,7 +34,7 @@
34#include "ispreg.h" 34#include "ispreg.h"
35#include "isppreview.h" 35#include "isppreview.h"
36 36
37/* Default values in Office Flourescent Light for RGBtoRGB Blending */ 37/* Default values in Office Fluorescent Light for RGBtoRGB Blending */
38static struct omap3isp_prev_rgbtorgb flr_rgb2rgb = { 38static struct omap3isp_prev_rgbtorgb flr_rgb2rgb = {
39 { /* RGB-RGB Matrix */ 39 { /* RGB-RGB Matrix */
40 {0x01E2, 0x0F30, 0x0FEE}, 40 {0x01E2, 0x0F30, 0x0FEE},
@@ -44,7 +44,7 @@ static struct omap3isp_prev_rgbtorgb flr_rgb2rgb = {
44 {0x0000, 0x0000, 0x0000} 44 {0x0000, 0x0000, 0x0000}
45}; 45};
46 46
47/* Default values in Office Flourescent Light for RGB to YUV Conversion*/ 47/* Default values in Office Fluorescent Light for RGB to YUV Conversion*/
48static struct omap3isp_prev_csc flr_prev_csc = { 48static struct omap3isp_prev_csc flr_prev_csc = {
49 { /* CSC Coef Matrix */ 49 { /* CSC Coef Matrix */
50 {66, 129, 25}, 50 {66, 129, 25},
@@ -54,22 +54,22 @@ static struct omap3isp_prev_csc flr_prev_csc = {
54 {0x0, 0x0, 0x0} 54 {0x0, 0x0, 0x0}
55}; 55};
56 56
57/* Default values in Office Flourescent Light for CFA Gradient*/ 57/* Default values in Office Fluorescent Light for CFA Gradient*/
58#define FLR_CFA_GRADTHRS_HORZ 0x28 58#define FLR_CFA_GRADTHRS_HORZ 0x28
59#define FLR_CFA_GRADTHRS_VERT 0x28 59#define FLR_CFA_GRADTHRS_VERT 0x28
60 60
61/* Default values in Office Flourescent Light for Chroma Suppression*/ 61/* Default values in Office Fluorescent Light for Chroma Suppression*/
62#define FLR_CSUP_GAIN 0x0D 62#define FLR_CSUP_GAIN 0x0D
63#define FLR_CSUP_THRES 0xEB 63#define FLR_CSUP_THRES 0xEB
64 64
65/* Default values in Office Flourescent Light for Noise Filter*/ 65/* Default values in Office Fluorescent Light for Noise Filter*/
66#define FLR_NF_STRGTH 0x03 66#define FLR_NF_STRGTH 0x03
67 67
68/* Default values for White Balance */ 68/* Default values for White Balance */
69#define FLR_WBAL_DGAIN 0x100 69#define FLR_WBAL_DGAIN 0x100
70#define FLR_WBAL_COEF 0x20 70#define FLR_WBAL_COEF 0x20
71 71
72/* Default values in Office Flourescent Light for Black Adjustment*/ 72/* Default values in Office Fluorescent Light for Black Adjustment*/
73#define FLR_BLKADJ_BLUE 0x0 73#define FLR_BLKADJ_BLUE 0x0
74#define FLR_BLKADJ_GREEN 0x0 74#define FLR_BLKADJ_GREEN 0x0
75#define FLR_BLKADJ_RED 0x0 75#define FLR_BLKADJ_RED 0x0
@@ -137,7 +137,7 @@ preview_enable_invalaw(struct isp_prev_device *prev, u8 enable)
137 * @enable: 1 - Enable, 0 - Disable 137 * @enable: 1 - Enable, 0 - Disable
138 * 138 *
139 * NOTE: PRV_WSDR_ADDR and PRV_WADD_OFFSET must be set also 139 * NOTE: PRV_WSDR_ADDR and PRV_WADD_OFFSET must be set also
140 * The proccess is applied for each captured frame. 140 * The process is applied for each captured frame.
141 */ 141 */
142static void 142static void
143preview_enable_drkframe_capture(struct isp_prev_device *prev, u8 enable) 143preview_enable_drkframe_capture(struct isp_prev_device *prev, u8 enable)
@@ -157,7 +157,7 @@ preview_enable_drkframe_capture(struct isp_prev_device *prev, u8 enable)
157 * @enable: 1 - Acquires memory bandwidth since the pixels in each frame is 157 * @enable: 1 - Acquires memory bandwidth since the pixels in each frame is
158 * subtracted with the pixels in the current frame. 158 * subtracted with the pixels in the current frame.
159 * 159 *
160 * The proccess is applied for each captured frame. 160 * The process is applied for each captured frame.
161 */ 161 */
162static void 162static void
163preview_enable_drkframe(struct isp_prev_device *prev, u8 enable) 163preview_enable_drkframe(struct isp_prev_device *prev, u8 enable)
@@ -1528,7 +1528,7 @@ static long preview_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg)
1528 * preview_set_stream - Enable/Disable streaming on preview subdev 1528 * preview_set_stream - Enable/Disable streaming on preview subdev
1529 * @sd : pointer to v4l2 subdev structure 1529 * @sd : pointer to v4l2 subdev structure
1530 * @enable: 1 == Enable, 0 == Disable 1530 * @enable: 1 == Enable, 0 == Disable
1531 * return -EINVAL or zero on sucess 1531 * return -EINVAL or zero on success
1532 */ 1532 */
1533static int preview_set_stream(struct v4l2_subdev *sd, int enable) 1533static int preview_set_stream(struct v4l2_subdev *sd, int enable)
1534{ 1534{
@@ -1780,7 +1780,7 @@ static int preview_enum_frame_size(struct v4l2_subdev *sd,
1780 * @sd : pointer to v4l2 subdev structure 1780 * @sd : pointer to v4l2 subdev structure
1781 * @fh : V4L2 subdev file handle 1781 * @fh : V4L2 subdev file handle
1782 * @fmt: pointer to v4l2 subdev format structure 1782 * @fmt: pointer to v4l2 subdev format structure
1783 * return -EINVAL or zero on sucess 1783 * return -EINVAL or zero on success
1784 */ 1784 */
1785static int preview_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, 1785static int preview_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
1786 struct v4l2_subdev_format *fmt) 1786 struct v4l2_subdev_format *fmt)
diff --git a/drivers/media/video/omap3isp/isppreview.h b/drivers/media/video/omap3isp/isppreview.h
index f2d63ca4bd6f..fa943bd05c7f 100644
--- a/drivers/media/video/omap3isp/isppreview.h
+++ b/drivers/media/video/omap3isp/isppreview.h
@@ -163,7 +163,7 @@ struct isptables_update {
163 * @output: Bitmask of the active output 163 * @output: Bitmask of the active output
164 * @video_in: Input video entity 164 * @video_in: Input video entity
165 * @video_out: Output video entity 165 * @video_out: Output video entity
166 * @error: A hardware error occured during capture 166 * @error: A hardware error occurred during capture
167 * @params: Module configuration data 167 * @params: Module configuration data
168 * @shadow_update: If set, update the hardware configured in the next interrupt 168 * @shadow_update: If set, update the hardware configured in the next interrupt
169 * @underrun: Whether the preview entity has queued buffers on the output 169 * @underrun: Whether the preview entity has queued buffers on the output
diff --git a/drivers/media/video/omap3isp/ispqueue.h b/drivers/media/video/omap3isp/ispqueue.h
index 251de3e1679d..92c5a12157d5 100644
--- a/drivers/media/video/omap3isp/ispqueue.h
+++ b/drivers/media/video/omap3isp/ispqueue.h
@@ -46,9 +46,9 @@ struct scatterlist;
46 * device yet. 46 * device yet.
47 * @ISP_BUF_STATE_ACTIVE: The buffer is in use for an active video transfer. 47 * @ISP_BUF_STATE_ACTIVE: The buffer is in use for an active video transfer.
48 * @ISP_BUF_STATE_ERROR: The device is done with the buffer and an error 48 * @ISP_BUF_STATE_ERROR: The device is done with the buffer and an error
49 * occured. For capture device the buffer likely contains corrupted data or 49 * occurred. For capture device the buffer likely contains corrupted data or
50 * no data at all. 50 * no data at all.
51 * @ISP_BUF_STATE_DONE: The device is done with the buffer and no error occured. 51 * @ISP_BUF_STATE_DONE: The device is done with the buffer and no error occurred.
52 * For capture devices the buffer contains valid data. 52 * For capture devices the buffer contains valid data.
53 */ 53 */
54enum isp_video_buffer_state { 54enum isp_video_buffer_state {
diff --git a/drivers/media/video/omap3isp/ispresizer.c b/drivers/media/video/omap3isp/ispresizer.c
index 75d39b115d42..653f88ba56db 100644
--- a/drivers/media/video/omap3isp/ispresizer.c
+++ b/drivers/media/video/omap3isp/ispresizer.c
@@ -751,7 +751,7 @@ static void resizer_print_status(struct isp_res_device *res)
751 * ratio will thus result in a resizing factor slightly larger than the 751 * ratio will thus result in a resizing factor slightly larger than the
752 * requested value. 752 * requested value.
753 * 753 *
754 * To accomodate that, and make sure the TRM equations are satisfied exactly, we 754 * To accommodate that, and make sure the TRM equations are satisfied exactly, we
755 * compute the input crop rectangle as the last step. 755 * compute the input crop rectangle as the last step.
756 * 756 *
757 * As if the situation wasn't complex enough, the maximum output width depends 757 * As if the situation wasn't complex enough, the maximum output width depends
@@ -1386,7 +1386,7 @@ static int resizer_enum_frame_size(struct v4l2_subdev *sd,
1386 * @sd : pointer to v4l2 subdev structure 1386 * @sd : pointer to v4l2 subdev structure
1387 * @fh : V4L2 subdev file handle 1387 * @fh : V4L2 subdev file handle
1388 * @fmt : pointer to v4l2 subdev format structure 1388 * @fmt : pointer to v4l2 subdev format structure
1389 * return -EINVAL or zero on sucess 1389 * return -EINVAL or zero on success
1390 */ 1390 */
1391static int resizer_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, 1391static int resizer_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
1392 struct v4l2_subdev_format *fmt) 1392 struct v4l2_subdev_format *fmt)
diff --git a/drivers/media/video/omap3isp/ispvideo.c b/drivers/media/video/omap3isp/ispvideo.c
index a0bb5db9cb8a..208a7ec739d7 100644
--- a/drivers/media/video/omap3isp/ispvideo.c
+++ b/drivers/media/video/omap3isp/ispvideo.c
@@ -494,12 +494,12 @@ static const struct isp_video_queue_operations isp_video_queue_ops = {
494/* 494/*
495 * omap3isp_video_buffer_next - Complete the current buffer and return the next 495 * omap3isp_video_buffer_next - Complete the current buffer and return the next
496 * @video: ISP video object 496 * @video: ISP video object
497 * @error: Whether an error occured during capture 497 * @error: Whether an error occurred during capture
498 * 498 *
499 * Remove the current video buffer from the DMA queue and fill its timestamp, 499 * Remove the current video buffer from the DMA queue and fill its timestamp,
500 * field count and state fields before waking up its completion handler. 500 * field count and state fields before waking up its completion handler.
501 * 501 *
502 * The buffer state is set to VIDEOBUF_DONE if no error occured (@error is 0) 502 * The buffer state is set to VIDEOBUF_DONE if no error occurred (@error is 0)
503 * or VIDEOBUF_ERROR otherwise (@error is non-zero). 503 * or VIDEOBUF_ERROR otherwise (@error is non-zero).
504 * 504 *
505 * The DMA queue is expected to contain at least one buffer. 505 * The DMA queue is expected to contain at least one buffer.
@@ -578,7 +578,7 @@ struct isp_buffer *omap3isp_video_buffer_next(struct isp_video *video,
578/* 578/*
579 * omap3isp_video_resume - Perform resume operation on the buffers 579 * omap3isp_video_resume - Perform resume operation on the buffers
580 * @video: ISP video object 580 * @video: ISP video object
581 * @continuous: Pipeline is in single shot mode if 0 or continous mode otherwise 581 * @continuous: Pipeline is in single shot mode if 0 or continuous mode otherwise
582 * 582 *
583 * This function is intended to be used on suspend/resume scenario. It 583 * This function is intended to be used on suspend/resume scenario. It
584 * requests video queue layer to discard buffers marked as DONE if it's in 584 * requests video queue layer to discard buffers marked as DONE if it's in
diff --git a/drivers/media/video/ov6650.c b/drivers/media/video/ov6650.c
index fe8e3ebd9ce4..456d9ad9ae5a 100644
--- a/drivers/media/video/ov6650.c
+++ b/drivers/media/video/ov6650.c
@@ -1038,7 +1038,7 @@ static int ov6650_reset(struct i2c_client *client)
1038 ret = ov6650_reg_rmw(client, REG_COMA, COMA_RESET, 0); 1038 ret = ov6650_reg_rmw(client, REG_COMA, COMA_RESET, 0);
1039 if (ret) 1039 if (ret)
1040 dev_err(&client->dev, 1040 dev_err(&client->dev,
1041 "An error occured while entering soft reset!\n"); 1041 "An error occurred while entering soft reset!\n");
1042 1042
1043 return ret; 1043 return ret;
1044} 1044}
diff --git a/drivers/media/video/ov9640.c b/drivers/media/video/ov9640.c
index 53d88a2ab920..5173ac449dd8 100644
--- a/drivers/media/video/ov9640.c
+++ b/drivers/media/video/ov9640.c
@@ -273,7 +273,7 @@ static int ov9640_reset(struct i2c_client *client)
273 ret = ov9640_reg_write(client, OV9640_COM7, OV9640_COM7_SCCB_RESET); 273 ret = ov9640_reg_write(client, OV9640_COM7, OV9640_COM7_SCCB_RESET);
274 if (ret) 274 if (ret)
275 dev_err(&client->dev, 275 dev_err(&client->dev,
276 "An error occured while entering soft reset!\n"); 276 "An error occurred while entering soft reset!\n");
277 277
278 return ret; 278 return ret;
279} 279}
diff --git a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
index aeed1c2945fb..9515f3a68f8f 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
@@ -32,7 +32,7 @@
32 32
33 Read and analyze data in the eeprom. Use tveeprom to figure out 33 Read and analyze data in the eeprom. Use tveeprom to figure out
34 the packet structure, since this is another Hauppauge device and 34 the packet structure, since this is another Hauppauge device and
35 internally it has a family resemblence to ivtv-type devices 35 internally it has a family resemblance to ivtv-type devices
36 36
37*/ 37*/
38 38
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.h b/drivers/media/video/pvrusb2/pvrusb2-hdw.h
index 51d3009ab57f..d7753ae9ff46 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.h
@@ -75,7 +75,7 @@ enum pvr2_v4l_type {
75 * (but it might still on the bus). In this state there's nothing we can 75 * (but it might still on the bus). In this state there's nothing we can
76 * do; it must be replugged in order to recover. 76 * do; it must be replugged in order to recover.
77 * 77 *
78 * COLD - Device is in an unusuable state, needs microcontroller firmware. 78 * COLD - Device is in an unusable state, needs microcontroller firmware.
79 * 79 *
80 * WARM - We can communicate with the device and the proper 80 * WARM - We can communicate with the device and the proper
81 * microcontroller firmware is running, but other device initialization is 81 * microcontroller firmware is running, but other device initialization is
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
index 02686771740d..c1ee09a043ba 100644
--- a/drivers/media/video/pxa_camera.c
+++ b/drivers/media/video/pxa_camera.c
@@ -714,7 +714,7 @@ static void pxa_camera_wakeup(struct pxa_camera_dev *pcdev,
714 * 714 *
715 * The DMA chaining is done with DMA running. This means a tiny temporal window 715 * The DMA chaining is done with DMA running. This means a tiny temporal window
716 * remains, where a buffer is queued on the chain, while the chain is already 716 * remains, where a buffer is queued on the chain, while the chain is already
717 * stopped. This means the tailed buffer would never be transfered by DMA. 717 * stopped. This means the tailed buffer would never be transferred by DMA.
718 * This function restarts the capture for this corner case, where : 718 * This function restarts the capture for this corner case, where :
719 * - DADR() == DADDR_STOP 719 * - DADR() == DADDR_STOP
720 * - a videobuffer is queued on the pcdev->capture list 720 * - a videobuffer is queued on the pcdev->capture list
diff --git a/drivers/media/video/s5p-fimc/fimc-reg.c b/drivers/media/video/s5p-fimc/fimc-reg.c
index 4d929a394521..4893b2d91d84 100644
--- a/drivers/media/video/s5p-fimc/fimc-reg.c
+++ b/drivers/media/video/s5p-fimc/fimc-reg.c
@@ -356,7 +356,7 @@ void fimc_hw_en_capture(struct fimc_ctx *ctx)
356 /* one shot mode */ 356 /* one shot mode */
357 cfg |= S5P_CIIMGCPT_CPT_FREN_ENABLE | S5P_CIIMGCPT_IMGCPTEN; 357 cfg |= S5P_CIIMGCPT_CPT_FREN_ENABLE | S5P_CIIMGCPT_IMGCPTEN;
358 } else { 358 } else {
359 /* Continous frame capture mode (freerun). */ 359 /* Continuous frame capture mode (freerun). */
360 cfg &= ~(S5P_CIIMGCPT_CPT_FREN_ENABLE | 360 cfg &= ~(S5P_CIIMGCPT_CPT_FREN_ENABLE |
361 S5P_CIIMGCPT_CPT_FRMOD_CNT); 361 S5P_CIIMGCPT_CPT_FRMOD_CNT);
362 cfg |= S5P_CIIMGCPT_IMGCPTEN; 362 cfg |= S5P_CIIMGCPT_IMGCPTEN;
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 61c6007c8ea6..50f1be05ebd3 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -7460,7 +7460,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
7460 dev->tuner_type = TUNER_PHILIPS_FM1216ME_MK3; 7460 dev->tuner_type = TUNER_PHILIPS_FM1216ME_MK3;
7461 break; 7461 break;
7462 default: 7462 default:
7463 printk(KERN_ERR "%s Cant determine tuner type %x from EEPROM\n", dev->name, tuner_t); 7463 printk(KERN_ERR "%s Can't determine tuner type %x from EEPROM\n", dev->name, tuner_t);
7464 } 7464 }
7465 } else if ((data[1] != 0) && (data[1] != 0xff)) { 7465 } else if ((data[1] != 0) && (data[1] != 0xff)) {
7466 /* new config structure */ 7466 /* new config structure */
@@ -7480,7 +7480,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
7480 printk(KERN_INFO "%s Board has DVB-T\n", dev->name); 7480 printk(KERN_INFO "%s Board has DVB-T\n", dev->name);
7481 break; 7481 break;
7482 default: 7482 default:
7483 printk(KERN_ERR "%s Cant determine tuner type %x from EEPROM\n", dev->name, tuner_t); 7483 printk(KERN_ERR "%s Can't determine tuner type %x from EEPROM\n", dev->name, tuner_t);
7484 } 7484 }
7485 } else { 7485 } else {
7486 printk(KERN_ERR "%s unexpected config structure\n", dev->name); 7486 printk(KERN_ERR "%s unexpected config structure\n", dev->name);
diff --git a/drivers/media/video/saa7164/saa7164-cmd.c b/drivers/media/video/saa7164/saa7164-cmd.c
index 6a4c217ed3a7..62fac7f9d04e 100644
--- a/drivers/media/video/saa7164/saa7164-cmd.c
+++ b/drivers/media/video/saa7164/saa7164-cmd.c
@@ -257,7 +257,7 @@ out:
257} 257}
258 258
259/* Wait for a signal event, without holding a mutex. Either return TIMEOUT if 259/* Wait for a signal event, without holding a mutex. Either return TIMEOUT if
260 * the event never occured, or SAA_OK if it was signaled during the wait. 260 * the event never occurred, or SAA_OK if it was signaled during the wait.
261 */ 261 */
262int saa7164_cmd_wait(struct saa7164_dev *dev, u8 seqno) 262int saa7164_cmd_wait(struct saa7164_dev *dev, u8 seqno)
263{ 263{
diff --git a/drivers/media/video/saa7164/saa7164-fw.c b/drivers/media/video/saa7164/saa7164-fw.c
index b369300cce06..a266bf0169e6 100644
--- a/drivers/media/video/saa7164/saa7164-fw.c
+++ b/drivers/media/video/saa7164/saa7164-fw.c
@@ -444,7 +444,7 @@ int saa7164_downloadfirmware(struct saa7164_dev *dev)
444 printk(KERN_INFO " .Reserved = 0x%x\n", hdr->reserved); 444 printk(KERN_INFO " .Reserved = 0x%x\n", hdr->reserved);
445 printk(KERN_INFO " .Version = 0x%x\n", hdr->version); 445 printk(KERN_INFO " .Version = 0x%x\n", hdr->version);
446 446
447 /* Retreive bootloader if reqd */ 447 /* Retrieve bootloader if reqd */
448 if ((hdr->firmwaresize == 0) && (hdr->bslsize == 0)) 448 if ((hdr->firmwaresize == 0) && (hdr->bslsize == 0))
449 /* Second bootloader in the firmware file */ 449 /* Second bootloader in the firmware file */
450 filesize = hdr->reserved * 16; 450 filesize = hdr->reserved * 16;
diff --git a/drivers/media/video/saa7164/saa7164-types.h b/drivers/media/video/saa7164/saa7164-types.h
index df1d2997fa6c..1d2140a3eb38 100644
--- a/drivers/media/video/saa7164/saa7164-types.h
+++ b/drivers/media/video/saa7164/saa7164-types.h
@@ -412,7 +412,7 @@ struct tmComResVBIFormatDescrHeader {
412 u8 StartLine; /* NTSC Start = 10 */ 412 u8 StartLine; /* NTSC Start = 10 */
413 u8 EndLine; /* NTSC = 21 */ 413 u8 EndLine; /* NTSC = 21 */
414 u8 FieldRate; /* 60 for NTSC */ 414 u8 FieldRate; /* 60 for NTSC */
415 u8 bNumLines; /* Unsed - scheduled for removal */ 415 u8 bNumLines; /* Unused - scheduled for removal */
416} __attribute__((packed)); 416} __attribute__((packed));
417 417
418struct tmComResProbeCommit { 418struct tmComResProbeCommit {
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index ce56a1cdbf0a..0e07c493e6f0 100644
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -1810,7 +1810,7 @@ static int sn9c102_open(struct file *filp)
1810 /* 1810 /*
1811 We will not release the "open_mutex" lock, so that only one 1811 We will not release the "open_mutex" lock, so that only one
1812 process can be in the wait queue below. This way the process 1812 process can be in the wait queue below. This way the process
1813 will be sleeping while holding the lock, without loosing its 1813 will be sleeping while holding the lock, without losing its
1814 priority after any wake_up(). 1814 priority after any wake_up().
1815 */ 1815 */
1816 err = wait_event_interruptible_exclusive(cam->wait_open, 1816 err = wait_event_interruptible_exclusive(cam->wait_open,
diff --git a/drivers/media/video/sn9c102/sn9c102_sensor.h b/drivers/media/video/sn9c102/sn9c102_sensor.h
index 7f38549715b6..3679970dba2c 100644
--- a/drivers/media/video/sn9c102/sn9c102_sensor.h
+++ b/drivers/media/video/sn9c102/sn9c102_sensor.h
@@ -180,7 +180,7 @@ struct sn9c102_sensor {
180 It should be used to initialize the sensor only, but may also 180 It should be used to initialize the sensor only, but may also
181 configure part of the SN9C1XX chip if necessary. You don't need to 181 configure part of the SN9C1XX chip if necessary. You don't need to
182 setup picture settings like brightness, contrast, etc.. here, if 182 setup picture settings like brightness, contrast, etc.. here, if
183 the corrisponding controls are implemented (see below), since 183 the corresponding controls are implemented (see below), since
184 they are adjusted in the core driver by calling the set_ctrl() 184 they are adjusted in the core driver by calling the set_ctrl()
185 method after init(), where the arguments are the default values 185 method after init(), where the arguments are the default values
186 specified in the v4l2_queryctrl list of supported controls; 186 specified in the v4l2_queryctrl list of supported controls;
diff --git a/drivers/media/video/tcm825x.c b/drivers/media/video/tcm825x.c
index 54681a535822..b6ee1bd342dc 100644
--- a/drivers/media/video/tcm825x.c
+++ b/drivers/media/video/tcm825x.c
@@ -493,7 +493,7 @@ static int ioctl_g_ctrl(struct v4l2_int_device *s,
493 int val, r; 493 int val, r;
494 struct vcontrol *lvc; 494 struct vcontrol *lvc;
495 495
496 /* exposure time is special, spread accross 2 registers */ 496 /* exposure time is special, spread across 2 registers */
497 if (vc->id == V4L2_CID_EXPOSURE) { 497 if (vc->id == V4L2_CID_EXPOSURE) {
498 int val_lower, val_upper; 498 int val_lower, val_upper;
499 499
@@ -538,7 +538,7 @@ static int ioctl_s_ctrl(struct v4l2_int_device *s,
538 struct vcontrol *lvc; 538 struct vcontrol *lvc;
539 int val = vc->value; 539 int val = vc->value;
540 540
541 /* exposure time is special, spread accross 2 registers */ 541 /* exposure time is special, spread across 2 registers */
542 if (vc->id == V4L2_CID_EXPOSURE) { 542 if (vc->id == V4L2_CID_EXPOSURE) {
543 int val_lower, val_upper; 543 int val_lower, val_upper;
544 val_lower = val & TCM825X_MASK(TCM825X_ESRSPD_L); 544 val_lower = val & TCM825X_MASK(TCM825X_ESRSPD_L);
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index a25e2b5e1944..c46a3bb95852 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -1058,11 +1058,11 @@ static int tda9874a_initialize(struct CHIPSTATE *chip)
1058#define TDA9875_MVR 0x1b /* Main volume droite */ 1058#define TDA9875_MVR 0x1b /* Main volume droite */
1059#define TDA9875_MBA 0x1d /* Main Basse */ 1059#define TDA9875_MBA 0x1d /* Main Basse */
1060#define TDA9875_MTR 0x1e /* Main treble */ 1060#define TDA9875_MTR 0x1e /* Main treble */
1061#define TDA9875_ACS 0x1f /* Auxilary channel select (FM) 0b0000000*/ 1061#define TDA9875_ACS 0x1f /* Auxiliary channel select (FM) 0b0000000*/
1062#define TDA9875_AVL 0x20 /* Auxilary volume gauche */ 1062#define TDA9875_AVL 0x20 /* Auxiliary volume gauche */
1063#define TDA9875_AVR 0x21 /* Auxilary volume droite */ 1063#define TDA9875_AVR 0x21 /* Auxiliary volume droite */
1064#define TDA9875_ABA 0x22 /* Auxilary Basse */ 1064#define TDA9875_ABA 0x22 /* Auxiliary Basse */
1065#define TDA9875_ATR 0x23 /* Auxilary treble */ 1065#define TDA9875_ATR 0x23 /* Auxiliary treble */
1066 1066
1067#define TDA9875_MSR 0x02 /* Monitor select register */ 1067#define TDA9875_MSR 0x02 /* Monitor select register */
1068#define TDA9875_C1MSB 0x03 /* Carrier 1 (FM) frequency register MSB */ 1068#define TDA9875_C1MSB 0x03 /* Carrier 1 (FM) frequency register MSB */
diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c
index 545c0294813d..fc766b9f24c5 100644
--- a/drivers/media/video/uvc/uvc_video.c
+++ b/drivers/media/video/uvc/uvc_video.c
@@ -394,11 +394,11 @@ int uvc_commit_video(struct uvc_streaming *stream,
394 * 394 *
395 * uvc_video_decode_end is called with header data at the end of a bulk or 395 * uvc_video_decode_end is called with header data at the end of a bulk or
396 * isochronous payload. It performs any additional header data processing and 396 * isochronous payload. It performs any additional header data processing and
397 * returns 0 or a negative error code if an error occured. As header data have 397 * returns 0 or a negative error code if an error occurred. As header data have
398 * already been processed by uvc_video_decode_start, this functions isn't 398 * already been processed by uvc_video_decode_start, this functions isn't
399 * required to perform sanity checks a second time. 399 * required to perform sanity checks a second time.
400 * 400 *
401 * For isochronous transfers where a payload is always transfered in a single 401 * For isochronous transfers where a payload is always transferred in a single
402 * URB, the three functions will be called in a row. 402 * URB, the three functions will be called in a row.
403 * 403 *
404 * To let the decoder process header data and update its internal state even 404 * To let the decoder process header data and update its internal state even
@@ -658,7 +658,7 @@ static void uvc_video_decode_bulk(struct urb *urb, struct uvc_streaming *stream,
658 buf); 658 buf);
659 } while (ret == -EAGAIN); 659 } while (ret == -EAGAIN);
660 660
661 /* If an error occured skip the rest of the payload. */ 661 /* If an error occurred skip the rest of the payload. */
662 if (ret < 0 || buf == NULL) { 662 if (ret < 0 || buf == NULL) {
663 stream->bulk.skip_payload = 1; 663 stream->bulk.skip_payload = 1;
664 } else { 664 } else {
@@ -821,7 +821,7 @@ static int uvc_alloc_urb_buffers(struct uvc_streaming *stream,
821 return stream->urb_size / psize; 821 return stream->urb_size / psize;
822 822
823 /* Compute the number of packets. Bulk endpoints might transfer UVC 823 /* Compute the number of packets. Bulk endpoints might transfer UVC
824 * payloads accross multiple URBs. 824 * payloads across multiple URBs.
825 */ 825 */
826 npackets = DIV_ROUND_UP(size, psize); 826 npackets = DIV_ROUND_UP(size, psize);
827 if (npackets > UVC_MAX_PACKETS) 827 if (npackets > UVC_MAX_PACKETS)
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index a01ed39e6c16..506edcc2ddeb 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -48,7 +48,7 @@
48 printk(KERN_CONT "%s: " fmt, vfd->name, ## arg);\ 48 printk(KERN_CONT "%s: " fmt, vfd->name, ## arg);\
49 } while (0) 49 } while (0)
50 50
51/* Zero out the end of the struct pointed to by p. Everthing after, but 51/* Zero out the end of the struct pointed to by p. Everything after, but
52 * not including, the specified field is cleared. */ 52 * not including, the specified field is cleared. */
53#define CLEAR_AFTER_FIELD(p, field) \ 53#define CLEAR_AFTER_FIELD(p, field) \
54 memset((u8 *)(p) + offsetof(typeof(*(p)), field) + sizeof((p)->field), \ 54 memset((u8 *)(p) + offsetof(typeof(*(p)), field) + sizeof((p)->field), \
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 75301d10a838..ca372eb911d0 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -354,7 +354,7 @@ static int vpx3220_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
354 354
355 /* Here we back up the input selection because it gets 355 /* Here we back up the input selection because it gets
356 overwritten when we fill the registers with the 356 overwritten when we fill the registers with the
357 choosen video norm */ 357 chosen video norm */
358 temp_input = vpx3220_fp_read(sd, 0xf2); 358 temp_input = vpx3220_fp_read(sd, 0xf2);
359 359
360 v4l2_dbg(1, debug, sd, "s_std %llx\n", (unsigned long long)std); 360 v4l2_dbg(1, debug, sd, "s_std %llx\n", (unsigned long long)std);
diff --git a/drivers/media/video/zoran/videocodec.h b/drivers/media/video/zoran/videocodec.h
index b654bfff8740..def55585ad23 100644
--- a/drivers/media/video/zoran/videocodec.h
+++ b/drivers/media/video/zoran/videocodec.h
@@ -57,7 +57,7 @@
57 therfor they may not be initialized. 57 therfor they may not be initialized.
58 58
59 The other functions are just for convenience, as they are for sure used by 59 The other functions are just for convenience, as they are for sure used by
60 most/all of the codecs. The last ones may be ommited, too. 60 most/all of the codecs. The last ones may be omitted, too.
61 61
62 See the structure declaration below for more information and which data has 62 See the structure declaration below for more information and which data has
63 to be set up for the master and the slave. 63 to be set up for the master and the slave.
diff --git a/drivers/media/video/zoran/zoran.h b/drivers/media/video/zoran/zoran.h
index 4bb368e6fd47..f3f640014928 100644
--- a/drivers/media/video/zoran/zoran.h
+++ b/drivers/media/video/zoran/zoran.h
@@ -259,7 +259,7 @@ struct card_info {
259 struct vfe_polarity vfe_pol; 259 struct vfe_polarity vfe_pol;
260 u8 gpio_pol[ZR_GPIO_MAX]; 260 u8 gpio_pol[ZR_GPIO_MAX];
261 261
262 /* is the /GWS line conected? */ 262 /* is the /GWS line connected? */
263 u8 gws_not_connected; 263 u8 gws_not_connected;
264 264
265 /* avs6eyes mux setting */ 265 /* avs6eyes mux setting */
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index 7c3921de9589..2771d818406e 100644
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -1254,7 +1254,7 @@ static int setup_overlay(struct zoran_fh *fh, int on)
1254{ 1254{
1255 struct zoran *zr = fh->zr; 1255 struct zoran *zr = fh->zr;
1256 1256
1257 /* If there is nothing to do, return immediatly */ 1257 /* If there is nothing to do, return immediately */
1258 if ((on && fh->overlay_active != ZORAN_FREE) || 1258 if ((on && fh->overlay_active != ZORAN_FREE) ||
1259 (!on && fh->overlay_active == ZORAN_FREE)) 1259 (!on && fh->overlay_active == ZORAN_FREE))
1260 return 0; 1260 return 0;
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
index 57b42bfc7d23..4a1909a32b60 100644
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
@@ -973,7 +973,7 @@ try_again:
973} 973}
974 974
975/* Memory allocated for attributes by this function should be freed by 975/* Memory allocated for attributes by this function should be freed by
976 * mspro_block_data_clear, no matter if the initialization process succeded 976 * mspro_block_data_clear, no matter if the initialization process succeeded
977 * or failed. 977 * or failed.
978 */ 978 */
979static int mspro_block_read_attributes(struct memstick_dev *card) 979static int mspro_block_read_attributes(struct memstick_dev *card)
diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
index 700d420a59ac..668f5c6a0399 100644
--- a/drivers/memstick/host/r592.c
+++ b/drivers/memstick/host/r592.c
@@ -796,7 +796,7 @@ static int r592_probe(struct pci_dev *pdev, const struct pci_device_id *id)
796 if (memstick_add_host(host)) 796 if (memstick_add_host(host))
797 goto error7; 797 goto error7;
798 798
799 message("driver succesfully loaded"); 799 message("driver successfully loaded");
800 return 0; 800 return 0;
801error7: 801error7:
802 free_irq(dev->irq, dev); 802 free_irq(dev->irq, dev);
diff --git a/drivers/memstick/host/r592.h b/drivers/memstick/host/r592.h
index eee264e6028f..c5726c1e8832 100644
--- a/drivers/memstick/host/r592.h
+++ b/drivers/memstick/host/r592.h
@@ -43,12 +43,12 @@
43 43
44 /* Error detection via CRC */ 44 /* Error detection via CRC */
45#define R592_STATUS_SEND_ERR (1 << 24) /* Send failed */ 45#define R592_STATUS_SEND_ERR (1 << 24) /* Send failed */
46#define R592_STATUS_RECV_ERR (1 << 25) /* Recieve failed */ 46#define R592_STATUS_RECV_ERR (1 << 25) /* Receive failed */
47 47
48 /* Card state */ 48 /* Card state */
49#define R592_STATUS_RDY (1 << 28) /* RDY signal recieved */ 49#define R592_STATUS_RDY (1 << 28) /* RDY signal received */
50#define R592_STATUS_CED (1 << 29) /* INT: Command done (serial mode)*/ 50#define R592_STATUS_CED (1 << 29) /* INT: Command done (serial mode)*/
51#define R592_STATUS_SFIFO_INPUT (1 << 30) /* Small fifo recieved data*/ 51#define R592_STATUS_SFIFO_INPUT (1 << 30) /* Small fifo received data*/
52 52
53#define R592_SFIFO_SIZE 32 /* total size of small fifo is 32 bytes */ 53#define R592_SFIFO_SIZE 32 /* total size of small fifo is 32 bytes */
54#define R592_SFIFO_PACKET 8 /* packet size of small fifo */ 54#define R592_SFIFO_PACKET 8 /* packet size of small fifo */
diff --git a/drivers/message/fusion/lsi/mpi_log_fc.h b/drivers/message/fusion/lsi/mpi_log_fc.h
index face6e7acc72..03be8b217709 100644
--- a/drivers/message/fusion/lsi/mpi_log_fc.h
+++ b/drivers/message/fusion/lsi/mpi_log_fc.h
@@ -38,8 +38,8 @@ typedef enum _MpiIocLogInfoFc
38{ 38{
39 MPI_IOCLOGINFO_FC_INIT_BASE = 0x20000000, 39 MPI_IOCLOGINFO_FC_INIT_BASE = 0x20000000,
40 MPI_IOCLOGINFO_FC_INIT_ERROR_OUT_OF_ORDER_FRAME = 0x20000001, /* received an out of order frame - unsupported */ 40 MPI_IOCLOGINFO_FC_INIT_ERROR_OUT_OF_ORDER_FRAME = 0x20000001, /* received an out of order frame - unsupported */
41 MPI_IOCLOGINFO_FC_INIT_ERROR_BAD_START_OF_FRAME = 0x20000002, /* Bad Rx Frame, bad start of frame primative */ 41 MPI_IOCLOGINFO_FC_INIT_ERROR_BAD_START_OF_FRAME = 0x20000002, /* Bad Rx Frame, bad start of frame primitive */
42 MPI_IOCLOGINFO_FC_INIT_ERROR_BAD_END_OF_FRAME = 0x20000003, /* Bad Rx Frame, bad end of frame primative */ 42 MPI_IOCLOGINFO_FC_INIT_ERROR_BAD_END_OF_FRAME = 0x20000003, /* Bad Rx Frame, bad end of frame primitive */
43 MPI_IOCLOGINFO_FC_INIT_ERROR_OVER_RUN = 0x20000004, /* Bad Rx Frame, overrun */ 43 MPI_IOCLOGINFO_FC_INIT_ERROR_OVER_RUN = 0x20000004, /* Bad Rx Frame, overrun */
44 MPI_IOCLOGINFO_FC_INIT_ERROR_RX_OTHER = 0x20000005, /* Other errors caught by IOC which require retries */ 44 MPI_IOCLOGINFO_FC_INIT_ERROR_RX_OTHER = 0x20000005, /* Other errors caught by IOC which require retries */
45 MPI_IOCLOGINFO_FC_INIT_ERROR_SUBPROC_DEAD = 0x20000006, /* Main processor could not initialize sub-processor */ 45 MPI_IOCLOGINFO_FC_INIT_ERROR_SUBPROC_DEAD = 0x20000006, /* Main processor could not initialize sub-processor */
diff --git a/drivers/message/fusion/lsi/mpi_log_sas.h b/drivers/message/fusion/lsi/mpi_log_sas.h
index 8b04810df469..f62960b5d527 100644
--- a/drivers/message/fusion/lsi/mpi_log_sas.h
+++ b/drivers/message/fusion/lsi/mpi_log_sas.h
@@ -56,9 +56,9 @@
56#define IOP_LOGINFO_CODE_FWUPLOAD_NO_FLASH_AVAILABLE (0x0003E000) /* Tried to upload from flash, but there is none */ 56#define IOP_LOGINFO_CODE_FWUPLOAD_NO_FLASH_AVAILABLE (0x0003E000) /* Tried to upload from flash, but there is none */
57#define IOP_LOGINFO_CODE_FWUPLOAD_UNKNOWN_IMAGE_TYPE (0x0003E001) /* ImageType field contents were invalid */ 57#define IOP_LOGINFO_CODE_FWUPLOAD_UNKNOWN_IMAGE_TYPE (0x0003E001) /* ImageType field contents were invalid */
58#define IOP_LOGINFO_CODE_FWUPLOAD_WRONG_IMAGE_SIZE (0x0003E002) /* ImageSize field in TCSGE was bad/offset in MfgPg 4 was wrong */ 58#define IOP_LOGINFO_CODE_FWUPLOAD_WRONG_IMAGE_SIZE (0x0003E002) /* ImageSize field in TCSGE was bad/offset in MfgPg 4 was wrong */
59#define IOP_LOGINFO_CODE_FWUPLOAD_ENTIRE_FLASH_UPLOAD_FAILED (0x0003E003) /* Error occured while attempting to upload the entire flash */ 59#define IOP_LOGINFO_CODE_FWUPLOAD_ENTIRE_FLASH_UPLOAD_FAILED (0x0003E003) /* Error occurred while attempting to upload the entire flash */
60#define IOP_LOGINFO_CODE_FWUPLOAD_REGION_UPLOAD_FAILED (0x0003E004) /* Error occured while attempting to upload single flash region */ 60#define IOP_LOGINFO_CODE_FWUPLOAD_REGION_UPLOAD_FAILED (0x0003E004) /* Error occurred while attempting to upload single flash region */
61#define IOP_LOGINFO_CODE_FWUPLOAD_DMA_FAILURE (0x0003E005) /* Problem occured while DMAing FW to host memory */ 61#define IOP_LOGINFO_CODE_FWUPLOAD_DMA_FAILURE (0x0003E005) /* Problem occurred while DMAing FW to host memory */
62 62
63#define IOP_LOGINFO_CODE_DIAG_MSG_ERROR (0x00040000) /* Error handling diag msg - or'd with diag status */ 63#define IOP_LOGINFO_CODE_DIAG_MSG_ERROR (0x00040000) /* Error handling diag msg - or'd with diag status */
64 64
@@ -187,8 +187,8 @@
187#define PL_LOGINFO_SUB_CODE_BREAK_ON_INCOMPLETE_BREAK_RCVD (0x00005000) 187#define PL_LOGINFO_SUB_CODE_BREAK_ON_INCOMPLETE_BREAK_RCVD (0x00005000)
188 188
189#define PL_LOGINFO_CODE_ENCL_MGMT_SMP_FRAME_FAILURE (0x00200000) /* Can't get SMP Frame */ 189#define PL_LOGINFO_CODE_ENCL_MGMT_SMP_FRAME_FAILURE (0x00200000) /* Can't get SMP Frame */
190#define PL_LOGINFO_CODE_ENCL_MGMT_SMP_READ_ERROR (0x00200010) /* Error occured on SMP Read */ 190#define PL_LOGINFO_CODE_ENCL_MGMT_SMP_READ_ERROR (0x00200010) /* Error occurred on SMP Read */
191#define PL_LOGINFO_CODE_ENCL_MGMT_SMP_WRITE_ERROR (0x00200020) /* Error occured on SMP Write */ 191#define PL_LOGINFO_CODE_ENCL_MGMT_SMP_WRITE_ERROR (0x00200020) /* Error occurred on SMP Write */
192#define PL_LOGINFO_CODE_ENCL_MGMT_NOT_SUPPORTED_ON_ENCL (0x00200040) /* Encl Mgmt services not available for this WWID */ 192#define PL_LOGINFO_CODE_ENCL_MGMT_NOT_SUPPORTED_ON_ENCL (0x00200040) /* Encl Mgmt services not available for this WWID */
193#define PL_LOGINFO_CODE_ENCL_MGMT_ADDR_MODE_NOT_SUPPORTED (0x00200050) /* Address Mode not suppored */ 193#define PL_LOGINFO_CODE_ENCL_MGMT_ADDR_MODE_NOT_SUPPORTED (0x00200050) /* Address Mode not suppored */
194#define PL_LOGINFO_CODE_ENCL_MGMT_BAD_SLOT_NUM (0x00200060) /* Invalid Slot Number in SEP Msg */ 194#define PL_LOGINFO_CODE_ENCL_MGMT_BAD_SLOT_NUM (0x00200060) /* Invalid Slot Number in SEP Msg */
@@ -207,8 +207,8 @@
207#define PL_LOGINFO_DA_SEP_RECEIVED_NACK_FROM_SLAVE (0x00200103) /* SEP NACK'd, it is busy */ 207#define PL_LOGINFO_DA_SEP_RECEIVED_NACK_FROM_SLAVE (0x00200103) /* SEP NACK'd, it is busy */
208#define PL_LOGINFO_DA_SEP_DID_NOT_RECEIVE_ACK (0x00200104) /* SEP didn't rcv. ACK (Last Rcvd Bit = 1) */ 208#define PL_LOGINFO_DA_SEP_DID_NOT_RECEIVE_ACK (0x00200104) /* SEP didn't rcv. ACK (Last Rcvd Bit = 1) */
209#define PL_LOGINFO_DA_SEP_BAD_STATUS_HDR_CHKSUM (0x00200105) /* SEP stopped or sent bad chksum in Hdr */ 209#define PL_LOGINFO_DA_SEP_BAD_STATUS_HDR_CHKSUM (0x00200105) /* SEP stopped or sent bad chksum in Hdr */
210#define PL_LOGINFO_DA_SEP_STOP_ON_DATA (0x00200106) /* SEP stopped while transfering data */ 210#define PL_LOGINFO_DA_SEP_STOP_ON_DATA (0x00200106) /* SEP stopped while transferring data */
211#define PL_LOGINFO_DA_SEP_STOP_ON_SENSE_DATA (0x00200107) /* SEP stopped while transfering sense data */ 211#define PL_LOGINFO_DA_SEP_STOP_ON_SENSE_DATA (0x00200107) /* SEP stopped while transferring sense data */
212#define PL_LOGINFO_DA_SEP_UNSUPPORTED_SCSI_STATUS_1 (0x00200108) /* SEP returned unknown scsi status */ 212#define PL_LOGINFO_DA_SEP_UNSUPPORTED_SCSI_STATUS_1 (0x00200108) /* SEP returned unknown scsi status */
213#define PL_LOGINFO_DA_SEP_UNSUPPORTED_SCSI_STATUS_2 (0x00200109) /* SEP returned unknown scsi status */ 213#define PL_LOGINFO_DA_SEP_UNSUPPORTED_SCSI_STATUS_2 (0x00200109) /* SEP returned unknown scsi status */
214#define PL_LOGINFO_DA_SEP_CHKSUM_ERROR_AFTER_STOP (0x0020010A) /* SEP returned bad chksum after STOP */ 214#define PL_LOGINFO_DA_SEP_CHKSUM_ERROR_AFTER_STOP (0x0020010A) /* SEP returned bad chksum after STOP */
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index ec8080c98081..fa15e853d4e8 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -3435,7 +3435,7 @@ SendPortEnable(MPT_ADAPTER *ioc, int portnum, int sleepFlag)
3435 * If memory has already been allocated, the same (cached) value 3435 * If memory has already been allocated, the same (cached) value
3436 * is returned. 3436 * is returned.
3437 * 3437 *
3438 * Return 0 if successfull, or non-zero for failure 3438 * Return 0 if successful, or non-zero for failure
3439 **/ 3439 **/
3440int 3440int
3441mpt_alloc_fw_memory(MPT_ADAPTER *ioc, int size) 3441mpt_alloc_fw_memory(MPT_ADAPTER *ioc, int size)
@@ -6932,7 +6932,7 @@ EXPORT_SYMBOL(mpt_halt_firmware);
6932 * Message Unit Reset - instructs the IOC to reset the Reply Post and 6932 * Message Unit Reset - instructs the IOC to reset the Reply Post and
6933 * Free FIFO's. All the Message Frames on Reply Free FIFO are discarded. 6933 * Free FIFO's. All the Message Frames on Reply Free FIFO are discarded.
6934 * All posted buffers are freed, and event notification is turned off. 6934 * All posted buffers are freed, and event notification is turned off.
6935 * IOC doesnt reply to any outstanding request. This will transfer IOC 6935 * IOC doesn't reply to any outstanding request. This will transfer IOC
6936 * to READY state. 6936 * to READY state.
6937 **/ 6937 **/
6938int 6938int
@@ -7905,7 +7905,7 @@ mpt_spi_log_info(MPT_ADAPTER *ioc, u32 log_info)
7905 "Owner", /* 15h */ 7905 "Owner", /* 15h */
7906 "Open Transmit DMA Abort", /* 16h */ 7906 "Open Transmit DMA Abort", /* 16h */
7907 "IO Device Missing Delay Retry", /* 17h */ 7907 "IO Device Missing Delay Retry", /* 17h */
7908 "IO Cancelled Due to Recieve Error", /* 18h */ 7908 "IO Cancelled Due to Receive Error", /* 18h */
7909 NULL, /* 19h */ 7909 NULL, /* 19h */
7910 NULL, /* 1Ah */ 7910 NULL, /* 1Ah */
7911 NULL, /* 1Bh */ 7911 NULL, /* 1Bh */
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index 878bda0cce70..6e6e16aab9da 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -985,7 +985,7 @@ retry_wait:
985 ReplyMsg = (pFWDownloadReply_t)iocp->ioctl_cmds.reply; 985 ReplyMsg = (pFWDownloadReply_t)iocp->ioctl_cmds.reply;
986 iocstat = le16_to_cpu(ReplyMsg->IOCStatus) & MPI_IOCSTATUS_MASK; 986 iocstat = le16_to_cpu(ReplyMsg->IOCStatus) & MPI_IOCSTATUS_MASK;
987 if (iocstat == MPI_IOCSTATUS_SUCCESS) { 987 if (iocstat == MPI_IOCSTATUS_SUCCESS) {
988 printk(MYIOC_s_INFO_FMT "F/W update successfull!\n", iocp->name); 988 printk(MYIOC_s_INFO_FMT "F/W update successful!\n", iocp->name);
989 return 0; 989 return 0;
990 } else if (iocstat == MPI_IOCSTATUS_INVALID_FUNCTION) { 990 } else if (iocstat == MPI_IOCSTATUS_INVALID_FUNCTION) {
991 printk(MYIOC_s_WARN_FMT "Hmmm... F/W download not supported!?!\n", 991 printk(MYIOC_s_WARN_FMT "Hmmm... F/W download not supported!?!\n",
@@ -2407,7 +2407,7 @@ done_free_mem:
2407 } 2407 }
2408 2408
2409 /* mf is null if command issued successfully 2409 /* mf is null if command issued successfully
2410 * otherwise, failure occured after mf acquired. 2410 * otherwise, failure occurred after mf acquired.
2411 */ 2411 */
2412 if (mf) 2412 if (mf)
2413 mpt_free_msg_frame(ioc, mf); 2413 mpt_free_msg_frame(ioc, mf);
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index f5a14afad2cd..66f94125de4e 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -307,7 +307,7 @@ mptsas_requeue_fw_event(MPT_ADAPTER *ioc, struct fw_event_work *fw_event,
307 spin_unlock_irqrestore(&ioc->fw_event_lock, flags); 307 spin_unlock_irqrestore(&ioc->fw_event_lock, flags);
308} 308}
309 309
310/* free memory assoicated to a sas firmware event */ 310/* free memory associated to a sas firmware event */
311static void 311static void
312mptsas_free_fw_event(MPT_ADAPTER *ioc, struct fw_event_work *fw_event) 312mptsas_free_fw_event(MPT_ADAPTER *ioc, struct fw_event_work *fw_event)
313{ 313{
@@ -1094,7 +1094,7 @@ mptsas_block_io_starget(struct scsi_target *starget)
1094/** 1094/**
1095 * mptsas_target_reset_queue 1095 * mptsas_target_reset_queue
1096 * 1096 *
1097 * Receive request for TARGET_RESET after recieving an firmware 1097 * Receive request for TARGET_RESET after receiving an firmware
1098 * event NOT_RESPONDING_EVENT, then put command in link list 1098 * event NOT_RESPONDING_EVENT, then put command in link list
1099 * and queue if task_queue already in use. 1099 * and queue if task_queue already in use.
1100 * 1100 *
@@ -1403,7 +1403,7 @@ mptsas_sas_enclosure_pg0(MPT_ADAPTER *ioc, struct mptsas_enclosure *enclosure,
1403/** 1403/**
1404 * mptsas_add_end_device - report a new end device to sas transport layer 1404 * mptsas_add_end_device - report a new end device to sas transport layer
1405 * @ioc: Pointer to MPT_ADAPTER structure 1405 * @ioc: Pointer to MPT_ADAPTER structure
1406 * @phy_info: decribes attached device 1406 * @phy_info: describes attached device
1407 * 1407 *
1408 * return (0) success (1) failure 1408 * return (0) success (1) failure
1409 * 1409 *
@@ -1481,7 +1481,7 @@ mptsas_add_end_device(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info)
1481/** 1481/**
1482 * mptsas_del_end_device - report a deleted end device to sas transport layer 1482 * mptsas_del_end_device - report a deleted end device to sas transport layer
1483 * @ioc: Pointer to MPT_ADAPTER structure 1483 * @ioc: Pointer to MPT_ADAPTER structure
1484 * @phy_info: decribes attached device 1484 * @phy_info: describes attached device
1485 * 1485 *
1486 **/ 1486 **/
1487static void 1487static void
diff --git a/drivers/message/i2o/README b/drivers/message/i2o/README
index 911fc3021e3b..f072a8eb3041 100644
--- a/drivers/message/i2o/README
+++ b/drivers/message/i2o/README
@@ -53,7 +53,7 @@ Symbios Logic (Now LSI)
53BoxHill Corporation 53BoxHill Corporation
54 Loan of initial FibreChannel disk array used for development work. 54 Loan of initial FibreChannel disk array used for development work.
55 55
56European Comission 56European Commission
57 Funding the work done by the University of Helsinki 57 Funding the work done by the University of Helsinki
58 58
59SysKonnect 59SysKonnect
diff --git a/drivers/message/i2o/device.c b/drivers/message/i2o/device.c
index 0ee4264f5db7..4547db99f7da 100644
--- a/drivers/message/i2o/device.c
+++ b/drivers/message/i2o/device.c
@@ -65,7 +65,7 @@ int i2o_device_claim(struct i2o_device *dev)
65 65
66 rc = i2o_device_issue_claim(dev, I2O_CMD_UTIL_CLAIM, I2O_CLAIM_PRIMARY); 66 rc = i2o_device_issue_claim(dev, I2O_CMD_UTIL_CLAIM, I2O_CLAIM_PRIMARY);
67 if (!rc) 67 if (!rc)
68 pr_debug("i2o: claim of device %d succeded\n", 68 pr_debug("i2o: claim of device %d succeeded\n",
69 dev->lct_data.tid); 69 dev->lct_data.tid);
70 else 70 else
71 pr_debug("i2o: claim of device %d failed %d\n", 71 pr_debug("i2o: claim of device %d failed %d\n",
@@ -110,7 +110,7 @@ int i2o_device_claim_release(struct i2o_device *dev)
110 } 110 }
111 111
112 if (!rc) 112 if (!rc)
113 pr_debug("i2o: claim release of device %d succeded\n", 113 pr_debug("i2o: claim release of device %d succeeded\n",
114 dev->lct_data.tid); 114 dev->lct_data.tid);
115 else 115 else
116 pr_debug("i2o: claim release of device %d failed %d\n", 116 pr_debug("i2o: claim release of device %d failed %d\n",
@@ -248,7 +248,7 @@ static int i2o_device_add(struct i2o_controller *c, i2o_lct_entry *entry)
248 goto unreg_dev; 248 goto unreg_dev;
249 } 249 }
250 250
251 /* create user entries refering to this device */ 251 /* create user entries referring to this device */
252 list_for_each_entry(tmp, &c->devices, list) 252 list_for_each_entry(tmp, &c->devices, list)
253 if ((tmp->lct_data.user_tid == i2o_dev->lct_data.tid) 253 if ((tmp->lct_data.user_tid == i2o_dev->lct_data.tid)
254 && (tmp != i2o_dev)) { 254 && (tmp != i2o_dev)) {
@@ -267,7 +267,7 @@ static int i2o_device_add(struct i2o_controller *c, i2o_lct_entry *entry)
267 goto rmlink1; 267 goto rmlink1;
268 } 268 }
269 269
270 /* create parent entries refering to this device */ 270 /* create parent entries referring to this device */
271 list_for_each_entry(tmp, &c->devices, list) 271 list_for_each_entry(tmp, &c->devices, list)
272 if ((tmp->lct_data.parent_tid == i2o_dev->lct_data.tid) 272 if ((tmp->lct_data.parent_tid == i2o_dev->lct_data.tid)
273 && (tmp != i2o_dev)) { 273 && (tmp != i2o_dev)) {
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index 47ec5bc0ed21..643ad52e3ca2 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -610,7 +610,7 @@ static int i2o_block_release(struct gendisk *disk, fmode_t mode)
610 610
611 /* 611 /*
612 * This is to deail with the case of an application 612 * This is to deail with the case of an application
613 * opening a device and then the device dissapears while 613 * opening a device and then the device disappears while
614 * it's in use, and then the application tries to release 614 * it's in use, and then the application tries to release
615 * it. ex: Unmounting a deleted RAID volume at reboot. 615 * it. ex: Unmounting a deleted RAID volume at reboot.
616 * If we send messages, it will just cause FAILs since 616 * If we send messages, it will just cause FAILs since
@@ -717,7 +717,7 @@ static unsigned int i2o_block_check_events(struct gendisk *disk,
717 717
718/** 718/**
719 * i2o_block_transfer - Transfer a request to/from the I2O controller 719 * i2o_block_transfer - Transfer a request to/from the I2O controller
720 * @req: the request which should be transfered 720 * @req: the request which should be transferred
721 * 721 *
722 * This function converts the request into a I2O message. The necessary 722 * This function converts the request into a I2O message. The necessary
723 * DMA buffers are allocated and after everything is setup post the message 723 * DMA buffers are allocated and after everything is setup post the message
diff --git a/drivers/message/i2o/i2o_block.h b/drivers/message/i2o/i2o_block.h
index 67f921b4419b..cf8873cbca3f 100644
--- a/drivers/message/i2o/i2o_block.h
+++ b/drivers/message/i2o/i2o_block.h
@@ -73,7 +73,7 @@ struct i2o_block_device {
73 struct i2o_device *i2o_dev; /* pointer to I2O device */ 73 struct i2o_device *i2o_dev; /* pointer to I2O device */
74 struct gendisk *gd; 74 struct gendisk *gd;
75 spinlock_t lock; /* queue lock */ 75 spinlock_t lock; /* queue lock */
76 struct list_head open_queue; /* list of transfered, but unfinished 76 struct list_head open_queue; /* list of transferred, but unfinished
77 requests */ 77 requests */
78 unsigned int open_queue_depth; /* number of requests in the queue */ 78 unsigned int open_queue_depth; /* number of requests in the queue */
79 79
diff --git a/drivers/message/i2o/i2o_scsi.c b/drivers/message/i2o/i2o_scsi.c
index 97bdf82ec905..f003957e8e1c 100644
--- a/drivers/message/i2o/i2o_scsi.c
+++ b/drivers/message/i2o/i2o_scsi.c
@@ -204,7 +204,7 @@ static int i2o_scsi_remove(struct device *dev)
204 * i2o_scsi_probe - verify if dev is a I2O SCSI device and install it 204 * i2o_scsi_probe - verify if dev is a I2O SCSI device and install it
205 * @dev: device to verify if it is a I2O SCSI device 205 * @dev: device to verify if it is a I2O SCSI device
206 * 206 *
207 * Retrieve channel, id and lun for I2O device. If everthing goes well 207 * Retrieve channel, id and lun for I2O device. If everything goes well
208 * register the I2O device as SCSI device on the I2O SCSI controller. 208 * register the I2O device as SCSI device on the I2O SCSI controller.
209 * 209 *
210 * Returns 0 on success or negative error code on failure. 210 * Returns 0 on success or negative error code on failure.
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index e2fea580585a..3ed3ff06be5d 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -201,7 +201,7 @@ config TWL4030_POWER
201 as clock request handshaking. 201 as clock request handshaking.
202 202
203 This driver uses board-specific data to initialize the resources 203 This driver uses board-specific data to initialize the resources
204 and load scripts controling which resources are switched off/on 204 and load scripts controlling which resources are switched off/on
205 or reset when a sleep, wakeup or warm reset event occurs. 205 or reset when a sleep, wakeup or warm reset event occurs.
206 206
207config TWL4030_CODEC 207config TWL4030_CODEC
diff --git a/drivers/mfd/ab8500-gpadc.c b/drivers/mfd/ab8500-gpadc.c
index bc93b2e8230c..6421ad1160de 100644
--- a/drivers/mfd/ab8500-gpadc.c
+++ b/drivers/mfd/ab8500-gpadc.c
@@ -314,7 +314,7 @@ int ab8500_gpadc_convert(struct ab8500_gpadc *gpadc, u8 input)
314 /* wait for completion of conversion */ 314 /* wait for completion of conversion */
315 if (!wait_for_completion_timeout(&gpadc->ab8500_gpadc_complete, 2*HZ)) { 315 if (!wait_for_completion_timeout(&gpadc->ab8500_gpadc_complete, 2*HZ)) {
316 dev_err(gpadc->dev, 316 dev_err(gpadc->dev,
317 "timeout: didnt recieve GPADC conversion interrupt\n"); 317 "timeout: didn't receive GPADC conversion interrupt\n");
318 ret = -EINVAL; 318 ret = -EINVAL;
319 goto out; 319 goto out;
320 } 320 }
diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
index f2f4029e21a0..43a76c41cfcc 100644
--- a/drivers/mfd/ezx-pcap.c
+++ b/drivers/mfd/ezx-pcap.c
@@ -185,7 +185,7 @@ static void pcap_isr_work(struct work_struct *work)
185 ezx_pcap_read(pcap, PCAP_REG_MSR, &msr); 185 ezx_pcap_read(pcap, PCAP_REG_MSR, &msr);
186 ezx_pcap_read(pcap, PCAP_REG_ISR, &isr); 186 ezx_pcap_read(pcap, PCAP_REG_ISR, &isr);
187 187
188 /* We cant service/ack irqs that are assigned to port 2 */ 188 /* We can't service/ack irqs that are assigned to port 2 */
189 if (!(pdata->config & PCAP_SECOND_PORT)) { 189 if (!(pdata->config & PCAP_SECOND_PORT)) {
190 ezx_pcap_read(pcap, PCAP_REG_INT_SEL, &int_sel); 190 ezx_pcap_read(pcap, PCAP_REG_INT_SEL, &int_sel);
191 isr &= ~int_sel; 191 isr &= ~int_sel;
@@ -457,7 +457,7 @@ static int __devinit ezx_pcap_probe(struct spi_device *spi)
457 pcap->workqueue = create_singlethread_workqueue("pcapd"); 457 pcap->workqueue = create_singlethread_workqueue("pcapd");
458 if (!pcap->workqueue) { 458 if (!pcap->workqueue) {
459 ret = -ENOMEM; 459 ret = -ENOMEM;
460 dev_err(&spi->dev, "cant create pcap thread\n"); 460 dev_err(&spi->dev, "can't create pcap thread\n");
461 goto free_pcap; 461 goto free_pcap;
462 } 462 }
463 463
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index cb01209754e0..53450f433f10 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -332,7 +332,7 @@ static int __devinit usbhs_omap_probe(struct platform_device *pdev)
332 int i; 332 int i;
333 333
334 if (!pdata) { 334 if (!pdata) {
335 dev_err(dev, "Missing platfrom data\n"); 335 dev_err(dev, "Missing platform data\n");
336 ret = -ENOMEM; 336 ret = -ENOMEM;
337 goto end_probe; 337 goto end_probe;
338 } 338 }
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c
index c7687f6a78a0..57868416c760 100644
--- a/drivers/mfd/pcf50633-core.c
+++ b/drivers/mfd/pcf50633-core.c
@@ -51,7 +51,7 @@ static int __pcf50633_write(struct pcf50633 *pcf, u8 reg, int num, u8 *data)
51 51
52} 52}
53 53
54/* Read a block of upto 32 regs */ 54/* Read a block of up to 32 regs */
55int pcf50633_read_block(struct pcf50633 *pcf, u8 reg, 55int pcf50633_read_block(struct pcf50633 *pcf, u8 reg,
56 int nr_regs, u8 *data) 56 int nr_regs, u8 *data)
57{ 57{
@@ -65,7 +65,7 @@ int pcf50633_read_block(struct pcf50633 *pcf, u8 reg,
65} 65}
66EXPORT_SYMBOL_GPL(pcf50633_read_block); 66EXPORT_SYMBOL_GPL(pcf50633_read_block);
67 67
68/* Write a block of upto 32 regs */ 68/* Write a block of up to 32 regs */
69int pcf50633_write_block(struct pcf50633 *pcf , u8 reg, 69int pcf50633_write_block(struct pcf50633 *pcf , u8 reg,
70 int nr_regs, u8 *data) 70 int nr_regs, u8 *data)
71{ 71{
diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
index fa937052fbab..dfbae34e1804 100644
--- a/drivers/mfd/twl6030-irq.c
+++ b/drivers/mfd/twl6030-irq.c
@@ -229,7 +229,7 @@ int twl6030_mmc_card_detect_config(void)
229 twl6030_interrupt_unmask(TWL6030_MMCDETECT_INT_MASK, 229 twl6030_interrupt_unmask(TWL6030_MMCDETECT_INT_MASK,
230 REG_INT_MSK_STS_B); 230 REG_INT_MSK_STS_B);
231 /* 231 /*
232 * Intially Configuring MMC_CTRL for receving interrupts & 232 * Initially Configuring MMC_CTRL for receiving interrupts &
233 * Card status on TWL6030 for MMC1 233 * Card status on TWL6030 for MMC1
234 */ 234 */
235 ret = twl_i2c_read_u8(TWL6030_MODULE_ID0, &reg_val, TWL6030_MMCCTRL); 235 ret = twl_i2c_read_u8(TWL6030_MODULE_ID0, &reg_val, TWL6030_MMCCTRL);
@@ -275,7 +275,7 @@ int twl6030_mmc_card_detect(struct device *dev, int slot)
275 /* TWL6030 provide's Card detect support for 275 /* TWL6030 provide's Card detect support for
276 * only MMC1 controller. 276 * only MMC1 controller.
277 */ 277 */
278 pr_err("Unkown MMC controller %d in %s\n", pdev->id, __func__); 278 pr_err("Unknown MMC controller %d in %s\n", pdev->id, __func__);
279 return ret; 279 return ret;
280 } 280 }
281 /* 281 /*
diff --git a/drivers/mfd/ucb1400_core.c b/drivers/mfd/ucb1400_core.c
index d73f84ba0f08..daf69527ed83 100644
--- a/drivers/mfd/ucb1400_core.c
+++ b/drivers/mfd/ucb1400_core.c
@@ -8,7 +8,7 @@
8 * Copyright: MontaVista Software, Inc. 8 * Copyright: MontaVista Software, Inc.
9 * 9 *
10 * Spliting done by: Marek Vasut <marek.vasut@gmail.com> 10 * Spliting done by: Marek Vasut <marek.vasut@gmail.com>
11 * If something doesnt work and it worked before spliting, e-mail me, 11 * If something doesn't work and it worked before spliting, e-mail me,
12 * dont bother Nicolas please ;-) 12 * dont bother Nicolas please ;-)
13 * 13 *
14 * This program is free software; you can redistribute it and/or modify 14 * This program is free software; you can redistribute it and/or modify
diff --git a/drivers/misc/bmp085.c b/drivers/misc/bmp085.c
index ecd276ad6b19..5f898cb706a6 100644
--- a/drivers/misc/bmp085.c
+++ b/drivers/misc/bmp085.c
@@ -2,7 +2,7 @@
2 2
3 This driver supports the bmp085 digital barometric pressure 3 This driver supports the bmp085 digital barometric pressure
4 and temperature sensor from Bosch Sensortec. The datasheet 4 and temperature sensor from Bosch Sensortec. The datasheet
5 is avaliable from their website: 5 is available from their website:
6 http://www.bosch-sensortec.com/content/language1/downloads/BST-BMP085-DS000-05.pdf 6 http://www.bosch-sensortec.com/content/language1/downloads/BST-BMP085-DS000-05.pdf
7 7
8 A pressure measurement is issued by reading from pressure0_input. 8 A pressure measurement is issued by reading from pressure0_input.
@@ -429,7 +429,7 @@ static int __devinit bmp085_probe(struct i2c_client *client,
429 if (err) 429 if (err)
430 goto exit_free; 430 goto exit_free;
431 431
432 dev_info(&data->client->dev, "Succesfully initialized bmp085!\n"); 432 dev_info(&data->client->dev, "Successfully initialized bmp085!\n");
433 goto exit; 433 goto exit;
434 434
435exit_free: 435exit_free:
diff --git a/drivers/misc/c2port/c2port-duramar2150.c b/drivers/misc/c2port/c2port-duramar2150.c
index 338dcc121507..778fc3fdfb9b 100644
--- a/drivers/misc/c2port/c2port-duramar2150.c
+++ b/drivers/misc/c2port/c2port-duramar2150.c
@@ -41,7 +41,7 @@ static void duramar2150_c2port_access(struct c2port_device *dev, int status)
41 outb(v | (C2D | C2CK), DIR_PORT); 41 outb(v | (C2D | C2CK), DIR_PORT);
42 else 42 else
43 /* When access is "off" is important that both lines are set 43 /* When access is "off" is important that both lines are set
44 * as inputs or hi-impedence */ 44 * as inputs or hi-impedance */
45 outb(v & ~(C2D | C2CK), DIR_PORT); 45 outb(v & ~(C2D | C2CK), DIR_PORT);
46 46
47 mutex_unlock(&update_lock); 47 mutex_unlock(&update_lock);
diff --git a/drivers/misc/ibmasm/remote.h b/drivers/misc/ibmasm/remote.h
index 72acf5af7a2a..00dbf1d4373a 100644
--- a/drivers/misc/ibmasm/remote.h
+++ b/drivers/misc/ibmasm/remote.h
@@ -20,7 +20,7 @@
20 * 20 *
21 * Author: Max Asböck <amax@us.ibm.com> 21 * Author: Max Asböck <amax@us.ibm.com>
22 * 22 *
23 * Orignally written by Pete Reynolds 23 * Originally written by Pete Reynolds
24 */ 24 */
25 25
26#ifndef _IBMASM_REMOTE_H_ 26#ifndef _IBMASM_REMOTE_H_
diff --git a/drivers/misc/iwmc3200top/main.c b/drivers/misc/iwmc3200top/main.c
index 727af07f1fbd..b1f4563be9ae 100644
--- a/drivers/misc/iwmc3200top/main.c
+++ b/drivers/misc/iwmc3200top/main.c
@@ -268,7 +268,7 @@ static void iwmct_irq_read_worker(struct work_struct *ws)
268 LOG_INFO(priv, IRQ, "ACK barker arrived " 268 LOG_INFO(priv, IRQ, "ACK barker arrived "
269 "- starting FW download\n"); 269 "- starting FW download\n");
270 } else { /* REBOOT barker */ 270 } else { /* REBOOT barker */
271 LOG_INFO(priv, IRQ, "Recieved reboot barker: %x\n", barker); 271 LOG_INFO(priv, IRQ, "Received reboot barker: %x\n", barker);
272 priv->barker = barker; 272 priv->barker = barker;
273 273
274 if (barker & BARKER_DNLOAD_SYNC_MSK) { 274 if (barker & BARKER_DNLOAD_SYNC_MSK) {
diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
index 27dc463097f3..74f16f167b8e 100644
--- a/drivers/misc/kgdbts.c
+++ b/drivers/misc/kgdbts.c
@@ -645,7 +645,7 @@ static int validate_simple_test(char *put_str)
645 645
646 while (*chk_str != '\0' && *put_str != '\0') { 646 while (*chk_str != '\0' && *put_str != '\0') {
647 /* If someone does a * to match the rest of the string, allow 647 /* If someone does a * to match the rest of the string, allow
648 * it, or stop if the recieved string is complete. 648 * it, or stop if the received string is complete.
649 */ 649 */
650 if (*put_str == '#' || *chk_str == '*') 650 if (*put_str == '#' || *chk_str == '*')
651 return 0; 651 return 0;
diff --git a/drivers/misc/sgi-gru/grukservices.c b/drivers/misc/sgi-gru/grukservices.c
index 34749ee88dfa..9e9bddaa95ae 100644
--- a/drivers/misc/sgi-gru/grukservices.c
+++ b/drivers/misc/sgi-gru/grukservices.c
@@ -229,7 +229,7 @@ again:
229 bid = blade_id < 0 ? uv_numa_blade_id() : blade_id; 229 bid = blade_id < 0 ? uv_numa_blade_id() : blade_id;
230 bs = gru_base[bid]; 230 bs = gru_base[bid];
231 231
232 /* Handle the case where migration occured while waiting for the sema */ 232 /* Handle the case where migration occurred while waiting for the sema */
233 down_read(&bs->bs_kgts_sema); 233 down_read(&bs->bs_kgts_sema);
234 if (blade_id < 0 && bid != uv_numa_blade_id()) { 234 if (blade_id < 0 && bid != uv_numa_blade_id()) {
235 up_read(&bs->bs_kgts_sema); 235 up_read(&bs->bs_kgts_sema);
diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
index 7a8b9068ea03..5c3ce2459675 100644
--- a/drivers/misc/sgi-gru/grutables.h
+++ b/drivers/misc/sgi-gru/grutables.h
@@ -379,7 +379,7 @@ struct gru_thread_state {
379 required for contest */ 379 required for contest */
380 char ts_cch_req_slice;/* CCH packet slice */ 380 char ts_cch_req_slice;/* CCH packet slice */
381 char ts_blade; /* If >= 0, migrate context if 381 char ts_blade; /* If >= 0, migrate context if
382 ref from diferent blade */ 382 ref from different blade */
383 char ts_force_cch_reload; 383 char ts_force_cch_reload;
384 char ts_cbr_idx[GRU_CBR_AU];/* CBR numbers of each 384 char ts_cbr_idx[GRU_CBR_AU];/* CBR numbers of each
385 allocated CB */ 385 allocated CB */
diff --git a/drivers/misc/ti-st/st_kim.c b/drivers/misc/ti-st/st_kim.c
index 9ee4c788aa69..b4488c8f6b23 100644
--- a/drivers/misc/ti-st/st_kim.c
+++ b/drivers/misc/ti-st/st_kim.c
@@ -649,7 +649,7 @@ static int kim_probe(struct platform_device *pdev)
649 /* multiple devices could exist */ 649 /* multiple devices could exist */
650 st_kim_devices[pdev->id] = pdev; 650 st_kim_devices[pdev->id] = pdev;
651 } else { 651 } else {
652 /* platform's sure about existance of 1 device */ 652 /* platform's sure about existence of 1 device */
653 st_kim_devices[0] = pdev; 653 st_kim_devices[0] = pdev;
654 } 654 }
655 655
diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c
index f5cedeccad42..abc1a63bcc5e 100644
--- a/drivers/mmc/card/mmc_test.c
+++ b/drivers/mmc/card/mmc_test.c
@@ -292,7 +292,7 @@ static void mmc_test_free_mem(struct mmc_test_mem *mem)
292} 292}
293 293
294/* 294/*
295 * Allocate a lot of memory, preferrably max_sz but at least min_sz. In case 295 * Allocate a lot of memory, preferably max_sz but at least min_sz. In case
296 * there isn't much memory do not exceed 1/16th total lowmem pages. Also do 296 * there isn't much memory do not exceed 1/16th total lowmem pages. Also do
297 * not exceed a maximum number of segments and try not to make segments much 297 * not exceed a maximum number of segments and try not to make segments much
298 * bigger than maximum segment size. 298 * bigger than maximum segment size.
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 14e95f39a7bf..772d0d0a541b 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -538,7 +538,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
538 538
539 /* 539 /*
540 * If enhanced_area_en is TRUE, host needs to enable ERASE_GRP_DEF 540 * If enhanced_area_en is TRUE, host needs to enable ERASE_GRP_DEF
541 * bit. This bit will be lost everytime after a reset or power off. 541 * bit. This bit will be lost every time after a reset or power off.
542 */ 542 */
543 if (card->ext_csd.enhanced_area_en) { 543 if (card->ext_csd.enhanced_area_en) {
544 err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, 544 err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index 60842f878ded..f3b22bf89cc9 100644
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -105,7 +105,7 @@ int mmc_go_idle(struct mmc_host *host)
105 * that in case of hardware that won't pull up DAT3/nCS otherwise. 105 * that in case of hardware that won't pull up DAT3/nCS otherwise.
106 * 106 *
107 * SPI hosts ignore ios.chip_select; it's managed according to 107 * SPI hosts ignore ios.chip_select; it's managed according to
108 * rules that must accomodate non-MMC slaves which this layer 108 * rules that must accommodate non-MMC slaves which this layer
109 * won't even know about. 109 * won't even know about.
110 */ 110 */
111 if (!mmc_host_is_spi(host)) { 111 if (!mmc_host_is_spi(host)) {
diff --git a/drivers/mmc/core/sdio_irq.c b/drivers/mmc/core/sdio_irq.c
index bb192f90e8e9..b3001617e67d 100644
--- a/drivers/mmc/core/sdio_irq.c
+++ b/drivers/mmc/core/sdio_irq.c
@@ -45,7 +45,7 @@ static int process_sdio_pending_irqs(struct mmc_card *card)
45 struct sdio_func *func = card->sdio_func[i - 1]; 45 struct sdio_func *func = card->sdio_func[i - 1];
46 if (!func) { 46 if (!func) {
47 printk(KERN_WARNING "%s: pending IRQ for " 47 printk(KERN_WARNING "%s: pending IRQ for "
48 "non-existant function\n", 48 "non-existent function\n",
49 mmc_card_id(card)); 49 mmc_card_id(card));
50 ret = -EINVAL; 50 ret = -EINVAL;
51 } else if (func->irq_handler) { 51 } else if (func->irq_handler) {
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 80bc9a5c25cc..ea3888b65d5d 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -127,7 +127,7 @@ struct atmel_mci_dma {
127 * EVENT_DATA_COMPLETE is set in @pending_events, all data-related 127 * EVENT_DATA_COMPLETE is set in @pending_events, all data-related
128 * interrupts must be disabled and @data_status updated with a 128 * interrupts must be disabled and @data_status updated with a
129 * snapshot of SR. Similarly, before EVENT_CMD_COMPLETE is set, the 129 * snapshot of SR. Similarly, before EVENT_CMD_COMPLETE is set, the
130 * CMDRDY interupt must be disabled and @cmd_status updated with a 130 * CMDRDY interrupt must be disabled and @cmd_status updated with a
131 * snapshot of SR, and before EVENT_XFER_COMPLETE can be set, the 131 * snapshot of SR, and before EVENT_XFER_COMPLETE can be set, the
132 * bytes_xfered field of @data must be written. This is ensured by 132 * bytes_xfered field of @data must be written. This is ensured by
133 * using barriers. 133 * using barriers.
@@ -1082,7 +1082,7 @@ static void atmci_request_end(struct atmel_mci *host, struct mmc_request *mrq)
1082 /* 1082 /*
1083 * Update the MMC clock rate if necessary. This may be 1083 * Update the MMC clock rate if necessary. This may be
1084 * necessary if set_ios() is called when a different slot is 1084 * necessary if set_ios() is called when a different slot is
1085 * busy transfering data. 1085 * busy transferring data.
1086 */ 1086 */
1087 if (host->need_clock_update) { 1087 if (host->need_clock_update) {
1088 mci_writel(host, MR, host->mode_reg); 1088 mci_writel(host, MR, host->mode_reg);
diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
index 2f7fc0c5146f..7c1e16aaf17f 100644
--- a/drivers/mmc/host/mmc_spi.c
+++ b/drivers/mmc/host/mmc_spi.c
@@ -99,7 +99,7 @@
99#define r1b_timeout (HZ * 3) 99#define r1b_timeout (HZ * 3)
100 100
101/* One of the critical speed parameters is the amount of data which may 101/* One of the critical speed parameters is the amount of data which may
102 * be transfered in one command. If this value is too low, the SD card 102 * be transferred in one command. If this value is too low, the SD card
103 * controller has to do multiple partial block writes (argggh!). With 103 * controller has to do multiple partial block writes (argggh!). With
104 * today (2008) SD cards there is little speed gain if we transfer more 104 * today (2008) SD cards there is little speed gain if we transfer more
105 * than 64 KBytes at a time. So use this value until there is any indication 105 * than 64 KBytes at a time. So use this value until there is any indication
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index 1ccd4b256cee..a04f87d7ee3d 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -874,7 +874,7 @@ static void finalize_request(struct s3cmci_host *host)
874 if (!mrq->data) 874 if (!mrq->data)
875 goto request_done; 875 goto request_done;
876 876
877 /* Calulate the amout of bytes transfer if there was no error */ 877 /* Calculate the amout of bytes transfer if there was no error */
878 if (mrq->data->error == 0) { 878 if (mrq->data->error == 0) {
879 mrq->data->bytes_xfered = 879 mrq->data->bytes_xfered =
880 (mrq->data->blocks * mrq->data->blksz); 880 (mrq->data->blocks * mrq->data->blksz);
@@ -882,7 +882,7 @@ static void finalize_request(struct s3cmci_host *host)
882 mrq->data->bytes_xfered = 0; 882 mrq->data->bytes_xfered = 0;
883 } 883 }
884 884
885 /* If we had an error while transfering data we flush the 885 /* If we had an error while transferring data we flush the
886 * DMA channel and the fifo to clear out any garbage. */ 886 * DMA channel and the fifo to clear out any garbage. */
887 if (mrq->data->error != 0) { 887 if (mrq->data->error != 0) {
888 if (s3cmci_host_usedma(host)) 888 if (s3cmci_host_usedma(host))
@@ -980,7 +980,7 @@ static int s3cmci_setup_data(struct s3cmci_host *host, struct mmc_data *data)
980 980
981 if ((data->blksz & 3) != 0) { 981 if ((data->blksz & 3) != 0) {
982 /* We cannot deal with unaligned blocks with more than 982 /* We cannot deal with unaligned blocks with more than
983 * one block being transfered. */ 983 * one block being transferred. */
984 984
985 if (data->blocks > 1) { 985 if (data->blocks > 1) {
986 pr_warning("%s: can't do non-word sized block transfers (blksz %d)\n", __func__, data->blksz); 986 pr_warning("%s: can't do non-word sized block transfers (blksz %d)\n", __func__, data->blksz);
diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
index 6ae8d2f00ec7..62d37de6de76 100644
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -355,7 +355,7 @@ static int tmio_mmc_start_command(struct tmio_mmc_host *host, struct mmc_command
355/* 355/*
356 * This chip always returns (at least?) as much data as you ask for. 356 * This chip always returns (at least?) as much data as you ask for.
357 * I'm unsure what happens if you ask for less than a block. This should be 357 * I'm unsure what happens if you ask for less than a block. This should be
358 * looked into to ensure that a funny length read doesnt hose the controller. 358 * looked into to ensure that a funny length read doesn't hose the controller.
359 */ 359 */
360static void tmio_mmc_pio_irq(struct tmio_mmc_host *host) 360static void tmio_mmc_pio_irq(struct tmio_mmc_host *host)
361{ 361{
diff --git a/drivers/mmc/host/wbsd.c b/drivers/mmc/host/wbsd.c
index 7fca0a386ba0..62e5a4d171e1 100644
--- a/drivers/mmc/host/wbsd.c
+++ b/drivers/mmc/host/wbsd.c
@@ -484,7 +484,7 @@ static void wbsd_fill_fifo(struct wbsd_host *host)
484 484
485 /* 485 /*
486 * Check that we aren't being called after the 486 * Check that we aren't being called after the
487 * entire buffer has been transfered. 487 * entire buffer has been transferred.
488 */ 488 */
489 if (host->num_sg == 0) 489 if (host->num_sg == 0)
490 return; 490 return;
@@ -828,7 +828,7 @@ static void wbsd_request(struct mmc_host *mmc, struct mmc_request *mrq)
828 /* 828 /*
829 * If this is a data transfer the request 829 * If this is a data transfer the request
830 * will be finished after the data has 830 * will be finished after the data has
831 * transfered. 831 * transferred.
832 */ 832 */
833 if (cmd->data && !cmd->error) { 833 if (cmd->data && !cmd->error) {
834 /* 834 /*
@@ -904,7 +904,7 @@ static void wbsd_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
904 setup &= ~WBSD_DAT3_H; 904 setup &= ~WBSD_DAT3_H;
905 905
906 /* 906 /*
907 * We cannot resume card detection immediatly 907 * We cannot resume card detection immediately
908 * because of capacitance and delays in the chip. 908 * because of capacitance and delays in the chip.
909 */ 909 */
910 mod_timer(&host->ignore_timer, jiffies + HZ / 100); 910 mod_timer(&host->ignore_timer, jiffies + HZ / 100);
diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig
index 35c6a23b183b..b1e3c26edd6d 100644
--- a/drivers/mtd/chips/Kconfig
+++ b/drivers/mtd/chips/Kconfig
@@ -19,7 +19,7 @@ config MTD_JEDECPROBE
19 help 19 help
20 This option enables JEDEC-style probing of flash chips which are not 20 This option enables JEDEC-style probing of flash chips which are not
21 compatible with the Common Flash Interface, but will use the common 21 compatible with the Common Flash Interface, but will use the common
22 CFI-targetted flash drivers for any chips which are identified which 22 CFI-targeted flash drivers for any chips which are identified which
23 are in fact compatible in all but the probe method. This actually 23 are in fact compatible in all but the probe method. This actually
24 covers most AMD/Fujitsu-compatible chips and also non-CFI 24 covers most AMD/Fujitsu-compatible chips and also non-CFI
25 Intel chips. 25 Intel chips.
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index 092aef11120c..09cb7c8d93b4 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -1247,12 +1247,12 @@ static int inval_cache_and_wait_for_operation(
1247 break; 1247 break;
1248 1248
1249 if (chip->erase_suspended && chip_state == FL_ERASING) { 1249 if (chip->erase_suspended && chip_state == FL_ERASING) {
1250 /* Erase suspend occured while sleep: reset timeout */ 1250 /* Erase suspend occurred while sleep: reset timeout */
1251 timeo = reset_timeo; 1251 timeo = reset_timeo;
1252 chip->erase_suspended = 0; 1252 chip->erase_suspended = 0;
1253 } 1253 }
1254 if (chip->write_suspended && chip_state == FL_WRITING) { 1254 if (chip->write_suspended && chip_state == FL_WRITING) {
1255 /* Write suspend occured while sleep: reset timeout */ 1255 /* Write suspend occurred while sleep: reset timeout */
1256 timeo = reset_timeo; 1256 timeo = reset_timeo;
1257 chip->write_suspended = 0; 1257 chip->write_suspended = 0;
1258 } 1258 }
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index f9a5331e9445..0b49266840b9 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -263,7 +263,7 @@ static void fixup_old_sst_eraseregion(struct mtd_info *mtd)
263 struct cfi_private *cfi = map->fldrv_priv; 263 struct cfi_private *cfi = map->fldrv_priv;
264 264
265 /* 265 /*
266 * These flashes report two seperate eraseblock regions based on the 266 * These flashes report two separate eraseblock regions based on the
267 * sector_erase-size and block_erase-size, although they both operate on the 267 * sector_erase-size and block_erase-size, although they both operate on the
268 * same memory. This is not allowed according to CFI, so we just pick the 268 * same memory. This is not allowed according to CFI, so we just pick the
269 * sector_erase-size. 269 * sector_erase-size.
@@ -611,8 +611,8 @@ static struct mtd_info *cfi_amdstd_setup(struct mtd_info *mtd)
611 * 611 *
612 * Note that anything more complicated than checking if no bits are toggling 612 * Note that anything more complicated than checking if no bits are toggling
613 * (including checking DQ5 for an error status) is tricky to get working 613 * (including checking DQ5 for an error status) is tricky to get working
614 * correctly and is therefore not done (particulary with interleaved chips 614 * correctly and is therefore not done (particularly with interleaved chips
615 * as each chip must be checked independantly of the others). 615 * as each chip must be checked independently of the others).
616 */ 616 */
617static int __xipram chip_ready(struct map_info *map, unsigned long addr) 617static int __xipram chip_ready(struct map_info *map, unsigned long addr)
618{ 618{
@@ -635,8 +635,8 @@ static int __xipram chip_ready(struct map_info *map, unsigned long addr)
635 * 635 *
636 * Note that anything more complicated than checking if no bits are toggling 636 * Note that anything more complicated than checking if no bits are toggling
637 * (including checking DQ5 for an error status) is tricky to get working 637 * (including checking DQ5 for an error status) is tricky to get working
638 * correctly and is therefore not done (particulary with interleaved chips 638 * correctly and is therefore not done (particularly with interleaved chips
639 * as each chip must be checked independantly of the others). 639 * as each chip must be checked independently of the others).
640 * 640 *
641 */ 641 */
642static int __xipram chip_good(struct map_info *map, unsigned long addr, map_word expected) 642static int __xipram chip_good(struct map_info *map, unsigned long addr, map_word expected)
diff --git a/drivers/mtd/chips/cfi_util.c b/drivers/mtd/chips/cfi_util.c
index 6ae3d111e1e7..8e464054a631 100644
--- a/drivers/mtd/chips/cfi_util.c
+++ b/drivers/mtd/chips/cfi_util.c
@@ -1,6 +1,6 @@
1/* 1/*
2 * Common Flash Interface support: 2 * Common Flash Interface support:
3 * Generic utility functions not dependant on command set 3 * Generic utility functions not dependent on command set
4 * 4 *
5 * Copyright (C) 2002 Red Hat 5 * Copyright (C) 2002 Red Hat
6 * Copyright (C) 2003 STMicroelectronics Limited 6 * Copyright (C) 2003 STMicroelectronics Limited
diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
index 4e1be51cc122..ea832ea0e4aa 100644
--- a/drivers/mtd/chips/jedec_probe.c
+++ b/drivers/mtd/chips/jedec_probe.c
@@ -2075,7 +2075,7 @@ static inline int jedec_match( uint32_t base,
2075 } 2075 }
2076 2076
2077 /* 2077 /*
2078 * Make sure the ID's dissappear when the device is taken out of 2078 * Make sure the ID's disappear when the device is taken out of
2079 * ID mode. The only time this should fail when it should succeed 2079 * ID mode. The only time this should fail when it should succeed
2080 * is when the ID's are written as data to the same 2080 * is when the ID's are written as data to the same
2081 * addresses. For this rare and unfortunate case the chip 2081 * addresses. For this rare and unfortunate case the chip
diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index f29a6f9df6e7..97183c8c9e33 100644
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -295,7 +295,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)
295 dev->mtd.owner = THIS_MODULE; 295 dev->mtd.owner = THIS_MODULE;
296 296
297 if (add_mtd_device(&dev->mtd)) { 297 if (add_mtd_device(&dev->mtd)) {
298 /* Device didnt get added, so free the entry */ 298 /* Device didn't get added, so free the entry */
299 goto devinit_err; 299 goto devinit_err;
300 } 300 }
301 list_add(&dev->list, &blkmtd_device_list); 301 list_add(&dev->list, &blkmtd_device_list);
diff --git a/drivers/mtd/devices/doc2001plus.c b/drivers/mtd/devices/doc2001plus.c
index 719b2915dc3a..8b36fa77a195 100644
--- a/drivers/mtd/devices/doc2001plus.c
+++ b/drivers/mtd/devices/doc2001plus.c
@@ -90,7 +90,7 @@ static inline int DoC_WaitReady(void __iomem * docptr)
90 return ret; 90 return ret;
91} 91}
92 92
93/* For some reason the Millennium Plus seems to occassionally put itself 93/* For some reason the Millennium Plus seems to occasionally put itself
94 * into reset mode. For me this happens randomly, with no pattern that I 94 * into reset mode. For me this happens randomly, with no pattern that I
95 * can detect. M-systems suggest always check this on any block level 95 * can detect. M-systems suggest always check this on any block level
96 * operation and setting to normal mode if in reset mode. 96 * operation and setting to normal mode if in reset mode.
diff --git a/drivers/mtd/devices/docecc.c b/drivers/mtd/devices/docecc.c
index a99838bb2dc0..37ef29a73ee4 100644
--- a/drivers/mtd/devices/docecc.c
+++ b/drivers/mtd/devices/docecc.c
@@ -109,7 +109,7 @@ for(ci=(n)-1;ci >=0;ci--)\
109 of the integer "alpha_to[i]" with a(0) being the LSB and a(m-1) the MSB. Thus for 109 of the integer "alpha_to[i]" with a(0) being the LSB and a(m-1) the MSB. Thus for
110 example the polynomial representation of @^5 would be given by the binary 110 example the polynomial representation of @^5 would be given by the binary
111 representation of the integer "alpha_to[5]". 111 representation of the integer "alpha_to[5]".
112 Similarily, index_of[] can be used as follows: 112 Similarly, index_of[] can be used as follows:
113 As above, let @ represent the primitive element of GF(2^m) that is 113 As above, let @ represent the primitive element of GF(2^m) that is
114 the root of the primitive polynomial p(x). In order to find the power 114 the root of the primitive polynomial p(x). In order to find the power
115 of @ (alpha) that has the polynomial representation 115 of @ (alpha) that has the polynomial representation
@@ -121,7 +121,7 @@ for(ci=(n)-1;ci >=0;ci--)\
121 NOTE: 121 NOTE:
122 The element alpha_to[2^m-1] = 0 always signifying that the 122 The element alpha_to[2^m-1] = 0 always signifying that the
123 representation of "@^infinity" = 0 is (0,0,0,...,0). 123 representation of "@^infinity" = 0 is (0,0,0,...,0).
124 Similarily, the element index_of[0] = A0 always signifying 124 Similarly, the element index_of[0] = A0 always signifying
125 that the power of alpha which has the polynomial representation 125 that the power of alpha which has the polynomial representation
126 (0,0,...,0) is "infinity". 126 (0,0,...,0) is "infinity".
127 127
diff --git a/drivers/mtd/devices/lart.c b/drivers/mtd/devices/lart.c
index caf604167f03..4b829f97d56c 100644
--- a/drivers/mtd/devices/lart.c
+++ b/drivers/mtd/devices/lart.c
@@ -353,7 +353,7 @@ static inline int erase_block (__u32 offset)
353 /* put the flash back into command mode */ 353 /* put the flash back into command mode */
354 write32 (DATA_TO_FLASH (READ_ARRAY),offset); 354 write32 (DATA_TO_FLASH (READ_ARRAY),offset);
355 355
356 /* was the erase successfull? */ 356 /* was the erase successful? */
357 if ((status & STATUS_ERASE_ERR)) 357 if ((status & STATUS_ERASE_ERR))
358 { 358 {
359 printk (KERN_WARNING "%s: erase error at address 0x%.8x.\n",module_name,offset); 359 printk (KERN_WARNING "%s: erase error at address 0x%.8x.\n",module_name,offset);
@@ -508,7 +508,7 @@ static inline int write_dword (__u32 offset,__u32 x)
508 /* put the flash back into command mode */ 508 /* put the flash back into command mode */
509 write32 (DATA_TO_FLASH (READ_ARRAY),offset); 509 write32 (DATA_TO_FLASH (READ_ARRAY),offset);
510 510
511 /* was the write successfull? */ 511 /* was the write successful? */
512 if ((status & STATUS_PGM_ERR) || read32 (offset) != x) 512 if ((status & STATUS_PGM_ERR) || read32 (offset) != x)
513 { 513 {
514 printk (KERN_WARNING "%s: write error at address 0x%.8x.\n",module_name,offset); 514 printk (KERN_WARNING "%s: write error at address 0x%.8x.\n",module_name,offset);
diff --git a/drivers/mtd/devices/pmc551.c b/drivers/mtd/devices/pmc551.c
index ef0aba0ce58f..41b8cdcc64cb 100644
--- a/drivers/mtd/devices/pmc551.c
+++ b/drivers/mtd/devices/pmc551.c
@@ -351,7 +351,7 @@ static int pmc551_write(struct mtd_info *mtd, loff_t to, size_t len,
351 * Fixup routines for the V370PDC 351 * Fixup routines for the V370PDC
352 * PCI device ID 0x020011b0 352 * PCI device ID 0x020011b0
353 * 353 *
354 * This function basicly kick starts the DRAM oboard the card and gets it 354 * This function basically kick starts the DRAM oboard the card and gets it
355 * ready to be used. Before this is done the device reads VERY erratic, so 355 * ready to be used. Before this is done the device reads VERY erratic, so
356 * much that it can crash the Linux 2.2.x series kernels when a user cat's 356 * much that it can crash the Linux 2.2.x series kernels when a user cat's
357 * /proc/pci .. though that is mainly a kernel bug in handling the PCI DEVSEL 357 * /proc/pci .. though that is mainly a kernel bug in handling the PCI DEVSEL
@@ -540,7 +540,7 @@ static u32 fixup_pmc551(struct pci_dev *dev)
540 540
541 /* 541 /*
542 * Check to make certain the DEVSEL is set correctly, this device 542 * Check to make certain the DEVSEL is set correctly, this device
543 * has a tendancy to assert DEVSEL and TRDY when a write is performed 543 * has a tendency to assert DEVSEL and TRDY when a write is performed
544 * to the memory when memory is read-only 544 * to the memory when memory is read-only
545 */ 545 */
546 if ((cmd & PCI_STATUS_DEVSEL_MASK) != 0x0) { 546 if ((cmd & PCI_STATUS_DEVSEL_MASK) != 0x0) {
diff --git a/drivers/mtd/lpddr/lpddr_cmds.c b/drivers/mtd/lpddr/lpddr_cmds.c
index 04fdfcca93f7..12679925b420 100644
--- a/drivers/mtd/lpddr/lpddr_cmds.c
+++ b/drivers/mtd/lpddr/lpddr_cmds.c
@@ -3,7 +3,7 @@
3 * erase, lock/unlock support for LPDDR flash memories 3 * erase, lock/unlock support for LPDDR flash memories
4 * (C) 2008 Korolev Alexey <akorolev@infradead.org> 4 * (C) 2008 Korolev Alexey <akorolev@infradead.org>
5 * (C) 2008 Vasiliy Leonenko <vasiliy.leonenko@gmail.com> 5 * (C) 2008 Vasiliy Leonenko <vasiliy.leonenko@gmail.com>
6 * Many thanks to Roman Borisov for intial enabling 6 * Many thanks to Roman Borisov for initial enabling
7 * 7 *
8 * This program is free software; you can redistribute it and/or 8 * This program is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU General Public License 9 * modify it under the terms of the GNU General Public License
@@ -171,7 +171,7 @@ static int wait_for_ready(struct map_info *map, struct flchip *chip,
171 mutex_lock(&chip->mutex); 171 mutex_lock(&chip->mutex);
172 } 172 }
173 if (chip->erase_suspended || chip->write_suspended) { 173 if (chip->erase_suspended || chip->write_suspended) {
174 /* Suspend has occured while sleep: reset timeout */ 174 /* Suspend has occurred while sleep: reset timeout */
175 timeo = reset_timeo; 175 timeo = reset_timeo;
176 chip->erase_suspended = chip->write_suspended = 0; 176 chip->erase_suspended = chip->write_suspended = 0;
177 } 177 }
diff --git a/drivers/mtd/maps/ceiva.c b/drivers/mtd/maps/ceiva.c
index e5f645b775ad..23f551dc8ca8 100644
--- a/drivers/mtd/maps/ceiva.c
+++ b/drivers/mtd/maps/ceiva.c
@@ -42,7 +42,7 @@
42 * 42 *
43 * Please note: 43 * Please note:
44 * 1. The flash size given should be the largest flash size that can 44 * 1. The flash size given should be the largest flash size that can
45 * be accomodated. 45 * be accommodated.
46 * 46 *
47 * 2. The bus width must defined in clps_setup_flash. 47 * 2. The bus width must defined in clps_setup_flash.
48 * 48 *
@@ -58,7 +58,7 @@
58#define BOOT_PARTITION_SIZE_KiB (16) 58#define BOOT_PARTITION_SIZE_KiB (16)
59#define PARAMS_PARTITION_SIZE_KiB (8) 59#define PARAMS_PARTITION_SIZE_KiB (8)
60#define KERNEL_PARTITION_SIZE_KiB (4*128) 60#define KERNEL_PARTITION_SIZE_KiB (4*128)
61/* Use both remaing portion of first flash, and all of second flash */ 61/* Use both remaining portion of first flash, and all of second flash */
62#define ROOT_PARTITION_SIZE_KiB (3*128) + (8*128) 62#define ROOT_PARTITION_SIZE_KiB (3*128) + (8*128)
63 63
64static struct mtd_partition ceiva_partitions[] = { 64static struct mtd_partition ceiva_partitions[] = {
diff --git a/drivers/mtd/maps/cfi_flagadm.c b/drivers/mtd/maps/cfi_flagadm.c
index b4ed81611918..f71343cd77cc 100644
--- a/drivers/mtd/maps/cfi_flagadm.c
+++ b/drivers/mtd/maps/cfi_flagadm.c
@@ -33,7 +33,7 @@
33 33
34 34
35/* We split the flash chip up into four parts. 35/* We split the flash chip up into four parts.
36 * 1: bootloader firts 128k (0x00000000 - 0x0001FFFF) size 0x020000 36 * 1: bootloader first 128k (0x00000000 - 0x0001FFFF) size 0x020000
37 * 2: kernel 640k (0x00020000 - 0x000BFFFF) size 0x0A0000 37 * 2: kernel 640k (0x00020000 - 0x000BFFFF) size 0x0A0000
38 * 3: compressed 1536k root ramdisk (0x000C0000 - 0x0023FFFF) size 0x180000 38 * 3: compressed 1536k root ramdisk (0x000C0000 - 0x0023FFFF) size 0x180000
39 * 4: writeable diskpartition (jffs)(0x00240000 - 0x003FFFFF) size 0x1C0000 39 * 4: writeable diskpartition (jffs)(0x00240000 - 0x003FFFFF) size 0x1C0000
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index 917022948399..6799e75d74e0 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -497,7 +497,7 @@ static int pcmciamtd_config(struct pcmcia_device *link)
497 dev->pcmcia_map.set_vpp = pcmciamtd_set_vpp; 497 dev->pcmcia_map.set_vpp = pcmciamtd_set_vpp;
498 498
499 /* Request a memory window for PCMCIA. Some architeures can map windows 499 /* Request a memory window for PCMCIA. Some architeures can map windows
500 * upto the maximum that PCMCIA can support (64MiB) - this is ideal and 500 * up to the maximum that PCMCIA can support (64MiB) - this is ideal and
501 * we aim for a window the size of the whole card - otherwise we try 501 * we aim for a window the size of the whole card - otherwise we try
502 * smaller windows until we succeed 502 * smaller windows until we succeed
503 */ 503 */
diff --git a/drivers/mtd/maps/pmcmsp-flash.c b/drivers/mtd/maps/pmcmsp-flash.c
index acb13fa5001c..64aea6acd48e 100644
--- a/drivers/mtd/maps/pmcmsp-flash.c
+++ b/drivers/mtd/maps/pmcmsp-flash.c
@@ -3,7 +3,7 @@
3 * Config with both CFI and JEDEC device support. 3 * Config with both CFI and JEDEC device support.
4 * 4 *
5 * Basically physmap.c with the addition of partitions and 5 * Basically physmap.c with the addition of partitions and
6 * an array of mapping info to accomodate more than one flash type per board. 6 * an array of mapping info to accommodate more than one flash type per board.
7 * 7 *
8 * Copyright 2005-2007 PMC-Sierra, Inc. 8 * Copyright 2005-2007 PMC-Sierra, Inc.
9 * 9 *
diff --git a/drivers/mtd/maps/sc520cdp.c b/drivers/mtd/maps/sc520cdp.c
index 85c1e56309ec..4d8aaaf4bb76 100644
--- a/drivers/mtd/maps/sc520cdp.c
+++ b/drivers/mtd/maps/sc520cdp.c
@@ -197,7 +197,7 @@ static void sc520cdp_setup_par(void)
197 } 197 }
198 198
199 /* 199 /*
200 ** Find the PARxx registers that are reponsible for activating 200 ** Find the PARxx registers that are responsible for activating
201 ** ROMCS0, ROMCS1 and BOOTCS. Reprogram each of these with a 201 ** ROMCS0, ROMCS1 and BOOTCS. Reprogram each of these with a
202 ** new value from the table. 202 ** new value from the table.
203 */ 203 */
diff --git a/drivers/mtd/maps/tqm8xxl.c b/drivers/mtd/maps/tqm8xxl.c
index c08e140d40ed..0718dfb3ee64 100644
--- a/drivers/mtd/maps/tqm8xxl.c
+++ b/drivers/mtd/maps/tqm8xxl.c
@@ -63,7 +63,7 @@ static void __iomem *start_scan_addr;
63 */ 63 */
64 64
65#ifdef CONFIG_MTD_PARTITIONS 65#ifdef CONFIG_MTD_PARTITIONS
66/* Currently, TQM8xxL has upto 8MiB flash */ 66/* Currently, TQM8xxL has up to 8MiB flash */
67static unsigned long tqm8xxl_max_flash_size = 0x00800000; 67static unsigned long tqm8xxl_max_flash_size = 0x00800000;
68 68
69/* partition definition for first flash bank 69/* partition definition for first flash bank
diff --git a/drivers/mtd/mtdblock.c b/drivers/mtd/mtdblock.c
index 1e74ad961040..3326615ad66b 100644
--- a/drivers/mtd/mtdblock.c
+++ b/drivers/mtd/mtdblock.c
@@ -129,7 +129,7 @@ static int write_cached_data (struct mtdblk_dev *mtdblk)
129 return ret; 129 return ret;
130 130
131 /* 131 /*
132 * Here we could argubly set the cache state to STATE_CLEAN. 132 * Here we could arguably set the cache state to STATE_CLEAN.
133 * However this could lead to inconsistency since we will not 133 * However this could lead to inconsistency since we will not
134 * be notified if this content is altered on the flash by other 134 * be notified if this content is altered on the flash by other
135 * means. Let's declare it empty and leave buffering tasks to 135 * means. Let's declare it empty and leave buffering tasks to
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 145b3d0dc0db..4c36ef66a46b 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -234,7 +234,7 @@ static ssize_t mtd_read(struct file *file, char __user *buf, size_t count,loff_t
234 * the data. For our userspace tools it is important 234 * the data. For our userspace tools it is important
235 * to dump areas with ecc errors ! 235 * to dump areas with ecc errors !
236 * For kernel internal usage it also might return -EUCLEAN 236 * For kernel internal usage it also might return -EUCLEAN
237 * to signal the caller that a bitflip has occured and has 237 * to signal the caller that a bitflip has occurred and has
238 * been corrected by the ECC algorithm. 238 * been corrected by the ECC algorithm.
239 * Userspace software which accesses NAND this way 239 * Userspace software which accesses NAND this way
240 * must be aware of the fact that it deals with NAND 240 * must be aware of the fact that it deals with NAND
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index a92054e945e1..edec457d361d 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -239,7 +239,7 @@ config MTD_NAND_BCM_UMI
239 help 239 help
240 This enables the NAND flash controller on the BCM UMI block. 240 This enables the NAND flash controller on the BCM UMI block.
241 241
242 No board specfic support is done by this driver, each board 242 No board specific support is done by this driver, each board
243 must advertise a platform_device for the driver to attach. 243 must advertise a platform_device for the driver to attach.
244 244
245config MTD_NAND_BCM_UMI_HWCS 245config MTD_NAND_BCM_UMI_HWCS
diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c
index a067d090cb31..bc65bf71e1a2 100644
--- a/drivers/mtd/nand/ams-delta.c
+++ b/drivers/mtd/nand/ams-delta.c
@@ -228,7 +228,7 @@ static int __devinit ams_delta_init(struct platform_device *pdev)
228 AMS_DELTA_LATCH2_NAND_NCE | 228 AMS_DELTA_LATCH2_NAND_NCE |
229 AMS_DELTA_LATCH2_NAND_NWP); 229 AMS_DELTA_LATCH2_NAND_NWP);
230 230
231 /* Scan to find existance of the device */ 231 /* Scan to find existence of the device */
232 if (nand_scan(ams_delta_mtd, 1)) { 232 if (nand_scan(ams_delta_mtd, 1)) {
233 err = -ENXIO; 233 err = -ENXIO;
234 goto out_mtd; 234 goto out_mtd;
diff --git a/drivers/mtd/nand/autcpu12.c b/drivers/mtd/nand/autcpu12.c
index 7c95da1f612c..0911cf03db80 100644
--- a/drivers/mtd/nand/autcpu12.c
+++ b/drivers/mtd/nand/autcpu12.c
@@ -176,7 +176,7 @@ static int __init autcpu12_init(void)
176 */ 176 */
177 this->options = NAND_USE_FLASH_BBT; 177 this->options = NAND_USE_FLASH_BBT;
178 178
179 /* Scan to find existance of the device */ 179 /* Scan to find existence of the device */
180 if (nand_scan(autcpu12_mtd, 1)) { 180 if (nand_scan(autcpu12_mtd, 1)) {
181 err = -ENXIO; 181 err = -ENXIO;
182 goto out_ior; 182 goto out_ior;
diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c
index 9f1b451005ca..71c35a0b9826 100644
--- a/drivers/mtd/nand/cs553x_nand.c
+++ b/drivers/mtd/nand/cs553x_nand.c
@@ -241,7 +241,7 @@ static int __init cs553x_init_one(int cs, int mmio, unsigned long adr)
241 /* Enable the following for a flash based bad block table */ 241 /* Enable the following for a flash based bad block table */
242 this->options = NAND_USE_FLASH_BBT | NAND_NO_AUTOINCR; 242 this->options = NAND_USE_FLASH_BBT | NAND_NO_AUTOINCR;
243 243
244 /* Scan to find existance of the device */ 244 /* Scan to find existence of the device */
245 if (nand_scan(new_mtd, 1)) { 245 if (nand_scan(new_mtd, 1)) {
246 err = -ENXIO; 246 err = -ENXIO;
247 goto out_ior; 247 goto out_ior;
diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
index 8c8d3c86c0e8..4633f094c510 100644
--- a/drivers/mtd/nand/denali.c
+++ b/drivers/mtd/nand/denali.c
@@ -724,7 +724,7 @@ static uint32_t wait_for_irq(struct denali_nand_info *denali, uint32_t irq_mask)
724} 724}
725 725
726/* This helper function setups the registers for ECC and whether or not 726/* This helper function setups the registers for ECC and whether or not
727 * the spare area will be transfered. */ 727 * the spare area will be transferred. */
728static void setup_ecc_for_xfer(struct denali_nand_info *denali, bool ecc_en, 728static void setup_ecc_for_xfer(struct denali_nand_info *denali, bool ecc_en,
729 bool transfer_spare) 729 bool transfer_spare)
730{ 730{
@@ -965,7 +965,7 @@ static bool handle_ecc(struct denali_nand_info *denali, uint8_t *buf,
965 965
966 if (ECC_ERROR_CORRECTABLE(err_correction_info)) { 966 if (ECC_ERROR_CORRECTABLE(err_correction_info)) {
967 /* If err_byte is larger than ECC_SECTOR_SIZE, 967 /* If err_byte is larger than ECC_SECTOR_SIZE,
968 * means error happend in OOB, so we ignore 968 * means error happened in OOB, so we ignore
969 * it. It's no need for us to correct it 969 * it. It's no need for us to correct it
970 * err_device is represented the NAND error 970 * err_device is represented the NAND error
971 * bits are happened in if there are more 971 * bits are happened in if there are more
@@ -1109,7 +1109,7 @@ static void denali_write_page(struct mtd_info *mtd, struct nand_chip *chip,
1109} 1109}
1110 1110
1111/* This is the callback that the NAND core calls to write a page without ECC. 1111/* This is the callback that the NAND core calls to write a page without ECC.
1112 * raw access is similiar to ECC page writes, so all the work is done in the 1112 * raw access is similar to ECC page writes, so all the work is done in the
1113 * write_page() function above. 1113 * write_page() function above.
1114 */ 1114 */
1115static void denali_write_page_raw(struct mtd_info *mtd, struct nand_chip *chip, 1115static void denali_write_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index b7f8de7b2780..96c0b34ba8db 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -137,7 +137,7 @@ static struct rs_control *rs_decoder;
137 * 137 *
138 * Fabrice Bellard figured this out in the old docecc code. I added 138 * Fabrice Bellard figured this out in the old docecc code. I added
139 * some comments, improved a minor bit and converted it to make use 139 * some comments, improved a minor bit and converted it to make use
140 * of the generic Reed-Solomon libary. tglx 140 * of the generic Reed-Solomon library. tglx
141 */ 141 */
142static int doc_ecc_decode(struct rs_control *rs, uint8_t *data, uint8_t *ecc) 142static int doc_ecc_decode(struct rs_control *rs, uint8_t *data, uint8_t *ecc)
143{ 143{
@@ -400,7 +400,7 @@ static uint16_t __init doc200x_ident_chip(struct mtd_info *mtd, int nr)
400 doc200x_hwcontrol(mtd, 0, NAND_CTRL_ALE | NAND_CTRL_CHANGE); 400 doc200x_hwcontrol(mtd, 0, NAND_CTRL_ALE | NAND_CTRL_CHANGE);
401 doc200x_hwcontrol(mtd, NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE); 401 doc200x_hwcontrol(mtd, NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE);
402 402
403 /* We cant' use dev_ready here, but at least we wait for the 403 /* We can't' use dev_ready here, but at least we wait for the
404 * command to complete 404 * command to complete
405 */ 405 */
406 udelay(50); 406 udelay(50);
@@ -986,7 +986,7 @@ static int doc200x_correct_data(struct mtd_info *mtd, u_char *dat,
986 dummy = ReadDOC(docptr, ECCConf); 986 dummy = ReadDOC(docptr, ECCConf);
987 } 987 }
988 988
989 /* Error occured ? */ 989 /* Error occurred ? */
990 if (dummy & 0x80) { 990 if (dummy & 0x80) {
991 for (i = 0; i < 6; i++) { 991 for (i = 0; i < 6; i++) {
992 if (DoC_is_MillenniumPlus(doc)) 992 if (DoC_is_MillenniumPlus(doc))
@@ -1160,7 +1160,7 @@ static inline int __init nftl_partscan(struct mtd_info *mtd, struct mtd_partitio
1160 /* NOTE: The lines below modify internal variables of the NAND and MTD 1160 /* NOTE: The lines below modify internal variables of the NAND and MTD
1161 layers; variables with have already been configured by nand_scan. 1161 layers; variables with have already been configured by nand_scan.
1162 Unfortunately, we didn't know before this point what these values 1162 Unfortunately, we didn't know before this point what these values
1163 should be. Thus, this code is somewhat dependant on the exact 1163 should be. Thus, this code is somewhat dependent on the exact
1164 implementation of the NAND layer. */ 1164 implementation of the NAND layer. */
1165 if (mh->UnitSizeFactor != 0xff) { 1165 if (mh->UnitSizeFactor != 0xff) {
1166 this->bbt_erase_shift += (0xff - mh->UnitSizeFactor); 1166 this->bbt_erase_shift += (0xff - mh->UnitSizeFactor);
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index 7a13d42cbabd..537e380b8dcb 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -59,7 +59,7 @@ struct fsl_elbc_mtd {
59 unsigned int fmr; /* FCM Flash Mode Register value */ 59 unsigned int fmr; /* FCM Flash Mode Register value */
60}; 60};
61 61
62/* Freescale eLBC FCM controller infomation */ 62/* Freescale eLBC FCM controller information */
63 63
64struct fsl_elbc_fcm_ctrl { 64struct fsl_elbc_fcm_ctrl {
65 struct nand_hw_control controller; 65 struct nand_hw_control controller;
diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index 205b10b9f9b9..0d45ef3883e8 100644
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/fsmc_nand.c
@@ -335,7 +335,7 @@ static void fsmc_enable_hwecc(struct mtd_info *mtd, int mode)
335 335
336/* 336/*
337 * fsmc_read_hwecc_ecc4 - Hardware ECC calculator for ecc4 option supported by 337 * fsmc_read_hwecc_ecc4 - Hardware ECC calculator for ecc4 option supported by
338 * FSMC. ECC is 13 bytes for 512 bytes of data (supports error correction upto 338 * FSMC. ECC is 13 bytes for 512 bytes of data (supports error correction up to
339 * max of 8-bits) 339 * max of 8-bits)
340 */ 340 */
341static int fsmc_read_hwecc_ecc4(struct mtd_info *mtd, const uint8_t *data, 341static int fsmc_read_hwecc_ecc4(struct mtd_info *mtd, const uint8_t *data,
@@ -381,7 +381,7 @@ static int fsmc_read_hwecc_ecc4(struct mtd_info *mtd, const uint8_t *data,
381 381
382/* 382/*
383 * fsmc_read_hwecc_ecc1 - Hardware ECC calculator for ecc1 option supported by 383 * fsmc_read_hwecc_ecc1 - Hardware ECC calculator for ecc1 option supported by
384 * FSMC. ECC is 3 bytes for 512 bytes of data (supports error correction upto 384 * FSMC. ECC is 3 bytes for 512 bytes of data (supports error correction up to
385 * max of 1-bit) 385 * max of 1-bit)
386 */ 386 */
387static int fsmc_read_hwecc_ecc1(struct mtd_info *mtd, const uint8_t *data, 387static int fsmc_read_hwecc_ecc1(struct mtd_info *mtd, const uint8_t *data,
@@ -408,10 +408,10 @@ static int fsmc_read_hwecc_ecc1(struct mtd_info *mtd, const uint8_t *data,
408 * @buf: buffer to store read data 408 * @buf: buffer to store read data
409 * @page: page number to read 409 * @page: page number to read
410 * 410 *
411 * This routine is needed for fsmc verison 8 as reading from NAND chip has to be 411 * This routine is needed for fsmc version 8 as reading from NAND chip has to be
412 * performed in a strict sequence as follows: 412 * performed in a strict sequence as follows:
413 * data(512 byte) -> ecc(13 byte) 413 * data(512 byte) -> ecc(13 byte)
414 * After this read, fsmc hardware generates and reports error data bits(upto a 414 * After this read, fsmc hardware generates and reports error data bits(up to a
415 * max of 8 bits) 415 * max of 8 bits)
416 */ 416 */
417static int fsmc_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, 417static int fsmc_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
@@ -686,7 +686,7 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
686 } 686 }
687 687
688 /* 688 /*
689 * Scan to find existance of the device 689 * Scan to find existence of the device
690 */ 690 */
691 if (nand_scan_ident(&host->mtd, 1, NULL)) { 691 if (nand_scan_ident(&host->mtd, 1, NULL)) {
692 ret = -ENXIO; 692 ret = -ENXIO;
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 85cfc061d41c..c54a4cbac6bc 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -1582,7 +1582,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
1582} 1582}
1583 1583
1584/** 1584/**
1585 * nand_read - [MTD Interface] MTD compability function for nand_do_read_ecc 1585 * nand_read - [MTD Interface] MTD compatibility function for nand_do_read_ecc
1586 * @mtd: MTD device structure 1586 * @mtd: MTD device structure
1587 * @from: offset to read from 1587 * @from: offset to read from
1588 * @len: number of bytes to read 1588 * @len: number of bytes to read
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index a1e8b30078d9..af46428286fe 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -945,7 +945,7 @@ static int check_create(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_desc
945 rd2 = NULL; 945 rd2 = NULL;
946 /* Per chip or per device ? */ 946 /* Per chip or per device ? */
947 chipsel = (td->options & NAND_BBT_PERCHIP) ? i : -1; 947 chipsel = (td->options & NAND_BBT_PERCHIP) ? i : -1;
948 /* Mirrored table avilable ? */ 948 /* Mirrored table available ? */
949 if (md) { 949 if (md) {
950 if (td->pages[i] == -1 && md->pages[i] == -1) { 950 if (td->pages[i] == -1 && md->pages[i] == -1) {
951 writeops = 0x03; 951 writeops = 0x03;
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index 213181be0d9a..893d95bfea48 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -162,7 +162,7 @@ MODULE_PARM_DESC(bitflips, "Maximum number of random bit flips per page (z
162MODULE_PARM_DESC(gravepages, "Pages that lose data [: maximum reads (defaults to 3)]" 162MODULE_PARM_DESC(gravepages, "Pages that lose data [: maximum reads (defaults to 3)]"
163 " separated by commas e.g. 1401:2 means page 1401" 163 " separated by commas e.g. 1401:2 means page 1401"
164 " can be read only twice before failing"); 164 " can be read only twice before failing");
165MODULE_PARM_DESC(rptwear, "Number of erases inbetween reporting wear, if not zero"); 165MODULE_PARM_DESC(rptwear, "Number of erases between reporting wear, if not zero");
166MODULE_PARM_DESC(overridesize, "Specifies the NAND Flash size overriding the ID bytes. " 166MODULE_PARM_DESC(overridesize, "Specifies the NAND Flash size overriding the ID bytes. "
167 "The size is specified in erase blocks and as the exponent of a power of two" 167 "The size is specified in erase blocks and as the exponent of a power of two"
168 " e.g. 5 means a size of 32 erase blocks"); 168 " e.g. 5 means a size of 32 erase blocks");
diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c
index 8c0b69375224..a045a4a581b6 100644
--- a/drivers/mtd/nand/nomadik_nand.c
+++ b/drivers/mtd/nand/nomadik_nand.c
@@ -151,7 +151,7 @@ static int nomadik_nand_probe(struct platform_device *pdev)
151 nand->options = pdata->options; 151 nand->options = pdata->options;
152 152
153 /* 153 /*
154 * Scan to find existance of the device 154 * Scan to find existence of the device
155 */ 155 */
156 if (nand_scan(&host->mtd, 1)) { 156 if (nand_scan(&host->mtd, 1)) {
157 ret = -ENXIO; 157 ret = -ENXIO;
diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c
index 59efa829ef24..20bfe5f15afd 100644
--- a/drivers/mtd/nand/pasemi_nand.c
+++ b/drivers/mtd/nand/pasemi_nand.c
@@ -157,7 +157,7 @@ static int __devinit pasemi_nand_probe(struct platform_device *ofdev)
157 /* Enable the following for a flash based bad block table */ 157 /* Enable the following for a flash based bad block table */
158 chip->options = NAND_USE_FLASH_BBT | NAND_NO_AUTOINCR; 158 chip->options = NAND_USE_FLASH_BBT | NAND_NO_AUTOINCR;
159 159
160 /* Scan to find existance of the device */ 160 /* Scan to find existence of the device */
161 if (nand_scan(pasemi_nand_mtd, 1)) { 161 if (nand_scan(pasemi_nand_mtd, 1)) {
162 err = -ENXIO; 162 err = -ENXIO;
163 goto out_lpc; 163 goto out_lpc;
diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c
index 317aff428e42..caf5a736340a 100644
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c
@@ -95,7 +95,7 @@ static int __devinit plat_nand_probe(struct platform_device *pdev)
95 goto out; 95 goto out;
96 } 96 }
97 97
98 /* Scan to find existance of the device */ 98 /* Scan to find existence of the device */
99 if (nand_scan(&data->mtd, pdata->chip.nr_chips)) { 99 if (nand_scan(&data->mtd, pdata->chip.nr_chips)) {
100 err = -ENXIO; 100 err = -ENXIO;
101 goto out; 101 goto out;
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index ab7f4c33ced6..ff0701276d65 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -184,7 +184,7 @@ struct pxa3xx_nand_info {
184 184
185static int use_dma = 1; 185static int use_dma = 1;
186module_param(use_dma, bool, 0444); 186module_param(use_dma, bool, 0444);
187MODULE_PARM_DESC(use_dma, "enable DMA for data transfering to/from NAND HW"); 187MODULE_PARM_DESC(use_dma, "enable DMA for data transferring to/from NAND HW");
188 188
189/* 189/*
190 * Default NAND flash controller configuration setup by the 190 * Default NAND flash controller configuration setup by the
diff --git a/drivers/mtd/nand/r852.c b/drivers/mtd/nand/r852.c
index 6322d1fb5d62..cae2e013c986 100644
--- a/drivers/mtd/nand/r852.c
+++ b/drivers/mtd/nand/r852.c
@@ -185,7 +185,7 @@ static void r852_do_dma(struct r852_device *dev, uint8_t *buf, int do_read)
185 185
186 dbg_verbose("doing dma %s ", do_read ? "read" : "write"); 186 dbg_verbose("doing dma %s ", do_read ? "read" : "write");
187 187
188 /* Set intial dma state: for reading first fill on board buffer, 188 /* Set initial dma state: for reading first fill on board buffer,
189 from device, for writes first fill the buffer from memory*/ 189 from device, for writes first fill the buffer from memory*/
190 dev->dma_state = do_read ? DMA_INTERNAL : DMA_MEMORY; 190 dev->dma_state = do_read ? DMA_INTERNAL : DMA_MEMORY;
191 191
@@ -766,7 +766,7 @@ static irqreturn_t r852_irq(int irq, void *data)
766 ret = IRQ_HANDLED; 766 ret = IRQ_HANDLED;
767 dev->card_detected = !!(card_status & R852_CARD_IRQ_INSERT); 767 dev->card_detected = !!(card_status & R852_CARD_IRQ_INSERT);
768 768
769 /* we shouldn't recieve any interrupts if we wait for card 769 /* we shouldn't receive any interrupts if we wait for card
770 to settle */ 770 to settle */
771 WARN_ON(dev->card_unstable); 771 WARN_ON(dev->card_unstable);
772 772
@@ -794,13 +794,13 @@ static irqreturn_t r852_irq(int irq, void *data)
794 ret = IRQ_HANDLED; 794 ret = IRQ_HANDLED;
795 795
796 if (dma_status & R852_DMA_IRQ_ERROR) { 796 if (dma_status & R852_DMA_IRQ_ERROR) {
797 dbg("recieved dma error IRQ"); 797 dbg("received dma error IRQ");
798 r852_dma_done(dev, -EIO); 798 r852_dma_done(dev, -EIO);
799 complete(&dev->dma_done); 799 complete(&dev->dma_done);
800 goto out; 800 goto out;
801 } 801 }
802 802
803 /* recieved DMA interrupt out of nowhere? */ 803 /* received DMA interrupt out of nowhere? */
804 WARN_ON_ONCE(dev->dma_stage == 0); 804 WARN_ON_ONCE(dev->dma_stage == 0);
805 805
806 if (dev->dma_stage == 0) 806 if (dev->dma_stage == 0)
@@ -960,7 +960,7 @@ int r852_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
960 &dev->card_detect_work, 0); 960 &dev->card_detect_work, 0);
961 961
962 962
963 printk(KERN_NOTICE DRV_NAME ": driver loaded succesfully\n"); 963 printk(KERN_NOTICE DRV_NAME ": driver loaded successfully\n");
964 return 0; 964 return 0;
965 965
966error10: 966error10:
diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
index 546c2f0eb2e8..81bbb5ee148d 100644
--- a/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/sh_flctl.c
@@ -78,7 +78,7 @@ static void start_translation(struct sh_flctl *flctl)
78 78
79static void timeout_error(struct sh_flctl *flctl, const char *str) 79static void timeout_error(struct sh_flctl *flctl, const char *str)
80{ 80{
81 dev_err(&flctl->pdev->dev, "Timeout occured in %s\n", str); 81 dev_err(&flctl->pdev->dev, "Timeout occurred in %s\n", str);
82} 82}
83 83
84static void wait_completion(struct sh_flctl *flctl) 84static void wait_completion(struct sh_flctl *flctl)
diff --git a/drivers/mtd/nand/sm_common.c b/drivers/mtd/nand/sm_common.c
index 4a8f367c295c..57cc80cd01a3 100644
--- a/drivers/mtd/nand/sm_common.c
+++ b/drivers/mtd/nand/sm_common.c
@@ -121,7 +121,7 @@ int sm_register_device(struct mtd_info *mtd, int smartmedia)
121 if (ret) 121 if (ret)
122 return ret; 122 return ret;
123 123
124 /* Bad block marker postion */ 124 /* Bad block marker position */
125 chip->badblockpos = 0x05; 125 chip->badblockpos = 0x05;
126 chip->badblockbits = 7; 126 chip->badblockbits = 7;
127 chip->block_markbad = sm_block_markbad; 127 chip->block_markbad = sm_block_markbad;
diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c
index 38fb16771f85..14c578707824 100644
--- a/drivers/mtd/nand/tmio_nand.c
+++ b/drivers/mtd/nand/tmio_nand.c
@@ -4,7 +4,7 @@
4 * Slightly murky pre-git history of the driver: 4 * Slightly murky pre-git history of the driver:
5 * 5 *
6 * Copyright (c) Ian Molton 2004, 2005, 2008 6 * Copyright (c) Ian Molton 2004, 2005, 2008
7 * Original work, independant of sharps code. Included hardware ECC support. 7 * Original work, independent of sharps code. Included hardware ECC support.
8 * Hard ECC did not work for writes in the early revisions. 8 * Hard ECC did not work for writes in the early revisions.
9 * Copyright (c) Dirk Opfer 2005. 9 * Copyright (c) Dirk Opfer 2005.
10 * Modifications developed from sharps code but 10 * Modifications developed from sharps code but
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index f591f615d3f6..1fcb41adab07 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -608,7 +608,7 @@ static int omap2_onenand_enable(struct mtd_info *mtd)
608 608
609 ret = regulator_enable(c->regulator); 609 ret = regulator_enable(c->regulator);
610 if (ret != 0) 610 if (ret != 0)
611 dev_err(&c->pdev->dev, "cant enable regulator\n"); 611 dev_err(&c->pdev->dev, "can't enable regulator\n");
612 612
613 return ret; 613 return ret;
614} 614}
@@ -620,7 +620,7 @@ static int omap2_onenand_disable(struct mtd_info *mtd)
620 620
621 ret = regulator_disable(c->regulator); 621 ret = regulator_disable(c->regulator);
622 if (ret != 0) 622 if (ret != 0)
623 dev_err(&c->pdev->dev, "cant disable regulator\n"); 623 dev_err(&c->pdev->dev, "can't disable regulator\n");
624 624
625 return ret; 625 return ret;
626} 626}
diff --git a/drivers/mtd/onenand/onenand_sim.c b/drivers/mtd/onenand/onenand_sim.c
index 8b246061d511..5ef3bd547772 100644
--- a/drivers/mtd/onenand/onenand_sim.c
+++ b/drivers/mtd/onenand/onenand_sim.c
@@ -321,7 +321,7 @@ static void onenand_data_handle(struct onenand_chip *this, int cmd,
321 continue; 321 continue;
322 if (memcmp(dest + off, ffchars, this->subpagesize) && 322 if (memcmp(dest + off, ffchars, this->subpagesize) &&
323 onenand_check_overwrite(dest + off, src + off, this->subpagesize)) 323 onenand_check_overwrite(dest + off, src + off, this->subpagesize))
324 printk(KERN_ERR "over-write happend at 0x%08x\n", offset); 324 printk(KERN_ERR "over-write happened at 0x%08x\n", offset);
325 memcpy(dest + off, src + off, this->subpagesize); 325 memcpy(dest + off, src + off, this->subpagesize);
326 } 326 }
327 /* Fall through */ 327 /* Fall through */
@@ -335,7 +335,7 @@ static void onenand_data_handle(struct onenand_chip *this, int cmd,
335 dest = ONENAND_CORE_SPARE(flash, this, offset); 335 dest = ONENAND_CORE_SPARE(flash, this, offset);
336 if (memcmp(dest, ffchars, mtd->oobsize) && 336 if (memcmp(dest, ffchars, mtd->oobsize) &&
337 onenand_check_overwrite(dest, src, mtd->oobsize)) 337 onenand_check_overwrite(dest, src, mtd->oobsize))
338 printk(KERN_ERR "OOB: over-write happend at 0x%08x\n", 338 printk(KERN_ERR "OOB: over-write happened at 0x%08x\n",
339 offset); 339 offset);
340 memcpy(dest, src, mtd->oobsize); 340 memcpy(dest, src, mtd->oobsize);
341 break; 341 break;
diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
index 2b0daae4018d..ed3d6cd2c6dc 100644
--- a/drivers/mtd/sm_ftl.c
+++ b/drivers/mtd/sm_ftl.c
@@ -540,7 +540,7 @@ static int sm_check_block(struct sm_ftl *ftl, int zone, int block)
540 return -EIO; 540 return -EIO;
541 } 541 }
542 542
543 /* If the block is sliced (partialy erased usually) erase it */ 543 /* If the block is sliced (partially erased usually) erase it */
544 if (i == 2) { 544 if (i == 2) {
545 sm_erase_block(ftl, zone, block, 1); 545 sm_erase_block(ftl, zone, block, 1);
546 return 1; 546 return 1;
@@ -878,7 +878,7 @@ static int sm_init_zone(struct sm_ftl *ftl, int zone_num)
878 return 0; 878 return 0;
879} 879}
880 880
881/* Get and automaticly initialize an FTL mapping for one zone */ 881/* Get and automatically initialize an FTL mapping for one zone */
882struct ftl_zone *sm_get_zone(struct sm_ftl *ftl, int zone_num) 882struct ftl_zone *sm_get_zone(struct sm_ftl *ftl, int zone_num)
883{ 883{
884 struct ftl_zone *zone; 884 struct ftl_zone *zone;
diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig
index 6abeb4f13403..4dcc752a0c0b 100644
--- a/drivers/mtd/ubi/Kconfig
+++ b/drivers/mtd/ubi/Kconfig
@@ -56,7 +56,7 @@ config MTD_UBI_DEBUG
56 bool "UBI debugging" 56 bool "UBI debugging"
57 depends on SYSFS 57 depends on SYSFS
58 select DEBUG_FS 58 select DEBUG_FS
59 select KALLSYMS_ALL if KALLSYMS && DEBUG_KERNEL 59 select KALLSYMS
60 help 60 help
61 This option enables UBI debugging. 61 This option enables UBI debugging.
62 62
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index eededf94f5a6..e347cc4388ed 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -344,6 +344,12 @@ static int do_sync_erase(struct ubi_device *ubi, int pnum)
344 wait_queue_head_t wq; 344 wait_queue_head_t wq;
345 345
346 dbg_io("erase PEB %d", pnum); 346 dbg_io("erase PEB %d", pnum);
347 ubi_assert(pnum >= 0 && pnum < ubi->peb_count);
348
349 if (ubi->ro_mode) {
350 ubi_err("read-only mode");
351 return -EROFS;
352 }
347 353
348retry: 354retry:
349 init_waitqueue_head(&wq); 355 init_waitqueue_head(&wq);
@@ -390,7 +396,7 @@ retry:
390 if (err) 396 if (err)
391 return err; 397 return err;
392 398
393 if (ubi_dbg_is_erase_failure() && !err) { 399 if (ubi_dbg_is_erase_failure()) {
394 dbg_err("cannot erase PEB %d (emulated)", pnum); 400 dbg_err("cannot erase PEB %d (emulated)", pnum);
395 return -EIO; 401 return -EIO;
396 } 402 }
diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c
index 11eb8ef12485..d2d12ab7def4 100644
--- a/drivers/mtd/ubi/scan.c
+++ b/drivers/mtd/ubi/scan.c
@@ -968,7 +968,7 @@ static int process_eb(struct ubi_device *ubi, struct ubi_scan_info *si,
968 * contains garbage because of a power cut during erase 968 * contains garbage because of a power cut during erase
969 * operation. So we just schedule this PEB for erasure. 969 * operation. So we just schedule this PEB for erasure.
970 * 970 *
971 * Besides, in case of NOR flash, we deliberatly 971 * Besides, in case of NOR flash, we deliberately
972 * corrupt both headers because NOR flash erasure is 972 * corrupt both headers because NOR flash erasure is
973 * slow and can start from the end. 973 * slow and can start from the end.
974 */ 974 */
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index b79e0dea3632..366eb70219a6 100644
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -790,11 +790,6 @@ static int paranoid_check_volume(struct ubi_device *ubi, int vol_id)
790 goto fail; 790 goto fail;
791 } 791 }
792 792
793 if (!vol->name) {
794 ubi_err("NULL volume name");
795 goto fail;
796 }
797
798 n = strnlen(vol->name, vol->name_len + 1); 793 n = strnlen(vol->name, vol->name_len + 1);
799 if (n != vol->name_len) { 794 if (n != vol->name_len) {
800 ubi_err("bad name_len %lld", n); 795 ubi_err("bad name_len %lld", n);
diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c
index 9e1c03eb97ae..5420f6de27df 100644
--- a/drivers/net/3c501.c
+++ b/drivers/net/3c501.c
@@ -399,7 +399,7 @@ static void el_timeout(struct net_device *dev)
399 * as we may still be attempting to retrieve the last RX packet buffer. 399 * as we may still be attempting to retrieve the last RX packet buffer.
400 * 400 *
401 * When a transmit times out we dump the card into control mode and just 401 * When a transmit times out we dump the card into control mode and just
402 * start again. It happens enough that it isnt worth logging. 402 * start again. It happens enough that it isn't worth logging.
403 * 403 *
404 * We avoid holding the spin locks when doing the packet load to the board. 404 * We avoid holding the spin locks when doing the packet load to the board.
405 * The device is very slow, and its DMA mode is even slower. If we held the 405 * The device is very slow, and its DMA mode is even slower. If we held the
@@ -499,7 +499,7 @@ static netdev_tx_t el_start_xmit(struct sk_buff *skb, struct net_device *dev)
499 * 499 *
500 * Handle the ether interface interrupts. The 3c501 needs a lot more 500 * Handle the ether interface interrupts. The 3c501 needs a lot more
501 * hand holding than most cards. In particular we get a transmit interrupt 501 * hand holding than most cards. In particular we get a transmit interrupt
502 * with a collision error because the board firmware isnt capable of rewinding 502 * with a collision error because the board firmware isn't capable of rewinding
503 * its own transmit buffer pointers. It can however count to 16 for us. 503 * its own transmit buffer pointers. It can however count to 16 for us.
504 * 504 *
505 * On the receive side the card is also very dumb. It has no buffering to 505 * On the receive side the card is also very dumb. It has no buffering to
@@ -732,7 +732,7 @@ static void el_receive(struct net_device *dev)
732 * el_reset: Reset a 3c501 card 732 * el_reset: Reset a 3c501 card
733 * @dev: The 3c501 card about to get zapped 733 * @dev: The 3c501 card about to get zapped
734 * 734 *
735 * Even resetting a 3c501 isnt simple. When you activate reset it loses all 735 * Even resetting a 3c501 isn't simple. When you activate reset it loses all
736 * its configuration. You must hold the lock when doing this. The function 736 * its configuration. You must hold the lock when doing this. The function
737 * cannot take the lock itself as it is callable from the irq handler. 737 * cannot take the lock itself as it is callable from the irq handler.
738 */ 738 */
diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index de579d043169..bc0d1a1c2e28 100644
--- a/drivers/net/3c523.c
+++ b/drivers/net/3c523.c
@@ -44,7 +44,7 @@
44 this for the 64K version would require a lot of heinous bank 44 this for the 64K version would require a lot of heinous bank
45 switching, which I'm sure not interested in doing. If you try to 45 switching, which I'm sure not interested in doing. If you try to
46 implement a bank switching version, you'll basically have to remember 46 implement a bank switching version, you'll basically have to remember
47 what bank is enabled and do a switch everytime you access a memory 47 what bank is enabled and do a switch every time you access a memory
48 location that's not current. You'll also have to remap pointers on 48 location that's not current. You'll also have to remap pointers on
49 the driver side, because it only knows about 16K of the memory. 49 the driver side, because it only knows about 16K of the memory.
50 Anyone desperate or masochistic enough to try? 50 Anyone desperate or masochistic enough to try?
diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c
index 8c094bae8bf3..d9d056d207f3 100644
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
@@ -51,7 +51,7 @@ DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " Richard Procter <rnp@paradise.net.
51 * circular buffer queues. 51 * circular buffer queues.
52 * 52 *
53 * The mailboxes can be used for controlling how the card traverses 53 * The mailboxes can be used for controlling how the card traverses
54 * its buffer rings, but are used only for inital setup in this 54 * its buffer rings, but are used only for initial setup in this
55 * implementation. The exec mailbox allows a variety of commands to 55 * implementation. The exec mailbox allows a variety of commands to
56 * be executed. Each command must complete before the next is 56 * be executed. Each command must complete before the next is
57 * executed. Primarily we use the exec mailbox for controlling the 57 * executed. Primarily we use the exec mailbox for controlling the
@@ -813,7 +813,7 @@ static void mc32_flush_rx_ring(struct net_device *dev)
813 * 813 *
814 * This sets up the host transmit data-structures. 814 * This sets up the host transmit data-structures.
815 * 815 *
816 * First, we obtain from the card it's current postion in the tx 816 * First, we obtain from the card it's current position in the tx
817 * ring, so that we will know where to begin transmitting 817 * ring, so that we will know where to begin transmitting
818 * packets. 818 * packets.
819 * 819 *
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 0a92436f0538..8cc22568ebd3 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -984,7 +984,7 @@ static int __init vortex_eisa_init(void)
984 * any device have been found when we exit from 984 * any device have been found when we exit from
985 * eisa_driver_register (the bus root driver may not be 985 * eisa_driver_register (the bus root driver may not be
986 * initialized yet). So we blindly assume something was 986 * initialized yet). So we blindly assume something was
987 * found, and let the sysfs magic happend... 987 * found, and let the sysfs magic happened...
988 */ 988 */
989 eisa_found = 1; 989 eisa_found = 1;
990 } 990 }
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index 41d9911202d0..ee648fe5d96f 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -1584,7 +1584,7 @@ static void ace_watchdog(struct net_device *data)
1584 /* 1584 /*
1585 * We haven't received a stats update event for more than 2.5 1585 * We haven't received a stats update event for more than 2.5
1586 * seconds and there is data in the transmit queue, thus we 1586 * seconds and there is data in the transmit queue, thus we
1587 * asume the card is stuck. 1587 * assume the card is stuck.
1588 */ 1588 */
1589 if (*ap->tx_csm != ap->tx_ret_csm) { 1589 if (*ap->tx_csm != ap->tx_ret_csm) {
1590 printk(KERN_WARNING "%s: Transmitter is stuck, %08x\n", 1590 printk(KERN_WARNING "%s: Transmitter is stuck, %08x\n",
@@ -2564,7 +2564,7 @@ restart:
2564 2564
2565 /* 2565 /*
2566 * A TX-descriptor producer (an IRQ) might have gotten 2566 * A TX-descriptor producer (an IRQ) might have gotten
2567 * inbetween, making the ring free again. Since xmit is 2567 * between, making the ring free again. Since xmit is
2568 * serialized, this is the only situation we have to 2568 * serialized, this is the only situation we have to
2569 * re-test. 2569 * re-test.
2570 */ 2570 */
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index 2ca880b4c0db..88495c48a81d 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -1398,7 +1398,7 @@ static void amd8111e_set_multicast_list(struct net_device *dev)
1398 mc_filter[1] = mc_filter[0] = 0; 1398 mc_filter[1] = mc_filter[0] = 0;
1399 lp->options &= ~OPTION_MULTICAST_ENABLE; 1399 lp->options &= ~OPTION_MULTICAST_ENABLE;
1400 amd8111e_writeq(*(u64*)mc_filter,lp->mmio + LADRF); 1400 amd8111e_writeq(*(u64*)mc_filter,lp->mmio + LADRF);
1401 /* disable promiscous mode */ 1401 /* disable promiscuous mode */
1402 writel(PROM, lp->mmio + CMD2); 1402 writel(PROM, lp->mmio + CMD2);
1403 return; 1403 return;
1404 } 1404 }
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index f4744fc89768..65a78f965dd2 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -133,7 +133,7 @@ struct net_local {
133/* Run-time register bank 2 definitions. */ 133/* Run-time register bank 2 definitions. */
134#define DATAPORT 8 /* Word-wide DMA or programmed-I/O dataport. */ 134#define DATAPORT 8 /* Word-wide DMA or programmed-I/O dataport. */
135#define TX_START 10 135#define TX_START 10
136#define COL16CNTL 11 /* Controll Reg for 16 collisions */ 136#define COL16CNTL 11 /* Control Reg for 16 collisions */
137#define MODE13 13 137#define MODE13 13
138#define RX_CTRL 14 138#define RX_CTRL 14
139/* Configuration registers only on the '865A/B chips. */ 139/* Configuration registers only on the '865A/B chips. */
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index 1ff001a8270c..b0a71e2f28a9 100644
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -2509,7 +2509,7 @@ static struct pci_driver atl1e_driver = {
2509 .id_table = atl1e_pci_tbl, 2509 .id_table = atl1e_pci_tbl,
2510 .probe = atl1e_probe, 2510 .probe = atl1e_probe,
2511 .remove = __devexit_p(atl1e_remove), 2511 .remove = __devexit_p(atl1e_remove),
2512 /* Power Managment Hooks */ 2512 /* Power Management Hooks */
2513#ifdef CONFIG_PM 2513#ifdef CONFIG_PM
2514 .suspend = atl1e_suspend, 2514 .suspend = atl1e_suspend,
2515 .resume = atl1e_resume, 2515 .resume = atl1e_resume,
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c
index 937ef1afa5db..e3cbf45dc612 100644
--- a/drivers/net/atlx/atl2.c
+++ b/drivers/net/atlx/atl2.c
@@ -1701,7 +1701,7 @@ static struct pci_driver atl2_driver = {
1701 .id_table = atl2_pci_tbl, 1701 .id_table = atl2_pci_tbl,
1702 .probe = atl2_probe, 1702 .probe = atl2_probe,
1703 .remove = __devexit_p(atl2_remove), 1703 .remove = __devexit_p(atl2_remove),
1704 /* Power Managment Hooks */ 1704 /* Power Management Hooks */
1705 .suspend = atl2_suspend, 1705 .suspend = atl2_suspend,
1706#ifdef CONFIG_PM 1706#ifdef CONFIG_PM
1707 .resume = atl2_resume, 1707 .resume = atl2_resume,
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c
index e94a966af418..c48104b08861 100644
--- a/drivers/net/bcm63xx_enet.c
+++ b/drivers/net/bcm63xx_enet.c
@@ -597,7 +597,7 @@ static int bcm_enet_set_mac_address(struct net_device *dev, void *p)
597} 597}
598 598
599/* 599/*
600 * Change rx mode (promiscous/allmulti) and update multicast list 600 * Change rx mode (promiscuous/allmulti) and update multicast list
601 */ 601 */
602static void bcm_enet_set_multicast_list(struct net_device *dev) 602static void bcm_enet_set_multicast_list(struct net_device *dev)
603{ 603{
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index 5a4a87e7c5ea..1e2d825bb94a 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -1331,7 +1331,7 @@ err:
1331 1331
1332/* 1332/*
1333 * Uses MCC for this command as it may be called in BH context 1333 * Uses MCC for this command as it may be called in BH context
1334 * (mc == NULL) => multicast promiscous 1334 * (mc == NULL) => multicast promiscuous
1335 */ 1335 */
1336int be_cmd_multicast_set(struct be_adapter *adapter, u32 if_id, 1336int be_cmd_multicast_set(struct be_adapter *adapter, u32 if_id,
1337 struct net_device *netdev, struct be_dma_mem *mem) 1337 struct net_device *netdev, struct be_dma_mem *mem)
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index a71163f1e34b..9a54c8b24ff9 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -708,7 +708,7 @@ static void be_set_multicast_list(struct net_device *netdev)
708 goto done; 708 goto done;
709 } 709 }
710 710
711 /* BE was previously in promiscous mode; disable it */ 711 /* BE was previously in promiscuous mode; disable it */
712 if (adapter->promiscuous) { 712 if (adapter->promiscuous) {
713 adapter->promiscuous = false; 713 adapter->promiscuous = false;
714 be_cmd_promiscuous_config(adapter, adapter->port_num, 0); 714 be_cmd_promiscuous_config(adapter, adapter->port_num, 0);
diff --git a/drivers/net/bna/bna_hw.h b/drivers/net/bna/bna_hw.h
index 806b224a4c63..6cb89692f5c1 100644
--- a/drivers/net/bna/bna_hw.h
+++ b/drivers/net/bna/bna_hw.h
@@ -897,7 +897,7 @@ static struct bna_ritseg_pool_cfg name[BFI_RIT_SEG_TOTAL_POOLS] = \
897 * Catapult RSS Table Base Offset Address 897 * Catapult RSS Table Base Offset Address
898 * 898 *
899 * Exists in RAD memory space. 899 * Exists in RAD memory space.
900 * Each entry is 352 bits, but alligned on 900 * Each entry is 352 bits, but aligned on
901 * 64 byte (512 bit) boundary. Accessed 901 * 64 byte (512 bit) boundary. Accessed
902 * 4 byte words, the whole entry can be 902 * 4 byte words, the whole entry can be
903 * broken into 11 word accesses. 903 * broken into 11 word accesses.
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
index b7ff87b35fbb..e0fca701d2f3 100644
--- a/drivers/net/bnx2x/bnx2x.h
+++ b/drivers/net/bnx2x/bnx2x.h
@@ -1220,7 +1220,7 @@ struct bnx2x {
1220 struct bnx2x_dcbx_port_params dcbx_port_params; 1220 struct bnx2x_dcbx_port_params dcbx_port_params;
1221 int dcb_version; 1221 int dcb_version;
1222 1222
1223 /* DCBX Negotation results */ 1223 /* DCBX Negotiation results */
1224 struct dcbx_features dcbx_local_feat; 1224 struct dcbx_features dcbx_local_feat;
1225 u32 dcbx_error; 1225 u32 dcbx_error;
1226 u32 pending_max; 1226 u32 pending_max;
diff --git a/drivers/net/bnx2x/bnx2x_hsi.h b/drivers/net/bnx2x/bnx2x_hsi.h
index be503cc0a50b..dac1bf9cbbfa 100644
--- a/drivers/net/bnx2x/bnx2x_hsi.h
+++ b/drivers/net/bnx2x/bnx2x_hsi.h
@@ -3019,7 +3019,7 @@ struct tstorm_eth_mac_filter_config {
3019 3019
3020 3020
3021/* 3021/*
3022 * common flag to indicate existance of TPA. 3022 * common flag to indicate existence of TPA.
3023 */ 3023 */
3024struct tstorm_eth_tpa_exist { 3024struct tstorm_eth_tpa_exist {
3025#if defined(__BIG_ENDIAN) 3025#if defined(__BIG_ENDIAN)
diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c
index f2f367d4e74d..974ef2be36a5 100644
--- a/drivers/net/bnx2x/bnx2x_link.c
+++ b/drivers/net/bnx2x/bnx2x_link.c
@@ -2823,7 +2823,7 @@ static u16 bnx2x_wait_reset_complete(struct bnx2x *bp,
2823 struct link_params *params) 2823 struct link_params *params)
2824{ 2824{
2825 u16 cnt, ctrl; 2825 u16 cnt, ctrl;
2826 /* Wait for soft reset to get cleared upto 1 sec */ 2826 /* Wait for soft reset to get cleared up to 1 sec */
2827 for (cnt = 0; cnt < 1000; cnt++) { 2827 for (cnt = 0; cnt < 1000; cnt++) {
2828 bnx2x_cl45_read(bp, phy, 2828 bnx2x_cl45_read(bp, phy,
2829 MDIO_PMA_DEVAD, MDIO_PMA_REG_CTRL, &ctrl); 2829 MDIO_PMA_DEVAD, MDIO_PMA_REG_CTRL, &ctrl);
@@ -4141,7 +4141,7 @@ static u8 bnx2x_8073_config_init(struct bnx2x_phy *phy,
4141 val = (1<<5); 4141 val = (1<<5);
4142 /* 4142 /*
4143 * Note that 2.5G works only when used with 1G 4143 * Note that 2.5G works only when used with 1G
4144 * advertisment 4144 * advertisement
4145 */ 4145 */
4146 } else 4146 } else
4147 val = (1<<5); 4147 val = (1<<5);
@@ -4151,7 +4151,7 @@ static u8 bnx2x_8073_config_init(struct bnx2x_phy *phy,
4151 PORT_HW_CFG_SPEED_CAPABILITY_D0_10G) 4151 PORT_HW_CFG_SPEED_CAPABILITY_D0_10G)
4152 val |= (1<<7); 4152 val |= (1<<7);
4153 4153
4154 /* Note that 2.5G works only when used with 1G advertisment */ 4154 /* Note that 2.5G works only when used with 1G advertisement */
4155 if (phy->speed_cap_mask & 4155 if (phy->speed_cap_mask &
4156 (PORT_HW_CFG_SPEED_CAPABILITY_D0_1G | 4156 (PORT_HW_CFG_SPEED_CAPABILITY_D0_1G |
4157 PORT_HW_CFG_SPEED_CAPABILITY_D0_2_5G)) 4157 PORT_HW_CFG_SPEED_CAPABILITY_D0_2_5G))
@@ -5232,14 +5232,14 @@ static u8 bnx2x_8706_config_init(struct bnx2x_phy *phy,
5232 bnx2x_cl45_write(bp, phy, 5232 bnx2x_cl45_write(bp, phy,
5233 MDIO_PMA_DEVAD, MDIO_PMA_REG_LASI_CTRL, 1); 5233 MDIO_PMA_DEVAD, MDIO_PMA_REG_LASI_CTRL, 1);
5234 } else { 5234 } else {
5235 /* Force 1Gbps using autoneg with 1G advertisment */ 5235 /* Force 1Gbps using autoneg with 1G advertisement */
5236 5236
5237 /* Allow CL37 through CL73 */ 5237 /* Allow CL37 through CL73 */
5238 DP(NETIF_MSG_LINK, "XGXS 8706 AutoNeg\n"); 5238 DP(NETIF_MSG_LINK, "XGXS 8706 AutoNeg\n");
5239 bnx2x_cl45_write(bp, phy, 5239 bnx2x_cl45_write(bp, phy,
5240 MDIO_AN_DEVAD, MDIO_AN_REG_CL37_CL73, 0x040c); 5240 MDIO_AN_DEVAD, MDIO_AN_REG_CL37_CL73, 0x040c);
5241 5241
5242 /* Enable Full-Duplex advertisment on CL37 */ 5242 /* Enable Full-Duplex advertisement on CL37 */
5243 bnx2x_cl45_write(bp, phy, 5243 bnx2x_cl45_write(bp, phy,
5244 MDIO_AN_DEVAD, MDIO_AN_REG_CL37_FC_LP, 0x0020); 5244 MDIO_AN_DEVAD, MDIO_AN_REG_CL37_FC_LP, 0x0020);
5245 /* Enable CL37 AN */ 5245 /* Enable CL37 AN */
@@ -6269,7 +6269,7 @@ static u8 bnx2x_848x3_config_init(struct bnx2x_phy *phy,
6269 6269
6270 switch (actual_phy_selection) { 6270 switch (actual_phy_selection) {
6271 case PORT_HW_CFG_PHY_SELECTION_HARDWARE_DEFAULT: 6271 case PORT_HW_CFG_PHY_SELECTION_HARDWARE_DEFAULT:
6272 /* Do nothing. Essentialy this is like the priority copper */ 6272 /* Do nothing. Essentially this is like the priority copper */
6273 break; 6273 break;
6274 case PORT_HW_CFG_PHY_SELECTION_FIRST_PHY_PRIORITY: 6274 case PORT_HW_CFG_PHY_SELECTION_FIRST_PHY_PRIORITY:
6275 val |= MDIO_CTL_REG_84823_MEDIA_PRIORITY_COPPER; 6275 val |= MDIO_CTL_REG_84823_MEDIA_PRIORITY_COPPER;
@@ -7765,7 +7765,7 @@ u8 bnx2x_link_reset(struct link_params *params, struct link_vars *vars,
7765 REG_WR(bp, NIG_REG_NIG_EMAC0_EN + port*4, 0); 7765 REG_WR(bp, NIG_REG_NIG_EMAC0_EN + port*4, 0);
7766 7766
7767 msleep(10); 7767 msleep(10);
7768 /* The PHY reset is controled by GPIO 1 7768 /* The PHY reset is controlled by GPIO 1
7769 * Hold it as vars low 7769 * Hold it as vars low
7770 */ 7770 */
7771 /* clear link led */ 7771 /* clear link led */
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index 32e64cc85d2c..a97a4a1c344f 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -3702,7 +3702,7 @@ static void bnx2x_eq_int(struct bnx2x *bp)
3702 if ((hw_cons & EQ_DESC_MAX_PAGE) == EQ_DESC_MAX_PAGE) 3702 if ((hw_cons & EQ_DESC_MAX_PAGE) == EQ_DESC_MAX_PAGE)
3703 hw_cons++; 3703 hw_cons++;
3704 3704
3705 /* This function may never run in parralel with itself for a 3705 /* This function may never run in parallel with itself for a
3706 * specific bp, thus there is no need in "paired" read memory 3706 * specific bp, thus there is no need in "paired" read memory
3707 * barrier here. 3707 * barrier here.
3708 */ 3708 */
@@ -5089,7 +5089,7 @@ static int bnx2x_init_hw_common(struct bnx2x *bp, u32 load_code)
5089 /* Step 1: set zeroes to all ilt page entries with valid bit on 5089 /* Step 1: set zeroes to all ilt page entries with valid bit on
5090 * Step 2: set the timers first/last ilt entry to point 5090 * Step 2: set the timers first/last ilt entry to point
5091 * to the entire range to prevent ILT range error for 3rd/4th 5091 * to the entire range to prevent ILT range error for 3rd/4th
5092 * vnic (this code assumes existance of the vnic) 5092 * vnic (this code assumes existence of the vnic)
5093 * 5093 *
5094 * both steps performed by call to bnx2x_ilt_client_init_op() 5094 * both steps performed by call to bnx2x_ilt_client_init_op()
5095 * with dummy TM client 5095 * with dummy TM client
@@ -8685,7 +8685,7 @@ static int __devinit bnx2x_get_hwinfo(struct bnx2x *bp)
8685 E1H_FUNC_MAX * sizeof(struct drv_func_mb); 8685 E1H_FUNC_MAX * sizeof(struct drv_func_mb);
8686 /* 8686 /*
8687 * get mf configuration: 8687 * get mf configuration:
8688 * 1. existance of MF configuration 8688 * 1. existence of MF configuration
8689 * 2. MAC address must be legal (check only upper bytes) 8689 * 2. MAC address must be legal (check only upper bytes)
8690 * for Switch-Independent mode; 8690 * for Switch-Independent mode;
8691 * OVLAN must be legal for Switch-Dependent mode 8691 * OVLAN must be legal for Switch-Dependent mode
@@ -8727,7 +8727,7 @@ static int __devinit bnx2x_get_hwinfo(struct bnx2x *bp)
8727 default: 8727 default:
8728 /* Unknown configuration: reset mf_config */ 8728 /* Unknown configuration: reset mf_config */
8729 bp->mf_config[vn] = 0; 8729 bp->mf_config[vn] = 0;
8730 DP(NETIF_MSG_PROBE, "Unkown MF mode 0x%x\n", 8730 DP(NETIF_MSG_PROBE, "Unknown MF mode 0x%x\n",
8731 val); 8731 val);
8732 } 8732 }
8733 } 8733 }
@@ -9777,7 +9777,7 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
9777 9777
9778#endif 9778#endif
9779 9779
9780 /* Configure interupt mode: try to enable MSI-X/MSI if 9780 /* Configure interrupt mode: try to enable MSI-X/MSI if
9781 * needed, set bp->num_queues appropriately. 9781 * needed, set bp->num_queues appropriately.
9782 */ 9782 */
9783 bnx2x_set_int_mode(bp); 9783 bnx2x_set_int_mode(bp);
diff --git a/drivers/net/bnx2x/bnx2x_reg.h b/drivers/net/bnx2x/bnx2x_reg.h
index 1c89f19a4425..1509a2318af9 100644
--- a/drivers/net/bnx2x/bnx2x_reg.h
+++ b/drivers/net/bnx2x/bnx2x_reg.h
@@ -175,9 +175,9 @@
175 the initial credit value; read returns the current value of the credit 175 the initial credit value; read returns the current value of the credit
176 counter. Must be initialized to 1 at start-up. */ 176 counter. Must be initialized to 1 at start-up. */
177#define CCM_REG_CFC_INIT_CRD 0xd0204 177#define CCM_REG_CFC_INIT_CRD 0xd0204
178/* [RW 2] Auxillary counter flag Q number 1. */ 178/* [RW 2] Auxiliary counter flag Q number 1. */
179#define CCM_REG_CNT_AUX1_Q 0xd00c8 179#define CCM_REG_CNT_AUX1_Q 0xd00c8
180/* [RW 2] Auxillary counter flag Q number 2. */ 180/* [RW 2] Auxiliary counter flag Q number 2. */
181#define CCM_REG_CNT_AUX2_Q 0xd00cc 181#define CCM_REG_CNT_AUX2_Q 0xd00cc
182/* [RW 28] The CM header value for QM request (primary). */ 182/* [RW 28] The CM header value for QM request (primary). */
183#define CCM_REG_CQM_CCM_HDR_P 0xd008c 183#define CCM_REG_CQM_CCM_HDR_P 0xd008c
@@ -457,13 +457,13 @@
457#define CSDM_REG_AGG_INT_MODE_9 0xc21dc 457#define CSDM_REG_AGG_INT_MODE_9 0xc21dc
458/* [RW 13] The start address in the internal RAM for the cfc_rsp lcid */ 458/* [RW 13] The start address in the internal RAM for the cfc_rsp lcid */
459#define CSDM_REG_CFC_RSP_START_ADDR 0xc2008 459#define CSDM_REG_CFC_RSP_START_ADDR 0xc2008
460/* [RW 16] The maximum value of the competion counter #0 */ 460/* [RW 16] The maximum value of the completion counter #0 */
461#define CSDM_REG_CMP_COUNTER_MAX0 0xc201c 461#define CSDM_REG_CMP_COUNTER_MAX0 0xc201c
462/* [RW 16] The maximum value of the competion counter #1 */ 462/* [RW 16] The maximum value of the completion counter #1 */
463#define CSDM_REG_CMP_COUNTER_MAX1 0xc2020 463#define CSDM_REG_CMP_COUNTER_MAX1 0xc2020
464/* [RW 16] The maximum value of the competion counter #2 */ 464/* [RW 16] The maximum value of the completion counter #2 */
465#define CSDM_REG_CMP_COUNTER_MAX2 0xc2024 465#define CSDM_REG_CMP_COUNTER_MAX2 0xc2024
466/* [RW 16] The maximum value of the competion counter #3 */ 466/* [RW 16] The maximum value of the completion counter #3 */
467#define CSDM_REG_CMP_COUNTER_MAX3 0xc2028 467#define CSDM_REG_CMP_COUNTER_MAX3 0xc2028
468/* [RW 13] The start address in the internal RAM for the completion 468/* [RW 13] The start address in the internal RAM for the completion
469 counters. */ 469 counters. */
@@ -851,7 +851,7 @@
851#define IGU_REG_ATTN_MSG_ADDR_L 0x130120 851#define IGU_REG_ATTN_MSG_ADDR_L 0x130120
852/* [R 4] Debug: [3] - attention write done message is pending (0-no pending; 852/* [R 4] Debug: [3] - attention write done message is pending (0-no pending;
853 * 1-pending). [2:0] = PFID. Pending means attention message was sent; but 853 * 1-pending). [2:0] = PFID. Pending means attention message was sent; but
854 * write done didnt receive. */ 854 * write done didn't receive. */
855#define IGU_REG_ATTN_WRITE_DONE_PENDING 0x130030 855#define IGU_REG_ATTN_WRITE_DONE_PENDING 0x130030
856#define IGU_REG_BLOCK_CONFIGURATION 0x130000 856#define IGU_REG_BLOCK_CONFIGURATION 0x130000
857#define IGU_REG_COMMAND_REG_32LSB_DATA 0x130124 857#define IGU_REG_COMMAND_REG_32LSB_DATA 0x130124
@@ -862,7 +862,7 @@
862#define IGU_REG_CSTORM_TYPE_0_SB_CLEANUP 0x130200 862#define IGU_REG_CSTORM_TYPE_0_SB_CLEANUP 0x130200
863/* [R 5] Debug: ctrl_fsm */ 863/* [R 5] Debug: ctrl_fsm */
864#define IGU_REG_CTRL_FSM 0x130064 864#define IGU_REG_CTRL_FSM 0x130064
865/* [R 1] data availble for error memory. If this bit is clear do not red 865/* [R 1] data available for error memory. If this bit is clear do not red
866 * from error_handling_memory. */ 866 * from error_handling_memory. */
867#define IGU_REG_ERROR_HANDLING_DATA_VALID 0x130130 867#define IGU_REG_ERROR_HANDLING_DATA_VALID 0x130130
868/* [RW 11] Parity mask register #0 read/write */ 868/* [RW 11] Parity mask register #0 read/write */
@@ -3015,7 +3015,7 @@
3015 block. Should be used for close the gates. */ 3015 block. Should be used for close the gates. */
3016#define PXP_REG_HST_DISCARD_DOORBELLS 0x1030a4 3016#define PXP_REG_HST_DISCARD_DOORBELLS 0x1030a4
3017/* [R 1] debug only: '1' means this PSWHST is discarding doorbells. This bit 3017/* [R 1] debug only: '1' means this PSWHST is discarding doorbells. This bit
3018 should update accoring to 'hst_discard_doorbells' register when the state 3018 should update according to 'hst_discard_doorbells' register when the state
3019 machine is idle */ 3019 machine is idle */
3020#define PXP_REG_HST_DISCARD_DOORBELLS_STATUS 0x1030a0 3020#define PXP_REG_HST_DISCARD_DOORBELLS_STATUS 0x1030a0
3021/* [RW 1] When 1; new internal writes arriving to the block are discarded. 3021/* [RW 1] When 1; new internal writes arriving to the block are discarded.
@@ -3023,7 +3023,7 @@
3023#define PXP_REG_HST_DISCARD_INTERNAL_WRITES 0x1030a8 3023#define PXP_REG_HST_DISCARD_INTERNAL_WRITES 0x1030a8
3024/* [R 6] debug only: A bit mask for all PSWHST internal write clients. '1' 3024/* [R 6] debug only: A bit mask for all PSWHST internal write clients. '1'
3025 means this PSWHST is discarding inputs from this client. Each bit should 3025 means this PSWHST is discarding inputs from this client. Each bit should
3026 update accoring to 'hst_discard_internal_writes' register when the state 3026 update according to 'hst_discard_internal_writes' register when the state
3027 machine is idle. */ 3027 machine is idle. */
3028#define PXP_REG_HST_DISCARD_INTERNAL_WRITES_STATUS 0x10309c 3028#define PXP_REG_HST_DISCARD_INTERNAL_WRITES_STATUS 0x10309c
3029/* [WB 160] Used for initialization of the inbound interrupts memory */ 3029/* [WB 160] Used for initialization of the inbound interrupts memory */
@@ -3822,13 +3822,13 @@
3822#define TSDM_REG_AGG_INT_T_1 0x420bc 3822#define TSDM_REG_AGG_INT_T_1 0x420bc
3823/* [RW 13] The start address in the internal RAM for the cfc_rsp lcid */ 3823/* [RW 13] The start address in the internal RAM for the cfc_rsp lcid */
3824#define TSDM_REG_CFC_RSP_START_ADDR 0x42008 3824#define TSDM_REG_CFC_RSP_START_ADDR 0x42008
3825/* [RW 16] The maximum value of the competion counter #0 */ 3825/* [RW 16] The maximum value of the completion counter #0 */
3826#define TSDM_REG_CMP_COUNTER_MAX0 0x4201c 3826#define TSDM_REG_CMP_COUNTER_MAX0 0x4201c
3827/* [RW 16] The maximum value of the competion counter #1 */ 3827/* [RW 16] The maximum value of the completion counter #1 */
3828#define TSDM_REG_CMP_COUNTER_MAX1 0x42020 3828#define TSDM_REG_CMP_COUNTER_MAX1 0x42020
3829/* [RW 16] The maximum value of the competion counter #2 */ 3829/* [RW 16] The maximum value of the completion counter #2 */
3830#define TSDM_REG_CMP_COUNTER_MAX2 0x42024 3830#define TSDM_REG_CMP_COUNTER_MAX2 0x42024
3831/* [RW 16] The maximum value of the competion counter #3 */ 3831/* [RW 16] The maximum value of the completion counter #3 */
3832#define TSDM_REG_CMP_COUNTER_MAX3 0x42028 3832#define TSDM_REG_CMP_COUNTER_MAX3 0x42028
3833/* [RW 13] The start address in the internal RAM for the completion 3833/* [RW 13] The start address in the internal RAM for the completion
3834 counters. */ 3834 counters. */
@@ -4284,13 +4284,13 @@
4284#define USDM_REG_AGG_INT_T_6 0xc40d0 4284#define USDM_REG_AGG_INT_T_6 0xc40d0
4285/* [RW 13] The start address in the internal RAM for the cfc_rsp lcid */ 4285/* [RW 13] The start address in the internal RAM for the cfc_rsp lcid */
4286#define USDM_REG_CFC_RSP_START_ADDR 0xc4008 4286#define USDM_REG_CFC_RSP_START_ADDR 0xc4008
4287/* [RW 16] The maximum value of the competion counter #0 */ 4287/* [RW 16] The maximum value of the completion counter #0 */
4288#define USDM_REG_CMP_COUNTER_MAX0 0xc401c 4288#define USDM_REG_CMP_COUNTER_MAX0 0xc401c
4289/* [RW 16] The maximum value of the competion counter #1 */ 4289/* [RW 16] The maximum value of the completion counter #1 */
4290#define USDM_REG_CMP_COUNTER_MAX1 0xc4020 4290#define USDM_REG_CMP_COUNTER_MAX1 0xc4020
4291/* [RW 16] The maximum value of the competion counter #2 */ 4291/* [RW 16] The maximum value of the completion counter #2 */
4292#define USDM_REG_CMP_COUNTER_MAX2 0xc4024 4292#define USDM_REG_CMP_COUNTER_MAX2 0xc4024
4293/* [RW 16] The maximum value of the competion counter #3 */ 4293/* [RW 16] The maximum value of the completion counter #3 */
4294#define USDM_REG_CMP_COUNTER_MAX3 0xc4028 4294#define USDM_REG_CMP_COUNTER_MAX3 0xc4028
4295/* [RW 13] The start address in the internal RAM for the completion 4295/* [RW 13] The start address in the internal RAM for the completion
4296 counters. */ 4296 counters. */
@@ -4798,13 +4798,13 @@
4798#define XSDM_REG_AGG_INT_MODE_1 0x1661bc 4798#define XSDM_REG_AGG_INT_MODE_1 0x1661bc
4799/* [RW 13] The start address in the internal RAM for the cfc_rsp lcid */ 4799/* [RW 13] The start address in the internal RAM for the cfc_rsp lcid */
4800#define XSDM_REG_CFC_RSP_START_ADDR 0x166008 4800#define XSDM_REG_CFC_RSP_START_ADDR 0x166008
4801/* [RW 16] The maximum value of the competion counter #0 */ 4801/* [RW 16] The maximum value of the completion counter #0 */
4802#define XSDM_REG_CMP_COUNTER_MAX0 0x16601c 4802#define XSDM_REG_CMP_COUNTER_MAX0 0x16601c
4803/* [RW 16] The maximum value of the competion counter #1 */ 4803/* [RW 16] The maximum value of the completion counter #1 */
4804#define XSDM_REG_CMP_COUNTER_MAX1 0x166020 4804#define XSDM_REG_CMP_COUNTER_MAX1 0x166020
4805/* [RW 16] The maximum value of the competion counter #2 */ 4805/* [RW 16] The maximum value of the completion counter #2 */
4806#define XSDM_REG_CMP_COUNTER_MAX2 0x166024 4806#define XSDM_REG_CMP_COUNTER_MAX2 0x166024
4807/* [RW 16] The maximum value of the competion counter #3 */ 4807/* [RW 16] The maximum value of the completion counter #3 */
4808#define XSDM_REG_CMP_COUNTER_MAX3 0x166028 4808#define XSDM_REG_CMP_COUNTER_MAX3 0x166028
4809/* [RW 13] The start address in the internal RAM for the completion 4809/* [RW 13] The start address in the internal RAM for the completion
4810 counters. */ 4810 counters. */
diff --git a/drivers/net/bonding/bond_alb.h b/drivers/net/bonding/bond_alb.h
index 4b3e35878406..86861f08b24d 100644
--- a/drivers/net/bonding/bond_alb.h
+++ b/drivers/net/bonding/bond_alb.h
@@ -76,7 +76,7 @@ struct tlb_client_info {
76 */ 76 */
77 u32 tx_bytes; /* Each Client accumulates the BytesTx that 77 u32 tx_bytes; /* Each Client accumulates the BytesTx that
78 * were tranmitted to it, and after each 78 * were tranmitted to it, and after each
79 * CallBack the LoadHistory is devided 79 * CallBack the LoadHistory is divided
80 * by the balance interval 80 * by the balance interval
81 */ 81 */
82 u32 load_history; /* This field contains the amount of Bytes 82 u32 load_history; /* This field contains the amount of Bytes
diff --git a/drivers/net/caif/caif_shmcore.c b/drivers/net/caif/caif_shmcore.c
index 80511167f35b..731aa1193770 100644
--- a/drivers/net/caif/caif_shmcore.c
+++ b/drivers/net/caif/caif_shmcore.c
@@ -591,7 +591,7 @@ int caif_shmcore_probe(struct shmdev_layer *pshm_dev)
591 (NR_TX_BUF * TX_BUF_SZ + NR_RX_BUF * RX_BUF_SZ)) { 591 (NR_TX_BUF * TX_BUF_SZ + NR_RX_BUF * RX_BUF_SZ)) {
592 592
593 pr_warn("ERROR, Amount of available" 593 pr_warn("ERROR, Amount of available"
594 " Phys. SHM cannot accomodate current SHM " 594 " Phys. SHM cannot accommodate current SHM "
595 "driver configuration, Bailing out ...\n"); 595 "driver configuration, Bailing out ...\n");
596 free_netdev(pshm_dev->pshm_netdev); 596 free_netdev(pshm_dev->pshm_netdev);
597 return -ENOMEM; 597 return -ENOMEM;
diff --git a/drivers/net/caif/caif_spi.c b/drivers/net/caif/caif_spi.c
index 20da1996d354..57e639373815 100644
--- a/drivers/net/caif/caif_spi.c
+++ b/drivers/net/caif/caif_spi.c
@@ -397,7 +397,7 @@ int cfspi_xmitlen(struct cfspi *cfspi)
397 int pkts = 0; 397 int pkts = 0;
398 398
399 /* 399 /*
400 * Decommit previously commited frames. 400 * Decommit previously committed frames.
401 * skb_queue_splice_tail(&cfspi->chead,&cfspi->qhead) 401 * skb_queue_splice_tail(&cfspi->chead,&cfspi->qhead)
402 */ 402 */
403 while (skb_peek(&cfspi->chead)) { 403 while (skb_peek(&cfspi->chead)) {
diff --git a/drivers/net/caif/caif_spi_slave.c b/drivers/net/caif/caif_spi_slave.c
index 1b9943a4edab..b009e03cda9e 100644
--- a/drivers/net/caif/caif_spi_slave.c
+++ b/drivers/net/caif/caif_spi_slave.c
@@ -98,7 +98,7 @@ void cfspi_xfer(struct work_struct *work)
98 98
99 cfspi_dbg_state(cfspi, CFSPI_STATE_FETCH_PKT); 99 cfspi_dbg_state(cfspi, CFSPI_STATE_FETCH_PKT);
100 100
101 /* Copy commited SPI frames after the SPI indication. */ 101 /* Copy committed SPI frames after the SPI indication. */
102 ptr = (u8 *) cfspi->xfer.va_tx; 102 ptr = (u8 *) cfspi->xfer.va_tx;
103 ptr += SPI_IND_SZ; 103 ptr += SPI_IND_SZ;
104 len = cfspi_xmitfrm(cfspi, ptr, cfspi->tx_cpck_len); 104 len = cfspi_xmitfrm(cfspi, ptr, cfspi->tx_cpck_len);
@@ -158,7 +158,7 @@ void cfspi_xfer(struct work_struct *work)
158 158
159 cfspi_dbg_state(cfspi, CFSPI_STATE_SIG_ACTIVE); 159 cfspi_dbg_state(cfspi, CFSPI_STATE_SIG_ACTIVE);
160 160
161 /* Signal that we are ready to recieve data. */ 161 /* Signal that we are ready to receive data. */
162 cfspi->dev->sig_xfer(true, cfspi->dev); 162 cfspi->dev->sig_xfer(true, cfspi->dev);
163 163
164 cfspi_dbg_state(cfspi, CFSPI_STATE_WAIT_XFER_DONE); 164 cfspi_dbg_state(cfspi, CFSPI_STATE_WAIT_XFER_DONE);
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index 57d2ffbbb433..74efb5a2ad41 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -416,7 +416,7 @@ static netdev_tx_t at91_start_xmit(struct sk_buff *skb, struct net_device *dev)
416 416
417 stats->tx_bytes += cf->can_dlc; 417 stats->tx_bytes += cf->can_dlc;
418 418
419 /* _NOTE_: substract AT91_MB_TX_FIRST offset from mb! */ 419 /* _NOTE_: subtract AT91_MB_TX_FIRST offset from mb! */
420 can_put_echo_skb(skb, dev, mb - AT91_MB_TX_FIRST); 420 can_put_echo_skb(skb, dev, mb - AT91_MB_TX_FIRST);
421 421
422 /* 422 /*
@@ -782,7 +782,7 @@ static void at91_irq_tx(struct net_device *dev, u32 reg_sr)
782 reg_msr = at91_read(priv, AT91_MSR(mb)); 782 reg_msr = at91_read(priv, AT91_MSR(mb));
783 if (likely(reg_msr & AT91_MSR_MRDY && 783 if (likely(reg_msr & AT91_MSR_MRDY &&
784 ~reg_msr & AT91_MSR_MABT)) { 784 ~reg_msr & AT91_MSR_MABT)) {
785 /* _NOTE_: substract AT91_MB_TX_FIRST offset from mb! */ 785 /* _NOTE_: subtract AT91_MB_TX_FIRST offset from mb! */
786 can_get_echo_skb(dev, mb - AT91_MB_TX_FIRST); 786 can_get_echo_skb(dev, mb - AT91_MB_TX_FIRST);
787 dev->stats.tx_packets++; 787 dev->stats.tx_packets++;
788 } 788 }
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
index 31552959aed7..7e5cc0bd913d 100644
--- a/drivers/net/can/c_can/c_can.c
+++ b/drivers/net/can/c_can/c_can.c
@@ -813,7 +813,7 @@ static int c_can_handle_state_change(struct net_device *dev,
813 struct sk_buff *skb; 813 struct sk_buff *skb;
814 struct can_berr_counter bec; 814 struct can_berr_counter bec;
815 815
816 /* propogate the error condition to the CAN stack */ 816 /* propagate the error condition to the CAN stack */
817 skb = alloc_can_err_skb(dev, &cf); 817 skb = alloc_can_err_skb(dev, &cf);
818 if (unlikely(!skb)) 818 if (unlikely(!skb))
819 return 0; 819 return 0;
@@ -887,7 +887,7 @@ static int c_can_handle_bus_err(struct net_device *dev,
887 if (lec_type == LEC_UNUSED || lec_type == LEC_NO_ERROR) 887 if (lec_type == LEC_UNUSED || lec_type == LEC_NO_ERROR)
888 return 0; 888 return 0;
889 889
890 /* propogate the error condition to the CAN stack */ 890 /* propagate the error condition to the CAN stack */
891 skb = alloc_can_err_skb(dev, &cf); 891 skb = alloc_can_err_skb(dev, &cf);
892 if (unlikely(!skb)) 892 if (unlikely(!skb))
893 return 0; 893 return 0;
diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
index 102b16c6cc97..587fba48cdd9 100644
--- a/drivers/net/can/janz-ican3.c
+++ b/drivers/net/can/janz-ican3.c
@@ -274,7 +274,7 @@ static inline void ican3_set_page(struct ican3_dev *mod, unsigned int page)
274 */ 274 */
275 275
276/* 276/*
277 * Recieve a message from the ICAN3 "old-style" firmware interface 277 * Receive a message from the ICAN3 "old-style" firmware interface
278 * 278 *
279 * LOCKING: must hold mod->lock 279 * LOCKING: must hold mod->lock
280 * 280 *
@@ -1050,7 +1050,7 @@ static void ican3_handle_inquiry(struct ican3_dev *mod, struct ican3_msg *msg)
1050 complete(&mod->termination_comp); 1050 complete(&mod->termination_comp);
1051 break; 1051 break;
1052 default: 1052 default:
1053 dev_err(mod->dev, "recieved an unknown inquiry response\n"); 1053 dev_err(mod->dev, "received an unknown inquiry response\n");
1054 break; 1054 break;
1055 } 1055 }
1056} 1056}
@@ -1058,7 +1058,7 @@ static void ican3_handle_inquiry(struct ican3_dev *mod, struct ican3_msg *msg)
1058static void ican3_handle_unknown_message(struct ican3_dev *mod, 1058static void ican3_handle_unknown_message(struct ican3_dev *mod,
1059 struct ican3_msg *msg) 1059 struct ican3_msg *msg)
1060{ 1060{
1061 dev_warn(mod->dev, "recieved unknown message: spec 0x%.2x length %d\n", 1061 dev_warn(mod->dev, "received unknown message: spec 0x%.2x length %d\n",
1062 msg->spec, le16_to_cpu(msg->len)); 1062 msg->spec, le16_to_cpu(msg->len));
1063} 1063}
1064 1064
@@ -1113,7 +1113,7 @@ static bool ican3_txok(struct ican3_dev *mod)
1113} 1113}
1114 1114
1115/* 1115/*
1116 * Recieve one CAN frame from the hardware 1116 * Receive one CAN frame from the hardware
1117 * 1117 *
1118 * CONTEXT: must be called from user context 1118 * CONTEXT: must be called from user context
1119 */ 1119 */
diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c
index 74cd880c7e06..92feac68b66e 100644
--- a/drivers/net/can/mscan/mscan.c
+++ b/drivers/net/can/mscan/mscan.c
@@ -246,7 +246,7 @@ static netdev_tx_t mscan_start_xmit(struct sk_buff *skb, struct net_device *dev)
246 out_be16(&regs->tx.idr3_2, can_id); 246 out_be16(&regs->tx.idr3_2, can_id);
247 247
248 can_id >>= 16; 248 can_id >>= 16;
249 /* EFF_FLAGS are inbetween the IDs :( */ 249 /* EFF_FLAGS are between the IDs :( */
250 can_id = (can_id & 0x7) | ((can_id << 2) & 0xffe0) 250 can_id = (can_id & 0x7) | ((can_id << 2) & 0xffe0)
251 | MSCAN_EFF_FLAGS; 251 | MSCAN_EFF_FLAGS;
252 } else { 252 } else {
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
index 0a8de01d52f7..a358ea9445a2 100644
--- a/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@ -425,7 +425,7 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
425 cf->data[3] = ecc & ECC_SEG; 425 cf->data[3] = ecc & ECC_SEG;
426 break; 426 break;
427 } 427 }
428 /* Error occured during transmission? */ 428 /* Error occurred during transmission? */
429 if ((ecc & ECC_DIR) == 0) 429 if ((ecc & ECC_DIR) == 0)
430 cf->data[2] |= CAN_ERR_PROT_TX; 430 cf->data[2] |= CAN_ERR_PROT_TX;
431 } 431 }
diff --git a/drivers/net/can/softing/softing.h b/drivers/net/can/softing/softing.h
index 7ec9f4db3d52..afd7d85b6915 100644
--- a/drivers/net/can/softing/softing.h
+++ b/drivers/net/can/softing/softing.h
@@ -22,7 +22,7 @@ struct softing_priv {
22 struct softing *card; 22 struct softing *card;
23 struct { 23 struct {
24 int pending; 24 int pending;
25 /* variables wich hold the circular buffer */ 25 /* variables which hold the circular buffer */
26 int echo_put; 26 int echo_put;
27 int echo_get; 27 int echo_get;
28 } tx; 28 } tx;
diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c
index aeea9f9ff6e8..7a70709d5608 100644
--- a/drivers/net/can/softing/softing_main.c
+++ b/drivers/net/can/softing/softing_main.c
@@ -218,7 +218,7 @@ static int softing_handle_1(struct softing *card)
218 ptr = buf; 218 ptr = buf;
219 cmd = *ptr++; 219 cmd = *ptr++;
220 if (cmd == 0xff) 220 if (cmd == 0xff)
221 /* not quite usefull, probably the card has got out */ 221 /* not quite useful, probably the card has got out */
222 return 0; 222 return 0;
223 netdev = card->net[0]; 223 netdev = card->net[0];
224 if (cmd & CMD_BUS2) 224 if (cmd & CMD_BUS2)
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index 4d07f1ee7168..f7bbde9eb2cb 100644
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -663,7 +663,7 @@ static int ti_hecc_error(struct net_device *ndev, int int_status,
663 struct can_frame *cf; 663 struct can_frame *cf;
664 struct sk_buff *skb; 664 struct sk_buff *skb;
665 665
666 /* propogate the error condition to the can stack */ 666 /* propagate the error condition to the can stack */
667 skb = alloc_can_err_skb(ndev, &cf); 667 skb = alloc_can_err_skb(ndev, &cf);
668 if (!skb) { 668 if (!skb) {
669 if (printk_ratelimit()) 669 if (printk_ratelimit())
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index e75f1a876972..a72c7bfb4090 100644
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -386,7 +386,7 @@ static void ems_usb_rx_err(struct ems_usb *dev, struct ems_cpc_msg *msg)
386 break; 386 break;
387 } 387 }
388 388
389 /* Error occured during transmission? */ 389 /* Error occurred during transmission? */
390 if ((ecc & SJA1000_ECC_DIR) == 0) 390 if ((ecc & SJA1000_ECC_DIR) == 0)
391 cf->data[2] |= CAN_ERR_PROT_TX; 391 cf->data[2] |= CAN_ERR_PROT_TX;
392 392
diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c
index dc53c831ea95..eb8b0e600282 100644
--- a/drivers/net/can/usb/esd_usb2.c
+++ b/drivers/net/can/usb/esd_usb2.c
@@ -284,7 +284,7 @@ static void esd_usb2_rx_event(struct esd_usb2_net_priv *priv,
284 break; 284 break;
285 } 285 }
286 286
287 /* Error occured during transmission? */ 287 /* Error occurred during transmission? */
288 if (!(ecc & SJA1000_ECC_DIR)) 288 if (!(ecc & SJA1000_ECC_DIR))
289 cf->data[2] |= CAN_ERR_PROT_TX; 289 cf->data[2] |= CAN_ERR_PROT_TX;
290 290
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index 3437613f0454..143a28c666af 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -51,7 +51,7 @@
51 * TX has 4 queues. currently these queues are used in a round-robin 51 * TX has 4 queues. currently these queues are used in a round-robin
52 * fashion for load balancing. They can also be used for QoS. for that 52 * fashion for load balancing. They can also be used for QoS. for that
53 * to work, however, QoS information needs to be exposed down to the driver 53 * to work, however, QoS information needs to be exposed down to the driver
54 * level so that subqueues get targetted to particular transmit rings. 54 * level so that subqueues get targeted to particular transmit rings.
55 * alternatively, the queues can be configured via use of the all-purpose 55 * alternatively, the queues can be configured via use of the all-purpose
56 * ioctl. 56 * ioctl.
57 * 57 *
@@ -5165,7 +5165,7 @@ err_out_free_res:
5165 pci_release_regions(pdev); 5165 pci_release_regions(pdev);
5166 5166
5167err_write_cacheline: 5167err_write_cacheline:
5168 /* Try to restore it in case the error occured after we 5168 /* Try to restore it in case the error occurred after we
5169 * set it. 5169 * set it.
5170 */ 5170 */
5171 pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, orig_cacheline_size); 5171 pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, orig_cacheline_size);
diff --git a/drivers/net/cassini.h b/drivers/net/cassini.h
index faf4746a0f3e..b361424d5f57 100644
--- a/drivers/net/cassini.h
+++ b/drivers/net/cassini.h
@@ -772,7 +772,7 @@
772#define RX_DEBUG_INTR_WRITE_PTR_MASK 0xC0000000 /* interrupt write pointer 772#define RX_DEBUG_INTR_WRITE_PTR_MASK 0xC0000000 /* interrupt write pointer
773 of the interrupt queue */ 773 of the interrupt queue */
774 774
775/* flow control frames are emmitted using two PAUSE thresholds: 775/* flow control frames are emitted using two PAUSE thresholds:
776 * XOFF PAUSE uses pause time value pre-programmed in the Send PAUSE MAC reg 776 * XOFF PAUSE uses pause time value pre-programmed in the Send PAUSE MAC reg
777 * XON PAUSE uses a pause time of 0. granularity of threshold is 64bytes. 777 * XON PAUSE uses a pause time of 0. granularity of threshold is 64bytes.
778 * PAUSE thresholds defined in terms of FIFO occupancy and may be translated 778 * PAUSE thresholds defined in terms of FIFO occupancy and may be translated
diff --git a/drivers/net/chelsio/mv88e1xxx.c b/drivers/net/chelsio/mv88e1xxx.c
index 809047a99e96..71018a4fdf15 100644
--- a/drivers/net/chelsio/mv88e1xxx.c
+++ b/drivers/net/chelsio/mv88e1xxx.c
@@ -41,7 +41,7 @@ static void mdio_clear_bit(struct cphy *cphy, int reg, u32 bitval)
41 * 41 *
42 * PARAMS: cphy - Pointer to PHY instance data. 42 * PARAMS: cphy - Pointer to PHY instance data.
43 * 43 *
44 * RETURN: 0 - Successfull reset. 44 * RETURN: 0 - Successful reset.
45 * -1 - Timeout. 45 * -1 - Timeout.
46 */ 46 */
47static int mv88e1xxx_reset(struct cphy *cphy, int wait) 47static int mv88e1xxx_reset(struct cphy *cphy, int wait)
diff --git a/drivers/net/chelsio/pm3393.c b/drivers/net/chelsio/pm3393.c
index 7dbb16d36fff..40c7b93ababc 100644
--- a/drivers/net/chelsio/pm3393.c
+++ b/drivers/net/chelsio/pm3393.c
@@ -293,7 +293,7 @@ static int pm3393_enable_port(struct cmac *cmac, int which)
293 pm3393_enable(cmac, which); 293 pm3393_enable(cmac, which);
294 294
295 /* 295 /*
296 * XXX This should be done by the PHY and preferrably not at all. 296 * XXX This should be done by the PHY and preferably not at all.
297 * The PHY doesn't give us link status indication on its own so have 297 * The PHY doesn't give us link status indication on its own so have
298 * the link management code query it instead. 298 * the link management code query it instead.
299 */ 299 */
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c
index f778b15ad3fd..8754d4473042 100644
--- a/drivers/net/chelsio/sge.c
+++ b/drivers/net/chelsio/sge.c
@@ -1662,7 +1662,7 @@ irqreturn_t t1_interrupt(int irq, void *data)
1662 * The code figures out how many entries the sk_buff will require in the 1662 * The code figures out how many entries the sk_buff will require in the
1663 * cmdQ and updates the cmdQ data structure with the state once the enqueue 1663 * cmdQ and updates the cmdQ data structure with the state once the enqueue
1664 * has complete. Then, it doesn't access the global structure anymore, but 1664 * has complete. Then, it doesn't access the global structure anymore, but
1665 * uses the corresponding fields on the stack. In conjuction with a spinlock 1665 * uses the corresponding fields on the stack. In conjunction with a spinlock
1666 * around that code, we can make the function reentrant without holding the 1666 * around that code, we can make the function reentrant without holding the
1667 * lock when we actually enqueue (which might be expensive, especially on 1667 * lock when we actually enqueue (which might be expensive, especially on
1668 * architectures with IO MMUs). 1668 * architectures with IO MMUs).
diff --git a/drivers/net/chelsio/vsc7326.c b/drivers/net/chelsio/vsc7326.c
index 106a590f0d9a..b0cb388f5e12 100644
--- a/drivers/net/chelsio/vsc7326.c
+++ b/drivers/net/chelsio/vsc7326.c
@@ -566,7 +566,7 @@ static int mac_disable(struct cmac *mac, int which)
566 for (i = 0; i <= 0x3a; ++i) 566 for (i = 0; i <= 0x3a; ++i)
567 vsc_write(mac->adapter, CRA(4, port, i), 0); 567 vsc_write(mac->adapter, CRA(4, port, i), 0);
568 568
569 /* Clear sofware counters */ 569 /* Clear software counters */
570 memset(&mac->stats, 0, sizeof(struct cmac_statistics)); 570 memset(&mac->stats, 0, sizeof(struct cmac_statistics));
571 571
572 return 0; 572 return 0;
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c
index 80c2feeefec5..9d267d3a6892 100644
--- a/drivers/net/cris/eth_v10.c
+++ b/drivers/net/cris/eth_v10.c
@@ -1383,7 +1383,7 @@ e100_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
1383 spin_lock(&np->lock); /* Preempt protection */ 1383 spin_lock(&np->lock); /* Preempt protection */
1384 switch (cmd) { 1384 switch (cmd) {
1385 /* The ioctls below should be considered obsolete but are */ 1385 /* The ioctls below should be considered obsolete but are */
1386 /* still present for compatability with old scripts/apps */ 1386 /* still present for compatibility with old scripts/apps */
1387 case SET_ETH_SPEED_10: /* 10 Mbps */ 1387 case SET_ETH_SPEED_10: /* 10 Mbps */
1388 e100_set_speed(dev, 10); 1388 e100_set_speed(dev, 10);
1389 break; 1389 break;
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index f9f6645b2e61..bfa2d56af1ee 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -199,7 +199,7 @@ static inline void refill_rspq(struct adapter *adapter,
199 * need_skb_unmap - does the platform need unmapping of sk_buffs? 199 * need_skb_unmap - does the platform need unmapping of sk_buffs?
200 * 200 *
201 * Returns true if the platform needs sk_buff unmapping. The compiler 201 * Returns true if the platform needs sk_buff unmapping. The compiler
202 * optimizes away unecessary code if this returns true. 202 * optimizes away unnecessary code if this returns true.
203 */ 203 */
204static inline int need_skb_unmap(void) 204static inline int need_skb_unmap(void)
205{ 205{
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index d55db6b38e7b..c688421da9c7 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -1386,11 +1386,11 @@ struct intr_info {
1386 * @reg: the interrupt status register to process 1386 * @reg: the interrupt status register to process
1387 * @mask: a mask to apply to the interrupt status 1387 * @mask: a mask to apply to the interrupt status
1388 * @acts: table of interrupt actions 1388 * @acts: table of interrupt actions
1389 * @stats: statistics counters tracking interrupt occurences 1389 * @stats: statistics counters tracking interrupt occurrences
1390 * 1390 *
1391 * A table driven interrupt handler that applies a set of masks to an 1391 * A table driven interrupt handler that applies a set of masks to an
1392 * interrupt status word and performs the corresponding actions if the 1392 * interrupt status word and performs the corresponding actions if the
1393 * interrupts described by the mask have occured. The actions include 1393 * interrupts described by the mask have occurred. The actions include
1394 * optionally printing a warning or alert message, and optionally 1394 * optionally printing a warning or alert message, and optionally
1395 * incrementing a stat counter. The table is terminated by an entry 1395 * incrementing a stat counter. The table is terminated by an entry
1396 * specifying mask 0. Returns the number of fatal interrupt conditions. 1396 * specifying mask 0. Returns the number of fatal interrupt conditions.
@@ -2783,7 +2783,7 @@ static void init_mtus(unsigned short mtus[])
2783{ 2783{
2784 /* 2784 /*
2785 * See draft-mathis-plpmtud-00.txt for the values. The min is 88 so 2785 * See draft-mathis-plpmtud-00.txt for the values. The min is 88 so
2786 * it can accomodate max size TCP/IP headers when SACK and timestamps 2786 * it can accommodate max size TCP/IP headers when SACK and timestamps
2787 * are enabled and still have at least 8 bytes of payload. 2787 * are enabled and still have at least 8 bytes of payload.
2788 */ 2788 */
2789 mtus[0] = 88; 2789 mtus[0] = 88;
diff --git a/drivers/net/cxgb4/t4_hw.c b/drivers/net/cxgb4/t4_hw.c
index b9fd8a6f2cc4..d1ec111aebd8 100644
--- a/drivers/net/cxgb4/t4_hw.c
+++ b/drivers/net/cxgb4/t4_hw.c
@@ -883,7 +883,7 @@ struct intr_info {
883 * 883 *
884 * A table driven interrupt handler that applies a set of masks to an 884 * A table driven interrupt handler that applies a set of masks to an
885 * interrupt status word and performs the corresponding actions if the 885 * interrupt status word and performs the corresponding actions if the
886 * interrupts described by the mask have occured. The actions include 886 * interrupts described by the mask have occurred. The actions include
887 * optionally emitting a warning or alert message. The table is terminated 887 * optionally emitting a warning or alert message. The table is terminated
888 * by an entry specifying mask 0. Returns the number of fatal interrupt 888 * by an entry specifying mask 0. Returns the number of fatal interrupt
889 * conditions. 889 * conditions.
diff --git a/drivers/net/cxgb4vf/cxgb4vf_main.c b/drivers/net/cxgb4vf/cxgb4vf_main.c
index 6aad64df4dcb..4661cbbd9bd9 100644
--- a/drivers/net/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/cxgb4vf/cxgb4vf_main.c
@@ -2738,7 +2738,7 @@ static int __devinit cxgb4vf_pci_probe(struct pci_dev *pdev,
2738 cfg_queues(adapter); 2738 cfg_queues(adapter);
2739 2739
2740 /* 2740 /*
2741 * Print a short notice on the existance and configuration of the new 2741 * Print a short notice on the existence and configuration of the new
2742 * VF network device ... 2742 * VF network device ...
2743 */ 2743 */
2744 for_each_port(adapter, pidx) { 2744 for_each_port(adapter, pidx) {
diff --git a/drivers/net/cxgb4vf/sge.c b/drivers/net/cxgb4vf/sge.c
index e0b3d1bc2fdf..bb65121f581c 100644
--- a/drivers/net/cxgb4vf/sge.c
+++ b/drivers/net/cxgb4vf/sge.c
@@ -224,8 +224,8 @@ static inline bool is_buf_mapped(const struct rx_sw_desc *sdesc)
224/** 224/**
225 * need_skb_unmap - does the platform need unmapping of sk_buffs? 225 * need_skb_unmap - does the platform need unmapping of sk_buffs?
226 * 226 *
227 * Returns true if the platfrom needs sk_buff unmapping. The compiler 227 * Returns true if the platform needs sk_buff unmapping. The compiler
228 * optimizes away unecessary code if this returns true. 228 * optimizes away unnecessary code if this returns true.
229 */ 229 */
230static inline int need_skb_unmap(void) 230static inline int need_skb_unmap(void)
231{ 231{
@@ -267,7 +267,7 @@ static inline unsigned int fl_cap(const struct sge_fl *fl)
267 * 267 *
268 * Tests specified Free List to see whether the number of buffers 268 * Tests specified Free List to see whether the number of buffers
269 * available to the hardware has falled below our "starvation" 269 * available to the hardware has falled below our "starvation"
270 * threshhold. 270 * threshold.
271 */ 271 */
272static inline bool fl_starving(const struct sge_fl *fl) 272static inline bool fl_starving(const struct sge_fl *fl)
273{ 273{
@@ -1149,7 +1149,7 @@ int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev)
1149 if (unlikely(credits < ETHTXQ_STOP_THRES)) { 1149 if (unlikely(credits < ETHTXQ_STOP_THRES)) {
1150 /* 1150 /*
1151 * After we're done injecting the Work Request for this 1151 * After we're done injecting the Work Request for this
1152 * packet, we'll be below our "stop threshhold" so stop the TX 1152 * packet, we'll be below our "stop threshold" so stop the TX
1153 * Queue now and schedule a request for an SGE Egress Queue 1153 * Queue now and schedule a request for an SGE Egress Queue
1154 * Update message. The queue will get started later on when 1154 * Update message. The queue will get started later on when
1155 * the firmware processes this Work Request and sends us an 1155 * the firmware processes this Work Request and sends us an
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index baca6bfcb089..807b6bb200eb 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -94,14 +94,14 @@ MODULE_VERSION(EMAC_MODULE_VERSION);
94static const char emac_version_string[] = "TI DaVinci EMAC Linux v6.1"; 94static const char emac_version_string[] = "TI DaVinci EMAC Linux v6.1";
95 95
96/* Configuration items */ 96/* Configuration items */
97#define EMAC_DEF_PASS_CRC (0) /* Do not pass CRC upto frames */ 97#define EMAC_DEF_PASS_CRC (0) /* Do not pass CRC up to frames */
98#define EMAC_DEF_QOS_EN (0) /* EMAC proprietary QoS disabled */ 98#define EMAC_DEF_QOS_EN (0) /* EMAC proprietary QoS disabled */
99#define EMAC_DEF_NO_BUFF_CHAIN (0) /* No buffer chain */ 99#define EMAC_DEF_NO_BUFF_CHAIN (0) /* No buffer chain */
100#define EMAC_DEF_MACCTRL_FRAME_EN (0) /* Discard Maccontrol frames */ 100#define EMAC_DEF_MACCTRL_FRAME_EN (0) /* Discard Maccontrol frames */
101#define EMAC_DEF_SHORT_FRAME_EN (0) /* Discard short frames */ 101#define EMAC_DEF_SHORT_FRAME_EN (0) /* Discard short frames */
102#define EMAC_DEF_ERROR_FRAME_EN (0) /* Discard error frames */ 102#define EMAC_DEF_ERROR_FRAME_EN (0) /* Discard error frames */
103#define EMAC_DEF_PROM_EN (0) /* Promiscous disabled */ 103#define EMAC_DEF_PROM_EN (0) /* Promiscuous disabled */
104#define EMAC_DEF_PROM_CH (0) /* Promiscous channel is 0 */ 104#define EMAC_DEF_PROM_CH (0) /* Promiscuous channel is 0 */
105#define EMAC_DEF_BCAST_EN (1) /* Broadcast enabled */ 105#define EMAC_DEF_BCAST_EN (1) /* Broadcast enabled */
106#define EMAC_DEF_BCAST_CH (0) /* Broadcast channel is 0 */ 106#define EMAC_DEF_BCAST_CH (0) /* Broadcast channel is 0 */
107#define EMAC_DEF_MCAST_EN (1) /* Multicast enabled */ 107#define EMAC_DEF_MCAST_EN (1) /* Multicast enabled */
@@ -1013,7 +1013,7 @@ static void emac_rx_handler(void *token, int len, int status)
1013 return; 1013 return;
1014 } 1014 }
1015 1015
1016 /* recycle on recieve error */ 1016 /* recycle on receive error */
1017 if (status < 0) { 1017 if (status < 0) {
1018 ndev->stats.rx_errors++; 1018 ndev->stats.rx_errors++;
1019 goto recycle; 1019 goto recycle;
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index f4d0922ec65b..dd70738eb2f4 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -160,7 +160,7 @@ static int e1000_get_settings(struct net_device *netdev,
160 &adapter->link_duplex); 160 &adapter->link_duplex);
161 ecmd->speed = adapter->link_speed; 161 ecmd->speed = adapter->link_speed;
162 162
163 /* unfortunatly FULL_DUPLEX != DUPLEX_FULL 163 /* unfortunately FULL_DUPLEX != DUPLEX_FULL
164 * and HALF_DUPLEX != DUPLEX_HALF */ 164 * and HALF_DUPLEX != DUPLEX_HALF */
165 165
166 if (adapter->link_duplex == FULL_DUPLEX) 166 if (adapter->link_duplex == FULL_DUPLEX)
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h
index c70b23d52284..5c9a8403668b 100644
--- a/drivers/net/e1000/e1000_hw.h
+++ b/drivers/net/e1000/e1000_hw.h
@@ -1026,7 +1026,7 @@ extern void __iomem *ce4100_gbe_mdio_base_virt;
1026 1026
1027#define E1000_KUMCTRLSTA 0x00034 /* MAC-PHY interface - RW */ 1027#define E1000_KUMCTRLSTA 0x00034 /* MAC-PHY interface - RW */
1028#define E1000_MDPHYA 0x0003C /* PHY address - RW */ 1028#define E1000_MDPHYA 0x0003C /* PHY address - RW */
1029#define E1000_MANC2H 0x05860 /* Managment Control To Host - RW */ 1029#define E1000_MANC2H 0x05860 /* Management Control To Host - RW */
1030#define E1000_SW_FW_SYNC 0x05B5C /* Software-Firmware Synchronization - RW */ 1030#define E1000_SW_FW_SYNC 0x05B5C /* Software-Firmware Synchronization - RW */
1031 1031
1032#define E1000_GCR 0x05B00 /* PCI-Ex Control */ 1032#define E1000_GCR 0x05B00 /* PCI-Ex Control */
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index bfab14092d2c..477e066a1cf0 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -205,7 +205,7 @@ static struct pci_driver e1000_driver = {
205 .probe = e1000_probe, 205 .probe = e1000_probe,
206 .remove = __devexit_p(e1000_remove), 206 .remove = __devexit_p(e1000_remove),
207#ifdef CONFIG_PM 207#ifdef CONFIG_PM
208 /* Power Managment Hooks */ 208 /* Power Management Hooks */
209 .suspend = e1000_suspend, 209 .suspend = e1000_suspend,
210 .resume = e1000_resume, 210 .resume = e1000_resume,
211#endif 211#endif
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index a39d4a4d871c..506a0a0043b3 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -4886,7 +4886,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
4886 if (skb->protocol == htons(ETH_P_IP)) 4886 if (skb->protocol == htons(ETH_P_IP))
4887 tx_flags |= E1000_TX_FLAGS_IPV4; 4887 tx_flags |= E1000_TX_FLAGS_IPV4;
4888 4888
4889 /* if count is 0 then mapping error has occured */ 4889 /* if count is 0 then mapping error has occurred */
4890 count = e1000_tx_map(adapter, skb, first, max_per_txd, nr_frags, mss); 4890 count = e1000_tx_map(adapter, skb, first, max_per_txd, nr_frags, mss);
4891 if (count) { 4891 if (count) {
4892 e1000_tx_queue(adapter, tx_flags, count); 4892 e1000_tx_queue(adapter, tx_flags, count);
diff --git a/drivers/net/enc28j60_hw.h b/drivers/net/enc28j60_hw.h
index 1a0b20969f80..25b41de49f0e 100644
--- a/drivers/net/enc28j60_hw.h
+++ b/drivers/net/enc28j60_hw.h
@@ -303,7 +303,7 @@
303/* maximum ethernet frame length */ 303/* maximum ethernet frame length */
304#define MAX_FRAMELEN 1518 304#define MAX_FRAMELEN 1518
305 305
306/* Prefered half duplex: LEDA: Link status LEDB: Rx/Tx activity */ 306/* Preferred half duplex: LEDA: Link status LEDB: Rx/Tx activity */
307#define ENC28J60_LAMPS_MODE 0x3476 307#define ENC28J60_LAMPS_MODE 0x3476
308 308
309#endif 309#endif
diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c
index fb717be511f6..12d28e9d0cb7 100644
--- a/drivers/net/eth16i.c
+++ b/drivers/net/eth16i.c
@@ -13,7 +13,7 @@
13 This driver supports following cards : 13 This driver supports following cards :
14 - ICL EtherTeam 16i 14 - ICL EtherTeam 16i
15 - ICL EtherTeam 32 EISA 15 - ICL EtherTeam 32 EISA
16 (Uses true 32 bit transfers rather than 16i compability mode) 16 (Uses true 32 bit transfers rather than 16i compatibility mode)
17 17
18 Example Module usage: 18 Example Module usage:
19 insmod eth16i.o io=0x2a0 mediatype=bnc 19 insmod eth16i.o io=0x2a0 mediatype=bnc
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index db0290f05bdf..a83dd312c3ac 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -542,7 +542,7 @@ static irqreturn_t ethoc_interrupt(int irq, void *dev_id)
542 542
543 /* Figure out what triggered the interrupt... 543 /* Figure out what triggered the interrupt...
544 * The tricky bit here is that the interrupt source bits get 544 * The tricky bit here is that the interrupt source bits get
545 * set in INT_SOURCE for an event irregardless of whether that 545 * set in INT_SOURCE for an event regardless of whether that
546 * event is masked or not. Thus, in order to figure out what 546 * event is masked or not. Thus, in order to figure out what
547 * triggered the interrupt, we need to remove the sources 547 * triggered the interrupt, we need to remove the sources
548 * for all events that are currently masked. This behaviour 548 * for all events that are currently masked. This behaviour
diff --git a/drivers/net/fec.h b/drivers/net/fec.h
index ace318df4c8d..8b2c6d797e6d 100644
--- a/drivers/net/fec.h
+++ b/drivers/net/fec.h
@@ -97,11 +97,11 @@ struct bufdesc {
97 * The following definitions courtesy of commproc.h, which where 97 * The following definitions courtesy of commproc.h, which where
98 * Copyright (c) 1997 Dan Malek (dmalek@jlc.net). 98 * Copyright (c) 1997 Dan Malek (dmalek@jlc.net).
99 */ 99 */
100#define BD_SC_EMPTY ((ushort)0x8000) /* Recieve is empty */ 100#define BD_SC_EMPTY ((ushort)0x8000) /* Receive is empty */
101#define BD_SC_READY ((ushort)0x8000) /* Transmit is ready */ 101#define BD_SC_READY ((ushort)0x8000) /* Transmit is ready */
102#define BD_SC_WRAP ((ushort)0x2000) /* Last buffer descriptor */ 102#define BD_SC_WRAP ((ushort)0x2000) /* Last buffer descriptor */
103#define BD_SC_INTRPT ((ushort)0x1000) /* Interrupt on change */ 103#define BD_SC_INTRPT ((ushort)0x1000) /* Interrupt on change */
104#define BD_SC_CM ((ushort)0x0200) /* Continous mode */ 104#define BD_SC_CM ((ushort)0x0200) /* Continuous mode */
105#define BD_SC_ID ((ushort)0x0100) /* Rec'd too many idles */ 105#define BD_SC_ID ((ushort)0x0100) /* Rec'd too many idles */
106#define BD_SC_P ((ushort)0x0100) /* xmt preamble */ 106#define BD_SC_P ((ushort)0x0100) /* xmt preamble */
107#define BD_SC_BR ((ushort)0x0020) /* Break received */ 107#define BD_SC_BR ((ushort)0x0020) /* Break received */
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 7b92897ca66b..d5ab4dad5051 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -440,7 +440,7 @@ union ring_type {
440#define NV_RX3_VLAN_TAG_PRESENT (1<<16) 440#define NV_RX3_VLAN_TAG_PRESENT (1<<16)
441#define NV_RX3_VLAN_TAG_MASK (0x0000FFFF) 441#define NV_RX3_VLAN_TAG_MASK (0x0000FFFF)
442 442
443/* Miscelaneous hardware related defines: */ 443/* Miscellaneous hardware related defines: */
444#define NV_PCI_REGSZ_VER1 0x270 444#define NV_PCI_REGSZ_VER1 0x270
445#define NV_PCI_REGSZ_VER2 0x2d4 445#define NV_PCI_REGSZ_VER2 0x2d4
446#define NV_PCI_REGSZ_VER3 0x604 446#define NV_PCI_REGSZ_VER3 0x604
@@ -1488,7 +1488,7 @@ static int phy_init(struct net_device *dev)
1488 } 1488 }
1489 } 1489 }
1490 1490
1491 /* some phys clear out pause advertisment on reset, set it back */ 1491 /* some phys clear out pause advertisement on reset, set it back */
1492 mii_rw(dev, np->phyaddr, MII_ADVERTISE, reg); 1492 mii_rw(dev, np->phyaddr, MII_ADVERTISE, reg);
1493 1493
1494 /* restart auto negotiation, power down phy */ 1494 /* restart auto negotiation, power down phy */
@@ -2535,7 +2535,7 @@ static void nv_tx_timeout(struct net_device *dev)
2535 else 2535 else
2536 nv_tx_done_optimized(dev, np->tx_ring_size); 2536 nv_tx_done_optimized(dev, np->tx_ring_size);
2537 2537
2538 /* save current HW postion */ 2538 /* save current HW position */
2539 if (np->tx_change_owner) 2539 if (np->tx_change_owner)
2540 put_tx.ex = np->tx_change_owner->first_tx_desc; 2540 put_tx.ex = np->tx_change_owner->first_tx_desc;
2541 else 2541 else
@@ -4053,7 +4053,7 @@ static int nv_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
4053 4053
4054 } else if (ecmd->autoneg == AUTONEG_DISABLE) { 4054 } else if (ecmd->autoneg == AUTONEG_DISABLE) {
4055 /* Note: autonegotiation disable, speed 1000 intentionally 4055 /* Note: autonegotiation disable, speed 1000 intentionally
4056 * forbidden - noone should need that. */ 4056 * forbidden - no one should need that. */
4057 4057
4058 if (ecmd->speed != SPEED_10 && ecmd->speed != SPEED_100) 4058 if (ecmd->speed != SPEED_10 && ecmd->speed != SPEED_100)
4059 return -EINVAL; 4059 return -EINVAL;
@@ -4103,7 +4103,7 @@ static int nv_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
4103 adv |= ADVERTISE_100HALF; 4103 adv |= ADVERTISE_100HALF;
4104 if (ecmd->advertising & ADVERTISED_100baseT_Full) 4104 if (ecmd->advertising & ADVERTISED_100baseT_Full)
4105 adv |= ADVERTISE_100FULL; 4105 adv |= ADVERTISE_100FULL;
4106 if (np->pause_flags & NV_PAUSEFRAME_RX_REQ) /* for rx we set both advertisments but disable tx pause */ 4106 if (np->pause_flags & NV_PAUSEFRAME_RX_REQ) /* for rx we set both advertisements but disable tx pause */
4107 adv |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM; 4107 adv |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;
4108 if (np->pause_flags & NV_PAUSEFRAME_TX_REQ) 4108 if (np->pause_flags & NV_PAUSEFRAME_TX_REQ)
4109 adv |= ADVERTISE_PAUSE_ASYM; 4109 adv |= ADVERTISE_PAUSE_ASYM;
@@ -4148,7 +4148,7 @@ static int nv_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
4148 if (ecmd->speed == SPEED_100 && ecmd->duplex == DUPLEX_FULL) 4148 if (ecmd->speed == SPEED_100 && ecmd->duplex == DUPLEX_FULL)
4149 adv |= ADVERTISE_100FULL; 4149 adv |= ADVERTISE_100FULL;
4150 np->pause_flags &= ~(NV_PAUSEFRAME_AUTONEG|NV_PAUSEFRAME_RX_ENABLE|NV_PAUSEFRAME_TX_ENABLE); 4150 np->pause_flags &= ~(NV_PAUSEFRAME_AUTONEG|NV_PAUSEFRAME_RX_ENABLE|NV_PAUSEFRAME_TX_ENABLE);
4151 if (np->pause_flags & NV_PAUSEFRAME_RX_REQ) {/* for rx we set both advertisments but disable tx pause */ 4151 if (np->pause_flags & NV_PAUSEFRAME_RX_REQ) {/* for rx we set both advertisements but disable tx pause */
4152 adv |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM; 4152 adv |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;
4153 np->pause_flags |= NV_PAUSEFRAME_RX_ENABLE; 4153 np->pause_flags |= NV_PAUSEFRAME_RX_ENABLE;
4154 } 4154 }
@@ -4449,7 +4449,7 @@ static int nv_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam*
4449 4449
4450 adv = mii_rw(dev, np->phyaddr, MII_ADVERTISE, MII_READ); 4450 adv = mii_rw(dev, np->phyaddr, MII_ADVERTISE, MII_READ);
4451 adv &= ~(ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM); 4451 adv &= ~(ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);
4452 if (np->pause_flags & NV_PAUSEFRAME_RX_REQ) /* for rx we set both advertisments but disable tx pause */ 4452 if (np->pause_flags & NV_PAUSEFRAME_RX_REQ) /* for rx we set both advertisements but disable tx pause */
4453 adv |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM; 4453 adv |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;
4454 if (np->pause_flags & NV_PAUSEFRAME_TX_REQ) 4454 if (np->pause_flags & NV_PAUSEFRAME_TX_REQ)
4455 adv |= ADVERTISE_PAUSE_ASYM; 4455 adv |= ADVERTISE_PAUSE_ASYM;
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h
index ec5d595ce2e2..b2fe7edefad9 100644
--- a/drivers/net/gianfar.h
+++ b/drivers/net/gianfar.h
@@ -1043,7 +1043,7 @@ enum gfar_errata {
1043}; 1043};
1044 1044
1045/* Struct stolen almost completely (and shamelessly) from the FCC enet source 1045/* Struct stolen almost completely (and shamelessly) from the FCC enet source
1046 * (Ok, that's not so true anymore, but there is a family resemblence) 1046 * (Ok, that's not so true anymore, but there is a family resemblance)
1047 * The GFAR buffer descriptors track the ring buffers. The rx_bd_base 1047 * The GFAR buffer descriptors track the ring buffers. The rx_bd_base
1048 * and tx_bd_base always point to the currently available buffer. 1048 * and tx_bd_base always point to the currently available buffer.
1049 * The dirty_tx tracks the current buffer that is being sent by the 1049 * The dirty_tx tracks the current buffer that is being sent by the
diff --git a/drivers/net/hamradio/Makefile b/drivers/net/hamradio/Makefile
index 9def86704a91..104096070026 100644
--- a/drivers/net/hamradio/Makefile
+++ b/drivers/net/hamradio/Makefile
@@ -3,7 +3,7 @@
3# 3#
4# 4#
5# 19971130 Moved the amateur radio related network drivers from 5# 19971130 Moved the amateur radio related network drivers from
6# drivers/net/ to drivers/hamradio for easier maintainance. 6# drivers/net/ to drivers/hamradio for easier maintenance.
7# Joerg Reuter DL1BKE <jreuter@yaina.de> 7# Joerg Reuter DL1BKE <jreuter@yaina.de>
8# 8#
9# 20000806 Rewritten to use lists instead of if-statements. 9# 20000806 Rewritten to use lists instead of if-statements.
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index 7d9ced0738c5..96a98d2ff151 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -30,7 +30,7 @@
30 * 0.1 F1OAT 07.06.98 Add timer polling routine for channel arbitration 30 * 0.1 F1OAT 07.06.98 Add timer polling routine for channel arbitration
31 * 0.2 F6FBB 08.06.98 Added delay after FPGA programming 31 * 0.2 F6FBB 08.06.98 Added delay after FPGA programming
32 * 0.3 F6FBB 29.07.98 Delayed PTT implementation for dupmode=2 32 * 0.3 F6FBB 29.07.98 Delayed PTT implementation for dupmode=2
33 * 0.4 F6FBB 30.07.98 Added TxTail, Slottime and Persistance 33 * 0.4 F6FBB 30.07.98 Added TxTail, Slottime and Persistence
34 * 0.5 F6FBB 01.08.98 Shared IRQs, /proc/net and network statistics 34 * 0.5 F6FBB 01.08.98 Shared IRQs, /proc/net and network statistics
35 * 0.6 F6FBB 25.08.98 Added 1200Bds format 35 * 0.6 F6FBB 25.08.98 Added 1200Bds format
36 * 0.7 F6FBB 12.09.98 Added to the kernel configuration 36 * 0.7 F6FBB 12.09.98 Added to the kernel configuration
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index 8e2c4601b5f5..8e10d2f6a5ad 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -180,8 +180,8 @@ struct hp100_private {
180 180
181 u_int *page_vaddr_algn; /* Aligned virtual address of allocated page */ 181 u_int *page_vaddr_algn; /* Aligned virtual address of allocated page */
182 u_long whatever_offset; /* Offset to bus/phys/dma address */ 182 u_long whatever_offset; /* Offset to bus/phys/dma address */
183 int rxrcommit; /* # Rx PDLs commited to adapter */ 183 int rxrcommit; /* # Rx PDLs committed to adapter */
184 int txrcommit; /* # Tx PDLs commited to adapter */ 184 int txrcommit; /* # Tx PDLs committed to adapter */
185}; 185};
186 186
187/* 187/*
@@ -716,7 +716,7 @@ static int __devinit hp100_probe1(struct net_device *dev, int ioaddr,
716 * implemented/tested only with the lassen chip anyway... */ 716 * implemented/tested only with the lassen chip anyway... */
717 if (lp->mode == 1) { /* busmaster */ 717 if (lp->mode == 1) { /* busmaster */
718 dma_addr_t page_baddr; 718 dma_addr_t page_baddr;
719 /* Get physically continous memory for TX & RX PDLs */ 719 /* Get physically continuous memory for TX & RX PDLs */
720 /* Conversion to new PCI API : 720 /* Conversion to new PCI API :
721 * Pages are always aligned and zeroed, no need to it ourself. 721 * Pages are always aligned and zeroed, no need to it ourself.
722 * Doc says should be OK for EISA bus as well - Jean II */ 722 * Doc says should be OK for EISA bus as well - Jean II */
@@ -1596,7 +1596,7 @@ drop:
1596 1596
1597/* clean_txring checks if packets have been sent by the card by reading 1597/* clean_txring checks if packets have been sent by the card by reading
1598 * the TX_PDL register from the performance page and comparing it to the 1598 * the TX_PDL register from the performance page and comparing it to the
1599 * number of commited packets. It then frees the skb's of the packets that 1599 * number of committed packets. It then frees the skb's of the packets that
1600 * obviously have been sent to the network. 1600 * obviously have been sent to the network.
1601 * 1601 *
1602 * Needs the PERFORMANCE page selected. 1602 * Needs the PERFORMANCE page selected.
@@ -1617,7 +1617,7 @@ static void hp100_clean_txring(struct net_device *dev)
1617 1617
1618#ifdef HP100_DEBUG 1618#ifdef HP100_DEBUG
1619 if (donecount > MAX_TX_PDL) 1619 if (donecount > MAX_TX_PDL)
1620 printk("hp100: %s: Warning: More PDLs transmitted than commited to card???\n", dev->name); 1620 printk("hp100: %s: Warning: More PDLs transmitted than committed to card???\n", dev->name);
1621#endif 1621#endif
1622 1622
1623 for (; 0 != donecount; donecount--) { 1623 for (; 0 != donecount; donecount--) {
@@ -1765,7 +1765,7 @@ drop:
1765 * Receive Function (Non-Busmaster mode) 1765 * Receive Function (Non-Busmaster mode)
1766 * Called when an "Receive Packet" interrupt occurs, i.e. the receive 1766 * Called when an "Receive Packet" interrupt occurs, i.e. the receive
1767 * packet counter is non-zero. 1767 * packet counter is non-zero.
1768 * For non-busmaster, this function does the whole work of transfering 1768 * For non-busmaster, this function does the whole work of transferring
1769 * the packet to the host memory and then up to higher layers via skb 1769 * the packet to the host memory and then up to higher layers via skb
1770 * and netif_rx. 1770 * and netif_rx.
1771 */ 1771 */
@@ -1892,7 +1892,7 @@ static void hp100_rx_bm(struct net_device *dev)
1892 /* RX_PKT_CNT states how many PDLs are currently formatted and available to 1892 /* RX_PKT_CNT states how many PDLs are currently formatted and available to
1893 * the cards BM engine */ 1893 * the cards BM engine */
1894 if ((hp100_inw(RX_PKT_CNT) & 0x00ff) >= lp->rxrcommit) { 1894 if ((hp100_inw(RX_PKT_CNT) & 0x00ff) >= lp->rxrcommit) {
1895 printk("hp100: %s: More packets received than commited? RX_PKT_CNT=0x%x, commit=0x%x\n", 1895 printk("hp100: %s: More packets received than committed? RX_PKT_CNT=0x%x, commit=0x%x\n",
1896 dev->name, hp100_inw(RX_PKT_CNT) & 0x00ff, 1896 dev->name, hp100_inw(RX_PKT_CNT) & 0x00ff,
1897 lp->rxrcommit); 1897 lp->rxrcommit);
1898 return; 1898 return;
@@ -2256,7 +2256,7 @@ static irqreturn_t hp100_interrupt(int irq, void *dev_id)
2256 if (lp->mode != 1) /* non busmaster */ 2256 if (lp->mode != 1) /* non busmaster */
2257 hp100_rx(dev); 2257 hp100_rx(dev);
2258 else if (!(val & HP100_RX_PDL_FILL_COMPL)) { 2258 else if (!(val & HP100_RX_PDL_FILL_COMPL)) {
2259 /* Shouldnt happen - maybe we missed a RX_PDL_FILL Interrupt? */ 2259 /* Shouldn't happen - maybe we missed a RX_PDL_FILL Interrupt? */
2260 hp100_rx_bm(dev); 2260 hp100_rx_bm(dev);
2261 } 2261 }
2262 } 2262 }
diff --git a/drivers/net/hp100.h b/drivers/net/hp100.h
index e6ca128a5564..b60e96fe38b4 100644
--- a/drivers/net/hp100.h
+++ b/drivers/net/hp100.h
@@ -109,7 +109,7 @@
109#define HP100_REG_MAC_CFG_2 0x0d /* RW: (8) Misc MAC functions */ 109#define HP100_REG_MAC_CFG_2 0x0d /* RW: (8) Misc MAC functions */
110#define HP100_REG_MAC_CFG_3 0x0e /* RW: (8) Misc MAC functions */ 110#define HP100_REG_MAC_CFG_3 0x0e /* RW: (8) Misc MAC functions */
111#define HP100_REG_MAC_CFG_4 0x0f /* R: (8) Misc MAC states */ 111#define HP100_REG_MAC_CFG_4 0x0f /* R: (8) Misc MAC states */
112#define HP100_REG_DROPPED 0x10 /* R: (16),11:0 Pkts cant fit in mem */ 112#define HP100_REG_DROPPED 0x10 /* R: (16),11:0 Pkts can't fit in mem */
113#define HP100_REG_CRC 0x12 /* R: (8) Pkts with CRC */ 113#define HP100_REG_CRC 0x12 /* R: (8) Pkts with CRC */
114#define HP100_REG_ABORT 0x13 /* R: (8) Aborted Tx pkts */ 114#define HP100_REG_ABORT 0x13 /* R: (8) Aborted Tx pkts */
115#define HP100_REG_TRAIN_REQUEST 0x14 /* RW: (16) Endnode MAC register. */ 115#define HP100_REG_TRAIN_REQUEST 0x14 /* RW: (16) Endnode MAC register. */
diff --git a/drivers/net/ibm_newemac/tah.c b/drivers/net/ibm_newemac/tah.c
index 8ead6a96abaa..5f51bf7c9dc5 100644
--- a/drivers/net/ibm_newemac/tah.c
+++ b/drivers/net/ibm_newemac/tah.c
@@ -60,7 +60,7 @@ void tah_reset(struct platform_device *ofdev)
60 printk(KERN_ERR "%s: reset timeout\n", 60 printk(KERN_ERR "%s: reset timeout\n",
61 ofdev->dev.of_node->full_name); 61 ofdev->dev.of_node->full_name);
62 62
63 /* 10KB TAH TX FIFO accomodates the max MTU of 9000 */ 63 /* 10KB TAH TX FIFO accommodates the max MTU of 9000 */
64 out_be32(&p->mr, 64 out_be32(&p->mr,
65 TAH_MR_CVR | TAH_MR_ST_768 | TAH_MR_TFS_10KB | TAH_MR_DTFP | 65 TAH_MR_CVR | TAH_MR_ST_768 | TAH_MR_TFS_10KB | TAH_MR_DTFP |
66 TAH_MR_DIG); 66 TAH_MR_DIG);
diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c
index 94d9969ec0bb..8ff68ae6b520 100644
--- a/drivers/net/ibmlana.c
+++ b/drivers/net/ibmlana.c
@@ -53,7 +53,7 @@ History:
53 still work with 2.0.x.... 53 still work with 2.0.x....
54 Jan 28th, 2000 54 Jan 28th, 2000
55 in Linux 2.2.13, the version.h file mysteriously didn't get 55 in Linux 2.2.13, the version.h file mysteriously didn't get
56 included. Added a workaround for this. Futhermore, it now 56 included. Added a workaround for this. Furthermore, it now
57 not only compiles as a modules ;-) 57 not only compiles as a modules ;-)
58 Jan 30th, 2000 58 Jan 30th, 2000
59 newer kernels automatically probe more than one board, so the 59 newer kernels automatically probe more than one board, so the
@@ -481,7 +481,7 @@ static void InitBoard(struct net_device *dev)
481 if ((dev->flags & IFF_ALLMULTI) || netdev_mc_count(dev) > camcnt) 481 if ((dev->flags & IFF_ALLMULTI) || netdev_mc_count(dev) > camcnt)
482 rcrval |= RCREG_AMC; 482 rcrval |= RCREG_AMC;
483 483
484 /* promiscous mode ? */ 484 /* promiscuous mode ? */
485 485
486 if (dev->flags & IFF_PROMISC) 486 if (dev->flags & IFF_PROMISC)
487 rcrval |= RCREG_PRO; 487 rcrval |= RCREG_PRO;
diff --git a/drivers/net/ibmlana.h b/drivers/net/ibmlana.h
index aa3ddbdee4bb..accd5efc9c8a 100644
--- a/drivers/net/ibmlana.h
+++ b/drivers/net/ibmlana.h
@@ -90,7 +90,7 @@ typedef struct {
90#define RCREG_ERR 0x8000 /* accept damaged and collided pkts */ 90#define RCREG_ERR 0x8000 /* accept damaged and collided pkts */
91#define RCREG_RNT 0x4000 /* accept packets that are < 64 */ 91#define RCREG_RNT 0x4000 /* accept packets that are < 64 */
92#define RCREG_BRD 0x2000 /* accept broadcasts */ 92#define RCREG_BRD 0x2000 /* accept broadcasts */
93#define RCREG_PRO 0x1000 /* promiscous mode */ 93#define RCREG_PRO 0x1000 /* promiscuous mode */
94#define RCREG_AMC 0x0800 /* accept all multicasts */ 94#define RCREG_AMC 0x0800 /* accept all multicasts */
95#define RCREG_LB_NONE 0x0000 /* no loopback */ 95#define RCREG_LB_NONE 0x0000 /* no loopback */
96#define RCREG_LB_MAC 0x0200 /* MAC loopback */ 96#define RCREG_LB_MAC 0x0200 /* MAC loopback */
diff --git a/drivers/net/igb/e1000_mac.c b/drivers/net/igb/e1000_mac.c
index 90c5e01e9235..ce8255fc3c52 100644
--- a/drivers/net/igb/e1000_mac.c
+++ b/drivers/net/igb/e1000_mac.c
@@ -181,7 +181,7 @@ s32 igb_vfta_set(struct e1000_hw *hw, u32 vid, bool add)
181 * address and must override the actual permanent MAC address. If an 181 * address and must override the actual permanent MAC address. If an
182 * alternate MAC address is fopund it is saved in the hw struct and 182 * alternate MAC address is fopund it is saved in the hw struct and
183 * prgrammed into RAR0 and the cuntion returns success, otherwise the 183 * prgrammed into RAR0 and the cuntion returns success, otherwise the
184 * fucntion returns an error. 184 * function returns an error.
185 **/ 185 **/
186s32 igb_check_alt_mac_addr(struct e1000_hw *hw) 186s32 igb_check_alt_mac_addr(struct e1000_hw *hw)
187{ 187{
@@ -982,7 +982,7 @@ out:
982} 982}
983 983
984/** 984/**
985 * igb_get_speed_and_duplex_copper - Retreive current speed/duplex 985 * igb_get_speed_and_duplex_copper - Retrieve current speed/duplex
986 * @hw: pointer to the HW structure 986 * @hw: pointer to the HW structure
987 * @speed: stores the current speed 987 * @speed: stores the current speed
988 * @duplex: stores the current duplex 988 * @duplex: stores the current duplex
diff --git a/drivers/net/igb/e1000_phy.c b/drivers/net/igb/e1000_phy.c
index 6694bf3e5ad9..d639706eb3f6 100644
--- a/drivers/net/igb/e1000_phy.c
+++ b/drivers/net/igb/e1000_phy.c
@@ -1421,7 +1421,7 @@ out:
1421} 1421}
1422 1422
1423/** 1423/**
1424 * igb_check_downshift - Checks whether a downshift in speed occured 1424 * igb_check_downshift - Checks whether a downshift in speed occurred
1425 * @hw: pointer to the HW structure 1425 * @hw: pointer to the HW structure
1426 * 1426 *
1427 * Success returns 0, Failure returns 1 1427 * Success returns 0, Failure returns 1
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 3d850af0cdda..0dfd1b93829e 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -200,7 +200,7 @@ static struct pci_driver igb_driver = {
200 .probe = igb_probe, 200 .probe = igb_probe,
201 .remove = __devexit_p(igb_remove), 201 .remove = __devexit_p(igb_remove),
202#ifdef CONFIG_PM 202#ifdef CONFIG_PM
203 /* Power Managment Hooks */ 203 /* Power Management Hooks */
204 .suspend = igb_suspend, 204 .suspend = igb_suspend,
205 .resume = igb_resume, 205 .resume = igb_resume,
206#endif 206#endif
@@ -2292,7 +2292,7 @@ static void igb_init_hw_timer(struct igb_adapter *adapter)
2292 /** 2292 /**
2293 * Scale the NIC clock cycle by a large factor so that 2293 * Scale the NIC clock cycle by a large factor so that
2294 * relatively small clock corrections can be added or 2294 * relatively small clock corrections can be added or
2295 * substracted at each clock tick. The drawbacks of a large 2295 * subtracted at each clock tick. The drawbacks of a large
2296 * factor are a) that the clock register overflows more quickly 2296 * factor are a) that the clock register overflows more quickly
2297 * (not such a big deal) and b) that the increment per tick has 2297 * (not such a big deal) and b) that the increment per tick has
2298 * to fit into 24 bits. As a result we need to use a shift of 2298 * to fit into 24 bits. As a result we need to use a shift of
@@ -3409,7 +3409,7 @@ static void igb_set_rx_mode(struct net_device *netdev)
3409 } else { 3409 } else {
3410 /* 3410 /*
3411 * Write addresses to the MTA, if the attempt fails 3411 * Write addresses to the MTA, if the attempt fails
3412 * then we should just turn on promiscous mode so 3412 * then we should just turn on promiscuous mode so
3413 * that we can at least receive multicast traffic 3413 * that we can at least receive multicast traffic
3414 */ 3414 */
3415 count = igb_write_mc_addr_list(netdev); 3415 count = igb_write_mc_addr_list(netdev);
@@ -3423,7 +3423,7 @@ static void igb_set_rx_mode(struct net_device *netdev)
3423 /* 3423 /*
3424 * Write addresses to available RAR registers, if there is not 3424 * Write addresses to available RAR registers, if there is not
3425 * sufficient space to store all the addresses then enable 3425 * sufficient space to store all the addresses then enable
3426 * unicast promiscous mode 3426 * unicast promiscuous mode
3427 */ 3427 */
3428 count = igb_write_uc_addr_list(netdev); 3428 count = igb_write_uc_addr_list(netdev);
3429 if (count < 0) { 3429 if (count < 0) {
@@ -4317,7 +4317,7 @@ netdev_tx_t igb_xmit_frame_ring_adv(struct sk_buff *skb,
4317 4317
4318 /* 4318 /*
4319 * count reflects descriptors mapped, if 0 or less then mapping error 4319 * count reflects descriptors mapped, if 0 or less then mapping error
4320 * has occured and we need to rewind the descriptor queue 4320 * has occurred and we need to rewind the descriptor queue
4321 */ 4321 */
4322 count = igb_tx_map_adv(tx_ring, skb, first); 4322 count = igb_tx_map_adv(tx_ring, skb, first);
4323 if (!count) { 4323 if (!count) {
@@ -5352,8 +5352,8 @@ static void igb_msg_task(struct igb_adapter *adapter)
5352 * The unicast table address is a register array of 32-bit registers. 5352 * The unicast table address is a register array of 32-bit registers.
5353 * The table is meant to be used in a way similar to how the MTA is used 5353 * The table is meant to be used in a way similar to how the MTA is used
5354 * however due to certain limitations in the hardware it is necessary to 5354 * however due to certain limitations in the hardware it is necessary to
5355 * set all the hash bits to 1 and use the VMOLR ROPE bit as a promiscous 5355 * set all the hash bits to 1 and use the VMOLR ROPE bit as a promiscuous
5356 * enable bit to allow vlan tag stripping when promiscous mode is enabled 5356 * enable bit to allow vlan tag stripping when promiscuous mode is enabled
5357 **/ 5357 **/
5358static void igb_set_uta(struct igb_adapter *adapter) 5358static void igb_set_uta(struct igb_adapter *adapter)
5359{ 5359{
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c
index 6ccc32fd7338..1d04ca6fdaea 100644
--- a/drivers/net/igbvf/netdev.c
+++ b/drivers/net/igbvf/netdev.c
@@ -2227,7 +2227,7 @@ static netdev_tx_t igbvf_xmit_frame_ring_adv(struct sk_buff *skb,
2227 2227
2228 /* 2228 /*
2229 * count reflects descriptors mapped, if 0 then mapping error 2229 * count reflects descriptors mapped, if 0 then mapping error
2230 * has occured and we need to rewind the descriptor queue 2230 * has occurred and we need to rewind the descriptor queue
2231 */ 2231 */
2232 count = igbvf_tx_map_adv(adapter, tx_ring, skb, first); 2232 count = igbvf_tx_map_adv(adapter, tx_ring, skb, first);
2233 2233
diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c
index a5b0f0e194bb..58cd3202b48c 100644
--- a/drivers/net/ipg.c
+++ b/drivers/net/ipg.c
@@ -486,14 +486,14 @@ static int ipg_config_autoneg(struct net_device *dev)
486 phyctrl = ipg_r8(PHY_CTRL); 486 phyctrl = ipg_r8(PHY_CTRL);
487 mac_ctrl_val = ipg_r32(MAC_CTRL); 487 mac_ctrl_val = ipg_r32(MAC_CTRL);
488 488
489 /* Set flags for use in resolving auto-negotation, assuming 489 /* Set flags for use in resolving auto-negotiation, assuming
490 * non-1000Mbps, half duplex, no flow control. 490 * non-1000Mbps, half duplex, no flow control.
491 */ 491 */
492 fullduplex = 0; 492 fullduplex = 0;
493 txflowcontrol = 0; 493 txflowcontrol = 0;
494 rxflowcontrol = 0; 494 rxflowcontrol = 0;
495 495
496 /* To accomodate a problem in 10Mbps operation, 496 /* To accommodate a problem in 10Mbps operation,
497 * set a global flag if PHY running in 10Mbps mode. 497 * set a global flag if PHY running in 10Mbps mode.
498 */ 498 */
499 sp->tenmbpsmode = 0; 499 sp->tenmbpsmode = 0;
@@ -846,7 +846,7 @@ static void init_tfdlist(struct net_device *dev)
846} 846}
847 847
848/* 848/*
849 * Free all transmit buffers which have already been transfered 849 * Free all transmit buffers which have already been transferred
850 * via DMA to the IPG. 850 * via DMA to the IPG.
851 */ 851 */
852static void ipg_nic_txfree(struct net_device *dev) 852static void ipg_nic_txfree(struct net_device *dev)
@@ -920,7 +920,7 @@ static void ipg_tx_timeout(struct net_device *dev)
920 920
921/* 921/*
922 * For TxComplete interrupts, free all transmit 922 * For TxComplete interrupts, free all transmit
923 * buffers which have already been transfered via DMA 923 * buffers which have already been transferred via DMA
924 * to the IPG. 924 * to the IPG.
925 */ 925 */
926static void ipg_nic_txcleanup(struct net_device *dev) 926static void ipg_nic_txcleanup(struct net_device *dev)
@@ -1141,13 +1141,13 @@ static int ipg_nic_rx_check_error(struct net_device *dev)
1141 1141
1142 /* Increment detailed receive error statistics. */ 1142 /* Increment detailed receive error statistics. */
1143 if (le64_to_cpu(rxfd->rfs) & IPG_RFS_RXFIFOOVERRUN) { 1143 if (le64_to_cpu(rxfd->rfs) & IPG_RFS_RXFIFOOVERRUN) {
1144 IPG_DEBUG_MSG("RX FIFO overrun occured.\n"); 1144 IPG_DEBUG_MSG("RX FIFO overrun occurred.\n");
1145 1145
1146 sp->stats.rx_fifo_errors++; 1146 sp->stats.rx_fifo_errors++;
1147 } 1147 }
1148 1148
1149 if (le64_to_cpu(rxfd->rfs) & IPG_RFS_RXRUNTFRAME) { 1149 if (le64_to_cpu(rxfd->rfs) & IPG_RFS_RXRUNTFRAME) {
1150 IPG_DEBUG_MSG("RX runt occured.\n"); 1150 IPG_DEBUG_MSG("RX runt occurred.\n");
1151 sp->stats.rx_length_errors++; 1151 sp->stats.rx_length_errors++;
1152 } 1152 }
1153 1153
@@ -1156,7 +1156,7 @@ static int ipg_nic_rx_check_error(struct net_device *dev)
1156 */ 1156 */
1157 1157
1158 if (le64_to_cpu(rxfd->rfs) & IPG_RFS_RXALIGNMENTERROR) { 1158 if (le64_to_cpu(rxfd->rfs) & IPG_RFS_RXALIGNMENTERROR) {
1159 IPG_DEBUG_MSG("RX alignment error occured.\n"); 1159 IPG_DEBUG_MSG("RX alignment error occurred.\n");
1160 sp->stats.rx_frame_errors++; 1160 sp->stats.rx_frame_errors++;
1161 } 1161 }
1162 1162
@@ -1421,12 +1421,12 @@ static int ipg_nic_rx(struct net_device *dev)
1421 1421
1422 /* Increment detailed receive error statistics. */ 1422 /* Increment detailed receive error statistics. */
1423 if (le64_to_cpu(rxfd->rfs) & IPG_RFS_RXFIFOOVERRUN) { 1423 if (le64_to_cpu(rxfd->rfs) & IPG_RFS_RXFIFOOVERRUN) {
1424 IPG_DEBUG_MSG("RX FIFO overrun occured.\n"); 1424 IPG_DEBUG_MSG("RX FIFO overrun occurred.\n");
1425 sp->stats.rx_fifo_errors++; 1425 sp->stats.rx_fifo_errors++;
1426 } 1426 }
1427 1427
1428 if (le64_to_cpu(rxfd->rfs) & IPG_RFS_RXRUNTFRAME) { 1428 if (le64_to_cpu(rxfd->rfs) & IPG_RFS_RXRUNTFRAME) {
1429 IPG_DEBUG_MSG("RX runt occured.\n"); 1429 IPG_DEBUG_MSG("RX runt occurred.\n");
1430 sp->stats.rx_length_errors++; 1430 sp->stats.rx_length_errors++;
1431 } 1431 }
1432 1432
@@ -1436,7 +1436,7 @@ static int ipg_nic_rx(struct net_device *dev)
1436 */ 1436 */
1437 1437
1438 if (le64_to_cpu(rxfd->rfs) & IPG_RFS_RXALIGNMENTERROR) { 1438 if (le64_to_cpu(rxfd->rfs) & IPG_RFS_RXALIGNMENTERROR) {
1439 IPG_DEBUG_MSG("RX alignment error occured.\n"); 1439 IPG_DEBUG_MSG("RX alignment error occurred.\n");
1440 sp->stats.rx_frame_errors++; 1440 sp->stats.rx_frame_errors++;
1441 } 1441 }
1442 1442
@@ -1460,7 +1460,7 @@ static int ipg_nic_rx(struct net_device *dev)
1460 } 1460 }
1461 } else { 1461 } else {
1462 1462
1463 /* Adjust the new buffer length to accomodate the size 1463 /* Adjust the new buffer length to accommodate the size
1464 * of the received frame. 1464 * of the received frame.
1465 */ 1465 */
1466 skb_put(skb, framelen); 1466 skb_put(skb, framelen);
@@ -1488,7 +1488,7 @@ static int ipg_nic_rx(struct net_device *dev)
1488 } 1488 }
1489 1489
1490 /* 1490 /*
1491 * If there are more RFDs to proces and the allocated amount of RFD 1491 * If there are more RFDs to process and the allocated amount of RFD
1492 * processing time has expired, assert Interrupt Requested to make 1492 * processing time has expired, assert Interrupt Requested to make
1493 * sure we come back to process the remaining RFDs. 1493 * sure we come back to process the remaining RFDs.
1494 */ 1494 */
@@ -1886,7 +1886,7 @@ static netdev_tx_t ipg_nic_hard_start_xmit(struct sk_buff *skb,
1886 /* Request TxComplete interrupts at an interval defined 1886 /* Request TxComplete interrupts at an interval defined
1887 * by the constant IPG_FRAMESBETWEENTXCOMPLETES. 1887 * by the constant IPG_FRAMESBETWEENTXCOMPLETES.
1888 * Request TxComplete interrupt for every frame 1888 * Request TxComplete interrupt for every frame
1889 * if in 10Mbps mode to accomodate problem with 10Mbps 1889 * if in 10Mbps mode to accommodate problem with 10Mbps
1890 * processing. 1890 * processing.
1891 */ 1891 */
1892 if (sp->tenmbpsmode) 1892 if (sp->tenmbpsmode)
@@ -2098,7 +2098,7 @@ static int ipg_nic_change_mtu(struct net_device *dev, int new_mtu)
2098 struct ipg_nic_private *sp = netdev_priv(dev); 2098 struct ipg_nic_private *sp = netdev_priv(dev);
2099 int err; 2099 int err;
2100 2100
2101 /* Function to accomodate changes to Maximum Transfer Unit 2101 /* Function to accommodate changes to Maximum Transfer Unit
2102 * (or MTU) of IPG NIC. Cannot use default function since 2102 * (or MTU) of IPG NIC. Cannot use default function since
2103 * the default will not allow for MTU > 1500 bytes. 2103 * the default will not allow for MTU > 1500 bytes.
2104 */ 2104 */
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c
index 92631eb6f6a3..872183f29ec4 100644
--- a/drivers/net/irda/ali-ircc.c
+++ b/drivers/net/irda/ali-ircc.c
@@ -76,7 +76,7 @@ static int ali_ircc_probe_53(ali_chip_t *chip, chipio_t *info);
76static int ali_ircc_init_43(ali_chip_t *chip, chipio_t *info); 76static int ali_ircc_init_43(ali_chip_t *chip, chipio_t *info);
77static int ali_ircc_init_53(ali_chip_t *chip, chipio_t *info); 77static int ali_ircc_init_53(ali_chip_t *chip, chipio_t *info);
78 78
79/* These are the currently known ALi sourth-bridge chipsets, the only one difference 79/* These are the currently known ALi south-bridge chipsets, the only one difference
80 * is that M1543C doesn't support HP HDSL-3600 80 * is that M1543C doesn't support HP HDSL-3600
81 */ 81 */
82static ali_chip_t chips[] = 82static ali_chip_t chips[] =
@@ -1108,7 +1108,7 @@ static void ali_ircc_sir_change_speed(struct ali_ircc_cb *priv, __u32 speed)
1108 outb(lcr, iobase+UART_LCR); /* Set 8N1 */ 1108 outb(lcr, iobase+UART_LCR); /* Set 8N1 */
1109 outb(fcr, iobase+UART_FCR); /* Enable FIFO's */ 1109 outb(fcr, iobase+UART_FCR); /* Enable FIFO's */
1110 1110
1111 /* without this, the conection will be broken after come back from FIR speed, 1111 /* without this, the connection will be broken after come back from FIR speed,
1112 but with this, the SIR connection is harder to established */ 1112 but with this, the SIR connection is harder to established */
1113 outb((UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2), iobase+UART_MCR); 1113 outb((UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2), iobase+UART_MCR);
1114 1114
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index f81d944fc360..174cafad2c1a 100644
--- a/drivers/net/irda/donauboe.c
+++ b/drivers/net/irda/donauboe.c
@@ -56,7 +56,7 @@
56/* do_probe module parameter Enable this code */ 56/* do_probe module parameter Enable this code */
57/* Probe code is very useful for understanding how the hardware works */ 57/* Probe code is very useful for understanding how the hardware works */
58/* Use it with various combinations of TT_LEN, RX_LEN */ 58/* Use it with various combinations of TT_LEN, RX_LEN */
59/* Strongly recomended, disable if the probe fails on your machine */ 59/* Strongly recommended, disable if the probe fails on your machine */
60/* and send me <james@fishsoup.dhs.org> the output of dmesg */ 60/* and send me <james@fishsoup.dhs.org> the output of dmesg */
61#define USE_PROBE 1 61#define USE_PROBE 1
62#undef USE_PROBE 62#undef USE_PROBE
diff --git a/drivers/net/irda/donauboe.h b/drivers/net/irda/donauboe.h
index 77fcf4459161..d92d54e839b9 100644
--- a/drivers/net/irda/donauboe.h
+++ b/drivers/net/irda/donauboe.h
@@ -51,7 +51,7 @@
51 51
52/* The documentation for this chip is allegedly released */ 52/* The documentation for this chip is allegedly released */
53/* However I have not seen it, not have I managed to contact */ 53/* However I have not seen it, not have I managed to contact */
54/* anyone who has. HOWEVER the chip bears a striking resemblence */ 54/* anyone who has. HOWEVER the chip bears a striking resemblance */
55/* to the IrDA controller in the Toshiba RISC TMPR3922 chip */ 55/* to the IrDA controller in the Toshiba RISC TMPR3922 chip */
56/* the documentation for this is freely available at */ 56/* the documentation for this is freely available at */
57/* http://www.madingley.org/james/resources/toshoboe/TMPR3922.pdf */ 57/* http://www.madingley.org/james/resources/toshoboe/TMPR3922.pdf */
diff --git a/drivers/net/irda/girbil-sir.c b/drivers/net/irda/girbil-sir.c
index a31b8fa8aaa9..96cdecff349d 100644
--- a/drivers/net/irda/girbil-sir.c
+++ b/drivers/net/irda/girbil-sir.c
@@ -38,7 +38,7 @@ static int girbil_change_speed(struct sir_dev *dev, unsigned speed);
38/* Control register 1 */ 38/* Control register 1 */
39#define GIRBIL_TXEN 0x01 /* Enable transmitter */ 39#define GIRBIL_TXEN 0x01 /* Enable transmitter */
40#define GIRBIL_RXEN 0x02 /* Enable receiver */ 40#define GIRBIL_RXEN 0x02 /* Enable receiver */
41#define GIRBIL_ECAN 0x04 /* Cancel self emmited data */ 41#define GIRBIL_ECAN 0x04 /* Cancel self emitted data */
42#define GIRBIL_ECHO 0x08 /* Echo control characters */ 42#define GIRBIL_ECHO 0x08 /* Echo control characters */
43 43
44/* LED Current Register (0x2) */ 44/* LED Current Register (0x2) */
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index e4ea61944c22..d9267cb98a23 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -370,7 +370,7 @@ static void speed_bulk_callback(struct urb *urb)
370 /* urb is now available */ 370 /* urb is now available */
371 //urb->status = 0; -> tested above 371 //urb->status = 0; -> tested above
372 372
373 /* New speed and xbof is now commited in hardware */ 373 /* New speed and xbof is now committed in hardware */
374 self->new_speed = -1; 374 self->new_speed = -1;
375 self->new_xbofs = -1; 375 self->new_xbofs = -1;
376 376
@@ -602,7 +602,7 @@ static void write_bulk_callback(struct urb *urb)
602 IRDA_DEBUG(1, "%s(), Changing speed now...\n", __func__); 602 IRDA_DEBUG(1, "%s(), Changing speed now...\n", __func__);
603 irda_usb_change_speed_xbofs(self); 603 irda_usb_change_speed_xbofs(self);
604 } else { 604 } else {
605 /* New speed and xbof is now commited in hardware */ 605 /* New speed and xbof is now committed in hardware */
606 self->new_speed = -1; 606 self->new_speed = -1;
607 self->new_xbofs = -1; 607 self->new_xbofs = -1;
608 /* Done, waiting for next packet */ 608 /* Done, waiting for next packet */
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c
index cc821de2c966..be52bfed66a9 100644
--- a/drivers/net/irda/mcs7780.c
+++ b/drivers/net/irda/mcs7780.c
@@ -588,7 +588,7 @@ static int mcs_speed_change(struct mcs_cb *mcs)
588 588
589 mcs_get_reg(mcs, MCS_MODE_REG, &rval); 589 mcs_get_reg(mcs, MCS_MODE_REG, &rval);
590 590
591 /* MINRXPW values recomended by MosChip */ 591 /* MINRXPW values recommended by MosChip */
592 if (mcs->new_speed <= 115200) { 592 if (mcs->new_speed <= 115200) {
593 rval &= ~MCS_FIR; 593 rval &= ~MCS_FIR;
594 594
@@ -799,7 +799,7 @@ static void mcs_receive_irq(struct urb *urb)
799 ret = usb_submit_urb(urb, GFP_ATOMIC); 799 ret = usb_submit_urb(urb, GFP_ATOMIC);
800} 800}
801 801
802/* Transmit callback funtion. */ 802/* Transmit callback function. */
803static void mcs_send_irq(struct urb *urb) 803static void mcs_send_irq(struct urb *urb)
804{ 804{
805 struct mcs_cb *mcs = urb->context; 805 struct mcs_cb *mcs = urb->context;
@@ -811,7 +811,7 @@ static void mcs_send_irq(struct urb *urb)
811 netif_wake_queue(ndev); 811 netif_wake_queue(ndev);
812} 812}
813 813
814/* Transmit callback funtion. */ 814/* Transmit callback function. */
815static netdev_tx_t mcs_hard_xmit(struct sk_buff *skb, 815static netdev_tx_t mcs_hard_xmit(struct sk_buff *skb,
816 struct net_device *ndev) 816 struct net_device *ndev)
817{ 817{
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index 559fe854d76d..7a963d4e6d06 100644
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
@@ -716,7 +716,7 @@ static int nsc_ircc_probe_338(nsc_chip_t *chip, chipio_t *info)
716 int reg, com = 0; 716 int reg, com = 0;
717 int pnp; 717 int pnp;
718 718
719 /* Read funtion enable register (FER) */ 719 /* Read function enable register (FER) */
720 outb(CFG_338_FER, cfg_base); 720 outb(CFG_338_FER, cfg_base);
721 reg = inb(cfg_base+1); 721 reg = inb(cfg_base+1);
722 722
diff --git a/drivers/net/irda/nsc-ircc.h b/drivers/net/irda/nsc-ircc.h
index 7ba7738759b9..32fa58211fad 100644
--- a/drivers/net/irda/nsc-ircc.h
+++ b/drivers/net/irda/nsc-ircc.h
@@ -135,7 +135,7 @@
135#define LSR_TXRDY 0x20 /* Transmitter ready */ 135#define LSR_TXRDY 0x20 /* Transmitter ready */
136#define LSR_TXEMP 0x40 /* Transmitter empty */ 136#define LSR_TXEMP 0x40 /* Transmitter empty */
137 137
138#define ASCR 0x07 /* Auxillary Status and Control Register */ 138#define ASCR 0x07 /* Auxiliary Status and Control Register */
139#define ASCR_RXF_TOUT 0x01 /* Rx FIFO timeout */ 139#define ASCR_RXF_TOUT 0x01 /* Rx FIFO timeout */
140#define ASCR_FEND_INF 0x02 /* Frame end bytes in rx FIFO */ 140#define ASCR_FEND_INF 0x02 /* Frame end bytes in rx FIFO */
141#define ASCR_S_EOT 0x04 /* Set end of transmission */ 141#define ASCR_S_EOT 0x04 /* Set end of transmission */
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c
index c192c31e4c5c..001ed0a255f6 100644
--- a/drivers/net/irda/pxaficp_ir.c
+++ b/drivers/net/irda/pxaficp_ir.c
@@ -40,7 +40,7 @@
40 40
41#define ICCR0_AME (1 << 7) /* Address match enable */ 41#define ICCR0_AME (1 << 7) /* Address match enable */
42#define ICCR0_TIE (1 << 6) /* Transmit FIFO interrupt enable */ 42#define ICCR0_TIE (1 << 6) /* Transmit FIFO interrupt enable */
43#define ICCR0_RIE (1 << 5) /* Recieve FIFO interrupt enable */ 43#define ICCR0_RIE (1 << 5) /* Receive FIFO interrupt enable */
44#define ICCR0_RXE (1 << 4) /* Receive enable */ 44#define ICCR0_RXE (1 << 4) /* Receive enable */
45#define ICCR0_TXE (1 << 3) /* Transmit enable */ 45#define ICCR0_TXE (1 << 3) /* Transmit enable */
46#define ICCR0_TUS (1 << 2) /* Transmit FIFO underrun select */ 46#define ICCR0_TUS (1 << 2) /* Transmit FIFO underrun select */
@@ -483,7 +483,7 @@ static irqreturn_t pxa_irda_fir_irq(int irq, void *dev_id)
483 } 483 }
484 484
485 if (icsr0 & ICSR0_EIF) { 485 if (icsr0 & ICSR0_EIF) {
486 /* An error in FIFO occured, or there is a end of frame */ 486 /* An error in FIFO occurred, or there is a end of frame */
487 pxa_irda_fir_irq_eif(si, dev, icsr0); 487 pxa_irda_fir_irq_eif(si, dev, icsr0);
488 } 488 }
489 489
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index 1c1677cfea29..8800e1fe4129 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -1582,7 +1582,7 @@ static irqreturn_t smsc_ircc_interrupt_sir(struct net_device *dev)
1582 int iobase; 1582 int iobase;
1583 int iir, lsr; 1583 int iir, lsr;
1584 1584
1585 /* Already locked comming here in smsc_ircc_interrupt() */ 1585 /* Already locked coming here in smsc_ircc_interrupt() */
1586 /*spin_lock(&self->lock);*/ 1586 /*spin_lock(&self->lock);*/
1587 1587
1588 iobase = self->io.sir_base; 1588 iobase = self->io.sir_base;
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
index 186cd28a61cc..f504b262ba36 100644
--- a/drivers/net/irda/via-ircc.c
+++ b/drivers/net/irda/via-ircc.c
@@ -29,7 +29,7 @@ F02 Oct/28/02: Add SB device ID for 3147 and 3177.
29 29
302004-02-16: <sda@bdit.de> 302004-02-16: <sda@bdit.de>
31- Removed unneeded 'legacy' pci stuff. 31- Removed unneeded 'legacy' pci stuff.
32- Make sure SIR mode is set (hw_init()) before calling mode-dependant stuff. 32- Make sure SIR mode is set (hw_init()) before calling mode-dependent stuff.
33- On speed change from core, don't send SIR frame with new speed. 33- On speed change from core, don't send SIR frame with new speed.
34 Use current speed and change speeds later. 34 Use current speed and change speeds later.
35- Make module-param dongle_id actually work. 35- Make module-param dongle_id actually work.
@@ -334,7 +334,7 @@ static __devinit int via_ircc_open(struct pci_dev *pdev, chipio_t * info,
334 self->io.dongle_id = dongle_id; 334 self->io.dongle_id = dongle_id;
335 335
336 /* The only value we must override it the baudrate */ 336 /* The only value we must override it the baudrate */
337 /* Maximum speeds and capabilities are dongle-dependant. */ 337 /* Maximum speeds and capabilities are dongle-dependent. */
338 switch( self->io.dongle_id ){ 338 switch( self->io.dongle_id ){
339 case 0x0d: 339 case 0x0d:
340 self->qos.baud_rate.bits = 340 self->qos.baud_rate.bits =
diff --git a/drivers/net/irda/vlsi_ir.h b/drivers/net/irda/vlsi_ir.h
index d66fab854bf1..a076eb125349 100644
--- a/drivers/net/irda/vlsi_ir.h
+++ b/drivers/net/irda/vlsi_ir.h
@@ -209,7 +209,7 @@ enum vlsi_pio_irintr {
209 IRINTR_ACTEN = 0x80, /* activity interrupt enable */ 209 IRINTR_ACTEN = 0x80, /* activity interrupt enable */
210 IRINTR_ACTIVITY = 0x40, /* activity monitor (traffic detected) */ 210 IRINTR_ACTIVITY = 0x40, /* activity monitor (traffic detected) */
211 IRINTR_RPKTEN = 0x20, /* receive packet interrupt enable*/ 211 IRINTR_RPKTEN = 0x20, /* receive packet interrupt enable*/
212 IRINTR_RPKTINT = 0x10, /* rx-packet transfered from fifo to memory finished */ 212 IRINTR_RPKTINT = 0x10, /* rx-packet transferred from fifo to memory finished */
213 IRINTR_TPKTEN = 0x08, /* transmit packet interrupt enable */ 213 IRINTR_TPKTEN = 0x08, /* transmit packet interrupt enable */
214 IRINTR_TPKTINT = 0x04, /* last bit of tx-packet+crc shifted to ir-pulser */ 214 IRINTR_TPKTINT = 0x04, /* last bit of tx-packet+crc shifted to ir-pulser */
215 IRINTR_OE_EN = 0x02, /* UART rx fifo overrun error interrupt enable */ 215 IRINTR_OE_EN = 0x02, /* UART rx fifo overrun error interrupt enable */
@@ -739,7 +739,7 @@ typedef struct vlsi_irda_dev {
739/* the remapped error flags we use for returning from frame 739/* the remapped error flags we use for returning from frame
740 * post-processing in vlsi_process_tx/rx() after it was completed 740 * post-processing in vlsi_process_tx/rx() after it was completed
741 * by the hardware. These functions either return the >=0 number 741 * by the hardware. These functions either return the >=0 number
742 * of transfered bytes in case of success or the negative (-) 742 * of transferred bytes in case of success or the negative (-)
743 * of the or'ed error flags. 743 * of the or'ed error flags.
744 */ 744 */
745 745
diff --git a/drivers/net/ixgbe/ixgbe_dcb.c b/drivers/net/ixgbe/ixgbe_dcb.c
index 41c529fac0ab..686a17aadef3 100644
--- a/drivers/net/ixgbe/ixgbe_dcb.c
+++ b/drivers/net/ixgbe/ixgbe_dcb.c
@@ -36,7 +36,7 @@
36/** 36/**
37 * ixgbe_ieee_credits - This calculates the ieee traffic class 37 * ixgbe_ieee_credits - This calculates the ieee traffic class
38 * credits from the configured bandwidth percentages. Credits 38 * credits from the configured bandwidth percentages. Credits
39 * are the smallest unit programable into the underlying 39 * are the smallest unit programmable into the underlying
40 * hardware. The IEEE 802.1Qaz specification do not use bandwidth 40 * hardware. The IEEE 802.1Qaz specification do not use bandwidth
41 * groups so this is much simplified from the CEE case. 41 * groups so this is much simplified from the CEE case.
42 */ 42 */
diff --git a/drivers/net/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ixgbe/ixgbe_dcb_nl.c
index fec4c724c37a..327c8614198c 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_nl.c
@@ -360,7 +360,7 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
360 return DCB_NO_HW_CHG; 360 return DCB_NO_HW_CHG;
361 361
362 /* 362 /*
363 * Only take down the adapter if an app change occured. FCoE 363 * Only take down the adapter if an app change occurred. FCoE
364 * may shuffle tx rings in this case and this can not be done 364 * may shuffle tx rings in this case and this can not be done
365 * without a reset currently. 365 * without a reset currently.
366 */ 366 */
@@ -599,7 +599,7 @@ static u8 ixgbe_dcbnl_setapp(struct net_device *netdev,
599 break; 599 break;
600 600
601 /* The FCoE application priority may be changed multiple 601 /* The FCoE application priority may be changed multiple
602 * times in quick sucession with switches that build up 602 * times in quick succession with switches that build up
603 * TLVs. To avoid creating uneeded device resets this 603 * TLVs. To avoid creating uneeded device resets this
604 * checks the actual HW configuration and clears 604 * checks the actual HW configuration and clears
605 * BIT_APP_UPCHG if a HW configuration change is not 605 * BIT_APP_UPCHG if a HW configuration change is not
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index f17e4a7ee731..6f8adc7f5d7c 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -644,7 +644,7 @@ void ixgbe_unmap_and_free_tx_resource(struct ixgbe_ring *tx_ring,
644 * @adapter: driver private struct 644 * @adapter: driver private struct
645 * @index: reg idx of queue to query (0-127) 645 * @index: reg idx of queue to query (0-127)
646 * 646 *
647 * Helper function to determine the traffic index for a paticular 647 * Helper function to determine the traffic index for a particular
648 * register index. 648 * register index.
649 * 649 *
650 * Returns : a tc index for use in range 0-7, or 0-3 650 * Returns : a tc index for use in range 0-7, or 0-3
@@ -3556,7 +3556,7 @@ void ixgbe_set_rx_mode(struct net_device *netdev)
3556 } else { 3556 } else {
3557 /* 3557 /*
3558 * Write addresses to the MTA, if the attempt fails 3558 * Write addresses to the MTA, if the attempt fails
3559 * then we should just turn on promiscous mode so 3559 * then we should just turn on promiscuous mode so
3560 * that we can at least receive multicast traffic 3560 * that we can at least receive multicast traffic
3561 */ 3561 */
3562 hw->mac.ops.update_mc_addr_list(hw, netdev); 3562 hw->mac.ops.update_mc_addr_list(hw, netdev);
@@ -3567,7 +3567,7 @@ void ixgbe_set_rx_mode(struct net_device *netdev)
3567 /* 3567 /*
3568 * Write addresses to available RAR registers, if there is not 3568 * Write addresses to available RAR registers, if there is not
3569 * sufficient space to store all the addresses then enable 3569 * sufficient space to store all the addresses then enable
3570 * unicast promiscous mode 3570 * unicast promiscuous mode
3571 */ 3571 */
3572 count = ixgbe_write_uc_addr_list(netdev); 3572 count = ixgbe_write_uc_addr_list(netdev);
3573 if (count < 0) { 3573 if (count < 0) {
@@ -4443,7 +4443,7 @@ static inline bool ixgbe_set_sriov_queues(struct ixgbe_adapter *adapter)
4443} 4443}
4444 4444
4445/* 4445/*
4446 * ixgbe_set_num_queues: Allocate queues for device, feature dependant 4446 * ixgbe_set_num_queues: Allocate queues for device, feature dependent
4447 * @adapter: board private structure to initialize 4447 * @adapter: board private structure to initialize
4448 * 4448 *
4449 * This is the top level queue allocation routine. The order here is very 4449 * This is the top level queue allocation routine. The order here is very
diff --git a/drivers/net/ixgbe/ixgbe_phy.c b/drivers/net/ixgbe/ixgbe_phy.c
index f72f705f6183..df5b8aa4795d 100644
--- a/drivers/net/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ixgbe/ixgbe_phy.c
@@ -1694,7 +1694,7 @@ static void ixgbe_i2c_bus_clear(struct ixgbe_hw *hw)
1694} 1694}
1695 1695
1696/** 1696/**
1697 * ixgbe_tn_check_overtemp - Checks if an overtemp occured. 1697 * ixgbe_tn_check_overtemp - Checks if an overtemp occurred.
1698 * @hw: pointer to hardware structure 1698 * @hw: pointer to hardware structure
1699 * 1699 *
1700 * Checks if the LASI temp alarm status was triggered due to overtemp 1700 * Checks if the LASI temp alarm status was triggered due to overtemp
diff --git a/drivers/net/ixgbe/ixgbe_x540.c b/drivers/net/ixgbe/ixgbe_x540.c
index f47e93fe32be..d9323c08f5c7 100644
--- a/drivers/net/ixgbe/ixgbe_x540.c
+++ b/drivers/net/ixgbe/ixgbe_x540.c
@@ -573,7 +573,7 @@ static s32 ixgbe_acquire_swfw_sync_X540(struct ixgbe_hw *hw, u16 mask)
573 * @hw: pointer to hardware structure 573 * @hw: pointer to hardware structure
574 * @mask: Mask to specify which semaphore to release 574 * @mask: Mask to specify which semaphore to release
575 * 575 *
576 * Releases the SWFW semaphore throught the SW_FW_SYNC register 576 * Releases the SWFW semaphore through the SW_FW_SYNC register
577 * for the specified function (CSR, PHY0, PHY1, EVM, Flash) 577 * for the specified function (CSR, PHY0, PHY1, EVM, Flash)
578 **/ 578 **/
579static void ixgbe_release_swfw_sync_X540(struct ixgbe_hw *hw, u16 mask) 579static void ixgbe_release_swfw_sync_X540(struct ixgbe_hw *hw, u16 mask)
diff --git a/drivers/net/ixgbevf/ixgbevf_main.c b/drivers/net/ixgbevf/ixgbevf_main.c
index 054ab05b7c6a..05fa7c85deed 100644
--- a/drivers/net/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ixgbevf/ixgbevf_main.c
@@ -1925,7 +1925,7 @@ static void ixgbevf_acquire_msix_vectors(struct ixgbevf_adapter *adapter,
1925} 1925}
1926 1926
1927/* 1927/*
1928 * ixgbevf_set_num_queues: Allocate queues for device, feature dependant 1928 * ixgbevf_set_num_queues: Allocate queues for device, feature dependent
1929 * @adapter: board private structure to initialize 1929 * @adapter: board private structure to initialize
1930 * 1930 *
1931 * This is the top level queue allocation routine. The order here is very 1931 * This is the top level queue allocation routine. The order here is very
diff --git a/drivers/net/ks8842.c b/drivers/net/ks8842.c
index efd44afeae83..f0d8346d0fa5 100644
--- a/drivers/net/ks8842.c
+++ b/drivers/net/ks8842.c
@@ -321,7 +321,7 @@ static void ks8842_reset_hw(struct ks8842_adapter *adapter)
321 /* RX 2 kb high watermark */ 321 /* RX 2 kb high watermark */
322 ks8842_write16(adapter, 0, 0x1000, REG_QRFCR); 322 ks8842_write16(adapter, 0, 0x1000, REG_QRFCR);
323 323
324 /* aggresive back off in half duplex */ 324 /* aggressive back off in half duplex */
325 ks8842_enable_bits(adapter, 32, 1 << 8, REG_SGCR1); 325 ks8842_enable_bits(adapter, 32, 1 << 8, REG_SGCR1);
326 326
327 /* enable no excessive collison drop */ 327 /* enable no excessive collison drop */
diff --git a/drivers/net/ks8851.c b/drivers/net/ks8851.c
index 0fa4a9887ba2..bcd9ba68c9f2 100644
--- a/drivers/net/ks8851.c
+++ b/drivers/net/ks8851.c
@@ -141,7 +141,7 @@ static int msg_enable;
141 * 141 *
142 * All these calls issue SPI transactions to access the chip's registers. They 142 * All these calls issue SPI transactions to access the chip's registers. They
143 * all require that the necessary lock is held to prevent accesses when the 143 * all require that the necessary lock is held to prevent accesses when the
144 * chip is busy transfering packet data (RX/TX FIFO accesses). 144 * chip is busy transferring packet data (RX/TX FIFO accesses).
145 */ 145 */
146 146
147/** 147/**
@@ -483,7 +483,7 @@ static void ks8851_rx_pkts(struct ks8851_net *ks)
483 * 483 *
484 * This form of operation would require us to hold the SPI bus' 484 * This form of operation would require us to hold the SPI bus'
485 * chipselect low during the entie transaction to avoid any 485 * chipselect low during the entie transaction to avoid any
486 * reset to the data stream comming from the chip. 486 * reset to the data stream coming from the chip.
487 */ 487 */
488 488
489 for (; rxfc != 0; rxfc--) { 489 for (; rxfc != 0; rxfc--) {
@@ -634,7 +634,7 @@ static void ks8851_irq_work(struct work_struct *work)
634 634
635/** 635/**
636 * calc_txlen - calculate size of message to send packet 636 * calc_txlen - calculate size of message to send packet
637 * @len: Lenght of data 637 * @len: Length of data
638 * 638 *
639 * Returns the size of the TXFIFO message needed to send 639 * Returns the size of the TXFIFO message needed to send
640 * this packet. 640 * this packet.
@@ -1472,7 +1472,7 @@ static int ks8851_phy_reg(int reg)
1472 * @reg: The register to read. 1472 * @reg: The register to read.
1473 * 1473 *
1474 * This call reads data from the PHY register specified in @reg. Since the 1474 * This call reads data from the PHY register specified in @reg. Since the
1475 * device does not support all the MII registers, the non-existant values 1475 * device does not support all the MII registers, the non-existent values
1476 * are always returned as zero. 1476 * are always returned as zero.
1477 * 1477 *
1478 * We return zero for unsupported registers as the MII code does not check 1478 * We return zero for unsupported registers as the MII code does not check
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index 2e2c69b24062..61631cace913 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -470,7 +470,7 @@ static int msg_enable;
470 * 470 *
471 * All these calls issue transactions to access the chip's registers. They 471 * All these calls issue transactions to access the chip's registers. They
472 * all require that the necessary lock is held to prevent accesses when the 472 * all require that the necessary lock is held to prevent accesses when the
473 * chip is busy transfering packet data (RX/TX FIFO accesses). 473 * chip is busy transferring packet data (RX/TX FIFO accesses).
474 */ 474 */
475 475
476/** 476/**
@@ -1364,7 +1364,7 @@ static int ks_phy_reg(int reg)
1364 * @reg: The register to read. 1364 * @reg: The register to read.
1365 * 1365 *
1366 * This call reads data from the PHY register specified in @reg. Since the 1366 * This call reads data from the PHY register specified in @reg. Since the
1367 * device does not support all the MII registers, the non-existant values 1367 * device does not support all the MII registers, the non-existent values
1368 * are always returned as zero. 1368 * are always returned as zero.
1369 * 1369 *
1370 * We return zero for unsupported registers as the MII code does not check 1370 * We return zero for unsupported registers as the MII code does not check
diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c
index da74db4a03d4..17b75e5f1b0a 100644
--- a/drivers/net/lib8390.c
+++ b/drivers/net/lib8390.c
@@ -35,7 +35,7 @@
35 Alexey Kuznetsov : use the 8390's six bit hash multicast filter. 35 Alexey Kuznetsov : use the 8390's six bit hash multicast filter.
36 Paul Gortmaker : tweak ANK's above multicast changes a bit. 36 Paul Gortmaker : tweak ANK's above multicast changes a bit.
37 Paul Gortmaker : update packet statistics for v2.1.x 37 Paul Gortmaker : update packet statistics for v2.1.x
38 Alan Cox : support arbitary stupid port mappings on the 38 Alan Cox : support arbitrary stupid port mappings on the
39 68K Macintosh. Support >16bit I/O spaces 39 68K Macintosh. Support >16bit I/O spaces
40 Paul Gortmaker : add kmod support for auto-loading of the 8390 40 Paul Gortmaker : add kmod support for auto-loading of the 8390
41 module by all drivers that require it. 41 module by all drivers that require it.
@@ -121,7 +121,7 @@ static void __NS8390_init(struct net_device *dev, int startp);
121/* 121/*
122 * SMP and the 8390 setup. 122 * SMP and the 8390 setup.
123 * 123 *
124 * The 8390 isnt exactly designed to be multithreaded on RX/TX. There is 124 * The 8390 isn't exactly designed to be multithreaded on RX/TX. There is
125 * a page register that controls bank and packet buffer access. We guard 125 * a page register that controls bank and packet buffer access. We guard
126 * this with ei_local->page_lock. Nobody should assume or set the page other 126 * this with ei_local->page_lock. Nobody should assume or set the page other
127 * than zero when the lock is not held. Lock holders must restore page 0 127 * than zero when the lock is not held. Lock holders must restore page 0
diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c
index 3698824744cb..385a95311cd2 100644
--- a/drivers/net/lp486e.c
+++ b/drivers/net/lp486e.c
@@ -27,7 +27,7 @@
27 27
28 Credits: 28 Credits:
29 Thanks to Murphy Software BV for letting me write this in their time. 29 Thanks to Murphy Software BV for letting me write this in their time.
30 Well, actually, I get payed doing this... 30 Well, actually, I get paid doing this...
31 (Also: see http://www.murphy.nl for murphy, and my homepage ~ard for 31 (Also: see http://www.murphy.nl for murphy, and my homepage ~ard for
32 more information on the Professional Workstation) 32 more information on the Professional Workstation)
33 33
diff --git a/drivers/net/meth.h b/drivers/net/meth.h
index a78dc1ca8c29..5b145c6bad60 100644
--- a/drivers/net/meth.h
+++ b/drivers/net/meth.h
@@ -144,7 +144,7 @@ typedef struct rx_packet {
144 /* Bits 22 through 28 are used to determine IPGR2 */ 144 /* Bits 22 through 28 are used to determine IPGR2 */
145 145
146#define METH_REV_SHIFT 29 /* Bits 29 through 31 are used to determine the revision */ 146#define METH_REV_SHIFT 29 /* Bits 29 through 31 are used to determine the revision */
147 /* 000: Inital revision */ 147 /* 000: Initial revision */
148 /* 001: First revision, Improved TX concatenation */ 148 /* 001: First revision, Improved TX concatenation */
149 149
150 150
@@ -193,7 +193,7 @@ typedef struct rx_packet {
193 /* 1: A TX message had the INT request bit set, the packet has been sent. */ 193 /* 1: A TX message had the INT request bit set, the packet has been sent. */
194#define METH_INT_TX_LINK_FAIL BIT(2) /* 0: No interrupt pending, 1: PHY has reported a link failure */ 194#define METH_INT_TX_LINK_FAIL BIT(2) /* 0: No interrupt pending, 1: PHY has reported a link failure */
195#define METH_INT_MEM_ERROR BIT(3) /* 0: No interrupt pending */ 195#define METH_INT_MEM_ERROR BIT(3) /* 0: No interrupt pending */
196 /* 1: A memory error occurred durring DMA, DMA stopped, Fatal */ 196 /* 1: A memory error occurred during DMA, DMA stopped, Fatal */
197#define METH_INT_TX_ABORT BIT(4) /* 0: No interrupt pending, 1: The TX aborted operation, DMA stopped, FATAL */ 197#define METH_INT_TX_ABORT BIT(4) /* 0: No interrupt pending, 1: The TX aborted operation, DMA stopped, FATAL */
198#define METH_INT_RX_THRESHOLD BIT(5) /* 0: No interrupt pending, 1: Selected receive threshold condition Valid */ 198#define METH_INT_RX_THRESHOLD BIT(5) /* 0: No interrupt pending, 1: Selected receive threshold condition Valid */
199#define METH_INT_RX_UNDERFLOW BIT(6) /* 0: No interrupt pending, 1: FIFO was empty, packet could not be queued */ 199#define METH_INT_RX_UNDERFLOW BIT(6) /* 0: No interrupt pending, 1: FIFO was empty, packet could not be queued */
diff --git a/drivers/net/mlx4/en_main.c b/drivers/net/mlx4/en_main.c
index 9317b61a75b8..9276b1b25586 100644
--- a/drivers/net/mlx4/en_main.c
+++ b/drivers/net/mlx4/en_main.c
@@ -236,7 +236,7 @@ static void *mlx4_en_add(struct mlx4_dev *dev)
236 goto err_mr; 236 goto err_mr;
237 } 237 }
238 238
239 /* Configure wich ports to start according to module parameters */ 239 /* Configure which ports to start according to module parameters */
240 mdev->port_cnt = 0; 240 mdev->port_cnt = 0;
241 mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH) 241 mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH)
242 mdev->port_cnt++; 242 mdev->port_cnt++;
diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/mlx4/en_netdev.c
index 4f158baa0246..77063f91c564 100644
--- a/drivers/net/mlx4/en_netdev.c
+++ b/drivers/net/mlx4/en_netdev.c
@@ -247,7 +247,7 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
247 priv->port); 247 priv->port);
248 if (err) 248 if (err)
249 en_err(priv, "Failed enabling " 249 en_err(priv, "Failed enabling "
250 "promiscous mode\n"); 250 "promiscuous mode\n");
251 251
252 /* Disable port multicast filter (unconditionally) */ 252 /* Disable port multicast filter (unconditionally) */
253 err = mlx4_SET_MCAST_FLTR(mdev->dev, priv->port, 0, 253 err = mlx4_SET_MCAST_FLTR(mdev->dev, priv->port, 0,
@@ -276,7 +276,7 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
276 } 276 }
277 277
278 /* 278 /*
279 * Not in promiscous mode 279 * Not in promiscuous mode
280 */ 280 */
281 281
282 if (priv->flags & MLX4_EN_FLAG_PROMISC) { 282 if (priv->flags & MLX4_EN_FLAG_PROMISC) {
@@ -292,14 +292,14 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
292 err = mlx4_unicast_promisc_remove(mdev->dev, priv->base_qpn, 292 err = mlx4_unicast_promisc_remove(mdev->dev, priv->base_qpn,
293 priv->port); 293 priv->port);
294 if (err) 294 if (err)
295 en_err(priv, "Failed disabling promiscous mode\n"); 295 en_err(priv, "Failed disabling promiscuous mode\n");
296 296
297 /* Disable Multicast promisc */ 297 /* Disable Multicast promisc */
298 if (priv->flags & MLX4_EN_FLAG_MC_PROMISC) { 298 if (priv->flags & MLX4_EN_FLAG_MC_PROMISC) {
299 err = mlx4_multicast_promisc_remove(mdev->dev, priv->base_qpn, 299 err = mlx4_multicast_promisc_remove(mdev->dev, priv->base_qpn,
300 priv->port); 300 priv->port);
301 if (err) 301 if (err)
302 en_err(priv, "Failed disabling multicast promiscous mode\n"); 302 en_err(priv, "Failed disabling multicast promiscuous mode\n");
303 priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC; 303 priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC;
304 } 304 }
305 305
@@ -331,7 +331,7 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
331 err = mlx4_multicast_promisc_remove(mdev->dev, priv->base_qpn, 331 err = mlx4_multicast_promisc_remove(mdev->dev, priv->base_qpn,
332 priv->port); 332 priv->port);
333 if (err) 333 if (err)
334 en_err(priv, "Failed disabling multicast promiscous mode\n"); 334 en_err(priv, "Failed disabling multicast promiscuous mode\n");
335 priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC; 335 priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC;
336 } 336 }
337 337
diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/mlx4/en_rx.c
index 05998ee297c9..cfd50bc49169 100644
--- a/drivers/net/mlx4/en_rx.c
+++ b/drivers/net/mlx4/en_rx.c
@@ -706,7 +706,7 @@ int mlx4_en_poll_rx_cq(struct napi_struct *napi, int budget)
706} 706}
707 707
708 708
709/* Calculate the last offset position that accomodates a full fragment 709/* Calculate the last offset position that accommodates a full fragment
710 * (assuming fagment size = stride-align) */ 710 * (assuming fagment size = stride-align) */
711static int mlx4_en_last_alloc_offset(struct mlx4_en_priv *priv, u16 stride, u16 align) 711static int mlx4_en_last_alloc_offset(struct mlx4_en_priv *priv, u16 stride, u16 align)
712{ 712{
diff --git a/drivers/net/mlx4/en_selftest.c b/drivers/net/mlx4/en_selftest.c
index 9c91a92da705..191a8dcd8a93 100644
--- a/drivers/net/mlx4/en_selftest.c
+++ b/drivers/net/mlx4/en_selftest.c
@@ -149,7 +149,7 @@ void mlx4_en_ex_selftest(struct net_device *dev, u32 *flags, u64 *buf)
149 149
150 netif_carrier_off(dev); 150 netif_carrier_off(dev);
151retry_tx: 151retry_tx:
152 /* Wait untill all tx queues are empty. 152 /* Wait until all tx queues are empty.
153 * there should not be any additional incoming traffic 153 * there should not be any additional incoming traffic
154 * since we turned the carrier off */ 154 * since we turned the carrier off */
155 msleep(200); 155 msleep(200);
diff --git a/drivers/net/mlx4/en_tx.c b/drivers/net/mlx4/en_tx.c
index 01feb8fd42ad..b229acf1855f 100644
--- a/drivers/net/mlx4/en_tx.c
+++ b/drivers/net/mlx4/en_tx.c
@@ -636,7 +636,7 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
636 if (unlikely(!real_size)) 636 if (unlikely(!real_size))
637 goto tx_drop; 637 goto tx_drop;
638 638
639 /* Allign descriptor to TXBB size */ 639 /* Align descriptor to TXBB size */
640 desc_size = ALIGN(real_size, TXBB_SIZE); 640 desc_size = ALIGN(real_size, TXBB_SIZE);
641 nr_txbb = desc_size / TXBB_SIZE; 641 nr_txbb = desc_size / TXBB_SIZE;
642 if (unlikely(nr_txbb > MAX_DESC_TXBBS)) { 642 if (unlikely(nr_txbb > MAX_DESC_TXBBS)) {
diff --git a/drivers/net/mlx4/mcg.c b/drivers/net/mlx4/mcg.c
index c6d336aed2d9..e63c37d6a115 100644
--- a/drivers/net/mlx4/mcg.c
+++ b/drivers/net/mlx4/mcg.c
@@ -222,7 +222,7 @@ static int existing_steering_entry(struct mlx4_dev *dev, u8 vep_num, u8 port,
222 222
223 /* the given qpn is listed as a promisc qpn 223 /* the given qpn is listed as a promisc qpn
224 * we need to add it as a duplicate to this entry 224 * we need to add it as a duplicate to this entry
225 * for future refernce */ 225 * for future references */
226 list_for_each_entry(dqp, &entry->duplicates, list) { 226 list_for_each_entry(dqp, &entry->duplicates, list) {
227 if (qpn == dqp->qpn) 227 if (qpn == dqp->qpn)
228 return 0; /* qp is already duplicated */ 228 return 0; /* qp is already duplicated */
diff --git a/drivers/net/mlx4/port.c b/drivers/net/mlx4/port.c
index eca7d8596f87..8856659fb43c 100644
--- a/drivers/net/mlx4/port.c
+++ b/drivers/net/mlx4/port.c
@@ -172,7 +172,7 @@ int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *qpn, u8 wrap)
172 } 172 }
173 173
174 if (mac == (MLX4_MAC_MASK & be64_to_cpu(table->entries[i]))) { 174 if (mac == (MLX4_MAC_MASK & be64_to_cpu(table->entries[i]))) {
175 /* MAC already registered, increase refernce count */ 175 /* MAC already registered, increase references count */
176 ++table->refs[i]; 176 ++table->refs[i];
177 goto out; 177 goto out;
178 } 178 }
@@ -360,7 +360,7 @@ int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index)
360 if (table->refs[i] && 360 if (table->refs[i] &&
361 (vlan == (MLX4_VLAN_MASK & 361 (vlan == (MLX4_VLAN_MASK &
362 be32_to_cpu(table->entries[i])))) { 362 be32_to_cpu(table->entries[i])))) {
363 /* Vlan already registered, increase refernce count */ 363 /* Vlan already registered, increase references count */
364 *index = i; 364 *index = i;
365 ++table->refs[i]; 365 ++table->refs[i];
366 goto out; 366 goto out;
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 673dc600c891..1446de59ae53 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -3702,7 +3702,7 @@ abort:
3702 3702
3703/* 3703/*
3704 * This function determines the number of slices supported. 3704 * This function determines the number of slices supported.
3705 * The number slices is the minumum of the number of CPUS, 3705 * The number slices is the minimum of the number of CPUS,
3706 * the number of MSI-X irqs supported, the number of slices 3706 * the number of MSI-X irqs supported, the number of slices
3707 * supported by the firmware 3707 * supported by the firmware
3708 */ 3708 */
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c
index a761076b69c3..53aeea4b536e 100644
--- a/drivers/net/myri_sbus.c
+++ b/drivers/net/myri_sbus.c
@@ -1009,7 +1009,7 @@ static int __devinit myri_sbus_probe(struct platform_device *op)
1009 1009
1010 /* Map in the MyriCOM register/localram set. */ 1010 /* Map in the MyriCOM register/localram set. */
1011 if (mp->eeprom.cpuvers < CPUVERS_4_0) { 1011 if (mp->eeprom.cpuvers < CPUVERS_4_0) {
1012 /* XXX Makes no sense, if control reg is non-existant this 1012 /* XXX Makes no sense, if control reg is non-existent this
1013 * XXX driver cannot function at all... maybe pre-4.0 is 1013 * XXX driver cannot function at all... maybe pre-4.0 is
1014 * XXX only a valid version for PCI cards? Ask feldy... 1014 * XXX only a valid version for PCI cards? Ask feldy...
1015 */ 1015 */
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 2fd39630b1e5..aa2813e06d00 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -203,7 +203,7 @@ skbuff at an offset of "+2", 16-byte aligning the IP header.
203IIId. Synchronization 203IIId. Synchronization
204 204
205Most operations are synchronized on the np->lock irq spinlock, except the 205Most operations are synchronized on the np->lock irq spinlock, except the
206recieve and transmit paths which are synchronised using a combination of 206receive and transmit paths which are synchronised using a combination of
207hardware descriptor ownership, disabling interrupts and NAPI poll scheduling. 207hardware descriptor ownership, disabling interrupts and NAPI poll scheduling.
208 208
209IVb. References 209IVb. References
@@ -726,7 +726,7 @@ static void move_int_phy(struct net_device *dev, int addr)
726 * There are two addresses we must avoid: 726 * There are two addresses we must avoid:
727 * - the address on the external phy that is used for transmission. 727 * - the address on the external phy that is used for transmission.
728 * - the address that we want to access. User space can access phys 728 * - the address that we want to access. User space can access phys
729 * on the mii bus with SIOCGMIIREG/SIOCSMIIREG, independant from the 729 * on the mii bus with SIOCGMIIREG/SIOCSMIIREG, independent from the
730 * phy that is used for transmission. 730 * phy that is used for transmission.
731 */ 731 */
732 732
@@ -1982,7 +1982,7 @@ static void init_ring(struct net_device *dev)
1982 1982
1983 np->rx_head_desc = &np->rx_ring[0]; 1983 np->rx_head_desc = &np->rx_ring[0];
1984 1984
1985 /* Please be carefull before changing this loop - at least gcc-2.95.1 1985 /* Please be careful before changing this loop - at least gcc-2.95.1
1986 * miscompiles it otherwise. 1986 * miscompiles it otherwise.
1987 */ 1987 */
1988 /* Initialize all Rx descriptors. */ 1988 /* Initialize all Rx descriptors. */
diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/netxen/netxen_nic_hdr.h
index d8bd73d7e296..dc1967c1f312 100644
--- a/drivers/net/netxen/netxen_nic_hdr.h
+++ b/drivers/net/netxen/netxen_nic_hdr.h
@@ -780,7 +780,7 @@ enum {
780 780
781/* 781/*
782 * capabilities register, can be used to selectively enable/disable features 782 * capabilities register, can be used to selectively enable/disable features
783 * for backward compability 783 * for backward compatibility
784 */ 784 */
785#define CRB_NIC_CAPABILITIES_HOST NETXEN_NIC_REG(0x1a8) 785#define CRB_NIC_CAPABILITIES_HOST NETXEN_NIC_REG(0x1a8)
786#define CRB_NIC_MSI_MODE_HOST NETXEN_NIC_REG(0x270) 786#define CRB_NIC_MSI_MODE_HOST NETXEN_NIC_REG(0x270)
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index a41b2cf4d917..6667e0667a88 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -512,7 +512,7 @@ static void ns83820_vlan_rx_register(struct net_device *ndev, struct vlan_group
512/* Packet Receiver 512/* Packet Receiver
513 * 513 *
514 * The hardware supports linked lists of receive descriptors for 514 * The hardware supports linked lists of receive descriptors for
515 * which ownership is transfered back and forth by means of an 515 * which ownership is transferred back and forth by means of an
516 * ownership bit. While the hardware does support the use of a 516 * ownership bit. While the hardware does support the use of a
517 * ring for receive descriptors, we only make use of a chain in 517 * ring for receive descriptors, we only make use of a chain in
518 * an attempt to reduce bus traffic under heavy load scenarios. 518 * an attempt to reduce bus traffic under heavy load scenarios.
@@ -1147,7 +1147,7 @@ again:
1147#ifdef NS83820_VLAN_ACCEL_SUPPORT 1147#ifdef NS83820_VLAN_ACCEL_SUPPORT
1148 if(vlan_tx_tag_present(skb)) { 1148 if(vlan_tx_tag_present(skb)) {
1149 /* fetch the vlan tag info out of the 1149 /* fetch the vlan tag info out of the
1150 * ancilliary data if the vlan code 1150 * ancillary data if the vlan code
1151 * is using hw vlan acceleration 1151 * is using hw vlan acceleration
1152 */ 1152 */
1153 short tag = vlan_tx_tag_get(skb); 1153 short tag = vlan_tx_tag_get(skb);
diff --git a/drivers/net/pch_gbe/pch_gbe.h b/drivers/net/pch_gbe/pch_gbe.h
index e1e33c80fb25..bf126e76fabf 100644
--- a/drivers/net/pch_gbe/pch_gbe.h
+++ b/drivers/net/pch_gbe/pch_gbe.h
@@ -351,7 +351,7 @@ struct pch_gbe_functions {
351}; 351};
352 352
353/** 353/**
354 * struct pch_gbe_mac_info - MAC infomation 354 * struct pch_gbe_mac_info - MAC information
355 * @addr[6]: Store the MAC address 355 * @addr[6]: Store the MAC address
356 * @fc: Mode of flow control 356 * @fc: Mode of flow control
357 * @fc_autoneg: Auto negotiation enable for flow control setting 357 * @fc_autoneg: Auto negotiation enable for flow control setting
@@ -375,7 +375,7 @@ struct pch_gbe_mac_info {
375}; 375};
376 376
377/** 377/**
378 * struct pch_gbe_phy_info - PHY infomation 378 * struct pch_gbe_phy_info - PHY information
379 * @addr: PHY address 379 * @addr: PHY address
380 * @id: PHY's identifier 380 * @id: PHY's identifier
381 * @revision: PHY's revision 381 * @revision: PHY's revision
@@ -393,7 +393,7 @@ struct pch_gbe_phy_info {
393/*! 393/*!
394 * @ingroup Gigabit Ether driver Layer 394 * @ingroup Gigabit Ether driver Layer
395 * @struct pch_gbe_bus_info 395 * @struct pch_gbe_bus_info
396 * @brief Bus infomation 396 * @brief Bus information
397 */ 397 */
398struct pch_gbe_bus_info { 398struct pch_gbe_bus_info {
399 u8 type; 399 u8 type;
@@ -404,7 +404,7 @@ struct pch_gbe_bus_info {
404/*! 404/*!
405 * @ingroup Gigabit Ether driver Layer 405 * @ingroup Gigabit Ether driver Layer
406 * @struct pch_gbe_hw 406 * @struct pch_gbe_hw
407 * @brief Hardware infomation 407 * @brief Hardware information
408 */ 408 */
409struct pch_gbe_hw { 409struct pch_gbe_hw {
410 void *back; 410 void *back;
@@ -462,7 +462,7 @@ struct pch_gbe_tx_desc {
462 462
463 463
464/** 464/**
465 * struct pch_gbe_buffer - Buffer infomation 465 * struct pch_gbe_buffer - Buffer information
466 * @skb: pointer to a socket buffer 466 * @skb: pointer to a socket buffer
467 * @dma: DMA address 467 * @dma: DMA address
468 * @time_stamp: time stamp 468 * @time_stamp: time stamp
@@ -477,7 +477,7 @@ struct pch_gbe_buffer {
477}; 477};
478 478
479/** 479/**
480 * struct pch_gbe_tx_ring - tx ring infomation 480 * struct pch_gbe_tx_ring - tx ring information
481 * @tx_lock: spinlock structs 481 * @tx_lock: spinlock structs
482 * @desc: pointer to the descriptor ring memory 482 * @desc: pointer to the descriptor ring memory
483 * @dma: physical address of the descriptor ring 483 * @dma: physical address of the descriptor ring
@@ -499,7 +499,7 @@ struct pch_gbe_tx_ring {
499}; 499};
500 500
501/** 501/**
502 * struct pch_gbe_rx_ring - rx ring infomation 502 * struct pch_gbe_rx_ring - rx ring information
503 * @desc: pointer to the descriptor ring memory 503 * @desc: pointer to the descriptor ring memory
504 * @dma: physical address of the descriptor ring 504 * @dma: physical address of the descriptor ring
505 * @size: length of descriptor ring in bytes 505 * @size: length of descriptor ring in bytes
diff --git a/drivers/net/pch_gbe/pch_gbe_ethtool.c b/drivers/net/pch_gbe/pch_gbe_ethtool.c
index c8c873b31a89..d2174a40d708 100644
--- a/drivers/net/pch_gbe/pch_gbe_ethtool.c
+++ b/drivers/net/pch_gbe/pch_gbe_ethtool.c
@@ -21,7 +21,7 @@
21#include "pch_gbe_api.h" 21#include "pch_gbe_api.h"
22 22
23/** 23/**
24 * pch_gbe_stats - Stats item infomation 24 * pch_gbe_stats - Stats item information
25 */ 25 */
26struct pch_gbe_stats { 26struct pch_gbe_stats {
27 char string[ETH_GSTRING_LEN]; 27 char string[ETH_GSTRING_LEN];
diff --git a/drivers/net/pch_gbe/pch_gbe_main.c b/drivers/net/pch_gbe/pch_gbe_main.c
index 50986840c99c..2ef2f9cdefa6 100644
--- a/drivers/net/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/pch_gbe/pch_gbe_main.c
@@ -1011,7 +1011,7 @@ static void pch_gbe_tx_queue(struct pch_gbe_adapter *adapter,
1011 tmp_skb->len = skb->len; 1011 tmp_skb->len = skb->len;
1012 memcpy(&tmp_skb->data[ETH_HLEN + 2], &skb->data[ETH_HLEN], 1012 memcpy(&tmp_skb->data[ETH_HLEN + 2], &skb->data[ETH_HLEN],
1013 (skb->len - ETH_HLEN)); 1013 (skb->len - ETH_HLEN));
1014 /*-- Set Buffer infomation --*/ 1014 /*-- Set Buffer information --*/
1015 buffer_info->length = tmp_skb->len; 1015 buffer_info->length = tmp_skb->len;
1016 buffer_info->dma = dma_map_single(&adapter->pdev->dev, tmp_skb->data, 1016 buffer_info->dma = dma_map_single(&adapter->pdev->dev, tmp_skb->data,
1017 buffer_info->length, 1017 buffer_info->length,
@@ -1540,7 +1540,7 @@ int pch_gbe_setup_tx_resources(struct pch_gbe_adapter *adapter,
1540 size = (int)sizeof(struct pch_gbe_buffer) * tx_ring->count; 1540 size = (int)sizeof(struct pch_gbe_buffer) * tx_ring->count;
1541 tx_ring->buffer_info = vzalloc(size); 1541 tx_ring->buffer_info = vzalloc(size);
1542 if (!tx_ring->buffer_info) { 1542 if (!tx_ring->buffer_info) {
1543 pr_err("Unable to allocate memory for the buffer infomation\n"); 1543 pr_err("Unable to allocate memory for the buffer information\n");
1544 return -ENOMEM; 1544 return -ENOMEM;
1545 } 1545 }
1546 1546
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c
index 1766dc4f07e1..c0f23376a462 100644
--- a/drivers/net/pci-skeleton.c
+++ b/drivers/net/pci-skeleton.c
@@ -214,7 +214,7 @@ static struct {
214 { "SMC1211TX EZCard 10/100 (RealTek RTL8139)" }, 214 { "SMC1211TX EZCard 10/100 (RealTek RTL8139)" },
215/* { MPX5030, "Accton MPX5030 (RealTek RTL8139)" },*/ 215/* { MPX5030, "Accton MPX5030 (RealTek RTL8139)" },*/
216 { "Delta Electronics 8139 10/100BaseTX" }, 216 { "Delta Electronics 8139 10/100BaseTX" },
217 { "Addtron Technolgy 8139 10/100BaseTX" }, 217 { "Addtron Technology 8139 10/100BaseTX" },
218}; 218};
219 219
220 220
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index 321b12f82645..81ac330f931d 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -950,7 +950,7 @@ static struct net_device_stats *el3_get_stats(struct net_device *dev)
950} 950}
951 951
952/* Update statistics. 952/* Update statistics.
953 Suprisingly this need not be run single-threaded, but it effectively is. 953 Surprisingly this need not be run single-threaded, but it effectively is.
954 The counters clear when read, so the adds must merely be atomic. 954 The counters clear when read, so the adds must merely be atomic.
955 */ 955 */
956static void update_stats(struct net_device *dev) 956static void update_stats(struct net_device *dev)
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index d3cb77205863..3077d72e8222 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -780,7 +780,7 @@ module_exit(exit_axnet_cs);
780 Alexey Kuznetsov : use the 8390's six bit hash multicast filter. 780 Alexey Kuznetsov : use the 8390's six bit hash multicast filter.
781 Paul Gortmaker : tweak ANK's above multicast changes a bit. 781 Paul Gortmaker : tweak ANK's above multicast changes a bit.
782 Paul Gortmaker : update packet statistics for v2.1.x 782 Paul Gortmaker : update packet statistics for v2.1.x
783 Alan Cox : support arbitary stupid port mappings on the 783 Alan Cox : support arbitrary stupid port mappings on the
784 68K Macintosh. Support >16bit I/O spaces 784 68K Macintosh. Support >16bit I/O spaces
785 Paul Gortmaker : add kmod support for auto-loading of the 8390 785 Paul Gortmaker : add kmod support for auto-loading of the 8390
786 module by all drivers that require it. 786 module by all drivers that require it.
@@ -842,7 +842,7 @@ static void do_set_multicast_list(struct net_device *dev);
842/* 842/*
843 * SMP and the 8390 setup. 843 * SMP and the 8390 setup.
844 * 844 *
845 * The 8390 isnt exactly designed to be multithreaded on RX/TX. There is 845 * The 8390 isn't exactly designed to be multithreaded on RX/TX. There is
846 * a page register that controls bank and packet buffer access. We guard 846 * a page register that controls bank and packet buffer access. We guard
847 * this with ei_local->page_lock. Nobody should assume or set the page other 847 * this with ei_local->page_lock. Nobody should assume or set the page other
848 * than zero when the lock is not held. Lock holders must restore page 0 848 * than zero when the lock is not held. Lock holders must restore page 0
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index 8a9ff5318923..108591756440 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -1264,7 +1264,7 @@ static netdev_tx_t smc_start_xmit(struct sk_buff *skb,
1264 1264
1265/*====================================================================== 1265/*======================================================================
1266 1266
1267 Handle a Tx anomolous event. Entered while in Window 2. 1267 Handle a Tx anomalous event. Entered while in Window 2.
1268 1268
1269======================================================================*/ 1269======================================================================*/
1270 1270
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index aee3bb0358bf..768037602dff 100644
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -1651,7 +1651,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
1651 /* 1651 /*
1652 * On selected chips turn on the BCR18:NOUFLO bit. This stops transmit 1652 * On selected chips turn on the BCR18:NOUFLO bit. This stops transmit
1653 * starting until the packet is loaded. Strike one for reliability, lose 1653 * starting until the packet is loaded. Strike one for reliability, lose
1654 * one for latency - although on PCI this isnt a big loss. Older chips 1654 * one for latency - although on PCI this isn't a big loss. Older chips
1655 * have FIFO's smaller than a packet, so you can't do this. 1655 * have FIFO's smaller than a packet, so you can't do this.
1656 * Turn on BCR18:BurstRdEn and BCR18:BurstWrEn. 1656 * Turn on BCR18:BurstRdEn and BCR18:BurstWrEn.
1657 */ 1657 */
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index e870c0698bbe..ff109fe5af6b 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -538,7 +538,7 @@ EXPORT_SYMBOL(phy_detach);
538/* Generic PHY support and helper functions */ 538/* Generic PHY support and helper functions */
539 539
540/** 540/**
541 * genphy_config_advert - sanitize and advertise auto-negotation parameters 541 * genphy_config_advert - sanitize and advertise auto-negotiation parameters
542 * @phydev: target phy_device struct 542 * @phydev: target phy_device struct
543 * 543 *
544 * Description: Writes MII_ADVERTISE with the appropriate values, 544 * Description: Writes MII_ADVERTISE with the appropriate values,
@@ -687,7 +687,7 @@ int genphy_config_aneg(struct phy_device *phydev)
687 return result; 687 return result;
688 688
689 if (result == 0) { 689 if (result == 0) {
690 /* Advertisment hasn't changed, but maybe aneg was never on to 690 /* Advertisement hasn't changed, but maybe aneg was never on to
691 * begin with? Or maybe phy was isolated? */ 691 * begin with? Or maybe phy was isolated? */
692 int ctl = phy_read(phydev, MII_BMCR); 692 int ctl = phy_read(phydev, MII_BMCR);
693 693
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 9f6d670748d1..4609bc0e2f56 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -1448,7 +1448,7 @@ static int ppp_mp_explode(struct ppp *ppp, struct sk_buff *skb)
1448 1448
1449 /* 1449 /*
1450 *check if we are on the last channel or 1450 *check if we are on the last channel or
1451 *we exceded the lenght of the data to 1451 *we exceded the length of the data to
1452 *fragment 1452 *fragment
1453 */ 1453 */
1454 if ((nfree <= 0) || (flen > len)) 1454 if ((nfree <= 0) || (flen > len))
diff --git a/drivers/net/ppp_synctty.c b/drivers/net/ppp_synctty.c
index 4e6b72f57de8..2573f525f11c 100644
--- a/drivers/net/ppp_synctty.c
+++ b/drivers/net/ppp_synctty.c
@@ -178,7 +178,7 @@ ppp_print_buffer (const char *name, const __u8 *buf, int count)
178 * way to fix this is to use a rwlock in the tty struct, but for now 178 * way to fix this is to use a rwlock in the tty struct, but for now
179 * we use a single global rwlock for all ttys in ppp line discipline. 179 * we use a single global rwlock for all ttys in ppp line discipline.
180 * 180 *
181 * FIXME: Fixed in tty_io nowdays. 181 * FIXME: Fixed in tty_io nowadays.
182 */ 182 */
183static DEFINE_RWLOCK(disc_data_lock); 183static DEFINE_RWLOCK(disc_data_lock);
184 184
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index 78c0e3c9b2b5..693aaef4e3ce 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -115,7 +115,7 @@ struct pppoe_net {
115 * 2) Session stage (MAC and SID are known) 115 * 2) Session stage (MAC and SID are known)
116 * 116 *
117 * Ethernet frames have a special tag for this but 117 * Ethernet frames have a special tag for this but
118 * we use simplier approach based on session id 118 * we use simpler approach based on session id
119 */ 119 */
120static inline bool stage_session(__be16 sid) 120static inline bool stage_session(__be16 sid)
121{ 121{
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c
index 5ecfa4b1e758..ffdf7349ef7a 100644
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
@@ -632,7 +632,7 @@ static inline void gelic_card_enable_rxdmac(struct gelic_card *card)
632 * @card: card structure 632 * @card: card structure
633 * 633 *
634 * gelic_card_disable_rxdmac terminates processing on the DMA controller by 634 * gelic_card_disable_rxdmac terminates processing on the DMA controller by
635 * turing off DMA and issueing a force end 635 * turing off DMA and issuing a force end
636 */ 636 */
637static inline void gelic_card_disable_rxdmac(struct gelic_card *card) 637static inline void gelic_card_disable_rxdmac(struct gelic_card *card)
638{ 638{
@@ -650,7 +650,7 @@ static inline void gelic_card_disable_rxdmac(struct gelic_card *card)
650 * @card: card structure 650 * @card: card structure
651 * 651 *
652 * gelic_card_disable_txdmac terminates processing on the DMA controller by 652 * gelic_card_disable_txdmac terminates processing on the DMA controller by
653 * turing off DMA and issueing a force end 653 * turing off DMA and issuing a force end
654 */ 654 */
655static inline void gelic_card_disable_txdmac(struct gelic_card *card) 655static inline void gelic_card_disable_txdmac(struct gelic_card *card)
656{ 656{
diff --git a/drivers/net/ps3_gelic_net.h b/drivers/net/ps3_gelic_net.h
index 32521ae5e824..fadadf9097a3 100644
--- a/drivers/net/ps3_gelic_net.h
+++ b/drivers/net/ps3_gelic_net.h
@@ -117,7 +117,7 @@ enum gelic_descr_rx_error {
117 GELIC_DESCR_RXDATAERR = 0x00020000, /* IP packet format error */ 117 GELIC_DESCR_RXDATAERR = 0x00020000, /* IP packet format error */
118 GELIC_DESCR_RXCALERR = 0x00010000, /* cariier extension length 118 GELIC_DESCR_RXCALERR = 0x00010000, /* cariier extension length
119 * error */ 119 * error */
120 GELIC_DESCR_RXCREXERR = 0x00008000, /* carrier extention error */ 120 GELIC_DESCR_RXCREXERR = 0x00008000, /* carrier extension error */
121 GELIC_DESCR_RXMLTCST = 0x00004000, /* multicast address frame */ 121 GELIC_DESCR_RXMLTCST = 0x00004000, /* multicast address frame */
122 /* bit 13..0 reserved */ 122 /* bit 13..0 reserved */
123}; 123};
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c
index 4a624a29393f..b5ae29d20f2e 100644
--- a/drivers/net/ps3_gelic_wireless.c
+++ b/drivers/net/ps3_gelic_wireless.c
@@ -814,7 +814,7 @@ static int gelic_wl_set_auth(struct net_device *netdev,
814 * you will not decide suitable cipher from 814 * you will not decide suitable cipher from
815 * its beacon. 815 * its beacon.
816 * You should have knowledge about the AP's 816 * You should have knowledge about the AP's
817 * cipher infomation in other method prior to 817 * cipher information in other method prior to
818 * the association. 818 * the association.
819 */ 819 */
820 if (!precise_ie()) 820 if (!precise_ie())
diff --git a/drivers/net/pxa168_eth.c b/drivers/net/pxa168_eth.c
index 1b63c8aef121..89f7540d90f9 100644
--- a/drivers/net/pxa168_eth.c
+++ b/drivers/net/pxa168_eth.c
@@ -462,7 +462,7 @@ static u32 hash_function(unsigned char *mac_addr_orig)
462 * pep - ETHERNET . 462 * pep - ETHERNET .
463 * mac_addr - MAC address. 463 * mac_addr - MAC address.
464 * skip - if 1, skip this address.Used in case of deleting an entry which is a 464 * skip - if 1, skip this address.Used in case of deleting an entry which is a
465 * part of chain in the hash table.We cant just delete the entry since 465 * part of chain in the hash table.We can't just delete the entry since
466 * that will break the chain.We need to defragment the tables time to 466 * that will break the chain.We need to defragment the tables time to
467 * time. 467 * time.
468 * rd - 0 Discard packet upon match. 468 * rd - 0 Discard packet upon match.
diff --git a/drivers/net/qla3xxx.h b/drivers/net/qla3xxx.h
index 3362a661248c..73e234366a82 100644
--- a/drivers/net/qla3xxx.h
+++ b/drivers/net/qla3xxx.h
@@ -770,7 +770,7 @@ enum {
770 FM93C56A_WDS = 0x0, 770 FM93C56A_WDS = 0x0,
771 FM93C56A_ERASE = 0x3, 771 FM93C56A_ERASE = 0x3,
772 FM93C56A_ERASE_ALL = 0x0, 772 FM93C56A_ERASE_ALL = 0x0,
773/* Command Extentions */ 773/* Command Extensions */
774 FM93C56A_WEN_EXT = 0x3, 774 FM93C56A_WEN_EXT = 0x3,
775 FM93C56A_WRITE_ALL_EXT = 0x1, 775 FM93C56A_WRITE_ALL_EXT = 0x1,
776 FM93C56A_WDS_EXT = 0x0, 776 FM93C56A_WDS_EXT = 0x0,
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 49bfa5813068..5bb311945436 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -660,7 +660,7 @@ static void ql_disable_interrupts(struct ql_adapter *qdev)
660/* If we're running with multiple MSI-X vectors then we enable on the fly. 660/* If we're running with multiple MSI-X vectors then we enable on the fly.
661 * Otherwise, we may have multiple outstanding workers and don't want to 661 * Otherwise, we may have multiple outstanding workers and don't want to
662 * enable until the last one finishes. In this case, the irq_cnt gets 662 * enable until the last one finishes. In this case, the irq_cnt gets
663 * incremented everytime we queue a worker and decremented everytime 663 * incremented every time we queue a worker and decremented every time
664 * a worker finishes. Once it hits zero we enable the interrupt. 664 * a worker finishes. Once it hits zero we enable the interrupt.
665 */ 665 */
666u32 ql_enable_completion_interrupt(struct ql_adapter *qdev, u32 intr) 666u32 ql_enable_completion_interrupt(struct ql_adapter *qdev, u32 intr)
@@ -3299,7 +3299,7 @@ msi:
3299 * will service it. An example would be if there are 3299 * will service it. An example would be if there are
3300 * 2 vectors (so 2 RSS rings) and 8 TX completion rings. 3300 * 2 vectors (so 2 RSS rings) and 8 TX completion rings.
3301 * This would mean that vector 0 would service RSS ring 0 3301 * This would mean that vector 0 would service RSS ring 0
3302 * and TX competion rings 0,1,2 and 3. Vector 1 would 3302 * and TX completion rings 0,1,2 and 3. Vector 1 would
3303 * service RSS ring 1 and TX completion rings 4,5,6 and 7. 3303 * service RSS ring 1 and TX completion rings 4,5,6 and 7.
3304 */ 3304 */
3305static void ql_set_tx_vect(struct ql_adapter *qdev) 3305static void ql_set_tx_vect(struct ql_adapter *qdev)
@@ -4152,7 +4152,7 @@ static int ql_change_rx_buffers(struct ql_adapter *qdev)
4152 int i, status; 4152 int i, status;
4153 u32 lbq_buf_len; 4153 u32 lbq_buf_len;
4154 4154
4155 /* Wait for an oustanding reset to complete. */ 4155 /* Wait for an outstanding reset to complete. */
4156 if (!test_bit(QL_ADAPTER_UP, &qdev->flags)) { 4156 if (!test_bit(QL_ADAPTER_UP, &qdev->flags)) {
4157 int i = 3; 4157 int i = 3;
4158 while (i-- && !test_bit(QL_ADAPTER_UP, &qdev->flags)) { 4158 while (i-- && !test_bit(QL_ADAPTER_UP, &qdev->flags)) {
@@ -4281,7 +4281,7 @@ static void qlge_set_multicast_list(struct net_device *ndev)
4281 if (ql_set_routing_reg 4281 if (ql_set_routing_reg
4282 (qdev, RT_IDX_PROMISCUOUS_SLOT, RT_IDX_VALID, 1)) { 4282 (qdev, RT_IDX_PROMISCUOUS_SLOT, RT_IDX_VALID, 1)) {
4283 netif_err(qdev, hw, qdev->ndev, 4283 netif_err(qdev, hw, qdev->ndev,
4284 "Failed to set promiscous mode.\n"); 4284 "Failed to set promiscuous mode.\n");
4285 } else { 4285 } else {
4286 set_bit(QL_PROMISCUOUS, &qdev->flags); 4286 set_bit(QL_PROMISCUOUS, &qdev->flags);
4287 } 4287 }
@@ -4291,7 +4291,7 @@ static void qlge_set_multicast_list(struct net_device *ndev)
4291 if (ql_set_routing_reg 4291 if (ql_set_routing_reg
4292 (qdev, RT_IDX_PROMISCUOUS_SLOT, RT_IDX_VALID, 0)) { 4292 (qdev, RT_IDX_PROMISCUOUS_SLOT, RT_IDX_VALID, 0)) {
4293 netif_err(qdev, hw, qdev->ndev, 4293 netif_err(qdev, hw, qdev->ndev,
4294 "Failed to clear promiscous mode.\n"); 4294 "Failed to clear promiscuous mode.\n");
4295 } else { 4295 } else {
4296 clear_bit(QL_PROMISCUOUS, &qdev->flags); 4296 clear_bit(QL_PROMISCUOUS, &qdev->flags);
4297 } 4297 }
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index e3ebd90ae651..200a363c3bf5 100644
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -535,7 +535,7 @@ static int r6040_rx(struct net_device *dev, int limit)
535 /* RX dribble */ 535 /* RX dribble */
536 if (err & DSC_RX_ERR_DRI) 536 if (err & DSC_RX_ERR_DRI)
537 dev->stats.rx_frame_errors++; 537 dev->stats.rx_frame_errors++;
538 /* Buffer lenght exceeded */ 538 /* Buffer length exceeded */
539 if (err & DSC_RX_ERR_BUF) 539 if (err & DSC_RX_ERR_BUF)
540 dev->stats.rx_length_errors++; 540 dev->stats.rx_length_errors++;
541 /* Packet too long */ 541 /* Packet too long */
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 356e74d20b80..337bdcd5abc9 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -2353,7 +2353,7 @@ static int start_nic(struct s2io_nic *nic)
2353 2353
2354 if (s2io_link_fault_indication(nic) == MAC_RMAC_ERR_TIMER) { 2354 if (s2io_link_fault_indication(nic) == MAC_RMAC_ERR_TIMER) {
2355 /* 2355 /*
2356 * Dont see link state interrupts initally on some switches, 2356 * Dont see link state interrupts initially on some switches,
2357 * so directly scheduling the link state task here. 2357 * so directly scheduling the link state task here.
2358 */ 2358 */
2359 schedule_work(&nic->set_link_task); 2359 schedule_work(&nic->set_link_task);
@@ -3563,7 +3563,7 @@ static void s2io_reset(struct s2io_nic *sp)
3563 } 3563 }
3564 3564
3565 /* 3565 /*
3566 * Clear spurious ECC interrupts that would have occured on 3566 * Clear spurious ECC interrupts that would have occurred on
3567 * XFRAME II cards after reset. 3567 * XFRAME II cards after reset.
3568 */ 3568 */
3569 if (sp->device_type == XFRAME_II_DEVICE) { 3569 if (sp->device_type == XFRAME_II_DEVICE) {
@@ -4065,7 +4065,7 @@ static int s2io_close(struct net_device *dev)
4065 * Description : 4065 * Description :
4066 * This function is the Tx entry point of the driver. S2IO NIC supports 4066 * This function is the Tx entry point of the driver. S2IO NIC supports
4067 * certain protocol assist features on Tx side, namely CSO, S/G, LSO. 4067 * certain protocol assist features on Tx side, namely CSO, S/G, LSO.
4068 * NOTE: when device cant queue the pkt,just the trans_start variable will 4068 * NOTE: when device can't queue the pkt,just the trans_start variable will
4069 * not be upadted. 4069 * not be upadted.
4070 * Return value: 4070 * Return value:
4071 * 0 on success & 1 on failure. 4071 * 0 on success & 1 on failure.
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index 7d160306b651..2d144979f6f8 100644
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -376,7 +376,7 @@ static const u16 fifo_selector[MAX_TX_FIFOS] = {0, 1, 3, 3, 7, 7, 7, 7};
376/* Maintains Per FIFO related information. */ 376/* Maintains Per FIFO related information. */
377struct tx_fifo_config { 377struct tx_fifo_config {
378#define MAX_AVAILABLE_TXDS 8192 378#define MAX_AVAILABLE_TXDS 8192
379 u32 fifo_len; /* specifies len of FIFO upto 8192, ie no of TxDLs */ 379 u32 fifo_len; /* specifies len of FIFO up to 8192, ie no of TxDLs */
380/* Priority definition */ 380/* Priority definition */
381#define TX_FIFO_PRI_0 0 /*Highest */ 381#define TX_FIFO_PRI_0 0 /*Highest */
382#define TX_FIFO_PRI_1 1 382#define TX_FIFO_PRI_1 1
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index 734fcfb52e85..d96b23769bd1 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -692,7 +692,7 @@ static int falcon_gmii_wait(struct efx_nic *efx)
692 efx_oword_t md_stat; 692 efx_oword_t md_stat;
693 int count; 693 int count;
694 694
695 /* wait upto 50ms - taken max from datasheet */ 695 /* wait up to 50ms - taken max from datasheet */
696 for (count = 0; count < 5000; count++) { 696 for (count = 0; count < 5000; count++) {
697 efx_reado(efx, &md_stat, FR_AB_MD_STAT); 697 efx_reado(efx, &md_stat, FR_AB_MD_STAT);
698 if (EFX_OWORD_FIELD(md_stat, FRF_AB_MD_BSY) == 0) { 698 if (EFX_OWORD_FIELD(md_stat, FRF_AB_MD_BSY) == 0) {
@@ -1221,7 +1221,7 @@ static int falcon_reset_sram(struct efx_nic *efx)
1221 1221
1222 return 0; 1222 return 0;
1223 } 1223 }
1224 } while (++count < 20); /* wait upto 0.4 sec */ 1224 } while (++count < 20); /* wait up to 0.4 sec */
1225 1225
1226 netif_err(efx, hw, efx->net_dev, "timed out waiting for SRAM reset\n"); 1226 netif_err(efx, hw, efx->net_dev, "timed out waiting for SRAM reset\n");
1227 return -ETIMEDOUT; 1227 return -ETIMEDOUT;
diff --git a/drivers/net/sfc/mcdi.c b/drivers/net/sfc/mcdi.c
index 5e118f0d2479..d98479030ef2 100644
--- a/drivers/net/sfc/mcdi.c
+++ b/drivers/net/sfc/mcdi.c
@@ -453,7 +453,7 @@ static void efx_mcdi_ev_death(struct efx_nic *efx, int rc)
453 * 453 *
454 * There's a race here with efx_mcdi_rpc(), because we might receive 454 * There's a race here with efx_mcdi_rpc(), because we might receive
455 * a REBOOT event *before* the request has been copied out. In polled 455 * a REBOOT event *before* the request has been copied out. In polled
456 * mode (during startup) this is irrelevent, because efx_mcdi_complete() 456 * mode (during startup) this is irrelevant, because efx_mcdi_complete()
457 * is ignored. In event mode, this condition is just an edge-case of 457 * is ignored. In event mode, this condition is just an edge-case of
458 * receiving a REBOOT event after posting the MCDI request. Did the mc 458 * receiving a REBOOT event after posting the MCDI request. Did the mc
459 * reboot before or after the copyout? The best we can do always is 459 * reboot before or after the copyout? The best we can do always is
diff --git a/drivers/net/sfc/mcdi_pcol.h b/drivers/net/sfc/mcdi_pcol.h
index b86a15f221ad..41fe06fa0600 100644
--- a/drivers/net/sfc/mcdi_pcol.h
+++ b/drivers/net/sfc/mcdi_pcol.h
@@ -103,7 +103,7 @@
103 * 103 *
104 * If Code==CMDDONE, then the fields are further interpreted as: 104 * If Code==CMDDONE, then the fields are further interpreted as:
105 * 105 *
106 * - LEVEL==INFO Command succeded 106 * - LEVEL==INFO Command succeeded
107 * - LEVEL==ERR Command failed 107 * - LEVEL==ERR Command failed
108 * 108 *
109 * 0 8 16 24 32 109 * 0 8 16 24 32
@@ -572,7 +572,7 @@
572 (4*(_numwords)) 572 (4*(_numwords))
573 573
574/* MC_CMD_SET_RAND_SEED: 574/* MC_CMD_SET_RAND_SEED:
575 * Set the 16byte seed for the MC psuedo-random generator 575 * Set the 16byte seed for the MC pseudo-random generator
576 */ 576 */
577#define MC_CMD_SET_RAND_SEED 0x1a 577#define MC_CMD_SET_RAND_SEED 0x1a
578#define MC_CMD_SET_RAND_SEED_IN_LEN 16 578#define MC_CMD_SET_RAND_SEED_IN_LEN 16
@@ -1162,7 +1162,7 @@
1162#define MC_CMD_MAC_STATS_CMD_CLEAR_WIDTH 1 1162#define MC_CMD_MAC_STATS_CMD_CLEAR_WIDTH 1
1163#define MC_CMD_MAC_STATS_CMD_PERIODIC_CHANGE_LBN 2 1163#define MC_CMD_MAC_STATS_CMD_PERIODIC_CHANGE_LBN 2
1164#define MC_CMD_MAC_STATS_CMD_PERIODIC_CHANGE_WIDTH 1 1164#define MC_CMD_MAC_STATS_CMD_PERIODIC_CHANGE_WIDTH 1
1165/* Remaining PERIOD* fields only relevent when PERIODIC_CHANGE is set */ 1165/* Remaining PERIOD* fields only relevant when PERIODIC_CHANGE is set */
1166#define MC_CMD_MAC_STATS_CMD_PERIODIC_ENABLE_LBN 3 1166#define MC_CMD_MAC_STATS_CMD_PERIODIC_ENABLE_LBN 3
1167#define MC_CMD_MAC_STATS_CMD_PERIODIC_ENABLE_WIDTH 1 1167#define MC_CMD_MAC_STATS_CMD_PERIODIC_ENABLE_WIDTH 1
1168#define MC_CMD_MAC_STATS_CMD_PERIODIC_CLEAR_LBN 4 1168#define MC_CMD_MAC_STATS_CMD_PERIODIC_CLEAR_LBN 4
diff --git a/drivers/net/sfc/mcdi_phy.c b/drivers/net/sfc/mcdi_phy.c
index ec3f740f5465..7e3c65b0c99f 100644
--- a/drivers/net/sfc/mcdi_phy.c
+++ b/drivers/net/sfc/mcdi_phy.c
@@ -449,7 +449,7 @@ void efx_mcdi_phy_check_fcntl(struct efx_nic *efx, u32 lpa)
449 struct efx_mcdi_phy_data *phy_cfg = efx->phy_data; 449 struct efx_mcdi_phy_data *phy_cfg = efx->phy_data;
450 u32 rmtadv; 450 u32 rmtadv;
451 451
452 /* The link partner capabilities are only relevent if the 452 /* The link partner capabilities are only relevant if the
453 * link supports flow control autonegotiation */ 453 * link supports flow control autonegotiation */
454 if (~phy_cfg->supported_cap & (1 << MC_CMD_PHY_CAP_AN_LBN)) 454 if (~phy_cfg->supported_cap & (1 << MC_CMD_PHY_CAP_AN_LBN))
455 return; 455 return;
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h
index 215d5c51bfa0..9ffa9a6b55a0 100644
--- a/drivers/net/sfc/net_driver.h
+++ b/drivers/net/sfc/net_driver.h
@@ -670,7 +670,7 @@ struct efx_filter_state;
670 * @irq_zero_count: Number of legacy IRQs seen with queue flags == 0 670 * @irq_zero_count: Number of legacy IRQs seen with queue flags == 0
671 * @fatal_irq_level: IRQ level (bit number) used for serious errors 671 * @fatal_irq_level: IRQ level (bit number) used for serious errors
672 * @mtd_list: List of MTDs attached to the NIC 672 * @mtd_list: List of MTDs attached to the NIC
673 * @nic_data: Hardware dependant state 673 * @nic_data: Hardware dependent state
674 * @mac_lock: MAC access lock. Protects @port_enabled, @phy_mode, 674 * @mac_lock: MAC access lock. Protects @port_enabled, @phy_mode,
675 * @port_inhibited, efx_monitor() and efx_reconfigure_port() 675 * @port_inhibited, efx_monitor() and efx_reconfigure_port()
676 * @port_enabled: Port enabled indicator. 676 * @port_enabled: Port enabled indicator.
diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c
index 3a0cc63428ee..dd03bf619988 100644
--- a/drivers/net/sgiseeq.c
+++ b/drivers/net/sgiseeq.c
@@ -33,7 +33,7 @@ static char *sgiseeqstr = "SGI Seeq8003";
33 * with that in mind, I've decided to make this driver look completely like a 33 * with that in mind, I've decided to make this driver look completely like a
34 * stupid Lance from a driver architecture perspective. Only difference is that 34 * stupid Lance from a driver architecture perspective. Only difference is that
35 * here our "ring buffer" looks and acts like a real Lance one does but is 35 * here our "ring buffer" looks and acts like a real Lance one does but is
36 * layed out like how the HPC DMA and the Seeq want it to. You'd be surprised 36 * laid out like how the HPC DMA and the Seeq want it to. You'd be surprised
37 * how a stupid idea like this can pay off in performance, not to mention 37 * how a stupid idea like this can pay off in performance, not to mention
38 * making this driver 2,000 times easier to write. ;-) 38 * making this driver 2,000 times easier to write. ;-)
39 */ 39 */
@@ -77,7 +77,7 @@ struct sgiseeq_tx_desc {
77}; 77};
78 78
79/* 79/*
80 * Warning: This structure is layed out in a certain way because HPC dma 80 * Warning: This structure is laid out in a certain way because HPC dma
81 * descriptors must be 8-byte aligned. So don't touch this without 81 * descriptors must be 8-byte aligned. So don't touch this without
82 * some care. 82 * some care.
83 */ 83 */
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index e9e7a530552c..8a72a979ee71 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -1875,7 +1875,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
1875 if (ret) 1875 if (ret)
1876 goto out_unregister; 1876 goto out_unregister;
1877 1877
1878 /* print device infomation */ 1878 /* print device information */
1879 pr_info("Base address at 0x%x, %pM, IRQ %d.\n", 1879 pr_info("Base address at 0x%x, %pM, IRQ %d.\n",
1880 (u32)ndev->base_addr, ndev->dev_addr, ndev->irq); 1880 (u32)ndev->base_addr, ndev->dev_addr, ndev->irq);
1881 1881
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index 3406ed870917..b436e007eea0 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -93,7 +93,7 @@ enum sis190_registers {
93 IntrStatus = 0x20, 93 IntrStatus = 0x20,
94 IntrMask = 0x24, 94 IntrMask = 0x24,
95 IntrControl = 0x28, 95 IntrControl = 0x28,
96 IntrTimer = 0x2c, // unused (Interupt Timer) 96 IntrTimer = 0x2c, // unused (Interrupt Timer)
97 PMControl = 0x30, // unused (Power Mgmt Control/Status) 97 PMControl = 0x30, // unused (Power Mgmt Control/Status)
98 rsv2 = 0x34, // reserved 98 rsv2 = 0x34, // reserved
99 ROMControl = 0x38, 99 ROMControl = 0x38,
@@ -234,7 +234,7 @@ enum _DescStatusBit {
234 RxSizeMask = 0x0000ffff 234 RxSizeMask = 0x0000ffff
235 /* 235 /*
236 * The asic could apparently do vlan, TSO, jumbo (sis191 only) and 236 * The asic could apparently do vlan, TSO, jumbo (sis191 only) and
237 * provide two (unused with Linux) Tx queues. No publically 237 * provide two (unused with Linux) Tx queues. No publicly
238 * available documentation alas. 238 * available documentation alas.
239 */ 239 */
240}; 240};
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index 84d4167eee9a..cb317cd069ff 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -1180,7 +1180,7 @@ sis900_init_rx_ring(struct net_device *net_dev)
1180 * 1180 *
1181 * 630E equalizer workaround rule(Cyrus Huang 08/15) 1181 * 630E equalizer workaround rule(Cyrus Huang 08/15)
1182 * PHY register 14h(Test) 1182 * PHY register 14h(Test)
1183 * Bit 14: 0 -- Automatically dectect (default) 1183 * Bit 14: 0 -- Automatically detect (default)
1184 * 1 -- Manually set Equalizer filter 1184 * 1 -- Manually set Equalizer filter
1185 * Bit 13: 0 -- (Default) 1185 * Bit 13: 0 -- (Default)
1186 * 1 -- Speed up convergence of equalizer setting 1186 * 1 -- Speed up convergence of equalizer setting
@@ -1192,7 +1192,7 @@ sis900_init_rx_ring(struct net_device *net_dev)
1192 * Then set equalizer value, and set Bit 14 to 1, Bit 9 to 0 1192 * Then set equalizer value, and set Bit 14 to 1, Bit 9 to 0
1193 * Link Off:Set Bit 13 to 1, Bit 14 to 0 1193 * Link Off:Set Bit 13 to 1, Bit 14 to 0
1194 * Calculate Equalizer value: 1194 * Calculate Equalizer value:
1195 * When Link is ON and Bit 14 is 0, SIS900PHY will auto-dectect proper equalizer value. 1195 * When Link is ON and Bit 14 is 0, SIS900PHY will auto-detect proper equalizer value.
1196 * When the equalizer is stable, this value is not a fixed value. It will be within 1196 * When the equalizer is stable, this value is not a fixed value. It will be within
1197 * a small range(eg. 7~9). Then we get a minimum and a maximum value(eg. min=7, max=9) 1197 * a small range(eg. 7~9). Then we get a minimum and a maximum value(eg. min=7, max=9)
1198 * 0 <= max <= 4 --> set equalizer to max 1198 * 0 <= max <= 4 --> set equalizer to max
@@ -1723,7 +1723,7 @@ static int sis900_rx(struct net_device *net_dev)
1723 rx_size = data_size - CRC_SIZE; 1723 rx_size = data_size - CRC_SIZE;
1724 1724
1725#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) 1725#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
1726 /* ``TOOLONG'' flag means jumbo packet recived. */ 1726 /* ``TOOLONG'' flag means jumbo packet received. */
1727 if ((rx_status & TOOLONG) && data_size <= MAX_FRAME_SIZE) 1727 if ((rx_status & TOOLONG) && data_size <= MAX_FRAME_SIZE)
1728 rx_status &= (~ ((unsigned int)TOOLONG)); 1728 rx_status &= (~ ((unsigned int)TOOLONG));
1729#endif 1729#endif
diff --git a/drivers/net/skfp/ess.c b/drivers/net/skfp/ess.c
index 8639a0884f5c..2fc5987b41dc 100644
--- a/drivers/net/skfp/ess.c
+++ b/drivers/net/skfp/ess.c
@@ -241,7 +241,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm,
241 != SMT_RDF_SUCCESS) || 241 != SMT_RDF_SUCCESS) ||
242 (sm->smt_tid != smc->ess.alloc_trans_id)) { 242 (sm->smt_tid != smc->ess.alloc_trans_id)) {
243 243
244 DB_ESS("ESS: Allocation Responce not accepted\n",0,0) ; 244 DB_ESS("ESS: Allocation Response not accepted\n",0,0) ;
245 return fs; 245 return fs;
246 } 246 }
247 247
@@ -393,7 +393,7 @@ static int process_bw_alloc(struct s_smc *smc, long int payload, long int overhe
393 * | T-NEG | 393 * | T-NEG |
394 * - - 394 * - -
395 * 395 *
396 * T-NEG is discribed by the equation: 396 * T-NEG is described by the equation:
397 * 397 *
398 * (-) fddiMACT-NEG 398 * (-) fddiMACT-NEG
399 * T-NEG = ------------------- 399 * T-NEG = -------------------
@@ -479,7 +479,7 @@ static void ess_send_response(struct s_smc *smc, struct smt_header *sm,
479 void *p ; 479 void *p ;
480 480
481 /* 481 /*
482 * get and initialize the responce frame 482 * get and initialize the response frame
483 */ 483 */
484 if (sba_cmd == CHANGE_ALLOCATION) { 484 if (sba_cmd == CHANGE_ALLOCATION) {
485 if (!(mb=smt_build_frame(smc,SMT_RAF,SMT_REPLY, 485 if (!(mb=smt_build_frame(smc,SMT_RAF,SMT_REPLY,
@@ -578,7 +578,7 @@ static void ess_send_alc_req(struct s_smc *smc)
578 } 578 }
579 579
580 /* 580 /*
581 * get and initialize the responce frame 581 * get and initialize the response frame
582 */ 582 */
583 if (!(mb=smt_build_frame(smc,SMT_RAF,SMT_REQUEST, 583 if (!(mb=smt_build_frame(smc,SMT_RAF,SMT_REQUEST,
584 sizeof(struct smt_sba_alc_req)))) 584 sizeof(struct smt_sba_alc_req))))
diff --git a/drivers/net/skfp/fplustm.c b/drivers/net/skfp/fplustm.c
index ca4e7bb6a5a8..a20ed1a98099 100644
--- a/drivers/net/skfp/fplustm.c
+++ b/drivers/net/skfp/fplustm.c
@@ -340,7 +340,7 @@ static void mac_counter_init(struct s_smc *smc)
340 outpw(FM_A(FM_LCNTR),0) ; 340 outpw(FM_A(FM_LCNTR),0) ;
341 outpw(FM_A(FM_ECNTR),0) ; 341 outpw(FM_A(FM_ECNTR),0) ;
342 /* 342 /*
343 * clear internal error counter stucture 343 * clear internal error counter structure
344 */ 344 */
345 ec = (u_long *)&smc->hw.fp.err_stats ; 345 ec = (u_long *)&smc->hw.fp.err_stats ;
346 for (i = (sizeof(struct err_st)/sizeof(long)) ; i ; i--) 346 for (i = (sizeof(struct err_st)/sizeof(long)) ; i ; i--)
@@ -1262,8 +1262,8 @@ Function DOWNCALL/INTERN (SMT, fplustm.c)
1262 1262
1263Para mode = 1 RX_ENABLE_ALLMULTI enable all multicasts 1263Para mode = 1 RX_ENABLE_ALLMULTI enable all multicasts
1264 2 RX_DISABLE_ALLMULTI disable "enable all multicasts" 1264 2 RX_DISABLE_ALLMULTI disable "enable all multicasts"
1265 3 RX_ENABLE_PROMISC enable promiscous 1265 3 RX_ENABLE_PROMISC enable promiscuous
1266 4 RX_DISABLE_PROMISC disable promiscous 1266 4 RX_DISABLE_PROMISC disable promiscuous
1267 5 RX_ENABLE_NSA enable reception of NSA frames 1267 5 RX_ENABLE_NSA enable reception of NSA frames
1268 6 RX_DISABLE_NSA disable reception of NSA frames 1268 6 RX_DISABLE_NSA disable reception of NSA frames
1269 1269
diff --git a/drivers/net/skfp/h/cmtdef.h b/drivers/net/skfp/h/cmtdef.h
index f2f771d8be76..5a6c6122ccb0 100644
--- a/drivers/net/skfp/h/cmtdef.h
+++ b/drivers/net/skfp/h/cmtdef.h
@@ -19,7 +19,7 @@
19 19
20/* 20/*
21 * implementation specific constants 21 * implementation specific constants
22 * MODIIFY THE FOLLWOING THREE DEFINES 22 * MODIIFY THE FOLLOWING THREE DEFINES
23 */ 23 */
24#define AMDPLC /* if Amd PLC chip used */ 24#define AMDPLC /* if Amd PLC chip used */
25#ifdef CONC 25#ifdef CONC
@@ -456,7 +456,7 @@ struct s_plc {
456 u_long soft_err ; /* error counter */ 456 u_long soft_err ; /* error counter */
457 u_long parity_err ; /* error counter */ 457 u_long parity_err ; /* error counter */
458 u_long ebuf_err ; /* error counter */ 458 u_long ebuf_err ; /* error counter */
459 u_long ebuf_cont ; /* continous error counter */ 459 u_long ebuf_cont ; /* continuous error counter */
460 u_long phyinv ; /* error counter */ 460 u_long phyinv ; /* error counter */
461 u_long vsym_ctr ; /* error counter */ 461 u_long vsym_ctr ; /* error counter */
462 u_long mini_ctr ; /* error counter */ 462 u_long mini_ctr ; /* error counter */
diff --git a/drivers/net/skfp/h/fplustm.h b/drivers/net/skfp/h/fplustm.h
index 6d738e1e2393..d43191ed938b 100644
--- a/drivers/net/skfp/h/fplustm.h
+++ b/drivers/net/skfp/h/fplustm.h
@@ -237,8 +237,8 @@ struct s_smt_fp {
237 */ 237 */
238#define RX_ENABLE_ALLMULTI 1 /* enable all multicasts */ 238#define RX_ENABLE_ALLMULTI 1 /* enable all multicasts */
239#define RX_DISABLE_ALLMULTI 2 /* disable "enable all multicasts" */ 239#define RX_DISABLE_ALLMULTI 2 /* disable "enable all multicasts" */
240#define RX_ENABLE_PROMISC 3 /* enable promiscous */ 240#define RX_ENABLE_PROMISC 3 /* enable promiscuous */
241#define RX_DISABLE_PROMISC 4 /* disable promiscous */ 241#define RX_DISABLE_PROMISC 4 /* disable promiscuous */
242#define RX_ENABLE_NSA 5 /* enable reception of NSA frames */ 242#define RX_ENABLE_NSA 5 /* enable reception of NSA frames */
243#define RX_DISABLE_NSA 6 /* disable reception of NSA frames */ 243#define RX_DISABLE_NSA 6 /* disable reception of NSA frames */
244 244
diff --git a/drivers/net/skfp/h/smc.h b/drivers/net/skfp/h/smc.h
index 026a83b9f743..c774a95902f5 100644
--- a/drivers/net/skfp/h/smc.h
+++ b/drivers/net/skfp/h/smc.h
@@ -388,7 +388,7 @@ struct smt_config {
388 u_long rmt_t_poll ; /* RMT : claim/beacon poller */ 388 u_long rmt_t_poll ; /* RMT : claim/beacon poller */
389 u_long rmt_dup_mac_behavior ; /* Flag for the beavior of SMT if 389 u_long rmt_dup_mac_behavior ; /* Flag for the beavior of SMT if
390 * a Duplicate MAC Address was detected. 390 * a Duplicate MAC Address was detected.
391 * FALSE: SMT will leave finaly the ring 391 * FALSE: SMT will leave finally the ring
392 * TRUE: SMT will reinstert into the ring 392 * TRUE: SMT will reinstert into the ring
393 */ 393 */
394 u_long mac_d_max ; /* MAC : D_Max timer value */ 394 u_long mac_d_max ; /* MAC : D_Max timer value */
diff --git a/drivers/net/skfp/h/smt.h b/drivers/net/skfp/h/smt.h
index 2976757a36fb..2030f9cbb24b 100644
--- a/drivers/net/skfp/h/smt.h
+++ b/drivers/net/skfp/h/smt.h
@@ -793,7 +793,7 @@ struct smt_rdf {
793} ; 793} ;
794 794
795/* 795/*
796 * SBA Request Allocation Responce Frame 796 * SBA Request Allocation Response Frame
797 */ 797 */
798struct smt_sba_alc_res { 798struct smt_sba_alc_res {
799 struct smt_header smt ; /* generic header */ 799 struct smt_header smt ; /* generic header */
diff --git a/drivers/net/skfp/h/supern_2.h b/drivers/net/skfp/h/supern_2.h
index 5ba0b8306753..0b73690280f6 100644
--- a/drivers/net/skfp/h/supern_2.h
+++ b/drivers/net/skfp/h/supern_2.h
@@ -14,7 +14,7 @@
14 14
15/* 15/*
16 defines for AMD Supernet II chip set 16 defines for AMD Supernet II chip set
17 the chips are refered to as 17 the chips are referred to as
18 FPLUS Formac Plus 18 FPLUS Formac Plus
19 PLC Physical Layer 19 PLC Physical Layer
20 20
@@ -386,7 +386,7 @@ struct tx_queue {
386#define FM_MDISRCV (4<<8) /* disable receive function */ 386#define FM_MDISRCV (4<<8) /* disable receive function */
387#define FM_MRES0 (5<<8) /* reserve */ 387#define FM_MRES0 (5<<8) /* reserve */
388#define FM_MLIMPROM (6<<8) /* limited-promiscuous mode */ 388#define FM_MLIMPROM (6<<8) /* limited-promiscuous mode */
389#define FM_MPROMISCOUS (7<<8) /* address detection : promiscous */ 389#define FM_MPROMISCOUS (7<<8) /* address detection : promiscuous */
390 390
391#define FM_SELSA 0x0800 /* select-short-address bit */ 391#define FM_SELSA 0x0800 /* select-short-address bit */
392 392
diff --git a/drivers/net/skfp/hwmtm.c b/drivers/net/skfp/hwmtm.c
index af5a755e269d..e26398b5a7dc 100644
--- a/drivers/net/skfp/hwmtm.c
+++ b/drivers/net/skfp/hwmtm.c
@@ -691,7 +691,7 @@ static u_long repair_rxd_ring(struct s_smc *smc, struct s_smt_rx_queue *queue)
691 * interrupt service routine, handles the interrupt requests 691 * interrupt service routine, handles the interrupt requests
692 * generated by the FDDI adapter. 692 * generated by the FDDI adapter.
693 * 693 *
694 * NOTE: The operating system dependent module must garantee that the 694 * NOTE: The operating system dependent module must guarantee that the
695 * interrupts of the adapter are disabled when it calls fddi_isr. 695 * interrupts of the adapter are disabled when it calls fddi_isr.
696 * 696 *
697 * About the USE_BREAK_ISR mechanismn: 697 * About the USE_BREAK_ISR mechanismn:
diff --git a/drivers/net/skfp/pcmplc.c b/drivers/net/skfp/pcmplc.c
index 112d35b1bf0e..88d02d0a42c4 100644
--- a/drivers/net/skfp/pcmplc.c
+++ b/drivers/net/skfp/pcmplc.c
@@ -1680,7 +1680,7 @@ void plc_irq(struct s_smc *smc, int np, unsigned int cmd)
1680 * Prevent counter from being wrapped after 1680 * Prevent counter from being wrapped after
1681 * hanging years in that interrupt. 1681 * hanging years in that interrupt.
1682 */ 1682 */
1683 plc->ebuf_cont++ ; /* Ebuf continous error */ 1683 plc->ebuf_cont++ ; /* Ebuf continuous error */
1684 } 1684 }
1685 1685
1686#ifdef SUPERNET_3 1686#ifdef SUPERNET_3
@@ -1717,8 +1717,8 @@ void plc_irq(struct s_smc *smc, int np, unsigned int cmd)
1717 } 1717 }
1718#endif /* SUPERNET_3 */ 1718#endif /* SUPERNET_3 */
1719 } else { 1719 } else {
1720 /* Reset the continous error variable */ 1720 /* Reset the continuous error variable */
1721 plc->ebuf_cont = 0 ; /* reset Ebuf continous error */ 1721 plc->ebuf_cont = 0 ; /* reset Ebuf continuous error */
1722 } 1722 }
1723 if (cmd & PL_PHYINV) { /* physical layer invalid signal */ 1723 if (cmd & PL_PHYINV) { /* physical layer invalid signal */
1724 plc->phyinv++ ; 1724 plc->phyinv++ ;
diff --git a/drivers/net/skfp/smt.c b/drivers/net/skfp/smt.c
index 1e1bd0c201c8..08d94329c12f 100644
--- a/drivers/net/skfp/smt.c
+++ b/drivers/net/skfp/smt.c
@@ -219,7 +219,7 @@ void smt_emulate_token_ct(struct s_smc *smc, int mac_index)
219 219
220 /* 220 /*
221 * Only when ring is up we will have a token count. The 221 * Only when ring is up we will have a token count. The
222 * flag is unfortunatly a single instance value. This 222 * flag is unfortunately a single instance value. This
223 * doesn't matter now, because we currently have only 223 * doesn't matter now, because we currently have only
224 * one MAC instance. 224 * one MAC instance.
225 */ 225 */
diff --git a/drivers/net/skge.h b/drivers/net/skge.h
index 507addcaffa3..51c0214ac25c 100644
--- a/drivers/net/skge.h
+++ b/drivers/net/skge.h
@@ -1038,7 +1038,7 @@ enum {
1038 1038
1039 PHY_ST_PRE_SUP = 1<<6, /* Bit 6: Preamble Suppression */ 1039 PHY_ST_PRE_SUP = 1<<6, /* Bit 6: Preamble Suppression */
1040 PHY_ST_AN_OVER = 1<<5, /* Bit 5: Auto-Negotiation Over */ 1040 PHY_ST_AN_OVER = 1<<5, /* Bit 5: Auto-Negotiation Over */
1041 PHY_ST_REM_FLT = 1<<4, /* Bit 4: Remote Fault Condition Occured */ 1041 PHY_ST_REM_FLT = 1<<4, /* Bit 4: Remote Fault Condition Occurred */
1042 PHY_ST_AN_CAP = 1<<3, /* Bit 3: Auto-Negotiation Capability */ 1042 PHY_ST_AN_CAP = 1<<3, /* Bit 3: Auto-Negotiation Capability */
1043 PHY_ST_LSYNC = 1<<2, /* Bit 2: Link Synchronized */ 1043 PHY_ST_LSYNC = 1<<2, /* Bit 2: Link Synchronized */
1044 PHY_ST_JAB_DET = 1<<1, /* Bit 1: Jabber Detected */ 1044 PHY_ST_JAB_DET = 1<<1, /* Bit 1: Jabber Detected */
@@ -1721,8 +1721,8 @@ enum {
1721 GM_GPSR_LINK_UP = 1<<12, /* Bit 12: Link Up Status */ 1721 GM_GPSR_LINK_UP = 1<<12, /* Bit 12: Link Up Status */
1722 GM_GPSR_PAUSE = 1<<11, /* Bit 11: Pause State */ 1722 GM_GPSR_PAUSE = 1<<11, /* Bit 11: Pause State */
1723 GM_GPSR_TX_ACTIVE = 1<<10, /* Bit 10: Tx in Progress */ 1723 GM_GPSR_TX_ACTIVE = 1<<10, /* Bit 10: Tx in Progress */
1724 GM_GPSR_EXC_COL = 1<<9, /* Bit 9: Excessive Collisions Occured */ 1724 GM_GPSR_EXC_COL = 1<<9, /* Bit 9: Excessive Collisions Occurred */
1725 GM_GPSR_LAT_COL = 1<<8, /* Bit 8: Late Collisions Occured */ 1725 GM_GPSR_LAT_COL = 1<<8, /* Bit 8: Late Collisions Occurred */
1726 1726
1727 GM_GPSR_PHY_ST_CH = 1<<5, /* Bit 5: PHY Status Change */ 1727 GM_GPSR_PHY_ST_CH = 1<<5, /* Bit 5: PHY Status Change */
1728 GM_GPSR_GIG_SPEED = 1<<4, /* Bit 4: Gigabit Speed (1 = 1000 Mbps) */ 1728 GM_GPSR_GIG_SPEED = 1<<4, /* Bit 4: Gigabit Speed (1 = 1000 Mbps) */
@@ -2227,7 +2227,7 @@ enum {
2227 XM_ST_BC = 1<<7, /* Bit 7: Broadcast packet */ 2227 XM_ST_BC = 1<<7, /* Bit 7: Broadcast packet */
2228 XM_ST_MC = 1<<6, /* Bit 6: Multicast packet */ 2228 XM_ST_MC = 1<<6, /* Bit 6: Multicast packet */
2229 XM_ST_UC = 1<<5, /* Bit 5: Unicast packet */ 2229 XM_ST_UC = 1<<5, /* Bit 5: Unicast packet */
2230 XM_ST_TX_UR = 1<<4, /* Bit 4: FIFO Underrun occured */ 2230 XM_ST_TX_UR = 1<<4, /* Bit 4: FIFO Underrun occurred */
2231 XM_ST_CS_ERR = 1<<3, /* Bit 3: Carrier Sense Error */ 2231 XM_ST_CS_ERR = 1<<3, /* Bit 3: Carrier Sense Error */
2232 XM_ST_LAT_COL = 1<<2, /* Bit 2: Late Collision Error */ 2232 XM_ST_LAT_COL = 1<<2, /* Bit 2: Late Collision Error */
2233 XM_ST_MUL_COL = 1<<1, /* Bit 1: Multiple Collisions */ 2233 XM_ST_MUL_COL = 1<<1, /* Bit 1: Multiple Collisions */
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 2a91868788f7..ff8d262dc276 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -932,7 +932,7 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port)
932 sky2_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_RST_CLR); 932 sky2_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_RST_CLR);
933 sky2_write16(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_OPER_ON); 933 sky2_write16(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_OPER_ON);
934 934
935 /* On chips without ram buffer, pause is controled by MAC level */ 935 /* On chips without ram buffer, pause is controlled by MAC level */
936 if (!(hw->flags & SKY2_HW_RAM_BUFFER)) { 936 if (!(hw->flags & SKY2_HW_RAM_BUFFER)) {
937 /* Pause threshold is scaled by 8 in bytes */ 937 /* Pause threshold is scaled by 8 in bytes */
938 if (hw->chip_id == CHIP_ID_YUKON_FE_P && 938 if (hw->chip_id == CHIP_ID_YUKON_FE_P &&
@@ -3255,7 +3255,7 @@ static void sky2_reset(struct sky2_hw *hw)
3255 3255
3256/* Take device down (offline). 3256/* Take device down (offline).
3257 * Equivalent to doing dev_stop() but this does not 3257 * Equivalent to doing dev_stop() but this does not
3258 * inform upper layers of the transistion. 3258 * inform upper layers of the transition.
3259 */ 3259 */
3260static void sky2_detach(struct net_device *dev) 3260static void sky2_detach(struct net_device *dev)
3261{ 3261{
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 6861b0e8db9a..0c6d10c5f053 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -1194,7 +1194,7 @@ enum {
1194 1194
1195 PHY_ST_PRE_SUP = 1<<6, /* Bit 6: Preamble Suppression */ 1195 PHY_ST_PRE_SUP = 1<<6, /* Bit 6: Preamble Suppression */
1196 PHY_ST_AN_OVER = 1<<5, /* Bit 5: Auto-Negotiation Over */ 1196 PHY_ST_AN_OVER = 1<<5, /* Bit 5: Auto-Negotiation Over */
1197 PHY_ST_REM_FLT = 1<<4, /* Bit 4: Remote Fault Condition Occured */ 1197 PHY_ST_REM_FLT = 1<<4, /* Bit 4: Remote Fault Condition Occurred */
1198 PHY_ST_AN_CAP = 1<<3, /* Bit 3: Auto-Negotiation Capability */ 1198 PHY_ST_AN_CAP = 1<<3, /* Bit 3: Auto-Negotiation Capability */
1199 PHY_ST_LSYNC = 1<<2, /* Bit 2: Link Synchronized */ 1199 PHY_ST_LSYNC = 1<<2, /* Bit 2: Link Synchronized */
1200 PHY_ST_JAB_DET = 1<<1, /* Bit 1: Jabber Detected */ 1200 PHY_ST_JAB_DET = 1<<1, /* Bit 1: Jabber Detected */
@@ -1725,8 +1725,8 @@ enum {
1725 GM_GPSR_LINK_UP = 1<<12, /* Bit 12: Link Up Status */ 1725 GM_GPSR_LINK_UP = 1<<12, /* Bit 12: Link Up Status */
1726 GM_GPSR_PAUSE = 1<<11, /* Bit 11: Pause State */ 1726 GM_GPSR_PAUSE = 1<<11, /* Bit 11: Pause State */
1727 GM_GPSR_TX_ACTIVE = 1<<10, /* Bit 10: Tx in Progress */ 1727 GM_GPSR_TX_ACTIVE = 1<<10, /* Bit 10: Tx in Progress */
1728 GM_GPSR_EXC_COL = 1<<9, /* Bit 9: Excessive Collisions Occured */ 1728 GM_GPSR_EXC_COL = 1<<9, /* Bit 9: Excessive Collisions Occurred */
1729 GM_GPSR_LAT_COL = 1<<8, /* Bit 8: Late Collisions Occured */ 1729 GM_GPSR_LAT_COL = 1<<8, /* Bit 8: Late Collisions Occurred */
1730 1730
1731 GM_GPSR_PHY_ST_CH = 1<<5, /* Bit 5: PHY Status Change */ 1731 GM_GPSR_PHY_ST_CH = 1<<5, /* Bit 5: PHY Status Change */
1732 GM_GPSR_GIG_SPEED = 1<<4, /* Bit 4: Gigabit Speed (1 = 1000 Mbps) */ 1732 GM_GPSR_GIG_SPEED = 1<<4, /* Bit 4: Gigabit Speed (1 = 1000 Mbps) */
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index 68d48ab6eacf..5f53fbbf67be 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -921,7 +921,7 @@ static const char * chip_ids[ 16 ] = {
921 * Hack Alert: Some setups just can't write 8 or 16 bits reliably when not 921 * Hack Alert: Some setups just can't write 8 or 16 bits reliably when not
922 * aligned to a 32 bit boundary. I tell you that does exist! 922 * aligned to a 32 bit boundary. I tell you that does exist!
923 * Fortunately the affected register accesses can be easily worked around 923 * Fortunately the affected register accesses can be easily worked around
924 * since we can write zeroes to the preceeding 16 bits without adverse 924 * since we can write zeroes to the preceding 16 bits without adverse
925 * effects and use a 32-bit access. 925 * effects and use a 32-bit access.
926 * 926 *
927 * Enforce it on any 32-bit capable setup for now. 927 * Enforce it on any 32-bit capable setup for now.
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c
index 1566259c1f27..c498b720b532 100644
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
@@ -1669,7 +1669,7 @@ static int smsc911x_eeprom_send_cmd(struct smsc911x_data *pdata, u32 op)
1669 } 1669 }
1670 1670
1671 if (e2cmd & E2P_CMD_EPC_TIMEOUT_) { 1671 if (e2cmd & E2P_CMD_EPC_TIMEOUT_) {
1672 SMSC_TRACE(DRV, "Error occured during eeprom operation"); 1672 SMSC_TRACE(DRV, "Error occurred during eeprom operation");
1673 return -EINVAL; 1673 return -EINVAL;
1674 } 1674 }
1675 1675
diff --git a/drivers/net/smsc9420.c b/drivers/net/smsc9420.c
index b09ee1c319e8..4c92ad8be765 100644
--- a/drivers/net/smsc9420.c
+++ b/drivers/net/smsc9420.c
@@ -364,7 +364,7 @@ static int smsc9420_eeprom_send_cmd(struct smsc9420_pdata *pd, u32 op)
364 } 364 }
365 365
366 if (e2cmd & E2P_CMD_EPC_TIMEOUT_) { 366 if (e2cmd & E2P_CMD_EPC_TIMEOUT_) {
367 smsc_info(HW, "Error occured during eeprom operation"); 367 smsc_info(HW, "Error occurred during eeprom operation");
368 return -EINVAL; 368 return -EINVAL;
369 } 369 }
370 370
diff --git a/drivers/net/stmmac/norm_desc.c b/drivers/net/stmmac/norm_desc.c
index cd0cc76f7a1c..029c2a2cf524 100644
--- a/drivers/net/stmmac/norm_desc.c
+++ b/drivers/net/stmmac/norm_desc.c
@@ -67,7 +67,7 @@ static int ndesc_get_tx_len(struct dma_desc *p)
67 67
68/* This function verifies if each incoming frame has some errors 68/* This function verifies if each incoming frame has some errors
69 * and, if required, updates the multicast statistics. 69 * and, if required, updates the multicast statistics.
70 * In case of success, it returns csum_none becasue the device 70 * In case of success, it returns csum_none because the device
71 * is not able to compute the csum in HW. */ 71 * is not able to compute the csum in HW. */
72static int ndesc_get_rx_status(void *data, struct stmmac_extra_stats *x, 72static int ndesc_get_rx_status(void *data, struct stmmac_extra_stats *x,
73 struct dma_desc *p) 73 struct dma_desc *p)
diff --git a/drivers/net/sunbmac.h b/drivers/net/sunbmac.h
index 8db88945b889..4943e975a731 100644
--- a/drivers/net/sunbmac.h
+++ b/drivers/net/sunbmac.h
@@ -185,7 +185,7 @@
185#define BIGMAC_RXCFG_ENABLE 0x00000001 /* Enable the receiver */ 185#define BIGMAC_RXCFG_ENABLE 0x00000001 /* Enable the receiver */
186#define BIGMAC_RXCFG_FIFO 0x0000000e /* Default rx fthresh... */ 186#define BIGMAC_RXCFG_FIFO 0x0000000e /* Default rx fthresh... */
187#define BIGMAC_RXCFG_PSTRIP 0x00000020 /* Pad byte strip enable */ 187#define BIGMAC_RXCFG_PSTRIP 0x00000020 /* Pad byte strip enable */
188#define BIGMAC_RXCFG_PMISC 0x00000040 /* Enable promiscous mode */ 188#define BIGMAC_RXCFG_PMISC 0x00000040 /* Enable promiscuous mode */
189#define BIGMAC_RXCFG_DERR 0x00000080 /* Disable error checking */ 189#define BIGMAC_RXCFG_DERR 0x00000080 /* Disable error checking */
190#define BIGMAC_RXCFG_DCRCS 0x00000100 /* Disable CRC stripping */ 190#define BIGMAC_RXCFG_DCRCS 0x00000100 /* Disable CRC stripping */
191#define BIGMAC_RXCFG_ME 0x00000200 /* Receive packets addressed to me */ 191#define BIGMAC_RXCFG_ME 0x00000200 /* Receive packets addressed to me */
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index c1a344829b54..d3be735c4719 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -1150,7 +1150,7 @@ static void gem_pcs_reinit_adv(struct gem *gp)
1150 val &= ~(PCS_CFG_ENABLE | PCS_CFG_TO); 1150 val &= ~(PCS_CFG_ENABLE | PCS_CFG_TO);
1151 writel(val, gp->regs + PCS_CFG); 1151 writel(val, gp->regs + PCS_CFG);
1152 1152
1153 /* Advertise all capabilities except assymetric 1153 /* Advertise all capabilities except asymmetric
1154 * pause. 1154 * pause.
1155 */ 1155 */
1156 val = readl(gp->regs + PCS_MIIADV); 1156 val = readl(gp->regs + PCS_MIIADV);
diff --git a/drivers/net/sunhme.h b/drivers/net/sunhme.h
index 756b5bf3aa89..64f278360d89 100644
--- a/drivers/net/sunhme.h
+++ b/drivers/net/sunhme.h
@@ -223,7 +223,7 @@
223/* BigMac receive config register. */ 223/* BigMac receive config register. */
224#define BIGMAC_RXCFG_ENABLE 0x00000001 /* Enable the receiver */ 224#define BIGMAC_RXCFG_ENABLE 0x00000001 /* Enable the receiver */
225#define BIGMAC_RXCFG_PSTRIP 0x00000020 /* Pad byte strip enable */ 225#define BIGMAC_RXCFG_PSTRIP 0x00000020 /* Pad byte strip enable */
226#define BIGMAC_RXCFG_PMISC 0x00000040 /* Enable promiscous mode */ 226#define BIGMAC_RXCFG_PMISC 0x00000040 /* Enable promiscuous mode */
227#define BIGMAC_RXCFG_DERR 0x00000080 /* Disable error checking */ 227#define BIGMAC_RXCFG_DERR 0x00000080 /* Disable error checking */
228#define BIGMAC_RXCFG_DCRCS 0x00000100 /* Disable CRC stripping */ 228#define BIGMAC_RXCFG_DCRCS 0x00000100 /* Disable CRC stripping */
229#define BIGMAC_RXCFG_REJME 0x00000200 /* Reject packets addressed to me */ 229#define BIGMAC_RXCFG_REJME 0x00000200 /* Reject packets addressed to me */
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index b6eec8cea209..7ca51cebcddd 100644
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -119,13 +119,13 @@ struct tc35815_regs {
119/* 119/*
120 * Bit assignments 120 * Bit assignments
121 */ 121 */
122/* DMA_Ctl bit asign ------------------------------------------------------- */ 122/* DMA_Ctl bit assign ------------------------------------------------------- */
123#define DMA_RxAlign 0x00c00000 /* 1:Reception Alignment */ 123#define DMA_RxAlign 0x00c00000 /* 1:Reception Alignment */
124#define DMA_RxAlign_1 0x00400000 124#define DMA_RxAlign_1 0x00400000
125#define DMA_RxAlign_2 0x00800000 125#define DMA_RxAlign_2 0x00800000
126#define DMA_RxAlign_3 0x00c00000 126#define DMA_RxAlign_3 0x00c00000
127#define DMA_M66EnStat 0x00080000 /* 1:66MHz Enable State */ 127#define DMA_M66EnStat 0x00080000 /* 1:66MHz Enable State */
128#define DMA_IntMask 0x00040000 /* 1:Interupt mask */ 128#define DMA_IntMask 0x00040000 /* 1:Interrupt mask */
129#define DMA_SWIntReq 0x00020000 /* 1:Software Interrupt request */ 129#define DMA_SWIntReq 0x00020000 /* 1:Software Interrupt request */
130#define DMA_TxWakeUp 0x00010000 /* 1:Transmit Wake Up */ 130#define DMA_TxWakeUp 0x00010000 /* 1:Transmit Wake Up */
131#define DMA_RxBigE 0x00008000 /* 1:Receive Big Endian */ 131#define DMA_RxBigE 0x00008000 /* 1:Receive Big Endian */
@@ -134,11 +134,11 @@ struct tc35815_regs {
134#define DMA_PowrMgmnt 0x00001000 /* 1:Power Management */ 134#define DMA_PowrMgmnt 0x00001000 /* 1:Power Management */
135#define DMA_DmBurst_Mask 0x000001fc /* DMA Burst size */ 135#define DMA_DmBurst_Mask 0x000001fc /* DMA Burst size */
136 136
137/* RxFragSize bit asign ---------------------------------------------------- */ 137/* RxFragSize bit assign ---------------------------------------------------- */
138#define RxFrag_EnPack 0x00008000 /* 1:Enable Packing */ 138#define RxFrag_EnPack 0x00008000 /* 1:Enable Packing */
139#define RxFrag_MinFragMask 0x00000ffc /* Minimum Fragment */ 139#define RxFrag_MinFragMask 0x00000ffc /* Minimum Fragment */
140 140
141/* MAC_Ctl bit asign ------------------------------------------------------- */ 141/* MAC_Ctl bit assign ------------------------------------------------------- */
142#define MAC_Link10 0x00008000 /* 1:Link Status 10Mbits */ 142#define MAC_Link10 0x00008000 /* 1:Link Status 10Mbits */
143#define MAC_EnMissRoll 0x00002000 /* 1:Enable Missed Roll */ 143#define MAC_EnMissRoll 0x00002000 /* 1:Enable Missed Roll */
144#define MAC_MissRoll 0x00000400 /* 1:Missed Roll */ 144#define MAC_MissRoll 0x00000400 /* 1:Missed Roll */
@@ -152,7 +152,7 @@ struct tc35815_regs {
152#define MAC_HaltImm 0x00000002 /* 1:Halt Immediate */ 152#define MAC_HaltImm 0x00000002 /* 1:Halt Immediate */
153#define MAC_HaltReq 0x00000001 /* 1:Halt request */ 153#define MAC_HaltReq 0x00000001 /* 1:Halt request */
154 154
155/* PROM_Ctl bit asign ------------------------------------------------------ */ 155/* PROM_Ctl bit assign ------------------------------------------------------ */
156#define PROM_Busy 0x00008000 /* 1:Busy (Start Operation) */ 156#define PROM_Busy 0x00008000 /* 1:Busy (Start Operation) */
157#define PROM_Read 0x00004000 /*10:Read operation */ 157#define PROM_Read 0x00004000 /*10:Read operation */
158#define PROM_Write 0x00002000 /*01:Write operation */ 158#define PROM_Write 0x00002000 /*01:Write operation */
@@ -162,7 +162,7 @@ struct tc35815_regs {
162#define PROM_Addr_Ena 0x00000030 /*11xxxx:PROM Write enable */ 162#define PROM_Addr_Ena 0x00000030 /*11xxxx:PROM Write enable */
163 /*00xxxx: disable */ 163 /*00xxxx: disable */
164 164
165/* CAM_Ctl bit asign ------------------------------------------------------- */ 165/* CAM_Ctl bit assign ------------------------------------------------------- */
166#define CAM_CompEn 0x00000010 /* 1:CAM Compare Enable */ 166#define CAM_CompEn 0x00000010 /* 1:CAM Compare Enable */
167#define CAM_NegCAM 0x00000008 /* 1:Reject packets CAM recognizes,*/ 167#define CAM_NegCAM 0x00000008 /* 1:Reject packets CAM recognizes,*/
168 /* accept other */ 168 /* accept other */
@@ -170,7 +170,7 @@ struct tc35815_regs {
170#define CAM_GroupAcc 0x00000002 /* 1:Multicast assept */ 170#define CAM_GroupAcc 0x00000002 /* 1:Multicast assept */
171#define CAM_StationAcc 0x00000001 /* 1:unicast accept */ 171#define CAM_StationAcc 0x00000001 /* 1:unicast accept */
172 172
173/* CAM_Ena bit asign ------------------------------------------------------- */ 173/* CAM_Ena bit assign ------------------------------------------------------- */
174#define CAM_ENTRY_MAX 21 /* CAM Data entry max count */ 174#define CAM_ENTRY_MAX 21 /* CAM Data entry max count */
175#define CAM_Ena_Mask ((1<<CAM_ENTRY_MAX)-1) /* CAM Enable bits (Max 21bits) */ 175#define CAM_Ena_Mask ((1<<CAM_ENTRY_MAX)-1) /* CAM Enable bits (Max 21bits) */
176#define CAM_Ena_Bit(index) (1 << (index)) 176#define CAM_Ena_Bit(index) (1 << (index))
@@ -178,7 +178,7 @@ struct tc35815_regs {
178#define CAM_ENTRY_SOURCE 1 178#define CAM_ENTRY_SOURCE 1
179#define CAM_ENTRY_MACCTL 20 179#define CAM_ENTRY_MACCTL 20
180 180
181/* Tx_Ctl bit asign -------------------------------------------------------- */ 181/* Tx_Ctl bit assign -------------------------------------------------------- */
182#define Tx_En 0x00000001 /* 1:Transmit enable */ 182#define Tx_En 0x00000001 /* 1:Transmit enable */
183#define Tx_TxHalt 0x00000002 /* 1:Transmit Halt Request */ 183#define Tx_TxHalt 0x00000002 /* 1:Transmit Halt Request */
184#define Tx_NoPad 0x00000004 /* 1:Suppress Padding */ 184#define Tx_NoPad 0x00000004 /* 1:Suppress Padding */
@@ -192,7 +192,7 @@ struct tc35815_regs {
192#define Tx_EnTxPar 0x00002000 /* 1:Enable Transmit Parity */ 192#define Tx_EnTxPar 0x00002000 /* 1:Enable Transmit Parity */
193#define Tx_EnComp 0x00004000 /* 1:Enable Completion */ 193#define Tx_EnComp 0x00004000 /* 1:Enable Completion */
194 194
195/* Tx_Stat bit asign ------------------------------------------------------- */ 195/* Tx_Stat bit assign ------------------------------------------------------- */
196#define Tx_TxColl_MASK 0x0000000F /* Tx Collision Count */ 196#define Tx_TxColl_MASK 0x0000000F /* Tx Collision Count */
197#define Tx_ExColl 0x00000010 /* Excessive Collision */ 197#define Tx_ExColl 0x00000010 /* Excessive Collision */
198#define Tx_TXDefer 0x00000020 /* Transmit Defered */ 198#define Tx_TXDefer 0x00000020 /* Transmit Defered */
@@ -208,7 +208,7 @@ struct tc35815_regs {
208#define Tx_Halted 0x00008000 /* Tx Halted */ 208#define Tx_Halted 0x00008000 /* Tx Halted */
209#define Tx_SQErr 0x00010000 /* Signal Quality Error(SQE) */ 209#define Tx_SQErr 0x00010000 /* Signal Quality Error(SQE) */
210 210
211/* Rx_Ctl bit asign -------------------------------------------------------- */ 211/* Rx_Ctl bit assign -------------------------------------------------------- */
212#define Rx_EnGood 0x00004000 /* 1:Enable Good */ 212#define Rx_EnGood 0x00004000 /* 1:Enable Good */
213#define Rx_EnRxPar 0x00002000 /* 1:Enable Receive Parity */ 213#define Rx_EnRxPar 0x00002000 /* 1:Enable Receive Parity */
214#define Rx_EnLongErr 0x00000800 /* 1:Enable Long Error */ 214#define Rx_EnLongErr 0x00000800 /* 1:Enable Long Error */
@@ -222,7 +222,7 @@ struct tc35815_regs {
222#define Rx_RxHalt 0x00000002 /* 1:Receive Halt Request */ 222#define Rx_RxHalt 0x00000002 /* 1:Receive Halt Request */
223#define Rx_RxEn 0x00000001 /* 1:Receive Intrrupt Enable */ 223#define Rx_RxEn 0x00000001 /* 1:Receive Intrrupt Enable */
224 224
225/* Rx_Stat bit asign ------------------------------------------------------- */ 225/* Rx_Stat bit assign ------------------------------------------------------- */
226#define Rx_Halted 0x00008000 /* Rx Halted */ 226#define Rx_Halted 0x00008000 /* Rx Halted */
227#define Rx_Good 0x00004000 /* Rx Good */ 227#define Rx_Good 0x00004000 /* Rx Good */
228#define Rx_RxPar 0x00002000 /* Rx Parity Error */ 228#define Rx_RxPar 0x00002000 /* Rx Parity Error */
@@ -238,7 +238,7 @@ struct tc35815_regs {
238 238
239#define Rx_Stat_Mask 0x0000FFF0 /* Rx All Status Mask */ 239#define Rx_Stat_Mask 0x0000FFF0 /* Rx All Status Mask */
240 240
241/* Int_En bit asign -------------------------------------------------------- */ 241/* Int_En bit assign -------------------------------------------------------- */
242#define Int_NRAbtEn 0x00000800 /* 1:Non-recoverable Abort Enable */ 242#define Int_NRAbtEn 0x00000800 /* 1:Non-recoverable Abort Enable */
243#define Int_TxCtlCmpEn 0x00000400 /* 1:Transmit Ctl Complete Enable */ 243#define Int_TxCtlCmpEn 0x00000400 /* 1:Transmit Ctl Complete Enable */
244#define Int_DmParErrEn 0x00000200 /* 1:DMA Parity Error Enable */ 244#define Int_DmParErrEn 0x00000200 /* 1:DMA Parity Error Enable */
@@ -253,7 +253,7 @@ struct tc35815_regs {
253#define Int_FDAExEn 0x00000001 /* 1:Free Descriptor Area */ 253#define Int_FDAExEn 0x00000001 /* 1:Free Descriptor Area */
254 /* Exhausted Enable */ 254 /* Exhausted Enable */
255 255
256/* Int_Src bit asign ------------------------------------------------------- */ 256/* Int_Src bit assign ------------------------------------------------------- */
257#define Int_NRabt 0x00004000 /* 1:Non Recoverable error */ 257#define Int_NRabt 0x00004000 /* 1:Non Recoverable error */
258#define Int_DmParErrStat 0x00002000 /* 1:DMA Parity Error & Clear */ 258#define Int_DmParErrStat 0x00002000 /* 1:DMA Parity Error & Clear */
259#define Int_BLEx 0x00001000 /* 1:Buffer List Empty & Clear */ 259#define Int_BLEx 0x00001000 /* 1:Buffer List Empty & Clear */
@@ -270,8 +270,8 @@ struct tc35815_regs {
270#define Int_IntMacRx 0x00000002 /* 1:Rx controller & Clear */ 270#define Int_IntMacRx 0x00000002 /* 1:Rx controller & Clear */
271#define Int_IntMacTx 0x00000001 /* 1:Tx controller & Clear */ 271#define Int_IntMacTx 0x00000001 /* 1:Tx controller & Clear */
272 272
273/* MD_CA bit asign --------------------------------------------------------- */ 273/* MD_CA bit assign --------------------------------------------------------- */
274#define MD_CA_PreSup 0x00001000 /* 1:Preamble Supress */ 274#define MD_CA_PreSup 0x00001000 /* 1:Preamble Suppress */
275#define MD_CA_Busy 0x00000800 /* 1:Busy (Start Operation) */ 275#define MD_CA_Busy 0x00000800 /* 1:Busy (Start Operation) */
276#define MD_CA_Wr 0x00000400 /* 1:Write 0:Read */ 276#define MD_CA_Wr 0x00000400 /* 1:Write 0:Read */
277 277
@@ -296,7 +296,7 @@ struct BDesc {
296 296
297#define FD_ALIGN 16 297#define FD_ALIGN 16
298 298
299/* Frame Descripter bit asign ---------------------------------------------- */ 299/* Frame Descripter bit assign ---------------------------------------------- */
300#define FD_FDLength_MASK 0x0000FFFF /* Length MASK */ 300#define FD_FDLength_MASK 0x0000FFFF /* Length MASK */
301#define FD_BDCnt_MASK 0x001F0000 /* BD count MASK in FD */ 301#define FD_BDCnt_MASK 0x001F0000 /* BD count MASK in FD */
302#define FD_FrmOpt_MASK 0x7C000000 /* Frame option MASK */ 302#define FD_FrmOpt_MASK 0x7C000000 /* Frame option MASK */
@@ -309,8 +309,8 @@ struct BDesc {
309#define FD_Next_EOL 0x00000001 /* FD EOL indicator */ 309#define FD_Next_EOL 0x00000001 /* FD EOL indicator */
310#define FD_BDCnt_SHIFT 16 310#define FD_BDCnt_SHIFT 16
311 311
312/* Buffer Descripter bit asign --------------------------------------------- */ 312/* Buffer Descripter bit assign --------------------------------------------- */
313#define BD_BuffLength_MASK 0x0000FFFF /* Recieve Data Size */ 313#define BD_BuffLength_MASK 0x0000FFFF /* Receive Data Size */
314#define BD_RxBDID_MASK 0x00FF0000 /* BD ID Number MASK */ 314#define BD_RxBDID_MASK 0x00FF0000 /* BD ID Number MASK */
315#define BD_RxBDSeqN_MASK 0x7F000000 /* Rx BD Sequence Number */ 315#define BD_RxBDSeqN_MASK 0x7F000000 /* Rx BD Sequence Number */
316#define BD_CownsBD 0x80000000 /* BD Controller owner bit */ 316#define BD_CownsBD 0x80000000 /* BD Controller owner bit */
@@ -339,7 +339,7 @@ struct BDesc {
339#define TX_THRESHOLD 1024 339#define TX_THRESHOLD 1024
340/* used threshold with packet max byte for low pci transfer ability.*/ 340/* used threshold with packet max byte for low pci transfer ability.*/
341#define TX_THRESHOLD_MAX 1536 341#define TX_THRESHOLD_MAX 1536
342/* setting threshold max value when overrun error occured this count. */ 342/* setting threshold max value when overrun error occurred this count. */
343#define TX_THRESHOLD_KEEP_LIMIT 10 343#define TX_THRESHOLD_KEEP_LIMIT 10
344 344
345/* 16 + RX_BUF_NUM * 8 + RX_FD_NUM * 16 + TX_FD_NUM * 32 <= PAGE_SIZE*FD_PAGE_NUM */ 345/* 16 + RX_BUF_NUM * 8 + RX_FD_NUM * 16 + TX_FD_NUM * 32 <= PAGE_SIZE*FD_PAGE_NUM */
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c
index 3397618d4d96..8564ec5cfb7f 100644
--- a/drivers/net/tehuti.c
+++ b/drivers/net/tehuti.c
@@ -645,7 +645,7 @@ static int bdx_ioctl_priv(struct net_device *ndev, struct ifreq *ifr, int cmd)
645 if (cmd != SIOCDEVPRIVATE) { 645 if (cmd != SIOCDEVPRIVATE) {
646 error = copy_from_user(data, ifr->ifr_data, sizeof(data)); 646 error = copy_from_user(data, ifr->ifr_data, sizeof(data));
647 if (error) { 647 if (error) {
648 pr_err("cant copy from user\n"); 648 pr_err("can't copy from user\n");
649 RET(-EFAULT); 649 RET(-EFAULT);
650 } 650 }
651 DBG("%d 0x%x 0x%x\n", data[0], data[1], data[2]); 651 DBG("%d 0x%x 0x%x\n", data[0], data[1], data[2]);
@@ -999,7 +999,7 @@ static inline void bdx_rxdb_free_elem(struct rxdb *db, int n)
999 * 999 *
1000 * RxD fifo is smaller than RxF fifo by design. Upon high load, RxD will be 1000 * RxD fifo is smaller than RxF fifo by design. Upon high load, RxD will be
1001 * filled and packets will be dropped by nic without getting into host or 1001 * filled and packets will be dropped by nic without getting into host or
1002 * cousing interrupt. Anyway, in that condition, host has no chance to proccess 1002 * cousing interrupt. Anyway, in that condition, host has no chance to process
1003 * all packets, but dropping in nic is cheaper, since it takes 0 cpu cycles 1003 * all packets, but dropping in nic is cheaper, since it takes 0 cpu cycles
1004 */ 1004 */
1005 1005
@@ -1200,8 +1200,8 @@ static void bdx_recycle_skb(struct bdx_priv *priv, struct rxd_desc *rxdd)
1200 RET(); 1200 RET();
1201} 1201}
1202 1202
1203/* bdx_rx_receive - recieves full packets from RXD fifo and pass them to OS 1203/* bdx_rx_receive - receives full packets from RXD fifo and pass them to OS
1204 * NOTE: a special treatment is given to non-continous descriptors 1204 * NOTE: a special treatment is given to non-continuous descriptors
1205 * that start near the end, wraps around and continue at the beginning. a second 1205 * that start near the end, wraps around and continue at the beginning. a second
1206 * part is copied right after the first, and then descriptor is interpreted as 1206 * part is copied right after the first, and then descriptor is interpreted as
1207 * normal. fifo has an extra space to allow such operations 1207 * normal. fifo has an extra space to allow such operations
@@ -1584,9 +1584,9 @@ err_mem:
1584} 1584}
1585 1585
1586/* 1586/*
1587 * bdx_tx_space - calculates avalable space in TX fifo 1587 * bdx_tx_space - calculates available space in TX fifo
1588 * @priv - NIC private structure 1588 * @priv - NIC private structure
1589 * Returns avaliable space in TX fifo in bytes 1589 * Returns available space in TX fifo in bytes
1590 */ 1590 */
1591static inline int bdx_tx_space(struct bdx_priv *priv) 1591static inline int bdx_tx_space(struct bdx_priv *priv)
1592{ 1592{
diff --git a/drivers/net/tehuti.h b/drivers/net/tehuti.h
index b6ba8601e2b5..c5642fefc9e7 100644
--- a/drivers/net/tehuti.h
+++ b/drivers/net/tehuti.h
@@ -502,7 +502,7 @@ struct txd_desc {
502#define GMAC_RX_FILTER_ACRC 0x0010 /* accept crc error */ 502#define GMAC_RX_FILTER_ACRC 0x0010 /* accept crc error */
503#define GMAC_RX_FILTER_AM 0x0008 /* accept multicast */ 503#define GMAC_RX_FILTER_AM 0x0008 /* accept multicast */
504#define GMAC_RX_FILTER_AB 0x0004 /* accept broadcast */ 504#define GMAC_RX_FILTER_AB 0x0004 /* accept broadcast */
505#define GMAC_RX_FILTER_PRM 0x0001 /* [0:1] promiscous mode */ 505#define GMAC_RX_FILTER_PRM 0x0001 /* [0:1] promiscuous mode */
506 506
507#define MAX_FRAME_AB_VAL 0x3fff /* 13:0 */ 507#define MAX_FRAME_AB_VAL 0x3fff /* 13:0 */
508 508
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 73c942d85f07..b8c5f35577e4 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -9712,7 +9712,7 @@ static int tg3_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
9712 eeprom->len += b_count; 9712 eeprom->len += b_count;
9713 } 9713 }
9714 9714
9715 /* read bytes upto the last 4 byte boundary */ 9715 /* read bytes up to the last 4 byte boundary */
9716 pd = &data[eeprom->len]; 9716 pd = &data[eeprom->len];
9717 for (i = 0; i < (len - (len & 3)); i += 4) { 9717 for (i = 0; i < (len - (len & 3)); i += 4) {
9718 ret = tg3_nvram_read_be32(tp, offset + i, &val); 9718 ret = tg3_nvram_read_be32(tp, offset + i, &val);
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index 73884b69b749..5e96706ad108 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2130,7 +2130,7 @@
2130#define MII_TG3_DSP_EXP96 0x0f96 2130#define MII_TG3_DSP_EXP96 0x0f96
2131#define MII_TG3_DSP_EXP97 0x0f97 2131#define MII_TG3_DSP_EXP97 0x0f97
2132 2132
2133#define MII_TG3_AUX_CTRL 0x18 /* auxilliary control register */ 2133#define MII_TG3_AUX_CTRL 0x18 /* auxiliary control register */
2134 2134
2135#define MII_TG3_AUXCTL_PCTL_100TX_LPWR 0x0010 2135#define MII_TG3_AUXCTL_PCTL_100TX_LPWR 0x0010
2136#define MII_TG3_AUXCTL_PCTL_SPR_ISOLATE 0x0020 2136#define MII_TG3_AUXCTL_PCTL_SPR_ISOLATE 0x0020
@@ -2146,7 +2146,7 @@
2146#define MII_TG3_AUXCTL_ACTL_TX_6DB 0x0400 2146#define MII_TG3_AUXCTL_ACTL_TX_6DB 0x0400
2147#define MII_TG3_AUXCTL_SHDWSEL_AUXCTL 0x0000 2147#define MII_TG3_AUXCTL_SHDWSEL_AUXCTL 0x0000
2148 2148
2149#define MII_TG3_AUX_STAT 0x19 /* auxilliary status register */ 2149#define MII_TG3_AUX_STAT 0x19 /* auxiliary status register */
2150#define MII_TG3_AUX_STAT_LPASS 0x0004 2150#define MII_TG3_AUX_STAT_LPASS 0x0004
2151#define MII_TG3_AUX_STAT_SPDMASK 0x0700 2151#define MII_TG3_AUX_STAT_SPDMASK 0x0700
2152#define MII_TG3_AUX_STAT_10HALF 0x0100 2152#define MII_TG3_AUX_STAT_10HALF 0x0100
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index 10800f16a231..8a3b191b195b 100644
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -208,7 +208,7 @@ static void print_rx_state(struct net_device *dev)
208 * passing/getting the next value from the nic. As with all requests 208 * passing/getting the next value from the nic. As with all requests
209 * on this nic it has to be done in two stages, a) tell the nic which 209 * on this nic it has to be done in two stages, a) tell the nic which
210 * memory address you want to access and b) pass/get the value from the nic. 210 * memory address you want to access and b) pass/get the value from the nic.
211 * With the EEProm, you have to wait before and inbetween access a) and b). 211 * With the EEProm, you have to wait before and between access a) and b).
212 * As this is only read at initialization time and the wait period is very 212 * As this is only read at initialization time and the wait period is very
213 * small we shouldn't have to worry about scheduling issues. 213 * small we shouldn't have to worry about scheduling issues.
214 */ 214 */
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
index 785ad1a2157b..2bedc0ace812 100644
--- a/drivers/net/tokenring/madgemc.c
+++ b/drivers/net/tokenring/madgemc.c
@@ -73,7 +73,7 @@ static void madgemc_setint(struct net_device *dev, int val);
73static irqreturn_t madgemc_interrupt(int irq, void *dev_id); 73static irqreturn_t madgemc_interrupt(int irq, void *dev_id);
74 74
75/* 75/*
76 * These work around paging, however they don't guarentee you're on the 76 * These work around paging, however they don't guarantee you're on the
77 * right page. 77 * right page.
78 */ 78 */
79#define SIFREADB(reg) (inb(dev->base_addr + ((reg<0x8)?reg:reg-0x8))) 79#define SIFREADB(reg) (inb(dev->base_addr + ((reg<0x8)?reg:reg-0x8)))
@@ -387,7 +387,7 @@ getout:
387 * both with their own disadvantages... 387 * both with their own disadvantages...
388 * 388 *
389 * 1) Read in the SIFSTS register from the TMS controller. This 389 * 1) Read in the SIFSTS register from the TMS controller. This
390 * is guarenteed to be accurate, however, there's a fairly 390 * is guaranteed to be accurate, however, there's a fairly
391 * large performance penalty for doing so: the Madge chips 391 * large performance penalty for doing so: the Madge chips
392 * must request the register from the Eagle, the Eagle must 392 * must request the register from the Eagle, the Eagle must
393 * read them from its internal bus, and then take the route 393 * read them from its internal bus, and then take the route
@@ -454,7 +454,7 @@ static irqreturn_t madgemc_interrupt(int irq, void *dev_id)
454} 454}
455 455
456/* 456/*
457 * Set the card to the prefered ring speed. 457 * Set the card to the preferred ring speed.
458 * 458 *
459 * Unlike newer cards, the MC16/32 have their speed selection 459 * Unlike newer cards, the MC16/32 have their speed selection
460 * circuit connected to the Madge ASICs and not to the TMS380 460 * circuit connected to the Madge ASICs and not to the TMS380
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index 63db5a6762ae..d9044aba7afa 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -393,7 +393,7 @@ static int smctr_alloc_shared_memory(struct net_device *dev)
393 tp->rx_bdb_end[NON_MAC_QUEUE] = (BDBlock *)smctr_malloc(dev, 0); 393 tp->rx_bdb_end[NON_MAC_QUEUE] = (BDBlock *)smctr_malloc(dev, 0);
394 394
395 /* Allocate MAC transmit buffers. 395 /* Allocate MAC transmit buffers.
396 * MAC Tx Buffers doen't have to be on an ODD Boundry. 396 * MAC Tx Buffers doen't have to be on an ODD Boundary.
397 */ 397 */
398 tp->tx_buff_head[MAC_QUEUE] 398 tp->tx_buff_head[MAC_QUEUE]
399 = (__u16 *)smctr_malloc(dev, tp->tx_buff_size[MAC_QUEUE]); 399 = (__u16 *)smctr_malloc(dev, tp->tx_buff_size[MAC_QUEUE]);
@@ -415,7 +415,7 @@ static int smctr_alloc_shared_memory(struct net_device *dev)
415 415
416 /* Allocate Non-MAC transmit buffers. 416 /* Allocate Non-MAC transmit buffers.
417 * ?? For maximum Netware performance, put Tx Buffers on 417 * ?? For maximum Netware performance, put Tx Buffers on
418 * ODD Boundry and then restore malloc to Even Boundrys. 418 * ODD Boundary and then restore malloc to Even Boundrys.
419 */ 419 */
420 smctr_malloc(dev, 1L); 420 smctr_malloc(dev, 1L);
421 tp->tx_buff_head[NON_MAC_QUEUE] 421 tp->tx_buff_head[NON_MAC_QUEUE]
@@ -1311,7 +1311,7 @@ static unsigned int smctr_get_num_rx_bdbs(struct net_device *dev)
1311 mem_used += sizeof(BDBlock) * tp->num_rx_bdbs[MAC_QUEUE]; 1311 mem_used += sizeof(BDBlock) * tp->num_rx_bdbs[MAC_QUEUE];
1312 1312
1313 /* Allocate MAC transmit buffers. 1313 /* Allocate MAC transmit buffers.
1314 * MAC transmit buffers don't have to be on an ODD Boundry. 1314 * MAC transmit buffers don't have to be on an ODD Boundary.
1315 */ 1315 */
1316 mem_used += tp->tx_buff_size[MAC_QUEUE]; 1316 mem_used += tp->tx_buff_size[MAC_QUEUE];
1317 1317
@@ -1325,7 +1325,7 @@ static unsigned int smctr_get_num_rx_bdbs(struct net_device *dev)
1325 1325
1326 /* Allocate Non-MAC transmit buffers. 1326 /* Allocate Non-MAC transmit buffers.
1327 * For maximum Netware performance, put Tx Buffers on 1327 * For maximum Netware performance, put Tx Buffers on
1328 * ODD Boundry,and then restore malloc to Even Boundrys. 1328 * ODD Boundary,and then restore malloc to Even Boundrys.
1329 */ 1329 */
1330 mem_used += 1L; 1330 mem_used += 1L;
1331 mem_used += tp->tx_buff_size[NON_MAC_QUEUE]; 1331 mem_used += tp->tx_buff_size[NON_MAC_QUEUE];
@@ -3069,8 +3069,8 @@ static int smctr_load_node_addr(struct net_device *dev)
3069 * disabled.!? 3069 * disabled.!?
3070 * 3070 *
3071 * NOTE 2: If the monitor_state is MS_BEACON_TEST_STATE and the receive_mask 3071 * NOTE 2: If the monitor_state is MS_BEACON_TEST_STATE and the receive_mask
3072 * has any multi-cast or promiscous bits set, the receive_mask needs to 3072 * has any multi-cast or promiscuous bits set, the receive_mask needs to
3073 * be changed to clear the multi-cast or promiscous mode bits, the lobe_test 3073 * be changed to clear the multi-cast or promiscuous mode bits, the lobe_test
3074 * run, and then the receive mask set back to its original value if the test 3074 * run, and then the receive mask set back to its original value if the test
3075 * is successful. 3075 * is successful.
3076 */ 3076 */
diff --git a/drivers/net/tokenring/tms380tr.h b/drivers/net/tokenring/tms380tr.h
index 60b30ee38dcb..e5a617c586c2 100644
--- a/drivers/net/tokenring/tms380tr.h
+++ b/drivers/net/tokenring/tms380tr.h
@@ -442,7 +442,7 @@ typedef struct {
442#define PASS_FIRST_BUF_ONLY 0x0100 /* Passes only first internal buffer 442#define PASS_FIRST_BUF_ONLY 0x0100 /* Passes only first internal buffer
443 * of each received frame; FrameSize 443 * of each received frame; FrameSize
444 * of RPLs must contain internal 444 * of RPLs must contain internal
445 * BUFFER_SIZE bits for promiscous mode. 445 * BUFFER_SIZE bits for promiscuous mode.
446 */ 446 */
447#define ENABLE_FULL_DUPLEX_SELECTION 0x2000 447#define ENABLE_FULL_DUPLEX_SELECTION 0x2000
448 /* Enable the use of full-duplex 448 /* Enable the use of full-duplex
diff --git a/drivers/net/tsi108_eth.h b/drivers/net/tsi108_eth.h
index 5a77ae6c5f36..5fee7d78dc6d 100644
--- a/drivers/net/tsi108_eth.h
+++ b/drivers/net/tsi108_eth.h
@@ -305,9 +305,9 @@
305#define TSI108_TX_CRC (1 << 5) /* Generate CRC for this packet */ 305#define TSI108_TX_CRC (1 << 5) /* Generate CRC for this packet */
306#define TSI108_TX_INT (1 << 14) /* Generate an IRQ after frag. processed */ 306#define TSI108_TX_INT (1 << 14) /* Generate an IRQ after frag. processed */
307#define TSI108_TX_RETRY (0xf << 16) /* 4 bit field indicating num. of retries */ 307#define TSI108_TX_RETRY (0xf << 16) /* 4 bit field indicating num. of retries */
308#define TSI108_TX_COL (1 << 20) /* Set if a collision occured */ 308#define TSI108_TX_COL (1 << 20) /* Set if a collision occurred */
309#define TSI108_TX_LCOL (1 << 24) /* Set if a late collision occured */ 309#define TSI108_TX_LCOL (1 << 24) /* Set if a late collision occurred */
310#define TSI108_TX_UNDER (1 << 25) /* Set if a FIFO underrun occured */ 310#define TSI108_TX_UNDER (1 << 25) /* Set if a FIFO underrun occurred */
311#define TSI108_TX_RLIM (1 << 26) /* Set if the retry limit was reached */ 311#define TSI108_TX_RLIM (1 << 26) /* Set if the retry limit was reached */
312#define TSI108_TX_OK (1 << 30) /* Set if the frame TX was successful */ 312#define TSI108_TX_OK (1 << 30) /* Set if the frame TX was successful */
313#define TSI108_TX_OWN (1 << 31) /* Set if the device owns the descriptor */ 313#define TSI108_TX_OWN (1 << 31) /* Set if the device owns the descriptor */
@@ -332,7 +332,7 @@ typedef struct {
332#define TSI108_RX_RUNT (1 << 4)/* Packet is less than minimum size */ 332#define TSI108_RX_RUNT (1 << 4)/* Packet is less than minimum size */
333#define TSI108_RX_HASH (1 << 7)/* Hash table match */ 333#define TSI108_RX_HASH (1 << 7)/* Hash table match */
334#define TSI108_RX_BAD (1 << 8) /* Bad frame */ 334#define TSI108_RX_BAD (1 << 8) /* Bad frame */
335#define TSI108_RX_OVER (1 << 9) /* FIFO overrun occured */ 335#define TSI108_RX_OVER (1 << 9) /* FIFO overrun occurred */
336#define TSI108_RX_TRUNC (1 << 11) /* Packet truncated due to excess length */ 336#define TSI108_RX_TRUNC (1 << 11) /* Packet truncated due to excess length */
337#define TSI108_RX_CRC (1 << 12) /* Packet had a CRC error */ 337#define TSI108_RX_CRC (1 << 12) /* Packet had a CRC error */
338#define TSI108_RX_INT (1 << 13) /* Generate an IRQ after frag. processed */ 338#define TSI108_RX_INT (1 << 13) /* Generate an IRQ after frag. processed */
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
index 4dbd493b996b..efaa1d69b720 100644
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
@@ -79,7 +79,7 @@
79 every usable DECchip board, I pinched Donald's 'next_module' field to 79 every usable DECchip board, I pinched Donald's 'next_module' field to
80 link my modules together. 80 link my modules together.
81 81
82 Upto 15 EISA cards can be supported under this driver, limited primarily 82 Up to 15 EISA cards can be supported under this driver, limited primarily
83 by the available IRQ lines. I have checked different configurations of 83 by the available IRQ lines. I have checked different configurations of
84 multiple depca, EtherWORKS 3 cards and de4x5 cards and have not found a 84 multiple depca, EtherWORKS 3 cards and de4x5 cards and have not found a
85 problem yet (provided you have at least depca.c v0.38) ... 85 problem yet (provided you have at least depca.c v0.38) ...
@@ -517,7 +517,7 @@ struct mii_phy {
517 u_int mci; /* 21142 MII Connector Interrupt info */ 517 u_int mci; /* 21142 MII Connector Interrupt info */
518}; 518};
519 519
520#define DE4X5_MAX_PHY 8 /* Allow upto 8 attached PHY devices per board */ 520#define DE4X5_MAX_PHY 8 /* Allow up to 8 attached PHY devices per board */
521 521
522struct sia_phy { 522struct sia_phy {
523 u_char mc; /* Media Code */ 523 u_char mc; /* Media Code */
@@ -1436,7 +1436,7 @@ de4x5_sw_reset(struct net_device *dev)
1436 1436
1437 /* Poll for setup frame completion (adapter interrupts are disabled now) */ 1437 /* Poll for setup frame completion (adapter interrupts are disabled now) */
1438 1438
1439 for (j=0, i=0;(i<500) && (j==0);i++) { /* Upto 500ms delay */ 1439 for (j=0, i=0;(i<500) && (j==0);i++) { /* Up to 500ms delay */
1440 mdelay(1); 1440 mdelay(1);
1441 if ((s32)le32_to_cpu(lp->tx_ring[lp->tx_new].status) >= 0) j=1; 1441 if ((s32)le32_to_cpu(lp->tx_ring[lp->tx_new].status) >= 0) j=1;
1442 } 1442 }
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index 7064e035757a..fb07f48910ae 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -1224,7 +1224,7 @@ static void dmfe_timer(unsigned long data)
1224 1224
1225 1225
1226 /* If chip reports that link is failed it could be because external 1226 /* If chip reports that link is failed it could be because external
1227 PHY link status pin is not conected correctly to chip 1227 PHY link status pin is not connected correctly to chip
1228 To be sure ask PHY too. 1228 To be sure ask PHY too.
1229 */ 1229 */
1230 1230
diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c
index 3031ed9c4a1a..296486bf0956 100644
--- a/drivers/net/tulip/eeprom.c
+++ b/drivers/net/tulip/eeprom.c
@@ -115,7 +115,7 @@ static void __devinit tulip_build_fake_mediatable(struct tulip_private *tp)
115 0x02, /* phy reset sequence length */ 115 0x02, /* phy reset sequence length */
116 0x01, 0x00, /* phy reset sequence */ 116 0x01, 0x00, /* phy reset sequence */
117 0x00, 0x78, /* media capabilities */ 117 0x00, 0x78, /* media capabilities */
118 0x00, 0xe0, /* nway advertisment */ 118 0x00, 0xe0, /* nway advertisement */
119 0x00, 0x05, /* fdx bit map */ 119 0x00, 0x05, /* fdx bit map */
120 0x00, 0x06 /* ttm bit map */ 120 0x00, 0x06 /* ttm bit map */
121 }; 121 };
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index 7fa5ec2de942..82653cb07857 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -846,7 +846,7 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)
846 if(typhoon_num_free_tx(txRing) < (numDesc + 2)) { 846 if(typhoon_num_free_tx(txRing) < (numDesc + 2)) {
847 netif_stop_queue(dev); 847 netif_stop_queue(dev);
848 848
849 /* A Tx complete IRQ could have gotten inbetween, making 849 /* A Tx complete IRQ could have gotten between, making
850 * the ring free again. Only need to recheck here, since 850 * the ring free again. Only need to recheck here, since
851 * Tx is serialized. 851 * Tx is serialized.
852 */ 852 */
diff --git a/drivers/net/ucc_geth.h b/drivers/net/ucc_geth.h
index 055b87ab4f07..d12fcad145e9 100644
--- a/drivers/net/ucc_geth.h
+++ b/drivers/net/ucc_geth.h
@@ -80,7 +80,7 @@ struct ucc_geth {
80 frames) received that were between 128 80 frames) received that were between 128
81 (Including FCS length==4) and 255 octets */ 81 (Including FCS length==4) and 255 octets */
82 u32 txok; /* Total number of octets residing in frames 82 u32 txok; /* Total number of octets residing in frames
83 that where involved in successfull 83 that where involved in successful
84 transmission */ 84 transmission */
85 u16 txcf; /* Total number of PAUSE control frames 85 u16 txcf; /* Total number of PAUSE control frames
86 transmitted by this MAC */ 86 transmitted by this MAC */
@@ -759,7 +759,7 @@ struct ucc_geth_hardware_statistics {
759 frames) received that were between 128 759 frames) received that were between 128
760 (Including FCS length==4) and 255 octets */ 760 (Including FCS length==4) and 255 octets */
761 u32 txok; /* Total number of octets residing in frames 761 u32 txok; /* Total number of octets residing in frames
762 that where involved in successfull 762 that where involved in successful
763 transmission */ 763 transmission */
764 u16 txcf; /* Total number of PAUSE control frames 764 u16 txcf; /* Total number of PAUSE control frames
765 transmitted by this MAC */ 765 transmitted by this MAC */
diff --git a/drivers/net/usb/cdc_eem.c b/drivers/net/usb/cdc_eem.c
index 8f128541656d..882f53f708df 100644
--- a/drivers/net/usb/cdc_eem.c
+++ b/drivers/net/usb/cdc_eem.c
@@ -190,7 +190,7 @@ static int eem_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
190 190
191 /* 191 /*
192 * EEM packet header format: 192 * EEM packet header format:
193 * b0..14: EEM type dependant (Data or Command) 193 * b0..14: EEM type dependent (Data or Command)
194 * b15: bmType 194 * b15: bmType
195 */ 195 */
196 header = get_unaligned_le16(skb->data); 196 header = get_unaligned_le16(skb->data);
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index 7dc84971f26f..ad0298f9b5f9 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -1221,7 +1221,7 @@ static void kaweth_disconnect(struct usb_interface *intf)
1221 1221
1222 usb_set_intfdata(intf, NULL); 1222 usb_set_intfdata(intf, NULL);
1223 if (!kaweth) { 1223 if (!kaweth) {
1224 dev_warn(&intf->dev, "unregistering non-existant device\n"); 1224 dev_warn(&intf->dev, "unregistering non-existent device\n");
1225 return; 1225 return;
1226 } 1226 }
1227 netdev = kaweth->net; 1227 netdev = kaweth->net;
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index 5e7f069eab53..eb5d75df5d5d 100644
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -1861,7 +1861,7 @@ static void rhine_restart_tx(struct net_device *dev) {
1861 u32 intr_status; 1861 u32 intr_status;
1862 1862
1863 /* 1863 /*
1864 * If new errors occured, we need to sort them out before doing Tx. 1864 * If new errors occurred, we need to sort them out before doing Tx.
1865 * In that case the ISR will be back here RSN anyway. 1865 * In that case the ISR will be back here RSN anyway.
1866 */ 1866 */
1867 intr_status = get_intr_status(dev); 1867 intr_status = get_intr_status(dev);
@@ -1887,7 +1887,7 @@ static void rhine_restart_tx(struct net_device *dev) {
1887 /* This should never happen */ 1887 /* This should never happen */
1888 if (debug > 1) 1888 if (debug > 1)
1889 printk(KERN_WARNING "%s: rhine_restart_tx() " 1889 printk(KERN_WARNING "%s: rhine_restart_tx() "
1890 "Another error occured %8.8x.\n", 1890 "Another error occurred %8.8x.\n",
1891 dev->name, intr_status); 1891 dev->name, intr_status);
1892 } 1892 }
1893 1893
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 0d6fec6b7d93..4fe051753842 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -292,7 +292,7 @@ VELOCITY_PARAM(DMA_length, "DMA length");
292/* IP_byte_align[] is used for IP header DWORD byte aligned 292/* IP_byte_align[] is used for IP header DWORD byte aligned
293 0: indicate the IP header won't be DWORD byte aligned.(Default) . 293 0: indicate the IP header won't be DWORD byte aligned.(Default) .
294 1: indicate the IP header will be DWORD byte aligned. 294 1: indicate the IP header will be DWORD byte aligned.
295 In some enviroment, the IP header should be DWORD byte aligned, 295 In some environment, the IP header should be DWORD byte aligned,
296 or the packet will be droped when we receive it. (eg: IPVS) 296 or the packet will be droped when we receive it. (eg: IPVS)
297*/ 297*/
298VELOCITY_PARAM(IP_byte_align, "Enable IP header dword aligned"); 298VELOCITY_PARAM(IP_byte_align, "Enable IP header dword aligned");
@@ -1994,7 +1994,7 @@ static inline void velocity_rx_csum(struct rx_desc *rd, struct sk_buff *skb)
1994 * @dev: network device 1994 * @dev: network device
1995 * 1995 *
1996 * Replace the current skb that is scheduled for Rx processing by a 1996 * Replace the current skb that is scheduled for Rx processing by a
1997 * shorter, immediatly allocated skb, if the received packet is small 1997 * shorter, immediately allocated skb, if the received packet is small
1998 * enough. This function returns a negative value if the received 1998 * enough. This function returns a negative value if the received
1999 * packet is too big or if memory is exhausted. 1999 * packet is too big or if memory is exhausted.
2000 */ 2000 */
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index cc14b4a75048..0d47c3a05307 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -892,7 +892,7 @@ vmxnet3_prepare_tso(struct sk_buff *skb,
892 * Transmits a pkt thru a given tq 892 * Transmits a pkt thru a given tq
893 * Returns: 893 * Returns:
894 * NETDEV_TX_OK: descriptors are setup successfully 894 * NETDEV_TX_OK: descriptors are setup successfully
895 * NETDEV_TX_OK: error occured, the pkt is dropped 895 * NETDEV_TX_OK: error occurred, the pkt is dropped
896 * NETDEV_TX_BUSY: tx ring is full, queue is stopped 896 * NETDEV_TX_BUSY: tx ring is full, queue is stopped
897 * 897 *
898 * Side-effects: 898 * Side-effects:
@@ -2685,7 +2685,7 @@ vmxnet3_read_mac_addr(struct vmxnet3_adapter *adapter, u8 *mac)
2685 * Enable MSIx vectors. 2685 * Enable MSIx vectors.
2686 * Returns : 2686 * Returns :
2687 * 0 on successful enabling of required vectors, 2687 * 0 on successful enabling of required vectors,
2688 * VMXNET3_LINUX_MIN_MSIX_VECT when only minumum number of vectors required 2688 * VMXNET3_LINUX_MIN_MSIX_VECT when only minimum number of vectors required
2689 * could be enabled. 2689 * could be enabled.
2690 * number of vectors which can be enabled otherwise (this number is smaller 2690 * number of vectors which can be enabled otherwise (this number is smaller
2691 * than VMXNET3_LINUX_MIN_MSIX_VECT) 2691 * than VMXNET3_LINUX_MIN_MSIX_VECT)
diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/vxge/vxge-config.c
index e74e4b42592d..401bebf59502 100644
--- a/drivers/net/vxge/vxge-config.c
+++ b/drivers/net/vxge/vxge-config.c
@@ -187,7 +187,7 @@ vxge_hw_vpath_fw_api(struct __vxge_hw_virtualpath *vpath, u32 action,
187 VXGE_HW_DEF_DEVICE_POLL_MILLIS); 187 VXGE_HW_DEF_DEVICE_POLL_MILLIS);
188 188
189 /* The __vxge_hw_device_register_poll can udelay for a significant 189 /* The __vxge_hw_device_register_poll can udelay for a significant
190 * amount of time, blocking other proccess from the CPU. If it delays 190 * amount of time, blocking other process from the CPU. If it delays
191 * for ~5secs, a NMI error can occur. A way around this is to give up 191 * for ~5secs, a NMI error can occur. A way around this is to give up
192 * the processor via msleep, but this is not allowed is under lock. 192 * the processor via msleep, but this is not allowed is under lock.
193 * So, only allow it to sleep for ~4secs if open. Otherwise, delay for 193 * So, only allow it to sleep for ~4secs if open. Otherwise, delay for
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index 395423aeec00..aff68c1118d4 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -2282,7 +2282,7 @@ vxge_alarm_msix_handle(int irq, void *dev_id)
2282 VXGE_HW_VPATH_MSIX_ACTIVE) + VXGE_ALARM_MSIX_ID; 2282 VXGE_HW_VPATH_MSIX_ACTIVE) + VXGE_ALARM_MSIX_ID;
2283 2283
2284 for (i = 0; i < vdev->no_of_vpath; i++) { 2284 for (i = 0; i < vdev->no_of_vpath; i++) {
2285 /* Reduce the chance of loosing alarm interrupts by masking 2285 /* Reduce the chance of losing alarm interrupts by masking
2286 * the vector. A pending bit will be set if an alarm is 2286 * the vector. A pending bit will be set if an alarm is
2287 * generated and on unmask the interrupt will be fired. 2287 * generated and on unmask the interrupt will be fired.
2288 */ 2288 */
@@ -2788,7 +2788,7 @@ static int vxge_open(struct net_device *dev)
2788 } 2788 }
2789 2789
2790 /* Enable vpath to sniff all unicast/multicast traffic that not 2790 /* Enable vpath to sniff all unicast/multicast traffic that not
2791 * addressed to them. We allow promiscous mode for PF only 2791 * addressed to them. We allow promiscuous mode for PF only
2792 */ 2792 */
2793 2793
2794 val64 = 0; 2794 val64 = 0;
@@ -2890,7 +2890,7 @@ out0:
2890 return ret; 2890 return ret;
2891} 2891}
2892 2892
2893/* Loop throught the mac address list and delete all the entries */ 2893/* Loop through the mac address list and delete all the entries */
2894static void vxge_free_mac_add_list(struct vxge_vpath *vpath) 2894static void vxge_free_mac_add_list(struct vxge_vpath *vpath)
2895{ 2895{
2896 2896
@@ -2957,7 +2957,7 @@ static int do_vxge_close(struct net_device *dev, int do_io)
2957 val64); 2957 val64);
2958 } 2958 }
2959 2959
2960 /* Remove the function 0 from promiscous mode */ 2960 /* Remove the function 0 from promiscuous mode */
2961 vxge_hw_mgmt_reg_write(vdev->devh, 2961 vxge_hw_mgmt_reg_write(vdev->devh,
2962 vxge_hw_mgmt_reg_type_mrpcim, 2962 vxge_hw_mgmt_reg_type_mrpcim,
2963 0, 2963 0,
diff --git a/drivers/net/vxge/vxge-traffic.c b/drivers/net/vxge/vxge-traffic.c
index 8674f331311c..2638b8d97b8f 100644
--- a/drivers/net/vxge/vxge-traffic.c
+++ b/drivers/net/vxge/vxge-traffic.c
@@ -1111,7 +1111,7 @@ void vxge_hw_channel_dtr_free(struct __vxge_hw_channel *channel, void *dtrh)
1111 * vxge_hw_channel_dtr_count 1111 * vxge_hw_channel_dtr_count
1112 * @channel: Channel handle. Obtained via vxge_hw_channel_open(). 1112 * @channel: Channel handle. Obtained via vxge_hw_channel_open().
1113 * 1113 *
1114 * Retreive number of DTRs available. This function can not be called 1114 * Retrieve number of DTRs available. This function can not be called
1115 * from data path. ring_initial_replenishi() is the only user. 1115 * from data path. ring_initial_replenishi() is the only user.
1116 */ 1116 */
1117int vxge_hw_channel_dtr_count(struct __vxge_hw_channel *channel) 1117int vxge_hw_channel_dtr_count(struct __vxge_hw_channel *channel)
@@ -2060,7 +2060,7 @@ enum vxge_hw_status vxge_hw_vpath_promisc_enable(
2060 2060
2061 vpath = vp->vpath; 2061 vpath = vp->vpath;
2062 2062
2063 /* Enable promiscous mode for function 0 only */ 2063 /* Enable promiscuous mode for function 0 only */
2064 if (!(vpath->hldev->access_rights & 2064 if (!(vpath->hldev->access_rights &
2065 VXGE_HW_DEVICE_ACCESS_RIGHT_MRPCIM)) 2065 VXGE_HW_DEVICE_ACCESS_RIGHT_MRPCIM))
2066 return VXGE_HW_OK; 2066 return VXGE_HW_OK;
diff --git a/drivers/net/vxge/vxge-traffic.h b/drivers/net/vxge/vxge-traffic.h
index 9d9dfda4c7ab..6c2fc0b72af5 100644
--- a/drivers/net/vxge/vxge-traffic.h
+++ b/drivers/net/vxge/vxge-traffic.h
@@ -681,7 +681,7 @@ struct vxge_hw_xmac_aggr_stats {
681 * @rx_red_discard: Count of received frames that are discarded because of RED 681 * @rx_red_discard: Count of received frames that are discarded because of RED
682 * (Random Early Discard). 682 * (Random Early Discard).
683 * @rx_xgmii_ctrl_err_cnt: Maintains a count of unexpected or misplaced control 683 * @rx_xgmii_ctrl_err_cnt: Maintains a count of unexpected or misplaced control
684 * characters occuring between times of normal data transmission 684 * characters occurring between times of normal data transmission
685 * (i.e. not included in RX_XGMII_DATA_ERR_CNT). This counter is 685 * (i.e. not included in RX_XGMII_DATA_ERR_CNT). This counter is
686 * incremented when either - 686 * incremented when either -
687 * 1) The Reconciliation Sublayer (RS) is expecting one control 687 * 1) The Reconciliation Sublayer (RS) is expecting one control
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index 10bafd59f9c3..6fb6f8e667d0 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -329,7 +329,7 @@ static int startmicrocode(struct cosa_data *cosa, int address);
329static int readmem(struct cosa_data *cosa, char __user *data, int addr, int len); 329static int readmem(struct cosa_data *cosa, char __user *data, int addr, int len);
330static int cosa_reset_and_read_id(struct cosa_data *cosa, char *id); 330static int cosa_reset_and_read_id(struct cosa_data *cosa, char *id);
331 331
332/* Auxilliary functions */ 332/* Auxiliary functions */
333static int get_wait_data(struct cosa_data *cosa); 333static int get_wait_data(struct cosa_data *cosa);
334static int put_wait_data(struct cosa_data *cosa, int data); 334static int put_wait_data(struct cosa_data *cosa, int data);
335static int puthexnumber(struct cosa_data *cosa, int number); 335static int puthexnumber(struct cosa_data *cosa, int number);
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index 4578e5b4b411..acb9ea830628 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -56,7 +56,7 @@
56 * IV. Notes 56 * IV. Notes
57 * The current error (XDU, RFO) recovery code is untested. 57 * The current error (XDU, RFO) recovery code is untested.
58 * So far, RDO takes his RX channel down and the right sequence to enable it 58 * So far, RDO takes his RX channel down and the right sequence to enable it
59 * again is still a mistery. If RDO happens, plan a reboot. More details 59 * again is still a mystery. If RDO happens, plan a reboot. More details
60 * in the code (NB: as this happens, TX still works). 60 * in the code (NB: as this happens, TX still works).
61 * Don't mess the cables during operation, especially on DTE ports. I don't 61 * Don't mess the cables during operation, especially on DTE ports. I don't
62 * suggest it for DCE either but at least one can get some messages instead 62 * suggest it for DCE either but at least one can get some messages instead
@@ -1065,7 +1065,7 @@ static int dscc4_open(struct net_device *dev)
1065 1065
1066 /* 1066 /*
1067 * Due to various bugs, there is no way to reliably reset a 1067 * Due to various bugs, there is no way to reliably reset a
1068 * specific port (manufacturer's dependant special PCI #RST wiring 1068 * specific port (manufacturer's dependent special PCI #RST wiring
1069 * apart: it affects all ports). Thus the device goes in the best 1069 * apart: it affects all ports). Thus the device goes in the best
1070 * silent mode possible at dscc4_close() time and simply claims to 1070 * silent mode possible at dscc4_close() time and simply claims to
1071 * be up if it's opened again. It still isn't possible to change 1071 * be up if it's opened again. It still isn't possible to change
@@ -1230,9 +1230,9 @@ static inline int dscc4_check_clock_ability(int port)
1230 * scaling. Of course some rounding may take place. 1230 * scaling. Of course some rounding may take place.
1231 * - no high speed mode (40Mb/s). May be trivial to do but I don't have an 1231 * - no high speed mode (40Mb/s). May be trivial to do but I don't have an
1232 * appropriate external clocking device for testing. 1232 * appropriate external clocking device for testing.
1233 * - no time-slot/clock mode 5: shameless lazyness. 1233 * - no time-slot/clock mode 5: shameless laziness.
1234 * 1234 *
1235 * The clock signals wiring can be (is ?) manufacturer dependant. Good luck. 1235 * The clock signals wiring can be (is ?) manufacturer dependent. Good luck.
1236 * 1236 *
1237 * BIG FAT WARNING: if the device isn't provided enough clocking signal, it 1237 * BIG FAT WARNING: if the device isn't provided enough clocking signal, it
1238 * won't pass the init sequence. For example, straight back-to-back DTE without 1238 * won't pass the init sequence. For example, straight back-to-back DTE without
diff --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c
index 48edc5f4dac8..e817583e6ec5 100644
--- a/drivers/net/wan/hostess_sv11.c
+++ b/drivers/net/wan/hostess_sv11.c
@@ -15,7 +15,7 @@
15 * The hardware does the bus handling to avoid the need for delays between 15 * The hardware does the bus handling to avoid the need for delays between
16 * touching control registers. 16 * touching control registers.
17 * 17 *
18 * Port B isnt wired (why - beats me) 18 * Port B isn't wired (why - beats me)
19 * 19 *
20 * Generic HDLC port Copyright (C) 2008 Krzysztof Halasa <khc@pm.waw.pl> 20 * Generic HDLC port Copyright (C) 2008 Krzysztof Halasa <khc@pm.waw.pl>
21 */ 21 */
diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c
index 6c571e198835..f1e1643dc3eb 100644
--- a/drivers/net/wan/ixp4xx_hss.c
+++ b/drivers/net/wan/ixp4xx_hss.c
@@ -178,7 +178,7 @@
178 * 178 *
179 * The resulting average clock frequency (assuming 33.333 MHz oscillator) is: 179 * The resulting average clock frequency (assuming 33.333 MHz oscillator) is:
180 * freq = 66.666 MHz / (A + (B + 1) / (C + 1)) 180 * freq = 66.666 MHz / (A + (B + 1) / (C + 1))
181 * minumum freq = 66.666 MHz / (A + 1) 181 * minimum freq = 66.666 MHz / (A + 1)
182 * maximum freq = 66.666 MHz / A 182 * maximum freq = 66.666 MHz / A
183 * 183 *
184 * Example: A = 2, B = 2, C = 7, CLOCK_CR register = 2 << 22 | 2 << 12 | 7 184 * Example: A = 2, B = 2, C = 7, CLOCK_CR register = 2 << 22 | 2 << 12 | 7
@@ -230,7 +230,7 @@
230#define PKT_PIPE_MODE_WRITE 0x57 230#define PKT_PIPE_MODE_WRITE 0x57
231 231
232/* HDLC packet status values - desc->status */ 232/* HDLC packet status values - desc->status */
233#define ERR_SHUTDOWN 1 /* stop or shutdown occurrance */ 233#define ERR_SHUTDOWN 1 /* stop or shutdown occurrence */
234#define ERR_HDLC_ALIGN 2 /* HDLC alignment error */ 234#define ERR_HDLC_ALIGN 2 /* HDLC alignment error */
235#define ERR_HDLC_FCS 3 /* HDLC Frame Check Sum error */ 235#define ERR_HDLC_FCS 3 /* HDLC Frame Check Sum error */
236#define ERR_RXFREE_Q_EMPTY 4 /* RX-free queue became empty while receiving 236#define ERR_RXFREE_Q_EMPTY 4 /* RX-free queue became empty while receiving
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index 70feb84df670..b7f2358d23be 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -24,7 +24,7 @@
24 * 24 *
25 * Linux driver notes: 25 * Linux driver notes:
26 * Linux uses the device struct lmc_private to pass private information 26 * Linux uses the device struct lmc_private to pass private information
27 * arround. 27 * around.
28 * 28 *
29 * The initialization portion of this driver (the lmc_reset() and the 29 * The initialization portion of this driver (the lmc_reset() and the
30 * lmc_dec_reset() functions, as well as the led controls and the 30 * lmc_dec_reset() functions, as well as the led controls and the
diff --git a/drivers/net/wan/lmc/lmc_var.h b/drivers/net/wan/lmc/lmc_var.h
index 65d01978e784..01ad45218d19 100644
--- a/drivers/net/wan/lmc/lmc_var.h
+++ b/drivers/net/wan/lmc/lmc_var.h
@@ -180,7 +180,7 @@ struct lmc___ctl {
180 180
181 181
182/* 182/*
183 * Carefull, look at the data sheet, there's more to this 183 * Careful, look at the data sheet, there's more to this
184 * structure than meets the eye. It should probably be: 184 * structure than meets the eye. It should probably be:
185 * 185 *
186 * struct tulip_desc_t { 186 * struct tulip_desc_t {
@@ -380,7 +380,7 @@ struct lmc___softc {
380/* CSR6 settings */ 380/* CSR6 settings */
381#define OPERATION_MODE 0x00000200 /* Full Duplex */ 381#define OPERATION_MODE 0x00000200 /* Full Duplex */
382#define PROMISC_MODE 0x00000040 /* Promiscuous Mode */ 382#define PROMISC_MODE 0x00000040 /* Promiscuous Mode */
383#define RECIEVE_ALL 0x40000000 /* Recieve All */ 383#define RECIEVE_ALL 0x40000000 /* Receive All */
384#define PASS_BAD_FRAMES 0x00000008 /* Pass Bad Frames */ 384#define PASS_BAD_FRAMES 0x00000008 /* Pass Bad Frames */
385 385
386/* Dec control registers CSR6 as well */ 386/* Dec control registers CSR6 as well */
@@ -398,7 +398,7 @@ struct lmc___softc {
398#define TULIP_CMD_RECEIVEALL 0x40000000L /* (RW) Receivel all frames? */ 398#define TULIP_CMD_RECEIVEALL 0x40000000L /* (RW) Receivel all frames? */
399#define TULIP_CMD_MUSTBEONE 0x02000000L /* (RW) Must Be One (21140) */ 399#define TULIP_CMD_MUSTBEONE 0x02000000L /* (RW) Must Be One (21140) */
400#define TULIP_CMD_TXTHRSHLDCTL 0x00400000L /* (RW) Transmit Threshold Mode (21140) */ 400#define TULIP_CMD_TXTHRSHLDCTL 0x00400000L /* (RW) Transmit Threshold Mode (21140) */
401#define TULIP_CMD_STOREFWD 0x00200000L /* (RW) Store and Foward (21140) */ 401#define TULIP_CMD_STOREFWD 0x00200000L /* (RW) Store and Forward (21140) */
402#define TULIP_CMD_NOHEARTBEAT 0x00080000L /* (RW) No Heartbeat (21140) */ 402#define TULIP_CMD_NOHEARTBEAT 0x00080000L /* (RW) No Heartbeat (21140) */
403#define TULIP_CMD_PORTSELECT 0x00040000L /* (RW) Post Select (100Mb) (21140) */ 403#define TULIP_CMD_PORTSELECT 0x00040000L /* (RW) Post Select (100Mb) (21140) */
404#define TULIP_CMD_FULLDUPLEX 0x00000200L /* (RW) Full Duplex Mode */ 404#define TULIP_CMD_FULLDUPLEX 0x00000200L /* (RW) Full Duplex Mode */
diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
index 93956861ea21..0806232e0f8f 100644
--- a/drivers/net/wan/z85230.c
+++ b/drivers/net/wan/z85230.c
@@ -542,7 +542,7 @@ static void z8530_dma_tx(struct z8530_channel *chan)
542 z8530_tx(chan); 542 z8530_tx(chan);
543 return; 543 return;
544 } 544 }
545 /* This shouldnt occur in DMA mode */ 545 /* This shouldn't occur in DMA mode */
546 printk(KERN_ERR "DMA tx - bogus event!\n"); 546 printk(KERN_ERR "DMA tx - bogus event!\n");
547 z8530_tx(chan); 547 z8530_tx(chan);
548} 548}
@@ -1219,7 +1219,7 @@ static const char *z8530_type_name[]={
1219 * @io: the port value in question 1219 * @io: the port value in question
1220 * 1220 *
1221 * Describe a Z8530 in a standard format. We must pass the I/O as 1221 * Describe a Z8530 in a standard format. We must pass the I/O as
1222 * the port offset isnt predictable. The main reason for this function 1222 * the port offset isn't predictable. The main reason for this function
1223 * is to try and get a common format of report. 1223 * is to try and get a common format of report.
1224 */ 1224 */
1225 1225
@@ -1588,7 +1588,7 @@ static void z8530_rx_done(struct z8530_channel *c)
1588 unsigned long flags; 1588 unsigned long flags;
1589 1589
1590 /* 1590 /*
1591 * Complete this DMA. Neccessary to find the length 1591 * Complete this DMA. Necessary to find the length
1592 */ 1592 */
1593 1593
1594 flags=claim_dma_lock(); 1594 flags=claim_dma_lock();
@@ -1657,7 +1657,7 @@ static void z8530_rx_done(struct z8530_channel *c)
1657 * fifo length for this. Thus we want to flip to the new 1657 * fifo length for this. Thus we want to flip to the new
1658 * buffer and then mess around copying and allocating 1658 * buffer and then mess around copying and allocating
1659 * things. For the current case it doesn't matter but 1659 * things. For the current case it doesn't matter but
1660 * if you build a system where the sync irq isnt blocked 1660 * if you build a system where the sync irq isn't blocked
1661 * by the kernel IRQ disable then you need only block the 1661 * by the kernel IRQ disable then you need only block the
1662 * sync IRQ for the RT_LOCK area. 1662 * sync IRQ for the RT_LOCK area.
1663 * 1663 *
diff --git a/drivers/net/wimax/i2400m/control.c b/drivers/net/wimax/i2400m/control.c
index 12b84ed0e38a..727d728649b7 100644
--- a/drivers/net/wimax/i2400m/control.c
+++ b/drivers/net/wimax/i2400m/control.c
@@ -378,7 +378,7 @@ void i2400m_report_tlv_system_state(struct i2400m *i2400m,
378 * the device's state as sometimes we need to do a link-renew (the BS 378 * the device's state as sometimes we need to do a link-renew (the BS
379 * wants us to renew a DHCP lease, for example). 379 * wants us to renew a DHCP lease, for example).
380 * 380 *
381 * In fact, doc says that everytime we get a link-up, we should do a 381 * In fact, doc says that every time we get a link-up, we should do a
382 * DHCP negotiation... 382 * DHCP negotiation...
383 */ 383 */
384static 384static
@@ -675,7 +675,7 @@ void i2400m_msg_to_dev_cancel_wait(struct i2400m *i2400m, int code)
675 * - the ack message wasn't formatted correctly 675 * - the ack message wasn't formatted correctly
676 * 676 *
677 * The returned skb has been allocated with wimax_msg_to_user_alloc(), 677 * The returned skb has been allocated with wimax_msg_to_user_alloc(),
678 * it contains the reponse in a netlink attribute and is ready to be 678 * it contains the response in a netlink attribute and is ready to be
679 * passed up to user space with wimax_msg_to_user_send(). To access 679 * passed up to user space with wimax_msg_to_user_send(). To access
680 * the payload and its length, use wimax_msg_{data,len}() on the skb. 680 * the payload and its length, use wimax_msg_{data,len}() on the skb.
681 * 681 *
diff --git a/drivers/net/wimax/i2400m/driver.c b/drivers/net/wimax/i2400m/driver.c
index 65bc334ed57b..47cae7150bc1 100644
--- a/drivers/net/wimax/i2400m/driver.c
+++ b/drivers/net/wimax/i2400m/driver.c
@@ -654,7 +654,7 @@ void __i2400m_dev_reset_handle(struct work_struct *ws)
654 if (result == -EUCLEAN) { 654 if (result == -EUCLEAN) {
655 /* 655 /*
656 * We come here because the reset during operational mode 656 * We come here because the reset during operational mode
657 * wasn't successully done and need to proceed to a bus 657 * wasn't successfully done and need to proceed to a bus
658 * reset. For the dev_reset_handle() to be able to handle 658 * reset. For the dev_reset_handle() to be able to handle
659 * the reset event later properly, we restore boot_mode back 659 * the reset event later properly, we restore boot_mode back
660 * to the state before previous reset. ie: just like we are 660 * to the state before previous reset. ie: just like we are
@@ -755,7 +755,7 @@ EXPORT_SYMBOL_GPL(i2400m_error_recovery);
755 * Alloc the command and ack buffers for boot mode 755 * Alloc the command and ack buffers for boot mode
756 * 756 *
757 * Get the buffers needed to deal with boot mode messages. These 757 * Get the buffers needed to deal with boot mode messages. These
758 * buffers need to be allocated before the sdio recieve irq is setup. 758 * buffers need to be allocated before the sdio receive irq is setup.
759 */ 759 */
760static 760static
761int i2400m_bm_buf_alloc(struct i2400m *i2400m) 761int i2400m_bm_buf_alloc(struct i2400m *i2400m)
diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c
index 8b55a5b14152..85dadd5bf4be 100644
--- a/drivers/net/wimax/i2400m/fw.c
+++ b/drivers/net/wimax/i2400m/fw.c
@@ -54,7 +54,7 @@
54 * endpoint and read from it in the notification endpoint. In SDIO we 54 * endpoint and read from it in the notification endpoint. In SDIO we
55 * talk to it via the write address and read from the read address. 55 * talk to it via the write address and read from the read address.
56 * 56 *
57 * Upon entrance to boot mode, the device sends (preceeded with a few 57 * Upon entrance to boot mode, the device sends (preceded with a few
58 * zero length packets (ZLPs) on the notification endpoint in USB) a 58 * zero length packets (ZLPs) on the notification endpoint in USB) a
59 * reboot barker (4 le32 words with the same value). We ack it by 59 * reboot barker (4 le32 words with the same value). We ack it by
60 * sending the same barker to the device. The device acks with a 60 * sending the same barker to the device. The device acks with a
@@ -1589,7 +1589,7 @@ int i2400m_dev_bootstrap(struct i2400m *i2400m, enum i2400m_bri flags)
1589 i2400m->fw_name = fw_name; 1589 i2400m->fw_name = fw_name;
1590 ret = i2400m_fw_bootstrap(i2400m, fw, flags); 1590 ret = i2400m_fw_bootstrap(i2400m, fw, flags);
1591 release_firmware(fw); 1591 release_firmware(fw);
1592 if (ret >= 0) /* firmware loaded succesfully */ 1592 if (ret >= 0) /* firmware loaded successfully */
1593 break; 1593 break;
1594 i2400m->fw_name = NULL; 1594 i2400m->fw_name = NULL;
1595 } 1595 }
diff --git a/drivers/net/wimax/i2400m/i2400m-usb.h b/drivers/net/wimax/i2400m/i2400m-usb.h
index eb80243e22df..6650fde99e1d 100644
--- a/drivers/net/wimax/i2400m/i2400m-usb.h
+++ b/drivers/net/wimax/i2400m/i2400m-usb.h
@@ -105,14 +105,14 @@ static inline void edc_init(struct edc *edc)
105 * 105 *
106 * @edc: pointer to error density counter. 106 * @edc: pointer to error density counter.
107 * @max_err: maximum number of errors we can accept over the timeframe 107 * @max_err: maximum number of errors we can accept over the timeframe
108 * @timeframe: lenght of the timeframe (in jiffies). 108 * @timeframe: length of the timeframe (in jiffies).
109 * 109 *
110 * Returns: !0 1 if maximum acceptable errors per timeframe has been 110 * Returns: !0 1 if maximum acceptable errors per timeframe has been
111 * exceeded. 0 otherwise. 111 * exceeded. 0 otherwise.
112 * 112 *
113 * This is way to determine if the number of acceptable errors per time 113 * This is way to determine if the number of acceptable errors per time
114 * period has been exceeded. It is not accurate as there are cases in which 114 * period has been exceeded. It is not accurate as there are cases in which
115 * this scheme will not work, for example if there are periodic occurences 115 * this scheme will not work, for example if there are periodic occurrences
116 * of errors that straddle updates to the start time. This scheme is 116 * of errors that straddle updates to the start time. This scheme is
117 * sufficient for our usage. 117 * sufficient for our usage.
118 * 118 *
@@ -204,7 +204,7 @@ enum {
204 * usb_autopm_get/put_interface() barriers when executing 204 * usb_autopm_get/put_interface() barriers when executing
205 * commands. See doc in i2400mu_suspend() for more information. 205 * commands. See doc in i2400mu_suspend() for more information.
206 * 206 *
207 * @rx_size_auto_shrink: if true, the rx_size is shrinked 207 * @rx_size_auto_shrink: if true, the rx_size is shrunk
208 * automatically based on the average size of the received 208 * automatically based on the average size of the received
209 * transactions. This allows the receive code to allocate smaller 209 * transactions. This allows the receive code to allocate smaller
210 * chunks of memory and thus reduce pressure on the memory 210 * chunks of memory and thus reduce pressure on the memory
diff --git a/drivers/net/wimax/i2400m/i2400m.h b/drivers/net/wimax/i2400m/i2400m.h
index 030cbfd31704..5eacc653a94d 100644
--- a/drivers/net/wimax/i2400m/i2400m.h
+++ b/drivers/net/wimax/i2400m/i2400m.h
@@ -526,7 +526,7 @@ struct i2400m_barker_db;
526 * 526 *
527 * @barker: barker type that the device uses; this is initialized by 527 * @barker: barker type that the device uses; this is initialized by
528 * i2400m_is_boot_barker() the first time it is called. Then it 528 * i2400m_is_boot_barker() the first time it is called. Then it
529 * won't change during the life cycle of the device and everytime 529 * won't change during the life cycle of the device and every time
530 * a boot barker is received, it is just verified for it being the 530 * a boot barker is received, it is just verified for it being the
531 * same. 531 * same.
532 * 532 *
@@ -928,7 +928,7 @@ extern void i2400m_report_tlv_rf_switches_status(
928 struct i2400m *, const struct i2400m_tlv_rf_switches_status *); 928 struct i2400m *, const struct i2400m_tlv_rf_switches_status *);
929 929
930/* 930/*
931 * Helpers for firmware backwards compability 931 * Helpers for firmware backwards compatibility
932 * 932 *
933 * As we aim to support at least the firmware version that was 933 * As we aim to support at least the firmware version that was
934 * released with the previous kernel/driver release, some code will be 934 * released with the previous kernel/driver release, some code will be
diff --git a/drivers/net/wimax/i2400m/netdev.c b/drivers/net/wimax/i2400m/netdev.c
index 94742e1eafe0..2edd8fe1c1f3 100644
--- a/drivers/net/wimax/i2400m/netdev.c
+++ b/drivers/net/wimax/i2400m/netdev.c
@@ -166,7 +166,7 @@ void i2400m_wake_tx_work(struct work_struct *ws)
166 d_fnstart(3, dev, "(ws %p i2400m %p skb %p)\n", ws, i2400m, skb); 166 d_fnstart(3, dev, "(ws %p i2400m %p skb %p)\n", ws, i2400m, skb);
167 result = -EINVAL; 167 result = -EINVAL;
168 if (skb == NULL) { 168 if (skb == NULL) {
169 dev_err(dev, "WAKE&TX: skb dissapeared!\n"); 169 dev_err(dev, "WAKE&TX: skb disappeared!\n");
170 goto out_put; 170 goto out_put;
171 } 171 }
172 /* If we have, somehow, lost the connection after this was 172 /* If we have, somehow, lost the connection after this was
diff --git a/drivers/net/wimax/i2400m/op-rfkill.c b/drivers/net/wimax/i2400m/op-rfkill.c
index 9e02b90b0080..b0dba35a8ad2 100644
--- a/drivers/net/wimax/i2400m/op-rfkill.c
+++ b/drivers/net/wimax/i2400m/op-rfkill.c
@@ -27,7 +27,7 @@
27 * - report changes in the HW RF Kill switch [with 27 * - report changes in the HW RF Kill switch [with
28 * wimax_rfkill_{sw,hw}_report(), which happens when we detect those 28 * wimax_rfkill_{sw,hw}_report(), which happens when we detect those
29 * indications coming through hardware reports]. We also do it on 29 * indications coming through hardware reports]. We also do it on
30 * initialization to let the stack know the intial HW state. 30 * initialization to let the stack know the initial HW state.
31 * 31 *
32 * - implement indications from the stack to change the SW RF Kill 32 * - implement indications from the stack to change the SW RF Kill
33 * switch (coming from sysfs, the wimax stack or user space). 33 * switch (coming from sysfs, the wimax stack or user space).
@@ -73,7 +73,7 @@ int i2400m_radio_is(struct i2400m *i2400m, enum wimax_rf_state state)
73 * Generic Netlink will call this function when a message is sent from 73 * Generic Netlink will call this function when a message is sent from
74 * userspace to change the software RF-Kill switch status. 74 * userspace to change the software RF-Kill switch status.
75 * 75 *
76 * This function will set the device's sofware RF-Kill switch state to 76 * This function will set the device's software RF-Kill switch state to
77 * match what is requested. 77 * match what is requested.
78 * 78 *
79 * NOTE: the i2400m has a strict state machine; we can only set the 79 * NOTE: the i2400m has a strict state machine; we can only set the
diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
index 844133b44af0..2f94a872101f 100644
--- a/drivers/net/wimax/i2400m/rx.c
+++ b/drivers/net/wimax/i2400m/rx.c
@@ -349,7 +349,7 @@ error_no_waiter:
349 * 349 *
350 * For reports: We can't clone the original skb where the data is 350 * For reports: We can't clone the original skb where the data is
351 * because we need to send this up via netlink; netlink has to add 351 * because we need to send this up via netlink; netlink has to add
352 * headers and we can't overwrite what's preceeding the payload...as 352 * headers and we can't overwrite what's preceding the payload...as
353 * it is another message. So we just dup them. 353 * it is another message. So we just dup them.
354 */ 354 */
355static 355static
@@ -425,7 +425,7 @@ error_check:
425 * 425 *
426 * As in i2400m_rx_ctl(), we can't clone the original skb where the 426 * As in i2400m_rx_ctl(), we can't clone the original skb where the
427 * data is because we need to send this up via netlink; netlink has to 427 * data is because we need to send this up via netlink; netlink has to
428 * add headers and we can't overwrite what's preceeding the 428 * add headers and we can't overwrite what's preceding the
429 * payload...as it is another message. So we just dup them. 429 * payload...as it is another message. So we just dup them.
430 */ 430 */
431static 431static
diff --git a/drivers/net/wimax/i2400m/tx.c b/drivers/net/wimax/i2400m/tx.c
index 3f819efc06b5..4b30ed11d785 100644
--- a/drivers/net/wimax/i2400m/tx.c
+++ b/drivers/net/wimax/i2400m/tx.c
@@ -149,7 +149,7 @@
149 * (with a moved message header to make sure it is size-aligned to 149 * (with a moved message header to make sure it is size-aligned to
150 * 16), TAIL room that was unusable (and thus is marked with a message 150 * 16), TAIL room that was unusable (and thus is marked with a message
151 * header that says 'skip this') and at the head of the buffer, an 151 * header that says 'skip this') and at the head of the buffer, an
152 * imcomplete message with a couple of payloads. 152 * incomplete message with a couple of payloads.
153 * 153 *
154 * N ___________________________________________________ 154 * N ___________________________________________________
155 * | | 155 * | |
@@ -819,7 +819,7 @@ EXPORT_SYMBOL_GPL(i2400m_tx);
819 * the FIF that is ready for transmission. 819 * the FIF that is ready for transmission.
820 * 820 *
821 * It sets the state in @i2400m to indicate the bus-specific driver is 821 * It sets the state in @i2400m to indicate the bus-specific driver is
822 * transfering that message (i2400m->tx_msg_size). 822 * transferring that message (i2400m->tx_msg_size).
823 * 823 *
824 * Once the transfer is completed, call i2400m_tx_msg_sent(). 824 * Once the transfer is completed, call i2400m_tx_msg_sent().
825 * 825 *
diff --git a/drivers/net/wimax/i2400m/usb-fw.c b/drivers/net/wimax/i2400m/usb-fw.c
index b58ec56b86f8..1fda46c55eb3 100644
--- a/drivers/net/wimax/i2400m/usb-fw.c
+++ b/drivers/net/wimax/i2400m/usb-fw.c
@@ -169,7 +169,7 @@ retry:
169 * 169 *
170 * Command can be a raw command, which requires no preparation (and 170 * Command can be a raw command, which requires no preparation (and
171 * which might not even be following the command format). Checks that 171 * which might not even be following the command format). Checks that
172 * the right amount of data was transfered. 172 * the right amount of data was transferred.
173 * 173 *
174 * To satisfy USB requirements (no onstack, vmalloc or in data segment 174 * To satisfy USB requirements (no onstack, vmalloc or in data segment
175 * buffers), we copy the command to i2400m->bm_cmd_buf and send it from 175 * buffers), we copy the command to i2400m->bm_cmd_buf and send it from
diff --git a/drivers/net/wimax/i2400m/usb-rx.c b/drivers/net/wimax/i2400m/usb-rx.c
index a26483a812a5..e3257681e360 100644
--- a/drivers/net/wimax/i2400m/usb-rx.c
+++ b/drivers/net/wimax/i2400m/usb-rx.c
@@ -58,7 +58,7 @@
58 * a zillion reads; by serializing, we are throttling. 58 * a zillion reads; by serializing, we are throttling.
59 * 59 *
60 * - RX data processing can get heavy enough so that it is not 60 * - RX data processing can get heavy enough so that it is not
61 * appropiate for doing it in the USB callback; thus we run it in a 61 * appropriate for doing it in the USB callback; thus we run it in a
62 * process context. 62 * process context.
63 * 63 *
64 * We provide a read buffer of an arbitrary size (short of a page); if 64 * We provide a read buffer of an arbitrary size (short of a page); if
diff --git a/drivers/net/wimax/i2400m/usb-tx.c b/drivers/net/wimax/i2400m/usb-tx.c
index c65b9979f87e..ac357acfb3e9 100644
--- a/drivers/net/wimax/i2400m/usb-tx.c
+++ b/drivers/net/wimax/i2400m/usb-tx.c
@@ -168,7 +168,7 @@ retry:
168/* 168/*
169 * Get the next TX message in the TX FIFO and send it to the device 169 * Get the next TX message in the TX FIFO and send it to the device
170 * 170 *
171 * Note we exit the loop if i2400mu_tx() fails; that funtion only 171 * Note we exit the loop if i2400mu_tx() fails; that function only
172 * fails on hard error (failing to tx a buffer not being one of them, 172 * fails on hard error (failing to tx a buffer not being one of them,
173 * see its doc). 173 * see its doc).
174 * 174 *
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 57a79b0475f6..4e5c7a11f04a 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -1884,7 +1884,7 @@ static int airo_open(struct net_device *dev) {
1884 /* Make sure the card is configured. 1884 /* Make sure the card is configured.
1885 * Wireless Extensions may postpone config changes until the card 1885 * Wireless Extensions may postpone config changes until the card
1886 * is open (to pipeline changes and speed-up card setup). If 1886 * is open (to pipeline changes and speed-up card setup). If
1887 * those changes are not yet commited, do it now - Jean II */ 1887 * those changes are not yet committed, do it now - Jean II */
1888 if (test_bit(FLAG_COMMIT, &ai->flags)) { 1888 if (test_bit(FLAG_COMMIT, &ai->flags)) {
1889 disable_MAC(ai, 1); 1889 disable_MAC(ai, 1);
1890 writeConfigRid(ai, 1); 1890 writeConfigRid(ai, 1);
@@ -1992,7 +1992,7 @@ static int mpi_send_packet (struct net_device *dev)
1992/* 1992/*
1993 * Magic, the cards firmware needs a length count (2 bytes) in the host buffer 1993 * Magic, the cards firmware needs a length count (2 bytes) in the host buffer
1994 * right after TXFID_HDR.The TXFID_HDR contains the status short so payloadlen 1994 * right after TXFID_HDR.The TXFID_HDR contains the status short so payloadlen
1995 * is immediatly after it. ------------------------------------------------ 1995 * is immediately after it. ------------------------------------------------
1996 * |TXFIDHDR+STATUS|PAYLOADLEN|802.3HDR|PACKETDATA| 1996 * |TXFIDHDR+STATUS|PAYLOADLEN|802.3HDR|PACKETDATA|
1997 * ------------------------------------------------ 1997 * ------------------------------------------------
1998 */ 1998 */
@@ -2006,7 +2006,7 @@ static int mpi_send_packet (struct net_device *dev)
2006 sizeof(wifictlhdr8023) + 2 ; 2006 sizeof(wifictlhdr8023) + 2 ;
2007 2007
2008 /* 2008 /*
2009 * Firmware automaticly puts 802 header on so 2009 * Firmware automatically puts 802 header on so
2010 * we don't need to account for it in the length 2010 * we don't need to account for it in the length
2011 */ 2011 */
2012 if (test_bit(FLAG_MIC_CAPABLE, &ai->flags) && ai->micstats.enabled && 2012 if (test_bit(FLAG_MIC_CAPABLE, &ai->flags) && ai->micstats.enabled &&
@@ -2531,7 +2531,7 @@ static int mpi_init_descriptors (struct airo_info *ai)
2531/* 2531/*
2532 * We are setting up three things here: 2532 * We are setting up three things here:
2533 * 1) Map AUX memory for descriptors: Rid, TxFid, or RxFid. 2533 * 1) Map AUX memory for descriptors: Rid, TxFid, or RxFid.
2534 * 2) Map PCI memory for issueing commands. 2534 * 2) Map PCI memory for issuing commands.
2535 * 3) Allocate memory (shared) to send and receive ethernet frames. 2535 * 3) Allocate memory (shared) to send and receive ethernet frames.
2536 */ 2536 */
2537static int mpi_map_card(struct airo_info *ai, struct pci_dev *pci) 2537static int mpi_map_card(struct airo_info *ai, struct pci_dev *pci)
@@ -3947,7 +3947,7 @@ static u16 issuecommand(struct airo_info *ai, Cmd *pCmd, Resp *pRsp) {
3947 3947
3948 if ( max_tries == -1 ) { 3948 if ( max_tries == -1 ) {
3949 airo_print_err(ai->dev->name, 3949 airo_print_err(ai->dev->name,
3950 "Max tries exceeded when issueing command"); 3950 "Max tries exceeded when issuing command");
3951 if (IN4500(ai, COMMAND) & COMMAND_BUSY) 3951 if (IN4500(ai, COMMAND) & COMMAND_BUSY)
3952 OUT4500(ai, EVACK, EV_CLEARCOMMANDBUSY); 3952 OUT4500(ai, EVACK, EV_CLEARCOMMANDBUSY);
3953 return ERROR; 3953 return ERROR;
@@ -4173,7 +4173,7 @@ done:
4173} 4173}
4174 4174
4175/* Note, that we are using BAP1 which is also used by transmit, so 4175/* Note, that we are using BAP1 which is also used by transmit, so
4176 * make sure this isnt called when a transmit is happening */ 4176 * make sure this isn't called when a transmit is happening */
4177static int PC4500_writerid(struct airo_info *ai, u16 rid, 4177static int PC4500_writerid(struct airo_info *ai, u16 rid,
4178 const void *pBuf, int len, int lock) 4178 const void *pBuf, int len, int lock)
4179{ 4179{
@@ -4776,7 +4776,7 @@ static int proc_stats_rid_open( struct inode *inode,
4776 if (!statsLabels[i]) continue; 4776 if (!statsLabels[i]) continue;
4777 if (j+strlen(statsLabels[i])+16>4096) { 4777 if (j+strlen(statsLabels[i])+16>4096) {
4778 airo_print_warn(apriv->dev->name, 4778 airo_print_warn(apriv->dev->name,
4779 "Potentially disasterous buffer overflow averted!"); 4779 "Potentially disastrous buffer overflow averted!");
4780 break; 4780 break;
4781 } 4781 }
4782 j+=sprintf(data->rbuffer+j, "%s: %u\n", statsLabels[i], 4782 j+=sprintf(data->rbuffer+j, "%s: %u\n", statsLabels[i],
diff --git a/drivers/net/wireless/ath/ar9170/main.c b/drivers/net/wireless/ath/ar9170/main.c
index b761fec0d721..ccc2edaaeda0 100644
--- a/drivers/net/wireless/ath/ar9170/main.c
+++ b/drivers/net/wireless/ath/ar9170/main.c
@@ -974,7 +974,7 @@ void ar9170_rx(struct ar9170 *ar, struct sk_buff *skb)
974 if (ar->rx_failover_missing <= 0) { 974 if (ar->rx_failover_missing <= 0) {
975 /* 975 /*
976 * nested ar9170_rx call! 976 * nested ar9170_rx call!
977 * termination is guranteed, even when the 977 * termination is guaranteed, even when the
978 * combined frame also have a element with 978 * combined frame also have a element with
979 * a bad tag. 979 * a bad tag.
980 */ 980 */
diff --git a/drivers/net/wireless/ath/ar9170/phy.c b/drivers/net/wireless/ath/ar9170/phy.c
index 0dbfcf79ac96..aa8d06ba1ee4 100644
--- a/drivers/net/wireless/ath/ar9170/phy.c
+++ b/drivers/net/wireless/ath/ar9170/phy.c
@@ -424,7 +424,7 @@ static u32 ar9170_get_default_phy_reg_val(u32 reg, bool is_2ghz, bool is_40mhz)
424 424
425/* 425/*
426 * initialize some phy regs from eeprom values in modal_header[] 426 * initialize some phy regs from eeprom values in modal_header[]
427 * acc. to band and bandwith 427 * acc. to band and bandwidth
428 */ 428 */
429static int ar9170_init_phy_from_eeprom(struct ar9170 *ar, 429static int ar9170_init_phy_from_eeprom(struct ar9170 *ar,
430 bool is_2ghz, bool is_40mhz) 430 bool is_2ghz, bool is_40mhz)
diff --git a/drivers/net/wireless/ath/ath5k/ani.h b/drivers/net/wireless/ath/ath5k/ani.h
index d0a664039c87..034015397093 100644
--- a/drivers/net/wireless/ath/ath5k/ani.h
+++ b/drivers/net/wireless/ath/ath5k/ani.h
@@ -27,7 +27,7 @@
27#define ATH5K_ANI_RSSI_THR_HIGH 40 27#define ATH5K_ANI_RSSI_THR_HIGH 40
28#define ATH5K_ANI_RSSI_THR_LOW 7 28#define ATH5K_ANI_RSSI_THR_LOW 7
29 29
30/* maximum availabe levels */ 30/* maximum available levels */
31#define ATH5K_ANI_MAX_FIRSTEP_LVL 2 31#define ATH5K_ANI_MAX_FIRSTEP_LVL 2
32#define ATH5K_ANI_MAX_NOISE_IMM_LVL 1 32#define ATH5K_ANI_MAX_NOISE_IMM_LVL 1
33 33
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 4d7f21ee111c..349a5963931b 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -1953,7 +1953,7 @@ ath5k_beacon_update_timers(struct ath5k_softc *sc, u64 bc_tsf)
1953 1953
1954#define FUDGE AR5K_TUNE_SW_BEACON_RESP + 3 1954#define FUDGE AR5K_TUNE_SW_BEACON_RESP + 3
1955 /* We use FUDGE to make sure the next TBTT is ahead of the current TU. 1955 /* We use FUDGE to make sure the next TBTT is ahead of the current TU.
1956 * Since we later substract AR5K_TUNE_SW_BEACON_RESP (10) in the timer 1956 * Since we later subtract AR5K_TUNE_SW_BEACON_RESP (10) in the timer
1957 * configuration we need to make sure it is bigger than that. */ 1957 * configuration we need to make sure it is bigger than that. */
1958 1958
1959 if (bc_tsf == -1) { 1959 if (bc_tsf == -1) {
@@ -1971,7 +1971,7 @@ ath5k_beacon_update_timers(struct ath5k_softc *sc, u64 bc_tsf)
1971 intval |= AR5K_BEACON_RESET_TSF; 1971 intval |= AR5K_BEACON_RESET_TSF;
1972 } else if (bc_tsf > hw_tsf) { 1972 } else if (bc_tsf > hw_tsf) {
1973 /* 1973 /*
1974 * beacon received, SW merge happend but HW TSF not yet updated. 1974 * beacon received, SW merge happened but HW TSF not yet updated.
1975 * not possible to reconfigure timers yet, but next time we 1975 * not possible to reconfigure timers yet, but next time we
1976 * receive a beacon with the same BSSID, the hardware will 1976 * receive a beacon with the same BSSID, the hardware will
1977 * automatically update the TSF and then we need to reconfigure 1977 * automatically update the TSF and then we need to reconfigure
@@ -2651,7 +2651,7 @@ ath5k_reset(struct ath5k_softc *sc, struct ieee80211_channel *chan,
2651 synchronize_irq(sc->irq); 2651 synchronize_irq(sc->irq);
2652 stop_tasklets(sc); 2652 stop_tasklets(sc);
2653 2653
2654 /* Save ani mode and disable ANI durring 2654 /* Save ani mode and disable ANI during
2655 * reset. If we don't we might get false 2655 * reset. If we don't we might get false
2656 * PHY error interrupts. */ 2656 * PHY error interrupts. */
2657 ani_mode = ah->ah_sc->ani_state.ani_mode; 2657 ani_mode = ah->ah_sc->ani_state.ani_mode;
diff --git a/drivers/net/wireless/ath/ath5k/desc.c b/drivers/net/wireless/ath/ath5k/desc.c
index 16b44ff7dd3e..a8fcc94269f7 100644
--- a/drivers/net/wireless/ath/ath5k/desc.c
+++ b/drivers/net/wireless/ath/ath5k/desc.c
@@ -51,7 +51,7 @@ ath5k_hw_setup_2word_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
51 /* 51 /*
52 * Validate input 52 * Validate input
53 * - Zero retries don't make sense. 53 * - Zero retries don't make sense.
54 * - A zero rate will put the HW into a mode where it continously sends 54 * - A zero rate will put the HW into a mode where it continuously sends
55 * noise on the channel, so it is important to avoid this. 55 * noise on the channel, so it is important to avoid this.
56 */ 56 */
57 if (unlikely(tx_tries0 == 0)) { 57 if (unlikely(tx_tries0 == 0)) {
@@ -190,7 +190,7 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
190 /* 190 /*
191 * Validate input 191 * Validate input
192 * - Zero retries don't make sense. 192 * - Zero retries don't make sense.
193 * - A zero rate will put the HW into a mode where it continously sends 193 * - A zero rate will put the HW into a mode where it continuously sends
194 * noise on the channel, so it is important to avoid this. 194 * noise on the channel, so it is important to avoid this.
195 */ 195 */
196 if (unlikely(tx_tries0 == 0)) { 196 if (unlikely(tx_tries0 == 0)) {
@@ -300,7 +300,7 @@ ath5k_hw_setup_mrr_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
300 /* 300 /*
301 * Rates can be 0 as long as the retry count is 0 too. 301 * Rates can be 0 as long as the retry count is 0 too.
302 * A zero rate and nonzero retry count will put the HW into a mode where 302 * A zero rate and nonzero retry count will put the HW into a mode where
303 * it continously sends noise on the channel, so it is important to 303 * it continuously sends noise on the channel, so it is important to
304 * avoid this. 304 * avoid this.
305 */ 305 */
306 if (unlikely((tx_rate1 == 0 && tx_tries1 != 0) || 306 if (unlikely((tx_rate1 == 0 && tx_tries1 != 0) ||
@@ -342,7 +342,7 @@ ath5k_hw_setup_mrr_tx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
342\***********************/ 342\***********************/
343 343
344/* 344/*
345 * Proccess the tx status descriptor on 5210/5211 345 * Process the tx status descriptor on 5210/5211
346 */ 346 */
347static int ath5k_hw_proc_2word_tx_status(struct ath5k_hw *ah, 347static int ath5k_hw_proc_2word_tx_status(struct ath5k_hw *ah,
348 struct ath5k_desc *desc, struct ath5k_tx_status *ts) 348 struct ath5k_desc *desc, struct ath5k_tx_status *ts)
@@ -394,7 +394,7 @@ static int ath5k_hw_proc_2word_tx_status(struct ath5k_hw *ah,
394} 394}
395 395
396/* 396/*
397 * Proccess a tx status descriptor on 5212 397 * Process a tx status descriptor on 5212
398 */ 398 */
399static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah, 399static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah,
400 struct ath5k_desc *desc, struct ath5k_tx_status *ts) 400 struct ath5k_desc *desc, struct ath5k_tx_status *ts)
@@ -519,7 +519,7 @@ int ath5k_hw_setup_rx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
519} 519}
520 520
521/* 521/*
522 * Proccess the rx status descriptor on 5210/5211 522 * Process the rx status descriptor on 5210/5211
523 */ 523 */
524static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah, 524static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah,
525 struct ath5k_desc *desc, struct ath5k_rx_status *rs) 525 struct ath5k_desc *desc, struct ath5k_rx_status *rs)
@@ -602,7 +602,7 @@ static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah,
602} 602}
603 603
604/* 604/*
605 * Proccess the rx status descriptor on 5212 605 * Process the rx status descriptor on 5212
606 */ 606 */
607static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah, 607static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
608 struct ath5k_desc *desc, 608 struct ath5k_desc *desc,
diff --git a/drivers/net/wireless/ath/ath5k/eeprom.c b/drivers/net/wireless/ath/ath5k/eeprom.c
index b6561f785c6e..efb672cb31e4 100644
--- a/drivers/net/wireless/ath/ath5k/eeprom.c
+++ b/drivers/net/wireless/ath/ath5k/eeprom.c
@@ -1080,7 +1080,7 @@ ath5k_eeprom_read_pcal_info_5112(struct ath5k_hw *ah, int mode)
1080 * 1080 *
1081 * To recreate the curves we read here the points and interpolate 1081 * To recreate the curves we read here the points and interpolate
1082 * later. Note that in most cases only 2 (higher and lower) curves are 1082 * later. Note that in most cases only 2 (higher and lower) curves are
1083 * used (like RF5112) but vendors have the oportunity to include all 1083 * used (like RF5112) but vendors have the opportunity to include all
1084 * 4 curves on eeprom. The final curve (higher power) has an extra 1084 * 4 curves on eeprom. The final curve (higher power) has an extra
1085 * point for better accuracy like RF5112. 1085 * point for better accuracy like RF5112.
1086 */ 1086 */
@@ -1302,7 +1302,7 @@ ath5k_eeprom_read_pcal_info_2413(struct ath5k_hw *ah, int mode)
1302 /* 1302 /*
1303 * Pd gain 0 is not the last pd gain 1303 * Pd gain 0 is not the last pd gain
1304 * so it only has 2 pd points. 1304 * so it only has 2 pd points.
1305 * Continue wih pd gain 1. 1305 * Continue with pd gain 1.
1306 */ 1306 */
1307 pcinfo->pwr_i[1] = (val >> 10) & 0x1f; 1307 pcinfo->pwr_i[1] = (val >> 10) & 0x1f;
1308 1308
diff --git a/drivers/net/wireless/ath/ath5k/pci.c b/drivers/net/wireless/ath/ath5k/pci.c
index 66598a0d1df0..3c44689a700b 100644
--- a/drivers/net/wireless/ath/ath5k/pci.c
+++ b/drivers/net/wireless/ath/ath5k/pci.c
@@ -57,7 +57,7 @@ static void ath5k_pci_read_cachesize(struct ath_common *common, int *csz)
57 *csz = (int)u8tmp; 57 *csz = (int)u8tmp;
58 58
59 /* 59 /*
60 * This check was put in to avoid "unplesant" consequences if 60 * This check was put in to avoid "unpleasant" consequences if
61 * the bootrom has not fully initialized all PCI devices. 61 * the bootrom has not fully initialized all PCI devices.
62 * Sometimes the cache line size register is not set 62 * Sometimes the cache line size register is not set
63 */ 63 */
diff --git a/drivers/net/wireless/ath/ath5k/pcu.c b/drivers/net/wireless/ath/ath5k/pcu.c
index a702817daf72..d9b3f828455a 100644
--- a/drivers/net/wireless/ath/ath5k/pcu.c
+++ b/drivers/net/wireless/ath/ath5k/pcu.c
@@ -472,7 +472,7 @@ void ath5k_hw_set_rx_filter(struct ath5k_hw *ah, u32 filter)
472 } 472 }
473 473
474 /* 474 /*
475 * The AR5210 uses promiscous mode to detect radar activity 475 * The AR5210 uses promiscuous mode to detect radar activity
476 */ 476 */
477 if (ah->ah_version == AR5K_AR5210 && 477 if (ah->ah_version == AR5K_AR5210 &&
478 (filter & AR5K_RX_FILTER_RADARERR)) { 478 (filter & AR5K_RX_FILTER_RADARERR)) {
@@ -706,8 +706,8 @@ ath5k_check_timer_win(int a, int b, int window, int intval)
706 * The need for this function arises from the fact that we have 4 separate 706 * The need for this function arises from the fact that we have 4 separate
707 * HW timer registers (TIMER0 - TIMER3), which are closely related to the 707 * HW timer registers (TIMER0 - TIMER3), which are closely related to the
708 * next beacon target time (NBTT), and that the HW updates these timers 708 * next beacon target time (NBTT), and that the HW updates these timers
709 * seperately based on the current TSF value. The hardware increments each 709 * separately based on the current TSF value. The hardware increments each
710 * timer by the beacon interval, when the local TSF coverted to TU is equal 710 * timer by the beacon interval, when the local TSF converted to TU is equal
711 * to the value stored in the timer. 711 * to the value stored in the timer.
712 * 712 *
713 * The reception of a beacon with the same BSSID can update the local HW TSF 713 * The reception of a beacon with the same BSSID can update the local HW TSF
diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c
index 62ce2f4e8605..55441913344d 100644
--- a/drivers/net/wireless/ath/ath5k/phy.c
+++ b/drivers/net/wireless/ath/ath5k/phy.c
@@ -335,11 +335,11 @@ static void ath5k_hw_wait_for_synth(struct ath5k_hw *ah,
335 * http://madwifi-project.org/ticket/1659 335 * http://madwifi-project.org/ticket/1659
336 * with various measurements and diagrams 336 * with various measurements and diagrams
337 * 337 *
338 * TODO: Deal with power drops due to probes by setting an apropriate 338 * TODO: Deal with power drops due to probes by setting an appropriate
339 * tx power on the probe packets ! Make this part of the calibration process. 339 * tx power on the probe packets ! Make this part of the calibration process.
340 */ 340 */
341 341
342/* Initialize ah_gain durring attach */ 342/* Initialize ah_gain during attach */
343int ath5k_hw_rfgain_opt_init(struct ath5k_hw *ah) 343int ath5k_hw_rfgain_opt_init(struct ath5k_hw *ah)
344{ 344{
345 /* Initialize the gain optimization values */ 345 /* Initialize the gain optimization values */
@@ -1049,7 +1049,7 @@ static int ath5k_hw_rfregs_init(struct ath5k_hw *ah,
1049\**************************/ 1049\**************************/
1050 1050
1051/* 1051/*
1052 * Convertion needed for RF5110 1052 * Conversion needed for RF5110
1053 */ 1053 */
1054static u32 ath5k_hw_rf5110_chan2athchan(struct ieee80211_channel *channel) 1054static u32 ath5k_hw_rf5110_chan2athchan(struct ieee80211_channel *channel)
1055{ 1055{
@@ -1088,7 +1088,7 @@ static int ath5k_hw_rf5110_channel(struct ath5k_hw *ah,
1088} 1088}
1089 1089
1090/* 1090/*
1091 * Convertion needed for 5111 1091 * Conversion needed for 5111
1092 */ 1092 */
1093static int ath5k_hw_rf5111_chan2athchan(unsigned int ieee, 1093static int ath5k_hw_rf5111_chan2athchan(unsigned int ieee,
1094 struct ath5k_athchan_2ghz *athchan) 1094 struct ath5k_athchan_2ghz *athchan)
@@ -2201,7 +2201,7 @@ ath5k_create_power_curve(s16 pmin, s16 pmax,
2201/* 2201/*
2202 * Get the surrounding per-channel power calibration piers 2202 * Get the surrounding per-channel power calibration piers
2203 * for a given frequency so that we can interpolate between 2203 * for a given frequency so that we can interpolate between
2204 * them and come up with an apropriate dataset for our current 2204 * them and come up with an appropriate dataset for our current
2205 * channel. 2205 * channel.
2206 */ 2206 */
2207static void 2207static void
@@ -2618,7 +2618,7 @@ ath5k_write_pcdac_table(struct ath5k_hw *ah)
2618/* 2618/*
2619 * Set the gain boundaries and create final Power to PDADC table 2619 * Set the gain boundaries and create final Power to PDADC table
2620 * 2620 *
2621 * We can have up to 4 pd curves, we need to do a simmilar process 2621 * We can have up to 4 pd curves, we need to do a similar process
2622 * as we do for RF5112. This time we don't have an edge_flag but we 2622 * as we do for RF5112. This time we don't have an edge_flag but we
2623 * set the gain boundaries on a separate register. 2623 * set the gain boundaries on a separate register.
2624 */ 2624 */
@@ -2826,13 +2826,13 @@ ath5k_setup_channel_powertable(struct ath5k_hw *ah,
2826 u32 target = channel->center_freq; 2826 u32 target = channel->center_freq;
2827 int pdg, i; 2827 int pdg, i;
2828 2828
2829 /* Get surounding freq piers for this channel */ 2829 /* Get surrounding freq piers for this channel */
2830 ath5k_get_chan_pcal_surrounding_piers(ah, channel, 2830 ath5k_get_chan_pcal_surrounding_piers(ah, channel,
2831 &pcinfo_L, 2831 &pcinfo_L,
2832 &pcinfo_R); 2832 &pcinfo_R);
2833 2833
2834 /* Loop over pd gain curves on 2834 /* Loop over pd gain curves on
2835 * surounding freq piers by index */ 2835 * surrounding freq piers by index */
2836 for (pdg = 0; pdg < ee->ee_pd_gains[ee_mode]; pdg++) { 2836 for (pdg = 0; pdg < ee->ee_pd_gains[ee_mode]; pdg++) {
2837 2837
2838 /* Fill curves in reverse order 2838 /* Fill curves in reverse order
@@ -2923,7 +2923,7 @@ ath5k_setup_channel_powertable(struct ath5k_hw *ah,
2923 } 2923 }
2924 2924
2925 /* Interpolate between curves 2925 /* Interpolate between curves
2926 * of surounding freq piers to 2926 * of surrounding freq piers to
2927 * get the final curve for this 2927 * get the final curve for this
2928 * pd gain. Re-use tmpL for interpolation 2928 * pd gain. Re-use tmpL for interpolation
2929 * output */ 2929 * output */
@@ -2947,7 +2947,7 @@ ath5k_setup_channel_powertable(struct ath5k_hw *ah,
2947 2947
2948 /* Fill min and max power levels for this 2948 /* Fill min and max power levels for this
2949 * channel by interpolating the values on 2949 * channel by interpolating the values on
2950 * surounding channels to complete the dataset */ 2950 * surrounding channels to complete the dataset */
2951 ah->ah_txpower.txp_min_pwr = ath5k_get_interpolated_value(target, 2951 ah->ah_txpower.txp_min_pwr = ath5k_get_interpolated_value(target,
2952 (s16) pcinfo_L->freq, 2952 (s16) pcinfo_L->freq,
2953 (s16) pcinfo_R->freq, 2953 (s16) pcinfo_R->freq,
@@ -3179,7 +3179,7 @@ ath5k_hw_txpower(struct ath5k_hw *ah, struct ieee80211_channel *channel,
3179 3179
3180 /* FIXME: TPC scale reduction */ 3180 /* FIXME: TPC scale reduction */
3181 3181
3182 /* Get surounding channels for per-rate power table 3182 /* Get surrounding channels for per-rate power table
3183 * calibration */ 3183 * calibration */
3184 ath5k_get_rate_pcal_data(ah, channel, &rate_info); 3184 ath5k_get_rate_pcal_data(ah, channel, &rate_info);
3185 3185
diff --git a/drivers/net/wireless/ath/ath5k/reg.h b/drivers/net/wireless/ath/ath5k/reg.h
index e1c9abd8c879..d12b827033c1 100644
--- a/drivers/net/wireless/ath/ath5k/reg.h
+++ b/drivers/net/wireless/ath/ath5k/reg.h
@@ -132,8 +132,8 @@
132 * As i can see in ar5k_ar5210_tx_start Reyk uses some of the values of BCR 132 * As i can see in ar5k_ar5210_tx_start Reyk uses some of the values of BCR
133 * for this register, so i guess TQ1V,TQ1FV and BDMAE have the same meaning 133 * for this register, so i guess TQ1V,TQ1FV and BDMAE have the same meaning
134 * here and SNP/SNAP means "snapshot" (so this register gets synced with BCR). 134 * here and SNP/SNAP means "snapshot" (so this register gets synced with BCR).
135 * So SNAPPEDBCRVALID sould also stand for "snapped BCR -values- valid", so i 135 * So SNAPPEDBCRVALID should also stand for "snapped BCR -values- valid", so i
136 * renamed it to SNAPSHOTSVALID to make more sense. I realy have no idea what 136 * renamed it to SNAPSHOTSVALID to make more sense. I really have no idea what
137 * else can it be. I also renamed SNPBCMD to SNPADHOC to match BCR. 137 * else can it be. I also renamed SNPBCMD to SNPADHOC to match BCR.
138 */ 138 */
139#define AR5K_BSR 0x002c /* Register Address */ 139#define AR5K_BSR 0x002c /* Register Address */
@@ -283,7 +283,7 @@
283 */ 283 */
284#define AR5K_ISR 0x001c /* Register Address [5210] */ 284#define AR5K_ISR 0x001c /* Register Address [5210] */
285#define AR5K_PISR 0x0080 /* Register Address [5211+] */ 285#define AR5K_PISR 0x0080 /* Register Address [5211+] */
286#define AR5K_ISR_RXOK 0x00000001 /* Frame successfuly recieved */ 286#define AR5K_ISR_RXOK 0x00000001 /* Frame successfuly received */
287#define AR5K_ISR_RXDESC 0x00000002 /* RX descriptor request */ 287#define AR5K_ISR_RXDESC 0x00000002 /* RX descriptor request */
288#define AR5K_ISR_RXERR 0x00000004 /* Receive error */ 288#define AR5K_ISR_RXERR 0x00000004 /* Receive error */
289#define AR5K_ISR_RXNOFRM 0x00000008 /* No frame received (receive timeout) */ 289#define AR5K_ISR_RXNOFRM 0x00000008 /* No frame received (receive timeout) */
@@ -372,12 +372,12 @@
372/* 372/*
373 * Interrupt Mask Registers 373 * Interrupt Mask Registers
374 * 374 *
375 * As whith ISRs 5210 has one IMR (AR5K_IMR) and 5211/5212 has one primary 375 * As with ISRs 5210 has one IMR (AR5K_IMR) and 5211/5212 has one primary
376 * (AR5K_PIMR) and 4 secondary IMRs (AR5K_SIMRx). Note that ISR/IMR flags match. 376 * (AR5K_PIMR) and 4 secondary IMRs (AR5K_SIMRx). Note that ISR/IMR flags match.
377 */ 377 */
378#define AR5K_IMR 0x0020 /* Register Address [5210] */ 378#define AR5K_IMR 0x0020 /* Register Address [5210] */
379#define AR5K_PIMR 0x00a0 /* Register Address [5211+] */ 379#define AR5K_PIMR 0x00a0 /* Register Address [5211+] */
380#define AR5K_IMR_RXOK 0x00000001 /* Frame successfuly recieved*/ 380#define AR5K_IMR_RXOK 0x00000001 /* Frame successfuly received*/
381#define AR5K_IMR_RXDESC 0x00000002 /* RX descriptor request*/ 381#define AR5K_IMR_RXDESC 0x00000002 /* RX descriptor request*/
382#define AR5K_IMR_RXERR 0x00000004 /* Receive error*/ 382#define AR5K_IMR_RXERR 0x00000004 /* Receive error*/
383#define AR5K_IMR_RXNOFRM 0x00000008 /* No frame received (receive timeout)*/ 383#define AR5K_IMR_RXNOFRM 0x00000008 /* No frame received (receive timeout)*/
@@ -895,7 +895,7 @@
895#define AR5K_PCICFG_SL_INTEN 0x00000800 /* Enable interrupts when asleep */ 895#define AR5K_PCICFG_SL_INTEN 0x00000800 /* Enable interrupts when asleep */
896#define AR5K_PCICFG_LED_BCTL 0x00001000 /* Led blink (?) [5210] */ 896#define AR5K_PCICFG_LED_BCTL 0x00001000 /* Led blink (?) [5210] */
897#define AR5K_PCICFG_RETRY_FIX 0x00001000 /* Enable pci core retry fix */ 897#define AR5K_PCICFG_RETRY_FIX 0x00001000 /* Enable pci core retry fix */
898#define AR5K_PCICFG_SL_INPEN 0x00002000 /* Sleep even whith pending interrupts*/ 898#define AR5K_PCICFG_SL_INPEN 0x00002000 /* Sleep even with pending interrupts*/
899#define AR5K_PCICFG_SPWR_DN 0x00010000 /* Mask for power status */ 899#define AR5K_PCICFG_SPWR_DN 0x00010000 /* Mask for power status */
900#define AR5K_PCICFG_LEDMODE 0x000e0000 /* Ledmode [5211+] */ 900#define AR5K_PCICFG_LEDMODE 0x000e0000 /* Ledmode [5211+] */
901#define AR5K_PCICFG_LEDMODE_PROP 0x00000000 /* Blink on standard traffic [5211+] */ 901#define AR5K_PCICFG_LEDMODE_PROP 0x00000000 /* Blink on standard traffic [5211+] */
diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
index ffcf44a4058b..106c0b06cf55 100644
--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
@@ -142,7 +142,7 @@ static void ar5008_hw_force_bias(struct ath_hw *ah, u16 synth_freq)
142 142
143/** 143/**
144 * ar5008_hw_set_channel - tune to a channel on the external AR2133/AR5133 radios 144 * ar5008_hw_set_channel - tune to a channel on the external AR2133/AR5133 radios
145 * @ah: atheros hardware stucture 145 * @ah: atheros hardware structure
146 * @chan: 146 * @chan:
147 * 147 *
148 * For the external AR2133/AR5133 radios, takes the MHz channel value and set 148 * For the external AR2133/AR5133 radios, takes the MHz channel value and set
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index 4a9271802991..6eadf975ae48 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -3240,7 +3240,7 @@ static int ar9300_compress_decision(struct ath_hw *ah,
3240 eep = ar9003_eeprom_struct_find_by_id(reference); 3240 eep = ar9003_eeprom_struct_find_by_id(reference);
3241 if (eep == NULL) { 3241 if (eep == NULL) {
3242 ath_dbg(common, ATH_DBG_EEPROM, 3242 ath_dbg(common, ATH_DBG_EEPROM,
3243 "cant find reference eeprom struct %d\n", 3243 "can't find reference eeprom struct %d\n",
3244 reference); 3244 reference);
3245 return -1; 3245 return -1;
3246 } 3246 }
diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.c b/drivers/net/wireless/ath/ath9k/htc_hst.c
index c41ab8c30161..62e139a30a74 100644
--- a/drivers/net/wireless/ath/ath9k/htc_hst.c
+++ b/drivers/net/wireless/ath/ath9k/htc_hst.c
@@ -360,7 +360,7 @@ ret:
360 * HTC Messages are handled directly here and the obtained SKB 360 * HTC Messages are handled directly here and the obtained SKB
361 * is freed. 361 * is freed.
362 * 362 *
363 * Sevice messages (Data, WMI) passed to the corresponding 363 * Service messages (Data, WMI) passed to the corresponding
364 * endpoint RX handlers, which have to free the SKB. 364 * endpoint RX handlers, which have to free the SKB.
365 */ 365 */
366void ath9k_htc_rx_msg(struct htc_target *htc_handle, 366void ath9k_htc_rx_msg(struct htc_target *htc_handle,
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c
index e83128c50f7b..9c65459be100 100644
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -44,7 +44,7 @@ static void ath_pci_read_cachesize(struct ath_common *common, int *csz)
44 *csz = (int)u8tmp; 44 *csz = (int)u8tmp;
45 45
46 /* 46 /*
47 * This check was put in to avoid "unplesant" consequences if 47 * This check was put in to avoid "unpleasant" consequences if
48 * the bootrom has not fully initialized all PCI devices. 48 * the bootrom has not fully initialized all PCI devices.
49 * Sometimes the cache line size register is not set 49 * Sometimes the cache line size register is not set
50 */ 50 */
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index a3241cd089b1..4c0d36a6980f 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -792,7 +792,7 @@ static void ath_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
792 792
793 tx_info->flags |= IEEE80211_TX_CTL_RATE_CTRL_PROBE; 793 tx_info->flags |= IEEE80211_TX_CTL_RATE_CTRL_PROBE;
794 } else { 794 } else {
795 /* Set the choosen rate. No RTS for first series entry. */ 795 /* Set the chosen rate. No RTS for first series entry. */
796 ath_rc_rate_set_series(rate_table, &rates[i++], txrc, 796 ath_rc_rate_set_series(rate_table, &rates[i++], txrc,
797 try_per_rate, rix, 0); 797 try_per_rate, rix, 0);
798 } 798 }
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 26734e53b37f..88fa7fdffd05 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -628,8 +628,8 @@ static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf,
628 (u32)ATH_AMPDU_LIMIT_MAX); 628 (u32)ATH_AMPDU_LIMIT_MAX);
629 629
630 /* 630 /*
631 * h/w can accept aggregates upto 16 bit lengths (65535). 631 * h/w can accept aggregates up to 16 bit lengths (65535).
632 * The IE, however can hold upto 65536, which shows up here 632 * The IE, however can hold up to 65536, which shows up here
633 * as zero. Ignore 65536 since we are constrained by hw. 633 * as zero. Ignore 65536 since we are constrained by hw.
634 */ 634 */
635 if (tid->an->maxampdu) 635 if (tid->an->maxampdu)
diff --git a/drivers/net/wireless/ath/carl9170/carl9170.h b/drivers/net/wireless/ath/carl9170/carl9170.h
index 9cad061cc1d2..3d4ed5863732 100644
--- a/drivers/net/wireless/ath/carl9170/carl9170.h
+++ b/drivers/net/wireless/ath/carl9170/carl9170.h
@@ -161,7 +161,7 @@ struct carl9170_sta_tid {
161 * Naturally: The higher the limit, the faster the device CAN send. 161 * Naturally: The higher the limit, the faster the device CAN send.
162 * However, even a slight over-commitment at the wrong time and the 162 * However, even a slight over-commitment at the wrong time and the
163 * hardware is doomed to send all already-queued frames at suboptimal 163 * hardware is doomed to send all already-queued frames at suboptimal
164 * rates. This in turn leads to an enourmous amount of unsuccessful 164 * rates. This in turn leads to an enormous amount of unsuccessful
165 * retries => Latency goes up, whereas the throughput goes down. CRASH! 165 * retries => Latency goes up, whereas the throughput goes down. CRASH!
166 */ 166 */
167#define CARL9170_NUM_TX_LIMIT_HARD ((AR9170_TXQ_DEPTH * 3) / 2) 167#define CARL9170_NUM_TX_LIMIT_HARD ((AR9170_TXQ_DEPTH * 3) / 2)
diff --git a/drivers/net/wireless/ath/carl9170/phy.c b/drivers/net/wireless/ath/carl9170/phy.c
index b6b0de600506..b6ae0e179c8d 100644
--- a/drivers/net/wireless/ath/carl9170/phy.c
+++ b/drivers/net/wireless/ath/carl9170/phy.c
@@ -427,7 +427,7 @@ static u32 carl9170_def_val(u32 reg, bool is_2ghz, bool is_40mhz)
427 427
428/* 428/*
429 * initialize some phy regs from eeprom values in modal_header[] 429 * initialize some phy regs from eeprom values in modal_header[]
430 * acc. to band and bandwith 430 * acc. to band and bandwidth
431 */ 431 */
432static int carl9170_init_phy_from_eeprom(struct ar9170 *ar, 432static int carl9170_init_phy_from_eeprom(struct ar9170 *ar,
433 bool is_2ghz, bool is_40mhz) 433 bool is_2ghz, bool is_40mhz)
diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c
index 84866a4b8350..ec21ea9fd8d5 100644
--- a/drivers/net/wireless/ath/carl9170/rx.c
+++ b/drivers/net/wireless/ath/carl9170/rx.c
@@ -849,7 +849,7 @@ static void carl9170_rx_stream(struct ar9170 *ar, void *buf, unsigned int len)
849 /* 849 /*
850 * nested carl9170_rx_stream call! 850 * nested carl9170_rx_stream call!
851 * 851 *
852 * termination is guranteed, even when the 852 * termination is guaranteed, even when the
853 * combined frame also have an element with 853 * combined frame also have an element with
854 * a bad tag. 854 * a bad tag.
855 */ 855 */
diff --git a/drivers/net/wireless/ath/carl9170/usb.c b/drivers/net/wireless/ath/carl9170/usb.c
index f82c400be288..2fb53d067512 100644
--- a/drivers/net/wireless/ath/carl9170/usb.c
+++ b/drivers/net/wireless/ath/carl9170/usb.c
@@ -430,7 +430,7 @@ static void carl9170_usb_rx_complete(struct urb *urb)
430 * The system is too slow to cope with 430 * The system is too slow to cope with
431 * the enormous workload. We have simply 431 * the enormous workload. We have simply
432 * run out of active rx urbs and this 432 * run out of active rx urbs and this
433 * unfortunatly leads to an unpredictable 433 * unfortunately leads to an unpredictable
434 * device. 434 * device.
435 */ 435 */
436 436
diff --git a/drivers/net/wireless/ath/hw.c b/drivers/net/wireless/ath/hw.c
index 183c28281385..cc11d66f15bc 100644
--- a/drivers/net/wireless/ath/hw.c
+++ b/drivers/net/wireless/ath/hw.c
@@ -86,7 +86,7 @@
86 * IFRAME-01: 0110 86 * IFRAME-01: 0110
87 * 87 *
88 * An easy eye-inspeciton of this already should tell you that this frame 88 * An easy eye-inspeciton of this already should tell you that this frame
89 * will not pass our check. This is beacuse the bssid_mask tells the 89 * will not pass our check. This is because the bssid_mask tells the
90 * hardware to only look at the second least significant bit and the 90 * hardware to only look at the second least significant bit and the
91 * common bit amongst the MAC and BSSIDs is 0, this frame has the 2nd LSB 91 * common bit amongst the MAC and BSSIDs is 0, this frame has the 2nd LSB
92 * as 1, which does not match 0. 92 * as 1, which does not match 0.
diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c
index f828f294ba89..0e1b8793c864 100644
--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
@@ -268,7 +268,7 @@ ath_reg_apply_active_scan_flags(struct wiphy *wiphy,
268 } 268 }
269 269
270 /* 270 /*
271 * If a country IE has been recieved check its rule for this 271 * If a country IE has been received check its rule for this
272 * channel first before enabling active scan. The passive scan 272 * channel first before enabling active scan. The passive scan
273 * would have been enforced by the initial processing of our 273 * would have been enforced by the initial processing of our
274 * custom regulatory domain. 274 * custom regulatory domain.
@@ -476,7 +476,7 @@ ath_regd_init_wiphy(struct ath_regulatory *reg,
476 wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY; 476 wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
477 } else { 477 } else {
478 /* 478 /*
479 * This gets applied in the case of the absense of CRDA, 479 * This gets applied in the case of the absence of CRDA,
480 * it's our own custom world regulatory domain, similar to 480 * it's our own custom world regulatory domain, similar to
481 * cfg80211's but we enable passive scanning. 481 * cfg80211's but we enable passive scanning.
482 */ 482 */
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 46e382ed46aa..39a11e8af4fa 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -439,7 +439,7 @@ static u8 mac_reader[] = {
439}; 439};
440 440
441struct atmel_private { 441struct atmel_private {
442 void *card; /* Bus dependent stucture varies for PCcard */ 442 void *card; /* Bus dependent structure varies for PCcard */
443 int (*present_callback)(void *); /* And callback which uses it */ 443 int (*present_callback)(void *); /* And callback which uses it */
444 char firmware_id[32]; 444 char firmware_id[32];
445 AtmelFWType firmware_type; 445 AtmelFWType firmware_type;
@@ -3895,7 +3895,7 @@ static int reset_atmel_card(struct net_device *dev)
3895 3895
3896 This routine is also responsible for initialising some 3896 This routine is also responsible for initialising some
3897 hardware-specific fields in the atmel_private structure, 3897 hardware-specific fields in the atmel_private structure,
3898 including a copy of the firmware's hostinfo stucture 3898 including a copy of the firmware's hostinfo structure
3899 which is the route into the rest of the firmware datastructures. */ 3899 which is the route into the rest of the firmware datastructures. */
3900 3900
3901 struct atmel_private *priv = netdev_priv(dev); 3901 struct atmel_private *priv = netdev_priv(dev);
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index c96e19da2949..05263516c113 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -99,7 +99,7 @@ static void atmel_detach(struct pcmcia_device *link)
99} 99}
100 100
101/* Call-back function to interrogate PCMCIA-specific information 101/* Call-back function to interrogate PCMCIA-specific information
102 about the current existance of the card */ 102 about the current existence of the card */
103static int card_present(void *arg) 103static int card_present(void *arg)
104{ 104{
105 struct pcmcia_device *link = (struct pcmcia_device *)arg; 105 struct pcmcia_device *link = (struct pcmcia_device *)arg;
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index bd4cb75b6ca3..229f4388f790 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -648,7 +648,7 @@ struct b43_request_fw_context {
648 char errors[B43_NR_FWTYPES][128]; 648 char errors[B43_NR_FWTYPES][128];
649 /* Temporary buffer for storing the firmware name. */ 649 /* Temporary buffer for storing the firmware name. */
650 char fwname[64]; 650 char fwname[64];
651 /* A fatal error occured while requesting. Firmware reqest 651 /* A fatal error occurred while requesting. Firmware reqest
652 * can not continue, as any other reqest will also fail. */ 652 * can not continue, as any other reqest will also fail. */
653 int fatal_failure; 653 int fatal_failure;
654}; 654};
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 57eb5b649730..d59b0168c14a 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4010,7 +4010,7 @@ static int b43_wireless_core_start(struct b43_wldev *dev)
4010 b43_mac_enable(dev); 4010 b43_mac_enable(dev);
4011 b43_write32(dev, B43_MMIO_GEN_IRQ_MASK, dev->irq_mask); 4011 b43_write32(dev, B43_MMIO_GEN_IRQ_MASK, dev->irq_mask);
4012 4012
4013 /* Start maintainance work */ 4013 /* Start maintenance work */
4014 b43_periodic_tasks_setup(dev); 4014 b43_periodic_tasks_setup(dev);
4015 4015
4016 b43_leds_init(dev); 4016 b43_leds_init(dev);
diff --git a/drivers/net/wireless/b43/phy_g.h b/drivers/net/wireless/b43/phy_g.h
index 8569fdd4c6be..5413c906a3e7 100644
--- a/drivers/net/wireless/b43/phy_g.h
+++ b/drivers/net/wireless/b43/phy_g.h
@@ -164,7 +164,7 @@ struct b43_phy_g {
164 /* Current Interference Mitigation mode */ 164 /* Current Interference Mitigation mode */
165 int interfmode; 165 int interfmode;
166 /* Stack of saved values from the Interference Mitigation code. 166 /* Stack of saved values from the Interference Mitigation code.
167 * Each value in the stack is layed out as follows: 167 * Each value in the stack is laid out as follows:
168 * bit 0-11: offset 168 * bit 0-11: offset
169 * bit 12-15: register ID 169 * bit 12-15: register ID
170 * bit 16-32: value 170 * bit 16-32: value
diff --git a/drivers/net/wireless/b43/phy_n.h b/drivers/net/wireless/b43/phy_n.h
index 001e841f118c..e789a89f1047 100644
--- a/drivers/net/wireless/b43/phy_n.h
+++ b/drivers/net/wireless/b43/phy_n.h
@@ -703,7 +703,7 @@
703#define B43_NPHY_CHAN_ESTHANG B43_PHY_N(0x21D) /* Channel estimate hang */ 703#define B43_NPHY_CHAN_ESTHANG B43_PHY_N(0x21D) /* Channel estimate hang */
704#define B43_NPHY_FINERX2_CGC B43_PHY_N(0x221) /* Fine RX 2 clock gate control */ 704#define B43_NPHY_FINERX2_CGC B43_PHY_N(0x221) /* Fine RX 2 clock gate control */
705#define B43_NPHY_FINERX2_CGC_DECGC 0x0008 /* Decode gated clocks */ 705#define B43_NPHY_FINERX2_CGC_DECGC 0x0008 /* Decode gated clocks */
706#define B43_NPHY_TXPCTL_INIT B43_PHY_N(0x222) /* TX power controll init */ 706#define B43_NPHY_TXPCTL_INIT B43_PHY_N(0x222) /* TX power control init */
707#define B43_NPHY_TXPCTL_INIT_PIDXI1 0x00FF /* Power index init 1 */ 707#define B43_NPHY_TXPCTL_INIT_PIDXI1 0x00FF /* Power index init 1 */
708#define B43_NPHY_TXPCTL_INIT_PIDXI1_SHIFT 0 708#define B43_NPHY_TXPCTL_INIT_PIDXI1_SHIFT 0
709#define B43_NPHY_PAPD_EN0 B43_PHY_N(0x297) /* PAPD Enable0 TBD */ 709#define B43_NPHY_PAPD_EN0 B43_PHY_N(0x297) /* PAPD Enable0 TBD */
diff --git a/drivers/net/wireless/b43legacy/b43legacy.h b/drivers/net/wireless/b43legacy/b43legacy.h
index c81b2f53b0c5..23583be1ee0b 100644
--- a/drivers/net/wireless/b43legacy/b43legacy.h
+++ b/drivers/net/wireless/b43legacy/b43legacy.h
@@ -488,7 +488,7 @@ struct b43legacy_phy {
488 /* Current Interference Mitigation mode */ 488 /* Current Interference Mitigation mode */
489 int interfmode; 489 int interfmode;
490 /* Stack of saved values from the Interference Mitigation code. 490 /* Stack of saved values from the Interference Mitigation code.
491 * Each value in the stack is layed out as follows: 491 * Each value in the stack is laid out as follows:
492 * bit 0-11: offset 492 * bit 0-11: offset
493 * bit 12-15: register ID 493 * bit 12-15: register ID
494 * bit 16-32: value 494 * bit 16-32: value
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
index 18d63f57777d..3d05dc15c6b8 100644
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -2359,7 +2359,7 @@ int prism2_ap_get_sta_qual(local_info_t *local, struct sockaddr addr[],
2359} 2359}
2360 2360
2361 2361
2362/* Translate our list of Access Points & Stations to a card independant 2362/* Translate our list of Access Points & Stations to a card independent
2363 * format that the Wireless Tools will understand - Jean II */ 2363 * format that the Wireless Tools will understand - Jean II */
2364int prism2_ap_translate_scan(struct net_device *dev, 2364int prism2_ap_translate_scan(struct net_device *dev,
2365 struct iw_request_info *info, char *buffer) 2365 struct iw_request_info *info, char *buffer)
diff --git a/drivers/net/wireless/hostap/hostap_ap.h b/drivers/net/wireless/hostap/hostap_ap.h
index 655ceeba9612..334e2d0b8e11 100644
--- a/drivers/net/wireless/hostap/hostap_ap.h
+++ b/drivers/net/wireless/hostap/hostap_ap.h
@@ -114,7 +114,7 @@ struct sta_info {
114 * has passed since last received frame from the station, a nullfunc data 114 * has passed since last received frame from the station, a nullfunc data
115 * frame is sent to the station. If this frame is not acknowledged and no other 115 * frame is sent to the station. If this frame is not acknowledged and no other
116 * frames have been received, the station will be disassociated after 116 * frames have been received, the station will be disassociated after
117 * AP_DISASSOC_DELAY. Similarily, a the station will be deauthenticated after 117 * AP_DISASSOC_DELAY. Similarly, a the station will be deauthenticated after
118 * AP_DEAUTH_DELAY. AP_TIMEOUT_RESOLUTION is the resolution that is used with 118 * AP_DEAUTH_DELAY. AP_TIMEOUT_RESOLUTION is the resolution that is used with
119 * max inactivity timer. */ 119 * max inactivity timer. */
120#define AP_MAX_INACTIVITY_SEC (5 * 60) 120#define AP_MAX_INACTIVITY_SEC (5 * 60)
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index 6038633ef361..12de46407c71 100644
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -1945,7 +1945,7 @@ static char * __prism2_translate_scan(local_info_t *local,
1945} 1945}
1946 1946
1947 1947
1948/* Translate scan data returned from the card to a card independant 1948/* Translate scan data returned from the card to a card independent
1949 * format that the Wireless Tools will understand - Jean II */ 1949 * format that the Wireless Tools will understand - Jean II */
1950static inline int prism2_translate_scan(local_info_t *local, 1950static inline int prism2_translate_scan(local_info_t *local,
1951 struct iw_request_info *info, 1951 struct iw_request_info *info,
@@ -2043,7 +2043,7 @@ static inline int prism2_ioctl_giwscan_sta(struct net_device *dev,
2043 * until results are ready for various reasons. 2043 * until results are ready for various reasons.
2044 * First, managing wait queues is complex and racy 2044 * First, managing wait queues is complex and racy
2045 * (there may be multiple simultaneous callers). 2045 * (there may be multiple simultaneous callers).
2046 * Second, we grab some rtnetlink lock before comming 2046 * Second, we grab some rtnetlink lock before coming
2047 * here (in dev_ioctl()). 2047 * here (in dev_ioctl()).
2048 * Third, the caller can wait on the Wireless Event 2048 * Third, the caller can wait on the Wireless Event
2049 * - Jean II */ 2049 * - Jean II */
diff --git a/drivers/net/wireless/hostap/hostap_wlan.h b/drivers/net/wireless/hostap/hostap_wlan.h
index 1c66b3c1030d..88dc6a52bdf1 100644
--- a/drivers/net/wireless/hostap/hostap_wlan.h
+++ b/drivers/net/wireless/hostap/hostap_wlan.h
@@ -853,7 +853,7 @@ struct local_info {
853 struct work_struct comms_qual_update; 853 struct work_struct comms_qual_update;
854 854
855 /* RSSI to dBm adjustment (for RX descriptor fields) */ 855 /* RSSI to dBm adjustment (for RX descriptor fields) */
856 int rssi_to_dBm; /* substract from RSSI to get approximate dBm value */ 856 int rssi_to_dBm; /* subtract from RSSI to get approximate dBm value */
857 857
858 /* BSS list / protected by local->lock */ 858 /* BSS list / protected by local->lock */
859 struct list_head bss_list; 859 struct list_head bss_list;
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index 4b97f918daff..44307753587d 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -63,7 +63,7 @@ When data is sent to the firmware, the first TBD is used to indicate to the
63firmware if a Command or Data is being sent. If it is Command, all of the 63firmware if a Command or Data is being sent. If it is Command, all of the
64command information is contained within the physical address referred to by the 64command information is contained within the physical address referred to by the
65TBD. If it is Data, the first TBD indicates the type of data packet, number 65TBD. If it is Data, the first TBD indicates the type of data packet, number
66of fragments, etc. The next TBD then referrs to the actual packet location. 66of fragments, etc. The next TBD then refers to the actual packet location.
67 67
68The Tx flow cycle is as follows: 68The Tx flow cycle is as follows:
69 69
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 160881f234cc..42c3fe37af64 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -1181,7 +1181,7 @@ static void ipw_led_shutdown(struct ipw_priv *priv)
1181/* 1181/*
1182 * The following adds a new attribute to the sysfs representation 1182 * The following adds a new attribute to the sysfs representation
1183 * of this device driver (i.e. a new file in /sys/bus/pci/drivers/ipw/) 1183 * of this device driver (i.e. a new file in /sys/bus/pci/drivers/ipw/)
1184 * used for controling the debug level. 1184 * used for controlling the debug level.
1185 * 1185 *
1186 * See the level definitions in ipw for details. 1186 * See the level definitions in ipw for details.
1187 */ 1187 */
@@ -3763,7 +3763,7 @@ static int ipw_queue_tx_init(struct ipw_priv *priv,
3763 3763
3764 q->txb = kmalloc(sizeof(q->txb[0]) * count, GFP_KERNEL); 3764 q->txb = kmalloc(sizeof(q->txb[0]) * count, GFP_KERNEL);
3765 if (!q->txb) { 3765 if (!q->txb) {
3766 IPW_ERROR("vmalloc for auxilary BD structures failed\n"); 3766 IPW_ERROR("vmalloc for auxiliary BD structures failed\n");
3767 return -ENOMEM; 3767 return -ENOMEM;
3768 } 3768 }
3769 3769
@@ -5581,7 +5581,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
5581 return 0; 5581 return 0;
5582 } 5582 }
5583 5583
5584 /* Verify privacy compatability */ 5584 /* Verify privacy compatibility */
5585 if (((priv->capability & CAP_PRIVACY_ON) ? 1 : 0) != 5585 if (((priv->capability & CAP_PRIVACY_ON) ? 1 : 0) !=
5586 ((network->capability & WLAN_CAPABILITY_PRIVACY) ? 1 : 0)) { 5586 ((network->capability & WLAN_CAPABILITY_PRIVACY) ? 1 : 0)) {
5587 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded " 5587 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "
@@ -5808,7 +5808,7 @@ static int ipw_best_network(struct ipw_priv *priv,
5808 return 0; 5808 return 0;
5809 } 5809 }
5810 5810
5811 /* Verify privacy compatability */ 5811 /* Verify privacy compatibility */
5812 if (((priv->capability & CAP_PRIVACY_ON) ? 1 : 0) != 5812 if (((priv->capability & CAP_PRIVACY_ON) ? 1 : 0) !=
5813 ((network->capability & WLAN_CAPABILITY_PRIVACY) ? 1 : 0)) { 5813 ((network->capability & WLAN_CAPABILITY_PRIVACY) ? 1 : 0)) {
5814 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded " 5814 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
@@ -8184,7 +8184,7 @@ static void ipw_handle_promiscuous_rx(struct ipw_priv *priv,
8184static int is_network_packet(struct ipw_priv *priv, 8184static int is_network_packet(struct ipw_priv *priv,
8185 struct libipw_hdr_4addr *header) 8185 struct libipw_hdr_4addr *header)
8186{ 8186{
8187 /* Filter incoming packets to determine if they are targetted toward 8187 /* Filter incoming packets to determine if they are targeted toward
8188 * this network, discarding packets coming from ourselves */ 8188 * this network, discarding packets coming from ourselves */
8189 switch (priv->ieee->iw_mode) { 8189 switch (priv->ieee->iw_mode) {
8190 case IW_MODE_ADHOC: /* Header: Dest. | Source | BSSID */ 8190 case IW_MODE_ADHOC: /* Header: Dest. | Source | BSSID */
@@ -8340,9 +8340,9 @@ static void ipw_handle_mgmt_packet(struct ipw_priv *priv,
8340} 8340}
8341 8341
8342/* 8342/*
8343 * Main entry function for recieving a packet with 80211 headers. This 8343 * Main entry function for receiving a packet with 80211 headers. This
8344 * should be called when ever the FW has notified us that there is a new 8344 * should be called when ever the FW has notified us that there is a new
8345 * skb in the recieve queue. 8345 * skb in the receive queue.
8346 */ 8346 */
8347static void ipw_rx(struct ipw_priv *priv) 8347static void ipw_rx(struct ipw_priv *priv)
8348{ 8348{
@@ -8683,7 +8683,7 @@ static int ipw_sw_reset(struct ipw_priv *priv, int option)
8683 * functions defined in ipw_main to provide the HW interaction. 8683 * functions defined in ipw_main to provide the HW interaction.
8684 * 8684 *
8685 * The exception to this is the use of the ipw_get_ordinal() 8685 * The exception to this is the use of the ipw_get_ordinal()
8686 * function used to poll the hardware vs. making unecessary calls. 8686 * function used to poll the hardware vs. making unnecessary calls.
8687 * 8687 *
8688 */ 8688 */
8689 8689
@@ -10419,7 +10419,7 @@ static void ipw_handle_promiscuous_tx(struct ipw_priv *priv,
10419 10419
10420 memset(&dummystats, 0, sizeof(dummystats)); 10420 memset(&dummystats, 0, sizeof(dummystats));
10421 10421
10422 /* Filtering of fragment chains is done agains the first fragment */ 10422 /* Filtering of fragment chains is done against the first fragment */
10423 hdr = (void *)txb->fragments[0]->data; 10423 hdr = (void *)txb->fragments[0]->data;
10424 if (libipw_is_management(le16_to_cpu(hdr->frame_control))) { 10424 if (libipw_is_management(le16_to_cpu(hdr->frame_control))) {
10425 if (filter & IPW_PROM_NO_MGMT) 10425 if (filter & IPW_PROM_NO_MGMT)
diff --git a/drivers/net/wireless/ipw2x00/libipw_rx.c b/drivers/net/wireless/ipw2x00/libipw_rx.c
index 0de1b1893220..e5ad76cd77da 100644
--- a/drivers/net/wireless/ipw2x00/libipw_rx.c
+++ b/drivers/net/wireless/ipw2x00/libipw_rx.c
@@ -925,7 +925,7 @@ drop_free:
925static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 }; 925static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 };
926 926
927/* 927/*
928* Make ther structure we read from the beacon packet has 928* Make the structure we read from the beacon packet to have
929* the right values 929* the right values
930*/ 930*/
931static int libipw_verify_qos_info(struct libipw_qos_information_element 931static int libipw_verify_qos_info(struct libipw_qos_information_element
diff --git a/drivers/net/wireless/iwlegacy/iwl-core.c b/drivers/net/wireless/iwlegacy/iwl-core.c
index a209a0e76bf0..7007d61bb6b5 100644
--- a/drivers/net/wireless/iwlegacy/iwl-core.c
+++ b/drivers/net/wireless/iwlegacy/iwl-core.c
@@ -1030,7 +1030,7 @@ int iwl_legacy_apm_init(struct iwl_priv *priv)
1030 /* 1030 /*
1031 * Enable HAP INTA (interrupt from management bus) to 1031 * Enable HAP INTA (interrupt from management bus) to
1032 * wake device's PCI Express link L1a -> L0s 1032 * wake device's PCI Express link L1a -> L0s
1033 * NOTE: This is no-op for 3945 (non-existant bit) 1033 * NOTE: This is no-op for 3945 (non-existent bit)
1034 */ 1034 */
1035 iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG, 1035 iwl_legacy_set_bit(priv, CSR_HW_IF_CONFIG_REG,
1036 CSR_HW_IF_CONFIG_REG_BIT_HAP_WAKE_L1A); 1036 CSR_HW_IF_CONFIG_REG_BIT_HAP_WAKE_L1A);
diff --git a/drivers/net/wireless/iwlegacy/iwl-fh.h b/drivers/net/wireless/iwlegacy/iwl-fh.h
index 4e20c7e5c883..6e6091816e36 100644
--- a/drivers/net/wireless/iwlegacy/iwl-fh.h
+++ b/drivers/net/wireless/iwlegacy/iwl-fh.h
@@ -436,7 +436,7 @@
436 * @finished_rb_num [0:11] - Indicates the index of the current RB 436 * @finished_rb_num [0:11] - Indicates the index of the current RB
437 * in which the last frame was written to 437 * in which the last frame was written to
438 * @finished_fr_num [0:11] - Indicates the index of the RX Frame 438 * @finished_fr_num [0:11] - Indicates the index of the RX Frame
439 * which was transfered 439 * which was transferred
440 */ 440 */
441struct iwl_rb_status { 441struct iwl_rb_status {
442 __le16 closed_rb_num; 442 __le16 closed_rb_num;
diff --git a/drivers/net/wireless/iwlegacy/iwl-scan.c b/drivers/net/wireless/iwlegacy/iwl-scan.c
index 60f597f796ca..353234a02c6d 100644
--- a/drivers/net/wireless/iwlegacy/iwl-scan.c
+++ b/drivers/net/wireless/iwlegacy/iwl-scan.c
@@ -143,7 +143,7 @@ static void iwl_legacy_do_scan_abort(struct iwl_priv *priv)
143 IWL_DEBUG_SCAN(priv, "Send scan abort failed %d\n", ret); 143 IWL_DEBUG_SCAN(priv, "Send scan abort failed %d\n", ret);
144 iwl_legacy_force_scan_end(priv); 144 iwl_legacy_force_scan_end(priv);
145 } else 145 } else
146 IWL_DEBUG_SCAN(priv, "Sucessfully send scan abort\n"); 146 IWL_DEBUG_SCAN(priv, "Successfully send scan abort\n");
147} 147}
148 148
149/** 149/**
diff --git a/drivers/net/wireless/iwlegacy/iwl-sta.c b/drivers/net/wireless/iwlegacy/iwl-sta.c
index 47c9da3834ea..66f0fb2bbe00 100644
--- a/drivers/net/wireless/iwlegacy/iwl-sta.c
+++ b/drivers/net/wireless/iwlegacy/iwl-sta.c
@@ -110,7 +110,7 @@ static int iwl_legacy_process_add_sta_resp(struct iwl_priv *priv,
110 /* 110 /*
111 * XXX: The MAC address in the command buffer is often changed from 111 * XXX: The MAC address in the command buffer is often changed from
112 * the original sent to the device. That is, the MAC address 112 * the original sent to the device. That is, the MAC address
113 * written to the command buffer often is not the same MAC adress 113 * written to the command buffer often is not the same MAC address
114 * read from the command buffer when the command returns. This 114 * read from the command buffer when the command returns. This
115 * issue has not yet been resolved and this debugging is left to 115 * issue has not yet been resolved and this debugging is left to
116 * observe the problem. 116 * observe the problem.
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ict.c b/drivers/net/wireless/iwlwifi/iwl-agn-ict.c
index b5cb3be0eb4b..ed0148d714de 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-ict.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-ict.c
@@ -69,7 +69,7 @@ int iwl_alloc_isr_ict(struct iwl_priv *priv)
69 if (!priv->_agn.ict_tbl_vir) 69 if (!priv->_agn.ict_tbl_vir)
70 return -ENOMEM; 70 return -ENOMEM;
71 71
72 /* align table to PAGE_SIZE boundry */ 72 /* align table to PAGE_SIZE boundary */
73 priv->_agn.aligned_ict_tbl_dma = ALIGN(priv->_agn.ict_tbl_dma, PAGE_SIZE); 73 priv->_agn.aligned_ict_tbl_dma = ALIGN(priv->_agn.ict_tbl_dma, PAGE_SIZE);
74 74
75 IWL_DEBUG_ISR(priv, "ict dma addr %Lx dma aligned %Lx diff %d\n", 75 IWL_DEBUG_ISR(priv, "ict dma addr %Lx dma aligned %Lx diff %d\n",
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 6c30fa652e27..bafbe57c9602 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -1040,7 +1040,7 @@ int iwl_apm_init(struct iwl_priv *priv)
1040 /* 1040 /*
1041 * Enable HAP INTA (interrupt from management bus) to 1041 * Enable HAP INTA (interrupt from management bus) to
1042 * wake device's PCI Express link L1a -> L0s 1042 * wake device's PCI Express link L1a -> L0s
1043 * NOTE: This is no-op for 3945 (non-existant bit) 1043 * NOTE: This is no-op for 3945 (non-existent bit)
1044 */ 1044 */
1045 iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG, 1045 iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,
1046 CSR_HW_IF_CONFIG_REG_BIT_HAP_WAKE_L1A); 1046 CSR_HW_IF_CONFIG_REG_BIT_HAP_WAKE_L1A);
diff --git a/drivers/net/wireless/iwlwifi/iwl-fh.h b/drivers/net/wireless/iwlwifi/iwl-fh.h
index 55b8370bc6d4..474009a244d4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fh.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fh.h
@@ -436,7 +436,7 @@
436 * @finished_rb_num [0:11] - Indicates the index of the current RB 436 * @finished_rb_num [0:11] - Indicates the index of the current RB
437 * in which the last frame was written to 437 * in which the last frame was written to
438 * @finished_fr_num [0:11] - Indicates the index of the RX Frame 438 * @finished_fr_num [0:11] - Indicates the index of the RX Frame
439 * which was transfered 439 * which was transferred
440 */ 440 */
441struct iwl_rb_status { 441struct iwl_rb_status {
442 __le16 closed_rb_num; 442 __le16 closed_rb_num;
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index 3a4d9e6b0421..914c77e44588 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -143,7 +143,7 @@ static void iwl_do_scan_abort(struct iwl_priv *priv)
143 IWL_DEBUG_SCAN(priv, "Send scan abort failed %d\n", ret); 143 IWL_DEBUG_SCAN(priv, "Send scan abort failed %d\n", ret);
144 iwl_force_scan_end(priv); 144 iwl_force_scan_end(priv);
145 } else 145 } else
146 IWL_DEBUG_SCAN(priv, "Sucessfully send scan abort\n"); 146 IWL_DEBUG_SCAN(priv, "Successfully send scan abort\n");
147} 147}
148 148
149/** 149/**
diff --git a/drivers/net/wireless/iwmc3200wifi/hal.c b/drivers/net/wireless/iwmc3200wifi/hal.c
index 907ac890997c..1cabcb39643f 100644
--- a/drivers/net/wireless/iwmc3200wifi/hal.c
+++ b/drivers/net/wireless/iwmc3200wifi/hal.c
@@ -57,7 +57,7 @@
57 * This is due to the fact the host talks exclusively 57 * This is due to the fact the host talks exclusively
58 * to the UMAC and so there needs to be a special UMAC 58 * to the UMAC and so there needs to be a special UMAC
59 * command for talking to the LMAC. 59 * command for talking to the LMAC.
60 * This is how a wifi command is layed out: 60 * This is how a wifi command is laid out:
61 * ------------------------ 61 * ------------------------
62 * | iwm_udma_out_wifi_hdr | 62 * | iwm_udma_out_wifi_hdr |
63 * ------------------------ 63 * ------------------------
@@ -72,7 +72,7 @@
72 * Those commands are handled by the device's bootrom, 72 * Those commands are handled by the device's bootrom,
73 * and are typically sent when the UMAC and the LMAC 73 * and are typically sent when the UMAC and the LMAC
74 * are not yet available. 74 * are not yet available.
75 * * This is how a non-wifi command is layed out: 75 * * This is how a non-wifi command is laid out:
76 * --------------------------- 76 * ---------------------------
77 * | iwm_udma_out_nonwifi_hdr | 77 * | iwm_udma_out_nonwifi_hdr |
78 * --------------------------- 78 * ---------------------------
diff --git a/drivers/net/wireless/iwmc3200wifi/tx.c b/drivers/net/wireless/iwmc3200wifi/tx.c
index 3216621fc55a..be98074c0608 100644
--- a/drivers/net/wireless/iwmc3200wifi/tx.c
+++ b/drivers/net/wireless/iwmc3200wifi/tx.c
@@ -197,7 +197,7 @@ int iwm_tx_credit_alloc(struct iwm_priv *iwm, int id, int nb)
197 spin_lock(&iwm->tx_credit.lock); 197 spin_lock(&iwm->tx_credit.lock);
198 198
199 if (!iwm_tx_credit_ok(iwm, id, nb)) { 199 if (!iwm_tx_credit_ok(iwm, id, nb)) {
200 IWM_DBG_TX(iwm, DBG, "No credit avaliable for pool[%d]\n", id); 200 IWM_DBG_TX(iwm, DBG, "No credit available for pool[%d]\n", id);
201 ret = -ENOSPC; 201 ret = -ENOSPC;
202 goto out; 202 goto out;
203 } 203 }
diff --git a/drivers/net/wireless/libertas/README b/drivers/net/wireless/libertas/README
index 60fd1afe89ac..1453eec82a99 100644
--- a/drivers/net/wireless/libertas/README
+++ b/drivers/net/wireless/libertas/README
@@ -70,7 +70,7 @@ rdrf
70 These commands are used to read the MAC, BBP and RF registers from the 70 These commands are used to read the MAC, BBP and RF registers from the
71 card. These commands take one parameter that specifies the offset 71 card. These commands take one parameter that specifies the offset
72 location that is to be read. This parameter must be specified in 72 location that is to be read. This parameter must be specified in
73 hexadecimal (its possible to preceed preceding the number with a "0x"). 73 hexadecimal (its possible to precede preceding the number with a "0x").
74 74
75 Path: /sys/kernel/debug/libertas_wireless/ethX/registers/ 75 Path: /sys/kernel/debug/libertas_wireless/ethX/registers/
76 76
@@ -84,7 +84,7 @@ wrrf
84 These commands are used to write the MAC, BBP and RF registers in the 84 These commands are used to write the MAC, BBP and RF registers in the
85 card. These commands take two parameters that specify the offset 85 card. These commands take two parameters that specify the offset
86 location and the value that is to be written. This parameters must 86 location and the value that is to be written. This parameters must
87 be specified in hexadecimal (its possible to preceed the number 87 be specified in hexadecimal (its possible to precede the number
88 with a "0x"). 88 with a "0x").
89 89
90 Usage: 90 Usage:
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
index 30ef0351bfc4..5caa2ac14d61 100644
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@ -1350,7 +1350,7 @@ static int lbs_cfg_connect(struct wiphy *wiphy, struct net_device *dev,
1350 * we remove all keys like in the WPA/WPA2 setup, 1350 * we remove all keys like in the WPA/WPA2 setup,
1351 * we just don't set RSN. 1351 * we just don't set RSN.
1352 * 1352 *
1353 * Therefore: fall-throught 1353 * Therefore: fall-through
1354 */ 1354 */
1355 case WLAN_CIPHER_SUITE_TKIP: 1355 case WLAN_CIPHER_SUITE_TKIP:
1356 case WLAN_CIPHER_SUITE_CCMP: 1356 case WLAN_CIPHER_SUITE_CCMP:
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index fc8121190d38..8712cb213f2f 100644
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -913,7 +913,7 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
913 goto out3; 913 goto out3;
914 } 914 }
915 915
916 /* Clear any interrupt cause that happend while sending 916 /* Clear any interrupt cause that happened while sending
917 * firmware/initializing card */ 917 * firmware/initializing card */
918 if_cs_write16(card, IF_CS_CARD_INT_CAUSE, IF_CS_BIT_MASK); 918 if_cs_write16(card, IF_CS_CARD_INT_CAUSE, IF_CS_BIT_MASK);
919 if_cs_enable_ints(card); 919 if_cs_enable_ints(card);
diff --git a/drivers/net/wireless/libertas/if_spi.h b/drivers/net/wireless/libertas/if_spi.h
index 8b1417d3b71b..d2ac1dcd7e2e 100644
--- a/drivers/net/wireless/libertas/if_spi.h
+++ b/drivers/net/wireless/libertas/if_spi.h
@@ -66,7 +66,7 @@
66#define IF_SPI_HOST_INT_CTRL_REG 0x40 /* Host interrupt controller reg */ 66#define IF_SPI_HOST_INT_CTRL_REG 0x40 /* Host interrupt controller reg */
67 67
68#define IF_SPI_CARD_INT_CAUSE_REG 0x44 /* Card interrupt cause reg */ 68#define IF_SPI_CARD_INT_CAUSE_REG 0x44 /* Card interrupt cause reg */
69#define IF_SPI_CARD_INT_STATUS_REG 0x48 /* Card interupt status reg */ 69#define IF_SPI_CARD_INT_STATUS_REG 0x48 /* Card interrupt status reg */
70#define IF_SPI_CARD_INT_EVENT_MASK_REG 0x4C /* Card interrupt event mask */ 70#define IF_SPI_CARD_INT_EVENT_MASK_REG 0x4C /* Card interrupt event mask */
71#define IF_SPI_CARD_INT_STATUS_MASK_REG 0x50 /* Card interrupt status mask */ 71#define IF_SPI_CARD_INT_STATUS_MASK_REG 0x50 /* Card interrupt status mask */
72 72
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 56f439d58013..f4f4257a9d67 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -62,7 +62,7 @@ MODULE_PARM_DESC(fake_hw_scan, "Install fake (no-op) hw-scan handler");
62 * an intersection to occur but each device will still use their 62 * an intersection to occur but each device will still use their
63 * respective regulatory requested domains. Subsequent radios will 63 * respective regulatory requested domains. Subsequent radios will
64 * use the resulting intersection. 64 * use the resulting intersection.
65 * @HWSIM_REGTEST_WORLD_ROAM: Used for testing the world roaming. We acomplish 65 * @HWSIM_REGTEST_WORLD_ROAM: Used for testing the world roaming. We accomplish
66 * this by using a custom beacon-capable regulatory domain for the first 66 * this by using a custom beacon-capable regulatory domain for the first
67 * radio. All other device world roam. 67 * radio. All other device world roam.
68 * @HWSIM_REGTEST_CUSTOM_WORLD: Used for testing the custom world regulatory 68 * @HWSIM_REGTEST_CUSTOM_WORLD: Used for testing the custom world regulatory
diff --git a/drivers/net/wireless/orinoco/hw.c b/drivers/net/wireless/orinoco/hw.c
index b4772c1c6135..3c7877a7c31c 100644
--- a/drivers/net/wireless/orinoco/hw.c
+++ b/drivers/net/wireless/orinoco/hw.c
@@ -1031,7 +1031,7 @@ int __orinoco_hw_set_tkip_key(struct orinoco_private *priv, int key_idx,
1031 else 1031 else
1032 buf.tsc[4] = 0x10; 1032 buf.tsc[4] = 0x10;
1033 1033
1034 /* Wait upto 100ms for tx queue to empty */ 1034 /* Wait up to 100ms for tx queue to empty */
1035 for (k = 100; k > 0; k--) { 1035 for (k = 100; k > 0; k--) {
1036 udelay(1000); 1036 udelay(1000);
1037 ret = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_TXQUEUEEMPTY, 1037 ret = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_TXQUEUEEMPTY,
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
index 356e6bb443a6..a946991989c6 100644
--- a/drivers/net/wireless/p54/main.c
+++ b/drivers/net/wireless/p54/main.c
@@ -465,7 +465,7 @@ static int p54_set_key(struct ieee80211_hw *dev, enum set_key_cmd cmd,
465 465
466 if (slot < 0) { 466 if (slot < 0) {
467 /* 467 /*
468 * The device supports the choosen algorithm, but the 468 * The device supports the chosen algorithm, but the
469 * firmware does not provide enough key slots to store 469 * firmware does not provide enough key slots to store
470 * all of them. 470 * all of them.
471 * But encryption offload for outgoing frames is always 471 * But encryption offload for outgoing frames is always
diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c
index 7ecc0bda57b3..6d9204fef90b 100644
--- a/drivers/net/wireless/p54/p54spi.c
+++ b/drivers/net/wireless/p54/p54spi.c
@@ -287,7 +287,7 @@ static void p54spi_power_on(struct p54s_priv *priv)
287 enable_irq(gpio_to_irq(p54spi_gpio_irq)); 287 enable_irq(gpio_to_irq(p54spi_gpio_irq));
288 288
289 /* 289 /*
290 * need to wait a while before device can be accessed, the lenght 290 * need to wait a while before device can be accessed, the length
291 * is just a guess 291 * is just a guess
292 */ 292 */
293 msleep(10); 293 msleep(10);
diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c
index d44f8e20cce0..266d45bf86f5 100644
--- a/drivers/net/wireless/prism54/islpci_eth.c
+++ b/drivers/net/wireless/prism54/islpci_eth.c
@@ -113,7 +113,7 @@ islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev)
113 * be aligned on a 4-byte boundary. If WDS is enabled add another 6 bytes 113 * be aligned on a 4-byte boundary. If WDS is enabled add another 6 bytes
114 * and add WDS address information */ 114 * and add WDS address information */
115 if (likely(((long) skb->data & 0x03) | init_wds)) { 115 if (likely(((long) skb->data & 0x03) | init_wds)) {
116 /* get the number of bytes to add and re-allign */ 116 /* get the number of bytes to add and re-align */
117 offset = (4 - (long) skb->data) & 0x03; 117 offset = (4 - (long) skb->data) & 0x03;
118 offset += init_wds ? 6 : 0; 118 offset += init_wds ? 6 : 0;
119 119
@@ -342,7 +342,7 @@ islpci_eth_receive(islpci_private *priv)
342 priv->pci_map_rx_address[index], 342 priv->pci_map_rx_address[index],
343 MAX_FRAGMENT_SIZE_RX + 2, PCI_DMA_FROMDEVICE); 343 MAX_FRAGMENT_SIZE_RX + 2, PCI_DMA_FROMDEVICE);
344 344
345 /* update the skb structure and allign the buffer */ 345 /* update the skb structure and align the buffer */
346 skb_put(skb, size); 346 skb_put(skb, size);
347 if (offset) { 347 if (offset) {
348 /* shift the buffer allocation offset bytes to get the right frame */ 348 /* shift the buffer allocation offset bytes to get the right frame */
diff --git a/drivers/net/wireless/rayctl.h b/drivers/net/wireless/rayctl.h
index 49d9b267bc0f..d7646f299bd3 100644
--- a/drivers/net/wireless/rayctl.h
+++ b/drivers/net/wireless/rayctl.h
@@ -578,7 +578,7 @@ struct tx_msg {
578 UCHAR var[1]; 578 UCHAR var[1];
579}; 579};
580 580
581/****** ECF Receive Control Stucture (RCS) Area at Shared RAM offset 0x0800 */ 581/****** ECF Receive Control Structure (RCS) Area at Shared RAM offset 0x0800 */
582/* Structures for command specific parameters (rcs.var) */ 582/* Structures for command specific parameters (rcs.var) */
583struct rx_packet_cmd { 583struct rx_packet_cmd {
584 UCHAR rx_data_ptr[2]; 584 UCHAR rx_data_ptr[2];
diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
index 70b9abbdeb9e..8fbc5fa965e0 100644
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -616,7 +616,7 @@
616 * READ_CONTROL: 0 write BBP, 1 read BBP 616 * READ_CONTROL: 0 write BBP, 1 read BBP
617 * BUSY: ASIC is busy executing BBP commands 617 * BUSY: ASIC is busy executing BBP commands
618 * BBP_PAR_DUR: 0 4 MAC clocks, 1 8 MAC clocks 618 * BBP_PAR_DUR: 0 4 MAC clocks, 1 8 MAC clocks
619 * BBP_RW_MODE: 0 serial, 1 paralell 619 * BBP_RW_MODE: 0 serial, 1 parallel
620 */ 620 */
621#define BBP_CSR_CFG 0x101c 621#define BBP_CSR_CFG 0x101c
622#define BBP_CSR_CFG_VALUE FIELD32(0x000000ff) 622#define BBP_CSR_CFG_VALUE FIELD32(0x000000ff)
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 2ee6cebb9b25..dbf74d07d947 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -1518,7 +1518,7 @@ static void rt2800_config_channel_rf2xxx(struct rt2x00_dev *rt2x00dev,
1518 if (rf->channel > 14) { 1518 if (rf->channel > 14) {
1519 /* 1519 /*
1520 * When TX power is below 0, we should increase it by 7 to 1520 * When TX power is below 0, we should increase it by 7 to
1521 * make it a positive value (Minumum value is -7). 1521 * make it a positive value (Minimum value is -7).
1522 * However this means that values between 0 and 7 have 1522 * However this means that values between 0 and 7 have
1523 * double meaning, and we should set a 7DBm boost flag. 1523 * double meaning, and we should set a 7DBm boost flag.
1524 */ 1524 */
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index a3940d7300a4..7f10239f56a8 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -484,13 +484,13 @@ struct rt2x00intf_conf {
484 enum nl80211_iftype type; 484 enum nl80211_iftype type;
485 485
486 /* 486 /*
487 * TSF sync value, this is dependant on the operation type. 487 * TSF sync value, this is dependent on the operation type.
488 */ 488 */
489 enum tsf_sync sync; 489 enum tsf_sync sync;
490 490
491 /* 491 /*
492 * The MAC and BSSID addressess are simple array of bytes, 492 * The MAC and BSSID addresses are simple array of bytes,
493 * these arrays are little endian, so when sending the addressess 493 * these arrays are little endian, so when sending the addresses
494 * to the drivers, copy the it into a endian-signed variable. 494 * to the drivers, copy the it into a endian-signed variable.
495 * 495 *
496 * Note that all devices (except rt2500usb) have 32 bits 496 * Note that all devices (except rt2500usb) have 32 bits
@@ -1131,7 +1131,7 @@ void rt2x00queue_stop_queue(struct data_queue *queue);
1131 * @drop: True to drop all pending frames. 1131 * @drop: True to drop all pending frames.
1132 * 1132 *
1133 * This function will flush the queue. After this call 1133 * This function will flush the queue. After this call
1134 * the queue is guarenteed to be empty. 1134 * the queue is guaranteed to be empty.
1135 */ 1135 */
1136void rt2x00queue_flush_queue(struct data_queue *queue, bool drop); 1136void rt2x00queue_flush_queue(struct data_queue *queue, bool drop);
1137 1137
diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/rt2x00/rt2x00config.c
index e7f67d5eda52..9416e36de29e 100644
--- a/drivers/net/wireless/rt2x00/rt2x00config.c
+++ b/drivers/net/wireless/rt2x00/rt2x00config.c
@@ -60,7 +60,7 @@ void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev,
60 * Note that when NULL is passed as address we will send 60 * Note that when NULL is passed as address we will send
61 * 00:00:00:00:00 to the device to clear the address. 61 * 00:00:00:00:00 to the device to clear the address.
62 * This will prevent the device being confused when it wants 62 * This will prevent the device being confused when it wants
63 * to ACK frames or consideres itself associated. 63 * to ACK frames or considers itself associated.
64 */ 64 */
65 memset(conf.mac, 0, sizeof(conf.mac)); 65 memset(conf.mac, 0, sizeof(conf.mac));
66 if (mac) 66 if (mac)
diff --git a/drivers/net/wireless/rt2x00/rt2x00crypto.c b/drivers/net/wireless/rt2x00/rt2x00crypto.c
index 5e9074bf2b8e..3f5688fbf3f7 100644
--- a/drivers/net/wireless/rt2x00/rt2x00crypto.c
+++ b/drivers/net/wireless/rt2x00/rt2x00crypto.c
@@ -237,7 +237,7 @@ void rt2x00crypto_rx_insert_iv(struct sk_buff *skb,
237 } 237 }
238 238
239 /* 239 /*
240 * NOTE: Always count the payload as transfered, 240 * NOTE: Always count the payload as transferred,
241 * even when alignment was set to zero. This is required 241 * even when alignment was set to zero. This is required
242 * for determining the correct offset for the ICV data. 242 * for determining the correct offset for the ICV data.
243 */ 243 */
diff --git a/drivers/net/wireless/rt2x00/rt2x00dump.h b/drivers/net/wireless/rt2x00/rt2x00dump.h
index 5d6e0b83151f..063ebcce97f8 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dump.h
+++ b/drivers/net/wireless/rt2x00/rt2x00dump.h
@@ -51,7 +51,7 @@
51 * [rt2x00dump header][hardware descriptor][ieee802.11 frame] 51 * [rt2x00dump header][hardware descriptor][ieee802.11 frame]
52 * 52 *
53 * rt2x00dump header: The description of the dumped frame, as well as 53 * rt2x00dump header: The description of the dumped frame, as well as
54 * additional information usefull for debugging. See &rt2x00dump_hdr. 54 * additional information useful for debugging. See &rt2x00dump_hdr.
55 * hardware descriptor: Descriptor that was used to receive or transmit 55 * hardware descriptor: Descriptor that was used to receive or transmit
56 * the frame. 56 * the frame.
57 * ieee802.11 frame: The actual frame that was received or transmitted. 57 * ieee802.11 frame: The actual frame that was received or transmitted.
diff --git a/drivers/net/wireless/rt2x00/rt2x00link.c b/drivers/net/wireless/rt2x00/rt2x00link.c
index c975b0a12e95..29abfdeb0b65 100644
--- a/drivers/net/wireless/rt2x00/rt2x00link.c
+++ b/drivers/net/wireless/rt2x00/rt2x00link.c
@@ -283,7 +283,7 @@ void rt2x00link_start_tuner(struct rt2x00_dev *rt2x00dev)
283 /** 283 /**
284 * While scanning, link tuning is disabled. By default 284 * While scanning, link tuning is disabled. By default
285 * the most sensitive settings will be used to make sure 285 * the most sensitive settings will be used to make sure
286 * that all beacons and probe responses will be recieved 286 * that all beacons and probe responses will be received
287 * during the scan. 287 * during the scan.
288 */ 288 */
289 if (test_bit(DEVICE_STATE_SCANNING, &rt2x00dev->flags)) 289 if (test_bit(DEVICE_STATE_SCANNING, &rt2x00dev->flags))
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index 4b3c70eeef1f..4358051bfe1a 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -546,7 +546,7 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
546 } 546 }
547 547
548 /* 548 /*
549 * When DMA allocation is required we should guarentee to the 549 * When DMA allocation is required we should guarantee to the
550 * driver that the DMA is aligned to a 4-byte boundary. 550 * driver that the DMA is aligned to a 4-byte boundary.
551 * However some drivers require L2 padding to pad the payload 551 * However some drivers require L2 padding to pad the payload
552 * rather then the header. This could be a requirement for 552 * rather then the header. This could be a requirement for
@@ -689,7 +689,7 @@ void rt2x00queue_for_each_entry(struct data_queue *queue,
689 spin_unlock_irqrestore(&queue->index_lock, irqflags); 689 spin_unlock_irqrestore(&queue->index_lock, irqflags);
690 690
691 /* 691 /*
692 * Start from the TX done pointer, this guarentees that we will 692 * Start from the TX done pointer, this guarantees that we will
693 * send out all frames in the correct order. 693 * send out all frames in the correct order.
694 */ 694 */
695 if (index_start < index_end) { 695 if (index_start < index_end) {
@@ -883,7 +883,7 @@ void rt2x00queue_flush_queue(struct data_queue *queue, bool drop)
883 } 883 }
884 884
885 /* 885 /*
886 * Check if driver supports flushing, we can only guarentee 886 * Check if driver supports flushing, we can only guarantee
887 * full support for flushing if the driver is able 887 * full support for flushing if the driver is able
888 * to cancel all pending frames (drop = true). 888 * to cancel all pending frames (drop = true).
889 */ 889 */
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h
index 0c8b0c699679..217861f8d95f 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.h
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.h
@@ -344,8 +344,8 @@ struct txentry_desc {
344 * only be touched after the device has signaled it is done with it. 344 * only be touched after the device has signaled it is done with it.
345 * @ENTRY_DATA_PENDING: This entry contains a valid frame and is waiting 345 * @ENTRY_DATA_PENDING: This entry contains a valid frame and is waiting
346 * for the signal to start sending. 346 * for the signal to start sending.
347 * @ENTRY_DATA_IO_FAILED: Hardware indicated that an IO error occured 347 * @ENTRY_DATA_IO_FAILED: Hardware indicated that an IO error occurred
348 * while transfering the data to the hardware. No TX status report will 348 * while transferring the data to the hardware. No TX status report will
349 * be expected from the hardware. 349 * be expected from the hardware.
350 * @ENTRY_DATA_STATUS_PENDING: The entry has been send to the device and 350 * @ENTRY_DATA_STATUS_PENDING: The entry has been send to the device and
351 * returned. It is now waiting for the status reporting before the 351 * returned. It is now waiting for the status reporting before the
@@ -365,7 +365,7 @@ enum queue_entry_flags {
365 * @flags: Entry flags, see &enum queue_entry_flags. 365 * @flags: Entry flags, see &enum queue_entry_flags.
366 * @queue: The data queue (&struct data_queue) to which this entry belongs. 366 * @queue: The data queue (&struct data_queue) to which this entry belongs.
367 * @skb: The buffer which is currently being transmitted (for TX queue), 367 * @skb: The buffer which is currently being transmitted (for TX queue),
368 * or used to directly recieve data in (for RX queue). 368 * or used to directly receive data in (for RX queue).
369 * @entry_idx: The entry index number. 369 * @entry_idx: The entry index number.
370 * @priv_data: Private data belonging to this queue entry. The pointer 370 * @priv_data: Private data belonging to this queue entry. The pointer
371 * points to data specific to a particular driver and queue type. 371 * points to data specific to a particular driver and queue type.
@@ -388,7 +388,7 @@ struct queue_entry {
388 * @Q_INDEX: Index pointer to the current entry in the queue, if this entry is 388 * @Q_INDEX: Index pointer to the current entry in the queue, if this entry is
389 * owned by the hardware then the queue is considered to be full. 389 * owned by the hardware then the queue is considered to be full.
390 * @Q_INDEX_DMA_DONE: Index pointer for the next entry which will have been 390 * @Q_INDEX_DMA_DONE: Index pointer for the next entry which will have been
391 * transfered to the hardware. 391 * transferred to the hardware.
392 * @Q_INDEX_DONE: Index pointer to the next entry which will be completed by 392 * @Q_INDEX_DONE: Index pointer to the next entry which will be completed by
393 * the hardware and for which we need to run the txdone handler. If this 393 * the hardware and for which we need to run the txdone handler. If this
394 * entry is not owned by the hardware the queue is considered to be empty. 394 * entry is not owned by the hardware the queue is considered to be empty.
@@ -627,7 +627,7 @@ static inline int rt2x00queue_threshold(struct data_queue *queue)
627} 627}
628 628
629/** 629/**
630 * rt2x00queue_status_timeout - Check if a timeout occured for STATUS reports 630 * rt2x00queue_status_timeout - Check if a timeout occurred for STATUS reports
631 * @queue: Queue to check. 631 * @queue: Queue to check.
632 */ 632 */
633static inline int rt2x00queue_status_timeout(struct data_queue *queue) 633static inline int rt2x00queue_status_timeout(struct data_queue *queue)
@@ -637,7 +637,7 @@ static inline int rt2x00queue_status_timeout(struct data_queue *queue)
637} 637}
638 638
639/** 639/**
640 * rt2x00queue_timeout - Check if a timeout occured for DMA transfers 640 * rt2x00queue_timeout - Check if a timeout occurred for DMA transfers
641 * @queue: Queue to check. 641 * @queue: Queue to check.
642 */ 642 */
643static inline int rt2x00queue_dma_timeout(struct data_queue *queue) 643static inline int rt2x00queue_dma_timeout(struct data_queue *queue)
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index fbe735f5b352..36f388f97d65 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -173,7 +173,7 @@ static void rt2x00usb_work_txdone_entry(struct queue_entry *entry)
173 /* 173 /*
174 * If the transfer to hardware succeeded, it does not mean the 174 * If the transfer to hardware succeeded, it does not mean the
175 * frame was send out correctly. It only means the frame 175 * frame was send out correctly. It only means the frame
176 * was succesfully pushed to the hardware, we have no 176 * was successfully pushed to the hardware, we have no
177 * way to determine the transmission status right now. 177 * way to determine the transmission status right now.
178 * (Only indirectly by looking at the failed TX counters 178 * (Only indirectly by looking at the failed TX counters
179 * in the register). 179 * in the register).
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.h b/drivers/net/wireless/rt2x00/rt2x00usb.h
index 6aaf51fc7ad8..e11c759ac9ed 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.h
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.h
@@ -400,7 +400,7 @@ void rt2x00usb_flush_queue(struct data_queue *queue);
400 * @rt2x00dev: Pointer to &struct rt2x00_dev 400 * @rt2x00dev: Pointer to &struct rt2x00_dev
401 * 401 *
402 * Check the health of the USB communication and determine 402 * Check the health of the USB communication and determine
403 * if timeouts have occured. If this is the case, this function 403 * if timeouts have occurred. If this is the case, this function
404 * will reset all communication to restore functionality again. 404 * will reset all communication to restore functionality again.
405 */ 405 */
406void rt2x00usb_watchdog(struct rt2x00_dev *rt2x00dev); 406void rt2x00usb_watchdog(struct rt2x00_dev *rt2x00dev);
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index bb0c781f4a1b..0d7d93e1d398 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -520,7 +520,7 @@ void rtl_get_tcb_desc(struct ieee80211_hw *hw,
520 *because hw will nerver use hw_rate 520 *because hw will nerver use hw_rate
521 *when tcb_desc->use_driver_rate = false 521 *when tcb_desc->use_driver_rate = false
522 *so we never set highest N rate here, 522 *so we never set highest N rate here,
523 *and N rate will all be controled by FW 523 *and N rate will all be controlled by FW
524 *when tcb_desc->use_driver_rate = false 524 *when tcb_desc->use_driver_rate = false
525 */ 525 */
526 if (rtlmac->ht_enable) { 526 if (rtlmac->ht_enable) {
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 9cd7703c2a30..5938f6ee21e4 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -395,7 +395,7 @@ static void rtl_pci_init_aspm(struct ieee80211_hw *hw)
395 * 0 - Disable ASPM, 395 * 0 - Disable ASPM,
396 * 1 - Enable ASPM without Clock Req, 396 * 1 - Enable ASPM without Clock Req,
397 * 2 - Enable ASPM with Clock Req, 397 * 2 - Enable ASPM with Clock Req,
398 * 3 - Alwyas Enable ASPM with Clock Req, 398 * 3 - Always Enable ASPM with Clock Req,
399 * 4 - Always Enable ASPM without Clock Req. 399 * 4 - Always Enable ASPM without Clock Req.
400 * set defult to RTL8192CE:3 RTL8192E:2 400 * set defult to RTL8192CE:3 RTL8192E:2
401 * */ 401 * */
diff --git a/drivers/net/wireless/rtlwifi/regd.c b/drivers/net/wireless/rtlwifi/regd.c
index 3336ca999dfd..d26f957981ad 100644
--- a/drivers/net/wireless/rtlwifi/regd.c
+++ b/drivers/net/wireless/rtlwifi/regd.c
@@ -179,7 +179,7 @@ static void _rtl_reg_apply_active_scan_flags(struct wiphy *wiphy,
179 } 179 }
180 180
181 /* 181 /*
182 *If a country IE has been recieved check its rule for this 182 *If a country IE has been received check its rule for this
183 *channel first before enabling active scan. The passive scan 183 *channel first before enabling active scan. The passive scan
184 *would have been enforced by the initial processing of our 184 *would have been enforced by the initial processing of our
185 *custom regulatory domain. 185 *custom regulatory domain.
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index 01226f8e70f9..07db95ff9bc5 100644
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -1555,7 +1555,7 @@ struct rtl_priv {
1555 1555
1556 1556
1557/*************************************** 1557/***************************************
1558 Bluetooth Co-existance Related 1558 Bluetooth Co-existence Related
1559****************************************/ 1559****************************************/
1560 1560
1561enum bt_ant_num { 1561enum bt_ant_num {
diff --git a/drivers/net/wireless/wl1251/cmd.c b/drivers/net/wireless/wl1251/cmd.c
index 0ade4bd617c0..81f164bc4888 100644
--- a/drivers/net/wireless/wl1251/cmd.c
+++ b/drivers/net/wireless/wl1251/cmd.c
@@ -104,7 +104,7 @@ int wl1251_cmd_test(struct wl1251 *wl, void *buf, size_t buf_len, u8 answer)
104 * @wl: wl struct 104 * @wl: wl struct
105 * @id: acx id 105 * @id: acx id
106 * @buf: buffer for the response, including all headers, must work with dma 106 * @buf: buffer for the response, including all headers, must work with dma
107 * @len: lenght of buf 107 * @len: length of buf
108 */ 108 */
109int wl1251_cmd_interrogate(struct wl1251 *wl, u16 id, void *buf, size_t len) 109int wl1251_cmd_interrogate(struct wl1251 *wl, u16 id, void *buf, size_t len)
110{ 110{
diff --git a/drivers/net/wireless/wl1251/rx.c b/drivers/net/wireless/wl1251/rx.c
index c1b3b3f03da2..6af35265c900 100644
--- a/drivers/net/wireless/wl1251/rx.c
+++ b/drivers/net/wireless/wl1251/rx.c
@@ -179,7 +179,7 @@ static void wl1251_rx_body(struct wl1251 *wl,
179 rx_buffer = skb_put(skb, length); 179 rx_buffer = skb_put(skb, length);
180 wl1251_mem_read(wl, rx_packet_ring_addr, rx_buffer, length); 180 wl1251_mem_read(wl, rx_packet_ring_addr, rx_buffer, length);
181 181
182 /* The actual lenght doesn't include the target's alignment */ 182 /* The actual length doesn't include the target's alignment */
183 skb->len = desc->length - PLCP_HEADER_LENGTH; 183 skb->len = desc->length - PLCP_HEADER_LENGTH;
184 184
185 fc = (u16 *)skb->data; 185 fc = (u16 *)skb->data;
diff --git a/drivers/net/wireless/wl12xx/cmd.c b/drivers/net/wireless/wl12xx/cmd.c
index f0aa7ab97bf7..96324336f936 100644
--- a/drivers/net/wireless/wl12xx/cmd.c
+++ b/drivers/net/wireless/wl12xx/cmd.c
@@ -359,7 +359,7 @@ int wl1271_cmd_test(struct wl1271 *wl, void *buf, size_t buf_len, u8 answer)
359 * @wl: wl struct 359 * @wl: wl struct
360 * @id: acx id 360 * @id: acx id
361 * @buf: buffer for the response, including all headers, must work with dma 361 * @buf: buffer for the response, including all headers, must work with dma
362 * @len: lenght of buf 362 * @len: length of buf
363 */ 363 */
364int wl1271_cmd_interrogate(struct wl1271 *wl, u16 id, void *buf, size_t len) 364int wl1271_cmd_interrogate(struct wl1271 *wl, u16 id, void *buf, size_t len)
365{ 365{
diff --git a/drivers/net/wireless/wl12xx/conf.h b/drivers/net/wireless/wl12xx/conf.h
index 856a8a2fff4f..8a8323896eec 100644
--- a/drivers/net/wireless/wl12xx/conf.h
+++ b/drivers/net/wireless/wl12xx/conf.h
@@ -497,7 +497,7 @@ struct conf_rx_settings {
497#define CONF_TX_RATE_RETRY_LIMIT 10 497#define CONF_TX_RATE_RETRY_LIMIT 10
498 498
499/* 499/*
500 * Rates supported for data packets when operating as AP. Note the absense 500 * Rates supported for data packets when operating as AP. Note the absence
501 * of the 22Mbps rate. There is a FW limitation on 12 rates so we must drop 501 * of the 22Mbps rate. There is a FW limitation on 12 rates so we must drop
502 * one. The rate dropped is not mandatory under any operating mode. 502 * one. The rate dropped is not mandatory under any operating mode.
503 */ 503 */
@@ -572,7 +572,7 @@ enum conf_tx_ac {
572 CONF_TX_AC_BK = 1, /* background */ 572 CONF_TX_AC_BK = 1, /* background */
573 CONF_TX_AC_VI = 2, /* video */ 573 CONF_TX_AC_VI = 2, /* video */
574 CONF_TX_AC_VO = 3, /* voice */ 574 CONF_TX_AC_VO = 3, /* voice */
575 CONF_TX_AC_CTS2SELF = 4, /* fictious AC, follows AC_VO */ 575 CONF_TX_AC_CTS2SELF = 4, /* fictitious AC, follows AC_VO */
576 CONF_TX_AC_ANY_TID = 0x1f 576 CONF_TX_AC_ANY_TID = 0x1f
577}; 577};
578 578
@@ -1169,7 +1169,7 @@ struct conf_memory_settings {
1169 1169
1170 /* 1170 /*
1171 * Minimum required free tx memory blocks in order to assure optimum 1171 * Minimum required free tx memory blocks in order to assure optimum
1172 * performence 1172 * performance
1173 * 1173 *
1174 * Range: 0-120 1174 * Range: 0-120
1175 */ 1175 */
@@ -1177,7 +1177,7 @@ struct conf_memory_settings {
1177 1177
1178 /* 1178 /*
1179 * Minimum required free rx memory blocks in order to assure optimum 1179 * Minimum required free rx memory blocks in order to assure optimum
1180 * performence 1180 * performance
1181 * 1181 *
1182 * Range: 0-120 1182 * Range: 0-120
1183 */ 1183 */
diff --git a/drivers/net/wireless/wl12xx/io.h b/drivers/net/wireless/wl12xx/io.h
index c1aac8292089..00c771ea70bf 100644
--- a/drivers/net/wireless/wl12xx/io.h
+++ b/drivers/net/wireless/wl12xx/io.h
@@ -94,7 +94,7 @@ static inline int wl1271_translate_addr(struct wl1271 *wl, int addr)
94 * translated region. 94 * translated region.
95 * 95 *
96 * The translated regions occur next to each other in physical device 96 * The translated regions occur next to each other in physical device
97 * memory, so just add the sizes of the preceeding address regions to 97 * memory, so just add the sizes of the preceding address regions to
98 * get the offset to the new region. 98 * get the offset to the new region.
99 * 99 *
100 * Currently, only the two first regions are addressed, and the 100 * Currently, only the two first regions are addressed, and the
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 3e5befe4d03b..fc08f36fe1f5 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -290,7 +290,7 @@ static void wl3501_get_from_wla(struct wl3501_card *this, u16 src, void *dest,
290 * \ \- IEEE 802.11 -/ \-------------- len --------------/ 290 * \ \- IEEE 802.11 -/ \-------------- len --------------/
291 * \-struct wl3501_80211_tx_hdr--/ \-------- Ethernet Frame -------/ 291 * \-struct wl3501_80211_tx_hdr--/ \-------- Ethernet Frame -------/
292 * 292 *
293 * Return = Postion in Card 293 * Return = Position in Card
294 */ 294 */
295static u16 wl3501_get_tx_buffer(struct wl3501_card *this, u16 len) 295static u16 wl3501_get_tx_buffer(struct wl3501_card *this, u16 len)
296{ 296{
@@ -1932,7 +1932,7 @@ static int wl3501_config(struct pcmcia_device *link)
1932 this->base_addr = dev->base_addr; 1932 this->base_addr = dev->base_addr;
1933 1933
1934 if (!wl3501_get_flash_mac_addr(this)) { 1934 if (!wl3501_get_flash_mac_addr(this)) {
1935 printk(KERN_WARNING "%s: Cant read MAC addr in flash ROM?\n", 1935 printk(KERN_WARNING "%s: Can't read MAC addr in flash ROM?\n",
1936 dev->name); 1936 dev->name);
1937 unregister_netdev(dev); 1937 unregister_netdev(dev);
1938 goto failed; 1938 goto failed;
diff --git a/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c b/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
index 0597d862fbd2..e36117486c91 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
@@ -169,7 +169,7 @@ static int rf2959_init_hw(struct zd_rf *rf)
169 { CR85, 0x00 }, { CR86, 0x10 }, { CR87, 0x2A }, 169 { CR85, 0x00 }, { CR86, 0x10 }, { CR87, 0x2A },
170 { CR88, 0x10 }, { CR89, 0x24 }, { CR90, 0x18 }, 170 { CR88, 0x10 }, { CR89, 0x24 }, { CR90, 0x18 },
171 /* { CR91, 0x18 }, */ 171 /* { CR91, 0x18 }, */
172 /* should solve continous CTS frame problems */ 172 /* should solve continuous CTS frame problems */
173 { CR91, 0x00 }, 173 { CR91, 0x00 },
174 { CR92, 0x0a }, { CR93, 0x00 }, { CR94, 0x01 }, 174 { CR92, 0x0a }, { CR93, 0x00 }, { CR94, 0x01 },
175 { CR95, 0x00 }, { CR96, 0x40 }, { CR97, 0x37 }, 175 { CR95, 0x00 }, { CR96, 0x40 }, { CR97, 0x37 },
diff --git a/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c b/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
index 9e74eb1b67d5..ba0a0ccb1fa0 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
@@ -353,7 +353,7 @@ static int uw2453_init_hw(struct zd_rf *rf)
353 }; 353 };
354 354
355 static const u32 rv[] = { 355 static const u32 rv[] = {
356 UW2453_REGWRITE(4, 0x2b), /* configure reciever gain */ 356 UW2453_REGWRITE(4, 0x2b), /* configure receiver gain */
357 UW2453_REGWRITE(5, 0x19e4f), /* configure transmitter gain */ 357 UW2453_REGWRITE(5, 0x19e4f), /* configure transmitter gain */
358 UW2453_REGWRITE(6, 0xf81ad), /* enable RX/TX filter tuning */ 358 UW2453_REGWRITE(6, 0xf81ad), /* enable RX/TX filter tuning */
359 UW2453_REGWRITE(7, 0x3fffe), /* disable TX gain in test mode */ 359 UW2453_REGWRITE(7, 0x3fffe), /* disable TX gain in test mode */
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index 2642af4ee491..372572c0adc6 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -786,7 +786,7 @@ static int xemaclite_mdio_read(struct mii_bus *bus, int phy_id, int reg)
786 * @reg: register number to write to 786 * @reg: register number to write to
787 * @val: value to write to the register number specified by reg 787 * @val: value to write to the register number specified by reg
788 * 788 *
789 * This fucntion waits till the device is ready to accept a new MDIO 789 * This function waits till the device is ready to accept a new MDIO
790 * request and then writes the val to the MDIO Write Data register. 790 * request and then writes the val to the MDIO Write Data register.
791 */ 791 */
792static int xemaclite_mdio_write(struct mii_bus *bus, int phy_id, int reg, 792static int xemaclite_mdio_write(struct mii_bus *bus, int phy_id, int reg,
diff --git a/drivers/net/znet.c b/drivers/net/znet.c
index ae07b3dfbcc1..ec2800ff8d42 100644
--- a/drivers/net/znet.c
+++ b/drivers/net/znet.c
@@ -652,7 +652,7 @@ static irqreturn_t znet_interrupt(int irq, void *dev_id)
652 dev->stats.tx_errors++; 652 dev->stats.tx_errors++;
653 653
654 /* Transceiver may be stuck if cable 654 /* Transceiver may be stuck if cable
655 * was removed while emiting a 655 * was removed while emitting a
656 * packet. Flip it off, then on to 656 * packet. Flip it off, then on to
657 * reset it. This is very empirical, 657 * reset it. This is very empirical,
658 * but it seems to work. */ 658 * but it seems to work. */
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index c9db49c10f45..8b63a691a9ed 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -676,7 +676,7 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,
676 676
677 early_init_dt_check_for_initrd(node); 677 early_init_dt_check_for_initrd(node);
678 678
679 /* Retreive command line */ 679 /* Retrieve command line */
680 p = of_get_flat_dt_prop(node, "bootargs", &l); 680 p = of_get_flat_dt_prop(node, "bootargs", &l);
681 if (p != NULL && l > 0) 681 if (p != NULL && l > 0)
682 strlcpy(cmd_line, p, min((int)l, COMMAND_LINE_SIZE)); 682 strlcpy(cmd_line, p, min((int)l, COMMAND_LINE_SIZE));
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index dcd7857784f2..d35e300b0ad1 100644
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -136,7 +136,7 @@ EXPORT_SYMBOL(of_phy_find_device);
136 * @hndlr: Link state callback for the network device 136 * @hndlr: Link state callback for the network device
137 * @iface: PHY data interface type 137 * @iface: PHY data interface type
138 * 138 *
139 * Returns a pointer to the phy_device if successfull. NULL otherwise 139 * Returns a pointer to the phy_device if successful. NULL otherwise
140 */ 140 */
141struct phy_device *of_phy_connect(struct net_device *dev, 141struct phy_device *of_phy_connect(struct net_device *dev,
142 struct device_node *phy_np, 142 struct device_node *phy_np,
diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index 1062b8ffe244..246a92f677e4 100644
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
@@ -141,7 +141,7 @@ struct pdcspath_attribute paths_attr_##_name = { \
141 * @entry: A pointer to an allocated pdcspath_entry. 141 * @entry: A pointer to an allocated pdcspath_entry.
142 * 142 *
143 * The general idea is that you don't read from the Stable Storage every time 143 * The general idea is that you don't read from the Stable Storage every time
144 * you access the files provided by the facilites. We store a copy of the 144 * you access the files provided by the facilities. We store a copy of the
145 * content of the stable storage WRT various paths in these structs. We read 145 * content of the stable storage WRT various paths in these structs. We read
146 * these structs when reading the files, and we will write to these structs when 146 * these structs when reading the files, and we will write to these structs when
147 * writing to the files, and only then write them back to the Stable Storage. 147 * writing to the files, and only then write them back to the Stable Storage.
@@ -213,7 +213,7 @@ pdcspath_store(struct pdcspath_entry *entry)
213 213
214 /* addr, devpath and count must be word aligned */ 214 /* addr, devpath and count must be word aligned */
215 if (pdc_stable_write(entry->addr, devpath, sizeof(*devpath)) != PDC_OK) { 215 if (pdc_stable_write(entry->addr, devpath, sizeof(*devpath)) != PDC_OK) {
216 printk(KERN_ERR "%s: an error occured when writing to PDC.\n" 216 printk(KERN_ERR "%s: an error occurred when writing to PDC.\n"
217 "It is likely that the Stable Storage data has been corrupted.\n" 217 "It is likely that the Stable Storage data has been corrupted.\n"
218 "Please check it carefully upon next reboot.\n", __func__); 218 "Please check it carefully upon next reboot.\n", __func__);
219 WARN_ON(1); 219 WARN_ON(1);
diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig
index 855f389eea40..d92185a5523b 100644
--- a/drivers/parport/Kconfig
+++ b/drivers/parport/Kconfig
@@ -142,7 +142,7 @@ config PARPORT_AX88796
142 the AX88796 network controller chip. This code is also available 142 the AX88796 network controller chip. This code is also available
143 as a module (say M), called parport_ax88796. 143 as a module (say M), called parport_ax88796.
144 144
145 The driver is not dependant on the AX88796 network driver, and 145 The driver is not dependent on the AX88796 network driver, and
146 should not interfere with the networking functions of the chip. 146 should not interfere with the networking functions of the chip.
147 147
148config PARPORT_1284 148config PARPORT_1284
diff --git a/drivers/parport/ieee1284.c b/drivers/parport/ieee1284.c
index 8901ecf6e037..f9fd4b33a546 100644
--- a/drivers/parport/ieee1284.c
+++ b/drivers/parport/ieee1284.c
@@ -355,7 +355,7 @@ int parport_negotiate (struct parport *port, int mode)
355 return 0; 355 return 0;
356 } 356 }
357 357
358 /* Go to compability forward idle mode */ 358 /* Go to compatibility forward idle mode */
359 if (port->ieee1284.mode != IEEE1284_MODE_COMPAT) 359 if (port->ieee1284.mode != IEEE1284_MODE_COMPAT)
360 parport_ieee1284_terminate (port); 360 parport_ieee1284_terminate (port);
361 361
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 8d62fb76cd41..a3755ffc03d4 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -1488,7 +1488,7 @@ static void __devinit winbond_check(int io, int key)
1488 1488
1489 outb(key, io); 1489 outb(key, io);
1490 outb(key, io); /* Write Magic Sequence to EFER, extended 1490 outb(key, io); /* Write Magic Sequence to EFER, extended
1491 funtion enable register */ 1491 function enable register */
1492 outb(0x20, io); /* Write EFIR, extended function index register */ 1492 outb(0x20, io); /* Write EFIR, extended function index register */
1493 devid = inb(io + 1); /* Read EFDR, extended function data register */ 1493 devid = inb(io + 1); /* Read EFDR, extended function data register */
1494 outb(0x21, io); 1494 outb(0x21, io);
@@ -1527,7 +1527,7 @@ static void __devinit winbond_check2(int io, int key)
1527 x_oldid = inb(io + 2); 1527 x_oldid = inb(io + 2);
1528 1528
1529 outb(key, io); /* Write Magic Byte to EFER, extended 1529 outb(key, io); /* Write Magic Byte to EFER, extended
1530 funtion enable register */ 1530 function enable register */
1531 outb(0x20, io + 2); /* Write EFIR, extended function index register */ 1531 outb(0x20, io + 2); /* Write EFIR, extended function index register */
1532 devid = inb(io + 2); /* Read EFDR, extended function data register */ 1532 devid = inb(io + 2); /* Read EFDR, extended function data register */
1533 outb(0x21, io + 1); 1533 outb(0x21, io + 1);
@@ -1569,7 +1569,7 @@ static void __devinit smsc_check(int io, int key)
1569 1569
1570 outb(key, io); 1570 outb(key, io);
1571 outb(key, io); /* Write Magic Sequence to EFER, extended 1571 outb(key, io); /* Write Magic Sequence to EFER, extended
1572 funtion enable register */ 1572 function enable register */
1573 outb(0x0d, io); /* Write EFIR, extended function index register */ 1573 outb(0x0d, io); /* Write EFIR, extended function index register */
1574 oldid = inb(io + 1); /* Read EFDR, extended function data register */ 1574 oldid = inb(io + 1); /* Read EFDR, extended function data register */
1575 outb(0x0e, io); 1575 outb(0x0e, io);
diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c
index 3bc72d18b121..8f3faf343f75 100644
--- a/drivers/pci/hotplug/acpi_pcihp.c
+++ b/drivers/pci/hotplug/acpi_pcihp.c
@@ -351,7 +351,7 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *pdev, u32 flags)
351 * To handle different BIOS behavior, we look for _OSC on a root 351 * To handle different BIOS behavior, we look for _OSC on a root
352 * bridge preferentially (according to PCI fw spec). Later for 352 * bridge preferentially (according to PCI fw spec). Later for
353 * OSHP within the scope of the hotplug controller and its parents, 353 * OSHP within the scope of the hotplug controller and its parents,
354 * upto the host bridge under which this controller exists. 354 * up to the host bridge under which this controller exists.
355 */ 355 */
356 handle = acpi_find_root_bridge_handle(pdev); 356 handle = acpi_find_root_bridge_handle(pdev);
357 if (handle) { 357 if (handle) {
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index e610cfe4f07b..2f67e9bc2f96 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -585,7 +585,7 @@ static void remove_bridge(acpi_handle handle)
585 585
586 /* 586 /*
587 * On root bridges with hotplug slots directly underneath (ie, 587 * On root bridges with hotplug slots directly underneath (ie,
588 * no p2p bridge inbetween), we call cleanup_bridge(). 588 * no p2p bridge between), we call cleanup_bridge().
589 * 589 *
590 * The else clause cleans up root bridges that either had no 590 * The else clause cleans up root bridges that either had no
591 * hotplug slots at all, or had a p2p bridge underneath. 591 * hotplug slots at all, or had a p2p bridge underneath.
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index ef7411c660b9..758adb5f47fd 100644
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -290,7 +290,7 @@ static int is_php_dn(struct device_node *dn, const int **indexes,
290 * @dn: device node of slot 290 * @dn: device node of slot
291 * 291 *
292 * This subroutine will register a hotplugable slot with the 292 * This subroutine will register a hotplugable slot with the
293 * PCI hotplug infrastructure. This routine is typicaly called 293 * PCI hotplug infrastructure. This routine is typically called
294 * during boot time, if the hotplug slots are present at boot time, 294 * during boot time, if the hotplug slots are present at boot time,
295 * or is called later, by the dlpar add code, if the slot is 295 * or is called later, by the dlpar add code, if the slot is
296 * being dynamically added during runtime. 296 * being dynamically added during runtime.
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 7da3bef60d87..505c1c7075f0 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -2265,7 +2265,7 @@ int __init init_dmars(void)
2265 /* 2265 /*
2266 * TBD: 2266 * TBD:
2267 * we could share the same root & context tables 2267 * we could share the same root & context tables
2268 * amoung all IOMMU's. Need to Split it later. 2268 * among all IOMMU's. Need to Split it later.
2269 */ 2269 */
2270 ret = iommu_alloc_root_entry(iommu); 2270 ret = iommu_alloc_root_entry(iommu);
2271 if (ret) { 2271 if (ret) {
diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c
index a22557b20283..3607faf28a4d 100644
--- a/drivers/pci/intr_remapping.c
+++ b/drivers/pci/intr_remapping.c
@@ -289,7 +289,7 @@ int free_irte(int irq)
289 * source validation type 289 * source validation type
290 */ 290 */
291#define SVT_NO_VERIFY 0x0 /* no verification is required */ 291#define SVT_NO_VERIFY 0x0 /* no verification is required */
292#define SVT_VERIFY_SID_SQ 0x1 /* verify using SID and SQ fiels */ 292#define SVT_VERIFY_SID_SQ 0x1 /* verify using SID and SQ fields */
293#define SVT_VERIFY_BUS 0x2 /* verify bus of request-id */ 293#define SVT_VERIFY_BUS 0x2 /* verify bus of request-id */
294 294
295/* 295/*
diff --git a/drivers/pci/iova.c b/drivers/pci/iova.c
index 7914951ef29a..9606e599a475 100644
--- a/drivers/pci/iova.c
+++ b/drivers/pci/iova.c
@@ -391,7 +391,7 @@ reserve_iova(struct iova_domain *iovad,
391 break; 391 break;
392 } 392 }
393 393
394 /* We are here either becasue this is the first reserver node 394 /* We are here either because this is the first reserver node
395 * or need to insert remaining non overlap addr range 395 * or need to insert remaining non overlap addr range
396 */ 396 */
397 iova = __insert_new_range(iovad, pfn_lo, pfn_hi); 397 iova = __insert_new_range(iovad, pfn_lo, pfn_hi);
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index a8a277a2e0d0..f8deb3e380a2 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -645,7 +645,7 @@ pci_adjust_legacy_attr(struct pci_bus *b, enum pci_mmap_state mmap_type)
645 * a per-bus basis. This routine creates the files and ties them into 645 * a per-bus basis. This routine creates the files and ties them into
646 * their associated read, write and mmap files from pci-sysfs.c 646 * their associated read, write and mmap files from pci-sysfs.c
647 * 647 *
648 * On error unwind, but don't propogate the error to the caller 648 * On error unwind, but don't propagate the error to the caller
649 * as it is ok to set up the PCI bus without these files. 649 * as it is ok to set up the PCI bus without these files.
650 */ 650 */
651void pci_create_legacy_files(struct pci_bus *b) 651void pci_create_legacy_files(struct pci_bus *b)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index bd80f6378463..5129ed6d8fa7 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -263,7 +263,7 @@ static void quirk_vialatency(struct pci_dev *dev)
263 * This happens to include the IDE controllers.... 263 * This happens to include the IDE controllers....
264 * 264 *
265 * VIA only apply this fix when an SB Live! is present but under 265 * VIA only apply this fix when an SB Live! is present but under
266 * both Linux and Windows this isnt enough, and we have seen 266 * both Linux and Windows this isn't enough, and we have seen
267 * corruption without SB Live! but with things like 3 UDMA IDE 267 * corruption without SB Live! but with things like 3 UDMA IDE
268 * controllers. So we ignore that bit of the VIA recommendation.. 268 * controllers. So we ignore that bit of the VIA recommendation..
269 */ 269 */
@@ -2680,7 +2680,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HINT, 0x0020, quirk_hotplug_bridge);
2680 * This is a quirk for the Ricoh MMC controller found as a part of 2680 * This is a quirk for the Ricoh MMC controller found as a part of
2681 * some mulifunction chips. 2681 * some mulifunction chips.
2682 2682
2683 * This is very similiar and based on the ricoh_mmc driver written by 2683 * This is very similar and based on the ricoh_mmc driver written by
2684 * Philip Langdale. Thank you for these magic sequences. 2684 * Philip Langdale. Thank you for these magic sequences.
2685 * 2685 *
2686 * These chips implement the four main memory card controllers (SD, MMC, MS, xD) 2686 * These chips implement the four main memory card controllers (SD, MMC, MS, xD)
diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c
index fc7906eaf228..3e447d0387b7 100644
--- a/drivers/pcmcia/i82092.c
+++ b/drivers/pcmcia/i82092.c
@@ -54,7 +54,7 @@ static struct pccard_operations i82092aa_operations = {
54 .set_mem_map = i82092aa_set_mem_map, 54 .set_mem_map = i82092aa_set_mem_map,
55}; 55};
56 56
57/* The card can do upto 4 sockets, allocate a structure for each of them */ 57/* The card can do up to 4 sockets, allocate a structure for each of them */
58 58
59struct socket_info { 59struct socket_info {
60 int number; 60 int number;
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index 42fbf1a75576..fe77e8223841 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -173,7 +173,7 @@ static int pcmcia_access_config(struct pcmcia_device *p_dev,
173 c = p_dev->function_config; 173 c = p_dev->function_config;
174 174
175 if (!(c->state & CONFIG_LOCKED)) { 175 if (!(c->state & CONFIG_LOCKED)) {
176 dev_dbg(&p_dev->dev, "Configuration isnt't locked\n"); 176 dev_dbg(&p_dev->dev, "Configuration isn't't locked\n");
177 mutex_unlock(&s->ops_mutex); 177 mutex_unlock(&s->ops_mutex);
178 return -EACCES; 178 return -EACCES;
179 } 179 }
diff --git a/drivers/pcmcia/pxa2xx_lubbock.c b/drivers/pcmcia/pxa2xx_lubbock.c
index 25afe637c657..c21888eebb58 100644
--- a/drivers/pcmcia/pxa2xx_lubbock.c
+++ b/drivers/pcmcia/pxa2xx_lubbock.c
@@ -187,7 +187,7 @@ lubbock_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
187 * We need to hack around the const qualifier as 187 * We need to hack around the const qualifier as
188 * well to keep this ugly workaround localized and 188 * well to keep this ugly workaround localized and
189 * not force it to the rest of the code. Barf bags 189 * not force it to the rest of the code. Barf bags
190 * avaliable in the seat pocket in front of you! 190 * available in the seat pocket in front of you!
191 */ 191 */
192 ((socket_state_t *)state)->Vcc = 50; 192 ((socket_state_t *)state)->Vcc = 50;
193 ((socket_state_t *)state)->Vpp = 50; 193 ((socket_state_t *)state)->Vpp = 50;
diff --git a/drivers/pcmcia/ti113x.h b/drivers/pcmcia/ti113x.h
index 9ffa97d0b16c..a71789486cdf 100644
--- a/drivers/pcmcia/ti113x.h
+++ b/drivers/pcmcia/ti113x.h
@@ -691,7 +691,7 @@ static int ti12xx_2nd_slot_empty(struct yenta_socket *socket)
691 /* 691 /*
692 * those are either single or dual slot CB with additional functions 692 * those are either single or dual slot CB with additional functions
693 * like 1394, smartcard reader, etc. check the TIEALL flag for them 693 * like 1394, smartcard reader, etc. check the TIEALL flag for them
694 * the TIEALL flag binds the IRQ of all functions toghether. 694 * the TIEALL flag binds the IRQ of all functions together.
695 * we catch the single slot variants later. 695 * we catch the single slot variants later.
696 */ 696 */
697 sysctl = config_readl(socket, TI113X_SYSTEM_CONTROL); 697 sysctl = config_readl(socket, TI113X_SYSTEM_CONTROL);
diff --git a/drivers/platform/x86/intel_mid_thermal.c b/drivers/platform/x86/intel_mid_thermal.c
index 6c12db503161..c2f4bd8013b5 100644
--- a/drivers/platform/x86/intel_mid_thermal.c
+++ b/drivers/platform/x86/intel_mid_thermal.c
@@ -202,7 +202,7 @@ static int mid_read_temp(struct thermal_zone_device *tzd, unsigned long *temp)
202 if (ret) 202 if (ret)
203 return ret; 203 return ret;
204 204
205 /* Shift bits to accomodate the lower two data bits */ 205 /* Shift bits to accommodate the lower two data bits */
206 adc_val = (data << 2); 206 adc_val = (data << 2);
207 addr++; 207 addr++;
208 208
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index 4a651f69e17c..bc00693d0c79 100644
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -320,7 +320,7 @@ void pnp_remove_card_device(struct pnp_dev *dev)
320 * pnp_request_card_device - Searches for a PnP device under the specified card 320 * pnp_request_card_device - Searches for a PnP device under the specified card
321 * @clink: pointer to the card link, cannot be NULL 321 * @clink: pointer to the card link, cannot be NULL
322 * @id: pointer to a PnP ID structure that explains the rules for finding the device 322 * @id: pointer to a PnP ID structure that explains the rules for finding the device
323 * @from: Starting place to search from. If NULL it will start from the begining. 323 * @from: Starting place to search from. If NULL it will start from the beginning.
324 */ 324 */
325struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink, 325struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink,
326 const char *id, struct pnp_dev *from) 326 const char *id, struct pnp_dev *from)
@@ -369,7 +369,7 @@ err_out:
369 369
370/** 370/**
371 * pnp_release_card_device - call this when the driver no longer needs the device 371 * pnp_release_card_device - call this when the driver no longer needs the device
372 * @dev: pointer to the PnP device stucture 372 * @dev: pointer to the PnP device structure
373 */ 373 */
374void pnp_release_card_device(struct pnp_dev *dev) 374void pnp_release_card_device(struct pnp_dev *dev)
375{ 375{
diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
index 8591f6ab1b35..b859d16cf78c 100644
--- a/drivers/pnp/pnpbios/bioscalls.c
+++ b/drivers/pnp/pnpbios/bioscalls.c
@@ -219,7 +219,7 @@ void pnpbios_print_status(const char *module, u16 status)
219 module); 219 module);
220 break; 220 break;
221 case PNP_HARDWARE_ERROR: 221 case PNP_HARDWARE_ERROR:
222 printk(KERN_ERR "PnPBIOS: %s: a hardware failure has occured\n", 222 printk(KERN_ERR "PnPBIOS: %s: a hardware failure has occurred\n",
223 module); 223 module);
224 break; 224 break;
225 default: 225 default:
diff --git a/drivers/pps/Kconfig b/drivers/pps/Kconfig
index f0d3376b58ba..258ca596e1bc 100644
--- a/drivers/pps/Kconfig
+++ b/drivers/pps/Kconfig
@@ -35,7 +35,7 @@ config NTP_PPS
35 depends on PPS && !NO_HZ 35 depends on PPS && !NO_HZ
36 help 36 help
37 This option adds support for direct in-kernel time 37 This option adds support for direct in-kernel time
38 syncronization using an external PPS signal. 38 synchronization using an external PPS signal.
39 39
40 It doesn't work on tickless systems at the moment. 40 It doesn't work on tickless systems at the moment.
41 41
diff --git a/drivers/ps3/ps3-lpm.c b/drivers/ps3/ps3-lpm.c
index 8000985d0e8c..643697f71390 100644
--- a/drivers/ps3/ps3-lpm.c
+++ b/drivers/ps3/ps3-lpm.c
@@ -919,7 +919,7 @@ EXPORT_SYMBOL_GPL(ps3_disable_pm);
919 * @offset: Offset in bytes from the start of the trace buffer. 919 * @offset: Offset in bytes from the start of the trace buffer.
920 * @buf: Copy destination. 920 * @buf: Copy destination.
921 * @count: Maximum count of bytes to copy. 921 * @count: Maximum count of bytes to copy.
922 * @bytes_copied: Pointer to a variable that will recieve the number of 922 * @bytes_copied: Pointer to a variable that will receive the number of
923 * bytes copied to @buf. 923 * bytes copied to @buf.
924 * 924 *
925 * On error @buf will contain any successfully copied trace buffer data 925 * On error @buf will contain any successfully copied trace buffer data
@@ -974,7 +974,7 @@ EXPORT_SYMBOL_GPL(ps3_lpm_copy_tb);
974 * @offset: Offset in bytes from the start of the trace buffer. 974 * @offset: Offset in bytes from the start of the trace buffer.
975 * @buf: A __user copy destination. 975 * @buf: A __user copy destination.
976 * @count: Maximum count of bytes to copy. 976 * @count: Maximum count of bytes to copy.
977 * @bytes_copied: Pointer to a variable that will recieve the number of 977 * @bytes_copied: Pointer to a variable that will receive the number of
978 * bytes copied to @buf. 978 * bytes copied to @buf.
979 * 979 *
980 * On error @buf will contain any successfully copied trace buffer data 980 * On error @buf will contain any successfully copied trace buffer data
@@ -1074,7 +1074,7 @@ EXPORT_SYMBOL_GPL(ps3_disable_pm_interrupts);
1074 1074
1075/** 1075/**
1076 * ps3_lpm_open - Open the logical performance monitor device. 1076 * ps3_lpm_open - Open the logical performance monitor device.
1077 * @tb_type: Specifies the type of trace buffer lv1 sould use for this lpm 1077 * @tb_type: Specifies the type of trace buffer lv1 should use for this lpm
1078 * instance, specified by one of enum ps3_lpm_tb_type. 1078 * instance, specified by one of enum ps3_lpm_tb_type.
1079 * @tb_cache: Optional user supplied buffer to use as the trace buffer cache. 1079 * @tb_cache: Optional user supplied buffer to use as the trace buffer cache.
1080 * If NULL, the driver will allocate and manage an internal buffer. 1080 * If NULL, the driver will allocate and manage an internal buffer.
diff --git a/drivers/ps3/ps3-sys-manager.c b/drivers/ps3/ps3-sys-manager.c
index d37c445f0eda..1b98367110c4 100644
--- a/drivers/ps3/ps3-sys-manager.c
+++ b/drivers/ps3/ps3-sys-manager.c
@@ -80,7 +80,7 @@ static void __maybe_unused _dump_sm_header(
80 * 80 *
81 * Currently all messages received from the system manager are either 81 * Currently all messages received from the system manager are either
82 * (16 bytes header + 8 bytes payload = 24 bytes) or (16 bytes header 82 * (16 bytes header + 8 bytes payload = 24 bytes) or (16 bytes header
83 * + 16 bytes payload = 32 bytes). This knowlege is used to simplify 83 * + 16 bytes payload = 32 bytes). This knowledge is used to simplify
84 * the logic. 84 * the logic.
85 */ 85 */
86 86
diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
index 3a59d5f018d3..ee893581d4b7 100644
--- a/drivers/rapidio/rio-scan.c
+++ b/drivers/rapidio/rio-scan.c
@@ -295,7 +295,7 @@ static int __devinit rio_add_device(struct rio_dev *rdev)
295} 295}
296 296
297/** 297/**
298 * rio_enable_rx_tx_port - enable input reciever and output transmitter of 298 * rio_enable_rx_tx_port - enable input receiver and output transmitter of
299 * given port 299 * given port
300 * @port: Master port associated with the RIO network 300 * @port: Master port associated with the RIO network
301 * @local: local=1 select local port otherwise a far device is reached 301 * @local: local=1 select local port otherwise a far device is reached
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 3ffc6979d164..0fae51c4845a 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1313,7 +1313,7 @@ static int _regulator_enable(struct regulator_dev *rdev)
1313 return -EINVAL; 1313 return -EINVAL;
1314 1314
1315 /* Query before enabling in case configuration 1315 /* Query before enabling in case configuration
1316 * dependant. */ 1316 * dependent. */
1317 ret = _regulator_get_enable_time(rdev); 1317 ret = _regulator_get_enable_time(rdev);
1318 if (ret >= 0) { 1318 if (ret >= 0) {
1319 delay = ret; 1319 delay = ret;
diff --git a/drivers/regulator/max8952.c b/drivers/regulator/max8952.c
index a8f4ecfb0843..daff7fd0e95c 100644
--- a/drivers/regulator/max8952.c
+++ b/drivers/regulator/max8952.c
@@ -262,7 +262,7 @@ static int __devinit max8952_pmic_probe(struct i2c_client *client,
262 262
263 if (err) { 263 if (err) {
264 dev_warn(max8952->dev, "VID0/1 gpio invalid: " 264 dev_warn(max8952->dev, "VID0/1 gpio invalid: "
265 "DVS not avilable.\n"); 265 "DVS not available.\n");
266 max8952->vid0 = 0; 266 max8952->vid0 = 0;
267 max8952->vid1 = 0; 267 max8952->vid1 = 0;
268 /* Mark invalid */ 268 /* Mark invalid */
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index 8ec6b069a7f5..23719f0acbf6 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -454,7 +454,7 @@ EXPORT_SYMBOL_GPL(rtc_update_irq_enable);
454 * @rtc: pointer to the rtc device 454 * @rtc: pointer to the rtc device
455 * 455 *
456 * This function is called when an AIE, UIE or PIE mode interrupt 456 * This function is called when an AIE, UIE or PIE mode interrupt
457 * has occured (or been emulated). 457 * has occurred (or been emulated).
458 * 458 *
459 * Triggers the registered irq_task function callback. 459 * Triggers the registered irq_task function callback.
460 */ 460 */
diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c
index 518a76ec71ca..e39b77a4609a 100644
--- a/drivers/rtc/rtc-at91rm9200.c
+++ b/drivers/rtc/rtc-at91rm9200.c
@@ -60,7 +60,7 @@ static void at91_rtc_decodetime(unsigned int timereg, unsigned int calreg,
60 /* 60 /*
61 * The Calendar Alarm register does not have a field for 61 * The Calendar Alarm register does not have a field for
62 * the year - so these will return an invalid value. When an 62 * the year - so these will return an invalid value. When an
63 * alarm is set, at91_alarm_year wille store the current year. 63 * alarm is set, at91_alarm_year will store the current year.
64 */ 64 */
65 tm->tm_year = bcd2bin(date & AT91_RTC_CENT) * 100; /* century */ 65 tm->tm_year = bcd2bin(date & AT91_RTC_CENT) * 100; /* century */
66 tm->tm_year += bcd2bin((date & AT91_RTC_YEAR) >> 8); /* year */ 66 tm->tm_year += bcd2bin((date & AT91_RTC_YEAR) >> 8); /* year */
diff --git a/drivers/rtc/rtc-bfin.c b/drivers/rtc/rtc-bfin.c
index ca9cff85ab8a..a0fc4cf42abf 100644
--- a/drivers/rtc/rtc-bfin.c
+++ b/drivers/rtc/rtc-bfin.c
@@ -20,9 +20,9 @@
20 * write would be discarded and things quickly fall apart. 20 * write would be discarded and things quickly fall apart.
21 * 21 *
22 * To keep this delay from significantly degrading performance (we, in theory, 22 * To keep this delay from significantly degrading performance (we, in theory,
23 * would have to sleep for up to 1 second everytime we wanted to write a 23 * would have to sleep for up to 1 second every time we wanted to write a
24 * register), we only check the write pending status before we start to issue 24 * register), we only check the write pending status before we start to issue
25 * a new write. We bank on the idea that it doesnt matter when the sync 25 * a new write. We bank on the idea that it doesn't matter when the sync
26 * happens so long as we don't attempt another write before it does. The only 26 * happens so long as we don't attempt another write before it does. The only
27 * time userspace would take this penalty is when they try and do multiple 27 * time userspace would take this penalty is when they try and do multiple
28 * operations right after another ... but in this case, they need to take the 28 * operations right after another ... but in this case, they need to take the
diff --git a/drivers/rtc/rtc-lpc32xx.c b/drivers/rtc/rtc-lpc32xx.c
index ec8701ce99f9..ae16250c762f 100644
--- a/drivers/rtc/rtc-lpc32xx.c
+++ b/drivers/rtc/rtc-lpc32xx.c
@@ -240,7 +240,7 @@ static int __devinit lpc32xx_rtc_probe(struct platform_device *pdev)
240 spin_lock_init(&rtc->lock); 240 spin_lock_init(&rtc->lock);
241 241
242 /* 242 /*
243 * The RTC is on a seperate power domain and can keep it's state 243 * The RTC is on a separate power domain and can keep it's state
244 * across a chip power cycle. If the RTC has never been previously 244 * across a chip power cycle. If the RTC has never been previously
245 * setup, then set it up now for the first time. 245 * setup, then set it up now for the first time.
246 */ 246 */
diff --git a/drivers/rtc/rtc-x1205.c b/drivers/rtc/rtc-x1205.c
index 9aae49139a0a..b00aad2620d4 100644
--- a/drivers/rtc/rtc-x1205.c
+++ b/drivers/rtc/rtc-x1205.c
@@ -573,7 +573,7 @@ static int x1205_probe(struct i2c_client *client,
573 573
574 i2c_set_clientdata(client, rtc); 574 i2c_set_clientdata(client, rtc);
575 575
576 /* Check for power failures and eventualy enable the osc */ 576 /* Check for power failures and eventually enable the osc */
577 if ((err = x1205_get_status(client, &sr)) == 0) { 577 if ((err = x1205_get_status(client, &sr)) == 0) {
578 if (sr & X1205_SR_RTCF) { 578 if (sr & X1205_SR_RTCF) {
579 dev_err(&client->dev, 579 dev_err(&client->dev,
diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c
index 1654a24817be..87a0cf160fe5 100644
--- a/drivers/s390/block/dasd_3990_erp.c
+++ b/drivers/s390/block/dasd_3990_erp.c
@@ -2207,7 +2207,7 @@ dasd_3990_erp_inspect_32(struct dasd_ccw_req * erp, char *sense)
2207 * DASD_3990_ERP_CONTROL_CHECK 2207 * DASD_3990_ERP_CONTROL_CHECK
2208 * 2208 *
2209 * DESCRIPTION 2209 * DESCRIPTION
2210 * Does a generic inspection if a control check occured and sets up 2210 * Does a generic inspection if a control check occurred and sets up
2211 * the related error recovery procedure 2211 * the related error recovery procedure
2212 * 2212 *
2213 * PARAMETER 2213 * PARAMETER
@@ -2250,7 +2250,7 @@ dasd_3990_erp_inspect(struct dasd_ccw_req *erp)
2250 struct dasd_ccw_req *erp_new = NULL; 2250 struct dasd_ccw_req *erp_new = NULL;
2251 char *sense; 2251 char *sense;
2252 2252
2253 /* if this problem occured on an alias retry on base */ 2253 /* if this problem occurred on an alias retry on base */
2254 erp_new = dasd_3990_erp_inspect_alias(erp); 2254 erp_new = dasd_3990_erp_inspect_alias(erp);
2255 if (erp_new) 2255 if (erp_new)
2256 return erp_new; 2256 return erp_new;
@@ -2282,7 +2282,7 @@ dasd_3990_erp_inspect(struct dasd_ccw_req *erp)
2282 * DASD_3990_ERP_ADD_ERP 2282 * DASD_3990_ERP_ADD_ERP
2283 * 2283 *
2284 * DESCRIPTION 2284 * DESCRIPTION
2285 * This funtion adds an additional request block (ERP) to the head of 2285 * This function adds an additional request block (ERP) to the head of
2286 * the given cqr (or erp). 2286 * the given cqr (or erp).
2287 * For a command mode cqr the erp is initialized as an default erp 2287 * For a command mode cqr the erp is initialized as an default erp
2288 * (retry TIC). 2288 * (retry TIC).
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index cb6a67bc89ff..42e1bf35f689 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -302,7 +302,7 @@ dasd_parse_keyword( char *parsestring ) {
302/* 302/*
303 * Try to interprete the first element on the comma separated parse string 303 * Try to interprete the first element on the comma separated parse string
304 * as a device number or a range of devices. If the interpretation is 304 * as a device number or a range of devices. If the interpretation is
305 * successfull, create the matching dasd_devmap entries and return a pointer 305 * successful, create the matching dasd_devmap entries and return a pointer
306 * to the residual string. 306 * to the residual string.
307 * If interpretation fails or in case of an error, return an error code. 307 * If interpretation fails or in case of an error, return an error code.
308 */ 308 */
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 459f2cbe80fc..db8005d9f2fd 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -2858,7 +2858,7 @@ static struct dasd_ccw_req *dasd_raw_build_cp(struct dasd_device *startdev,
2858 /* 2858 /*
2859 * struct PFX_eckd_data has up to 2 byte as extended parameter 2859 * struct PFX_eckd_data has up to 2 byte as extended parameter
2860 * this is needed for write full track and has to be mentioned 2860 * this is needed for write full track and has to be mentioned
2861 * seperately 2861 * separately
2862 * add 8 instead of 2 to keep 8 byte boundary 2862 * add 8 instead of 2 to keep 8 byte boundary
2863 */ 2863 */
2864 pfx_datasize = sizeof(struct PFX_eckd_data) + 8; 2864 pfx_datasize = sizeof(struct PFX_eckd_data) + 8;
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index 4c023761946f..e21a5c39ef20 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -604,7 +604,7 @@ __raw3270_size_device(struct raw3270 *rp)
604 /* 604 /*
605 * To determine the size of the 3270 device we need to do: 605 * To determine the size of the 3270 device we need to do:
606 * 1) send a 'read partition' data stream to the device 606 * 1) send a 'read partition' data stream to the device
607 * 2) wait for the attn interrupt that preceeds the query reply 607 * 2) wait for the attn interrupt that precedes the query reply
608 * 3) do a read modified to get the query reply 608 * 3) do a read modified to get the query reply
609 * To make things worse we have to cope with intervention 609 * To make things worse we have to cope with intervention
610 * required (3270 device switched to 'stand-by') and command 610 * required (3270 device switched to 'stand-by') and command
diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c
index e090a307fdee..87cd0ab242de 100644
--- a/drivers/s390/char/tape_char.c
+++ b/drivers/s390/char/tape_char.c
@@ -139,7 +139,7 @@ tapechar_read(struct file *filp, char __user *data, size_t count, loff_t *ppos)
139 /* 139 /*
140 * If the tape isn't terminated yet, do it now. And since we then 140 * If the tape isn't terminated yet, do it now. And since we then
141 * are at the end of the tape there wouldn't be anything to read 141 * are at the end of the tape there wouldn't be anything to read
142 * anyways. So we return immediatly. 142 * anyways. So we return immediately.
143 */ 143 */
144 if(device->required_tapemarks) { 144 if(device->required_tapemarks) {
145 return tape_std_terminate_write(device); 145 return tape_std_terminate_write(device);
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c
index d33554df2b06..2db1482b406e 100644
--- a/drivers/s390/char/tty3270.c
+++ b/drivers/s390/char/tty3270.c
@@ -328,7 +328,7 @@ tty3270_write_callback(struct raw3270_request *rq, void *data)
328 328
329 tp = (struct tty3270 *) rq->view; 329 tp = (struct tty3270 *) rq->view;
330 if (rq->rc != 0) { 330 if (rq->rc != 0) {
331 /* Write wasn't successfull. Refresh all. */ 331 /* Write wasn't successful. Refresh all. */
332 tp->update_flags = TTY_UPDATE_ALL; 332 tp->update_flags = TTY_UPDATE_ALL;
333 tty3270_set_timer(tp, 1); 333 tty3270_set_timer(tp, 1);
334 } 334 }
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index a845695ac314..6084103672b5 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -318,7 +318,7 @@ ccw_device_sense_id_done(struct ccw_device *cdev, int err)
318 318
319/** 319/**
320 * ccw_device_notify() - inform the device's driver about an event 320 * ccw_device_notify() - inform the device's driver about an event
321 * @cdev: device for which an event occured 321 * @cdev: device for which an event occurred
322 * @event: event that occurred 322 * @event: event that occurred
323 * 323 *
324 * Returns: 324 * Returns:
@@ -688,7 +688,7 @@ ccw_device_online_verify(struct ccw_device *cdev, enum dev_event dev_event)
688 (scsw_stctl(&cdev->private->irb.scsw) & SCSW_STCTL_STATUS_PEND)) { 688 (scsw_stctl(&cdev->private->irb.scsw) & SCSW_STCTL_STATUS_PEND)) {
689 /* 689 /*
690 * No final status yet or final status not yet delivered 690 * No final status yet or final status not yet delivered
691 * to the device driver. Can't do path verfication now, 691 * to the device driver. Can't do path verification now,
692 * delay until final status was delivered. 692 * delay until final status was delivered.
693 */ 693 */
694 cdev->private->flags.doverify = 1; 694 cdev->private->flags.doverify = 1;
diff --git a/drivers/s390/crypto/zcrypt_api.h b/drivers/s390/crypto/zcrypt_api.h
index 88ebd114735b..9688f3985b07 100644
--- a/drivers/s390/crypto/zcrypt_api.h
+++ b/drivers/s390/crypto/zcrypt_api.h
@@ -76,7 +76,7 @@ struct ica_z90_status {
76 76
77/** 77/**
78 * Large random numbers are pulled in 4096 byte chunks from the crypto cards 78 * Large random numbers are pulled in 4096 byte chunks from the crypto cards
79 * and stored in a page. Be carefull when increasing this buffer due to size 79 * and stored in a page. Be careful when increasing this buffer due to size
80 * limitations for AP requests. 80 * limitations for AP requests.
81 */ 81 */
82#define ZCRYPT_RNG_BUFFER_SIZE 4096 82#define ZCRYPT_RNG_BUFFER_SIZE 4096
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index 9feb62febb3d..da8aa75bb20b 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -779,7 +779,7 @@ claw_irq_handler(struct ccw_device *cdev,
779 case CLAW_START_WRITE: 779 case CLAW_START_WRITE:
780 if (p_ch->irb->scsw.cmd.dstat & DEV_STAT_UNIT_CHECK) { 780 if (p_ch->irb->scsw.cmd.dstat & DEV_STAT_UNIT_CHECK) {
781 dev_info(&cdev->dev, 781 dev_info(&cdev->dev,
782 "%s: Unit Check Occured in " 782 "%s: Unit Check Occurred in "
783 "write channel\n", dev->name); 783 "write channel\n", dev->name);
784 clear_bit(0, (void *)&p_ch->IO_active); 784 clear_bit(0, (void *)&p_ch->IO_active);
785 if (p_ch->irb->ecw[0] & 0x80) { 785 if (p_ch->irb->ecw[0] & 0x80) {
diff --git a/drivers/s390/net/ctcm_fsms.c b/drivers/s390/net/ctcm_fsms.c
index 8c921fc3511a..2d602207541b 100644
--- a/drivers/s390/net/ctcm_fsms.c
+++ b/drivers/s390/net/ctcm_fsms.c
@@ -184,7 +184,7 @@ static void ctcmpc_chx_resend(fsm_instance *, int, void *);
184static void ctcmpc_chx_send_sweep(fsm_instance *fsm, int event, void *arg); 184static void ctcmpc_chx_send_sweep(fsm_instance *fsm, int event, void *arg);
185 185
186/** 186/**
187 * Check return code of a preceeding ccw_device call, halt_IO etc... 187 * Check return code of a preceding ccw_device call, halt_IO etc...
188 * 188 *
189 * ch : The channel, the error belongs to. 189 * ch : The channel, the error belongs to.
190 * Returns the error code (!= 0) to inspect. 190 * Returns the error code (!= 0) to inspect.
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 7fbc4adbb6d5..49d1cfc3217e 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -1123,7 +1123,7 @@ list_modified:
1123 list_for_each_entry_safe(ipm, tmp, &card->ipm_list, list){ 1123 list_for_each_entry_safe(ipm, tmp, &card->ipm_list, list){
1124 switch (ipm->ipm_state) { 1124 switch (ipm->ipm_state) {
1125 case LCS_IPM_STATE_SET_REQUIRED: 1125 case LCS_IPM_STATE_SET_REQUIRED:
1126 /* del from ipm_list so noone else can tamper with 1126 /* del from ipm_list so no one else can tamper with
1127 * this entry */ 1127 * this entry */
1128 list_del_init(&ipm->list); 1128 list_del_init(&ipm->list);
1129 spin_unlock_irqrestore(&card->ipm_lock, flags); 1129 spin_unlock_irqrestore(&card->ipm_lock, flags);
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 10a3a3b4dd3e..85cc53117ea6 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -1107,7 +1107,7 @@ static int qeth_setup_card(struct qeth_card *card)
1107 INIT_LIST_HEAD(card->ip_tbd_list); 1107 INIT_LIST_HEAD(card->ip_tbd_list);
1108 INIT_LIST_HEAD(&card->cmd_waiter_list); 1108 INIT_LIST_HEAD(&card->cmd_waiter_list);
1109 init_waitqueue_head(&card->wait_q); 1109 init_waitqueue_head(&card->wait_q);
1110 /* intial options */ 1110 /* initial options */
1111 qeth_set_intial_options(card); 1111 qeth_set_intial_options(card);
1112 /* IP address takeover */ 1112 /* IP address takeover */
1113 INIT_LIST_HEAD(&card->ipato.entries); 1113 INIT_LIST_HEAD(&card->ipato.entries);
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index a0e05ef65924..8512b5c0ef82 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -1083,7 +1083,7 @@ static void zfcp_fsf_send_els_handler(struct zfcp_fsf_req *req)
1083 } 1083 }
1084 break; 1084 break;
1085 case FSF_SBAL_MISMATCH: 1085 case FSF_SBAL_MISMATCH:
1086 /* should never occure, avoided in zfcp_fsf_send_els */ 1086 /* should never occur, avoided in zfcp_fsf_send_els */
1087 /* fall through */ 1087 /* fall through */
1088 default: 1088 default:
1089 req->status |= ZFCP_STATUS_FSFREQ_ERROR; 1089 req->status |= ZFCP_STATUS_FSFREQ_ERROR;
diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c
index 8da5ed644c2b..98e97d90835b 100644
--- a/drivers/s390/scsi/zfcp_qdio.c
+++ b/drivers/s390/scsi/zfcp_qdio.c
@@ -391,7 +391,7 @@ int zfcp_qdio_open(struct zfcp_qdio *qdio)
391 if (do_QDIO(cdev, QDIO_FLAG_SYNC_INPUT, 0, 0, QDIO_MAX_BUFFERS_PER_Q)) 391 if (do_QDIO(cdev, QDIO_FLAG_SYNC_INPUT, 0, 0, QDIO_MAX_BUFFERS_PER_Q))
392 goto failed_qdio; 392 goto failed_qdio;
393 393
394 /* set index of first avalable SBALS / number of available SBALS */ 394 /* set index of first available SBALS / number of available SBALS */
395 qdio->req_q_idx = 0; 395 qdio->req_q_idx = 0;
396 atomic_set(&qdio->req_q_free, QDIO_MAX_BUFFERS_PER_Q); 396 atomic_set(&qdio->req_q_free, QDIO_MAX_BUFFERS_PER_Q);
397 atomic_set_mask(ZFCP_STATUS_ADAPTER_QDIOUP, &qdio->adapter->status); 397 atomic_set_mask(ZFCP_STATUS_ADAPTER_QDIOUP, &qdio->adapter->status);
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index e8566224fe4b..6b4678a7900a 100644
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -13,7 +13,7 @@
13 * TODO: Erase/program both banks of a 8MB SIMM. 13 * TODO: Erase/program both banks of a 8MB SIMM.
14 * 14 *
15 * It is anticipated that programming an OS Flash will be a routine 15 * It is anticipated that programming an OS Flash will be a routine
16 * procedure. In the same time it is exeedingly dangerous because 16 * procedure. In the same time it is exceedingly dangerous because
17 * a user can program its OBP flash with OS image and effectively 17 * a user can program its OBP flash with OS image and effectively
18 * kill the machine. 18 * kill the machine.
19 * 19 *
diff --git a/drivers/sbus/char/max1617.h b/drivers/sbus/char/max1617.h
index 0bb09c286cb4..cd30819a0a30 100644
--- a/drivers/sbus/char/max1617.h
+++ b/drivers/sbus/char/max1617.h
@@ -6,7 +6,7 @@
6#define MAX1617_CPU_TEMP 0x01 /* Processor die temp in C */ 6#define MAX1617_CPU_TEMP 0x01 /* Processor die temp in C */
7#define MAX1617_STATUS 0x02 /* Chip status bits */ 7#define MAX1617_STATUS 0x02 /* Chip status bits */
8 8
9/* Read-only versions of changable registers. */ 9/* Read-only versions of changeable registers. */
10#define MAX1617_RD_CFG_BYTE 0x03 /* Config register */ 10#define MAX1617_RD_CFG_BYTE 0x03 /* Config register */
11#define MAX1617_RD_CVRATE_BYTE 0x04 /* Temp conversion rate */ 11#define MAX1617_RD_CVRATE_BYTE 0x04 /* Temp conversion rate */
12#define MAX1617_RD_AMB_HIGHLIM 0x05 /* Ambient high limit */ 12#define MAX1617_RD_AMB_HIGHLIM 0x05 /* Ambient high limit */
diff --git a/drivers/scsi/3w-9xxx.h b/drivers/scsi/3w-9xxx.h
index 3343824855d0..040f7214e5b7 100644
--- a/drivers/scsi/3w-9xxx.h
+++ b/drivers/scsi/3w-9xxx.h
@@ -61,7 +61,7 @@ static twa_message_type twa_aen_table[] = {
61 {0x0000, "AEN queue empty"}, 61 {0x0000, "AEN queue empty"},
62 {0x0001, "Controller reset occurred"}, 62 {0x0001, "Controller reset occurred"},
63 {0x0002, "Degraded unit detected"}, 63 {0x0002, "Degraded unit detected"},
64 {0x0003, "Controller error occured"}, 64 {0x0003, "Controller error occurred"},
65 {0x0004, "Background rebuild failed"}, 65 {0x0004, "Background rebuild failed"},
66 {0x0005, "Background rebuild done"}, 66 {0x0005, "Background rebuild done"},
67 {0x0006, "Incomplete unit detected"}, 67 {0x0006, "Incomplete unit detected"},
diff --git a/drivers/scsi/3w-xxxx.h b/drivers/scsi/3w-xxxx.h
index 8b9f9d17e7fe..49dcf03c631a 100644
--- a/drivers/scsi/3w-xxxx.h
+++ b/drivers/scsi/3w-xxxx.h
@@ -8,7 +8,7 @@
8 8
9 Copyright (C) 1999-2010 3ware Inc. 9 Copyright (C) 1999-2010 3ware Inc.
10 10
11 Kernel compatiblity By: Andre Hedrick <andre@suse.com> 11 Kernel compatibility By: Andre Hedrick <andre@suse.com>
12 Non-Copyright (C) 2000 Andre Hedrick <andre@suse.com> 12 Non-Copyright (C) 2000 Andre Hedrick <andre@suse.com>
13 13
14 This program is free software; you can redistribute it and/or modify 14 This program is free software; you can redistribute it and/or modify
diff --git a/drivers/scsi/53c700.scr b/drivers/scsi/53c700.scr
index a064a092c604..ec822e3b7a27 100644
--- a/drivers/scsi/53c700.scr
+++ b/drivers/scsi/53c700.scr
@@ -31,7 +31,7 @@ ABSOLUTE StatusAddress = 0 ; Addr to receive status return
31ABSOLUTE ReceiveMsgAddress = 0 ; Addr to receive msg 31ABSOLUTE ReceiveMsgAddress = 0 ; Addr to receive msg
32; 32;
33; This is the magic component for handling scatter-gather. Each of the 33; This is the magic component for handling scatter-gather. Each of the
34; SG components is preceeded by a script fragment which moves the 34; SG components is preceded by a script fragment which moves the
35; necessary amount of data and jumps to the next SG segment. The final 35; necessary amount of data and jumps to the next SG segment. The final
36; SG segment jumps back to . However, this address is the first SG script 36; SG segment jumps back to . However, this address is the first SG script
37; segment. 37; segment.
diff --git a/drivers/scsi/53c700_d.h_shipped b/drivers/scsi/53c700_d.h_shipped
index 0b42a51257f2..aa623da333c8 100644
--- a/drivers/scsi/53c700_d.h_shipped
+++ b/drivers/scsi/53c700_d.h_shipped
@@ -34,7 +34,7 @@ ABSOLUTE StatusAddress = 0 ; Addr to receive status return
34ABSOLUTE ReceiveMsgAddress = 0 ; Addr to receive msg 34ABSOLUTE ReceiveMsgAddress = 0 ; Addr to receive msg
35; 35;
36; This is the magic component for handling scatter-gather. Each of the 36; This is the magic component for handling scatter-gather. Each of the
37; SG components is preceeded by a script fragment which moves the 37; SG components is preceded by a script fragment which moves the
38; necessary amount of data and jumps to the next SG segment. The final 38; necessary amount of data and jumps to the next SG segment. The final
39; SG segment jumps back to . However, this address is the first SG script 39; SG segment jumps back to . However, this address is the first SG script
40; segment. 40; segment.
diff --git a/drivers/scsi/FlashPoint.c b/drivers/scsi/FlashPoint.c
index e40cdfb7541f..dcd716d68600 100644
--- a/drivers/scsi/FlashPoint.c
+++ b/drivers/scsi/FlashPoint.c
@@ -2509,7 +2509,7 @@ static void FPT_ssel(unsigned long port, unsigned char p_card)
2509 WR_HARPOON(port + hp_autostart_3, 2509 WR_HARPOON(port + hp_autostart_3,
2510 (SELECT + SELCHK_STRT)); 2510 (SELECT + SELCHK_STRT));
2511 2511
2512 /* Setup our STATE so we know what happend when 2512 /* Setup our STATE so we know what happened when
2513 the wheels fall off. */ 2513 the wheels fall off. */
2514 currSCCB->Sccb_scsistat = SELECT_ST; 2514 currSCCB->Sccb_scsistat = SELECT_ST;
2515 2515
@@ -2900,7 +2900,7 @@ static void FPT_SendMsg(unsigned long port, unsigned char message)
2900 * 2900 *
2901 * Function: FPT_sdecm 2901 * Function: FPT_sdecm
2902 * 2902 *
2903 * Description: Determine the proper responce to the message from the 2903 * Description: Determine the proper response to the message from the
2904 * target device. 2904 * target device.
2905 * 2905 *
2906 *---------------------------------------------------------------------*/ 2906 *---------------------------------------------------------------------*/
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index e7cd2fcbe036..165e4dd865d9 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -1198,12 +1198,12 @@ static irqreturn_t NCR5380_intr(int dummy, void *dev_id)
1198 */ 1198 */
1199 1199
1200 if ((NCR5380_read(MODE_REG) & MR_DMA) && ((basr & BASR_END_DMA_TRANSFER) || !(basr & BASR_PHASE_MATCH))) { 1200 if ((NCR5380_read(MODE_REG) & MR_DMA) && ((basr & BASR_END_DMA_TRANSFER) || !(basr & BASR_PHASE_MATCH))) {
1201 int transfered; 1201 int transferred;
1202 1202
1203 if (!hostdata->connected) 1203 if (!hostdata->connected)
1204 panic("scsi%d : received end of DMA interrupt with no connected cmd\n", instance->hostno); 1204 panic("scsi%d : received end of DMA interrupt with no connected cmd\n", instance->hostno);
1205 1205
1206 transfered = (hostdata->dmalen - NCR5380_dma_residual(instance)); 1206 transferred = (hostdata->dmalen - NCR5380_dma_residual(instance));
1207 hostdata->connected->SCp.this_residual -= transferred; 1207 hostdata->connected->SCp.this_residual -= transferred;
1208 hostdata->connected->SCp.ptr += transferred; 1208 hostdata->connected->SCp.ptr += transferred;
1209 hostdata->dmalen = 0; 1209 hostdata->dmalen = 0;
@@ -1563,7 +1563,7 @@ failed:
1563 * bytes to transfer, **data - pointer to data pointer. 1563 * bytes to transfer, **data - pointer to data pointer.
1564 * 1564 *
1565 * Returns : -1 when different phase is entered without transferring 1565 * Returns : -1 when different phase is entered without transferring
1566 * maximum number of bytes, 0 if all bytes or transfered or exit 1566 * maximum number of bytes, 0 if all bytes or transferred or exit
1567 * is in same phase. 1567 * is in same phase.
1568 * 1568 *
1569 * Also, *phase, *count, *data are modified in place. 1569 * Also, *phase, *count, *data are modified in place.
@@ -1800,7 +1800,7 @@ static int do_abort(struct Scsi_Host *host) {
1800 * bytes to transfer, **data - pointer to data pointer. 1800 * bytes to transfer, **data - pointer to data pointer.
1801 * 1801 *
1802 * Returns : -1 when different phase is entered without transferring 1802 * Returns : -1 when different phase is entered without transferring
1803 * maximum number of bytes, 0 if all bytes or transfered or exit 1803 * maximum number of bytes, 0 if all bytes or transferred or exit
1804 * is in same phase. 1804 * is in same phase.
1805 * 1805 *
1806 * Also, *phase, *count, *data are modified in place. 1806 * Also, *phase, *count, *data are modified in place.
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 118ce83a737c..061995741444 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -747,8 +747,8 @@ char * get_container_type(unsigned tindex)
747 * Arguments: [1] pointer to void [1] int 747 * Arguments: [1] pointer to void [1] int
748 * 748 *
749 * Purpose: Sets SCSI inquiry data strings for vendor, product 749 * Purpose: Sets SCSI inquiry data strings for vendor, product
750 * and revision level. Allows strings to be set in platform dependant 750 * and revision level. Allows strings to be set in platform dependent
751 * files instead of in OS dependant driver source. 751 * files instead of in OS dependent driver source.
752 */ 752 */
753 753
754static void setinqstr(struct aac_dev *dev, void *data, int tindex) 754static void setinqstr(struct aac_dev *dev, void *data, int tindex)
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 29ab00016b78..ffb587817efc 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -1259,7 +1259,7 @@ struct aac_dev
1259#define CACHE_UNSTABLE 2 1259#define CACHE_UNSTABLE 2
1260 1260
1261/* 1261/*
1262 * Lets the client know at which level the data was commited on 1262 * Lets the client know at which level the data was committed on
1263 * a write request 1263 * a write request
1264 */ 1264 */
1265 1265
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index dd7ad3ba2dad..e7d0d47b9185 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -421,7 +421,7 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
421 if (!(hw_fib->header.XferState & cpu_to_le32(HostOwned))) 421 if (!(hw_fib->header.XferState & cpu_to_le32(HostOwned)))
422 return -EBUSY; 422 return -EBUSY;
423 /* 423 /*
424 * There are 5 cases with the wait and reponse requested flags. 424 * There are 5 cases with the wait and response requested flags.
425 * The only invalid cases are if the caller requests to wait and 425 * The only invalid cases are if the caller requests to wait and
426 * does not request a response and if the caller does not want a 426 * does not request a response and if the caller does not want a
427 * response and the Fib is not allocated from pool. If a response 427 * response and the Fib is not allocated from pool. If a response
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 081c6de92bc5..bfd618a69499 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -4544,7 +4544,7 @@ AscMemWordCopyPtrToLram(PortAddr iop_base, ushort s_addr,
4544 * Copy 4 bytes to LRAM. 4544 * Copy 4 bytes to LRAM.
4545 * 4545 *
4546 * The source data is assumed to be in little-endian order in memory 4546 * The source data is assumed to be in little-endian order in memory
4547 * and is maintained in little-endian order when writen to LRAM. 4547 * and is maintained in little-endian order when written to LRAM.
4548 */ 4548 */
4549static void 4549static void
4550AscMemDWordCopyPtrToLram(PortAddr iop_base, 4550AscMemDWordCopyPtrToLram(PortAddr iop_base,
diff --git a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c
index d058f1ab82b5..1c10b796c1a2 100644
--- a/drivers/scsi/aha1740.c
+++ b/drivers/scsi/aha1740.c
@@ -461,7 +461,7 @@ static int aha1740_queuecommand_lck(Scsi_Cmnd * SCpnt, void (*done)(Scsi_Cmnd *)
461 /* The Adaptec Spec says the card is so fast that the loops 461 /* The Adaptec Spec says the card is so fast that the loops
462 will only be executed once in the code below. Even if this 462 will only be executed once in the code below. Even if this
463 was true with the fastest processors when the spec was 463 was true with the fastest processors when the spec was
464 written, it doesn't seem to be true with todays fast 464 written, it doesn't seem to be true with today's fast
465 processors. We print a warning if the code is executed more 465 processors. We print a warning if the code is executed more
466 often than LOOPCNT_WARN. If this happens, it should be 466 often than LOOPCNT_WARN. If this happens, it should be
467 investigated. If the count reaches LOOPCNT_MAX, we assume 467 investigated. If the count reaches LOOPCNT_MAX, we assume
diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h
index 95ee50385188..9b059422aacb 100644
--- a/drivers/scsi/aic7xxx/aic79xx.h
+++ b/drivers/scsi/aic7xxx/aic79xx.h
@@ -473,7 +473,7 @@ struct hardware_scb {
473 * o A residual has occurred if SG_FULL_RESID is set in sgptr, 473 * o A residual has occurred if SG_FULL_RESID is set in sgptr,
474 * or residual_sgptr does not have SG_LIST_NULL set. 474 * or residual_sgptr does not have SG_LIST_NULL set.
475 * 475 *
476 * o We are transfering the last segment if residual_datacnt has 476 * o We are transferring the last segment if residual_datacnt has
477 * the SG_LAST_SEG flag set. 477 * the SG_LAST_SEG flag set.
478 * 478 *
479 * Host: 479 * Host:
@@ -516,7 +516,7 @@ struct hardware_scb {
516 */ 516 */
517 517
518/* 518/*
519 * Definition of a scatter/gather element as transfered to the controller. 519 * Definition of a scatter/gather element as transferred to the controller.
520 * The aic7xxx chips only support a 24bit length. We use the top byte of 520 * The aic7xxx chips only support a 24bit length. We use the top byte of
521 * the length to store additional address bits and a flag to indicate 521 * the length to store additional address bits and a flag to indicate
522 * that a given segment terminates the transfer. This gives us an 522 * that a given segment terminates the transfer. This gives us an
diff --git a/drivers/scsi/aic7xxx/aic79xx.reg b/drivers/scsi/aic7xxx/aic79xx.reg
index 0666c22ab55b..7e12c31ccfda 100644
--- a/drivers/scsi/aic7xxx/aic79xx.reg
+++ b/drivers/scsi/aic7xxx/aic79xx.reg
@@ -305,7 +305,7 @@ register HS_MAILBOX {
305} 305}
306 306
307/* 307/*
308 * Sequencer Interupt Status 308 * Sequencer Interrupt Status
309 */ 309 */
310register SEQINTSTAT { 310register SEQINTSTAT {
311 address 0x00C 311 address 0x00C
@@ -685,7 +685,7 @@ register DCHRXMSG0 {
685} 685}
686 686
687/* 687/*
688 * CMC Recieve Message 0 688 * CMC Receive Message 0
689 */ 689 */
690register CMCRXMSG0 { 690register CMCRXMSG0 {
691 address 0x090 691 address 0x090
@@ -696,7 +696,7 @@ register CMCRXMSG0 {
696} 696}
697 697
698/* 698/*
699 * Overlay Recieve Message 0 699 * Overlay Receive Message 0
700 */ 700 */
701register OVLYRXMSG0 { 701register OVLYRXMSG0 {
702 address 0x090 702 address 0x090
@@ -732,7 +732,7 @@ register DCHRXMSG1 {
732} 732}
733 733
734/* 734/*
735 * CMC Recieve Message 1 735 * CMC Receive Message 1
736 */ 736 */
737register CMCRXMSG1 { 737register CMCRXMSG1 {
738 address 0x091 738 address 0x091
@@ -742,7 +742,7 @@ register CMCRXMSG1 {
742} 742}
743 743
744/* 744/*
745 * Overlay Recieve Message 1 745 * Overlay Receive Message 1
746 */ 746 */
747register OVLYRXMSG1 { 747register OVLYRXMSG1 {
748 address 0x091 748 address 0x091
@@ -777,7 +777,7 @@ register DCHRXMSG2 {
777} 777}
778 778
779/* 779/*
780 * CMC Recieve Message 2 780 * CMC Receive Message 2
781 */ 781 */
782register CMCRXMSG2 { 782register CMCRXMSG2 {
783 address 0x092 783 address 0x092
@@ -787,7 +787,7 @@ register CMCRXMSG2 {
787} 787}
788 788
789/* 789/*
790 * Overlay Recieve Message 2 790 * Overlay Receive Message 2
791 */ 791 */
792register OVLYRXMSG2 { 792register OVLYRXMSG2 {
793 address 0x092 793 address 0x092
@@ -816,7 +816,7 @@ register DCHRXMSG3 {
816} 816}
817 817
818/* 818/*
819 * CMC Recieve Message 3 819 * CMC Receive Message 3
820 */ 820 */
821register CMCRXMSG3 { 821register CMCRXMSG3 {
822 address 0x093 822 address 0x093
@@ -826,7 +826,7 @@ register CMCRXMSG3 {
826} 826}
827 827
828/* 828/*
829 * Overlay Recieve Message 3 829 * Overlay Receive Message 3
830 */ 830 */
831register OVLYRXMSG3 { 831register OVLYRXMSG3 {
832 address 0x093 832 address 0x093
@@ -1249,7 +1249,7 @@ register TARGPCISTAT {
1249 1249
1250/* 1250/*
1251 * LQ Packet In 1251 * LQ Packet In
1252 * The last LQ Packet recieved 1252 * The last LQ Packet received
1253 */ 1253 */
1254register LQIN { 1254register LQIN {
1255 address 0x020 1255 address 0x020
@@ -2573,7 +2573,7 @@ register IOPDNCTL {
2573} 2573}
2574 2574
2575/* 2575/*
2576 * Shaddow Host Address. 2576 * Shadow Host Address.
2577 */ 2577 */
2578register SHADDR { 2578register SHADDR {
2579 address 0x060 2579 address 0x060
@@ -3983,7 +3983,7 @@ scratch_ram {
3983 3983
3984 /* 3984 /*
3985 * The maximum amount of time to wait, when interrupt coalescing 3985 * The maximum amount of time to wait, when interrupt coalescing
3986 * is enabled, before issueing a CMDCMPLT interrupt for a completed 3986 * is enabled, before issuing a CMDCMPLT interrupt for a completed
3987 * command. 3987 * command.
3988 */ 3988 */
3989 INT_COALESCING_TIMER { 3989 INT_COALESCING_TIMER {
diff --git a/drivers/scsi/aic7xxx/aic79xx.seq b/drivers/scsi/aic7xxx/aic79xx.seq
index 2fb78e35a9e5..3a36d9362a10 100644
--- a/drivers/scsi/aic7xxx/aic79xx.seq
+++ b/drivers/scsi/aic7xxx/aic79xx.seq
@@ -567,7 +567,7 @@ BEGIN_CRITICAL;
567 shr SELOID, 4, SCB_SCSIID; 567 shr SELOID, 4, SCB_SCSIID;
568 /* 568 /*
569 * If we want to send a message to the device, ensure 569 * If we want to send a message to the device, ensure
570 * we are selecting with atn irregardless of our packetized 570 * we are selecting with atn regardless of our packetized
571 * agreement. Since SPI4 only allows target reset or PPR 571 * agreement. Since SPI4 only allows target reset or PPR
572 * messages if this is a packetized connection, the change 572 * messages if this is a packetized connection, the change
573 * to our negotiation table entry for this selection will 573 * to our negotiation table entry for this selection will
@@ -960,7 +960,7 @@ p_status_okay:
960 * This is done to allow the host to send messages outside of an identify 960 * This is done to allow the host to send messages outside of an identify
961 * sequence while protecting the seqencer from testing the MK_MESSAGE bit 961 * sequence while protecting the seqencer from testing the MK_MESSAGE bit
962 * on an SCB that might not be for the current nexus. (For example, a 962 * on an SCB that might not be for the current nexus. (For example, a
963 * BDR message in responce to a bad reselection would leave us pointed to 963 * BDR message in response to a bad reselection would leave us pointed to
964 * an SCB that doesn't have anything to do with the current target). 964 * an SCB that doesn't have anything to do with the current target).
965 * 965 *
966 * Otherwise, treat MSG_OUT as a 1 byte message to send (abort, abort tag, 966 * Otherwise, treat MSG_OUT as a 1 byte message to send (abort, abort tag,
@@ -1507,7 +1507,7 @@ service_fifo:
1507 * If the other FIFO needs loading, then it 1507 * If the other FIFO needs loading, then it
1508 * must not have claimed the S/G cache yet 1508 * must not have claimed the S/G cache yet
1509 * (SG_CACHE_AVAIL would have been cleared in 1509 * (SG_CACHE_AVAIL would have been cleared in
1510 * the orginal FIFO mode and we test this above). 1510 * the original FIFO mode and we test this above).
1511 * Return to the idle loop so we can process the 1511 * Return to the idle loop so we can process the
1512 * FIFO not currently on the bus first. 1512 * FIFO not currently on the bus first.
1513 */ 1513 */
@@ -1521,7 +1521,7 @@ idle_sgfetch_okay:
1521idle_sgfetch_start: 1521idle_sgfetch_start:
1522 /* 1522 /*
1523 * We fetch a "cacheline aligned" and sized amount of data 1523 * We fetch a "cacheline aligned" and sized amount of data
1524 * so we don't end up referencing a non-existant page. 1524 * so we don't end up referencing a non-existent page.
1525 * Cacheline aligned is in quotes because the kernel will 1525 * Cacheline aligned is in quotes because the kernel will
1526 * set the prefetch amount to a reasonable level if the 1526 * set the prefetch amount to a reasonable level if the
1527 * cacheline size is unknown. 1527 * cacheline size is unknown.
@@ -1551,7 +1551,7 @@ idle_sg_avail:
1551 test DFSTATUS, PRELOAD_AVAIL jz return; 1551 test DFSTATUS, PRELOAD_AVAIL jz return;
1552 /* 1552 /*
1553 * On the A, preloading a segment before HDMAENACK 1553 * On the A, preloading a segment before HDMAENACK
1554 * comes true can clobber the shaddow address of the 1554 * comes true can clobber the shadow address of the
1555 * first segment in the S/G FIFO. Wait until it is 1555 * first segment in the S/G FIFO. Wait until it is
1556 * safe to proceed. 1556 * safe to proceed.
1557 */ 1557 */
@@ -2004,10 +2004,10 @@ pkt_handle_xfer:
2004 * Defer handling of this NONPACKREQ until we 2004 * Defer handling of this NONPACKREQ until we
2005 * can be sure it pertains to this FIFO. SAVEPTRS 2005 * can be sure it pertains to this FIFO. SAVEPTRS
2006 * will not be asserted if the NONPACKREQ is for us, 2006 * will not be asserted if the NONPACKREQ is for us,
2007 * so we must simulate it if shaddow is valid. If 2007 * so we must simulate it if shadow is valid. If
2008 * shaddow is not valid, keep running this FIFO until we 2008 * shadow is not valid, keep running this FIFO until we
2009 * have satisfied the transfer by loading segments and 2009 * have satisfied the transfer by loading segments and
2010 * waiting for either shaddow valid or last_seg_done. 2010 * waiting for either shadow valid or last_seg_done.
2011 */ 2011 */
2012 test MDFFSTAT, SHVALID jnz pkt_saveptrs; 2012 test MDFFSTAT, SHVALID jnz pkt_saveptrs;
2013pkt_service_fifo: 2013pkt_service_fifo:
@@ -2171,7 +2171,7 @@ pkt_status_check_nonpackreq:
2171 /* 2171 /*
2172 * The unexpected nonpkt phase handler assumes that any 2172 * The unexpected nonpkt phase handler assumes that any
2173 * data channel use will have a FIFO reference count. It 2173 * data channel use will have a FIFO reference count. It
2174 * turns out that the status handler doesn't need a refernce 2174 * turns out that the status handler doesn't need a references
2175 * count since the status received flag, and thus completion 2175 * count since the status received flag, and thus completion
2176 * processing, cannot be set until the handler is finished. 2176 * processing, cannot be set until the handler is finished.
2177 * We increment the count here to make the nonpkt handler 2177 * We increment the count here to make the nonpkt handler
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index 3233bf564435..5f8617dd43bb 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -562,7 +562,7 @@ ahd_targetcmd_offset(struct ahd_softc *ahd, u_int index)
562} 562}
563#endif 563#endif
564 564
565/*********************** Miscelaneous Support Functions ***********************/ 565/*********************** Miscellaneous Support Functions ***********************/
566/* 566/*
567 * Return pointers to the transfer negotiation information 567 * Return pointers to the transfer negotiation information
568 * for the specified our_id/remote_id pair. 568 * for the specified our_id/remote_id pair.
@@ -599,7 +599,7 @@ void
599ahd_outw(struct ahd_softc *ahd, u_int port, u_int value) 599ahd_outw(struct ahd_softc *ahd, u_int port, u_int value)
600{ 600{
601 /* 601 /*
602 * Write low byte first to accomodate registers 602 * Write low byte first to accommodate registers
603 * such as PRGMCNT where the order maters. 603 * such as PRGMCNT where the order maters.
604 */ 604 */
605 ahd_outb(ahd, port, value & 0xFF); 605 ahd_outb(ahd, port, value & 0xFF);
@@ -2067,7 +2067,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
2067 * that requires host assistance for completion. 2067 * that requires host assistance for completion.
2068 * While handling the message phase(s), we will be 2068 * While handling the message phase(s), we will be
2069 * notified by the sequencer after each byte is 2069 * notified by the sequencer after each byte is
2070 * transfered so we can track bus phase changes. 2070 * transferred so we can track bus phase changes.
2071 * 2071 *
2072 * If this is the first time we've seen a HOST_MSG_LOOP 2072 * If this is the first time we've seen a HOST_MSG_LOOP
2073 * interrupt, initialize the state of the host message 2073 * interrupt, initialize the state of the host message
@@ -2487,7 +2487,7 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat)
2487 /* 2487 /*
2488 * Although the driver does not care about the 2488 * Although the driver does not care about the
2489 * 'Selection in Progress' status bit, the busy 2489 * 'Selection in Progress' status bit, the busy
2490 * LED does. SELINGO is only cleared by a successfull 2490 * LED does. SELINGO is only cleared by a successful
2491 * selection, so we must manually clear it to insure 2491 * selection, so we must manually clear it to insure
2492 * the LED turns off just incase no future successful 2492 * the LED turns off just incase no future successful
2493 * selections occur (e.g. no devices on the bus). 2493 * selections occur (e.g. no devices on the bus).
@@ -3548,7 +3548,7 @@ ahd_clear_critical_section(struct ahd_softc *ahd)
3548 ahd_outb(ahd, SEQCTL0, ahd_inb(ahd, SEQCTL0) & ~STEP); 3548 ahd_outb(ahd, SEQCTL0, ahd_inb(ahd, SEQCTL0) & ~STEP);
3549 ahd_outb(ahd, SIMODE1, simode1); 3549 ahd_outb(ahd, SIMODE1, simode1);
3550 /* 3550 /*
3551 * SCSIINT seems to glitch occassionally when 3551 * SCSIINT seems to glitch occasionally when
3552 * the interrupt masks are restored. Clear SCSIINT 3552 * the interrupt masks are restored. Clear SCSIINT
3553 * one more time so that only persistent errors 3553 * one more time so that only persistent errors
3554 * are seen as a real interrupt. 3554 * are seen as a real interrupt.
@@ -3838,7 +3838,7 @@ ahd_validate_width(struct ahd_softc *ahd, struct ahd_initiator_tinfo *tinfo,
3838 3838
3839/* 3839/*
3840 * Update the bitmask of targets for which the controller should 3840 * Update the bitmask of targets for which the controller should
3841 * negotiate with at the next convenient oportunity. This currently 3841 * negotiate with at the next convenient opportunity. This currently
3842 * means the next time we send the initial identify messages for 3842 * means the next time we send the initial identify messages for
3843 * a new transaction. 3843 * a new transaction.
3844 */ 3844 */
@@ -4200,7 +4200,7 @@ ahd_update_neg_table(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
4200 4200
4201 /* 4201 /*
4202 * During packetized transfers, the target will 4202 * During packetized transfers, the target will
4203 * give us the oportunity to send command packets 4203 * give us the opportunity to send command packets
4204 * without us asserting attention. 4204 * without us asserting attention.
4205 */ 4205 */
4206 if ((tinfo->ppr_options & MSG_EXT_PPR_IU_REQ) == 0) 4206 if ((tinfo->ppr_options & MSG_EXT_PPR_IU_REQ) == 0)
@@ -5651,7 +5651,7 @@ ahd_handle_msg_reject(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
5651 5651
5652 /* 5652 /*
5653 * Requeue all tagged commands for this target 5653 * Requeue all tagged commands for this target
5654 * currently in our posession so they can be 5654 * currently in our possession so they can be
5655 * converted to untagged commands. 5655 * converted to untagged commands.
5656 */ 5656 */
5657 ahd_search_qinfifo(ahd, SCB_GET_TARGET(ahd, scb), 5657 ahd_search_qinfifo(ahd, SCB_GET_TARGET(ahd, scb),
@@ -6245,7 +6245,7 @@ ahd_shutdown(void *arg)
6245/* 6245/*
6246 * Reset the controller and record some information about it 6246 * Reset the controller and record some information about it
6247 * that is only available just after a reset. If "reinit" is 6247 * that is only available just after a reset. If "reinit" is
6248 * non-zero, this reset occured after initial configuration 6248 * non-zero, this reset occurred after initial configuration
6249 * and the caller requests that the chip be fully reinitialized 6249 * and the caller requests that the chip be fully reinitialized
6250 * to a runable state. Chip interrupts are *not* enabled after 6250 * to a runable state. Chip interrupts are *not* enabled after
6251 * a reinitialization. The caller must enable interrupts via 6251 * a reinitialization. The caller must enable interrupts via
@@ -6495,7 +6495,7 @@ ahd_init_scbdata(struct ahd_softc *ahd)
6495 } 6495 }
6496 6496
6497 /* 6497 /*
6498 * Note that we were successfull 6498 * Note that we were successful
6499 */ 6499 */
6500 return (0); 6500 return (0);
6501 6501
@@ -7079,7 +7079,7 @@ ahd_init(struct ahd_softc *ahd)
7079 return (ENOMEM); 7079 return (ENOMEM);
7080 7080
7081 /* 7081 /*
7082 * Verify that the compiler hasn't over-agressively 7082 * Verify that the compiler hasn't over-aggressively
7083 * padded important structures. 7083 * padded important structures.
7084 */ 7084 */
7085 if (sizeof(struct hardware_scb) != 64) 7085 if (sizeof(struct hardware_scb) != 64)
@@ -10087,7 +10087,7 @@ ahd_write_seeprom(struct ahd_softc *ahd, uint16_t *buf,
10087 return (error); 10087 return (error);
10088 10088
10089 /* 10089 /*
10090 * Write the data. If we don't get throught the loop at 10090 * Write the data. If we don't get through the loop at
10091 * least once, the arguments were invalid. 10091 * least once, the arguments were invalid.
10092 */ 10092 */
10093 retval = EINVAL; 10093 retval = EINVAL;
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 25d066624476..7d48700257a7 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -1441,7 +1441,7 @@ ahd_platform_set_tags(struct ahd_softc *ahd, struct scsi_device *sdev,
1441 usertags = ahd_linux_user_tagdepth(ahd, devinfo); 1441 usertags = ahd_linux_user_tagdepth(ahd, devinfo);
1442 if (!was_queuing) { 1442 if (!was_queuing) {
1443 /* 1443 /*
1444 * Start out agressively and allow our 1444 * Start out aggressively and allow our
1445 * dynamic queue depth algorithm to take 1445 * dynamic queue depth algorithm to take
1446 * care of the rest. 1446 * care of the rest.
1447 */ 1447 */
diff --git a/drivers/scsi/aic7xxx/aic7xxx.h b/drivers/scsi/aic7xxx/aic7xxx.h
index 17444bc18bca..f695774645c1 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.h
+++ b/drivers/scsi/aic7xxx/aic7xxx.h
@@ -440,7 +440,7 @@ struct hardware_scb {
440 * o A residual has occurred if SG_FULL_RESID is set in sgptr, 440 * o A residual has occurred if SG_FULL_RESID is set in sgptr,
441 * or residual_sgptr does not have SG_LIST_NULL set. 441 * or residual_sgptr does not have SG_LIST_NULL set.
442 * 442 *
443 * o We are transfering the last segment if residual_datacnt has 443 * o We are transferring the last segment if residual_datacnt has
444 * the SG_LAST_SEG flag set. 444 * the SG_LAST_SEG flag set.
445 * 445 *
446 * Host: 446 * Host:
@@ -494,7 +494,7 @@ struct hardware_scb {
494 */ 494 */
495 495
496/* 496/*
497 * Definition of a scatter/gather element as transfered to the controller. 497 * Definition of a scatter/gather element as transferred to the controller.
498 * The aic7xxx chips only support a 24bit length. We use the top byte of 498 * The aic7xxx chips only support a 24bit length. We use the top byte of
499 * the length to store additional address bits and a flag to indicate 499 * the length to store additional address bits and a flag to indicate
500 * that a given segment terminates the transfer. This gives us an 500 * that a given segment terminates the transfer. This gives us an
diff --git a/drivers/scsi/aic7xxx/aic7xxx.reg b/drivers/scsi/aic7xxx/aic7xxx.reg
index 9a96e55da39a..ba0b411d03e2 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.reg
+++ b/drivers/scsi/aic7xxx/aic7xxx.reg
@@ -351,7 +351,7 @@ register SSTAT2 {
351 address 0x00d 351 address 0x00d
352 access_mode RO 352 access_mode RO
353 field OVERRUN 0x80 353 field OVERRUN 0x80
354 field SHVALID 0x40 /* Shaddow Layer non-zero */ 354 field SHVALID 0x40 /* Shadow Layer non-zero */
355 field EXP_ACTIVE 0x10 /* SCSI Expander Active */ 355 field EXP_ACTIVE 0x10 /* SCSI Expander Active */
356 field CRCVALERR 0x08 /* CRC doesn't match (U3 only) */ 356 field CRCVALERR 0x08 /* CRC doesn't match (U3 only) */
357 field CRCENDERR 0x04 /* No terminal CRC packet (U3 only) */ 357 field CRCENDERR 0x04 /* No terminal CRC packet (U3 only) */
diff --git a/drivers/scsi/aic7xxx/aic7xxx.seq b/drivers/scsi/aic7xxx/aic7xxx.seq
index 5a4cfc954a9f..e60041e8f2d1 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.seq
+++ b/drivers/scsi/aic7xxx/aic7xxx.seq
@@ -57,10 +57,10 @@ PREFIX = "ahc_"
57 * a later time. This problem cannot be resolved by holding a single entry 57 * a later time. This problem cannot be resolved by holding a single entry
58 * in scratch ram since a reconnecting target can request sense and this will 58 * in scratch ram since a reconnecting target can request sense and this will
59 * create yet another SCB waiting for selection. The solution used here is to 59 * create yet another SCB waiting for selection. The solution used here is to
60 * use byte 27 of the SCB as a psuedo-next pointer and to thread a list 60 * use byte 27 of the SCB as a pseudo-next pointer and to thread a list
61 * of SCBs that are awaiting selection. Since 0-0xfe are valid SCB indexes, 61 * of SCBs that are awaiting selection. Since 0-0xfe are valid SCB indexes,
62 * SCB_LIST_NULL is 0xff which is out of range. An entry is also added to 62 * SCB_LIST_NULL is 0xff which is out of range. An entry is also added to
63 * this list everytime a request sense occurs or after completing a non-tagged 63 * this list every time a request sense occurs or after completing a non-tagged
64 * command for which a second SCB has been queued. The sequencer will 64 * command for which a second SCB has been queued. The sequencer will
65 * automatically consume the entries. 65 * automatically consume the entries.
66 */ 66 */
@@ -752,7 +752,7 @@ idle_loop:
752 752
753 /* 753 /*
754 * We fetch a "cacheline aligned" and sized amount of data 754 * We fetch a "cacheline aligned" and sized amount of data
755 * so we don't end up referencing a non-existant page. 755 * so we don't end up referencing a non-existent page.
756 * Cacheline aligned is in quotes because the kernel will 756 * Cacheline aligned is in quotes because the kernel will
757 * set the prefetch amount to a reasonable level if the 757 * set the prefetch amount to a reasonable level if the
758 * cacheline size is unknown. 758 * cacheline size is unknown.
@@ -1485,7 +1485,7 @@ p_status_okay:
1485 * This is done to allow the host to send messages outside of an identify 1485 * This is done to allow the host to send messages outside of an identify
1486 * sequence while protecting the seqencer from testing the MK_MESSAGE bit 1486 * sequence while protecting the seqencer from testing the MK_MESSAGE bit
1487 * on an SCB that might not be for the current nexus. (For example, a 1487 * on an SCB that might not be for the current nexus. (For example, a
1488 * BDR message in responce to a bad reselection would leave us pointed to 1488 * BDR message in response to a bad reselection would leave us pointed to
1489 * an SCB that doesn't have anything to do with the current target). 1489 * an SCB that doesn't have anything to do with the current target).
1490 * 1490 *
1491 * Otherwise, treat MSG_OUT as a 1 byte message to send (abort, abort tag, 1491 * Otherwise, treat MSG_OUT as a 1 byte message to send (abort, abort tag,
@@ -1999,7 +1999,7 @@ if ((ahc->flags & AHC_TARGETROLE) != 0) {
1999 * from out to in, wait an additional data release delay before continuing. 1999 * from out to in, wait an additional data release delay before continuing.
2000 */ 2000 */
2001change_phase: 2001change_phase:
2002 /* Wait for preceeding I/O session to complete. */ 2002 /* Wait for preceding I/O session to complete. */
2003 test SCSISIGI, ACKI jnz .; 2003 test SCSISIGI, ACKI jnz .;
2004 2004
2005 /* Change the phase */ 2005 /* Change the phase */
diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index e021b4812d58..dc28b0a91b22 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -427,7 +427,7 @@ ahc_targetcmd_offset(struct ahc_softc *ahc, u_int index)
427} 427}
428#endif 428#endif
429 429
430/*********************** Miscelaneous Support Functions ***********************/ 430/*********************** Miscellaneous Support Functions ***********************/
431/* 431/*
432 * Determine whether the sequencer reported a residual 432 * Determine whether the sequencer reported a residual
433 * for this SCB/transaction. 433 * for this SCB/transaction.
@@ -1243,7 +1243,7 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
1243 * that requires host assistance for completion. 1243 * that requires host assistance for completion.
1244 * While handling the message phase(s), we will be 1244 * While handling the message phase(s), we will be
1245 * notified by the sequencer after each byte is 1245 * notified by the sequencer after each byte is
1246 * transfered so we can track bus phase changes. 1246 * transferred so we can track bus phase changes.
1247 * 1247 *
1248 * If this is the first time we've seen a HOST_MSG_LOOP 1248 * If this is the first time we've seen a HOST_MSG_LOOP
1249 * interrupt, initialize the state of the host message 1249 * interrupt, initialize the state of the host message
@@ -1487,7 +1487,7 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
1487 scbptr, ahc_inb(ahc, ARG_1), 1487 scbptr, ahc_inb(ahc, ARG_1),
1488 ahc->scb_data->hscbs[scbptr].tag); 1488 ahc->scb_data->hscbs[scbptr].tag);
1489 ahc_dump_card_state(ahc); 1489 ahc_dump_card_state(ahc);
1490 panic("for saftey"); 1490 panic("for safety");
1491 break; 1491 break;
1492 } 1492 }
1493 case OUT_OF_RANGE: 1493 case OUT_OF_RANGE:
@@ -1733,7 +1733,7 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat)
1733 /* 1733 /*
1734 * Although the driver does not care about the 1734 * Although the driver does not care about the
1735 * 'Selection in Progress' status bit, the busy 1735 * 'Selection in Progress' status bit, the busy
1736 * LED does. SELINGO is only cleared by a successfull 1736 * LED does. SELINGO is only cleared by a successful
1737 * selection, so we must manually clear it to insure 1737 * selection, so we must manually clear it to insure
1738 * the LED turns off just incase no future successful 1738 * the LED turns off just incase no future successful
1739 * selections occur (e.g. no devices on the bus). 1739 * selections occur (e.g. no devices on the bus).
@@ -1943,7 +1943,7 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat)
1943 if (lastphase != P_BUSFREE) { 1943 if (lastphase != P_BUSFREE) {
1944 /* 1944 /*
1945 * Renegotiate with this device at the 1945 * Renegotiate with this device at the
1946 * next oportunity just in case this busfree 1946 * next opportunity just in case this busfree
1947 * is due to a negotiation mismatch with the 1947 * is due to a negotiation mismatch with the
1948 * device. 1948 * device.
1949 */ 1949 */
@@ -2442,7 +2442,7 @@ ahc_validate_width(struct ahc_softc *ahc, struct ahc_initiator_tinfo *tinfo,
2442 2442
2443/* 2443/*
2444 * Update the bitmask of targets for which the controller should 2444 * Update the bitmask of targets for which the controller should
2445 * negotiate with at the next convenient oportunity. This currently 2445 * negotiate with at the next convenient opportunity. This currently
2446 * means the next time we send the initial identify messages for 2446 * means the next time we send the initial identify messages for
2447 * a new transaction. 2447 * a new transaction.
2448 */ 2448 */
@@ -4131,7 +4131,7 @@ ahc_handle_msg_reject(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
4131 4131
4132 /* 4132 /*
4133 * Requeue all tagged commands for this target 4133 * Requeue all tagged commands for this target
4134 * currently in our posession so they can be 4134 * currently in our possession so they can be
4135 * converted to untagged commands. 4135 * converted to untagged commands.
4136 */ 4136 */
4137 ahc_search_qinfifo(ahc, SCB_GET_TARGET(ahc, scb), 4137 ahc_search_qinfifo(ahc, SCB_GET_TARGET(ahc, scb),
@@ -4581,7 +4581,7 @@ ahc_shutdown(void *arg)
4581/* 4581/*
4582 * Reset the controller and record some information about it 4582 * Reset the controller and record some information about it
4583 * that is only available just after a reset. If "reinit" is 4583 * that is only available just after a reset. If "reinit" is
4584 * non-zero, this reset occured after initial configuration 4584 * non-zero, this reset occurred after initial configuration
4585 * and the caller requests that the chip be fully reinitialized 4585 * and the caller requests that the chip be fully reinitialized
4586 * to a runable state. Chip interrupts are *not* enabled after 4586 * to a runable state. Chip interrupts are *not* enabled after
4587 * a reinitialization. The caller must enable interrupts via 4587 * a reinitialization. The caller must enable interrupts via
@@ -4899,7 +4899,7 @@ ahc_init_scbdata(struct ahc_softc *ahc)
4899 ahc->next_queued_scb = ahc_get_scb(ahc); 4899 ahc->next_queued_scb = ahc_get_scb(ahc);
4900 4900
4901 /* 4901 /*
4902 * Note that we were successfull 4902 * Note that we were successful
4903 */ 4903 */
4904 return (0); 4904 return (0);
4905 4905
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 4a359bb307c6..c6251bb4f438 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -294,7 +294,7 @@ static uint32_t aic7xxx_extended;
294 * dubious at best. To my knowledge, this option has never actually 294 * dubious at best. To my knowledge, this option has never actually
295 * solved a PCI parity problem, but on certain machines with broken PCI 295 * solved a PCI parity problem, but on certain machines with broken PCI
296 * chipset configurations where stray PCI transactions with bad parity are 296 * chipset configurations where stray PCI transactions with bad parity are
297 * the norm rather than the exception, the error messages can be overwelming. 297 * the norm rather than the exception, the error messages can be overwhelming.
298 * It's included in the driver for completeness. 298 * It's included in the driver for completeness.
299 * 0 = Shut off PCI parity check 299 * 0 = Shut off PCI parity check
300 * non-0 = reverse polarity pci parity checking 300 * non-0 = reverse polarity pci parity checking
@@ -1318,7 +1318,7 @@ ahc_platform_set_tags(struct ahc_softc *ahc, struct scsi_device *sdev,
1318 usertags = ahc_linux_user_tagdepth(ahc, devinfo); 1318 usertags = ahc_linux_user_tagdepth(ahc, devinfo);
1319 if (!was_queuing) { 1319 if (!was_queuing) {
1320 /* 1320 /*
1321 * Start out agressively and allow our 1321 * Start out aggressively and allow our
1322 * dynamic queue depth algorithm to take 1322 * dynamic queue depth algorithm to take
1323 * care of the rest. 1323 * care of the rest.
1324 */ 1324 */
diff --git a/drivers/scsi/aic7xxx/aic7xxx_pci.c b/drivers/scsi/aic7xxx/aic7xxx_pci.c
index 2b11a4272364..6917b4f5ac9e 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_pci.c
@@ -789,7 +789,7 @@ ahc_pci_config(struct ahc_softc *ahc, const struct ahc_pci_identity *entry)
789 ahc->bus_intr = ahc_pci_intr; 789 ahc->bus_intr = ahc_pci_intr;
790 ahc->bus_chip_init = ahc_pci_chip_init; 790 ahc->bus_chip_init = ahc_pci_chip_init;
791 791
792 /* Remeber how the card was setup in case there is no SEEPROM */ 792 /* Remember how the card was setup in case there is no SEEPROM */
793 if ((ahc_inb(ahc, HCNTRL) & POWRDN) == 0) { 793 if ((ahc_inb(ahc, HCNTRL) & POWRDN) == 0) {
794 ahc_pause(ahc); 794 ahc_pause(ahc);
795 if ((ahc->features & AHC_ULTRA2) != 0) 795 if ((ahc->features & AHC_ULTRA2) != 0)
@@ -860,7 +860,7 @@ ahc_pci_config(struct ahc_softc *ahc, const struct ahc_pci_identity *entry)
860 } 860 }
861 861
862 /* 862 /*
863 * We cannot perform ULTRA speeds without the presense 863 * We cannot perform ULTRA speeds without the presence
864 * of the external precision resistor. 864 * of the external precision resistor.
865 */ 865 */
866 if ((ahc->features & AHC_ULTRA) != 0) { 866 if ((ahc->features & AHC_ULTRA) != 0) {
@@ -969,7 +969,7 @@ ahc_pci_config(struct ahc_softc *ahc, const struct ahc_pci_identity *entry)
969} 969}
970 970
971/* 971/*
972 * Test for the presense of external sram in an 972 * Test for the presence of external sram in an
973 * "unshared" configuration. 973 * "unshared" configuration.
974 */ 974 */
975static int 975static int
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y b/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
index e4064433842e..f1586a437906 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
@@ -803,7 +803,7 @@ macro_arglist:
803| macro_arglist ',' T_ARG 803| macro_arglist ',' T_ARG
804 { 804 {
805 if ($1 == 0) { 805 if ($1 == 0) {
806 stop("Comma without preceeding argument in arg list", 806 stop("Comma without preceding argument in arg list",
807 EX_DATAERR); 807 EX_DATAERR);
808 /* NOTREACHED */ 808 /* NOTREACHED */
809 } 809 }
@@ -1319,8 +1319,8 @@ code:
1319; 1319;
1320 1320
1321 /* 1321 /*
1322 * This grammer differs from the one in the aic7xxx 1322 * This grammar differs from the one in the aic7xxx
1323 * reference manual since the grammer listed there is 1323 * reference manual since the grammar listed there is
1324 * ambiguous and causes a shift/reduce conflict. 1324 * ambiguous and causes a shift/reduce conflict.
1325 * It also seems more logical as the "immediate" 1325 * It also seems more logical as the "immediate"
1326 * argument is listed as the second arg like the 1326 * argument is listed as the second arg like the
@@ -1799,7 +1799,7 @@ format_3_instr(int opcode, symbol_ref_t *src,
1799 instr = seq_alloc(); 1799 instr = seq_alloc();
1800 f3_instr = &instr->format.format3; 1800 f3_instr = &instr->format.format3;
1801 if (address->symbol == NULL) { 1801 if (address->symbol == NULL) {
1802 /* 'dot' referrence. Use the current instruction pointer */ 1802 /* 'dot' reference. Use the current instruction pointer */
1803 addr = instruction_ptr + address->offset; 1803 addr = instruction_ptr + address->offset;
1804 } else if (address->symbol->type == UNINITIALIZED) { 1804 } else if (address->symbol->type == UNINITIALIZED) {
1805 /* forward reference */ 1805 /* forward reference */
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_macro_gram.y b/drivers/scsi/aic7xxx/aicasm/aicasm_macro_gram.y
index ff46aa6801bf..708326df0766 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm_macro_gram.y
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm_macro_gram.y
@@ -115,7 +115,7 @@ macro_arglist:
115| macro_arglist ',' T_ARG 115| macro_arglist ',' T_ARG
116 { 116 {
117 if ($1 == 0) { 117 if ($1 == 0) {
118 stop("Comma without preceeding argument in arg list", 118 stop("Comma without preceding argument in arg list",
119 EX_DATAERR); 119 EX_DATAERR);
120 /* NOTREACHED */ 120 /* NOTREACHED */
121 } 121 }
diff --git a/drivers/scsi/aic7xxx_old.c b/drivers/scsi/aic7xxx_old.c
index 4ff60a08df0f..5b212f0df898 100644
--- a/drivers/scsi/aic7xxx_old.c
+++ b/drivers/scsi/aic7xxx_old.c
@@ -905,7 +905,7 @@ struct aic_dev_data {
905 * problems with architectures I can't test on (because I don't have one, 905 * problems with architectures I can't test on (because I don't have one,
906 * such as the Alpha based systems) which happen to give faults for 906 * such as the Alpha based systems) which happen to give faults for
907 * non-aligned memory accesses, care was taken to align this structure 907 * non-aligned memory accesses, care was taken to align this structure
908 * in a way that gauranteed all accesses larger than 8 bits were aligned 908 * in a way that guaranteed all accesses larger than 8 bits were aligned
909 * on the appropriate boundary. It's also organized to try and be more 909 * on the appropriate boundary. It's also organized to try and be more
910 * cache line efficient. Be careful when changing this lest you might hurt 910 * cache line efficient. Be careful when changing this lest you might hurt
911 * overall performance and bring down the wrath of the masses. 911 * overall performance and bring down the wrath of the masses.
@@ -1180,7 +1180,7 @@ static int aic7xxx_pci_parity = 0;
1180 * the card's registers in a hex dump format tailored to each model of 1180 * the card's registers in a hex dump format tailored to each model of
1181 * controller. 1181 * controller.
1182 * 1182 *
1183 * NOTE: THE CONTROLLER IS LEFT IN AN UNUSEABLE STATE BY THIS OPTION. 1183 * NOTE: THE CONTROLLER IS LEFT IN AN UNUSABLE STATE BY THIS OPTION.
1184 * YOU CANNOT BOOT UP WITH THIS OPTION, IT IS FOR DEBUGGING PURPOSES 1184 * YOU CANNOT BOOT UP WITH THIS OPTION, IT IS FOR DEBUGGING PURPOSES
1185 * ONLY 1185 * ONLY
1186 */ 1186 */
@@ -3467,7 +3467,7 @@ aic7xxx_reset_current_bus(struct aic7xxx_host *p)
3467 /* Turn off the bus' current operations, after all, we shouldn't have any 3467 /* Turn off the bus' current operations, after all, we shouldn't have any
3468 * valid commands left to cause a RSELI and SELO once we've tossed the 3468 * valid commands left to cause a RSELI and SELO once we've tossed the
3469 * bus away with this reset, so we might as well shut down the sequencer 3469 * bus away with this reset, so we might as well shut down the sequencer
3470 * until the bus is restarted as oppossed to saving the current settings 3470 * until the bus is restarted as opposed to saving the current settings
3471 * and restoring them (which makes no sense to me). */ 3471 * and restoring them (which makes no sense to me). */
3472 3472
3473 /* Turn on the bus reset. */ 3473 /* Turn on the bus reset. */
@@ -4070,7 +4070,7 @@ aic7xxx_handle_seqint(struct aic7xxx_host *p, unsigned char intstat)
4070 aic_dev->max_q_depth = aic_dev->temp_q_depth = 1; 4070 aic_dev->max_q_depth = aic_dev->temp_q_depth = 1;
4071 /* 4071 /*
4072 * We set this command up as a bus device reset. However, we have 4072 * We set this command up as a bus device reset. However, we have
4073 * to clear the tag type as it's causing us problems. We shouldnt 4073 * to clear the tag type as it's causing us problems. We shouldn't
4074 * have to worry about any other commands being active, since if 4074 * have to worry about any other commands being active, since if
4075 * the device is refusing tagged commands, this should be the 4075 * the device is refusing tagged commands, this should be the
4076 * first tagged command sent to the device, however, we do have 4076 * first tagged command sent to the device, however, we do have
@@ -9748,7 +9748,7 @@ skip_pci_controller:
9748 } 9748 }
9749 9749
9750 /* 9750 /*
9751 * We are commited now, everything has been checked and this card 9751 * We are committed now, everything has been checked and this card
9752 * has been found, now we just set it up 9752 * has been found, now we just set it up
9753 */ 9753 */
9754 9754
@@ -9906,7 +9906,7 @@ skip_pci_controller:
9906 * 2: All PCI controllers with BIOS_ENABLED next, according to BIOS 9906 * 2: All PCI controllers with BIOS_ENABLED next, according to BIOS
9907 * address, going from lowest to highest. 9907 * address, going from lowest to highest.
9908 * 3: Remaining VLB/EISA controllers going in slot order. 9908 * 3: Remaining VLB/EISA controllers going in slot order.
9909 * 4: Remaining PCI controllers, going in PCI device order (reversable) 9909 * 4: Remaining PCI controllers, going in PCI device order (reversible)
9910 */ 9910 */
9911 9911
9912 { 9912 {
diff --git a/drivers/scsi/aic7xxx_old/aic7xxx.seq b/drivers/scsi/aic7xxx_old/aic7xxx.seq
index 1565be9ebd49..823ff2873229 100644
--- a/drivers/scsi/aic7xxx_old/aic7xxx.seq
+++ b/drivers/scsi/aic7xxx_old/aic7xxx.seq
@@ -51,7 +51,7 @@
51 * use byte 27 of the SCB as a pseudo-next pointer and to thread a list 51 * use byte 27 of the SCB as a pseudo-next pointer and to thread a list
52 * of SCBs that are awaiting selection. Since 0-0xfe are valid SCB indexes, 52 * of SCBs that are awaiting selection. Since 0-0xfe are valid SCB indexes,
53 * SCB_LIST_NULL is 0xff which is out of range. An entry is also added to 53 * SCB_LIST_NULL is 0xff which is out of range. An entry is also added to
54 * this list everytime a request sense occurs or after completing a non-tagged 54 * this list every time a request sense occurs or after completing a non-tagged
55 * command for which a second SCB has been queued. The sequencer will 55 * command for which a second SCB has been queued. The sequencer will
56 * automatically consume the entries. 56 * automatically consume the entries.
57 */ 57 */
@@ -696,7 +696,7 @@ p_status:
696 * This is done to allow the hsot to send messages outside of an identify 696 * This is done to allow the hsot to send messages outside of an identify
697 * sequence while protecting the seqencer from testing the MK_MESSAGE bit 697 * sequence while protecting the seqencer from testing the MK_MESSAGE bit
698 * on an SCB that might not be for the current nexus. (For example, a 698 * on an SCB that might not be for the current nexus. (For example, a
699 * BDR message in responce to a bad reselection would leave us pointed to 699 * BDR message in response to a bad reselection would leave us pointed to
700 * an SCB that doesn't have anything to do with the current target). 700 * an SCB that doesn't have anything to do with the current target).
701 * Otherwise, treat MSG_OUT as a 1 byte message to send (abort, abort tag, 701 * Otherwise, treat MSG_OUT as a 1 byte message to send (abort, abort tag,
702 * bus device reset). 702 * bus device reset).
@@ -716,8 +716,8 @@ p_mesgout_identify:
716 } else { 716 } else {
717 and SINDEX,0x7,SCB_TCL; /* lun */ 717 and SINDEX,0x7,SCB_TCL; /* lun */
718 } 718 }
719 and A,DISCENB,SCB_CONTROL; /* mask off disconnect privledge */ 719 and A,DISCENB,SCB_CONTROL; /* mask off disconnect privilege */
720 or SINDEX,A; /* or in disconnect privledge */ 720 or SINDEX,A; /* or in disconnect privilege */
721 or SINDEX,MSG_IDENTIFYFLAG; 721 or SINDEX,MSG_IDENTIFYFLAG;
722p_mesgout_mk_message: 722p_mesgout_mk_message:
723 test SCB_CONTROL,MK_MESSAGE jz p_mesgout_tag; 723 test SCB_CONTROL,MK_MESSAGE jz p_mesgout_tag;
diff --git a/drivers/scsi/aic94xx/aic94xx_reg_def.h b/drivers/scsi/aic94xx/aic94xx_reg_def.h
index 40273a747d29..dd6cc8008b16 100644
--- a/drivers/scsi/aic94xx/aic94xx_reg_def.h
+++ b/drivers/scsi/aic94xx/aic94xx_reg_def.h
@@ -2134,7 +2134,7 @@
2134* The host accesses this scratch in a different manner from the 2134* The host accesses this scratch in a different manner from the
2135* link sequencer. The sequencer has to use LSEQ registers 2135* link sequencer. The sequencer has to use LSEQ registers
2136* LmSCRPAGE and LmMnSCRPAGE to access the scratch memory. A flat 2136* LmSCRPAGE and LmMnSCRPAGE to access the scratch memory. A flat
2137* mapping of the scratch memory is avaliable for software 2137* mapping of the scratch memory is available for software
2138* convenience and to prevent corruption while the sequencer is 2138* convenience and to prevent corruption while the sequencer is
2139* running. This memory is mapped onto addresses 800h - 9FFh. 2139* running. This memory is mapped onto addresses 800h - 9FFh.
2140* 2140*
diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c
index ec166726b314..c454e44cf51c 100644
--- a/drivers/scsi/arm/acornscsi.c
+++ b/drivers/scsi/arm/acornscsi.c
@@ -100,7 +100,7 @@
100 */ 100 */
101#define TIMEOUT_TIME 10 101#define TIMEOUT_TIME 10
102/* 102/*
103 * Define this if you want to have verbose explaination of SCSI 103 * Define this if you want to have verbose explanation of SCSI
104 * status/messages. 104 * status/messages.
105 */ 105 */
106#undef CONFIG_ACORNSCSI_CONSTANTS 106#undef CONFIG_ACORNSCSI_CONSTANTS
@@ -1561,7 +1561,7 @@ void acornscsi_message(AS_Host *host)
1561 /* 1561 /*
1562 * If we were negociating sync transfer, we don't yet know if 1562 * If we were negociating sync transfer, we don't yet know if
1563 * this REJECT is for the sync transfer or for the tagged queue/wide 1563 * this REJECT is for the sync transfer or for the tagged queue/wide
1564 * transfer. Re-initiate sync transfer negociation now, and if 1564 * transfer. Re-initiate sync transfer negotiation now, and if
1565 * we got a REJECT in response to SDTR, then it'll be set to DONE. 1565 * we got a REJECT in response to SDTR, then it'll be set to DONE.
1566 */ 1566 */
1567 if (host->device[host->SCpnt->device->id].sync_state == SYNC_SENT_REQUEST) 1567 if (host->device[host->SCpnt->device->id].sync_state == SYNC_SENT_REQUEST)
diff --git a/drivers/scsi/arm/acornscsi.h b/drivers/scsi/arm/acornscsi.h
index 8d2172a0b351..01bc715a3aec 100644
--- a/drivers/scsi/arm/acornscsi.h
+++ b/drivers/scsi/arm/acornscsi.h
@@ -223,8 +223,8 @@ typedef enum {
223 * Synchronous transfer state 223 * Synchronous transfer state
224 */ 224 */
225typedef enum { /* Synchronous transfer state */ 225typedef enum { /* Synchronous transfer state */
226 SYNC_ASYNCHRONOUS, /* don't negociate synchronous transfers*/ 226 SYNC_ASYNCHRONOUS, /* don't negotiate synchronous transfers*/
227 SYNC_NEGOCIATE, /* start negociation */ 227 SYNC_NEGOCIATE, /* start negotiation */
228 SYNC_SENT_REQUEST, /* sent SDTR message */ 228 SYNC_SENT_REQUEST, /* sent SDTR message */
229 SYNC_COMPLETED, /* received SDTR reply */ 229 SYNC_COMPLETED, /* received SDTR reply */
230} syncxfer_t; 230} syncxfer_t;
@@ -322,7 +322,7 @@ typedef struct acornscsi_hostdata {
322 /* per-device info */ 322 /* per-device info */
323 struct { 323 struct {
324 unsigned char sync_xfer; /* synchronous transfer (SBIC value) */ 324 unsigned char sync_xfer; /* synchronous transfer (SBIC value) */
325 syncxfer_t sync_state; /* sync xfer negociation state */ 325 syncxfer_t sync_state; /* sync xfer negotiation state */
326 unsigned char disconnect_ok:1; /* device can disconnect */ 326 unsigned char disconnect_ok:1; /* device can disconnect */
327 } device[8]; 327 } device[8];
328 unsigned long busyluns[64 / sizeof(unsigned long)];/* array of bits indicating LUNs busy */ 328 unsigned long busyluns[64 / sizeof(unsigned long)];/* array of bits indicating LUNs busy */
diff --git a/drivers/scsi/arm/arxescsi.c b/drivers/scsi/arm/arxescsi.c
index 2836fe248df9..a750aa72b8ef 100644
--- a/drivers/scsi/arm/arxescsi.c
+++ b/drivers/scsi/arm/arxescsi.c
@@ -228,7 +228,7 @@ static const char *arxescsi_info(struct Scsi_Host *host)
228 * Params : buffer - a buffer to write information to 228 * Params : buffer - a buffer to write information to
229 * start - a pointer into this buffer set by this routine to the start 229 * start - a pointer into this buffer set by this routine to the start
230 * of the required information. 230 * of the required information.
231 * offset - offset into information that we have read upto. 231 * offset - offset into information that we have read up to.
232 * length - length of buffer 232 * length - length of buffer
233 * host_no - host number to return information for 233 * host_no - host number to return information for
234 * inout - 0 for reading, 1 for writing. 234 * inout - 0 for reading, 1 for writing.
diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c
index c9902b5c1f2b..547987b86384 100644
--- a/drivers/scsi/arm/cumana_2.c
+++ b/drivers/scsi/arm/cumana_2.c
@@ -344,7 +344,7 @@ cumanascsi_2_set_proc_info(struct Scsi_Host *host, char *buffer, int length)
344 * Params : buffer - a buffer to write information to 344 * Params : buffer - a buffer to write information to
345 * start - a pointer into this buffer set by this routine to the start 345 * start - a pointer into this buffer set by this routine to the start
346 * of the required information. 346 * of the required information.
347 * offset - offset into information that we have read upto. 347 * offset - offset into information that we have read up to.
348 * length - length of buffer 348 * length - length of buffer
349 * host_no - host number to return information for 349 * host_no - host number to return information for
350 * inout - 0 for reading, 1 for writing. 350 * inout - 0 for reading, 1 for writing.
diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c
index d8435132f461..edfd12b48c28 100644
--- a/drivers/scsi/arm/eesox.c
+++ b/drivers/scsi/arm/eesox.c
@@ -429,7 +429,7 @@ eesoxscsi_set_proc_info(struct Scsi_Host *host, char *buffer, int length)
429 * Params : buffer - a buffer to write information to 429 * Params : buffer - a buffer to write information to
430 * start - a pointer into this buffer set by this routine to the start 430 * start - a pointer into this buffer set by this routine to the start
431 * of the required information. 431 * of the required information.
432 * offset - offset into information that we have read upto. 432 * offset - offset into information that we have read up to.
433 * length - length of buffer 433 * length - length of buffer
434 * host_no - host number to return information for 434 * host_no - host number to return information for
435 * inout - 0 for reading, 1 for writing. 435 * inout - 0 for reading, 1 for writing.
diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index 2b2ce21e227e..e85c40b6e19b 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -2119,7 +2119,7 @@ request_sense:
2119 * executed, unless a target connects to us. 2119 * executed, unless a target connects to us.
2120 */ 2120 */
2121 if (info->reqSCpnt) 2121 if (info->reqSCpnt)
2122 printk(KERN_WARNING "scsi%d.%c: loosing request command\n", 2122 printk(KERN_WARNING "scsi%d.%c: losing request command\n",
2123 info->host->host_no, '0' + SCpnt->device->id); 2123 info->host->host_no, '0' + SCpnt->device->id);
2124 info->reqSCpnt = SCpnt; 2124 info->reqSCpnt = SCpnt;
2125} 2125}
@@ -2294,7 +2294,7 @@ static int fas216_noqueue_command_lck(struct scsi_cmnd *SCpnt,
2294 * If we don't have an IRQ, then we must poll the card for 2294 * If we don't have an IRQ, then we must poll the card for
2295 * it's interrupt, and use that to call this driver's 2295 * it's interrupt, and use that to call this driver's
2296 * interrupt routine. That way, we keep the command 2296 * interrupt routine. That way, we keep the command
2297 * progressing. Maybe we can add some inteligence here 2297 * progressing. Maybe we can add some intelligence here
2298 * and go to sleep if we know that the device is going 2298 * and go to sleep if we know that the device is going
2299 * to be some time (eg, disconnected). 2299 * to be some time (eg, disconnected).
2300 */ 2300 */
diff --git a/drivers/scsi/arm/fas216.h b/drivers/scsi/arm/fas216.h
index f30f8d659dc4..84b7127c0121 100644
--- a/drivers/scsi/arm/fas216.h
+++ b/drivers/scsi/arm/fas216.h
@@ -203,11 +203,11 @@ typedef enum {
203} fasdmatype_t; 203} fasdmatype_t;
204 204
205typedef enum { 205typedef enum {
206 neg_wait, /* Negociate with device */ 206 neg_wait, /* Negotiate with device */
207 neg_inprogress, /* Negociation sent */ 207 neg_inprogress, /* Negotiation sent */
208 neg_complete, /* Negociation complete */ 208 neg_complete, /* Negotiation complete */
209 neg_targcomplete, /* Target completed negociation */ 209 neg_targcomplete, /* Target completed negotiation */
210 neg_invalid /* Negociation not supported */ 210 neg_invalid /* Negotiation not supported */
211} neg_t; 211} neg_t;
212 212
213#define MAGIC 0x441296bdUL 213#define MAGIC 0x441296bdUL
diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c
index e2297b4c1b9e..9274c0677b9c 100644
--- a/drivers/scsi/arm/powertec.c
+++ b/drivers/scsi/arm/powertec.c
@@ -232,7 +232,7 @@ powertecscsi_set_proc_info(struct Scsi_Host *host, char *buffer, int length)
232 * Params : buffer - a buffer to write information to 232 * Params : buffer - a buffer to write information to
233 * start - a pointer into this buffer set by this routine to the start 233 * start - a pointer into this buffer set by this routine to the start
234 * of the required information. 234 * of the required information.
235 * offset - offset into information that we have read upto. 235 * offset - offset into information that we have read up to.
236 * length - length of buffer 236 * length - length of buffer
237 * inout - 0 for reading, 1 for writing. 237 * inout - 0 for reading, 1 for writing.
238 * Returns : length of data written to buffer. 238 * Returns : length of data written to buffer.
diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c
index 88b2928b4d3b..ea439f93ed81 100644
--- a/drivers/scsi/atari_NCR5380.c
+++ b/drivers/scsi/atari_NCR5380.c
@@ -464,7 +464,7 @@ static void free_all_tags(void)
464 * 464 *
465 * Parameters: Scsi_Cmnd *cmd 465 * Parameters: Scsi_Cmnd *cmd
466 * The command to work on. The first scatter buffer's data are 466 * The command to work on. The first scatter buffer's data are
467 * assumed to be already transfered into ptr/this_residual. 467 * assumed to be already transferred into ptr/this_residual.
468 */ 468 */
469 469
470static void merge_contiguous_buffers(Scsi_Cmnd *cmd) 470static void merge_contiguous_buffers(Scsi_Cmnd *cmd)
@@ -1720,7 +1720,7 @@ static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd *cmd, int tag)
1720 * bytes to transfer, **data - pointer to data pointer. 1720 * bytes to transfer, **data - pointer to data pointer.
1721 * 1721 *
1722 * Returns : -1 when different phase is entered without transferring 1722 * Returns : -1 when different phase is entered without transferring
1723 * maximum number of bytes, 0 if all bytes are transfered or exit 1723 * maximum number of bytes, 0 if all bytes are transferred or exit
1724 * is in same phase. 1724 * is in same phase.
1725 * 1725 *
1726 * Also, *phase, *count, *data are modified in place. 1726 * Also, *phase, *count, *data are modified in place.
@@ -1911,7 +1911,7 @@ static int do_abort(struct Scsi_Host *host)
1911 * bytes to transfer, **data - pointer to data pointer. 1911 * bytes to transfer, **data - pointer to data pointer.
1912 * 1912 *
1913 * Returns : -1 when different phase is entered without transferring 1913 * Returns : -1 when different phase is entered without transferring
1914 * maximum number of bytes, 0 if all bytes or transfered or exit 1914 * maximum number of bytes, 0 if all bytes or transferred or exit
1915 * is in same phase. 1915 * is in same phase.
1916 * 1916 *
1917 * Also, *phase, *count, *data are modified in place. 1917 * Also, *phase, *count, *data are modified in place.
diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c
index 76029d570beb..7e6eca4a125e 100644
--- a/drivers/scsi/atp870u.c
+++ b/drivers/scsi/atp870u.c
@@ -1228,7 +1228,7 @@ TCM_5: /* isolation complete.. */
1228 printk(" \n%x %x %x %s\n ",assignid_map,mbuf[0],mbuf[1],&mbuf[2]); */ 1228 printk(" \n%x %x %x %s\n ",assignid_map,mbuf[0],mbuf[1],&mbuf[2]); */
1229 i = 15; 1229 i = 15;
1230 j = mbuf[0]; 1230 j = mbuf[0];
1231 if ((j & 0x20) != 0) { /* bit5=1:ID upto 7 */ 1231 if ((j & 0x20) != 0) { /* bit5=1:ID up to 7 */
1232 i = 7; 1232 i = 7;
1233 } 1233 }
1234 if ((j & 0x06) == 0) { /* IDvalid? */ 1234 if ((j & 0x06) == 0) { /* IDvalid? */
diff --git a/drivers/scsi/be2iscsi/be_cmds.h b/drivers/scsi/be2iscsi/be_cmds.h
index 5218de4ab35a..fbd1dc2c15f7 100644
--- a/drivers/scsi/be2iscsi/be_cmds.h
+++ b/drivers/scsi/be2iscsi/be_cmds.h
@@ -877,7 +877,7 @@ struct be_all_if_id {
877 */ 877 */
878#define CXN_KILLED_PDU_SIZE_EXCEEDS_DSL 3 /* Connection got invalidated 878#define CXN_KILLED_PDU_SIZE_EXCEEDS_DSL 3 /* Connection got invalidated
879 * internally 879 * internally
880 * due to a recieved PDU 880 * due to a received PDU
881 * size > DSL 881 * size > DSL
882 */ 882 */
883#define CXN_KILLED_BURST_LEN_MISMATCH 4 /* Connection got invalidated 883#define CXN_KILLED_BURST_LEN_MISMATCH 4 /* Connection got invalidated
@@ -886,7 +886,7 @@ struct be_all_if_id {
886 * FBL/MBL. 886 * FBL/MBL.
887 */ 887 */
888#define CXN_KILLED_AHS_RCVD 5 /* Connection got invalidated 888#define CXN_KILLED_AHS_RCVD 5 /* Connection got invalidated
889 * internally due to a recieved 889 * internally due to a received
890 * PDU Hdr that has 890 * PDU Hdr that has
891 * AHS */ 891 * AHS */
892#define CXN_KILLED_HDR_DIGEST_ERR 6 /* Connection got invalidated 892#define CXN_KILLED_HDR_DIGEST_ERR 6 /* Connection got invalidated
@@ -899,12 +899,12 @@ struct be_all_if_id {
899 * pdu hdr 899 * pdu hdr
900 */ 900 */
901#define CXN_KILLED_STALE_ITT_TTT_RCVD 8 /* Connection got invalidated 901#define CXN_KILLED_STALE_ITT_TTT_RCVD 8 /* Connection got invalidated
902 * internally due to a recieved 902 * internally due to a received
903 * ITT/TTT that does not belong 903 * ITT/TTT that does not belong
904 * to this Connection 904 * to this Connection
905 */ 905 */
906#define CXN_KILLED_INVALID_ITT_TTT_RCVD 9 /* Connection got invalidated 906#define CXN_KILLED_INVALID_ITT_TTT_RCVD 9 /* Connection got invalidated
907 * internally due to recieved 907 * internally due to received
908 * ITT/TTT value > Max 908 * ITT/TTT value > Max
909 * Supported ITTs/TTTs 909 * Supported ITTs/TTTs
910 */ 910 */
@@ -936,21 +936,21 @@ struct be_all_if_id {
936 * index. 936 * index.
937 */ 937 */
938#define CXN_KILLED_OVER_RUN_RESIDUAL 16 /* Command got invalidated 938#define CXN_KILLED_OVER_RUN_RESIDUAL 16 /* Command got invalidated
939 * internally due to recived 939 * internally due to received
940 * command has residual 940 * command has residual
941 * over run bytes. 941 * over run bytes.
942 */ 942 */
943#define CXN_KILLED_UNDER_RUN_RESIDUAL 17 /* Command got invalidated 943#define CXN_KILLED_UNDER_RUN_RESIDUAL 17 /* Command got invalidated
944 * internally due to recived 944 * internally due to received
945 * command has residual under 945 * command has residual under
946 * run bytes. 946 * run bytes.
947 */ 947 */
948#define CMD_KILLED_INVALID_STATSN_RCVD 18 /* Command got invalidated 948#define CMD_KILLED_INVALID_STATSN_RCVD 18 /* Command got invalidated
949 * internally due to a recieved 949 * internally due to a received
950 * PDU has an invalid StatusSN 950 * PDU has an invalid StatusSN
951 */ 951 */
952#define CMD_KILLED_INVALID_R2T_RCVD 19 /* Command got invalidated 952#define CMD_KILLED_INVALID_R2T_RCVD 19 /* Command got invalidated
953 * internally due to a recieved 953 * internally due to a received
954 * an R2T with some invalid 954 * an R2T with some invalid
955 * fields in it 955 * fields in it
956 */ 956 */
@@ -973,7 +973,7 @@ struct be_all_if_id {
973 */ 973 */
974#define CMD_CXN_KILLED_INVALID_DATASN_RCVD 24 /* Command got invalidated 974#define CMD_CXN_KILLED_INVALID_DATASN_RCVD 24 /* Command got invalidated
975 * internally due to a 975 * internally due to a
976 * recieved PDU has an invalid 976 * received PDU has an invalid
977 * DataSN 977 * DataSN
978 */ 978 */
979#define CXN_INVALIDATE_NOTIFY 25 /* Connection invalidation 979#define CXN_INVALIDATE_NOTIFY 25 /* Connection invalidation
diff --git a/drivers/scsi/bfa/bfa_core.c b/drivers/scsi/bfa/bfa_core.c
index 1cd5c8b0618d..91838c51fb76 100644
--- a/drivers/scsi/bfa/bfa_core.c
+++ b/drivers/scsi/bfa/bfa_core.c
@@ -355,7 +355,7 @@ bfa_msix_lpu_err(struct bfa_s *bfa, int vec)
355 /* 355 /*
356 * ERR_PSS bit needs to be cleared as well in case 356 * ERR_PSS bit needs to be cleared as well in case
357 * interrups are shared so driver's interrupt handler is 357 * interrups are shared so driver's interrupt handler is
358 * still called eventhough it is already masked out. 358 * still called even though it is already masked out.
359 */ 359 */
360 curr_value = readl( 360 curr_value = readl(
361 bfa->ioc.ioc_regs.pss_err_status_reg); 361 bfa->ioc.ioc_regs.pss_err_status_reg);
diff --git a/drivers/scsi/bfa/bfa_defs_svc.h b/drivers/scsi/bfa/bfa_defs_svc.h
index 648c84176722..207f598877c7 100644
--- a/drivers/scsi/bfa/bfa_defs_svc.h
+++ b/drivers/scsi/bfa/bfa_defs_svc.h
@@ -145,7 +145,7 @@ struct bfa_fw_io_stats_s {
145 u32 ioh_data_oor_event; /* Data out of range */ 145 u32 ioh_data_oor_event; /* Data out of range */
146 u32 ioh_ro_ooo_event; /* Relative offset out of range */ 146 u32 ioh_ro_ooo_event; /* Relative offset out of range */
147 u32 ioh_cpu_owned_event; /* IOH hit -iost owned by f/w */ 147 u32 ioh_cpu_owned_event; /* IOH hit -iost owned by f/w */
148 u32 ioh_unexp_frame_event; /* unexpected frame recieved 148 u32 ioh_unexp_frame_event; /* unexpected frame received
149 * count */ 149 * count */
150 u32 ioh_err_int; /* IOH error int during data-phase 150 u32 ioh_err_int; /* IOH error int during data-phase
151 * for scsi write 151 * for scsi write
@@ -566,8 +566,8 @@ struct bfa_itnim_iostats_s {
566 u32 input_reqs; /* Data in-bound requests */ 566 u32 input_reqs; /* Data in-bound requests */
567 u32 output_reqs; /* Data out-bound requests */ 567 u32 output_reqs; /* Data out-bound requests */
568 u32 io_comps; /* Total IO Completions */ 568 u32 io_comps; /* Total IO Completions */
569 u32 wr_throughput; /* Write data transfered in bytes */ 569 u32 wr_throughput; /* Write data transferred in bytes */
570 u32 rd_throughput; /* Read data transfered in bytes */ 570 u32 rd_throughput; /* Read data transferred in bytes */
571 571
572 u32 iocomp_ok; /* Slowpath IO completions */ 572 u32 iocomp_ok; /* Slowpath IO completions */
573 u32 iocomp_underrun; /* IO underrun */ 573 u32 iocomp_underrun; /* IO underrun */
diff --git a/drivers/scsi/bfa/bfa_fc.h b/drivers/scsi/bfa/bfa_fc.h
index 8e764fae8dc9..bf0067e0fd0d 100644
--- a/drivers/scsi/bfa/bfa_fc.h
+++ b/drivers/scsi/bfa/bfa_fc.h
@@ -315,7 +315,7 @@ struct fc_plogi_csp_s {
315 query_dbc:1, 315 query_dbc:1,
316 hg_supp:1; 316 hg_supp:1;
317#endif 317#endif
318 __be16 rxsz; /* recieve data_field size */ 318 __be16 rxsz; /* receive data_field size */
319 __be16 conseq; 319 __be16 conseq;
320 __be16 ro_bitmap; 320 __be16 ro_bitmap;
321 __be32 e_d_tov; 321 __be32 e_d_tov;
diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
index f674f9318629..9b43ca4b6778 100644
--- a/drivers/scsi/bfa/bfa_fcs.c
+++ b/drivers/scsi/bfa/bfa_fcs.c
@@ -1033,7 +1033,7 @@ bfa_fcs_fabric_delvport(struct bfa_fcs_fabric_s *fabric,
1033 1033
1034 1034
1035/* 1035/*
1036 * Lookup for a vport withing a fabric given its pwwn 1036 * Lookup for a vport within a fabric given its pwwn
1037 */ 1037 */
1038struct bfa_fcs_vport_s * 1038struct bfa_fcs_vport_s *
1039bfa_fcs_fabric_vport_lookup(struct bfa_fcs_fabric_s *fabric, wwn_t pwwn) 1039bfa_fcs_fabric_vport_lookup(struct bfa_fcs_fabric_s *fabric, wwn_t pwwn)
diff --git a/drivers/scsi/bfa/bfa_fcs.h b/drivers/scsi/bfa/bfa_fcs.h
index 0fd63168573f..61cdce4bd913 100644
--- a/drivers/scsi/bfa/bfa_fcs.h
+++ b/drivers/scsi/bfa/bfa_fcs.h
@@ -705,7 +705,7 @@ enum rport_event {
705 RPSM_EVENT_ADDRESS_CHANGE = 15, /* Rport's PID has changed */ 705 RPSM_EVENT_ADDRESS_CHANGE = 15, /* Rport's PID has changed */
706 RPSM_EVENT_ADDRESS_DISC = 16, /* Need to Discover rport's PID */ 706 RPSM_EVENT_ADDRESS_DISC = 16, /* Need to Discover rport's PID */
707 RPSM_EVENT_PRLO_RCVD = 17, /* PRLO from remote device */ 707 RPSM_EVENT_PRLO_RCVD = 17, /* PRLO from remote device */
708 RPSM_EVENT_PLOGI_RETRY = 18, /* Retry PLOGI continously */ 708 RPSM_EVENT_PLOGI_RETRY = 18, /* Retry PLOGI continuously */
709}; 709};
710 710
711/* 711/*
diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
index 43fa986bb586..1d6be8c14473 100644
--- a/drivers/scsi/bfa/bfa_fcs_lport.c
+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
@@ -1149,7 +1149,7 @@ bfa_fcs_lport_fdmi_sm_offline(struct bfa_fcs_lport_fdmi_s *fdmi,
1149 } else { 1149 } else {
1150 /* 1150 /*
1151 * For a base port, we should first register the HBA 1151 * For a base port, we should first register the HBA
1152 * atribute. The HBA attribute also contains the base 1152 * attribute. The HBA attribute also contains the base
1153 * port registration. 1153 * port registration.
1154 */ 1154 */
1155 bfa_sm_set_state(fdmi, 1155 bfa_sm_set_state(fdmi,
diff --git a/drivers/scsi/bfa/bfa_svc.c b/drivers/scsi/bfa/bfa_svc.c
index 1d34921f88bf..16d9a5f61c18 100644
--- a/drivers/scsi/bfa/bfa_svc.c
+++ b/drivers/scsi/bfa/bfa_svc.c
@@ -1035,7 +1035,7 @@ bfa_fcxp_free(struct bfa_fcxp_s *fcxp)
1035 * @param[in] rport BFA rport pointer. Could be left NULL for WKA rports 1035 * @param[in] rport BFA rport pointer. Could be left NULL for WKA rports
1036 * @param[in] vf_id virtual Fabric ID 1036 * @param[in] vf_id virtual Fabric ID
1037 * @param[in] lp_tag lport tag 1037 * @param[in] lp_tag lport tag
1038 * @param[in] cts use Continous sequence 1038 * @param[in] cts use Continuous sequence
1039 * @param[in] cos fc Class of Service 1039 * @param[in] cos fc Class of Service
1040 * @param[in] reqlen request length, does not include FCHS length 1040 * @param[in] reqlen request length, does not include FCHS length
1041 * @param[in] fchs fc Header Pointer. The header content will be copied 1041 * @param[in] fchs fc Header Pointer. The header content will be copied
@@ -5022,7 +5022,7 @@ bfa_uf_start(struct bfa_s *bfa)
5022} 5022}
5023 5023
5024/* 5024/*
5025 * Register handler for all unsolicted recieve frames. 5025 * Register handler for all unsolicted receive frames.
5026 * 5026 *
5027 * @param[in] bfa BFA instance 5027 * @param[in] bfa BFA instance
5028 * @param[in] ufrecv receive handler function 5028 * @param[in] ufrecv receive handler function
diff --git a/drivers/scsi/bfa/bfa_svc.h b/drivers/scsi/bfa/bfa_svc.h
index 331ad992a581..5902a45c080f 100644
--- a/drivers/scsi/bfa/bfa_svc.h
+++ b/drivers/scsi/bfa/bfa_svc.h
@@ -127,7 +127,7 @@ struct bfa_fcxp_req_info_s {
127 * rport nexus is established 127 * rport nexus is established
128 */ 128 */
129 struct fchs_s fchs; /* request FC header structure */ 129 struct fchs_s fchs; /* request FC header structure */
130 u8 cts; /* continous sequence */ 130 u8 cts; /* continuous sequence */
131 u8 class; /* FC class for the request/response */ 131 u8 class; /* FC class for the request/response */
132 u16 max_frmsz; /* max send frame size */ 132 u16 max_frmsz; /* max send frame size */
133 u16 vf_id; /* vsan tag if applicable */ 133 u16 vf_id; /* vsan tag if applicable */
diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c
index 44524cf55d33..0fd510a01561 100644
--- a/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
@@ -1278,7 +1278,7 @@ bfad_setup_intr(struct bfad_s *bfad)
1278 * interrupts into one vector, so even if we 1278 * interrupts into one vector, so even if we
1279 * can try to request less vectors, we don't 1279 * can try to request less vectors, we don't
1280 * know how to associate interrupt events to 1280 * know how to associate interrupt events to
1281 * vectors. Linux doesn't dupicate vectors 1281 * vectors. Linux doesn't duplicate vectors
1282 * in the MSIX table for this case. 1282 * in the MSIX table for this case.
1283 */ 1283 */
1284 1284
diff --git a/drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h b/drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h
index 69d031d98469..97a61b4d81b7 100644
--- a/drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h
+++ b/drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h
@@ -898,7 +898,7 @@ struct fcoe_confqe {
898 898
899 899
900/* 900/*
901 * FCoE conection data base 901 * FCoE connection data base
902 */ 902 */
903struct fcoe_conn_db { 903struct fcoe_conn_db {
904#if defined(__BIG_ENDIAN) 904#if defined(__BIG_ENDIAN)
diff --git a/drivers/scsi/bnx2fc/bnx2fc_els.c b/drivers/scsi/bnx2fc/bnx2fc_els.c
index 7a11a255157f..52c358427ce2 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_els.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_els.c
@@ -397,7 +397,7 @@ void bnx2fc_process_els_compl(struct bnx2fc_cmd *els_req,
397 &els_req->req_flags)) { 397 &els_req->req_flags)) {
398 BNX2FC_ELS_DBG("Timer context finished processing this " 398 BNX2FC_ELS_DBG("Timer context finished processing this "
399 "els - 0x%x\n", els_req->xid); 399 "els - 0x%x\n", els_req->xid);
400 /* This IO doesnt receive cleanup completion */ 400 /* This IO doesn't receive cleanup completion */
401 kref_put(&els_req->refcount, bnx2fc_cmd_release); 401 kref_put(&els_req->refcount, bnx2fc_cmd_release);
402 return; 402 return;
403 } 403 }
diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index d3fc302c241a..1decefbf32e3 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -1273,7 +1273,7 @@ static void bnx2fc_lun_reset_cmpl(struct bnx2fc_cmd *io_req)
1273 bnx2fc_cmd_release); 1273 bnx2fc_cmd_release);
1274 /* timer hold */ 1274 /* timer hold */
1275 rc = bnx2fc_initiate_abts(cmd); 1275 rc = bnx2fc_initiate_abts(cmd);
1276 /* abts shouldnt fail in this context */ 1276 /* abts shouldn't fail in this context */
1277 WARN_ON(rc != SUCCESS); 1277 WARN_ON(rc != SUCCESS);
1278 } else 1278 } else
1279 printk(KERN_ERR PFX "lun_rst: abts already in" 1279 printk(KERN_ERR PFX "lun_rst: abts already in"
@@ -1308,7 +1308,7 @@ static void bnx2fc_tgt_reset_cmpl(struct bnx2fc_cmd *io_req)
1308 kref_put(&io_req->refcount, 1308 kref_put(&io_req->refcount,
1309 bnx2fc_cmd_release); /* timer hold */ 1309 bnx2fc_cmd_release); /* timer hold */
1310 rc = bnx2fc_initiate_abts(cmd); 1310 rc = bnx2fc_initiate_abts(cmd);
1311 /* abts shouldnt fail in this context */ 1311 /* abts shouldn't fail in this context */
1312 WARN_ON(rc != SUCCESS); 1312 WARN_ON(rc != SUCCESS);
1313 1313
1314 } else 1314 } else
diff --git a/drivers/scsi/bnx2fc/bnx2fc_tgt.c b/drivers/scsi/bnx2fc/bnx2fc_tgt.c
index 7cc05e4e82d5..a2e3830bd268 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_tgt.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_tgt.c
@@ -395,7 +395,7 @@ void bnx2fc_rport_event_handler(struct fc_lport *lport,
395 rp = rport->dd_data; 395 rp = rport->dd_data;
396 if (rport->port_id == FC_FID_DIR_SERV) { 396 if (rport->port_id == FC_FID_DIR_SERV) {
397 /* 397 /*
398 * bnx2fc_rport structure doesnt exist for 398 * bnx2fc_rport structure doesn't exist for
399 * directory server. 399 * directory server.
400 * We should not come here, as lport will 400 * We should not come here, as lport will
401 * take care of fabric login 401 * take care of fabric login
diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c
index 1da34c019b8a..f0b89513faed 100644
--- a/drivers/scsi/bnx2i/bnx2i_hwi.c
+++ b/drivers/scsi/bnx2i/bnx2i_hwi.c
@@ -173,7 +173,7 @@ void bnx2i_arm_cq_event_coalescing(struct bnx2i_endpoint *ep, u8 action)
173 173
174/** 174/**
175 * bnx2i_get_rq_buf - copy RQ buffer contents to driver buffer 175 * bnx2i_get_rq_buf - copy RQ buffer contents to driver buffer
176 * @conn: iscsi connection on which RQ event occured 176 * @conn: iscsi connection on which RQ event occurred
177 * @ptr: driver buffer to which RQ buffer contents is to 177 * @ptr: driver buffer to which RQ buffer contents is to
178 * be copied 178 * be copied
179 * @len: length of valid data inside RQ buf 179 * @len: length of valid data inside RQ buf
diff --git a/drivers/scsi/cxgbi/libcxgbi.h b/drivers/scsi/cxgbi/libcxgbi.h
index 0a20fd5f7102..9267844519c9 100644
--- a/drivers/scsi/cxgbi/libcxgbi.h
+++ b/drivers/scsi/cxgbi/libcxgbi.h
@@ -262,9 +262,9 @@ struct cxgbi_skb_tx_cb {
262enum cxgbi_skcb_flags { 262enum cxgbi_skcb_flags {
263 SKCBF_TX_NEED_HDR, /* packet needs a header */ 263 SKCBF_TX_NEED_HDR, /* packet needs a header */
264 SKCBF_RX_COALESCED, /* received whole pdu */ 264 SKCBF_RX_COALESCED, /* received whole pdu */
265 SKCBF_RX_HDR, /* recieved pdu header */ 265 SKCBF_RX_HDR, /* received pdu header */
266 SKCBF_RX_DATA, /* recieved pdu payload */ 266 SKCBF_RX_DATA, /* received pdu payload */
267 SKCBF_RX_STATUS, /* recieved ddp status */ 267 SKCBF_RX_STATUS, /* received ddp status */
268 SKCBF_RX_DATA_DDPD, /* pdu payload ddp'd */ 268 SKCBF_RX_DATA_DDPD, /* pdu payload ddp'd */
269 SKCBF_RX_HCRC_ERR, /* header digest error */ 269 SKCBF_RX_HCRC_ERR, /* header digest error */
270 SKCBF_RX_DCRC_ERR, /* data digest error */ 270 SKCBF_RX_DCRC_ERR, /* data digest error */
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c
index b0f8523e665f..b10b3841535c 100644
--- a/drivers/scsi/dc395x.c
+++ b/drivers/scsi/dc395x.c
@@ -235,7 +235,7 @@ struct ScsiReqBlk {
235 235
236 u8 sg_count; /* No of HW sg entries for this request */ 236 u8 sg_count; /* No of HW sg entries for this request */
237 u8 sg_index; /* Index of HW sg entry for this request */ 237 u8 sg_index; /* Index of HW sg entry for this request */
238 size_t total_xfer_length; /* Total number of bytes remaining to be transfered */ 238 size_t total_xfer_length; /* Total number of bytes remaining to be transferred */
239 size_t request_length; /* Total number of bytes in this request */ 239 size_t request_length; /* Total number of bytes in this request */
240 /* 240 /*
241 * The sense buffer handling function, request_sense, uses 241 * The sense buffer handling function, request_sense, uses
@@ -1774,7 +1774,7 @@ static void dc395x_handle_interrupt(struct AdapterCtlBlk *acb,
1774 dc395x_statev(acb, srb, &scsi_status); 1774 dc395x_statev(acb, srb, &scsi_status);
1775 1775
1776 /* 1776 /*
1777 * if there were any exception occured scsi_status 1777 * if there were any exception occurred scsi_status
1778 * will be modify to bus free phase new scsi_status 1778 * will be modify to bus free phase new scsi_status
1779 * transfer out from ... previous dc395x_statev 1779 * transfer out from ... previous dc395x_statev
1780 */ 1780 */
@@ -1954,11 +1954,11 @@ static void sg_verify_length(struct ScsiReqBlk *srb)
1954static void sg_update_list(struct ScsiReqBlk *srb, u32 left) 1954static void sg_update_list(struct ScsiReqBlk *srb, u32 left)
1955{ 1955{
1956 u8 idx; 1956 u8 idx;
1957 u32 xferred = srb->total_xfer_length - left; /* bytes transfered */ 1957 u32 xferred = srb->total_xfer_length - left; /* bytes transferred */
1958 struct SGentry *psge = srb->segment_x + srb->sg_index; 1958 struct SGentry *psge = srb->segment_x + srb->sg_index;
1959 1959
1960 dprintkdbg(DBG_0, 1960 dprintkdbg(DBG_0,
1961 "sg_update_list: Transfered %i of %i bytes, %i remain\n", 1961 "sg_update_list: Transferred %i of %i bytes, %i remain\n",
1962 xferred, srb->total_xfer_length, left); 1962 xferred, srb->total_xfer_length, left);
1963 if (xferred == 0) { 1963 if (xferred == 0) {
1964 /* nothing to update since we did not transfer any data */ 1964 /* nothing to update since we did not transfer any data */
@@ -1990,7 +1990,7 @@ static void sg_update_list(struct ScsiReqBlk *srb, u32 left)
1990 1990
1991 1991
1992/* 1992/*
1993 * We have transfered a single byte (PIO mode?) and need to update 1993 * We have transferred a single byte (PIO mode?) and need to update
1994 * the count of bytes remaining (total_xfer_length) and update the sg 1994 * the count of bytes remaining (total_xfer_length) and update the sg
1995 * entry to either point to next byte in the current sg entry, or of 1995 * entry to either point to next byte in the current sg entry, or of
1996 * already at the end to point to the start of the next sg entry 1996 * already at the end to point to the start of the next sg entry
@@ -2029,7 +2029,7 @@ static void cleanup_after_transfer(struct AdapterCtlBlk *acb,
2029 2029
2030 2030
2031/* 2031/*
2032 * Those no of bytes will be transfered w/ PIO through the SCSI FIFO 2032 * Those no of bytes will be transferred w/ PIO through the SCSI FIFO
2033 * Seems to be needed for unknown reasons; could be a hardware bug :-( 2033 * Seems to be needed for unknown reasons; could be a hardware bug :-(
2034 */ 2034 */
2035#define DC395x_LASTPIO 4 2035#define DC395x_LASTPIO 4
@@ -2256,7 +2256,7 @@ static void data_in_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb,
2256 DC395x_read32(acb, TRM_S1040_DMA_CXCNT), 2256 DC395x_read32(acb, TRM_S1040_DMA_CXCNT),
2257 srb->total_xfer_length, d_left_counter); 2257 srb->total_xfer_length, d_left_counter);
2258#if DC395x_LASTPIO 2258#if DC395x_LASTPIO
2259 /* KG: Less than or equal to 4 bytes can not be transfered via DMA, it seems. */ 2259 /* KG: Less than or equal to 4 bytes can not be transferred via DMA, it seems. */
2260 if (d_left_counter 2260 if (d_left_counter
2261 && srb->total_xfer_length <= DC395x_LASTPIO) { 2261 && srb->total_xfer_length <= DC395x_LASTPIO) {
2262 size_t left_io = srb->total_xfer_length; 2262 size_t left_io = srb->total_xfer_length;
diff --git a/drivers/scsi/dc395x.h b/drivers/scsi/dc395x.h
index b38360e5fe4f..fbf35e37701e 100644
--- a/drivers/scsi/dc395x.h
+++ b/drivers/scsi/dc395x.h
@@ -617,7 +617,7 @@ struct ScsiInqData
617#define NTC_DO_SEND_START 0x08 /* Send start command SPINUP */ 617#define NTC_DO_SEND_START 0x08 /* Send start command SPINUP */
618#define NTC_DO_DISCONNECT 0x04 /* Enable SCSI disconnect */ 618#define NTC_DO_DISCONNECT 0x04 /* Enable SCSI disconnect */
619#define NTC_DO_SYNC_NEGO 0x02 /* Sync negotiation */ 619#define NTC_DO_SYNC_NEGO 0x02 /* Sync negotiation */
620#define NTC_DO_PARITY_CHK 0x01 /* (it sould define at NAC) */ 620#define NTC_DO_PARITY_CHK 0x01 /* (it should define at NAC) */
621 /* Parity check enable */ 621 /* Parity check enable */
622 622
623/************************************************************************/ 623/************************************************************************/
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
index 7cae0bc85390..42fe52902add 100644
--- a/drivers/scsi/device_handler/scsi_dh_alua.c
+++ b/drivers/scsi/device_handler/scsi_dh_alua.c
@@ -541,7 +541,7 @@ static int alua_check_sense(struct scsi_device *sdev,
541 * 541 *
542 * Evaluate the Target Port Group State. 542 * Evaluate the Target Port Group State.
543 * Returns SCSI_DH_DEV_OFFLINED if the path is 543 * Returns SCSI_DH_DEV_OFFLINED if the path is
544 * found to be unuseable. 544 * found to be unusable.
545 */ 545 */
546static int alua_rtpg(struct scsi_device *sdev, struct alua_dh_data *h) 546static int alua_rtpg(struct scsi_device *sdev, struct alua_dh_data *h)
547{ 547{
@@ -620,7 +620,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_dh_data *h)
620 break; 620 break;
621 case TPGS_STATE_OFFLINE: 621 case TPGS_STATE_OFFLINE:
622 case TPGS_STATE_UNAVAILABLE: 622 case TPGS_STATE_UNAVAILABLE:
623 /* Path unuseable for unavailable/offline */ 623 /* Path unusable for unavailable/offline */
624 err = SCSI_DH_DEV_OFFLINED; 624 err = SCSI_DH_DEV_OFFLINED;
625 break; 625 break;
626 default: 626 default:
diff --git a/drivers/scsi/dpt/sys_info.h b/drivers/scsi/dpt/sys_info.h
index a90c4cb8ea8b..a4aa1c31ff72 100644
--- a/drivers/scsi/dpt/sys_info.h
+++ b/drivers/scsi/dpt/sys_info.h
@@ -79,9 +79,9 @@
79 typedef struct { 79 typedef struct {
80#endif 80#endif
81 81
82 uSHORT cylinders; /* Upto 1024 */ 82 uSHORT cylinders; /* Up to 1024 */
83 uCHAR heads; /* Upto 255 */ 83 uCHAR heads; /* Up to 255 */
84 uCHAR sectors; /* Upto 63 */ 84 uCHAR sectors; /* Up to 63 */
85 85
86#ifdef __cplusplus 86#ifdef __cplusplus
87 87
diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c
index 53925ac178fd..0eb4fe6a4c8a 100644
--- a/drivers/scsi/eata.c
+++ b/drivers/scsi/eata.c
@@ -63,7 +63,7 @@
63 * ep:[y|n] eisa_probe=[1|0] CONFIG_EISA defined 63 * ep:[y|n] eisa_probe=[1|0] CONFIG_EISA defined
64 * pp:[y|n] pci_probe=[1|0] CONFIG_PCI defined 64 * pp:[y|n] pci_probe=[1|0] CONFIG_PCI defined
65 * 65 *
66 * The default action is to perform probing if the corrisponding 66 * The default action is to perform probing if the corresponding
67 * bus is configured and to skip probing otherwise. 67 * bus is configured and to skip probing otherwise.
68 * 68 *
69 * + If pci_probe is in effect and a list of I/O ports is specified 69 * + If pci_probe is in effect and a list of I/O ports is specified
diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c
index c93f007e702f..9d38be2a41f9 100644
--- a/drivers/scsi/fcoe/fcoe_ctlr.c
+++ b/drivers/scsi/fcoe/fcoe_ctlr.c
@@ -656,7 +656,7 @@ int fcoe_ctlr_els_send(struct fcoe_ctlr *fip, struct fc_lport *lport,
656 * If non-FIP, we may have gotten an SID by accepting an FLOGI 656 * If non-FIP, we may have gotten an SID by accepting an FLOGI
657 * from a point-to-point connection. Switch to using 657 * from a point-to-point connection. Switch to using
658 * the source mac based on the SID. The destination 658 * the source mac based on the SID. The destination
659 * MAC in this case would have been set by receving the 659 * MAC in this case would have been set by receiving the
660 * FLOGI. 660 * FLOGI.
661 */ 661 */
662 if (fip->state == FIP_ST_NON_FIP) { 662 if (fip->state == FIP_ST_NON_FIP) {
@@ -1876,7 +1876,7 @@ static void fcoe_ctlr_vn_send(struct fcoe_ctlr *fip,
1876 * fcoe_ctlr_vn_rport_callback - Event handler for rport events. 1876 * fcoe_ctlr_vn_rport_callback - Event handler for rport events.
1877 * @lport: The lport which is receiving the event 1877 * @lport: The lport which is receiving the event
1878 * @rdata: remote port private data 1878 * @rdata: remote port private data
1879 * @event: The event that occured 1879 * @event: The event that occurred
1880 * 1880 *
1881 * Locking Note: The rport lock must not be held when calling this function. 1881 * Locking Note: The rport lock must not be held when calling this function.
1882 */ 1882 */
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c
index 69b7aa54f43f..643f6d500fe7 100644
--- a/drivers/scsi/fdomain.c
+++ b/drivers/scsi/fdomain.c
@@ -174,7 +174,7 @@
174 Future Domain sold DOS BIOS source for $250 and the UN*X driver source was 174 Future Domain sold DOS BIOS source for $250 and the UN*X driver source was
175 $750, but these required a non-disclosure agreement, so even if I could 175 $750, but these required a non-disclosure agreement, so even if I could
176 have afforded them, they would *not* have been useful for writing this 176 have afforded them, they would *not* have been useful for writing this
177 publically distributable driver. Future Domain technical support has 177 publicly distributable driver. Future Domain technical support has
178 provided some information on the phone and have sent a few useful FAXs. 178 provided some information on the phone and have sent a few useful FAXs.
179 They have been much more helpful since they started to recognize that the 179 They have been much more helpful since they started to recognize that the
180 word "Linux" refers to an operating system :-). 180 word "Linux" refers to an operating system :-).
diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c
index 2b48d79bad94..3c53c3478ee7 100644
--- a/drivers/scsi/fnic/fnic_fcs.c
+++ b/drivers/scsi/fnic/fnic_fcs.c
@@ -411,7 +411,7 @@ int fnic_rq_cmpl_handler(struct fnic *fnic, int rq_work_to_do)
411 err = vnic_rq_fill(&fnic->rq[i], fnic_alloc_rq_frame); 411 err = vnic_rq_fill(&fnic->rq[i], fnic_alloc_rq_frame);
412 if (err) 412 if (err)
413 shost_printk(KERN_ERR, fnic->lport->host, 413 shost_printk(KERN_ERR, fnic->lport->host,
414 "fnic_alloc_rq_frame cant alloc" 414 "fnic_alloc_rq_frame can't alloc"
415 " frame\n"); 415 " frame\n");
416 } 416 }
417 tot_rq_work_done += cur_work_done; 417 tot_rq_work_done += cur_work_done;
diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index 22d02404d15f..538b31c2cf58 100644
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -1123,7 +1123,7 @@ void fnic_rport_exch_reset(struct fnic *fnic, u32 port_id)
1123 fc_lun.scsi_lun, io_req)) { 1123 fc_lun.scsi_lun, io_req)) {
1124 /* 1124 /*
1125 * Revert the cmd state back to old state, if 1125 * Revert the cmd state back to old state, if
1126 * it hasnt changed in between. This cmd will get 1126 * it hasn't changed in between. This cmd will get
1127 * aborted later by scsi_eh, or cleaned up during 1127 * aborted later by scsi_eh, or cleaned up during
1128 * lun reset 1128 * lun reset
1129 */ 1129 */
@@ -1208,7 +1208,7 @@ void fnic_terminate_rport_io(struct fc_rport *rport)
1208 fc_lun.scsi_lun, io_req)) { 1208 fc_lun.scsi_lun, io_req)) {
1209 /* 1209 /*
1210 * Revert the cmd state back to old state, if 1210 * Revert the cmd state back to old state, if
1211 * it hasnt changed in between. This cmd will get 1211 * it hasn't changed in between. This cmd will get
1212 * aborted later by scsi_eh, or cleaned up during 1212 * aborted later by scsi_eh, or cleaned up during
1213 * lun reset 1213 * lun reset
1214 */ 1214 */
diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index 427a56d3117e..81182badfeb1 100644
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -566,7 +566,7 @@ generic_NCR5380_biosparam(struct scsi_device *sdev, struct block_device *bdev,
566 * @dst: buffer to read into 566 * @dst: buffer to read into
567 * @len: buffer length 567 * @len: buffer length
568 * 568 *
569 * Perform a psuedo DMA mode read from an NCR53C400 or equivalent 569 * Perform a pseudo DMA mode read from an NCR53C400 or equivalent
570 * controller 570 * controller
571 */ 571 */
572 572
@@ -650,7 +650,7 @@ static inline int NCR5380_pread(struct Scsi_Host *instance, unsigned char *dst,
650 * @dst: buffer to read into 650 * @dst: buffer to read into
651 * @len: buffer length 651 * @len: buffer length
652 * 652 *
653 * Perform a psuedo DMA mode read from an NCR53C400 or equivalent 653 * Perform a pseudo DMA mode read from an NCR53C400 or equivalent
654 * controller 654 * controller
655 */ 655 */
656 656
diff --git a/drivers/scsi/gdth.h b/drivers/scsi/gdth.h
index 120a0625a7b5..d969855ac64a 100644
--- a/drivers/scsi/gdth.h
+++ b/drivers/scsi/gdth.h
@@ -895,7 +895,7 @@ typedef struct {
895 u8 ldr_no; /* log. drive no. */ 895 u8 ldr_no; /* log. drive no. */
896 u8 rw_attribs; /* r/w attributes */ 896 u8 rw_attribs; /* r/w attributes */
897 u8 cluster_type; /* cluster properties */ 897 u8 cluster_type; /* cluster properties */
898 u8 media_changed; /* Flag:MOUNT/UNMOUNT occured */ 898 u8 media_changed; /* Flag:MOUNT/UNMOUNT occurred */
899 u32 start_sec; /* start sector */ 899 u32 start_sec; /* start sector */
900 } hdr[MAX_LDRIVES]; /* host drives */ 900 } hdr[MAX_LDRIVES]; /* host drives */
901 struct { 901 struct {
diff --git a/drivers/scsi/gvp11.c b/drivers/scsi/gvp11.c
index 2ce26eb7a1ec..50bb54150a78 100644
--- a/drivers/scsi/gvp11.c
+++ b/drivers/scsi/gvp11.c
@@ -300,7 +300,7 @@ static int __devinit gvp11_probe(struct zorro_dev *z,
300 /* 300 /*
301 * Rumors state that some GVP ram boards use the same product 301 * Rumors state that some GVP ram boards use the same product
302 * code as the SCSI controllers. Therefore if the board-size 302 * code as the SCSI controllers. Therefore if the board-size
303 * is not 64KB we asume it is a ram board and bail out. 303 * is not 64KB we assume it is a ram board and bail out.
304 */ 304 */
305 if (zorro_resource_len(z) != 0x10000) 305 if (zorro_resource_len(z) != 0x10000)
306 return -ENODEV; 306 return -ENODEV;
diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c
index 99aa0e5699bc..26cd9d1d7571 100644
--- a/drivers/scsi/imm.c
+++ b/drivers/scsi/imm.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * (The IMM is the embedded controller in the ZIP Plus drive.) 4 * (The IMM is the embedded controller in the ZIP Plus drive.)
5 * 5 *
6 * My unoffical company acronym list is 21 pages long: 6 * My unofficial company acronym list is 21 pages long:
7 * FLA: Four letter acronym with built in facility for 7 * FLA: Four letter acronym with built in facility for
8 * future expansion to five letters. 8 * future expansion to five letters.
9 */ 9 */
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
index 9627d062e16b..dd741bcd6ccd 100644
--- a/drivers/scsi/initio.c
+++ b/drivers/scsi/initio.c
@@ -242,7 +242,7 @@ static u8 i91udftNvRam[64] =
242 242
243static u8 initio_rate_tbl[8] = /* fast 20 */ 243static u8 initio_rate_tbl[8] = /* fast 20 */
244{ 244{
245 /* nanosecond devide by 4 */ 245 /* nanosecond divide by 4 */
246 12, /* 50ns, 20M */ 246 12, /* 50ns, 20M */
247 18, /* 75ns, 13.3M */ 247 18, /* 75ns, 13.3M */
248 25, /* 100ns, 10M */ 248 25, /* 100ns, 10M */
@@ -1917,7 +1917,7 @@ static int int_initio_scsi_rst(struct initio_host * host)
1917} 1917}
1918 1918
1919/** 1919/**
1920 * int_initio_scsi_resel - Reselection occured 1920 * int_initio_scsi_resel - Reselection occurred
1921 * @host: InitIO host adapter 1921 * @host: InitIO host adapter
1922 * 1922 *
1923 * A SCSI reselection event has been signalled and the interrupt 1923 * A SCSI reselection event has been signalled and the interrupt
diff --git a/drivers/scsi/initio.h b/drivers/scsi/initio.h
index e58af9e95506..219b901bdc25 100644
--- a/drivers/scsi/initio.h
+++ b/drivers/scsi/initio.h
@@ -116,7 +116,7 @@ typedef struct {
116#define TUL_SBusId 0x89 /* 09 R SCSI BUS ID */ 116#define TUL_SBusId 0x89 /* 09 R SCSI BUS ID */
117#define TUL_STimeOut 0x8A /* 0A W Sel/Resel Time Out Register */ 117#define TUL_STimeOut 0x8A /* 0A W Sel/Resel Time Out Register */
118#define TUL_SIdent 0x8A /* 0A R Identify Message Register */ 118#define TUL_SIdent 0x8A /* 0A R Identify Message Register */
119#define TUL_SAvail 0x8A /* 0A R Availiable Counter Register */ 119#define TUL_SAvail 0x8A /* 0A R Available Counter Register */
120#define TUL_SData 0x8B /* 0B R/W SCSI data in/out */ 120#define TUL_SData 0x8B /* 0B R/W SCSI data in/out */
121#define TUL_SFifo 0x8C /* 0C R/W FIFO */ 121#define TUL_SFifo 0x8C /* 0C R/W FIFO */
122#define TUL_SSignal 0x90 /* 10 R/W SCSI signal in/out */ 122#define TUL_SSignal 0x90 /* 10 R/W SCSI signal in/out */
@@ -389,7 +389,7 @@ struct scsi_ctrl_blk {
389/* Bit Definition for status */ 389/* Bit Definition for status */
390#define SCB_RENT 0x01 390#define SCB_RENT 0x01
391#define SCB_PEND 0x02 391#define SCB_PEND 0x02
392#define SCB_CONTIG 0x04 /* Contigent Allegiance */ 392#define SCB_CONTIG 0x04 /* Contingent Allegiance */
393#define SCB_SELECT 0x08 393#define SCB_SELECT 0x08
394#define SCB_BUSY 0x10 394#define SCB_BUSY 0x10
395#define SCB_DONE 0x20 395#define SCB_DONE 0x20
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index b2511acd39bd..218f71a8726e 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -137,7 +137,7 @@
137/* - Fix path/name for scsi_hosts.h include for 2.6 kernels */ 137/* - Fix path/name for scsi_hosts.h include for 2.6 kernels */
138/* - Fix sort order of 7k */ 138/* - Fix sort order of 7k */
139/* - Remove 3 unused "inline" functions */ 139/* - Remove 3 unused "inline" functions */
140/* 7.12.xx - Use STATIC functions whereever possible */ 140/* 7.12.xx - Use STATIC functions wherever possible */
141/* - Clean up deprecated MODULE_PARM calls */ 141/* - Clean up deprecated MODULE_PARM calls */
142/* 7.12.05 - Remove Version Matching per IBM request */ 142/* 7.12.05 - Remove Version Matching per IBM request */
143/*****************************************************************************/ 143/*****************************************************************************/
@@ -1665,7 +1665,7 @@ ips_flash_copperhead(ips_ha_t * ha, ips_passthru_t * pt, ips_scb_t * scb)
1665 int datasize; 1665 int datasize;
1666 1666
1667 /* Trombone is the only copperhead that can do packet flash, but only 1667 /* Trombone is the only copperhead that can do packet flash, but only
1668 * for firmware. No one said it had to make sence. */ 1668 * for firmware. No one said it had to make sense. */
1669 if (IPS_IS_TROMBONE(ha) && pt->CoppCP.cmd.flashfw.type == IPS_FW_IMAGE) { 1669 if (IPS_IS_TROMBONE(ha) && pt->CoppCP.cmd.flashfw.type == IPS_FW_IMAGE) {
1670 if (ips_usrcmd(ha, pt, scb)) 1670 if (ips_usrcmd(ha, pt, scb))
1671 return IPS_SUCCESS; 1671 return IPS_SUCCESS;
diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h
index 4e49fbcfe8af..f2df0593332b 100644
--- a/drivers/scsi/ips.h
+++ b/drivers/scsi/ips.h
@@ -1193,7 +1193,7 @@ typedef struct {
1193#define IPS_VER_SEBRING "7.12.02" 1193#define IPS_VER_SEBRING "7.12.02"
1194#define IPS_VER_KEYWEST "7.12.02" 1194#define IPS_VER_KEYWEST "7.12.02"
1195 1195
1196/* Compatability IDs for various adapters */ 1196/* Compatibility IDs for various adapters */
1197#define IPS_COMPAT_UNKNOWN "" 1197#define IPS_COMPAT_UNKNOWN ""
1198#define IPS_COMPAT_CURRENT "KW710" 1198#define IPS_COMPAT_CURRENT "KW710"
1199#define IPS_COMPAT_SERVERAID1 "2.25.01" 1199#define IPS_COMPAT_SERVERAID1 "2.25.01"
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index a860452a8f71..3df985305f69 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -295,7 +295,7 @@ static int iscsi_sw_tcp_xmit(struct iscsi_conn *conn)
295 rc = iscsi_sw_tcp_xmit_segment(tcp_conn, segment); 295 rc = iscsi_sw_tcp_xmit_segment(tcp_conn, segment);
296 /* 296 /*
297 * We may not have been able to send data because the conn 297 * We may not have been able to send data because the conn
298 * is getting stopped. libiscsi will know so propogate err 298 * is getting stopped. libiscsi will know so propagate err
299 * for it to do the right thing. 299 * for it to do the right thing.
300 */ 300 */
301 if (rc == -EAGAIN) 301 if (rc == -EAGAIN)
diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
index 28231badd9e6..77035a746f60 100644
--- a/drivers/scsi/libfc/fc_exch.c
+++ b/drivers/scsi/libfc/fc_exch.c
@@ -1042,7 +1042,7 @@ static void fc_exch_set_addr(struct fc_exch *ep,
1042} 1042}
1043 1043
1044/** 1044/**
1045 * fc_seq_els_rsp_send() - Send an ELS response using infomation from 1045 * fc_seq_els_rsp_send() - Send an ELS response using information from
1046 * the existing sequence/exchange. 1046 * the existing sequence/exchange.
1047 * @fp: The received frame 1047 * @fp: The received frame
1048 * @els_cmd: The ELS command to be sent 1048 * @els_cmd: The ELS command to be sent
@@ -1153,7 +1153,7 @@ static void fc_seq_send_ack(struct fc_seq *sp, const struct fc_frame *rx_fp)
1153 * fc_exch_send_ba_rjt() - Send BLS Reject 1153 * fc_exch_send_ba_rjt() - Send BLS Reject
1154 * @rx_fp: The frame being rejected 1154 * @rx_fp: The frame being rejected
1155 * @reason: The reason the frame is being rejected 1155 * @reason: The reason the frame is being rejected
1156 * @explan: The explaination for the rejection 1156 * @explan: The explanation for the rejection
1157 * 1157 *
1158 * This is for rejecting BA_ABTS only. 1158 * This is for rejecting BA_ABTS only.
1159 */ 1159 */
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index b1b03af158bf..5b799a37ad09 100644
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -870,7 +870,7 @@ static void fc_fcp_resp(struct fc_fcp_pkt *fsp, struct fc_frame *fp)
870 fsp->scsi_resid = ntohl(rp_ex->fr_resid); 870 fsp->scsi_resid = ntohl(rp_ex->fr_resid);
871 /* 871 /*
872 * The cmnd->underflow is the minimum number of 872 * The cmnd->underflow is the minimum number of
873 * bytes that must be transfered for this 873 * bytes that must be transferred for this
874 * command. Provided a sense condition is not 874 * command. Provided a sense condition is not
875 * present, make sure the actual amount 875 * present, make sure the actual amount
876 * transferred is at least the underflow value 876 * transferred is at least the underflow value
@@ -1306,7 +1306,7 @@ static int fc_lun_reset(struct fc_lport *lport, struct fc_fcp_pkt *fsp,
1306} 1306}
1307 1307
1308/** 1308/**
1309 * fc_tm_done() - Task Managment response handler 1309 * fc_tm_done() - Task Management response handler
1310 * @seq: The sequence that the response is on 1310 * @seq: The sequence that the response is on
1311 * @fp: The response frame 1311 * @fp: The response frame
1312 * @arg: The FCP packet the response is for 1312 * @arg: The FCP packet the response is for
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index 8c08b210001d..906bbcad0e2d 100644
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -52,7 +52,7 @@
52 * while making the callback. To ensure that the rport is not free'd while 52 * while making the callback. To ensure that the rport is not free'd while
53 * processing the callback the rport callbacks are serialized through a 53 * processing the callback the rport callbacks are serialized through a
54 * single-threaded workqueue. An rport would never be free'd while in a 54 * single-threaded workqueue. An rport would never be free'd while in a
55 * callback handler becuase no other rport work in this queue can be executed 55 * callback handler because no other rport work in this queue can be executed
56 * at the same time. 56 * at the same time.
57 * 57 *
58 * When discovery succeeds or fails a callback is made to the lport as 58 * When discovery succeeds or fails a callback is made to the lport as
@@ -163,7 +163,7 @@ static int fc_frame_drop(struct fc_lport *lport, struct fc_frame *fp)
163 * fc_lport_rport_callback() - Event handler for rport events 163 * fc_lport_rport_callback() - Event handler for rport events
164 * @lport: The lport which is receiving the event 164 * @lport: The lport which is receiving the event
165 * @rdata: private remote port data 165 * @rdata: private remote port data
166 * @event: The event that occured 166 * @event: The event that occurred
167 * 167 *
168 * Locking Note: The rport lock should not be held when calling 168 * Locking Note: The rport lock should not be held when calling
169 * this function. 169 * this function.
@@ -379,7 +379,7 @@ static void fc_lport_add_fc4_type(struct fc_lport *lport, enum fc_fh_type type)
379 379
380/** 380/**
381 * fc_lport_recv_rlir_req() - Handle received Registered Link Incident Report. 381 * fc_lport_recv_rlir_req() - Handle received Registered Link Incident Report.
382 * @lport: Fibre Channel local port recieving the RLIR 382 * @lport: Fibre Channel local port receiving the RLIR
383 * @fp: The RLIR request frame 383 * @fp: The RLIR request frame
384 * 384 *
385 * Locking Note: The lport lock is expected to be held before calling 385 * Locking Note: The lport lock is expected to be held before calling
@@ -396,7 +396,7 @@ static void fc_lport_recv_rlir_req(struct fc_lport *lport, struct fc_frame *fp)
396 396
397/** 397/**
398 * fc_lport_recv_echo_req() - Handle received ECHO request 398 * fc_lport_recv_echo_req() - Handle received ECHO request
399 * @lport: The local port recieving the ECHO 399 * @lport: The local port receiving the ECHO
400 * @fp: ECHO request frame 400 * @fp: ECHO request frame
401 * 401 *
402 * Locking Note: The lport lock is expected to be held before calling 402 * Locking Note: The lport lock is expected to be held before calling
@@ -432,7 +432,7 @@ static void fc_lport_recv_echo_req(struct fc_lport *lport,
432 432
433/** 433/**
434 * fc_lport_recv_rnid_req() - Handle received Request Node ID data request 434 * fc_lport_recv_rnid_req() - Handle received Request Node ID data request
435 * @lport: The local port recieving the RNID 435 * @lport: The local port receiving the RNID
436 * @fp: The RNID request frame 436 * @fp: The RNID request frame
437 * 437 *
438 * Locking Note: The lport lock is expected to be held before calling 438 * Locking Note: The lport lock is expected to be held before calling
@@ -491,7 +491,7 @@ static void fc_lport_recv_rnid_req(struct fc_lport *lport,
491 491
492/** 492/**
493 * fc_lport_recv_logo_req() - Handle received fabric LOGO request 493 * fc_lport_recv_logo_req() - Handle received fabric LOGO request
494 * @lport: The local port recieving the LOGO 494 * @lport: The local port receiving the LOGO
495 * @fp: The LOGO request frame 495 * @fp: The LOGO request frame
496 * 496 *
497 * Locking Note: The lport lock is exected to be held before calling 497 * Locking Note: The lport lock is exected to be held before calling
@@ -771,7 +771,7 @@ EXPORT_SYMBOL(fc_lport_set_local_id);
771 771
772/** 772/**
773 * fc_lport_recv_flogi_req() - Receive a FLOGI request 773 * fc_lport_recv_flogi_req() - Receive a FLOGI request
774 * @lport: The local port that recieved the request 774 * @lport: The local port that received the request
775 * @rx_fp: The FLOGI frame 775 * @rx_fp: The FLOGI frame
776 * 776 *
777 * A received FLOGI request indicates a point-to-point connection. 777 * A received FLOGI request indicates a point-to-point connection.
@@ -858,7 +858,7 @@ out:
858 * if an rport should handle the request. 858 * if an rport should handle the request.
859 * 859 *
860 * Locking Note: This function should not be called with the lport 860 * Locking Note: This function should not be called with the lport
861 * lock held becuase it will grab the lock. 861 * lock held because it will grab the lock.
862 */ 862 */
863static void fc_lport_recv_els_req(struct fc_lport *lport, 863static void fc_lport_recv_els_req(struct fc_lport *lport,
864 struct fc_frame *fp) 864 struct fc_frame *fp)
@@ -925,7 +925,7 @@ struct fc4_prov fc_lport_els_prov = {
925 * @fp: The frame the request is in 925 * @fp: The frame the request is in
926 * 926 *
927 * Locking Note: This function should not be called with the lport 927 * Locking Note: This function should not be called with the lport
928 * lock held becuase it may grab the lock. 928 * lock held because it may grab the lock.
929 */ 929 */
930static void fc_lport_recv_req(struct fc_lport *lport, 930static void fc_lport_recv_req(struct fc_lport *lport,
931 struct fc_frame *fp) 931 struct fc_frame *fp)
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index f3f693b772ac..874e29d9533f 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -240,7 +240,7 @@ static int sas_ex_phy_discover_helper(struct domain_device *dev, u8 *disc_req,
240 disc_resp, DISCOVER_RESP_SIZE); 240 disc_resp, DISCOVER_RESP_SIZE);
241 if (res) 241 if (res)
242 return res; 242 return res;
243 /* This is detecting a failure to transmit inital 243 /* This is detecting a failure to transmit initial
244 * dev to host FIS as described in section G.5 of 244 * dev to host FIS as described in section G.5 of
245 * sas-2 r 04b */ 245 * sas-2 r 04b */
246 dr = &((struct smp_resp *)disc_resp)->disc; 246 dr = &((struct smp_resp *)disc_resp)->disc;
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index 4e0faa00b96f..17d789325f40 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -4515,7 +4515,7 @@ static FC_RPORT_ATTR(field, S_IRUGO, lpfc_show_rport_##field, NULL)
4515 * Description: 4515 * Description:
4516 * This function is called by the transport after the @fc_vport's symbolic name 4516 * This function is called by the transport after the @fc_vport's symbolic name
4517 * has been changed. This function re-registers the symbolic name with the 4517 * has been changed. This function re-registers the symbolic name with the
4518 * switch to propogate the change into the fabric if the vport is active. 4518 * switch to propagate the change into the fabric if the vport is active.
4519 **/ 4519 **/
4520static void 4520static void
4521lpfc_set_vport_symbolic_name(struct fc_vport *fc_vport) 4521lpfc_set_vport_symbolic_name(struct fc_vport *fc_vport)
diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index 793b9f1131fb..77b2871d96b7 100644
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -1939,7 +1939,7 @@ out:
1939 * @rxxri: Receive exchange id 1939 * @rxxri: Receive exchange id
1940 * @len: Number of data bytes 1940 * @len: Number of data bytes
1941 * 1941 *
1942 * This function allocates and posts a data buffer of sufficient size to recieve 1942 * This function allocates and posts a data buffer of sufficient size to receive
1943 * an unsolicted CT command. 1943 * an unsolicted CT command.
1944 **/ 1944 **/
1945static int lpfcdiag_loop_post_rxbufs(struct lpfc_hba *phba, uint16_t rxxri, 1945static int lpfcdiag_loop_post_rxbufs(struct lpfc_hba *phba, uint16_t rxxri,
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
index a753581509d6..3d967741c708 100644
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@ -908,7 +908,7 @@ lpfc_debugfs_dumpData_open(struct inode *inode, struct file *file)
908 if (!debug) 908 if (!debug)
909 goto out; 909 goto out;
910 910
911 /* Round to page boundry */ 911 /* Round to page boundary */
912 printk(KERN_ERR "9059 BLKGRD: %s: _dump_buf_data=0x%p\n", 912 printk(KERN_ERR "9059 BLKGRD: %s: _dump_buf_data=0x%p\n",
913 __func__, _dump_buf_data); 913 __func__, _dump_buf_data);
914 debug->buffer = _dump_buf_data; 914 debug->buffer = _dump_buf_data;
@@ -938,7 +938,7 @@ lpfc_debugfs_dumpDif_open(struct inode *inode, struct file *file)
938 if (!debug) 938 if (!debug)
939 goto out; 939 goto out;
940 940
941 /* Round to page boundry */ 941 /* Round to page boundary */
942 printk(KERN_ERR "9060 BLKGRD: %s: _dump_buf_dif=0x%p file=%s\n", 942 printk(KERN_ERR "9060 BLKGRD: %s: _dump_buf_dif=0x%p file=%s\n",
943 __func__, _dump_buf_dif, file->f_dentry->d_name.name); 943 __func__, _dump_buf_dif, file->f_dentry->d_name.name);
944 debug->buffer = _dump_buf_dif; 944 debug->buffer = _dump_buf_dif;
@@ -2158,7 +2158,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
2158 debugfs_create_dir(name, phba->hba_debugfs_root); 2158 debugfs_create_dir(name, phba->hba_debugfs_root);
2159 if (!vport->vport_debugfs_root) { 2159 if (!vport->vport_debugfs_root) {
2160 lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT, 2160 lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
2161 "0417 Cant create debugfs\n"); 2161 "0417 Can't create debugfs\n");
2162 goto debug_failed; 2162 goto debug_failed;
2163 } 2163 }
2164 atomic_inc(&phba->debugfs_vport_count); 2164 atomic_inc(&phba->debugfs_vport_count);
@@ -2211,7 +2211,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
2211 vport, &lpfc_debugfs_op_nodelist); 2211 vport, &lpfc_debugfs_op_nodelist);
2212 if (!vport->debug_nodelist) { 2212 if (!vport->debug_nodelist) {
2213 lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT, 2213 lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
2214 "0409 Cant create debugfs nodelist\n"); 2214 "0409 Can't create debugfs nodelist\n");
2215 goto debug_failed; 2215 goto debug_failed;
2216 } 2216 }
2217 2217
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 735028fedda5..d34b69f9cdb1 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -102,7 +102,7 @@ lpfc_els_chk_latt(struct lpfc_vport *vport)
102 phba->pport->port_state); 102 phba->pport->port_state);
103 103
104 /* CLEAR_LA should re-enable link attention events and 104 /* CLEAR_LA should re-enable link attention events and
105 * we should then imediately take a LATT event. The 105 * we should then immediately take a LATT event. The
106 * LATT processing should call lpfc_linkdown() which 106 * LATT processing should call lpfc_linkdown() which
107 * will cleanup any left over in-progress discovery 107 * will cleanup any left over in-progress discovery
108 * events. 108 * events.
@@ -1599,7 +1599,7 @@ out:
1599 * This routine is the completion callback function for issuing the Port 1599 * This routine is the completion callback function for issuing the Port
1600 * Login (PLOGI) command. For PLOGI completion, there must be an active 1600 * Login (PLOGI) command. For PLOGI completion, there must be an active
1601 * ndlp on the vport node list that matches the remote node ID from the 1601 * ndlp on the vport node list that matches the remote node ID from the
1602 * PLOGI reponse IOCB. If such ndlp does not exist, the PLOGI is simply 1602 * PLOGI response IOCB. If such ndlp does not exist, the PLOGI is simply
1603 * ignored and command IOCB released. The PLOGI response IOCB status is 1603 * ignored and command IOCB released. The PLOGI response IOCB status is
1604 * checked for error conditons. If there is error status reported, PLOGI 1604 * checked for error conditons. If there is error status reported, PLOGI
1605 * retry shall be attempted by invoking the lpfc_els_retry() routine. 1605 * retry shall be attempted by invoking the lpfc_els_retry() routine.
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 154c715fb3af..301498301a8f 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -739,7 +739,7 @@ lpfc_do_work(void *p)
739 739
740/* 740/*
741 * This is only called to handle FC worker events. Since this a rare 741 * This is only called to handle FC worker events. Since this a rare
742 * occurance, we allocate a struct lpfc_work_evt structure here instead of 742 * occurrence, we allocate a struct lpfc_work_evt structure here instead of
743 * embedding it in the IOCB. 743 * embedding it in the IOCB.
744 */ 744 */
745int 745int
@@ -1348,7 +1348,7 @@ lpfc_register_fcf(struct lpfc_hba *phba)
1348 int rc; 1348 int rc;
1349 1349
1350 spin_lock_irq(&phba->hbalock); 1350 spin_lock_irq(&phba->hbalock);
1351 /* If the FCF is not availabe do nothing. */ 1351 /* If the FCF is not available do nothing. */
1352 if (!(phba->fcf.fcf_flag & FCF_AVAILABLE)) { 1352 if (!(phba->fcf.fcf_flag & FCF_AVAILABLE)) {
1353 phba->hba_flag &= ~(FCF_TS_INPROG | FCF_RR_INPROG); 1353 phba->hba_flag &= ~(FCF_TS_INPROG | FCF_RR_INPROG);
1354 spin_unlock_irq(&phba->hbalock); 1354 spin_unlock_irq(&phba->hbalock);
@@ -1538,7 +1538,7 @@ lpfc_match_fcf_conn_list(struct lpfc_hba *phba,
1538 1538
1539 /* 1539 /*
1540 * If user did not specify any addressing mode, or if the 1540 * If user did not specify any addressing mode, or if the
1541 * prefered addressing mode specified by user is not supported 1541 * preferred addressing mode specified by user is not supported
1542 * by FCF, allow fabric to pick the addressing mode. 1542 * by FCF, allow fabric to pick the addressing mode.
1543 */ 1543 */
1544 *addr_mode = bf_get(lpfc_fcf_record_mac_addr_prov, 1544 *addr_mode = bf_get(lpfc_fcf_record_mac_addr_prov,
@@ -1553,7 +1553,7 @@ lpfc_match_fcf_conn_list(struct lpfc_hba *phba,
1553 FCFCNCT_AM_SPMA) ? 1553 FCFCNCT_AM_SPMA) ?
1554 LPFC_FCF_SPMA : LPFC_FCF_FPMA; 1554 LPFC_FCF_SPMA : LPFC_FCF_FPMA;
1555 /* 1555 /*
1556 * If the user specified a prefered address mode, use the 1556 * If the user specified a preferred address mode, use the
1557 * addr mode only if FCF support the addr_mode. 1557 * addr mode only if FCF support the addr_mode.
1558 */ 1558 */
1559 else if ((conn_entry->conn_rec.flags & FCFCNCT_AM_VALID) && 1559 else if ((conn_entry->conn_rec.flags & FCFCNCT_AM_VALID) &&
@@ -3117,7 +3117,7 @@ lpfc_mbx_cmpl_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
3117 * back at reg login state so this 3117 * back at reg login state so this
3118 * mbox needs to be ignored becase 3118 * mbox needs to be ignored becase
3119 * there is another reg login in 3119 * there is another reg login in
3120 * proccess. 3120 * process.
3121 */ 3121 */
3122 spin_lock_irq(shost->host_lock); 3122 spin_lock_irq(shost->host_lock);
3123 ndlp->nlp_flag &= ~NLP_IGNR_REG_CMPL; 3123 ndlp->nlp_flag &= ~NLP_IGNR_REG_CMPL;
@@ -4477,7 +4477,7 @@ lpfc_setup_disc_node(struct lpfc_vport *vport, uint32_t did)
4477 if ((vport->fc_flag & FC_RSCN_MODE) && 4477 if ((vport->fc_flag & FC_RSCN_MODE) &&
4478 !(vport->fc_flag & FC_NDISC_ACTIVE)) { 4478 !(vport->fc_flag & FC_NDISC_ACTIVE)) {
4479 if (lpfc_rscn_payload_check(vport, did)) { 4479 if (lpfc_rscn_payload_check(vport, did)) {
4480 /* If we've already recieved a PLOGI from this NPort 4480 /* If we've already received a PLOGI from this NPort
4481 * we don't need to try to discover it again. 4481 * we don't need to try to discover it again.
4482 */ 4482 */
4483 if (ndlp->nlp_flag & NLP_RCV_PLOGI) 4483 if (ndlp->nlp_flag & NLP_RCV_PLOGI)
@@ -4493,7 +4493,7 @@ lpfc_setup_disc_node(struct lpfc_vport *vport, uint32_t did)
4493 } else 4493 } else
4494 ndlp = NULL; 4494 ndlp = NULL;
4495 } else { 4495 } else {
4496 /* If we've already recieved a PLOGI from this NPort, 4496 /* If we've already received a PLOGI from this NPort,
4497 * or we are already in the process of discovery on it, 4497 * or we are already in the process of discovery on it,
4498 * we don't need to try to discover it again. 4498 * we don't need to try to discover it again.
4499 */ 4499 */
@@ -5756,7 +5756,7 @@ lpfc_read_fcoe_param(struct lpfc_hba *phba,
5756 * @size: Size of the data buffer. 5756 * @size: Size of the data buffer.
5757 * @rec_type: Record type to be searched. 5757 * @rec_type: Record type to be searched.
5758 * 5758 *
5759 * This function searches config region data to find the begining 5759 * This function searches config region data to find the beginning
5760 * of the record specified by record_type. If record found, this 5760 * of the record specified by record_type. If record found, this
5761 * function return pointer to the record else return NULL. 5761 * function return pointer to the record else return NULL.
5762 */ 5762 */
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index e6ebe516cfbb..505f88443b5c 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -4466,7 +4466,7 @@ lpfc_sli4_driver_resource_unset(struct lpfc_hba *phba)
4466} 4466}
4467 4467
4468/** 4468/**
4469 * lpfc_init_api_table_setup - Set up init api fucntion jump table 4469 * lpfc_init_api_table_setup - Set up init api function jump table
4470 * @phba: The hba struct for which this call is being executed. 4470 * @phba: The hba struct for which this call is being executed.
4471 * @dev_grp: The HBA PCI-Device group number. 4471 * @dev_grp: The HBA PCI-Device group number.
4472 * 4472 *
@@ -4850,7 +4850,7 @@ out_free_mem:
4850 * 4850 *
4851 * Return codes 4851 * Return codes
4852 * 0 - successful 4852 * 0 - successful
4853 * -ENOMEM - No availble memory 4853 * -ENOMEM - No available memory
4854 * -EIO - The mailbox failed to complete successfully. 4854 * -EIO - The mailbox failed to complete successfully.
4855 **/ 4855 **/
4856int 4856int
@@ -5730,7 +5730,7 @@ lpfc_destroy_bootstrap_mbox(struct lpfc_hba *phba)
5730 * 5730 *
5731 * Return codes 5731 * Return codes
5732 * 0 - successful 5732 * 0 - successful
5733 * -ENOMEM - No availble memory 5733 * -ENOMEM - No available memory
5734 * -EIO - The mailbox failed to complete successfully. 5734 * -EIO - The mailbox failed to complete successfully.
5735 **/ 5735 **/
5736static int 5736static int
@@ -5835,7 +5835,7 @@ lpfc_sli4_read_config(struct lpfc_hba *phba)
5835 * 5835 *
5836 * Return codes 5836 * Return codes
5837 * 0 - successful 5837 * 0 - successful
5838 * -ENOMEM - No availble memory 5838 * -ENOMEM - No available memory
5839 * -EIO - The mailbox failed to complete successfully. 5839 * -EIO - The mailbox failed to complete successfully.
5840 **/ 5840 **/
5841static int 5841static int
@@ -5894,7 +5894,7 @@ lpfc_setup_endian_order(struct lpfc_hba *phba)
5894 * 5894 *
5895 * Return codes 5895 * Return codes
5896 * 0 - successful 5896 * 0 - successful
5897 * -ENOMEM - No availble memory 5897 * -ENOMEM - No available memory
5898 * -EIO - The mailbox failed to complete successfully. 5898 * -EIO - The mailbox failed to complete successfully.
5899 **/ 5899 **/
5900static int 5900static int
@@ -6189,7 +6189,7 @@ out_error:
6189 * 6189 *
6190 * Return codes 6190 * Return codes
6191 * 0 - successful 6191 * 0 - successful
6192 * -ENOMEM - No availble memory 6192 * -ENOMEM - No available memory
6193 * -EIO - The mailbox failed to complete successfully. 6193 * -EIO - The mailbox failed to complete successfully.
6194 **/ 6194 **/
6195static void 6195static void
@@ -6253,7 +6253,7 @@ lpfc_sli4_queue_destroy(struct lpfc_hba *phba)
6253 * 6253 *
6254 * Return codes 6254 * Return codes
6255 * 0 - successful 6255 * 0 - successful
6256 * -ENOMEM - No availble memory 6256 * -ENOMEM - No available memory
6257 * -EIO - The mailbox failed to complete successfully. 6257 * -EIO - The mailbox failed to complete successfully.
6258 **/ 6258 **/
6259int 6259int
@@ -6498,7 +6498,7 @@ out_error:
6498 * 6498 *
6499 * Return codes 6499 * Return codes
6500 * 0 - successful 6500 * 0 - successful
6501 * -ENOMEM - No availble memory 6501 * -ENOMEM - No available memory
6502 * -EIO - The mailbox failed to complete successfully. 6502 * -EIO - The mailbox failed to complete successfully.
6503 **/ 6503 **/
6504void 6504void
@@ -6543,7 +6543,7 @@ lpfc_sli4_queue_unset(struct lpfc_hba *phba)
6543 * 6543 *
6544 * Return codes 6544 * Return codes
6545 * 0 - successful 6545 * 0 - successful
6546 * -ENOMEM - No availble memory 6546 * -ENOMEM - No available memory
6547 **/ 6547 **/
6548static int 6548static int
6549lpfc_sli4_cq_event_pool_create(struct lpfc_hba *phba) 6549lpfc_sli4_cq_event_pool_create(struct lpfc_hba *phba)
@@ -6704,7 +6704,7 @@ lpfc_sli4_cq_event_release_all(struct lpfc_hba *phba)
6704 * 6704 *
6705 * Return codes 6705 * Return codes
6706 * 0 - successful 6706 * 0 - successful
6707 * -ENOMEM - No availble memory 6707 * -ENOMEM - No available memory
6708 * -EIO - The mailbox failed to complete successfully. 6708 * -EIO - The mailbox failed to complete successfully.
6709 **/ 6709 **/
6710int 6710int
diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c
index dba32dfdb59b..fbab9734e9b4 100644
--- a/drivers/scsi/lpfc/lpfc_mbox.c
+++ b/drivers/scsi/lpfc/lpfc_mbox.c
@@ -1834,7 +1834,7 @@ lpfc_sli4_mbox_opcode_get(struct lpfc_hba *phba, struct lpfcMboxq *mbox)
1834 * @fcf_index: index to fcf table. 1834 * @fcf_index: index to fcf table.
1835 * 1835 *
1836 * This routine routine allocates and constructs non-embedded mailbox command 1836 * This routine routine allocates and constructs non-embedded mailbox command
1837 * for reading a FCF table entry refered by @fcf_index. 1837 * for reading a FCF table entry referred by @fcf_index.
1838 * 1838 *
1839 * Return: pointer to the mailbox command constructed if successful, otherwise 1839 * Return: pointer to the mailbox command constructed if successful, otherwise
1840 * NULL. 1840 * NULL.
diff --git a/drivers/scsi/lpfc/lpfc_nl.h b/drivers/scsi/lpfc/lpfc_nl.h
index f3cfbe2ce986..f2b1bbcb196f 100644
--- a/drivers/scsi/lpfc/lpfc_nl.h
+++ b/drivers/scsi/lpfc/lpfc_nl.h
@@ -50,7 +50,7 @@
50 * and subcategory. The event type must come first. 50 * and subcategory. The event type must come first.
51 * The subcategory further defines the data that follows in the rest 51 * The subcategory further defines the data that follows in the rest
52 * of the payload. Each category will have its own unique header plus 52 * of the payload. Each category will have its own unique header plus
53 * any addtional data unique to the subcategory. 53 * any additional data unique to the subcategory.
54 * The payload sent via the fc transport is one-way driver->application. 54 * The payload sent via the fc transport is one-way driver->application.
55 */ 55 */
56 56
diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 52b35159fc35..0d92d4205ea6 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -658,7 +658,7 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
658 return 0; 658 return 0;
659} 659}
660/** 660/**
661 * lpfc_release_rpi - Release a RPI by issueing unreg_login mailbox cmd. 661 * lpfc_release_rpi - Release a RPI by issuing unreg_login mailbox cmd.
662 * @phba : Pointer to lpfc_hba structure. 662 * @phba : Pointer to lpfc_hba structure.
663 * @vport: Pointer to lpfc_vport structure. 663 * @vport: Pointer to lpfc_vport structure.
664 * @rpi : rpi to be release. 664 * @rpi : rpi to be release.
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 2b962b020cfb..fe7cc84e773b 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -577,7 +577,7 @@ lpfc_new_scsi_buf_s3(struct lpfc_vport *vport, int num_to_alloc)
577 iocb->un.fcpi64.bdl.addrHigh = 0; 577 iocb->un.fcpi64.bdl.addrHigh = 0;
578 iocb->ulpBdeCount = 0; 578 iocb->ulpBdeCount = 0;
579 iocb->ulpLe = 0; 579 iocb->ulpLe = 0;
580 /* fill in responce BDE */ 580 /* fill in response BDE */
581 iocb->unsli3.fcp_ext.rbde.tus.f.bdeFlags = 581 iocb->unsli3.fcp_ext.rbde.tus.f.bdeFlags =
582 BUFF_TYPE_BDE_64; 582 BUFF_TYPE_BDE_64;
583 iocb->unsli3.fcp_ext.rbde.tus.f.bdeSize = 583 iocb->unsli3.fcp_ext.rbde.tus.f.bdeSize =
@@ -1217,10 +1217,10 @@ lpfc_scsi_prep_dma_buf_s3(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)
1217 (2 * sizeof(struct ulp_bde64))); 1217 (2 * sizeof(struct ulp_bde64)));
1218 data_bde->addrHigh = putPaddrHigh(physaddr); 1218 data_bde->addrHigh = putPaddrHigh(physaddr);
1219 data_bde->addrLow = putPaddrLow(physaddr); 1219 data_bde->addrLow = putPaddrLow(physaddr);
1220 /* ebde count includes the responce bde and data bpl */ 1220 /* ebde count includes the response bde and data bpl */
1221 iocb_cmd->unsli3.fcp_ext.ebde_count = 2; 1221 iocb_cmd->unsli3.fcp_ext.ebde_count = 2;
1222 } else { 1222 } else {
1223 /* ebde count includes the responce bde and data bdes */ 1223 /* ebde count includes the response bde and data bdes */
1224 iocb_cmd->unsli3.fcp_ext.ebde_count = (num_bde + 1); 1224 iocb_cmd->unsli3.fcp_ext.ebde_count = (num_bde + 1);
1225 } 1225 }
1226 } else { 1226 } else {
@@ -2380,7 +2380,7 @@ lpfc_handle_fcp_err(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,
2380 } 2380 }
2381 /* 2381 /*
2382 * The cmnd->underflow is the minimum number of bytes that must 2382 * The cmnd->underflow is the minimum number of bytes that must
2383 * be transfered for this command. Provided a sense condition 2383 * be transferred for this command. Provided a sense condition
2384 * is not present, make sure the actual amount transferred is at 2384 * is not present, make sure the actual amount transferred is at
2385 * least the underflow value or fail. 2385 * least the underflow value or fail.
2386 */ 2386 */
@@ -2873,7 +2873,7 @@ lpfc_scsi_prep_task_mgmt_cmd(struct lpfc_vport *vport,
2873} 2873}
2874 2874
2875/** 2875/**
2876 * lpfc_scsi_api_table_setup - Set up scsi api fucntion jump table 2876 * lpfc_scsi_api_table_setup - Set up scsi api function jump table
2877 * @phba: The hba struct for which this call is being executed. 2877 * @phba: The hba struct for which this call is being executed.
2878 * @dev_grp: The HBA PCI-Device group number. 2878 * @dev_grp: The HBA PCI-Device group number.
2879 * 2879 *
diff --git a/drivers/scsi/lpfc/lpfc_scsi.h b/drivers/scsi/lpfc/lpfc_scsi.h
index 5932273870a5..ce645b20a6ad 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.h
+++ b/drivers/scsi/lpfc/lpfc_scsi.h
@@ -130,7 +130,7 @@ struct lpfc_scsi_buf {
130 dma_addr_t nonsg_phys; /* Non scatter-gather physical address. */ 130 dma_addr_t nonsg_phys; /* Non scatter-gather physical address. */
131 131
132 /* 132 /*
133 * data and dma_handle are the kernel virutal and bus address of the 133 * data and dma_handle are the kernel virtual and bus address of the
134 * dma-able buffer containing the fcp_cmd, fcp_rsp and a scatter 134 * dma-able buffer containing the fcp_cmd, fcp_rsp and a scatter
135 * gather bde list that supports the sg_tablesize value. 135 * gather bde list that supports the sg_tablesize value.
136 */ 136 */
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 4746dcd756dd..dacabbe0a586 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -2817,7 +2817,7 @@ void lpfc_poll_eratt(unsigned long ptr)
2817 * This function is called from the interrupt context when there is a ring 2817 * This function is called from the interrupt context when there is a ring
2818 * event for the fcp ring. The caller does not hold any lock. 2818 * event for the fcp ring. The caller does not hold any lock.
2819 * The function processes each response iocb in the response ring until it 2819 * The function processes each response iocb in the response ring until it
2820 * finds an iocb with LE bit set and chains all the iocbs upto the iocb with 2820 * finds an iocb with LE bit set and chains all the iocbs up to the iocb with
2821 * LE bit set. The function will call the completion handler of the command iocb 2821 * LE bit set. The function will call the completion handler of the command iocb
2822 * if the response iocb indicates a completion for a command iocb or it is 2822 * if the response iocb indicates a completion for a command iocb or it is
2823 * an abort completion. The function will call lpfc_sli_process_unsol_iocb 2823 * an abort completion. The function will call lpfc_sli_process_unsol_iocb
@@ -5117,7 +5117,7 @@ lpfc_mbox_timeout_handler(struct lpfc_hba *phba)
5117 5117
5118 /* Setting state unknown so lpfc_sli_abort_iocb_ring 5118 /* Setting state unknown so lpfc_sli_abort_iocb_ring
5119 * would get IOCB_ERROR from lpfc_sli_issue_iocb, allowing 5119 * would get IOCB_ERROR from lpfc_sli_issue_iocb, allowing
5120 * it to fail all oustanding SCSI IO. 5120 * it to fail all outstanding SCSI IO.
5121 */ 5121 */
5122 spin_lock_irq(&phba->pport->work_port_lock); 5122 spin_lock_irq(&phba->pport->work_port_lock);
5123 phba->pport->work_port_events &= ~WORKER_MBOX_TMO; 5123 phba->pport->work_port_events &= ~WORKER_MBOX_TMO;
@@ -6031,7 +6031,7 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
6031} 6031}
6032 6032
6033/** 6033/**
6034 * lpfc_mbox_api_table_setup - Set up mbox api fucntion jump table 6034 * lpfc_mbox_api_table_setup - Set up mbox api function jump table
6035 * @phba: The hba struct for which this call is being executed. 6035 * @phba: The hba struct for which this call is being executed.
6036 * @dev_grp: The HBA PCI-Device group number. 6036 * @dev_grp: The HBA PCI-Device group number.
6037 * 6037 *
@@ -6847,7 +6847,7 @@ __lpfc_sli_issue_iocb(struct lpfc_hba *phba, uint32_t ring_number,
6847} 6847}
6848 6848
6849/** 6849/**
6850 * lpfc_sli_api_table_setup - Set up sli api fucntion jump table 6850 * lpfc_sli_api_table_setup - Set up sli api function jump table
6851 * @phba: The hba struct for which this call is being executed. 6851 * @phba: The hba struct for which this call is being executed.
6852 * @dev_grp: The HBA PCI-Device group number. 6852 * @dev_grp: The HBA PCI-Device group number.
6853 * 6853 *
@@ -7521,7 +7521,7 @@ lpfc_sli_ring_taggedbuf_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
7521 struct lpfc_dmabuf *mp, *next_mp; 7521 struct lpfc_dmabuf *mp, *next_mp;
7522 struct list_head *slp = &pring->postbufq; 7522 struct list_head *slp = &pring->postbufq;
7523 7523
7524 /* Search postbufq, from the begining, looking for a match on tag */ 7524 /* Search postbufq, from the beginning, looking for a match on tag */
7525 spin_lock_irq(&phba->hbalock); 7525 spin_lock_irq(&phba->hbalock);
7526 list_for_each_entry_safe(mp, next_mp, &pring->postbufq, list) { 7526 list_for_each_entry_safe(mp, next_mp, &pring->postbufq, list) {
7527 if (mp->buffer_tag == tag) { 7527 if (mp->buffer_tag == tag) {
@@ -7565,7 +7565,7 @@ lpfc_sli_ringpostbuf_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
7565 struct lpfc_dmabuf *mp, *next_mp; 7565 struct lpfc_dmabuf *mp, *next_mp;
7566 struct list_head *slp = &pring->postbufq; 7566 struct list_head *slp = &pring->postbufq;
7567 7567
7568 /* Search postbufq, from the begining, looking for a match on phys */ 7568 /* Search postbufq, from the beginning, looking for a match on phys */
7569 spin_lock_irq(&phba->hbalock); 7569 spin_lock_irq(&phba->hbalock);
7570 list_for_each_entry_safe(mp, next_mp, &pring->postbufq, list) { 7570 list_for_each_entry_safe(mp, next_mp, &pring->postbufq, list) {
7571 if (mp->phys == phys) { 7571 if (mp->phys == phys) {
@@ -8438,7 +8438,7 @@ lpfc_sli_mbox_sys_shutdown(struct lpfc_hba *phba)
8438 * for possible error attention events. The caller must hold the hostlock 8438 * for possible error attention events. The caller must hold the hostlock
8439 * with spin_lock_irq(). 8439 * with spin_lock_irq().
8440 * 8440 *
8441 * This fucntion returns 1 when there is Error Attention in the Host Attention 8441 * This function returns 1 when there is Error Attention in the Host Attention
8442 * Register and returns 0 otherwise. 8442 * Register and returns 0 otherwise.
8443 **/ 8443 **/
8444static int 8444static int
@@ -8491,7 +8491,7 @@ unplug_err:
8491 * for possible error attention events. The caller must hold the hostlock 8491 * for possible error attention events. The caller must hold the hostlock
8492 * with spin_lock_irq(). 8492 * with spin_lock_irq().
8493 * 8493 *
8494 * This fucntion returns 1 when there is Error Attention in the Host Attention 8494 * This function returns 1 when there is Error Attention in the Host Attention
8495 * Register and returns 0 otherwise. 8495 * Register and returns 0 otherwise.
8496 **/ 8496 **/
8497static int 8497static int
@@ -8581,7 +8581,7 @@ lpfc_sli4_eratt_read(struct lpfc_hba *phba)
8581 * This function is called from timer soft interrupt context to check HBA's 8581 * This function is called from timer soft interrupt context to check HBA's
8582 * error attention register bit for error attention events. 8582 * error attention register bit for error attention events.
8583 * 8583 *
8584 * This fucntion returns 1 when there is Error Attention in the Host Attention 8584 * This function returns 1 when there is Error Attention in the Host Attention
8585 * Register and returns 0 otherwise. 8585 * Register and returns 0 otherwise.
8586 **/ 8586 **/
8587int 8587int
@@ -9684,7 +9684,7 @@ out:
9684 * @cq: Pointer to the completion queue. 9684 * @cq: Pointer to the completion queue.
9685 * @wcqe: Pointer to a completion queue entry. 9685 * @wcqe: Pointer to a completion queue entry.
9686 * 9686 *
9687 * This routine process a slow-path work-queue or recieve queue completion queue 9687 * This routine process a slow-path work-queue or receive queue completion queue
9688 * entry. 9688 * entry.
9689 * 9689 *
9690 * Return: true if work posted to worker thread, otherwise false. 9690 * Return: true if work posted to worker thread, otherwise false.
@@ -12971,7 +12971,7 @@ lpfc_sli4_build_dflt_fcf_record(struct lpfc_hba *phba,
12971 * record and processing it one at a time starting from the @fcf_index 12971 * record and processing it one at a time starting from the @fcf_index
12972 * for initial FCF discovery or fast FCF failover rediscovery. 12972 * for initial FCF discovery or fast FCF failover rediscovery.
12973 * 12973 *
12974 * Return 0 if the mailbox command is submitted sucessfully, none 0 12974 * Return 0 if the mailbox command is submitted successfully, none 0
12975 * otherwise. 12975 * otherwise.
12976 **/ 12976 **/
12977int 12977int
@@ -13032,7 +13032,7 @@ fail_fcf_scan:
13032 * This routine is invoked to read an FCF record indicated by @fcf_index 13032 * This routine is invoked to read an FCF record indicated by @fcf_index
13033 * and to use it for FLOGI roundrobin FCF failover. 13033 * and to use it for FLOGI roundrobin FCF failover.
13034 * 13034 *
13035 * Return 0 if the mailbox command is submitted sucessfully, none 0 13035 * Return 0 if the mailbox command is submitted successfully, none 0
13036 * otherwise. 13036 * otherwise.
13037 **/ 13037 **/
13038int 13038int
@@ -13078,7 +13078,7 @@ fail_fcf_read:
13078 * This routine is invoked to read an FCF record indicated by @fcf_index to 13078 * This routine is invoked to read an FCF record indicated by @fcf_index to
13079 * determine whether it's eligible for FLOGI roundrobin failover list. 13079 * determine whether it's eligible for FLOGI roundrobin failover list.
13080 * 13080 *
13081 * Return 0 if the mailbox command is submitted sucessfully, none 0 13081 * Return 0 if the mailbox command is submitted successfully, none 0
13082 * otherwise. 13082 * otherwise.
13083 **/ 13083 **/
13084int 13084int
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index c212694a9714..f2684dd09ed0 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -284,7 +284,7 @@ mega_query_adapter(adapter_t *adapter)
284 284
285 adapter->host->max_id = 16; /* max targets per channel */ 285 adapter->host->max_id = 16; /* max targets per channel */
286 286
287 adapter->host->max_lun = 7; /* Upto 7 luns for non disk devices */ 287 adapter->host->max_lun = 7; /* Up to 7 luns for non disk devices */
288 288
289 adapter->host->cmd_per_lun = max_cmd_per_lun; 289 adapter->host->cmd_per_lun = max_cmd_per_lun;
290 290
@@ -3734,7 +3734,7 @@ mega_m_to_n(void __user *arg, nitioctl_t *uioc)
3734 * check is the application conforms to NIT. We do not have to do much 3734 * check is the application conforms to NIT. We do not have to do much
3735 * in that case. 3735 * in that case.
3736 * We exploit the fact that the signature is stored in the very 3736 * We exploit the fact that the signature is stored in the very
3737 * begining of the structure. 3737 * beginning of the structure.
3738 */ 3738 */
3739 3739
3740 if( copy_from_user(signature, arg, 7) ) 3740 if( copy_from_user(signature, arg, 7) )
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h
index 853411911b2e..9a7897f8ca43 100644
--- a/drivers/scsi/megaraid.h
+++ b/drivers/scsi/megaraid.h
@@ -532,9 +532,9 @@ struct uioctl_t {
532 532
533/* 533/*
534 * struct mcontroller is used to pass information about the controllers in the 534 * struct mcontroller is used to pass information about the controllers in the
535 * system. Its upto the application how to use the information. We are passing 535 * system. Its up to the application how to use the information. We are passing
536 * as much info about the cards as possible and useful. Before issuing the 536 * as much info about the cards as possible and useful. Before issuing the
537 * call to find information about the cards, the applicaiton needs to issue a 537 * call to find information about the cards, the application needs to issue a
538 * ioctl first to find out the number of controllers in the system. 538 * ioctl first to find out the number of controllers in the system.
539 */ 539 */
540#define MAX_CONTROLLERS 32 540#define MAX_CONTROLLERS 32
@@ -804,7 +804,7 @@ typedef struct {
804 unsigned long base; 804 unsigned long base;
805 void __iomem *mmio_base; 805 void __iomem *mmio_base;
806 806
807 /* mbox64 with mbox not aligned on 16-byte boundry */ 807 /* mbox64 with mbox not aligned on 16-byte boundary */
808 mbox64_t *una_mbox64; 808 mbox64_t *una_mbox64;
809 dma_addr_t una_mbox64_dma; 809 dma_addr_t una_mbox64_dma;
810 810
diff --git a/drivers/scsi/megaraid/mbox_defs.h b/drivers/scsi/megaraid/mbox_defs.h
index ce2487a888ed..e01c6f7c2cac 100644
--- a/drivers/scsi/megaraid/mbox_defs.h
+++ b/drivers/scsi/megaraid/mbox_defs.h
@@ -660,7 +660,7 @@ typedef struct {
660 * @lparam : logical drives parameters 660 * @lparam : logical drives parameters
661 * @span : span 661 * @span : span
662 * 662 *
663 * 8-LD logical drive with upto 8 spans 663 * 8-LD logical drive with up to 8 spans
664 */ 664 */
665typedef struct { 665typedef struct {
666 logdrv_param_t lparam; 666 logdrv_param_t lparam;
@@ -673,7 +673,7 @@ typedef struct {
673 * @lparam : logical drives parameters 673 * @lparam : logical drives parameters
674 * @span : span 674 * @span : span
675 * 675 *
676 * 8-LD logical drive with upto 4 spans 676 * 8-LD logical drive with up to 4 spans
677 */ 677 */
678typedef struct { 678typedef struct {
679 logdrv_param_t lparam; 679 logdrv_param_t lparam;
@@ -720,7 +720,7 @@ typedef struct {
720 * @ldrv : logical drives information 720 * @ldrv : logical drives information
721 * @pdrv : physical drives information 721 * @pdrv : physical drives information
722 * 722 *
723 * Disk array for 8LD logical drives with upto 8 spans 723 * Disk array for 8LD logical drives with up to 8 spans
724 */ 724 */
725typedef struct { 725typedef struct {
726 uint8_t numldrv; 726 uint8_t numldrv;
@@ -737,7 +737,7 @@ typedef struct {
737 * @ldrv : logical drives information 737 * @ldrv : logical drives information
738 * @pdrv : physical drives information 738 * @pdrv : physical drives information
739 * 739 *
740 * Disk array for 8LD logical drives with upto 4 spans 740 * Disk array for 8LD logical drives with up to 4 spans
741 */ 741 */
742typedef struct { 742typedef struct {
743 uint8_t numldrv; 743 uint8_t numldrv;
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index 5708cb27d078..1dba32870b4c 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -2689,7 +2689,7 @@ megaraid_reset_handler(struct scsi_cmnd *scp)
2689 (MBOX_RESET_WAIT + MBOX_RESET_EXT_WAIT) - i)); 2689 (MBOX_RESET_WAIT + MBOX_RESET_EXT_WAIT) - i));
2690 } 2690 }
2691 2691
2692 // bailout if no recovery happended in reset time 2692 // bailout if no recovery happened in reset time
2693 if (adapter->outstanding_cmds == 0) { 2693 if (adapter->outstanding_cmds == 0) {
2694 break; 2694 break;
2695 } 2695 }
@@ -3452,7 +3452,7 @@ megaraid_mbox_display_scb(adapter_t *adapter, scb_t *scb)
3452 * megaraid_mbox_setup_device_map - manage device ids 3452 * megaraid_mbox_setup_device_map - manage device ids
3453 * @adapter : Driver's soft state 3453 * @adapter : Driver's soft state
3454 * 3454 *
3455 * Manange the device ids to have an appropraite mapping between the kernel 3455 * Manange the device ids to have an appropriate mapping between the kernel
3456 * scsi addresses and megaraid scsi and logical drive addresses. We export 3456 * scsi addresses and megaraid scsi and logical drive addresses. We export
3457 * scsi devices on their actual addresses, whereas the logical drives are 3457 * scsi devices on their actual addresses, whereas the logical drives are
3458 * exported on a virtual scsi channel. 3458 * exported on a virtual scsi channel.
@@ -3973,7 +3973,7 @@ megaraid_sysfs_get_ldmap_timeout(unsigned long data)
3973 * NOTE: The commands issuance functionality is not generalized and 3973 * NOTE: The commands issuance functionality is not generalized and
3974 * implemented in context of "get ld map" command only. If required, the 3974 * implemented in context of "get ld map" command only. If required, the
3975 * command issuance logical can be trivially pulled out and implemented as a 3975 * command issuance logical can be trivially pulled out and implemented as a
3976 * standalone libary. For now, this should suffice since there is no other 3976 * standalone library. For now, this should suffice since there is no other
3977 * user of this interface. 3977 * user of this interface.
3978 * 3978 *
3979 * Return 0 on success. 3979 * Return 0 on success.
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index 635b228c3ead..046dcc672ec1 100644
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -1347,7 +1347,7 @@ struct megasas_instance {
1347 struct timer_list io_completion_timer; 1347 struct timer_list io_completion_timer;
1348 struct list_head internal_reset_pending_q; 1348 struct list_head internal_reset_pending_q;
1349 1349
1350 /* Ptr to hba specfic information */ 1350 /* Ptr to hba specific information */
1351 void *ctrl_context; 1351 void *ctrl_context;
1352 u8 msi_flag; 1352 u8 msi_flag;
1353 struct msix_entry msixentry; 1353 struct msix_entry msixentry;
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index bbd10c81fd9c..66d4cea4df98 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -1698,7 +1698,7 @@ void megasas_do_ocr(struct megasas_instance *instance)
1698 * megasas_wait_for_outstanding - Wait for all outstanding cmds 1698 * megasas_wait_for_outstanding - Wait for all outstanding cmds
1699 * @instance: Adapter soft state 1699 * @instance: Adapter soft state
1700 * 1700 *
1701 * This function waits for upto MEGASAS_RESET_WAIT_TIME seconds for FW to 1701 * This function waits for up to MEGASAS_RESET_WAIT_TIME seconds for FW to
1702 * complete all its outstanding commands. Returns error if one or more IOs 1702 * complete all its outstanding commands. Returns error if one or more IOs
1703 * are pending after this time period. It also marks the controller dead. 1703 * are pending after this time period. It also marks the controller dead.
1704 */ 1704 */
diff --git a/drivers/scsi/mpt2sas/mpi/mpi2_init.h b/drivers/scsi/mpt2sas/mpi/mpi2_init.h
index 20e6b8869341..165454d52591 100644
--- a/drivers/scsi/mpt2sas/mpi/mpi2_init.h
+++ b/drivers/scsi/mpt2sas/mpi/mpi2_init.h
@@ -21,7 +21,7 @@
21 * 05-21-08 02.00.05 Fixed typo in name of Mpi2SepRequest_t. 21 * 05-21-08 02.00.05 Fixed typo in name of Mpi2SepRequest_t.
22 * 10-02-08 02.00.06 Removed Untagged and No Disconnect values from SCSI IO 22 * 10-02-08 02.00.06 Removed Untagged and No Disconnect values from SCSI IO
23 * Control field Task Attribute flags. 23 * Control field Task Attribute flags.
24 * Moved LUN field defines to mpi2.h becasue they are 24 * Moved LUN field defines to mpi2.h because they are
25 * common to many structures. 25 * common to many structures.
26 * 05-06-09 02.00.07 Changed task management type of Query Unit Attention to 26 * 05-06-09 02.00.07 Changed task management type of Query Unit Attention to
27 * Query Asynchronous Event. 27 * Query Asynchronous Event.
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index 5e001ffd4c13..3346357031e9 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -925,7 +925,7 @@ _base_interrupt(int irq, void *bus_id)
925} 925}
926 926
927/** 927/**
928 * mpt2sas_base_release_callback_handler - clear interupt callback handler 928 * mpt2sas_base_release_callback_handler - clear interrupt callback handler
929 * @cb_idx: callback index 929 * @cb_idx: callback index
930 * 930 *
931 * Return nothing. 931 * Return nothing.
@@ -1113,7 +1113,7 @@ _base_restore_msix_table(struct MPT2SAS_ADAPTER *ioc)
1113 * @ioc: per adapter object 1113 * @ioc: per adapter object
1114 * 1114 *
1115 * Check to see if card is capable of MSIX, and set number 1115 * Check to see if card is capable of MSIX, and set number
1116 * of avaliable msix vectors 1116 * of available msix vectors
1117 */ 1117 */
1118static int 1118static int
1119_base_check_enable_msix(struct MPT2SAS_ADAPTER *ioc) 1119_base_check_enable_msix(struct MPT2SAS_ADAPTER *ioc)
@@ -1595,7 +1595,7 @@ mpt2sas_base_put_smid_scsi_io(struct MPT2SAS_ADAPTER *ioc, u16 smid, u16 handle)
1595 1595
1596 1596
1597/** 1597/**
1598 * mpt2sas_base_put_smid_hi_priority - send Task Managment request to firmware 1598 * mpt2sas_base_put_smid_hi_priority - send Task Management request to firmware
1599 * @ioc: per adapter object 1599 * @ioc: per adapter object
1600 * @smid: system request message index 1600 * @smid: system request message index
1601 * 1601 *
@@ -2599,7 +2599,7 @@ _base_wait_for_doorbell_int(struct MPT2SAS_ADAPTER *ioc, int timeout,
2599 int_status = readl(&ioc->chip->HostInterruptStatus); 2599 int_status = readl(&ioc->chip->HostInterruptStatus);
2600 if (int_status & MPI2_HIS_IOC2SYS_DB_STATUS) { 2600 if (int_status & MPI2_HIS_IOC2SYS_DB_STATUS) {
2601 dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: " 2601 dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "
2602 "successfull count(%d), timeout(%d)\n", ioc->name, 2602 "successful count(%d), timeout(%d)\n", ioc->name,
2603 __func__, count, timeout)); 2603 __func__, count, timeout));
2604 return 0; 2604 return 0;
2605 } 2605 }
@@ -2640,7 +2640,7 @@ _base_wait_for_doorbell_ack(struct MPT2SAS_ADAPTER *ioc, int timeout,
2640 int_status = readl(&ioc->chip->HostInterruptStatus); 2640 int_status = readl(&ioc->chip->HostInterruptStatus);
2641 if (!(int_status & MPI2_HIS_SYS2IOC_DB_STATUS)) { 2641 if (!(int_status & MPI2_HIS_SYS2IOC_DB_STATUS)) {
2642 dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: " 2642 dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "
2643 "successfull count(%d), timeout(%d)\n", ioc->name, 2643 "successful count(%d), timeout(%d)\n", ioc->name,
2644 __func__, count, timeout)); 2644 __func__, count, timeout));
2645 return 0; 2645 return 0;
2646 } else if (int_status & MPI2_HIS_IOC2SYS_DB_STATUS) { 2646 } else if (int_status & MPI2_HIS_IOC2SYS_DB_STATUS) {
@@ -2688,7 +2688,7 @@ _base_wait_for_doorbell_not_used(struct MPT2SAS_ADAPTER *ioc, int timeout,
2688 doorbell_reg = readl(&ioc->chip->Doorbell); 2688 doorbell_reg = readl(&ioc->chip->Doorbell);
2689 if (!(doorbell_reg & MPI2_DOORBELL_USED)) { 2689 if (!(doorbell_reg & MPI2_DOORBELL_USED)) {
2690 dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: " 2690 dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "
2691 "successfull count(%d), timeout(%d)\n", ioc->name, 2691 "successful count(%d), timeout(%d)\n", ioc->name,
2692 __func__, count, timeout)); 2692 __func__, count, timeout));
2693 return 0; 2693 return 0;
2694 } 2694 }
diff --git a/drivers/scsi/mpt2sas/mpt2sas_config.c b/drivers/scsi/mpt2sas/mpt2sas_config.c
index 6afd67b324fe..6861244249a3 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_config.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_config.c
@@ -93,7 +93,7 @@ struct config_request{
93 * @mpi_reply: reply message frame 93 * @mpi_reply: reply message frame
94 * Context: none. 94 * Context: none.
95 * 95 *
96 * Function for displaying debug info helpfull when debugging issues 96 * Function for displaying debug info helpful when debugging issues
97 * in this module. 97 * in this module.
98 */ 98 */
99static void 99static void
diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.c b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
index e92b77af5484..1c6d2b405eef 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_ctl.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
@@ -116,7 +116,7 @@ _ctl_sas_device_find_by_handle(struct MPT2SAS_ADAPTER *ioc, u16 handle)
116 * @mpi_reply: reply message frame 116 * @mpi_reply: reply message frame
117 * Context: none. 117 * Context: none.
118 * 118 *
119 * Function for displaying debug info helpfull when debugging issues 119 * Function for displaying debug info helpful when debugging issues
120 * in this module. 120 * in this module.
121 */ 121 */
122static void 122static void
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index 6ceb7759bfe5..d2064a0533ae 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -397,7 +397,7 @@ _scsih_get_sas_address(struct MPT2SAS_ADAPTER *ioc, u16 handle,
397 * @is_raid: [flag] 1 = raid object, 0 = sas object 397 * @is_raid: [flag] 1 = raid object, 0 = sas object
398 * 398 *
399 * Determines whether this device should be first reported device to 399 * Determines whether this device should be first reported device to
400 * to scsi-ml or sas transport, this purpose is for persistant boot device. 400 * to scsi-ml or sas transport, this purpose is for persistent boot device.
401 * There are primary, alternate, and current entries in bios page 2. The order 401 * There are primary, alternate, and current entries in bios page 2. The order
402 * priority is primary, alternate, then current. This routine saves 402 * priority is primary, alternate, then current. This routine saves
403 * the corresponding device object and is_raid flag in the ioc object. 403 * the corresponding device object and is_raid flag in the ioc object.
@@ -2671,10 +2671,10 @@ _scsih_block_io_to_children_attached_directly(struct MPT2SAS_ADAPTER *ioc,
2671 * @handle: device handle 2671 * @handle: device handle
2672 * Context: interrupt time. 2672 * Context: interrupt time.
2673 * 2673 *
2674 * This code is to initiate the device removal handshake protocal 2674 * This code is to initiate the device removal handshake protocol
2675 * with controller firmware. This function will issue target reset 2675 * with controller firmware. This function will issue target reset
2676 * using high priority request queue. It will send a sas iounit 2676 * using high priority request queue. It will send a sas iounit
2677 * controll request (MPI2_SAS_OP_REMOVE_DEVICE) from this completion. 2677 * control request (MPI2_SAS_OP_REMOVE_DEVICE) from this completion.
2678 * 2678 *
2679 * This is designed to send muliple task management request at the same 2679 * This is designed to send muliple task management request at the same
2680 * time to the fifo. If the fifo is full, we will append the request, 2680 * time to the fifo. If the fifo is full, we will append the request,
@@ -2749,9 +2749,9 @@ _scsih_tm_tr_send(struct MPT2SAS_ADAPTER *ioc, u16 handle)
2749 * @reply: reply message frame(lower 32bit addr) 2749 * @reply: reply message frame(lower 32bit addr)
2750 * Context: interrupt time. 2750 * Context: interrupt time.
2751 * 2751 *
2752 * This is the sas iounit controll completion routine. 2752 * This is the sas iounit control completion routine.
2753 * This code is part of the code to initiate the device removal 2753 * This code is part of the code to initiate the device removal
2754 * handshake protocal with controller firmware. 2754 * handshake protocol with controller firmware.
2755 * 2755 *
2756 * Return 1 meaning mf should be freed from _base_interrupt 2756 * Return 1 meaning mf should be freed from _base_interrupt
2757 * 0 means the mf is freed from this function. 2757 * 0 means the mf is freed from this function.
@@ -2878,8 +2878,8 @@ _scsih_tm_volume_tr_complete(struct MPT2SAS_ADAPTER *ioc, u16 smid,
2878 * 2878 *
2879 * This is the target reset completion routine. 2879 * This is the target reset completion routine.
2880 * This code is part of the code to initiate the device removal 2880 * This code is part of the code to initiate the device removal
2881 * handshake protocal with controller firmware. 2881 * handshake protocol with controller firmware.
2882 * It will send a sas iounit controll request (MPI2_SAS_OP_REMOVE_DEVICE) 2882 * It will send a sas iounit control request (MPI2_SAS_OP_REMOVE_DEVICE)
2883 * 2883 *
2884 * Return 1 meaning mf should be freed from _base_interrupt 2884 * Return 1 meaning mf should be freed from _base_interrupt
2885 * 0 means the mf is freed from this function. 2885 * 0 means the mf is freed from this function.
@@ -2984,7 +2984,7 @@ _scsih_check_for_pending_tm(struct MPT2SAS_ADAPTER *ioc, u16 smid)
2984 * 2984 *
2985 * This routine added to better handle cable breaker. 2985 * This routine added to better handle cable breaker.
2986 * 2986 *
2987 * This handles the case where driver recieves multiple expander 2987 * This handles the case where driver receives multiple expander
2988 * add and delete events in a single shot. When there is a delete event 2988 * add and delete events in a single shot. When there is a delete event
2989 * the routine will void any pending add events waiting in the event queue. 2989 * the routine will void any pending add events waiting in the event queue.
2990 * 2990 *
@@ -3511,7 +3511,7 @@ _scsih_normalize_sense(char *sense_buffer, struct sense_info *data)
3511 3511
3512#ifdef CONFIG_SCSI_MPT2SAS_LOGGING 3512#ifdef CONFIG_SCSI_MPT2SAS_LOGGING
3513/** 3513/**
3514 * _scsih_scsi_ioc_info - translated non-successfull SCSI_IO request 3514 * _scsih_scsi_ioc_info - translated non-successful SCSI_IO request
3515 * @ioc: per adapter object 3515 * @ioc: per adapter object
3516 * @scmd: pointer to scsi command object 3516 * @scmd: pointer to scsi command object
3517 * @mpi_reply: reply mf payload returned from firmware 3517 * @mpi_reply: reply mf payload returned from firmware
@@ -5138,7 +5138,7 @@ _scsih_sas_broadcast_primative_event(struct MPT2SAS_ADAPTER *ioc,
5138 unsigned long flags; 5138 unsigned long flags;
5139 int r; 5139 int r;
5140 5140
5141 dewtprintk(ioc, printk(MPT2SAS_INFO_FMT "broadcast primative: " 5141 dewtprintk(ioc, printk(MPT2SAS_INFO_FMT "broadcast primitive: "
5142 "phy number(%d), width(%d)\n", ioc->name, event_data->PhyNum, 5142 "phy number(%d), width(%d)\n", ioc->name, event_data->PhyNum,
5143 event_data->PortWidth)); 5143 event_data->PortWidth));
5144 dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: enter\n", ioc->name, 5144 dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: enter\n", ioc->name,
diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c
index 46cc3825638d..835d8d66e696 100644
--- a/drivers/scsi/ncr53c8xx.c
+++ b/drivers/scsi/ncr53c8xx.c
@@ -2679,7 +2679,7 @@ static struct script script0 __initdata = {
2679}/*-------------------------< RESEL_TAG >-------------------*/,{ 2679}/*-------------------------< RESEL_TAG >-------------------*/,{
2680 /* 2680 /*
2681 ** Read IDENTIFY + SIMPLE + TAG using a single MOVE. 2681 ** Read IDENTIFY + SIMPLE + TAG using a single MOVE.
2682 ** Agressive optimization, is'nt it? 2682 ** Aggressive optimization, is'nt it?
2683 ** No need to test the SIMPLE TAG message, since the 2683 ** No need to test the SIMPLE TAG message, since the
2684 ** driver only supports conformant devices for tags. ;-) 2684 ** driver only supports conformant devices for tags. ;-)
2685 */ 2685 */
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index 6b8b021400f8..f6a50c98c36f 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -1288,7 +1288,7 @@ static irqreturn_t do_nsp32_isr(int irq, void *dev_id)
1288 nsp32_dbg(NSP32_DEBUG_INTR, "SSACK=0x%lx", 1288 nsp32_dbg(NSP32_DEBUG_INTR, "SSACK=0x%lx",
1289 nsp32_read4(base, SAVED_SACK_CNT)); 1289 nsp32_read4(base, SAVED_SACK_CNT));
1290 1290
1291 scsi_set_resid(SCpnt, 0); /* all data transfered! */ 1291 scsi_set_resid(SCpnt, 0); /* all data transferred! */
1292 } 1292 }
1293 1293
1294 /* 1294 /*
@@ -1630,7 +1630,7 @@ static int nsp32_busfree_occur(struct scsi_cmnd *SCpnt, unsigned short execph)
1630 1630
1631 /* 1631 /*
1632 * If SAVEDSACKCNT == 0, it means SavedDataPointer is 1632 * If SAVEDSACKCNT == 0, it means SavedDataPointer is
1633 * come after data transfering. 1633 * come after data transferring.
1634 */ 1634 */
1635 if (s_sacklen > 0) { 1635 if (s_sacklen > 0) {
1636 /* 1636 /*
@@ -1785,7 +1785,7 @@ static void nsp32_adjust_busfree(struct scsi_cmnd *SCpnt, unsigned int s_sacklen
1785 the head element of the sg. restlen is correctly calculated. */ 1785 the head element of the sg. restlen is correctly calculated. */
1786 } 1786 }
1787 1787
1788 /* calculate the rest length for transfering */ 1788 /* calculate the rest length for transferring */
1789 restlen = sentlen - s_sacklen; 1789 restlen = sentlen - s_sacklen;
1790 1790
1791 /* update adjusting current SG table entry */ 1791 /* update adjusting current SG table entry */
diff --git a/drivers/scsi/nsp32.h b/drivers/scsi/nsp32.h
index 9565acf1aa72..c0221829069c 100644
--- a/drivers/scsi/nsp32.h
+++ b/drivers/scsi/nsp32.h
@@ -507,7 +507,7 @@ typedef struct _nsp32_lunt {
507/* 507/*
508 * SCSI TARGET/LUN definition 508 * SCSI TARGET/LUN definition
509 */ 509 */
510#define NSP32_HOST_SCSIID 7 /* SCSI initiator is everytime defined as 7 */ 510#define NSP32_HOST_SCSIID 7 /* SCSI initiator is every time defined as 7 */
511#define MAX_TARGET 8 511#define MAX_TARGET 8
512#define MAX_LUN 8 /* XXX: In SPI3, max number of LUN is 64. */ 512#define MAX_LUN 8 /* XXX: In SPI3, max number of LUN is 64. */
513 513
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 521e2182d45b..58f5be4740e9 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -1366,7 +1366,7 @@ error:
1366/* The values below are based on the OnStream frame payload size of 32K == 2**15, 1366/* The values below are based on the OnStream frame payload size of 32K == 2**15,
1367 * that is, OSST_FRAME_SHIFT + OSST_SECTOR_SHIFT must be 15. With a minimum block 1367 * that is, OSST_FRAME_SHIFT + OSST_SECTOR_SHIFT must be 15. With a minimum block
1368 * size of 512 bytes, we need to be able to resolve 32K/512 == 64 == 2**6 positions 1368 * size of 512 bytes, we need to be able to resolve 32K/512 == 64 == 2**6 positions
1369 * inside each frame. Finaly, OSST_SECTOR_MASK == 2**OSST_FRAME_SHIFT - 1. 1369 * inside each frame. Finally, OSST_SECTOR_MASK == 2**OSST_FRAME_SHIFT - 1.
1370 */ 1370 */
1371#define OSST_FRAME_SHIFT 6 1371#define OSST_FRAME_SHIFT 6
1372#define OSST_SECTOR_SHIFT 9 1372#define OSST_SECTOR_SHIFT 9
@@ -3131,7 +3131,7 @@ static int osst_flush_write_buffer(struct osst_tape *STp, struct osst_request **
3131 } 3131 }
3132#if DEBUG 3132#if DEBUG
3133 if (debugging) 3133 if (debugging)
3134 printk(OSST_DEB_MSG "%s:D: Flushing %d bytes, Transfering %d bytes in %d lblocks.\n", 3134 printk(OSST_DEB_MSG "%s:D: Flushing %d bytes, Transferring %d bytes in %d lblocks.\n",
3135 name, offset, transfer, blks); 3135 name, offset, transfer, blks);
3136#endif 3136#endif
3137 3137
@@ -3811,7 +3811,7 @@ static ssize_t osst_read(struct file * filp, char __user * buf, size_t count, lo
3811 3811
3812 if (transfer == 0) { 3812 if (transfer == 0) {
3813 printk(KERN_WARNING 3813 printk(KERN_WARNING
3814 "%s:W: Nothing can be transfered, requested %Zd, tape block size (%d%c).\n", 3814 "%s:W: Nothing can be transferred, requested %Zd, tape block size (%d%c).\n",
3815 name, count, STp->block_size < 1024? 3815 name, count, STp->block_size < 1024?
3816 STp->block_size:STp->block_size/1024, 3816 STp->block_size:STp->block_size/1024,
3817 STp->block_size<1024?'b':'k'); 3817 STp->block_size<1024?'b':'k');
diff --git a/drivers/scsi/osst.h b/drivers/scsi/osst.h
index 11d26c57f3f8..b4fea98ba276 100644
--- a/drivers/scsi/osst.h
+++ b/drivers/scsi/osst.h
@@ -413,7 +413,7 @@ typedef struct os_dat_s {
413 * AUX 413 * AUX
414 */ 414 */
415typedef struct os_aux_s { 415typedef struct os_aux_s {
416 __be32 format_id; /* hardware compability AUX is based on */ 416 __be32 format_id; /* hardware compatibility AUX is based on */
417 char application_sig[4]; /* driver used to write this media */ 417 char application_sig[4]; /* driver used to write this media */
418 __be32 hdwr; /* reserved */ 418 __be32 hdwr; /* reserved */
419 __be32 update_frame_cntr; /* for configuration frame */ 419 __be32 update_frame_cntr; /* for configuration frame */
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index be3f33d31a99..54bdf6d85c6d 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -742,7 +742,7 @@ static void nsp_pio_read(struct scsi_cmnd *SCpnt)
742 742
743 res = nsp_fifo_count(SCpnt) - ocount; 743 res = nsp_fifo_count(SCpnt) - ocount;
744 //nsp_dbg(NSP_DEBUG_DATA_IO, "ptr=0x%p this=0x%x ocount=0x%x res=0x%x", SCpnt->SCp.ptr, SCpnt->SCp.this_residual, ocount, res); 744 //nsp_dbg(NSP_DEBUG_DATA_IO, "ptr=0x%p this=0x%x ocount=0x%x res=0x%x", SCpnt->SCp.ptr, SCpnt->SCp.this_residual, ocount, res);
745 if (res == 0) { /* if some data avilable ? */ 745 if (res == 0) { /* if some data available ? */
746 if (stat == BUSPHASE_DATA_IN) { /* phase changed? */ 746 if (stat == BUSPHASE_DATA_IN) { /* phase changed? */
747 //nsp_dbg(NSP_DEBUG_DATA_IO, " wait for data this=%d", SCpnt->SCp.this_residual); 747 //nsp_dbg(NSP_DEBUG_DATA_IO, " wait for data this=%d", SCpnt->SCp.this_residual);
748 continue; 748 continue;
diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c
index 18b6c55cd08c..8b7db1e53c10 100644
--- a/drivers/scsi/pm8001/pm8001_hwi.c
+++ b/drivers/scsi/pm8001/pm8001_hwi.c
@@ -339,7 +339,7 @@ update_outbnd_queue_table(struct pm8001_hba_info *pm8001_ha, int number)
339 339
340/** 340/**
341 * bar4_shift - function is called to shift BAR base address 341 * bar4_shift - function is called to shift BAR base address
342 * @pm8001_ha : our hba card infomation 342 * @pm8001_ha : our hba card information
343 * @shiftValue : shifting value in memory bar. 343 * @shiftValue : shifting value in memory bar.
344 */ 344 */
345static int bar4_shift(struct pm8001_hba_info *pm8001_ha, u32 shiftValue) 345static int bar4_shift(struct pm8001_hba_info *pm8001_ha, u32 shiftValue)
diff --git a/drivers/scsi/pm8001/pm8001_hwi.h b/drivers/scsi/pm8001/pm8001_hwi.h
index 833a5201eda4..909132041c07 100644
--- a/drivers/scsi/pm8001/pm8001_hwi.h
+++ b/drivers/scsi/pm8001/pm8001_hwi.h
@@ -209,7 +209,7 @@ struct pio_setup_fis {
209 209
210/* 210/*
211 * brief the data structure of SATA Completion Response 211 * brief the data structure of SATA Completion Response
212 * use to discribe the sata task response (64 bytes) 212 * use to describe the sata task response (64 bytes)
213 */ 213 */
214struct sata_completion_resp { 214struct sata_completion_resp {
215 __le32 tag; 215 __le32 tag;
@@ -951,7 +951,7 @@ struct set_dev_state_resp {
951#define PCIE_EVENT_INTERRUPT 0x003044 951#define PCIE_EVENT_INTERRUPT 0x003044
952#define PCIE_ERROR_INTERRUPT_ENABLE 0x003048 952#define PCIE_ERROR_INTERRUPT_ENABLE 0x003048
953#define PCIE_ERROR_INTERRUPT 0x00304C 953#define PCIE_ERROR_INTERRUPT 0x00304C
954/* signature defintion for host scratch pad0 register */ 954/* signature definition for host scratch pad0 register */
955#define SPC_SOFT_RESET_SIGNATURE 0x252acbcd 955#define SPC_SOFT_RESET_SIGNATURE 0x252acbcd
956/* Signature for Soft Reset */ 956/* Signature for Soft Reset */
957 957
diff --git a/drivers/scsi/pm8001/pm8001_sas.h b/drivers/scsi/pm8001/pm8001_sas.h
index bdb6b27dedd6..aa05e661d113 100644
--- a/drivers/scsi/pm8001/pm8001_sas.h
+++ b/drivers/scsi/pm8001/pm8001_sas.h
@@ -445,7 +445,7 @@ struct fw_control_info {
445struct fw_control_ex { 445struct fw_control_ex {
446 struct fw_control_info *fw_control; 446 struct fw_control_info *fw_control;
447 void *buffer;/* keep buffer pointer to be 447 void *buffer;/* keep buffer pointer to be
448 freed when the responce comes*/ 448 freed when the response comes*/
449 void *virtAddr;/* keep virtual address of the data */ 449 void *virtAddr;/* keep virtual address of the data */
450 void *usrAddr;/* keep virtual address of the 450 void *usrAddr;/* keep virtual address of the
451 user data */ 451 user data */
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index bcf858e88c64..96d5ad0c1e42 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -213,7 +213,7 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
213 * pmcraid_slave_configure - Configures a SCSI device 213 * pmcraid_slave_configure - Configures a SCSI device
214 * @scsi_dev: scsi device struct 214 * @scsi_dev: scsi device struct
215 * 215 *
216 * This fucntion is executed by SCSI mid layer just after a device is first 216 * This function is executed by SCSI mid layer just after a device is first
217 * scanned (i.e. it has responded to an INQUIRY). For VSET resources, the 217 * scanned (i.e. it has responded to an INQUIRY). For VSET resources, the
218 * timeout value (default 30s) will be over-written to a higher value (60s) 218 * timeout value (default 30s) will be over-written to a higher value (60s)
219 * and max_sectors value will be over-written to 512. It also sets queue depth 219 * and max_sectors value will be over-written to 512. It also sets queue depth
@@ -2122,7 +2122,7 @@ static void pmcraid_fail_outstanding_cmds(struct pmcraid_instance *pinstance)
2122 * 2122 *
2123 * This function executes most of the steps required for IOA reset. This gets 2123 * This function executes most of the steps required for IOA reset. This gets
2124 * called by user threads (modprobe/insmod/rmmod) timer, tasklet and midlayer's 2124 * called by user threads (modprobe/insmod/rmmod) timer, tasklet and midlayer's
2125 * 'eh_' thread. Access to variables used for controling the reset sequence is 2125 * 'eh_' thread. Access to variables used for controlling the reset sequence is
2126 * synchronized using host lock. Various functions called during reset process 2126 * synchronized using host lock. Various functions called during reset process
2127 * would make use of a single command block, pointer to which is also stored in 2127 * would make use of a single command block, pointer to which is also stored in
2128 * adapter instance structure. 2128 * adapter instance structure.
@@ -2994,7 +2994,7 @@ static int pmcraid_abort_complete(struct pmcraid_cmd *cancel_cmd)
2994 2994
2995 /* If the abort task is not timed out we will get a Good completion 2995 /* If the abort task is not timed out we will get a Good completion
2996 * as sense_key, otherwise we may get one the following responses 2996 * as sense_key, otherwise we may get one the following responses
2997 * due to subsquent bus reset or device reset. In case IOASC is 2997 * due to subsequent bus reset or device reset. In case IOASC is
2998 * NR_SYNC_REQUIRED, set sync_reqd flag for the corresponding resource 2998 * NR_SYNC_REQUIRED, set sync_reqd flag for the corresponding resource
2999 */ 2999 */
3000 if (ioasc == PMCRAID_IOASC_UA_BUS_WAS_RESET || 3000 if (ioasc == PMCRAID_IOASC_UA_BUS_WAS_RESET ||
@@ -3933,7 +3933,7 @@ static long pmcraid_ioctl_passthrough(
3933 3933
3934 /* if abort task couldn't find the command i.e it got 3934 /* if abort task couldn't find the command i.e it got
3935 * completed prior to aborting, return good completion. 3935 * completed prior to aborting, return good completion.
3936 * if command got aborted succesfully or there was IOA 3936 * if command got aborted successfully or there was IOA
3937 * reset due to abort task itself getting timedout then 3937 * reset due to abort task itself getting timedout then
3938 * return -ETIMEDOUT 3938 * return -ETIMEDOUT
3939 */ 3939 */
@@ -5932,7 +5932,7 @@ static int __devinit pmcraid_probe(
5932 * However, firmware supports 64-bit streaming DMA buffers, whereas 5932 * However, firmware supports 64-bit streaming DMA buffers, whereas
5933 * coherent buffers are to be 32-bit. Since pci_alloc_consistent always 5933 * coherent buffers are to be 32-bit. Since pci_alloc_consistent always
5934 * returns memory within 4GB (if not, change this logic), coherent 5934 * returns memory within 4GB (if not, change this logic), coherent
5935 * buffers are within firmware acceptible address ranges. 5935 * buffers are within firmware acceptable address ranges.
5936 */ 5936 */
5937 if ((sizeof(dma_addr_t) == 4) || 5937 if ((sizeof(dma_addr_t) == 4) ||
5938 pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) 5938 pci_set_dma_mask(pdev, DMA_BIT_MASK(64)))
diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
index 4db210d93947..34e4c915002e 100644
--- a/drivers/scsi/pmcraid.h
+++ b/drivers/scsi/pmcraid.h
@@ -1024,7 +1024,7 @@ static struct pmcraid_ioasc_error pmcraid_ioasc_error_table[] = {
1024 1024
1025 1025
1026/* 1026/*
1027 * pmcraid_ioctl_header - definition of header structure that preceeds all the 1027 * pmcraid_ioctl_header - definition of header structure that precedes all the
1028 * buffers given as ioctl arguments. 1028 * buffers given as ioctl arguments.
1029 * 1029 *
1030 * .signature : always ASCII string, "PMCRAID" 1030 * .signature : always ASCII string, "PMCRAID"
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 5dec684bf010..8ba5744c267e 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -78,7 +78,7 @@
78 - Clean up vchan handling 78 - Clean up vchan handling
79 Rev 3.23.33 July 3, 2003, Jes Sorensen 79 Rev 3.23.33 July 3, 2003, Jes Sorensen
80 - Don't define register access macros before define determining MMIO. 80 - Don't define register access macros before define determining MMIO.
81 This just happend to work out on ia64 but not elsewhere. 81 This just happened to work out on ia64 but not elsewhere.
82 - Don't try and read from the card while it is in reset as 82 - Don't try and read from the card while it is in reset as
83 it won't respond and causes an MCA 83 it won't respond and causes an MCA
84 Rev 3.23.32 June 23, 2003, Jes Sorensen 84 Rev 3.23.32 June 23, 2003, Jes Sorensen
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 6c51c0a35b9e..ee20353c8550 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -2086,7 +2086,7 @@ struct ct_sns_pkt {
2086}; 2086};
2087 2087
2088/* 2088/*
2089 * SNS command structures -- for 2200 compatability. 2089 * SNS command structures -- for 2200 compatibility.
2090 */ 2090 */
2091#define RFT_ID_SNS_SCMD_LEN 22 2091#define RFT_ID_SNS_SCMD_LEN 22
2092#define RFT_ID_SNS_CMD_SIZE 60 2092#define RFT_ID_SNS_CMD_SIZE 60
diff --git a/drivers/scsi/qla2xxx/qla_fw.h b/drivers/scsi/qla2xxx/qla_fw.h
index 631fefc8482d..f5ba09c8a663 100644
--- a/drivers/scsi/qla2xxx/qla_fw.h
+++ b/drivers/scsi/qla2xxx/qla_fw.h
@@ -539,7 +539,7 @@ struct sts_entry_24xx {
539 * If DIF Error is set in comp_status, these additional fields are 539 * If DIF Error is set in comp_status, these additional fields are
540 * defined: 540 * defined:
541 * &data[10] : uint8_t report_runt_bg[2]; - computed guard 541 * &data[10] : uint8_t report_runt_bg[2]; - computed guard
542 * &data[12] : uint8_t actual_dif[8]; - DIF Data recieved 542 * &data[12] : uint8_t actual_dif[8]; - DIF Data received
543 * &data[20] : uint8_t expected_dif[8]; - DIF Data computed 543 * &data[20] : uint8_t expected_dif[8]; - DIF Data computed
544 */ 544 */
545}; 545};
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index d17ed9a94a0c..712518d05128 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -414,7 +414,7 @@ skip_rio:
414 "marked OFFLINE!\n"); 414 "marked OFFLINE!\n");
415 vha->flags.online = 0; 415 vha->flags.online = 0;
416 } else { 416 } else {
417 /* Check to see if MPI timeout occured */ 417 /* Check to see if MPI timeout occurred */
418 if ((mbx & MBX_3) && (ha->flags.port0)) 418 if ((mbx & MBX_3) && (ha->flags.port0))
419 set_bit(MPI_RESET_NEEDED, 419 set_bit(MPI_RESET_NEEDED,
420 &vha->dpc_flags); 420 &vha->dpc_flags);
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 7a7c0ecfe7dd..34893397ac84 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -303,7 +303,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
303 !test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) { 303 !test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
304 304
305 qla_printk(KERN_WARNING, ha, 305 qla_printk(KERN_WARNING, ha,
306 "Mailbox command timeout occured. " 306 "Mailbox command timeout occurred. "
307 "Scheduling ISP " "abort. eeh_busy: 0x%x\n", 307 "Scheduling ISP " "abort. eeh_busy: 0x%x\n",
308 ha->flags.eeh_busy); 308 ha->flags.eeh_busy);
309 set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags); 309 set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
@@ -321,7 +321,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
321 !test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) { 321 !test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
322 322
323 qla_printk(KERN_WARNING, ha, 323 qla_printk(KERN_WARNING, ha,
324 "Mailbox command timeout occured. " 324 "Mailbox command timeout occurred. "
325 "Issuing ISP abort.\n"); 325 "Issuing ISP abort.\n");
326 326
327 set_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags); 327 set_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags);
@@ -3789,7 +3789,7 @@ qla2x00_loopback_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq,
3789 mcp->mb[20] = LSW(MSD(mreq->send_dma)); 3789 mcp->mb[20] = LSW(MSD(mreq->send_dma));
3790 mcp->mb[21] = MSW(MSD(mreq->send_dma)); 3790 mcp->mb[21] = MSW(MSD(mreq->send_dma));
3791 3791
3792 /* recieve data address */ 3792 /* receive data address */
3793 mcp->mb[16] = LSW(mreq->rcv_dma); 3793 mcp->mb[16] = LSW(mreq->rcv_dma);
3794 mcp->mb[17] = MSW(mreq->rcv_dma); 3794 mcp->mb[17] = MSW(mreq->rcv_dma);
3795 mcp->mb[6] = LSW(MSD(mreq->rcv_dma)); 3795 mcp->mb[6] = LSW(MSD(mreq->rcv_dma));
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 76ec876e6b21..455fe134d31d 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -2598,7 +2598,7 @@ qla82xx_calc_dsd_lists(uint16_t dsds)
2598 * qla82xx_start_scsi() - Send a SCSI command to the ISP 2598 * qla82xx_start_scsi() - Send a SCSI command to the ISP
2599 * @sp: command to send to the ISP 2599 * @sp: command to send to the ISP
2600 * 2600 *
2601 * Returns non-zero if a failure occured, else zero. 2601 * Returns non-zero if a failure occurred, else zero.
2602 */ 2602 */
2603int 2603int
2604qla82xx_start_scsi(srb_t *sp) 2604qla82xx_start_scsi(srb_t *sp)
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 75a966c94860..aa7747529165 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1046,7 +1046,7 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd)
1046 1046
1047eh_bus_reset_done: 1047eh_bus_reset_done:
1048 qla_printk(KERN_INFO, vha->hw, "%s: reset %s\n", __func__, 1048 qla_printk(KERN_INFO, vha->hw, "%s: reset %s\n", __func__,
1049 (ret == FAILED) ? "failed" : "succeded"); 1049 (ret == FAILED) ? "failed" : "succeeded");
1050 1050
1051 return ret; 1051 return ret;
1052} 1052}
@@ -1136,7 +1136,7 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
1136 1136
1137eh_host_reset_lock: 1137eh_host_reset_lock:
1138 qla_printk(KERN_INFO, ha, "%s: reset %s\n", __func__, 1138 qla_printk(KERN_INFO, ha, "%s: reset %s\n", __func__,
1139 (ret == FAILED) ? "failed" : "succeded"); 1139 (ret == FAILED) ? "failed" : "succeeded");
1140 1140
1141 return ret; 1141 return ret;
1142} 1142}
@@ -3902,7 +3902,7 @@ uint32_t qla82xx_error_recovery(scsi_qla_host_t *base_vha)
3902 continue; 3902 continue;
3903 if (atomic_read(&other_pdev->enable_cnt)) { 3903 if (atomic_read(&other_pdev->enable_cnt)) {
3904 DEBUG17(qla_printk(KERN_INFO, ha, 3904 DEBUG17(qla_printk(KERN_INFO, ha,
3905 "Found PCI func availabe and enabled at 0x%x\n", 3905 "Found PCI func available and enabled at 0x%x\n",
3906 fn)); 3906 fn));
3907 pci_dev_put(other_pdev); 3907 pci_dev_put(other_pdev);
3908 break; 3908 break;
diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index c1f8d1b150f7..4757878d59dd 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
@@ -182,7 +182,7 @@ struct srb {
182 uint16_t flags; /* (1) Status flags. */ 182 uint16_t flags; /* (1) Status flags. */
183 183
184#define SRB_DMA_VALID BIT_3 /* DMA Buffer mapped. */ 184#define SRB_DMA_VALID BIT_3 /* DMA Buffer mapped. */
185#define SRB_GOT_SENSE BIT_4 /* sense data recieved. */ 185#define SRB_GOT_SENSE BIT_4 /* sense data received. */
186 uint8_t state; /* (1) Status flags. */ 186 uint8_t state; /* (1) Status flags. */
187 187
188#define SRB_NO_QUEUE_STATE 0 /* Request is in between states */ 188#define SRB_NO_QUEUE_STATE 0 /* Request is in between states */
diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
index bbb2e903d38a..48e2241ddaf4 100644
--- a/drivers/scsi/qla4xxx/ql4_init.c
+++ b/drivers/scsi/qla4xxx/ql4_init.c
@@ -1338,7 +1338,7 @@ exit_init_hba:
1338 } 1338 }
1339 1339
1340 DEBUG2(printk("scsi%ld: initialize adapter: %s\n", ha->host_no, 1340 DEBUG2(printk("scsi%ld: initialize adapter: %s\n", ha->host_no,
1341 status == QLA_ERROR ? "FAILED" : "SUCCEDED")); 1341 status == QLA_ERROR ? "FAILED" : "SUCCEEDED"));
1342 return status; 1342 return status;
1343} 1343}
1344 1344
diff --git a/drivers/scsi/qla4xxx/ql4_nvram.h b/drivers/scsi/qla4xxx/ql4_nvram.h
index b3831bd29479..945cc328f57f 100644
--- a/drivers/scsi/qla4xxx/ql4_nvram.h
+++ b/drivers/scsi/qla4xxx/ql4_nvram.h
@@ -28,7 +28,7 @@
28#define FM93C56A_ERASE 0x3 28#define FM93C56A_ERASE 0x3
29#define FM93C56A_ERASE_ALL 0x0 29#define FM93C56A_ERASE_ALL 0x0
30 30
31/* Command Extentions */ 31/* Command Extensions */
32#define FM93C56A_WEN_EXT 0x3 32#define FM93C56A_WEN_EXT 0x3
33#define FM93C56A_WRITE_ALL_EXT 0x1 33#define FM93C56A_WRITE_ALL_EXT 0x1
34#define FM93C56A_WDS_EXT 0x0 34#define FM93C56A_WDS_EXT 0x0
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index a4acb0dd7beb..230ba097d28c 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -1213,7 +1213,7 @@ recover_ha_init_adapter:
1213 1213
1214 clear_bit(DPC_RESET_ACTIVE, &ha->dpc_flags); 1214 clear_bit(DPC_RESET_ACTIVE, &ha->dpc_flags);
1215 DEBUG2(printk("scsi%ld: recover adapter: %s\n", ha->host_no, 1215 DEBUG2(printk("scsi%ld: recover adapter: %s\n", ha->host_no,
1216 status == QLA_ERROR ? "FAILED" : "SUCCEDED")); 1216 status == QLA_ERROR ? "FAILED" : "SUCCEEDED"));
1217 1217
1218 return status; 1218 return status;
1219} 1219}
@@ -2110,7 +2110,7 @@ static int qla4xxx_eh_abort(struct scsi_cmnd *cmd)
2110 2110
2111 ql4_printk(KERN_INFO, ha, 2111 ql4_printk(KERN_INFO, ha,
2112 "scsi%ld:%d:%d: Abort command - %s\n", 2112 "scsi%ld:%d:%d: Abort command - %s\n",
2113 ha->host_no, id, lun, (ret == SUCCESS) ? "succeded" : "failed"); 2113 ha->host_no, id, lun, (ret == SUCCESS) ? "succeeded" : "failed");
2114 2114
2115 return ret; 2115 return ret;
2116} 2116}
@@ -2278,7 +2278,7 @@ static int qla4xxx_eh_host_reset(struct scsi_cmnd *cmd)
2278 return_status = SUCCESS; 2278 return_status = SUCCESS;
2279 2279
2280 ql4_printk(KERN_INFO, ha, "HOST RESET %s.\n", 2280 ql4_printk(KERN_INFO, ha, "HOST RESET %s.\n",
2281 return_status == FAILED ? "FAILED" : "SUCCEDED"); 2281 return_status == FAILED ? "FAILED" : "SUCCEEDED");
2282 2282
2283 return return_status; 2283 return return_status;
2284} 2284}
@@ -2492,7 +2492,7 @@ qla4xxx_pci_slot_reset(struct pci_dev *pdev)
2492 /* Initialize device or resume if in suspended state */ 2492 /* Initialize device or resume if in suspended state */
2493 rc = pci_enable_device(pdev); 2493 rc = pci_enable_device(pdev);
2494 if (rc) { 2494 if (rc) {
2495 ql4_printk(KERN_WARNING, ha, "scsi%ld: %s: Cant re-enable " 2495 ql4_printk(KERN_WARNING, ha, "scsi%ld: %s: Can't re-enable "
2496 "device after reset\n", ha->host_no, __func__); 2496 "device after reset\n", ha->host_no, __func__);
2497 goto exit_slot_reset; 2497 goto exit_slot_reset;
2498 } 2498 }
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index fa5758cbdedb..6888b2ca5bfc 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -2454,7 +2454,7 @@ static void scsi_debug_slave_destroy(struct scsi_device *sdp)
2454 printk(KERN_INFO "scsi_debug: slave_destroy <%u %u %u %u>\n", 2454 printk(KERN_INFO "scsi_debug: slave_destroy <%u %u %u %u>\n",
2455 sdp->host->host_no, sdp->channel, sdp->id, sdp->lun); 2455 sdp->host->host_no, sdp->channel, sdp->id, sdp->lun);
2456 if (devip) { 2456 if (devip) {
2457 /* make this slot avaliable for re-use */ 2457 /* make this slot available for re-use */
2458 devip->used = 0; 2458 devip->used = 0;
2459 sdp->hostdata = NULL; 2459 sdp->hostdata = NULL;
2460 } 2460 }
diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c
index a2ed201885ae..26a8a45584ef 100644
--- a/drivers/scsi/scsi_netlink.c
+++ b/drivers/scsi/scsi_netlink.c
@@ -499,7 +499,7 @@ scsi_netlink_init(void)
499 SCSI_NL_GRP_CNT, scsi_nl_rcv_msg, NULL, 499 SCSI_NL_GRP_CNT, scsi_nl_rcv_msg, NULL,
500 THIS_MODULE); 500 THIS_MODULE);
501 if (!scsi_nl_sock) { 501 if (!scsi_nl_sock) {
502 printk(KERN_ERR "%s: register of recieve handler failed\n", 502 printk(KERN_ERR "%s: register of receive handler failed\n",
503 __func__); 503 __func__);
504 netlink_unregister_notifier(&scsi_netlink_notifier); 504 netlink_unregister_notifier(&scsi_netlink_notifier);
505 return; 505 return;
diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
index f67282058ba1..8bca8c25ba69 100644
--- a/drivers/scsi/scsi_tgt_lib.c
+++ b/drivers/scsi/scsi_tgt_lib.c
@@ -93,7 +93,7 @@ struct scsi_cmnd *scsi_host_get_command(struct Scsi_Host *shost,
93 93
94 /* 94 /*
95 * The blk helpers are used to the READ/WRITE requests 95 * The blk helpers are used to the READ/WRITE requests
96 * transfering data from a initiator point of view. Since 96 * transferring data from a initiator point of view. Since
97 * we are in target mode we want the opposite. 97 * we are in target mode we want the opposite.
98 */ 98 */
99 rq = blk_get_request(shost->uspace_req_q, !write, gfp_mask); 99 rq = blk_get_request(shost->uspace_req_q, !write, gfp_mask);
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 2941d2d92c94..fdf3fa639056 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -2378,7 +2378,7 @@ fc_flush_devloss(struct Scsi_Host *shost)
2378 * fc_remove_host - called to terminate any fc_transport-related elements for a scsi host. 2378 * fc_remove_host - called to terminate any fc_transport-related elements for a scsi host.
2379 * @shost: Which &Scsi_Host 2379 * @shost: Which &Scsi_Host
2380 * 2380 *
2381 * This routine is expected to be called immediately preceeding the 2381 * This routine is expected to be called immediately preceding the
2382 * a driver's call to scsi_remove_host(). 2382 * a driver's call to scsi_remove_host().
2383 * 2383 *
2384 * WARNING: A driver utilizing the fc_transport, which fails to call 2384 * WARNING: A driver utilizing the fc_transport, which fails to call
@@ -2458,7 +2458,7 @@ static void fc_terminate_rport_io(struct fc_rport *rport)
2458} 2458}
2459 2459
2460/** 2460/**
2461 * fc_starget_delete - called to delete the scsi decendents of an rport 2461 * fc_starget_delete - called to delete the scsi descendants of an rport
2462 * @work: remote port to be operated on. 2462 * @work: remote port to be operated on.
2463 * 2463 *
2464 * Deletes target and all sdevs. 2464 * Deletes target and all sdevs.
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index b61ebec6bca7..bd0806e64e85 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1055,7 +1055,7 @@ static int sd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
1055 * @arg: this is third argument given to ioctl(2) system call. 1055 * @arg: this is third argument given to ioctl(2) system call.
1056 * Often contains a pointer. 1056 * Often contains a pointer.
1057 * 1057 *
1058 * Returns 0 if successful (some ioctls return postive numbers on 1058 * Returns 0 if successful (some ioctls return positive numbers on
1059 * success as well). Returns a negated errno value in case of error. 1059 * success as well). Returns a negated errno value in case of error.
1060 * 1060 *
1061 * Note: most ioctls are forward onto the block subsystem or further 1061 * Note: most ioctls are forward onto the block subsystem or further
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index aefadc6a1607..95019c747cc1 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -567,7 +567,7 @@ static const struct block_device_operations sr_bdops =
567 .revalidate_disk = sr_block_revalidate_disk, 567 .revalidate_disk = sr_block_revalidate_disk,
568 /* 568 /*
569 * No compat_ioctl for now because sr_block_ioctl never 569 * No compat_ioctl for now because sr_block_ioctl never
570 * seems to pass arbitary ioctls down to host drivers. 570 * seems to pass arbitrary ioctls down to host drivers.
571 */ 571 */
572}; 572};
573 573
diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c
index 4f0e5485ffde..07eaef1c722b 100644
--- a/drivers/scsi/sun3_NCR5380.c
+++ b/drivers/scsi/sun3_NCR5380.c
@@ -467,7 +467,7 @@ static void free_all_tags( void )
467 * 467 *
468 * Parameters: struct scsi_cmnd *cmd 468 * Parameters: struct scsi_cmnd *cmd
469 * The command to work on. The first scatter buffer's data are 469 * The command to work on. The first scatter buffer's data are
470 * assumed to be already transfered into ptr/this_residual. 470 * assumed to be already transferred into ptr/this_residual.
471 */ 471 */
472 472
473static void merge_contiguous_buffers(struct scsi_cmnd *cmd) 473static void merge_contiguous_buffers(struct scsi_cmnd *cmd)
@@ -1717,7 +1717,7 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd,
1717 * bytes to transfer, **data - pointer to data pointer. 1717 * bytes to transfer, **data - pointer to data pointer.
1718 * 1718 *
1719 * Returns : -1 when different phase is entered without transferring 1719 * Returns : -1 when different phase is entered without transferring
1720 * maximum number of bytes, 0 if all bytes are transfered or exit 1720 * maximum number of bytes, 0 if all bytes are transferred or exit
1721 * is in same phase. 1721 * is in same phase.
1722 * 1722 *
1723 * Also, *phase, *count, *data are modified in place. 1723 * Also, *phase, *count, *data are modified in place.
@@ -1904,7 +1904,7 @@ static int do_abort (struct Scsi_Host *host)
1904 * bytes to transfer, **data - pointer to data pointer. 1904 * bytes to transfer, **data - pointer to data pointer.
1905 * 1905 *
1906 * Returns : -1 when different phase is entered without transferring 1906 * Returns : -1 when different phase is entered without transferring
1907 * maximum number of bytes, 0 if all bytes or transfered or exit 1907 * maximum number of bytes, 0 if all bytes or transferred or exit
1908 * is in same phase. 1908 * is in same phase.
1909 * 1909 *
1910 * Also, *phase, *count, *data are modified in place. 1910 * Also, *phase, *count, *data are modified in place.
diff --git a/drivers/scsi/sym53c416.c b/drivers/scsi/sym53c416.c
index 190107ae120b..012c86edd59f 100644
--- a/drivers/scsi/sym53c416.c
+++ b/drivers/scsi/sym53c416.c
@@ -774,7 +774,7 @@ static int sym53c416_host_reset(Scsi_Cmnd *SCpnt)
774 774
775 /* printk("sym53c416_reset\n"); */ 775 /* printk("sym53c416_reset\n"); */
776 base = SCpnt->device->host->io_port; 776 base = SCpnt->device->host->io_port;
777 /* search scsi_id - fixme, we shouldnt need to iterate for this! */ 777 /* search scsi_id - fixme, we shouldn't need to iterate for this! */
778 for(i = 0; i < host_index && scsi_id == -1; i++) 778 for(i = 0; i < host_index && scsi_id == -1; i++)
779 if(hosts[i].base == base) 779 if(hosts[i].base == base)
780 scsi_id = hosts[i].scsi_id; 780 scsi_id = hosts[i].scsi_id;
diff --git a/drivers/scsi/sym53c8xx_2/sym_fw1.h b/drivers/scsi/sym53c8xx_2/sym_fw1.h
index 7b08d6caaa99..63952ee300b5 100644
--- a/drivers/scsi/sym53c8xx_2/sym_fw1.h
+++ b/drivers/scsi/sym53c8xx_2/sym_fw1.h
@@ -1449,7 +1449,7 @@ static struct SYM_FWB_SCR SYM_FWB_SCR = {
1449 PADDR_B (msg_weird_seen), 1449 PADDR_B (msg_weird_seen),
1450 /* 1450 /*
1451 * We donnot handle extended messages from SCRIPTS. 1451 * We donnot handle extended messages from SCRIPTS.
1452 * Read the amount of data correponding to the 1452 * Read the amount of data corresponding to the
1453 * message length and call the C code. 1453 * message length and call the C code.
1454 */ 1454 */
1455 SCR_COPY (1), 1455 SCR_COPY (1),
diff --git a/drivers/scsi/sym53c8xx_2/sym_fw2.h b/drivers/scsi/sym53c8xx_2/sym_fw2.h
index ae1fb179b88e..c87d72443a16 100644
--- a/drivers/scsi/sym53c8xx_2/sym_fw2.h
+++ b/drivers/scsi/sym53c8xx_2/sym_fw2.h
@@ -1326,7 +1326,7 @@ static struct SYM_FWB_SCR SYM_FWB_SCR = {
1326 PADDR_B (msg_weird_seen), 1326 PADDR_B (msg_weird_seen),
1327 /* 1327 /*
1328 * We donnot handle extended messages from SCRIPTS. 1328 * We donnot handle extended messages from SCRIPTS.
1329 * Read the amount of data correponding to the 1329 * Read the amount of data corresponding to the
1330 * message length and call the C code. 1330 * message length and call the C code.
1331 */ 1331 */
1332 SCR_STORE_REL (scratcha, 1), 1332 SCR_STORE_REL (scratcha, 1),
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c
index 2c3e89ddf069..d92fe4037e94 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
@@ -2457,7 +2457,7 @@ static void sym_int_ma (struct sym_hcb *np)
2457 } 2457 }
2458 2458
2459 /* 2459 /*
2460 * The data in the dma fifo has not been transfered to 2460 * The data in the dma fifo has not been transferred to
2461 * the target -> add the amount to the rest 2461 * the target -> add the amount to the rest
2462 * and clear the data. 2462 * and clear the data.
2463 * Check the sstat2 register in case of wide transfer. 2463 * Check the sstat2 register in case of wide transfer.
@@ -5094,7 +5094,7 @@ fail:
5094} 5094}
5095 5095
5096/* 5096/*
5097 * Lun control block deallocation. Returns the number of valid remaing LCBs 5097 * Lun control block deallocation. Returns the number of valid remaining LCBs
5098 * for the target. 5098 * for the target.
5099 */ 5099 */
5100int sym_free_lcb(struct sym_hcb *np, u_char tn, u_char ln) 5100int sym_free_lcb(struct sym_hcb *np, u_char tn, u_char ln)
diff --git a/drivers/scsi/sym53c8xx_2/sym_malloc.c b/drivers/scsi/sym53c8xx_2/sym_malloc.c
index 883cac10daf9..6f9af0de7ec3 100644
--- a/drivers/scsi/sym53c8xx_2/sym_malloc.c
+++ b/drivers/scsi/sym53c8xx_2/sym_malloc.c
@@ -50,7 +50,7 @@
50 * from the SCRIPTS code. In addition, cache line alignment 50 * from the SCRIPTS code. In addition, cache line alignment
51 * is guaranteed for power of 2 cache line size. 51 * is guaranteed for power of 2 cache line size.
52 * 52 *
53 * This allocator has been developped for the Linux sym53c8xx 53 * This allocator has been developed for the Linux sym53c8xx
54 * driver, since this O/S does not provide naturally aligned 54 * driver, since this O/S does not provide naturally aligned
55 * allocations. 55 * allocations.
56 * It has the advantage of allowing the driver to use private 56 * It has the advantage of allowing the driver to use private
diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
index 5f697e0bd009..4468ae3610f7 100644
--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
@@ -1843,7 +1843,7 @@ check_setup_args(char *key, int *flags, int *val, char *buf)
1843 * 1843 *
1844 * The original driver used to rely on a fixed sx_table, containing periods 1844 * The original driver used to rely on a fixed sx_table, containing periods
1845 * for (only) the lower limits of the respective input-clock-frequency ranges 1845 * for (only) the lower limits of the respective input-clock-frequency ranges
1846 * (8-10/12-15/16-20 MHz). Although it seems, that no problems ocurred with 1846 * (8-10/12-15/16-20 MHz). Although it seems, that no problems occurred with
1847 * this setting so far, it might be desirable to adjust the transfer periods 1847 * this setting so far, it might be desirable to adjust the transfer periods
1848 * closer to the really attached, possibly 25% higher, input-clock, since 1848 * closer to the really attached, possibly 25% higher, input-clock, since
1849 * - the wd33c93 may really use a significant shorter period, than it has 1849 * - the wd33c93 may really use a significant shorter period, than it has
diff --git a/drivers/scsi/wd7000.c b/drivers/scsi/wd7000.c
index db451ae0a368..9ee0afef2d16 100644
--- a/drivers/scsi/wd7000.c
+++ b/drivers/scsi/wd7000.c
@@ -837,7 +837,7 @@ static inline Scb *alloc_scbs(struct Scsi_Host *host, int needed)
837 } 837 }
838 } 838 }
839 839
840 /* Take the lock, then check we didnt get beaten, if so try again */ 840 /* Take the lock, then check we didn't get beaten, if so try again */
841 spin_lock_irqsave(&scbpool_lock, flags); 841 spin_lock_irqsave(&scbpool_lock, flags);
842 if (freescbs < needed) { 842 if (freescbs < needed) {
843 spin_unlock_irqrestore(&scbpool_lock, flags); 843 spin_unlock_irqrestore(&scbpool_lock, flags);
diff --git a/drivers/sfi/sfi_core.c b/drivers/sfi/sfi_core.c
index 04113e5304a0..1e824fb1649b 100644
--- a/drivers/sfi/sfi_core.c
+++ b/drivers/sfi/sfi_core.c
@@ -515,7 +515,7 @@ void __init sfi_init_late(void)
515} 515}
516 516
517/* 517/*
518 * The reason we put it here becasue we need wait till the /sys/firmware 518 * The reason we put it here because we need wait till the /sys/firmware
519 * is setup, then our interface can be registered in /sys/firmware/sfi 519 * is setup, then our interface can be registered in /sys/firmware/sfi
520 */ 520 */
521core_initcall(sfi_sysfs_init); 521core_initcall(sfi_sysfs_init);
diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c
index 5a4e0afb9ad6..5825370bad25 100644
--- a/drivers/spi/amba-pl022.c
+++ b/drivers/spi/amba-pl022.c
@@ -661,7 +661,7 @@ static void readwriter(struct pl022 *pl022)
661{ 661{
662 662
663 /* 663 /*
664 * The FIFO depth is different inbetween primecell variants. 664 * The FIFO depth is different between primecell variants.
665 * I believe filling in too much in the FIFO might cause 665 * I believe filling in too much in the FIFO might cause
666 * errons in 8bit wide transfers on ARM variants (just 8 words 666 * errons in 8bit wide transfers on ARM variants (just 8 words
667 * FIFO, means only 8x8 = 64 bits in FIFO) at least. 667 * FIFO, means only 8x8 = 64 bits in FIFO) at least.
@@ -722,7 +722,7 @@ static void readwriter(struct pl022 *pl022)
722 * This inner reader takes care of things appearing in the RX 722 * This inner reader takes care of things appearing in the RX
723 * FIFO as we're transmitting. This will happen a lot since the 723 * FIFO as we're transmitting. This will happen a lot since the
724 * clock starts running when you put things into the TX FIFO, 724 * clock starts running when you put things into the TX FIFO,
725 * and then things are continously clocked into the RX FIFO. 725 * and then things are continuously clocked into the RX FIFO.
726 */ 726 */
727 while ((readw(SSP_SR(pl022->virtbase)) & SSP_SR_MASK_RNE) 727 while ((readw(SSP_SR(pl022->virtbase)) & SSP_SR_MASK_RNE)
728 && (pl022->rx < pl022->rx_end)) { 728 && (pl022->rx < pl022->rx_end)) {
@@ -842,7 +842,7 @@ static void dma_callback(void *data)
842 842
843 unmap_free_dma_scatter(pl022); 843 unmap_free_dma_scatter(pl022);
844 844
845 /* Update total bytes transfered */ 845 /* Update total bytes transferred */
846 msg->actual_length += pl022->cur_transfer->len; 846 msg->actual_length += pl022->cur_transfer->len;
847 if (pl022->cur_transfer->cs_change) 847 if (pl022->cur_transfer->cs_change)
848 pl022->cur_chip-> 848 pl022->cur_chip->
@@ -1224,7 +1224,7 @@ static irqreturn_t pl022_interrupt_handler(int irq, void *dev_id)
1224 "number of bytes on a 16bit bus?)\n", 1224 "number of bytes on a 16bit bus?)\n",
1225 (u32) (pl022->rx - pl022->rx_end)); 1225 (u32) (pl022->rx - pl022->rx_end));
1226 } 1226 }
1227 /* Update total bytes transfered */ 1227 /* Update total bytes transferred */
1228 msg->actual_length += pl022->cur_transfer->len; 1228 msg->actual_length += pl022->cur_transfer->len;
1229 if (pl022->cur_transfer->cs_change) 1229 if (pl022->cur_transfer->cs_change)
1230 pl022->cur_chip-> 1230 pl022->cur_chip->
@@ -1415,11 +1415,11 @@ static void do_polling_transfer(struct pl022 *pl022)
1415 SSP_CR1(pl022->virtbase)); 1415 SSP_CR1(pl022->virtbase));
1416 1416
1417 dev_dbg(&pl022->adev->dev, "polling transfer ongoing ...\n"); 1417 dev_dbg(&pl022->adev->dev, "polling transfer ongoing ...\n");
1418 /* FIXME: insert a timeout so we don't hang here indefinately */ 1418 /* FIXME: insert a timeout so we don't hang here indefinitely */
1419 while (pl022->tx < pl022->tx_end || pl022->rx < pl022->rx_end) 1419 while (pl022->tx < pl022->tx_end || pl022->rx < pl022->rx_end)
1420 readwriter(pl022); 1420 readwriter(pl022);
1421 1421
1422 /* Update total byte transfered */ 1422 /* Update total byte transferred */
1423 message->actual_length += pl022->cur_transfer->len; 1423 message->actual_length += pl022->cur_transfer->len;
1424 if (pl022->cur_transfer->cs_change) 1424 if (pl022->cur_transfer->cs_change)
1425 pl022->cur_chip->cs_control(SSP_CHIP_DESELECT); 1425 pl022->cur_chip->cs_control(SSP_CHIP_DESELECT);
@@ -2129,7 +2129,7 @@ pl022_probe(struct amba_device *adev, const struct amba_id *id)
2129 "probe - problem registering spi master\n"); 2129 "probe - problem registering spi master\n");
2130 goto err_spi_register; 2130 goto err_spi_register;
2131 } 2131 }
2132 dev_dbg(dev, "probe succeded\n"); 2132 dev_dbg(dev, "probe succeeded\n");
2133 /* 2133 /*
2134 * Disable the silicon block pclk and any voltage domain and just 2134 * Disable the silicon block pclk and any voltage domain and just
2135 * power it up and clock it when it's needed 2135 * power it up and clock it when it's needed
@@ -2184,7 +2184,7 @@ pl022_remove(struct amba_device *adev)
2184 spi_unregister_master(pl022->master); 2184 spi_unregister_master(pl022->master);
2185 spi_master_put(pl022->master); 2185 spi_master_put(pl022->master);
2186 amba_set_drvdata(adev, NULL); 2186 amba_set_drvdata(adev, NULL);
2187 dev_dbg(&adev->dev, "remove succeded\n"); 2187 dev_dbg(&adev->dev, "remove succeeded\n");
2188 return 0; 2188 return 0;
2189} 2189}
2190 2190
diff --git a/drivers/spi/au1550_spi.c b/drivers/spi/au1550_spi.c
index 3c9ade69643f..b50563d320e1 100644
--- a/drivers/spi/au1550_spi.c
+++ b/drivers/spi/au1550_spi.c
@@ -480,7 +480,7 @@ static irqreturn_t au1550_spi_dma_irq_callback(struct au1550_spi *hw)
480 au1xxx_dbdma_stop(hw->dma_rx_ch); 480 au1xxx_dbdma_stop(hw->dma_rx_ch);
481 au1xxx_dbdma_stop(hw->dma_tx_ch); 481 au1xxx_dbdma_stop(hw->dma_tx_ch);
482 482
483 /* get number of transfered bytes */ 483 /* get number of transferred bytes */
484 hw->rx_count = hw->len - au1xxx_get_dma_residue(hw->dma_rx_ch); 484 hw->rx_count = hw->len - au1xxx_get_dma_residue(hw->dma_rx_ch);
485 hw->tx_count = hw->len - au1xxx_get_dma_residue(hw->dma_tx_ch); 485 hw->tx_count = hw->len - au1xxx_get_dma_residue(hw->dma_tx_ch);
486 486
diff --git a/drivers/spi/dw_spi.c b/drivers/spi/dw_spi.c
index 9a6196461b27..b1a4b9f503ae 100644
--- a/drivers/spi/dw_spi.c
+++ b/drivers/spi/dw_spi.c
@@ -345,7 +345,7 @@ static void int_error_stop(struct dw_spi *dws, const char *msg)
345 345
346void dw_spi_xfer_done(struct dw_spi *dws) 346void dw_spi_xfer_done(struct dw_spi *dws)
347{ 347{
348 /* Update total byte transfered return count actual bytes read */ 348 /* Update total byte transferred return count actual bytes read */
349 dws->cur_msg->actual_length += dws->len; 349 dws->cur_msg->actual_length += dws->len;
350 350
351 /* Move to next transfer */ 351 /* Move to next transfer */
diff --git a/drivers/spi/dw_spi.h b/drivers/spi/dw_spi.h
index fb0bce564844..b23e452adaf7 100644
--- a/drivers/spi/dw_spi.h
+++ b/drivers/spi/dw_spi.h
@@ -46,7 +46,7 @@
46#define SPI_INT_RXFI (1 << 4) 46#define SPI_INT_RXFI (1 << 4)
47#define SPI_INT_MSTI (1 << 5) 47#define SPI_INT_MSTI (1 << 5)
48 48
49/* TX RX interrupt level threshhold, max can be 256 */ 49/* TX RX interrupt level threshold, max can be 256 */
50#define SPI_INT_THRESHOLD 32 50#define SPI_INT_THRESHOLD 32
51 51
52enum dw_ssi_type { 52enum dw_ssi_type {
diff --git a/drivers/spi/ep93xx_spi.c b/drivers/spi/ep93xx_spi.c
index 0ba35df9a6df..d3570071e98f 100644
--- a/drivers/spi/ep93xx_spi.c
+++ b/drivers/spi/ep93xx_spi.c
@@ -512,7 +512,7 @@ static int ep93xx_spi_read_write(struct ep93xx_spi *espi)
512 * 512 *
513 * This function processes one SPI transfer given in @t. Function waits until 513 * This function processes one SPI transfer given in @t. Function waits until
514 * transfer is complete (may sleep) and updates @msg->status based on whether 514 * transfer is complete (may sleep) and updates @msg->status based on whether
515 * transfer was succesfully processed or not. 515 * transfer was successfully processed or not.
516 */ 516 */
517static void ep93xx_spi_process_transfer(struct ep93xx_spi *espi, 517static void ep93xx_spi_process_transfer(struct ep93xx_spi *espi,
518 struct spi_message *msg, 518 struct spi_message *msg,
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index a429b01d0285..9c74aad6be93 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -700,7 +700,7 @@ static void int_transfer_complete(struct driver_data *drv_data)
700 if (!pxa25x_ssp_comp(drv_data)) 700 if (!pxa25x_ssp_comp(drv_data))
701 write_SSTO(0, reg); 701 write_SSTO(0, reg);
702 702
703 /* Update total byte transfered return count actual bytes read */ 703 /* Update total byte transferred return count actual bytes read */
704 drv_data->cur_msg->actual_length += drv_data->len - 704 drv_data->cur_msg->actual_length += drv_data->len -
705 (drv_data->rx_end - drv_data->rx); 705 (drv_data->rx_end - drv_data->rx);
706 706
@@ -759,7 +759,7 @@ static irqreturn_t interrupt_transfer(struct driver_data *drv_data)
759 759
760 /* 760 /*
761 * PXA25x_SSP has no timeout, set up rx threshould for the 761 * PXA25x_SSP has no timeout, set up rx threshould for the
762 * remaing RX bytes. 762 * remaining RX bytes.
763 */ 763 */
764 if (pxa25x_ssp_comp(drv_data)) { 764 if (pxa25x_ssp_comp(drv_data)) {
765 765
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 34bb17f03019..82b9a428c323 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -957,7 +957,7 @@ EXPORT_SYMBOL_GPL(spi_sync);
957 * drivers may DMA directly into and out of the message buffers. 957 * drivers may DMA directly into and out of the message buffers.
958 * 958 *
959 * This call should be used by drivers that require exclusive access to the 959 * This call should be used by drivers that require exclusive access to the
960 * SPI bus. It has to be preceeded by a spi_bus_lock call. The SPI bus must 960 * SPI bus. It has to be preceded by a spi_bus_lock call. The SPI bus must
961 * be released by a spi_bus_unlock call when the exclusive access is over. 961 * be released by a spi_bus_unlock call when the exclusive access is over.
962 * 962 *
963 * It returns zero on success, else a negative error code. 963 * It returns zero on success, else a negative error code.
diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c
index a28462486df8..bdb7289a1d22 100644
--- a/drivers/spi/spi_bfin5xx.c
+++ b/drivers/spi/spi_bfin5xx.c
@@ -905,7 +905,7 @@ static void bfin_spi_pump_transfers(unsigned long data)
905 "IO write error!\n"); 905 "IO write error!\n");
906 message->state = ERROR_STATE; 906 message->state = ERROR_STATE;
907 } else { 907 } else {
908 /* Update total byte transfered */ 908 /* Update total byte transferred */
909 message->actual_length += drv_data->len_in_bytes; 909 message->actual_length += drv_data->len_in_bytes;
910 /* Move to next transfer of this msg */ 910 /* Move to next transfer of this msg */
911 message->state = bfin_spi_next_transfer(drv_data); 911 message->state = bfin_spi_next_transfer(drv_data);
diff --git a/drivers/spi/spi_fsl_espi.c b/drivers/spi/spi_fsl_espi.c
index 900e921ab80e..496f895a0024 100644
--- a/drivers/spi/spi_fsl_espi.c
+++ b/drivers/spi/spi_fsl_espi.c
@@ -474,7 +474,7 @@ static int fsl_espi_setup(struct spi_device *spi)
474 mpc8xxx_spi = spi_master_get_devdata(spi->master); 474 mpc8xxx_spi = spi_master_get_devdata(spi->master);
475 reg_base = mpc8xxx_spi->reg_base; 475 reg_base = mpc8xxx_spi->reg_base;
476 476
477 hw_mode = cs->hw_mode; /* Save orginal settings */ 477 hw_mode = cs->hw_mode; /* Save original settings */
478 cs->hw_mode = mpc8xxx_spi_read_reg( 478 cs->hw_mode = mpc8xxx_spi_read_reg(
479 &reg_base->csmode[spi->chip_select]); 479 &reg_base->csmode[spi->chip_select]);
480 /* mask out bits we are going to set */ 480 /* mask out bits we are going to set */
diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index a467b20baac8..6f34963b3c64 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -670,7 +670,7 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus,
670 ssb_printk(KERN_ERR PFX "No SPROM available!\n"); 670 ssb_printk(KERN_ERR PFX "No SPROM available!\n");
671 return -ENODEV; 671 return -ENODEV;
672 } 672 }
673 if (bus->chipco.dev) { /* can be unavailible! */ 673 if (bus->chipco.dev) { /* can be unavailable! */
674 /* 674 /*
675 * get SPROM offset: SSB_SPROM_BASE1 except for 675 * get SPROM offset: SSB_SPROM_BASE1 except for
676 * chipcommon rev >= 31 or chip ID is 0x4312 and 676 * chipcommon rev >= 31 or chip ID is 0x4312 and
diff --git a/drivers/ssb/sprom.c b/drivers/ssb/sprom.c
index 4f7cc8d13277..5f34d7a3e3a5 100644
--- a/drivers/ssb/sprom.c
+++ b/drivers/ssb/sprom.c
@@ -185,7 +185,7 @@ bool ssb_is_sprom_available(struct ssb_bus *bus)
185 /* this routine differs from specs as we do not access SPROM directly 185 /* this routine differs from specs as we do not access SPROM directly
186 on PCMCIA */ 186 on PCMCIA */
187 if (bus->bustype == SSB_BUSTYPE_PCI && 187 if (bus->bustype == SSB_BUSTYPE_PCI &&
188 bus->chipco.dev && /* can be unavailible! */ 188 bus->chipco.dev && /* can be unavailable! */
189 bus->chipco.dev->id.revision >= 31) 189 bus->chipco.dev->id.revision >= 31)
190 return bus->chipco.capabilities & SSB_CHIPCO_CAP_SPROM; 190 return bus->chipco.capabilities & SSB_CHIPCO_CAP_SPROM;
191 191
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 18b43fcb4171..dca4a0bb6ca9 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -117,8 +117,6 @@ source "drivers/staging/hv/Kconfig"
117 117
118source "drivers/staging/vme/Kconfig" 118source "drivers/staging/vme/Kconfig"
119 119
120source "drivers/staging/memrar/Kconfig"
121
122source "drivers/staging/sep/Kconfig" 120source "drivers/staging/sep/Kconfig"
123 121
124source "drivers/staging/iio/Kconfig" 122source "drivers/staging/iio/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index cfd13cd55efb..eb93012b6f59 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -40,7 +40,6 @@ obj-$(CONFIG_VT6655) += vt6655/
40obj-$(CONFIG_VT6656) += vt6656/ 40obj-$(CONFIG_VT6656) += vt6656/
41obj-$(CONFIG_HYPERV) += hv/ 41obj-$(CONFIG_HYPERV) += hv/
42obj-$(CONFIG_VME_BUS) += vme/ 42obj-$(CONFIG_VME_BUS) += vme/
43obj-$(CONFIG_MRST_RAR_HANDLER) += memrar/
44obj-$(CONFIG_DX_SEP) += sep/ 43obj-$(CONFIG_DX_SEP) += sep/
45obj-$(CONFIG_IIO) += iio/ 44obj-$(CONFIG_IIO) += iio/
46obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio/ 45obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio/
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
index c6488e0d1305..41223f953589 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
@@ -237,7 +237,7 @@ static int CreditsAvailableCallback(void *pContext, int Credits, bool CreditIRQE
237 pProt->CreditsCurrentSeek)); 237 pProt->CreditsCurrentSeek));
238 238
239 if (pProt->CreditsAvailable >= pProt->CreditsCurrentSeek) { 239 if (pProt->CreditsAvailable >= pProt->CreditsCurrentSeek) {
240 /* we have enough credits to fullfill at least 1 packet waiting in the queue */ 240 /* we have enough credits to fulfill at least 1 packet waiting in the queue */
241 pProt->CreditsCurrentSeek = 0; 241 pProt->CreditsCurrentSeek = 0;
242 pProt->SendStateFlags &= ~HCI_SEND_WAIT_CREDITS; 242 pProt->SendStateFlags &= ~HCI_SEND_WAIT_CREDITS;
243 doPendingSends = true; 243 doPendingSends = true;
@@ -285,7 +285,7 @@ static void FailureCallback(void *pContext, int Status)
285{ 285{
286 struct gmbox_proto_hci_uart *pProt = (struct gmbox_proto_hci_uart *)pContext; 286 struct gmbox_proto_hci_uart *pProt = (struct gmbox_proto_hci_uart *)pContext;
287 287
288 /* target assertion occured */ 288 /* target assertion occurred */
289 NotifyTransportFailure(pProt, Status); 289 NotifyTransportFailure(pProt, Status);
290} 290}
291 291
@@ -507,7 +507,7 @@ static int HCIUartMessagePending(void *pContext, u8 LookAheadBytes[], int ValidB
507 507
508 } while (false); 508 } while (false);
509 509
510 /* check if we need to disable the reciever */ 510 /* check if we need to disable the receiver */
511 if (status || blockRecv) { 511 if (status || blockRecv) {
512 DevGMboxIRQAction(pProt->pDev, GMBOX_RECV_IRQ_DISABLE, PROC_IO_SYNC); 512 DevGMboxIRQAction(pProt->pDev, GMBOX_RECV_IRQ_DISABLE, PROC_IO_SYNC);
513 } 513 }
diff --git a/drivers/staging/ath6kl/include/aggr_recv_api.h b/drivers/staging/ath6kl/include/aggr_recv_api.h
index 67a058492c4d..5ead58d5febd 100644
--- a/drivers/staging/ath6kl/include/aggr_recv_api.h
+++ b/drivers/staging/ath6kl/include/aggr_recv_api.h
@@ -72,7 +72,7 @@ aggr_process_bar(void *cntxt, u8 tid, u16 seq_no);
72 * This event is to initiate/modify the receive side window. 72 * This event is to initiate/modify the receive side window.
73 * Target will send WMI_ADDBA_REQ_EVENTID event to host - to setup 73 * Target will send WMI_ADDBA_REQ_EVENTID event to host - to setup
74 * recv re-ordering queues. Target will negotiate ADDBA with peer, 74 * recv re-ordering queues. Target will negotiate ADDBA with peer,
75 * and indicate via this event after succesfully completing the 75 * and indicate via this event after successfully completing the
76 * negotiation. This happens in two situations: 76 * negotiation. This happens in two situations:
77 * 1. Initial setup of aggregation 77 * 1. Initial setup of aggregation
78 * 2. Renegotiation of current recv window. 78 * 2. Renegotiation of current recv window.
diff --git a/drivers/staging/ath6kl/include/common/a_hci.h b/drivers/staging/ath6kl/include/common/a_hci.h
index 08cb013090be..379d65224e3a 100644
--- a/drivers/staging/ath6kl/include/common/a_hci.h
+++ b/drivers/staging/ath6kl/include/common/a_hci.h
@@ -124,7 +124,7 @@
124#define PAL_NUM_COMPL_DATA_BLOCK_EVENT 0x48 124#define PAL_NUM_COMPL_DATA_BLOCK_EVENT 0x48
125#define PAL_SHORT_RANGE_MODE_CHANGE_COMPL_EVENT 0x4C 125#define PAL_SHORT_RANGE_MODE_CHANGE_COMPL_EVENT 0x4C
126#define PAL_AMP_STATUS_CHANGE_EVENT 0x4D 126#define PAL_AMP_STATUS_CHANGE_EVENT 0x4D
127/*======== End of PAL events definiton =================*/ 127/*======== End of PAL events definition =================*/
128 128
129 129
130/*======== Timeouts (not part of HCI cmd, but input to PAL engine) =========*/ 130/*======== Timeouts (not part of HCI cmd, but input to PAL engine) =========*/
@@ -430,7 +430,7 @@ typedef struct hci_event_hw_err_t {
430 u8 hw_err_code; 430 u8 hw_err_code;
431} POSTPACK HCI_EVENT_HW_ERR; 431} POSTPACK HCI_EVENT_HW_ERR;
432 432
433/* Flush occured event */ 433/* Flush occurred event */
434/* Qos Violation event */ 434/* Qos Violation event */
435typedef struct hci_event_handle_t { 435typedef struct hci_event_handle_t {
436 u8 event_code; 436 u8 event_code;
diff --git a/drivers/staging/ath6kl/include/common/dbglog.h b/drivers/staging/ath6kl/include/common/dbglog.h
index 3a3d00da0b81..b7a123086ccf 100644
--- a/drivers/staging/ath6kl/include/common/dbglog.h
+++ b/drivers/staging/ath6kl/include/common/dbglog.h
@@ -44,7 +44,7 @@ extern "C" {
44#define DBGLOG_MODULEID_NUM_MAX 16 /* Upper limit is width of mask */ 44#define DBGLOG_MODULEID_NUM_MAX 16 /* Upper limit is width of mask */
45 45
46/* 46/*
47 * Please ensure that the definition of any new module intrduced is captured 47 * Please ensure that the definition of any new module introduced is captured
48 * between the DBGLOG_MODULEID_START and DBGLOG_MODULEID_END defines. The 48 * between the DBGLOG_MODULEID_START and DBGLOG_MODULEID_END defines. The
49 * structure is required for the parser to correctly pick up the values for 49 * structure is required for the parser to correctly pick up the values for
50 * different modules. 50 * different modules.
diff --git a/drivers/staging/ath6kl/include/common/epping_test.h b/drivers/staging/ath6kl/include/common/epping_test.h
index 5c40d8a2229d..7027fac8f37e 100644
--- a/drivers/staging/ath6kl/include/common/epping_test.h
+++ b/drivers/staging/ath6kl/include/common/epping_test.h
@@ -92,7 +92,7 @@ typedef PREPACK struct {
92#define EPPING_CMD_RESET_RECV_CNT 2 /* reset recv count */ 92#define EPPING_CMD_RESET_RECV_CNT 2 /* reset recv count */
93#define EPPING_CMD_CAPTURE_RECV_CNT 3 /* fetch recv count, 4-byte count returned in CmdBuffer_t */ 93#define EPPING_CMD_CAPTURE_RECV_CNT 3 /* fetch recv count, 4-byte count returned in CmdBuffer_t */
94#define EPPING_CMD_NO_ECHO 4 /* non-echo packet test (tx-only) */ 94#define EPPING_CMD_NO_ECHO 4 /* non-echo packet test (tx-only) */
95#define EPPING_CMD_CONT_RX_START 5 /* continous RX packets, parameters are in CmdBuffer_h */ 95#define EPPING_CMD_CONT_RX_START 5 /* continuous RX packets, parameters are in CmdBuffer_h */
96#define EPPING_CMD_CONT_RX_STOP 6 /* stop continuous RX packet transmission */ 96#define EPPING_CMD_CONT_RX_STOP 6 /* stop continuous RX packet transmission */
97 97
98 /* test command parameters may be no more than 8 bytes */ 98 /* test command parameters may be no more than 8 bytes */
diff --git a/drivers/staging/ath6kl/include/common/ini_dset.h b/drivers/staging/ath6kl/include/common/ini_dset.h
index 8bfc75940c8f..a9e05fa0f659 100644
--- a/drivers/staging/ath6kl/include/common/ini_dset.h
+++ b/drivers/staging/ath6kl/include/common/ini_dset.h
@@ -31,7 +31,7 @@
31 */ 31 */
32typedef enum { 32typedef enum {
33#if defined(AR6002_REV4) || defined(AR6003) 33#if defined(AR6002_REV4) || defined(AR6003)
34/* Add these definitions for compatability */ 34/* Add these definitions for compatibility */
35#define WHAL_INI_DATA_ID_BB_RFGAIN_LNA1 WHAL_INI_DATA_ID_BB_RFGAIN 35#define WHAL_INI_DATA_ID_BB_RFGAIN_LNA1 WHAL_INI_DATA_ID_BB_RFGAIN
36#define WHAL_INI_DATA_ID_BB_RFGAIN_LNA2 WHAL_INI_DATA_ID_BB_RFGAIN 36#define WHAL_INI_DATA_ID_BB_RFGAIN_LNA2 WHAL_INI_DATA_ID_BB_RFGAIN
37 WHAL_INI_DATA_ID_NULL =0, 37 WHAL_INI_DATA_ID_NULL =0,
diff --git a/drivers/staging/ath6kl/include/common/testcmd.h b/drivers/staging/ath6kl/include/common/testcmd.h
index 9ca1f2ac2cbf..7d94aee508b3 100644
--- a/drivers/staging/ath6kl/include/common/testcmd.h
+++ b/drivers/staging/ath6kl/include/common/testcmd.h
@@ -43,8 +43,8 @@ typedef enum {
43 PN15_PATTERN 43 PN15_PATTERN
44}TX_DATA_PATTERN; 44}TX_DATA_PATTERN;
45 45
46/* Continous tx 46/* Continuous tx
47 mode : TCMD_CONT_TX_OFF - Disabling continous tx 47 mode : TCMD_CONT_TX_OFF - Disabling continuous tx
48 TCMD_CONT_TX_SINE - Enable continuous unmodulated tx 48 TCMD_CONT_TX_SINE - Enable continuous unmodulated tx
49 TCMD_CONT_TX_FRAME- Enable continuous modulated tx 49 TCMD_CONT_TX_FRAME- Enable continuous modulated tx
50 freq : Channel freq in Mhz. (e.g 2412 for channel 1 in 11 g) 50 freq : Channel freq in Mhz. (e.g 2412 for channel 1 in 11 g)
diff --git a/drivers/staging/ath6kl/include/common/wmi.h b/drivers/staging/ath6kl/include/common/wmi.h
index c645af373442..4e6343485362 100644
--- a/drivers/staging/ath6kl/include/common/wmi.h
+++ b/drivers/staging/ath6kl/include/common/wmi.h
@@ -1568,8 +1568,8 @@ typedef PREPACK struct {
1568 switch to ps-poll mode 1568 switch to ps-poll mode
1569 default = 3 */ 1569 default = 3 */
1570 1570
1571 u32 scoContStompMax; /* max number of continous stomp allowed in opt mode. 1571 u32 scoContStompMax; /* max number of continuous stomp allowed in opt mode.
1572 if excedded switch to pspoll mode 1572 if exceeded switch to pspoll mode
1573 default = 3 */ 1573 default = 3 */
1574 1574
1575 u32 scoMinlowRateMbps; /* Low rate threshold */ 1575 u32 scoMinlowRateMbps; /* Low rate threshold */
@@ -2084,7 +2084,7 @@ typedef PREPACK struct {
2084/* 2084/*
2085 * BSS INFO HDR version 2.0 2085 * BSS INFO HDR version 2.0
2086 * With 6 bytes HTC header and 6 bytes of WMI header 2086 * With 6 bytes HTC header and 6 bytes of WMI header
2087 * WMI_BSS_INFO_HDR cannot be accomodated in the removed 802.11 management 2087 * WMI_BSS_INFO_HDR cannot be accommodated in the removed 802.11 management
2088 * header space. 2088 * header space.
2089 * - Reduce the ieMask to 2 bytes as only two bit flags are used 2089 * - Reduce the ieMask to 2 bytes as only two bit flags are used
2090 * - Remove rssi and compute it on the host. rssi = snr - 95 2090 * - Remove rssi and compute it on the host. rssi = snr - 95
@@ -2911,7 +2911,7 @@ typedef PREPACK struct {
2911 u8 pktID; /* packet ID to identify parent packet */ 2911 u8 pktID; /* packet ID to identify parent packet */
2912 u8 rateIdx; /* rate index on successful transmission */ 2912 u8 rateIdx; /* rate index on successful transmission */
2913 u8 ackFailures; /* number of ACK failures in tx attempt */ 2913 u8 ackFailures; /* number of ACK failures in tx attempt */
2914#if 0 /* optional params currently ommitted. */ 2914#if 0 /* optional params currently omitted. */
2915 u32 queueDelay; // usec delay measured Tx Start time - host delivery time 2915 u32 queueDelay; // usec delay measured Tx Start time - host delivery time
2916 u32 mediaDelay; // usec delay measured ACK rx time - host delivery time 2916 u32 mediaDelay; // usec delay measured ACK rx time - host delivery time
2917#endif 2917#endif
diff --git a/drivers/staging/ath6kl/include/common/wmix.h b/drivers/staging/ath6kl/include/common/wmix.h
index 5ebb8285d135..36acba66d49f 100644
--- a/drivers/staging/ath6kl/include/common/wmix.h
+++ b/drivers/staging/ath6kl/include/common/wmix.h
@@ -191,7 +191,7 @@ typedef PREPACK struct {
191} POSTPACK WMIX_GPIO_INTR_ACK_CMD; 191} POSTPACK WMIX_GPIO_INTR_ACK_CMD;
192 192
193/* 193/*
194 * Target informs Host of GPIO interrupts that have ocurred since the 194 * Target informs Host of GPIO interrupts that have occurred since the
195 * last WMIX_GIPO_INTR_ACK_CMD was received. Additional information -- 195 * last WMIX_GIPO_INTR_ACK_CMD was received. Additional information --
196 * the current GPIO input values is provided -- in order to support 196 * the current GPIO input values is provided -- in order to support
197 * use of a GPIO interrupt as a Data Valid signal for other GPIO pins. 197 * use of a GPIO interrupt as a Data Valid signal for other GPIO pins.
diff --git a/drivers/staging/ath6kl/include/htc_api.h b/drivers/staging/ath6kl/include/htc_api.h
index 1bc2488788ab..4fb767559f82 100644
--- a/drivers/staging/ath6kl/include/htc_api.h
+++ b/drivers/staging/ath6kl/include/htc_api.h
@@ -209,7 +209,7 @@ struct htc_endpoint_credit_dist {
209typedef enum _HTC_CREDIT_DIST_REASON { 209typedef enum _HTC_CREDIT_DIST_REASON {
210 HTC_CREDIT_DIST_SEND_COMPLETE = 0, /* credits available as a result of completed 210 HTC_CREDIT_DIST_SEND_COMPLETE = 0, /* credits available as a result of completed
211 send operations (MANDATORY) resulting in credit reports */ 211 send operations (MANDATORY) resulting in credit reports */
212 HTC_CREDIT_DIST_ACTIVITY_CHANGE = 1, /* a change in endpoint activity occured (OPTIONAL) */ 212 HTC_CREDIT_DIST_ACTIVITY_CHANGE = 1, /* a change in endpoint activity occurred (OPTIONAL) */
213 HTC_CREDIT_DIST_SEEK_CREDITS, /* an endpoint needs to "seek" credits (OPTIONAL) */ 213 HTC_CREDIT_DIST_SEEK_CREDITS, /* an endpoint needs to "seek" credits (OPTIONAL) */
214 HTC_DUMP_CREDIT_STATE /* for debugging, dump any state information that is kept by 214 HTC_DUMP_CREDIT_STATE /* for debugging, dump any state information that is kept by
215 the distribution function */ 215 the distribution function */
@@ -253,7 +253,7 @@ struct htc_endpoint_stats {
253 u32 RxPacketsBundled; /* count of recv packets received in a bundle */ 253 u32 RxPacketsBundled; /* count of recv packets received in a bundle */
254 u32 RxBundleLookAheads; /* count of number of bundled lookaheads */ 254 u32 RxBundleLookAheads; /* count of number of bundled lookaheads */
255 u32 RxBundleIndFromHdr; /* count of the number of bundle indications from the HTC header */ 255 u32 RxBundleIndFromHdr; /* count of the number of bundle indications from the HTC header */
256 u32 RxAllocThreshHit; /* count of the number of times the recv allocation threshhold was hit */ 256 u32 RxAllocThreshHit; /* count of the number of times the recv allocation threshold was hit */
257 u32 RxAllocThreshBytes; /* total number of bytes */ 257 u32 RxAllocThreshBytes; /* total number of bytes */
258}; 258};
259 259
@@ -391,7 +391,7 @@ int HTCSendPkt(HTC_HANDLE HTCHandle, struct htc_packet *pPacket);
391+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ 391+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
392void HTCStop(HTC_HANDLE HTCHandle); 392void HTCStop(HTC_HANDLE HTCHandle);
393/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 393/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
394 @desc: Destory HTC service 394 @desc: Destroy HTC service
395 @function name: HTCDestroy 395 @function name: HTCDestroy
396 @input: HTCHandle 396 @input: HTCHandle
397 @output: 397 @output:
diff --git a/drivers/staging/ath6kl/miscdrv/credit_dist.c b/drivers/staging/ath6kl/miscdrv/credit_dist.c
index ae54e1f48e50..33fa0209026d 100644
--- a/drivers/staging/ath6kl/miscdrv/credit_dist.c
+++ b/drivers/staging/ath6kl/miscdrv/credit_dist.c
@@ -341,7 +341,7 @@ static void SeekCredits(struct common_credit_state_info *pCredInfo,
341 credits = min(pCredInfo->CurrentFreeCredits,pEPDist->TxCreditsSeek); 341 credits = min(pCredInfo->CurrentFreeCredits,pEPDist->TxCreditsSeek);
342 342
343 if (credits >= pEPDist->TxCreditsSeek) { 343 if (credits >= pEPDist->TxCreditsSeek) {
344 /* we found some to fullfill the seek request */ 344 /* we found some to fulfill the seek request */
345 break; 345 break;
346 } 346 }
347 347
@@ -364,8 +364,8 @@ static void SeekCredits(struct common_credit_state_info *pCredInfo,
364 364
365 if ((pCurEpDist->TxCreditsAssigned - need) >= pCurEpDist->TxCreditsMin) { 365 if ((pCurEpDist->TxCreditsAssigned - need) >= pCurEpDist->TxCreditsMin) {
366 /* the current one has been allocated more than it's minimum and it 366 /* the current one has been allocated more than it's minimum and it
367 * has enough credits assigned above it's minimum to fullfill our need 367 * has enough credits assigned above it's minimum to fulfill our need
368 * try to take away just enough to fullfill our need */ 368 * try to take away just enough to fulfill our need */
369 ReduceCredits(pCredInfo, 369 ReduceCredits(pCredInfo,
370 pCurEpDist, 370 pCurEpDist,
371 pCurEpDist->TxCreditsAssigned - need); 371 pCurEpDist->TxCreditsAssigned - need);
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_android.c b/drivers/staging/ath6kl/os/linux/ar6000_android.c
index c96f6e9c99c6..4aa75ee2cb13 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_android.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_android.c
@@ -372,7 +372,7 @@ void android_ar6k_check_wow_status(struct ar6_softc *ar, struct sk_buff *skb, bo
372 } 372 }
373 } 373 }
374 if (needWake) { 374 if (needWake) {
375 /* keep host wake up if there is any event and packate comming in*/ 375 /* keep host wake up if there is any event and packate coming in*/
376 if (wowledon) { 376 if (wowledon) {
377 char buf[32]; 377 char buf[32];
378 int len = sprintf(buf, "on"); 378 int len = sprintf(buf, "on");
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index 27cb02dfad3c..97d6ce63b5c0 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -520,7 +520,7 @@ dbglog_parse_debug_logs(s8 *datap, u32 len)
520int 520int
521ar6000_dbglog_get_debug_logs(struct ar6_softc *ar) 521ar6000_dbglog_get_debug_logs(struct ar6_softc *ar)
522{ 522{
523 u32 data[8]; /* Should be able to accomodate struct dbglog_buf_s */ 523 u32 data[8]; /* Should be able to accommodate struct dbglog_buf_s */
524 u32 address; 524 u32 address;
525 u32 length; 525 u32 length;
526 u32 dropped; 526 u32 dropped;
@@ -2063,7 +2063,7 @@ ar6000_stop_endpoint(struct net_device *dev, bool keepprofile, bool getdbglogs)
2063 * - In case of surprise removal, the hcd already frees up the pending 2063 * - In case of surprise removal, the hcd already frees up the pending
2064 * for the device and hence there is no need to unregister the function 2064 * for the device and hence there is no need to unregister the function
2065 * driver inorder to get these requests. For planned removal, the function 2065 * driver inorder to get these requests. For planned removal, the function
2066 * driver has to explictly unregister itself to have the hcd return all the 2066 * driver has to explicitly unregister itself to have the hcd return all the
2067 * pending requests before the data structures for the devices are freed up. 2067 * pending requests before the data structures for the devices are freed up.
2068 * Note that as per the current implementation, the function driver will 2068 * Note that as per the current implementation, the function driver will
2069 * end up releasing all the devices since there is no API to selectively 2069 * end up releasing all the devices since there is no API to selectively
@@ -2982,7 +2982,7 @@ ar6000_data_tx(struct sk_buff *skb, struct net_device *dev)
2982 /* If target is not associated */ 2982 /* If target is not associated */
2983 if( (!ar->arConnected && !bypasswmi) 2983 if( (!ar->arConnected && !bypasswmi)
2984#ifdef CONFIG_HOST_TCMD_SUPPORT 2984#ifdef CONFIG_HOST_TCMD_SUPPORT
2985 /* TCMD doesnt support any data, free the buf and return */ 2985 /* TCMD doesn't support any data, free the buf and return */
2986 || (ar->arTargetMode == AR6000_TCMD_MODE) 2986 || (ar->arTargetMode == AR6000_TCMD_MODE)
2987#endif 2987#endif
2988 ) { 2988 ) {
@@ -6393,7 +6393,7 @@ static void DoHTCSendPktsTest(struct ar6_softc *ar, int MapNo, HTC_ENDPOINT_ID e
6393/* 6393/*
6394 * Add support for adding and removing a virtual adapter for soft AP. 6394 * Add support for adding and removing a virtual adapter for soft AP.
6395 * Some OS requires different adapters names for station and soft AP mode. 6395 * Some OS requires different adapters names for station and soft AP mode.
6396 * To support these requirement, create and destory a netdevice instance 6396 * To support these requirement, create and destroy a netdevice instance
6397 * when the AP mode is operational. A full fledged support for virual device 6397 * when the AP mode is operational. A full fledged support for virual device
6398 * is not implemented. Rather a virtual interface is created and is linked 6398 * is not implemented. Rather a virtual interface is created and is linked
6399 * with the existing physical device instance during the operation of the 6399 * with the existing physical device instance during the operation of the
diff --git a/drivers/staging/ath6kl/wmi/wmi.c b/drivers/staging/ath6kl/wmi/wmi.c
index 0ddaee21f9d7..a00bf0a59871 100644
--- a/drivers/staging/ath6kl/wmi/wmi.c
+++ b/drivers/staging/ath6kl/wmi/wmi.c
@@ -4867,7 +4867,7 @@ wmi_set_country(struct wmi_t *wmip, u8 *countryCode)
4867#ifdef CONFIG_HOST_TCMD_SUPPORT 4867#ifdef CONFIG_HOST_TCMD_SUPPORT
4868/* WMI layer doesn't need to know the data type of the test cmd. 4868/* WMI layer doesn't need to know the data type of the test cmd.
4869 This would be beneficial for customers like Qualcomm, who might 4869 This would be beneficial for customers like Qualcomm, who might
4870 have different test command requirements from differnt manufacturers 4870 have different test command requirements from different manufacturers
4871 */ 4871 */
4872int 4872int
4873wmi_test_cmd(struct wmi_t *wmip, u8 *buf, u32 len) 4873wmi_test_cmd(struct wmi_t *wmip, u8 *buf, u32 len)
diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 32909e2938d5..20cca24ff5f0 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -412,7 +412,7 @@ struct _MINI_ADAPTER
412 412
413 // this to keep track of the Tx and Rx MailBox Registers. 413 // this to keep track of the Tx and Rx MailBox Registers.
414 atomic_t CurrNumFreeTxDesc; 414 atomic_t CurrNumFreeTxDesc;
415 // to keep track the no of byte recieved 415 // to keep track the no of byte received
416 USHORT PrevNumRecvDescs; 416 USHORT PrevNumRecvDescs;
417 USHORT CurrNumRecvDescs; 417 USHORT CurrNumRecvDescs;
418 UINT u32TotalDSD; 418 UINT u32TotalDSD;
@@ -527,7 +527,7 @@ struct _MINI_ADAPTER
527 BOOLEAN bStatusWrite; 527 BOOLEAN bStatusWrite;
528 UINT uiNVMDSDSize; 528 UINT uiNVMDSDSize;
529 UINT uiVendorExtnFlag; 529 UINT uiVendorExtnFlag;
530 //it will always represent choosed DSD at any point of time. 530 //it will always represent chosen DSD at any point of time.
531 // Generally it is Active DSD but in case of NVM RD/WR it might be different. 531 // Generally it is Active DSD but in case of NVM RD/WR it might be different.
532 UINT ulFlashCalStart; 532 UINT ulFlashCalStart;
533 ULONG ulFlashControlSectionStart; 533 ULONG ulFlashControlSectionStart;
@@ -546,10 +546,10 @@ struct _MINI_ADAPTER
546 PFLASH_CS_INFO psFlashCSInfo ; 546 PFLASH_CS_INFO psFlashCSInfo ;
547 PFLASH2X_VENDORSPECIFIC_INFO psFlash2xVendorInfo; 547 PFLASH2X_VENDORSPECIFIC_INFO psFlash2xVendorInfo;
548 UINT uiFlashBaseAdd; //Flash start address 548 UINT uiFlashBaseAdd; //Flash start address
549 UINT uiActiveISOOffset; //Active ISO offset choosen before f/w download 549 UINT uiActiveISOOffset; //Active ISO offset chosen before f/w download
550 FLASH2X_SECTION_VAL eActiveISO; //Active ISO section val 550 FLASH2X_SECTION_VAL eActiveISO; //Active ISO section val
551 FLASH2X_SECTION_VAL eActiveDSD; //Active DSD val choosen before f/w download 551 FLASH2X_SECTION_VAL eActiveDSD; //Active DSD val chosen before f/w download
552 UINT uiActiveDSDOffsetAtFwDld; //For accessing Active DSD choosen before f/w download 552 UINT uiActiveDSDOffsetAtFwDld; //For accessing Active DSD chosen before f/w download
553 UINT uiFlashLayoutMajorVersion ; 553 UINT uiFlashLayoutMajorVersion ;
554 UINT uiFlashLayoutMinorVersion; 554 UINT uiFlashLayoutMinorVersion;
555 BOOLEAN bAllDSDWriteAllow ; 555 BOOLEAN bAllDSDWriteAllow ;
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 9be184f143e5..c0ee95a71343 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -384,7 +384,7 @@ static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter,stConvergenceSLT
384 } 384 }
385 if(psfCSType->cCPacketClassificationRule.u8Protocol == 0) 385 if(psfCSType->cCPacketClassificationRule.u8Protocol == 0)
386 { 386 {
387 //we didnt get protocol field filled in by the BS 387 //we didn't get protocol field filled in by the BS
388 pstClassifierEntry->ucProtocolLength=0; 388 pstClassifierEntry->ucProtocolLength=0;
389 } 389 }
390 else 390 else
@@ -879,7 +879,7 @@ static VOID CopyToAdapter( register PMINI_ADAPTER Adapter, /**<Pointer to the A
879 879
880 /* 880 /*
881 Passing the argument u8PHSI instead of clsid. Because for DL with no classifier rule, 881 Passing the argument u8PHSI instead of clsid. Because for DL with no classifier rule,
882 clsid will be zero hence we cant have multiple PHS rules for the same SF. 882 clsid will be zero hence we can't have multiple PHS rules for the same SF.
883 To support multiple PHS rule, passing u8PHSI. 883 To support multiple PHS rule, passing u8PHSI.
884 */ 884 */
885 885
@@ -1103,7 +1103,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
1103 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8TrafficIndicationPreference : 0x%X", 1103 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8TrafficIndicationPreference : 0x%X",
1104 pstAddIndication->sfAuthorizedSet.u8TrafficIndicationPreference); 1104 pstAddIndication->sfAuthorizedSet.u8TrafficIndicationPreference);
1105 1105
1106 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " Total Classifiers Recieved : 0x%X",pstAddIndication->sfAuthorizedSet.u8TotalClassifiers); 1106 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " Total Classifiers Received : 0x%X",pstAddIndication->sfAuthorizedSet.u8TotalClassifiers);
1107 1107
1108 nCurClassifierCnt = pstAddIndication->sfAuthorizedSet.u8TotalClassifiers; 1108 nCurClassifierCnt = pstAddIndication->sfAuthorizedSet.u8TotalClassifiers;
1109 1109
@@ -1305,7 +1305,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
1305 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8TrafficIndicationPreference : 0x%02X", 1305 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8TrafficIndicationPreference : 0x%02X",
1306 pstAddIndication->sfAdmittedSet.u8TrafficIndicationPreference); 1306 pstAddIndication->sfAdmittedSet.u8TrafficIndicationPreference);
1307 1307
1308 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " Total Classifiers Recieved : 0x%X",pstAddIndication->sfAdmittedSet.u8TotalClassifiers); 1308 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " Total Classifiers Received : 0x%X",pstAddIndication->sfAdmittedSet.u8TotalClassifiers);
1309 1309
1310 nCurClassifierCnt = pstAddIndication->sfAdmittedSet.u8TotalClassifiers; 1310 nCurClassifierCnt = pstAddIndication->sfAdmittedSet.u8TotalClassifiers;
1311 1311
@@ -1502,7 +1502,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
1502 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " u8TrafficIndicationPreference : 0x%X", 1502 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " u8TrafficIndicationPreference : 0x%X",
1503 pstAddIndication->sfActiveSet.u8TrafficIndicationPreference); 1503 pstAddIndication->sfActiveSet.u8TrafficIndicationPreference);
1504 1504
1505 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " Total Classifiers Recieved : 0x%X",pstAddIndication->sfActiveSet.u8TotalClassifiers); 1505 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " Total Classifiers Received : 0x%X",pstAddIndication->sfActiveSet.u8TotalClassifiers);
1506 1506
1507 nCurClassifierCnt = pstAddIndication->sfActiveSet.u8TotalClassifiers; 1507 nCurClassifierCnt = pstAddIndication->sfActiveSet.u8TotalClassifiers;
1508 1508
@@ -1696,7 +1696,7 @@ ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter,PVOID pvBuffer,UINT *p
1696 //No Special handling send the message as it is 1696 //No Special handling send the message as it is
1697 return 1; 1697 return 1;
1698 } 1698 }
1699 // For DSA_REQ, only upto "psfAuthorizedSet" parameter should be accessed by driver! 1699 // For DSA_REQ, only up to "psfAuthorizedSet" parameter should be accessed by driver!
1700 1700
1701 pstAddIndication=kmalloc(sizeof(*pstAddIndication), GFP_KERNEL); 1701 pstAddIndication=kmalloc(sizeof(*pstAddIndication), GFP_KERNEL);
1702 if(NULL==pstAddIndication) 1702 if(NULL==pstAddIndication)
@@ -1788,7 +1788,7 @@ static inline stLocalSFAddIndicationAlt
1788 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Inside RestoreCmControlResponseMessage "); 1788 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "Inside RestoreCmControlResponseMessage ");
1789 /* 1789 /*
1790 //Need to Allocate memory to contain the SUPER Large structures 1790 //Need to Allocate memory to contain the SUPER Large structures
1791 //Our driver cant create these structures on Stack :( 1791 //Our driver can't create these structures on Stack :(
1792 */ 1792 */
1793 pstAddIndicationDest=kmalloc(sizeof(stLocalSFAddIndicationAlt), GFP_KERNEL); 1793 pstAddIndicationDest=kmalloc(sizeof(stLocalSFAddIndicationAlt), GFP_KERNEL);
1794 1794
@@ -1957,7 +1957,7 @@ INT AllocAdapterDsxBuffer(PMINI_ADAPTER Adapter)
1957{ 1957{
1958 /* 1958 /*
1959 //Need to Allocate memory to contain the SUPER Large structures 1959 //Need to Allocate memory to contain the SUPER Large structures
1960 //Our driver cant create these structures on Stack 1960 //Our driver can't create these structures on Stack
1961 */ 1961 */
1962 Adapter->caDsxReqResp=kmalloc(sizeof(stLocalSFAddIndicationAlt)+LEADER_SIZE, GFP_KERNEL); 1962 Adapter->caDsxReqResp=kmalloc(sizeof(stLocalSFAddIndicationAlt)+LEADER_SIZE, GFP_KERNEL);
1963 if(!Adapter->caDsxReqResp) 1963 if(!Adapter->caDsxReqResp)
diff --git a/drivers/staging/bcm/HostMIBSInterface.h b/drivers/staging/bcm/HostMIBSInterface.h
index f17a4f13474c..e34531b638e8 100644
--- a/drivers/staging/bcm/HostMIBSInterface.h
+++ b/drivers/staging/bcm/HostMIBSInterface.h
@@ -62,7 +62,7 @@ typedef struct _S_MIBS_HOST_INFO
62 ULONG NumDesUsed; 62 ULONG NumDesUsed;
63 ULONG CurrNumFreeDesc; 63 ULONG CurrNumFreeDesc;
64 ULONG PrevNumFreeDesc; 64 ULONG PrevNumFreeDesc;
65 // to keep track the no of byte recieved 65 // to keep track the no of byte received
66 ULONG PrevNumRcevBytes; 66 ULONG PrevNumRcevBytes;
67 ULONG CurrNumRcevBytes; 67 ULONG CurrNumRcevBytes;
68 68
diff --git a/drivers/staging/bcm/IPv6Protocol.c b/drivers/staging/bcm/IPv6Protocol.c
index 91b6fbe33c91..5b4fd372ec36 100644
--- a/drivers/staging/bcm/IPv6Protocol.c
+++ b/drivers/staging/bcm/IPv6Protocol.c
@@ -287,7 +287,7 @@ static BOOLEAN MatchSrcIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Head
287 287
288 for(uiLoopIndex=0;uiLoopIndex<uiCountIPSrcAddresses;uiLoopIndex+=uiIpv6AddrNoLongWords) 288 for(uiLoopIndex=0;uiLoopIndex<uiCountIPSrcAddresses;uiLoopIndex+=uiIpv6AddrNoLongWords)
289 { 289 {
290 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Src Ipv6 Address In Recieved Packet : \n "); 290 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Src Ipv6 Address In Received Packet : \n ");
291 DumpIpv6Address(aulSrcIP); 291 DumpIpv6Address(aulSrcIP);
292 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Src Ipv6 Mask In Classifier Rule: \n"); 292 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Src Ipv6 Mask In Classifier Rule: \n");
293 DumpIpv6Address(&pstClassifierRule->stSrcIpAddress.ulIpv6Mask[uiLoopIndex]); 293 DumpIpv6Address(&pstClassifierRule->stSrcIpAddress.ulIpv6Mask[uiLoopIndex]);
@@ -340,7 +340,7 @@ static BOOLEAN MatchDestIpv6Address(S_CLASSIFIER_RULE *pstClassifierRule,IPV6Hea
340 340
341 for(uiLoopIndex=0;uiLoopIndex<uiCountIPDestinationAddresses;uiLoopIndex+=uiIpv6AddrNoLongWords) 341 for(uiLoopIndex=0;uiLoopIndex<uiCountIPDestinationAddresses;uiLoopIndex+=uiIpv6AddrNoLongWords)
342 { 342 {
343 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Destination Ipv6 Address In Recieved Packet : \n "); 343 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Destination Ipv6 Address In Received Packet : \n ");
344 DumpIpv6Address(aulDestIP); 344 DumpIpv6Address(aulDestIP);
345 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Destination Ipv6 Mask In Classifier Rule: \n"); 345 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\n Destination Ipv6 Mask In Classifier Rule: \n");
346 DumpIpv6Address(&pstClassifierRule->stDestIpAddress.ulIpv6Mask[uiLoopIndex]); 346 DumpIpv6Address(&pstClassifierRule->stDestIpAddress.ulIpv6Mask[uiLoopIndex]);
diff --git a/drivers/staging/bcm/InterfaceIdleMode.c b/drivers/staging/bcm/InterfaceIdleMode.c
index bf5c0ad86610..96fa4ead7930 100644
--- a/drivers/staging/bcm/InterfaceIdleMode.c
+++ b/drivers/staging/bcm/InterfaceIdleMode.c
@@ -11,7 +11,7 @@ Input parameters: IN PMINI_ADAPTER Adapter - Miniport Adapter Context
11 11
12 12
13Return: BCM_STATUS_SUCCESS - If Wakeup of the HW Interface was successful. 13Return: BCM_STATUS_SUCCESS - If Wakeup of the HW Interface was successful.
14 Other - If an error occured. 14 Other - If an error occurred.
15*/ 15*/
16 16
17 17
@@ -26,7 +26,7 @@ Input parameters: IN PMINI_ADAPTER Adapter - Miniport Adapter Context
26 26
27 27
28Return: BCM_STATUS_SUCCESS - If Idle mode response related HW configuration was successful. 28Return: BCM_STATUS_SUCCESS - If Idle mode response related HW configuration was successful.
29 Other - If an error occured. 29 Other - If an error occurred.
30*/ 30*/
31 31
32/* 32/*
diff --git a/drivers/staging/bcm/InterfaceIsr.c b/drivers/staging/bcm/InterfaceIsr.c
index 220ff922bdcf..67719d57256d 100644
--- a/drivers/staging/bcm/InterfaceIsr.c
+++ b/drivers/staging/bcm/InterfaceIsr.c
@@ -80,8 +80,8 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/)
80 } 80 }
81 case -EINPROGRESS: 81 case -EINPROGRESS:
82 { 82 {
83 //This situation may happend when URBunlink is used. for detail check usb_unlink_urb documentation. 83 //This situation may happened when URBunlink is used. for detail check usb_unlink_urb documentation.
84 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Impossibe condition has occured... something very bad is going on"); 84 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Impossibe condition has occurred... something very bad is going on");
85 break ; 85 break ;
86 //return; 86 //return;
87 } 87 }
diff --git a/drivers/staging/bcm/InterfaceRx.c b/drivers/staging/bcm/InterfaceRx.c
index 533f8ebe0f84..806ef5d18522 100644
--- a/drivers/staging/bcm/InterfaceRx.c
+++ b/drivers/staging/bcm/InterfaceRx.c
@@ -34,7 +34,7 @@ GetBulkInRcb(PS_INTERFACE_ADAPTER psIntfAdapter)
34 return pRcb; 34 return pRcb;
35} 35}
36 36
37/*this is receive call back - when pkt avilable for receive (BULK IN- end point)*/ 37/*this is receive call back - when pkt available for receive (BULK IN- end point)*/
38static void read_bulk_callback(struct urb *urb) 38static void read_bulk_callback(struct urb *urb)
39{ 39{
40 struct sk_buff *skb = NULL; 40 struct sk_buff *skb = NULL;
@@ -123,7 +123,7 @@ static void read_bulk_callback(struct urb *urb)
123 if((ntohs(pLeader->Vcid) == VCID_CONTROL_PACKET) || 123 if((ntohs(pLeader->Vcid) == VCID_CONTROL_PACKET) ||
124 (!(pLeader->Status >= 0x20 && pLeader->Status <= 0x3F))) 124 (!(pLeader->Status >= 0x20 && pLeader->Status <= 0x3F)))
125 { 125 {
126 BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_CTRL, DBG_LVL_ALL, "Recived control pkt..."); 126 BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_CTRL, DBG_LVL_ALL, "Received control pkt...");
127 *(PUSHORT)skb->data = pLeader->Status; 127 *(PUSHORT)skb->data = pLeader->Status;
128 memcpy(skb->data+sizeof(USHORT), urb->transfer_buffer + 128 memcpy(skb->data+sizeof(USHORT), urb->transfer_buffer +
129 (sizeof(LEADER)), pLeader->PLength); 129 (sizeof(LEADER)), pLeader->PLength);
@@ -142,7 +142,7 @@ static void read_bulk_callback(struct urb *urb)
142 * Data Packet, Format a proper Ethernet Header 142 * Data Packet, Format a proper Ethernet Header
143 * and give it to the stack 143 * and give it to the stack
144 */ 144 */
145 BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_DATA, DBG_LVL_ALL, "Recived Data pkt..."); 145 BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_DATA, DBG_LVL_ALL, "Received Data pkt...");
146 skb_reserve(skb, 2 + SKB_RESERVE_PHS_BYTES); 146 skb_reserve(skb, 2 + SKB_RESERVE_PHS_BYTES);
147 memcpy(skb->data+ETH_HLEN, (PUCHAR)urb->transfer_buffer + sizeof(LEADER), pLeader->PLength); 147 memcpy(skb->data+ETH_HLEN, (PUCHAR)urb->transfer_buffer + sizeof(LEADER), pLeader->PLength);
148 skb->dev = Adapter->dev; 148 skb->dev = Adapter->dev;
@@ -151,7 +151,7 @@ static void read_bulk_callback(struct urb *urb)
151 skb_put (skb, pLeader->PLength + ETH_HLEN); 151 skb_put (skb, pLeader->PLength + ETH_HLEN);
152 Adapter->PackInfo[QueueIndex].uiTotalRxBytes+=pLeader->PLength; 152 Adapter->PackInfo[QueueIndex].uiTotalRxBytes+=pLeader->PLength;
153 Adapter->PackInfo[QueueIndex].uiThisPeriodRxBytes+= pLeader->PLength; 153 Adapter->PackInfo[QueueIndex].uiThisPeriodRxBytes+= pLeader->PLength;
154 BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_DATA, DBG_LVL_ALL, "Recived Data pkt of len :0x%X", pLeader->PLength); 154 BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_DATA, DBG_LVL_ALL, "Received Data pkt of len :0x%X", pLeader->PLength);
155 155
156 if(netif_running(Adapter->dev)) 156 if(netif_running(Adapter->dev))
157 { 157 {
@@ -237,7 +237,7 @@ Input parameters: IN PMINI_ADAPTER Adapter - Miniport Adapter Context
237 237
238 238
239Return: TRUE - If Rx was successful. 239Return: TRUE - If Rx was successful.
240 Other - If an error occured. 240 Other - If an error occurred.
241*/ 241*/
242 242
243BOOLEAN InterfaceRx (PS_INTERFACE_ADAPTER psIntfAdapter) 243BOOLEAN InterfaceRx (PS_INTERFACE_ADAPTER psIntfAdapter)
diff --git a/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h
index e4f8eb70be1e..f859cf1c47b0 100644
--- a/drivers/staging/bcm/Ioctl.h
+++ b/drivers/staging/bcm/Ioctl.h
@@ -241,7 +241,7 @@ typedef struct bulkwrmbuffer
241 241
242typedef enum _FLASH2X_SECTION_VAL 242typedef enum _FLASH2X_SECTION_VAL
243{ 243{
244 NO_SECTION_VAL = 0, //no section is choosen when absolute offset is given for RD/WR 244 NO_SECTION_VAL = 0, //no section is chosen when absolute offset is given for RD/WR
245 ISO_IMAGE1, 245 ISO_IMAGE1,
246 ISO_IMAGE2, 246 ISO_IMAGE2,
247 DSD0, 247 DSD0,
diff --git a/drivers/staging/bcm/LeakyBucket.c b/drivers/staging/bcm/LeakyBucket.c
index f4cf41c0e46b..a55d4228e8e0 100644
--- a/drivers/staging/bcm/LeakyBucket.c
+++ b/drivers/staging/bcm/LeakyBucket.c
@@ -213,7 +213,7 @@ static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)
213 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "For Queue: %zd\n", psSF-Adapter->PackInfo); 213 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "For Queue: %zd\n", psSF-Adapter->PackInfo);
214 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "\nAvailable Tokens = %d required = %d\n", 214 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "\nAvailable Tokens = %d required = %d\n",
215 psSF->uiCurrentTokenCount, iPacketLen); 215 psSF->uiCurrentTokenCount, iPacketLen);
216 //this part indicates that becuase of non-availability of the tokens 216 //this part indicates that because of non-availability of the tokens
217 //pkt has not been send out hence setting the pending flag indicating the host to send it out 217 //pkt has not been send out hence setting the pending flag indicating the host to send it out
218 //first next iteration . 218 //first next iteration .
219 psSF->uiPendedLast = TRUE; 219 psSF->uiPendedLast = TRUE;
diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index d624f35d0551..c5003b62234c 100644
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -602,7 +602,7 @@ VOID LinkControlResponseMessage(PMINI_ADAPTER Adapter,PUCHAR pucBuffer)
602 Adapter->LinkStatus=LINKUP_DONE; 602 Adapter->LinkStatus=LINKUP_DONE;
603 Adapter->bPHSEnabled = *(pucBuffer+3); 603 Adapter->bPHSEnabled = *(pucBuffer+3);
604 Adapter->bETHCSEnabled = *(pucBuffer+4) & ETH_CS_MASK; 604 Adapter->bETHCSEnabled = *(pucBuffer+4) & ETH_CS_MASK;
605 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "PHS Support Status Recieved In LinkUp Ack : %x \n",Adapter->bPHSEnabled); 605 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "PHS Support Status Received In LinkUp Ack : %x \n",Adapter->bPHSEnabled);
606 if((FALSE == Adapter->bShutStatus)&& 606 if((FALSE == Adapter->bShutStatus)&&
607 (FALSE == Adapter->IdleMode)) 607 (FALSE == Adapter->IdleMode))
608 { 608 {
@@ -1153,7 +1153,7 @@ int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter)
1153 1153
1154 /* 1154 /*
1155 * 1. If the LED Settings fails, do not stop and do the Firmware download. 1155 * 1. If the LED Settings fails, do not stop and do the Firmware download.
1156 * 2. This init would happend only if the cfg file is present, else 1156 * 2. This init would happened only if the cfg file is present, else
1157 * call from the ioctl context. 1157 * call from the ioctl context.
1158 */ 1158 */
1159 1159
@@ -1185,7 +1185,7 @@ int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter)
1185 status = PropagateCalParamsFromFlashToMemory(ps_adapter); 1185 status = PropagateCalParamsFromFlashToMemory(ps_adapter);
1186 if(status) 1186 if(status)
1187 { 1187 {
1188 BCM_DEBUG_PRINT(ps_adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL," Propogation of Cal param failed .." ); 1188 BCM_DEBUG_PRINT(ps_adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL," Propagation of Cal param failed .." );
1189 goto OUT; 1189 goto OUT;
1190 } 1190 }
1191 } 1191 }
diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c
index feade9451b2e..c97020f0fb6a 100644
--- a/drivers/staging/bcm/Qos.c
+++ b/drivers/staging/bcm/Qos.c
@@ -727,7 +727,7 @@ static BOOLEAN EthCSMatchVLANRules(S_CLASSIFIER_RULE *pstClassifierRule,struct s
727 727
728 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s CLS UserPrio:%x CLS VLANID:%x\n",__FUNCTION__,ntohs(*((USHORT *)pstClassifierRule->usUserPriority)),pstClassifierRule->usVLANID); 728 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s CLS UserPrio:%x CLS VLANID:%x\n",__FUNCTION__,ntohs(*((USHORT *)pstClassifierRule->usUserPriority)),pstClassifierRule->usVLANID);
729 729
730 /* In case FW didn't recieve the TLV, the priority field should be ignored */ 730 /* In case FW didn't receive the TLV, the priority field should be ignored */
731 if(pstClassifierRule->usValidityBitMap & (1<<PKT_CLASSIFICATION_USER_PRIORITY_VALID)) 731 if(pstClassifierRule->usValidityBitMap & (1<<PKT_CLASSIFICATION_USER_PRIORITY_VALID))
732 { 732 {
733 if(pstEthCsPktInfo->eNwpktEthFrameType!=eEth802QVLANFrame) 733 if(pstEthCsPktInfo->eNwpktEthFrameType!=eEth802QVLANFrame)
diff --git a/drivers/staging/bcm/cntrl_SignalingInterface.h b/drivers/staging/bcm/cntrl_SignalingInterface.h
index 890778450a86..ab131806e2c9 100644
--- a/drivers/staging/bcm/cntrl_SignalingInterface.h
+++ b/drivers/staging/bcm/cntrl_SignalingInterface.h
@@ -21,7 +21,7 @@
21#define VENDOR_PHS_PARAM_LENGTH 10 21#define VENDOR_PHS_PARAM_LENGTH 10
22#define MAX_NUM_ACTIVE_BS 10 22#define MAX_NUM_ACTIVE_BS 10
23#define AUTH_TOKEN_LENGTH 10 23#define AUTH_TOKEN_LENGTH 10
24#define NUM_HARQ_CHANNELS 16 //Changed from 10 to 16 to accomodate all HARQ channels 24#define NUM_HARQ_CHANNELS 16 //Changed from 10 to 16 to accommodate all HARQ channels
25#define VENDOR_CLASSIFIER_PARAM_LENGTH 1 //Changed the size to 1 byte since we dnt use it 25#define VENDOR_CLASSIFIER_PARAM_LENGTH 1 //Changed the size to 1 byte since we dnt use it
26#define VENDOR_SPECIF_QOS_PARAM 1 26#define VENDOR_SPECIF_QOS_PARAM 1
27#define VENDOR_PHS_PARAM_LENGTH 10 27#define VENDOR_PHS_PARAM_LENGTH 10
@@ -109,13 +109,13 @@ typedef struct _stPhsRuleSI {
109 B_UINT8 u8PHSI; 109 B_UINT8 u8PHSI;
110 /** PHSF Length Of The Service Flow*/ 110 /** PHSF Length Of The Service Flow*/
111 B_UINT8 u8PHSFLength; 111 B_UINT8 u8PHSFLength;
112 /** String of bytes containing header information to be supressed by the sending CS and reconstructed by the receiving CS*/ 112 /** String of bytes containing header information to be suppressed by the sending CS and reconstructed by the receiving CS*/
113 B_UINT8 u8PHSF[MAX_PHS_LENGTHS]; 113 B_UINT8 u8PHSF[MAX_PHS_LENGTHS];
114 /** PHSM Length Of The Service Flow*/ 114 /** PHSM Length Of The Service Flow*/
115 B_UINT8 u8PHSMLength; 115 B_UINT8 u8PHSMLength;
116 /** PHS Mask for the SF*/ 116 /** PHS Mask for the SF*/
117 B_UINT8 u8PHSM[MAX_PHS_LENGTHS]; 117 B_UINT8 u8PHSM[MAX_PHS_LENGTHS];
118 /** 8bit Total number of bytes to be supressed for the Service Flow*/ 118 /** 8bit Total number of bytes to be suppressed for the Service Flow*/
119 B_UINT8 u8PHSS; 119 B_UINT8 u8PHSS;
120 /** 8bit Indicates whether or not Packet Header contents need to be verified prior to supression */ 120 /** 8bit Indicates whether or not Packet Header contents need to be verified prior to supression */
121 B_UINT8 u8PHSV; 121 B_UINT8 u8PHSV;
diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index c7292373a65f..4da5b7b54a1a 100644
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -313,7 +313,7 @@ INT ReadMacAddressFromNVM(PMINI_ADAPTER Adapter)
313// uiNumBytes - Number of bytes to be read from the EEPROM. 313// uiNumBytes - Number of bytes to be read from the EEPROM.
314// 314//
315// Returns: 315// Returns:
316// OSAL_STATUS_SUCCESS - if EEPROM read is successfull. 316// OSAL_STATUS_SUCCESS - if EEPROM read is successful.
317// <FAILURE> - if failed. 317// <FAILURE> - if failed.
318//----------------------------------------------------------------------------- 318//-----------------------------------------------------------------------------
319 319
@@ -431,7 +431,7 @@ INT BeceemEEPROMBulkRead(
431// uiNumBytes - Number of bytes to be read from the FLASH. 431// uiNumBytes - Number of bytes to be read from the FLASH.
432// 432//
433// Returns: 433// Returns:
434// OSAL_STATUS_SUCCESS - if FLASH read is successfull. 434// OSAL_STATUS_SUCCESS - if FLASH read is successful.
435// <FAILURE> - if failed. 435// <FAILURE> - if failed.
436//----------------------------------------------------------------------------- 436//-----------------------------------------------------------------------------
437 437
@@ -1174,7 +1174,7 @@ static INT BeceemFlashBulkWrite(
1174 if(NULL == pTempBuff) 1174 if(NULL == pTempBuff)
1175 goto BeceemFlashBulkWrite_EXIT; 1175 goto BeceemFlashBulkWrite_EXIT;
1176// 1176//
1177// check if the data to be written is overlapped accross sectors 1177// check if the data to be written is overlapped across sectors
1178// 1178//
1179 if(uiOffset+uiNumBytes < uiSectBoundary) 1179 if(uiOffset+uiNumBytes < uiSectBoundary)
1180 { 1180 {
@@ -1390,7 +1390,7 @@ static INT BeceemFlashBulkWriteStatus(
1390 goto BeceemFlashBulkWriteStatus_EXIT; 1390 goto BeceemFlashBulkWriteStatus_EXIT;
1391 1391
1392// 1392//
1393// check if the data to be written is overlapped accross sectors 1393// check if the data to be written is overlapped across sectors
1394// 1394//
1395 if(uiOffset+uiNumBytes < uiSectBoundary) 1395 if(uiOffset+uiNumBytes < uiSectBoundary)
1396 { 1396 {
@@ -2020,7 +2020,7 @@ INT BeceemEEPROMBulkWrite(
2020// uiNumBytes - Number of bytes to be read from the NVM. 2020// uiNumBytes - Number of bytes to be read from the NVM.
2021// 2021//
2022// Returns: 2022// Returns:
2023// OSAL_STATUS_SUCCESS - if NVM read is successfull. 2023// OSAL_STATUS_SUCCESS - if NVM read is successful.
2024// <FAILURE> - if failed. 2024// <FAILURE> - if failed.
2025//----------------------------------------------------------------------------- 2025//-----------------------------------------------------------------------------
2026 2026
@@ -2083,7 +2083,7 @@ INT BeceemNVMRead(
2083// uiNumBytes - Number of bytes to be written.. 2083// uiNumBytes - Number of bytes to be written..
2084// 2084//
2085// Returns: 2085// Returns:
2086// OSAL_STATUS_SUCCESS - if NVM write is successfull. 2086// OSAL_STATUS_SUCCESS - if NVM write is successful.
2087// <FAILURE> - if failed. 2087// <FAILURE> - if failed.
2088//----------------------------------------------------------------------------- 2088//-----------------------------------------------------------------------------
2089 2089
@@ -2218,7 +2218,7 @@ INT BeceemNVMWrite(
2218// uiSectorSize - sector size 2218// uiSectorSize - sector size
2219// 2219//
2220// Returns: 2220// Returns:
2221// OSAL_STATUS_SUCCESS - if NVM write is successfull. 2221// OSAL_STATUS_SUCCESS - if NVM write is successful.
2222// <FAILURE> - if failed. 2222// <FAILURE> - if failed.
2223//----------------------------------------------------------------------------- 2223//-----------------------------------------------------------------------------
2224 2224
@@ -2430,7 +2430,7 @@ INT BcmInitNVM(PMINI_ADAPTER ps_adapter)
2430*Input Parameter: 2430*Input Parameter:
2431* Adapter data structure 2431* Adapter data structure
2432*Return Value : 2432*Return Value :
2433* 0. means sucess; 2433* 0. means success;
2434*/ 2434*/
2435/***************************************************************************/ 2435/***************************************************************************/
2436 2436
@@ -2998,7 +2998,7 @@ INT BcmGetSectionValStartOffset(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlas
2998 /* 2998 /*
2999 * Considering all the section for which end offset can be calculated or directly given 2999 * Considering all the section for which end offset can be calculated or directly given
3000 * in CS Structure. if matching case does not exist, return STATUS_FAILURE indicating section 3000 * in CS Structure. if matching case does not exist, return STATUS_FAILURE indicating section
3001 * endoffset can't be calculated or given in CS Stucture. 3001 * endoffset can't be calculated or given in CS Structure.
3002 */ 3002 */
3003 3003
3004 INT SectStartOffset = 0 ; 3004 INT SectStartOffset = 0 ;
@@ -3173,7 +3173,7 @@ INT BcmGetSectionValEndOffset(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2
3173* @uiNumBytes : Number of Bytes for Read 3173* @uiNumBytes : Number of Bytes for Read
3174* 3174*
3175* Return value:- 3175* Return value:-
3176* return true on sucess and STATUS_FAILURE on fail. 3176* return true on success and STATUS_FAILURE on fail.
3177*/ 3177*/
3178 3178
3179INT BcmFlash2xBulkRead( 3179INT BcmFlash2xBulkRead(
@@ -3241,7 +3241,7 @@ INT BcmFlash2xBulkRead(
3241* @uiNumBytes : Number of Bytes for Write 3241* @uiNumBytes : Number of Bytes for Write
3242* 3242*
3243* Return value:- 3243* Return value:-
3244* return true on sucess and STATUS_FAILURE on fail. 3244* return true on success and STATUS_FAILURE on fail.
3245* 3245*
3246*/ 3246*/
3247 3247
@@ -3308,7 +3308,7 @@ INT BcmFlash2xBulkWrite(
3308* @Adapter :-Drivers private Data Structure 3308* @Adapter :-Drivers private Data Structure
3309* 3309*
3310* Return Value:- 3310* Return Value:-
3311* Return STATUS_SUCESS if get sucess in setting the right DSD else negaive error code 3311* Return STATUS_SUCESS if get success in setting the right DSD else negaive error code
3312* 3312*
3313**/ 3313**/
3314static INT BcmGetActiveDSD(PMINI_ADAPTER Adapter) 3314static INT BcmGetActiveDSD(PMINI_ADAPTER Adapter)
@@ -3384,7 +3384,7 @@ static INT BcmGetActiveISO(PMINI_ADAPTER Adapter)
3384* @uiOffset : Offset provided in the Flash 3384* @uiOffset : Offset provided in the Flash
3385* 3385*
3386* Return Value:- 3386* Return Value:-
3387* Sucess:-TRUE , offset is writable 3387* Success:-TRUE , offset is writable
3388* Failure:-FALSE, offset is RO 3388* Failure:-FALSE, offset is RO
3389* 3389*
3390**/ 3390**/
@@ -3441,7 +3441,7 @@ static INT BcmDumpFlash2xSectionBitMap(PFLASH2X_BITMAP psFlash2xBitMap)
3441 @Adapter:-Driver private Data Structure 3441 @Adapter:-Driver private Data Structure
3442* 3442*
3443* Return value:- 3443* Return value:-
3444* Sucess:- STATUS_SUCESS 3444* Success:- STATUS_SUCESS
3445* Failure:- negative error code 3445* Failure:- negative error code
3446**/ 3446**/
3447 3447
@@ -3783,7 +3783,7 @@ INT BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectV
3783 // This is a SPECIAL Case which will only happen if the current highest priority ISO has priority value = 0x7FFFFFFF. 3783 // This is a SPECIAL Case which will only happen if the current highest priority ISO has priority value = 0x7FFFFFFF.
3784 // We will write 1 to the current Highest priority ISO And then shall increase the priority of the requested ISO 3784 // We will write 1 to the current Highest priority ISO And then shall increase the priority of the requested ISO
3785 // by user 3785 // by user
3786 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "SectImagePriority wraparound happend, eFlash2xSectVal: 0x%x\n",eFlash2xSectVal); 3786 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "SectImagePriority wraparound happened, eFlash2xSectVal: 0x%x\n",eFlash2xSectVal);
3787 SectImagePriority = htonl(0x1); 3787 SectImagePriority = htonl(0x1);
3788 Status = BcmFlash2xBulkWrite(Adapter, 3788 Status = BcmFlash2xBulkWrite(Adapter,
3789 &SectImagePriority, 3789 &SectImagePriority,
@@ -3853,7 +3853,7 @@ INT BcmSetActiveSection(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSectV
3853 // This is a SPECIAL Case which will only happen if the current highest priority DSD has priority value = 0x7FFFFFFF. 3853 // This is a SPECIAL Case which will only happen if the current highest priority DSD has priority value = 0x7FFFFFFF.
3854 // We will write 1 to the current Highest priority DSD And then shall increase the priority of the requested DSD 3854 // We will write 1 to the current Highest priority DSD And then shall increase the priority of the requested DSD
3855 // by user 3855 // by user
3856 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, NVM_RW, DBG_LVL_ALL, "SectImagePriority wraparound happend, eFlash2xSectVal: 0x%x\n",eFlash2xSectVal); 3856 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, NVM_RW, DBG_LVL_ALL, "SectImagePriority wraparound happened, eFlash2xSectVal: 0x%x\n",eFlash2xSectVal);
3857 SectImagePriority = htonl(0x1); 3857 SectImagePriority = htonl(0x1);
3858 3858
3859 Status = BcmFlash2xBulkWrite(Adapter, 3859 Status = BcmFlash2xBulkWrite(Adapter,
@@ -4119,7 +4119,7 @@ INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
4119 MAX_RW_SIZE); 4119 MAX_RW_SIZE);
4120 IsThisHeaderSector = FALSE ; 4120 IsThisHeaderSector = FALSE ;
4121 } 4121 }
4122 //substracting the written Data 4122 //subtracting the written Data
4123 uiTotalDataToCopy = uiTotalDataToCopy - Adapter->uiSectorSize ; 4123 uiTotalDataToCopy = uiTotalDataToCopy - Adapter->uiSectorSize ;
4124 } 4124 }
4125 4125
@@ -4250,7 +4250,7 @@ INT BcmCopyISO(PMINI_ADAPTER Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
4250 IsThisHeaderSector = FALSE ; 4250 IsThisHeaderSector = FALSE ;
4251 } 4251 }
4252 4252
4253 //substracting the written Data 4253 //subtracting the written Data
4254 uiTotalDataToCopy = uiTotalDataToCopy - Adapter->uiSectorSize ; 4254 uiTotalDataToCopy = uiTotalDataToCopy - Adapter->uiSectorSize ;
4255 } 4255 }
4256 4256
@@ -4268,7 +4268,7 @@ BcmFlash2xCorruptSig : this API is used to corrupt the written sig in Bcm Header
4268@eFlash2xSectionVal :- Flash section val which has header 4268@eFlash2xSectionVal :- Flash section val which has header
4269 4269
4270Return Value :- 4270Return Value :-
4271 Sucess :- If Section is present and writable, corrupt the sig and return STATUS_SUCCESS 4271 Success :- If Section is present and writable, corrupt the sig and return STATUS_SUCCESS
4272 Failure :-Return negative error code 4272 Failure :-Return negative error code
4273 4273
4274 4274
@@ -4301,7 +4301,7 @@ BcmFlash2xWriteSig :-this API is used to Write the sig if requested Section has
4301@eFlashSectionVal :- Flash section val which has header 4301@eFlashSectionVal :- Flash section val which has header
4302 4302
4303Return Value :- 4303Return Value :-
4304 Sucess :- If Section is present and writable write the sig and return STATUS_SUCCESS 4304 Success :- If Section is present and writable write the sig and return STATUS_SUCCESS
4305 Failure :-Return negative error code 4305 Failure :-Return negative error code
4306 4306
4307**/ 4307**/
@@ -4504,7 +4504,7 @@ BcmCopySection :- This API is used to copy the One section in another. Both sect
4504 in case of numofBytes equal zero complete section will be copied. 4504 in case of numofBytes equal zero complete section will be copied.
4505 4505
4506Return Values- 4506Return Values-
4507 Sucess : Return STATUS_SUCCESS 4507 Success : Return STATUS_SUCCESS
4508 Faillure :- return negative error code 4508 Faillure :- return negative error code
4509 4509
4510**/ 4510**/
@@ -4621,7 +4621,7 @@ SaveHeaderIfPresent :- This API is use to Protect the Header in case of Header S
4621@uiOffset :- Flash offset that has to be written. 4621@uiOffset :- Flash offset that has to be written.
4622 4622
4623Return value :- 4623Return value :-
4624 Sucess :- On sucess return STATUS_SUCCESS 4624 Success :- On success return STATUS_SUCCESS
4625 Faillure :- Return negative error code 4625 Faillure :- Return negative error code
4626 4626
4627**/ 4627**/
@@ -4634,7 +4634,7 @@ INT SaveHeaderIfPresent(PMINI_ADAPTER Adapter, PUCHAR pBuff, UINT uiOffset)
4634 UINT uiSectAlignAddr = 0; 4634 UINT uiSectAlignAddr = 0;
4635 UINT sig = 0; 4635 UINT sig = 0;
4636 4636
4637 //making the offset sector alligned 4637 //making the offset sector aligned
4638 uiSectAlignAddr = uiOffset & ~(Adapter->uiSectorSize - 1); 4638 uiSectAlignAddr = uiOffset & ~(Adapter->uiSectorSize - 1);
4639 4639
4640 4640
@@ -4643,7 +4643,7 @@ INT SaveHeaderIfPresent(PMINI_ADAPTER Adapter, PUCHAR pBuff, UINT uiOffset)
4643 (uiSectAlignAddr == BcmGetSectionValEndOffset(Adapter,DSD0)- Adapter->uiSectorSize)) 4643 (uiSectAlignAddr == BcmGetSectionValEndOffset(Adapter,DSD0)- Adapter->uiSectorSize))
4644 { 4644 {
4645 4645
4646 //offset from the sector boundry having the header map 4646 //offset from the sector boundary having the header map
4647 offsetToProtect = Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader % Adapter->uiSectorSize; 4647 offsetToProtect = Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader % Adapter->uiSectorSize;
4648 HeaderSizeToProtect = sizeof(DSD_HEADER); 4648 HeaderSizeToProtect = sizeof(DSD_HEADER);
4649 bHasHeader = TRUE ; 4649 bHasHeader = TRUE ;
@@ -4697,7 +4697,7 @@ BcmDoChipSelect : This will selcet the appropriate chip for writing.
4697@Adapater :- Bcm Driver Private Data Structure 4697@Adapater :- Bcm Driver Private Data Structure
4698 4698
4699OutPut:- 4699OutPut:-
4700 Select the Appropriate chip and retrn status Sucess 4700 Select the Appropriate chip and retrn status Success
4701**/ 4701**/
4702static INT BcmDoChipSelect(PMINI_ADAPTER Adapter, UINT offset) 4702static INT BcmDoChipSelect(PMINI_ADAPTER Adapter, UINT offset)
4703{ 4703{
@@ -5086,7 +5086,7 @@ static INT CorruptDSDSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSect
5086 { 5086 {
5087 if(IsSectionWritable(Adapter,eFlash2xSectionVal) != TRUE) 5087 if(IsSectionWritable(Adapter,eFlash2xSectionVal) != TRUE)
5088 { 5088 {
5089 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Section is not Writable...Hence cant Corrupt signature"); 5089 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Section is not Writable...Hence can't Corrupt signature");
5090 return SECTOR_IS_NOT_WRITABLE; 5090 return SECTOR_IS_NOT_WRITABLE;
5091 } 5091 }
5092 } 5092 }
@@ -5155,7 +5155,7 @@ static INT CorruptISOSig(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL eFlash2xSect
5155 5155
5156 if(IsSectionWritable(Adapter,eFlash2xSectionVal) != TRUE) 5156 if(IsSectionWritable(Adapter,eFlash2xSectionVal) != TRUE)
5157 { 5157 {
5158 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Section is not Writable...Hence cant Corrupt signature"); 5158 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Section is not Writable...Hence can't Corrupt signature");
5159 return SECTOR_IS_NOT_WRITABLE; 5159 return SECTOR_IS_NOT_WRITABLE;
5160 } 5160 }
5161 5161
diff --git a/drivers/staging/brcm80211/README b/drivers/staging/brcm80211/README
index 99e67669f26b..f8facb0786ec 100644
--- a/drivers/staging/brcm80211/README
+++ b/drivers/staging/brcm80211/README
@@ -71,7 +71,7 @@ the driver. The devices use a single worldwide regulatory domain, with channels
71passive operation. Transmission on those channels is suppressed until 71passive operation. Transmission on those channels is suppressed until
72appropriate other traffic is observed on those channels. 72appropriate other traffic is observed on those channels.
73 73
74Within the driver, we use the ficticious country code "X2" to represent this 74Within the driver, we use the fictitious country code "X2" to represent this
75worldwide regulatory domain. There is currently no interface to configure a 75worldwide regulatory domain. There is currently no interface to configure a
76different domain. 76different domain.
77 77
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index 65313fa0cf4a..71c3571ee143 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -264,7 +264,7 @@ extern SDIOH_API_RC sdioh_disable_func_intr(void)
264} 264}
265#endif /* defined(OOB_INTR_ONLY) && defined(HW_OOB) */ 265#endif /* defined(OOB_INTR_ONLY) && defined(HW_OOB) */
266 266
267/* Configure callback to client when we recieve client interrupt */ 267/* Configure callback to client when we receive client interrupt */
268extern SDIOH_API_RC 268extern SDIOH_API_RC
269sdioh_interrupt_register(sdioh_info_t *sd, sdioh_cb_fn_t fn, void *argh) 269sdioh_interrupt_register(sdioh_info_t *sd, sdioh_cb_fn_t fn, void *argh)
270{ 270{
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c b/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
index cbfa1c1b7059..1cf6c5dc2bb7 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
@@ -46,7 +46,7 @@ extern int sdioh_mmc_irq(int irq);
46#include <mach/gpio.h> 46#include <mach/gpio.h>
47#endif 47#endif
48 48
49/* Customer specific Host GPIO defintion */ 49/* Customer specific Host GPIO definition */
50static int dhd_oob_gpio_num = -1; /* GG 19 */ 50static int dhd_oob_gpio_num = -1; /* GG 19 */
51 51
52module_param(dhd_oob_gpio_num, int, 0644); 52module_param(dhd_oob_gpio_num, int, 0644);
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index 02c6d446934c..dd0375793875 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -478,7 +478,7 @@ static int dhd_set_suspend(int value, dhd_pub_t *dhd)
478 dhd_set_packet_filter(1, dhd); 478 dhd_set_packet_filter(1, dhd);
479 479
480 /* if dtim skip setup as default force it 480 /* if dtim skip setup as default force it
481 * to wake each thrid dtim 481 * to wake each third dtim
482 * for better power saving. 482 * for better power saving.
483 * Note that side effect is chance to miss BC/MC 483 * Note that side effect is chance to miss BC/MC
484 * packet 484 * packet
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index 106627040db0..464f52af1315 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -3659,7 +3659,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
3659 * control pkt receives. 3659 * control pkt receives.
3660 * Later we use buffer-poll for data as well 3660 * Later we use buffer-poll for data as well
3661 * as control packets. 3661 * as control packets.
3662 * This is required becuase dhd receives full 3662 * This is required because dhd receives full
3663 * frame in gSPI unlike SDIO. 3663 * frame in gSPI unlike SDIO.
3664 * After the frame is received we have to 3664 * After the frame is received we have to
3665 * distinguish whether it is data 3665 * distinguish whether it is data
@@ -3744,7 +3744,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
3744 bus->dhd->rx_errors++; 3744 bus->dhd->rx_errors++;
3745 dhd_os_sdunlock_rxq(bus->dhd); 3745 dhd_os_sdunlock_rxq(bus->dhd);
3746 /* Force retry w/normal header read. 3746 /* Force retry w/normal header read.
3747 * Don't attemp NAK for 3747 * Don't attempt NAK for
3748 * gSPI 3748 * gSPI
3749 */ 3749 */
3750 dhdsdio_rxfail(bus, true, 3750 dhdsdio_rxfail(bus, true,
diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
index 774b4e916b29..c1b07ae31674 100644
--- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
@@ -1079,7 +1079,7 @@ static int ieee_hw_init(struct ieee80211_hw *hw)
1079 */ 1079 */
1080 hw->max_rates = 2; /* Primary rate and 1 fallback rate */ 1080 hw->max_rates = 2; /* Primary rate and 1 fallback rate */
1081 1081
1082 hw->channel_change_time = 7 * 1000; /* channel change time is dependant on chip and band */ 1082 hw->channel_change_time = 7 * 1000; /* channel change time is dependent on chip and band */
1083 hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION); 1083 hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
1084 1084
1085 hw->rate_control_algorithm = "minstrel_ht"; 1085 hw->rate_control_algorithm = "minstrel_ht";
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
index c6cdcd940956..f00865957881 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
@@ -89,7 +89,7 @@ u32 wl_ampdu_dbg =
89/* structure to hold tx fifo information and pre-loading state 89/* structure to hold tx fifo information and pre-loading state
90 * counters specific to tx underflows of ampdus 90 * counters specific to tx underflows of ampdus
91 * some counters might be redundant with the ones in wlc or ampdu structures. 91 * some counters might be redundant with the ones in wlc or ampdu structures.
92 * This allows to maintain a specific state independantly of 92 * This allows to maintain a specific state independently of
93 * how often and/or when the wlc counters are updated. 93 * how often and/or when the wlc counters are updated.
94 */ 94 */
95typedef struct wlc_fifo_info { 95typedef struct wlc_fifo_info {
@@ -265,7 +265,7 @@ static void scb_ampdu_update_config(struct ampdu_info *ampdu, struct scb *scb)
265 265
266 scb_ampdu->max_pdu = (u8) ampdu->wlc->pub->tunables->ampdunummpdu; 266 scb_ampdu->max_pdu = (u8) ampdu->wlc->pub->tunables->ampdunummpdu;
267 267
268 /* go back to legacy size if some preloading is occuring */ 268 /* go back to legacy size if some preloading is occurring */
269 for (i = 0; i < NUM_FFPLD_FIFO; i++) { 269 for (i = 0; i < NUM_FFPLD_FIFO; i++) {
270 if (ampdu->fifo_tb[i].ampdu_pld_size > FFPLD_PLD_INCR) 270 if (ampdu->fifo_tb[i].ampdu_pld_size > FFPLD_PLD_INCR)
271 scb_ampdu->max_pdu = AMPDU_NUM_MPDU_LEGACY; 271 scb_ampdu->max_pdu = AMPDU_NUM_MPDU_LEGACY;
@@ -406,7 +406,7 @@ static int wlc_ffpld_check_txfunfl(struct wlc_info *wlc, int fid)
406 /* 406 /*
407 compute a new dma xfer rate for max_mpdu @ max mcs. 407 compute a new dma xfer rate for max_mpdu @ max mcs.
408 This is the minimum dma rate that 408 This is the minimum dma rate that
409 can acheive no unferflow condition for the current mpdu size. 409 can achieve no unferflow condition for the current mpdu size.
410 */ 410 */
411 /* note : we divide/multiply by 100 to avoid integer overflows */ 411 /* note : we divide/multiply by 100 to avoid integer overflows */
412 fifo->dmaxferrate = 412 fifo->dmaxferrate =
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
index 5a96dc3cdb36..4b6e181c7dc9 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
@@ -1915,7 +1915,7 @@ void wlc_bmac_phy_reset(struct wlc_hw_info *wlc_hw)
1915 1915
1916 phy_bw_clkbits = wlc_phy_clk_bwbits(wlc_hw->band->pi); 1916 phy_bw_clkbits = wlc_phy_clk_bwbits(wlc_hw->band->pi);
1917 1917
1918 /* Specfic reset sequence required for NPHY rev 3 and 4 */ 1918 /* Specific reset sequence required for NPHY rev 3 and 4 */
1919 if (WLCISNPHY(wlc_hw->band) && NREV_GE(wlc_hw->band->phyrev, 3) && 1919 if (WLCISNPHY(wlc_hw->band) && NREV_GE(wlc_hw->band->phyrev, 3) &&
1920 NREV_LE(wlc_hw->band->phyrev, 4)) { 1920 NREV_LE(wlc_hw->band->phyrev, 4)) {
1921 /* Set the PHY bandwidth */ 1921 /* Set the PHY bandwidth */
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_main.c b/drivers/staging/brcm80211/brcmsmac/wlc_main.c
index 639b5d7c9603..ab7ab850e199 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_main.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_main.c
@@ -6283,7 +6283,7 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
6283 ((preamble_type[1] == WLC_MM_PREAMBLE) == 6283 ((preamble_type[1] == WLC_MM_PREAMBLE) ==
6284 (txh->MModeFbrLen != 0))); 6284 (txh->MModeFbrLen != 0)));
6285 6285
6286 ac = wme_fifo2ac[queue]; 6286 ac = skb_get_queue_mapping(p);
6287 if (SCB_WME(scb) && qos && wlc->edcf_txop[ac]) { 6287 if (SCB_WME(scb) && qos && wlc->edcf_txop[ac]) {
6288 uint frag_dur, dur, dur_fallback; 6288 uint frag_dur, dur, dur_fallback;
6289 6289
@@ -6919,8 +6919,7 @@ prep_mac80211_status(struct wlc_info *wlc, d11rxhdr_t *rxh, struct sk_buff *p,
6919 preamble = 0; 6919 preamble = 0;
6920 if (IS_CCK(rspec)) { 6920 if (IS_CCK(rspec)) {
6921 if (rxh->PhyRxStatus_0 & PRXS0_SHORTH) 6921 if (rxh->PhyRxStatus_0 & PRXS0_SHORTH)
6922 WL_ERROR("Short CCK\n"); 6922 rx_status->flag |= RX_FLAG_SHORTPRE;
6923 rx_status->flag |= RX_FLAG_SHORTPRE;
6924 } else if (IS_OFDM(rspec)) { 6923 } else if (IS_OFDM(rspec)) {
6925 rx_status->flag |= RX_FLAG_SHORTPRE; 6924 rx_status->flag |= RX_FLAG_SHORTPRE;
6926 } else { 6925 } else {
@@ -7079,10 +7078,8 @@ void BCMFASTPATH wlc_recv(struct wlc_info *wlc, struct sk_buff *p)
7079 if (ieee80211_is_probe_req(h->frame_control)) 7078 if (ieee80211_is_probe_req(h->frame_control))
7080 goto toss; 7079 goto toss;
7081 7080
7082 if (is_amsdu) { 7081 if (is_amsdu)
7083 WL_ERROR("%s: is_amsdu causing toss\n", __func__);
7084 goto toss; 7082 goto toss;
7085 }
7086 7083
7087 wlc_recvctl(wlc, rxh, p); 7084 wlc_recvctl(wlc, rxh, p);
7088 return; 7085 return;
@@ -8295,7 +8292,7 @@ wlc_txflowcontrol_prio_isset(struct wlc_info *wlc, struct wlc_txq_info *q,
8295 return (q->stopped & prio_mask) == prio_mask; 8292 return (q->stopped & prio_mask) == prio_mask;
8296} 8293}
8297 8294
8298/* propogate the flow control to all interfaces using the given tx queue */ 8295/* propagate the flow control to all interfaces using the given tx queue */
8299void wlc_txflowcontrol(struct wlc_info *wlc, struct wlc_txq_info *qi, 8296void wlc_txflowcontrol(struct wlc_info *wlc, struct wlc_txq_info *qi,
8300 bool on, int prio) 8297 bool on, int prio)
8301{ 8298{
@@ -8462,7 +8459,7 @@ static void wlc_txq_free(struct wlc_info *wlc, struct wlc_txq_info *qi)
8462} 8459}
8463 8460
8464/* 8461/*
8465 * Flag 'scan in progress' to withold dynamic phy calibration 8462 * Flag 'scan in progress' to withhold dynamic phy calibration
8466 */ 8463 */
8467void wlc_scan_start(struct wlc_info *wlc) 8464void wlc_scan_start(struct wlc_info *wlc)
8468{ 8465{
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_rate.c b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c
index 0cfa36023cf1..d284f1ac49cc 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_rate.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c
@@ -332,7 +332,7 @@ wlc_rate_hwrs_filter_sort_validate(wlc_rateset_t *rs,
332 return false; 332 return false;
333} 333}
334 334
335/* caluclate the rate of a rx'd frame and return it as a ratespec */ 335/* calculate the rate of a rx'd frame and return it as a ratespec */
336ratespec_t BCMFASTPATH wlc_compute_rspec(d11rxhdr_t *rxh, u8 *plcp) 336ratespec_t BCMFASTPATH wlc_compute_rspec(d11rxhdr_t *rxh, u8 *plcp)
337{ 337{
338 int phy_type; 338 int phy_type;
diff --git a/drivers/staging/brcm80211/include/bcmsrom_fmt.h b/drivers/staging/brcm80211/include/bcmsrom_fmt.h
index ae2bff828607..4768968f910a 100644
--- a/drivers/staging/brcm80211/include/bcmsrom_fmt.h
+++ b/drivers/staging/brcm80211/include/bcmsrom_fmt.h
@@ -103,7 +103,7 @@
103 103
104#define SROM_CRCREV 63 104#define SROM_CRCREV 63
105 105
106/* SROM Rev 4: Reallocate the software part of the srom to accomodate 106/* SROM Rev 4: Reallocate the software part of the srom to accommodate
107 * MIMO features. It assumes up to two PCIE functions and 440 bytes 107 * MIMO features. It assumes up to two PCIE functions and 440 bytes
108 * of useable srom i.e. the useable storage in chips with OTP that 108 * of useable srom i.e. the useable storage in chips with OTP that
109 * implements hardware redundancy. 109 * implements hardware redundancy.
diff --git a/drivers/staging/brcm80211/include/hndsoc.h b/drivers/staging/brcm80211/include/hndsoc.h
index 9747cc46ca96..6435686b329f 100644
--- a/drivers/staging/brcm80211/include/hndsoc.h
+++ b/drivers/staging/brcm80211/include/hndsoc.h
@@ -181,7 +181,7 @@
181 * conventions for the use the flash space: 181 * conventions for the use the flash space:
182 */ 182 */
183 183
184/* Minumum amount of flash we support */ 184/* Minimum amount of flash we support */
185#define FLASH_MIN 0x00020000 /* Minimum flash size */ 185#define FLASH_MIN 0x00020000 /* Minimum flash size */
186 186
187/* A boot/binary may have an embedded block that describes its size */ 187/* A boot/binary may have an embedded block that describes its size */
diff --git a/drivers/staging/brcm80211/util/bcmotp.c b/drivers/staging/brcm80211/util/bcmotp.c
index ba71c108b366..17991212a22d 100644
--- a/drivers/staging/brcm80211/util/bcmotp.c
+++ b/drivers/staging/brcm80211/util/bcmotp.c
@@ -213,7 +213,7 @@ static u16 ipxotp_read_bit(void *oh, chipcregs_t *cc, uint off)
213 return (int)st; 213 return (int)st;
214} 214}
215 215
216/* Calculate max HW/SW region byte size by substracting fuse region and checksum size, 216/* Calculate max HW/SW region byte size by subtracting fuse region and checksum size,
217 * osizew is oi->wsize (OTP size - GU size) in words 217 * osizew is oi->wsize (OTP size - GU size) in words
218 */ 218 */
219static int ipxotp_max_rgnsz(si_t *sih, int osizew) 219static int ipxotp_max_rgnsz(si_t *sih, int osizew)
@@ -229,7 +229,7 @@ static int ipxotp_max_rgnsz(si_t *sih, int osizew)
229 ret = osizew * 2 - OTP_SZ_FU_72 - OTP_SZ_CHECKSUM; 229 ret = osizew * 2 - OTP_SZ_FU_72 - OTP_SZ_CHECKSUM;
230 break; 230 break;
231 default: 231 default:
232 ASSERT(0); /* Don't konw about this chip */ 232 ASSERT(0); /* Don't know about this chip */
233 } 233 }
234 234
235 return ret; 235 return ret;
diff --git a/drivers/staging/brcm80211/util/bcmsrom.c b/drivers/staging/brcm80211/util/bcmsrom.c
index eca35b94e96c..850bfa6593e0 100644
--- a/drivers/staging/brcm80211/util/bcmsrom.c
+++ b/drivers/staging/brcm80211/util/bcmsrom.c
@@ -1859,7 +1859,7 @@ static int initvars_srom_pci(si_t *sih, void *curmap, char **vars, uint *count)
1859 1859
1860 /* 1860 /*
1861 * Apply CRC over SROM content regardless SROM is present or not, 1861 * Apply CRC over SROM content regardless SROM is present or not,
1862 * and use variable <devpath>sromrev's existance in flash to decide 1862 * and use variable <devpath>sromrev's existence in flash to decide
1863 * if we should return an error when CRC fails or read SROM variables 1863 * if we should return an error when CRC fails or read SROM variables
1864 * from flash. 1864 * from flash.
1865 */ 1865 */
diff --git a/drivers/staging/brcm80211/util/hnddma.c b/drivers/staging/brcm80211/util/hnddma.c
index 8a81eb997f99..be339feae77d 100644
--- a/drivers/staging/brcm80211/util/hnddma.c
+++ b/drivers/staging/brcm80211/util/hnddma.c
@@ -1179,7 +1179,7 @@ static void BCMFASTPATH dma64_txreclaim(dma_info_t *di, txd_range_t range)
1179 (range == HNDDMA_RANGE_ALL) ? "all" : 1179 (range == HNDDMA_RANGE_ALL) ? "all" :
1180 ((range == 1180 ((range ==
1181 HNDDMA_RANGE_TRANSMITTED) ? "transmitted" : 1181 HNDDMA_RANGE_TRANSMITTED) ? "transmitted" :
1182 "transfered"))); 1182 "transferred")));
1183 1183
1184 if (di->txin == di->txout) 1184 if (di->txin == di->txout)
1185 return; 1185 return;
@@ -1549,7 +1549,7 @@ static int BCMFASTPATH dma64_txfast(dma_info_t *di, struct sk_buff *p0,
1549 * If range is HNDDMA_RANGE_TRANSMITTED, reclaim descriptors that have be 1549 * If range is HNDDMA_RANGE_TRANSMITTED, reclaim descriptors that have be
1550 * transmitted as noted by the hardware "CurrDescr" pointer. 1550 * transmitted as noted by the hardware "CurrDescr" pointer.
1551 * If range is HNDDMA_RANGE_TRANSFERED, reclaim descriptors that have be 1551 * If range is HNDDMA_RANGE_TRANSFERED, reclaim descriptors that have be
1552 * transfered by the DMA as noted by the hardware "ActiveDescr" pointer. 1552 * transferred by the DMA as noted by the hardware "ActiveDescr" pointer.
1553 * If range is HNDDMA_RANGE_ALL, reclaim all txd(s) posted to the ring and 1553 * If range is HNDDMA_RANGE_ALL, reclaim all txd(s) posted to the ring and
1554 * return associated packet regardless of the value of hardware pointers. 1554 * return associated packet regardless of the value of hardware pointers.
1555 */ 1555 */
@@ -1563,7 +1563,7 @@ static void *BCMFASTPATH dma64_getnexttxp(dma_info_t *di, txd_range_t range)
1563 (range == HNDDMA_RANGE_ALL) ? "all" : 1563 (range == HNDDMA_RANGE_ALL) ? "all" :
1564 ((range == 1564 ((range ==
1565 HNDDMA_RANGE_TRANSMITTED) ? "transmitted" : 1565 HNDDMA_RANGE_TRANSMITTED) ? "transmitted" :
1566 "transfered"))); 1566 "transferred")));
1567 1567
1568 if (di->ntxd == 0) 1568 if (di->ntxd == 0)
1569 return NULL; 1569 return NULL;
diff --git a/drivers/staging/brcm80211/util/sbpcmcia.h b/drivers/staging/brcm80211/util/sbpcmcia.h
index 6b9923f551a9..d4c156586e81 100644
--- a/drivers/staging/brcm80211/util/sbpcmcia.h
+++ b/drivers/staging/brcm80211/util/sbpcmcia.h
@@ -109,7 +109,7 @@
109#define CISTPL_CFTABLE 0x1b /* Config table entry */ 109#define CISTPL_CFTABLE 0x1b /* Config table entry */
110#define CISTPL_END 0xff /* End of the CIS tuple chain */ 110#define CISTPL_END 0xff /* End of the CIS tuple chain */
111 111
112/* Function identifier provides context for the function extentions tuple */ 112/* Function identifier provides context for the function extensions tuple */
113#define CISTPL_FID_SDIO 0x0c /* Extensions defined by SDIO spec */ 113#define CISTPL_FID_SDIO 0x0c /* Extensions defined by SDIO spec */
114 114
115/* Function extensions for LANs (assumed for extensions other than SDIO) */ 115/* Function extensions for LANs (assumed for extensions other than SDIO) */
diff --git a/drivers/staging/brcm80211/util/siutils.c b/drivers/staging/brcm80211/util/siutils.c
index ed168ceba5f0..6ebd7f58af81 100644
--- a/drivers/staging/brcm80211/util/siutils.c
+++ b/drivers/staging/brcm80211/util/siutils.c
@@ -1319,7 +1319,7 @@ int si_clkctl_xtal(si_t *sih, uint what, bool on)
1319} 1319}
1320 1320
1321/* 1321/*
1322 * clock control policy function throught chipcommon 1322 * clock control policy function through chipcommon
1323 * 1323 *
1324 * set dynamic clk control mode (forceslow, forcefast, dynamic) 1324 * set dynamic clk control mode (forceslow, forcefast, dynamic)
1325 * returns true if we are forcing fast clock 1325 * returns true if we are forcing fast clock
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index a4ceb29c358e..e7e72b8d8cde 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -2064,7 +2064,7 @@ void comedi_event(struct comedi_device *dev, struct comedi_subdevice *s)
2064 COMEDI_CB_OVERFLOW)) { 2064 COMEDI_CB_OVERFLOW)) {
2065 runflags_mask |= SRF_RUNNING; 2065 runflags_mask |= SRF_RUNNING;
2066 } 2066 }
2067 /* remember if an error event has occured, so an error 2067 /* remember if an error event has occurred, so an error
2068 * can be returned the next time the user does a read() */ 2068 * can be returned the next time the user does a read() */
2069 if (s->async->events & (COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW)) { 2069 if (s->async->events & (COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW)) {
2070 runflags_mask |= SRF_ERROR; 2070 runflags_mask |= SRF_ERROR;
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c
index 644bda44556e..482a412aa652 100644
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c
@@ -124,9 +124,9 @@ You should also find the complete GPL in the COPYING file accompanying this sour
124| -5: The selected PCI input clock is wrong | 124| -5: The selected PCI input clock is wrong |
125| -6: Timing unity selection is wrong | 125| -6: Timing unity selection is wrong |
126| -7: Base timing selection is wrong | 126| -7: Base timing selection is wrong |
127| -8: You can not used the 40MHz clock selection wich | 127| -8: You can not used the 40MHz clock selection with |
128| this board | 128| this board |
129| -9: You can not used the 40MHz clock selection wich | 129| -9: You can not used the 40MHz clock selection with |
130| this CHRONOS version | 130| this CHRONOS version |
131+----------------------------------------------------------------------------+ 131+----------------------------------------------------------------------------+
132*/ 132*/
@@ -721,10 +721,10 @@ int i_APCI1710_InsnConfigInitChrono(struct comedi_device *dev, struct comedi_sub
721 } 721 }
722 } else { 722 } else {
723 /**************************************************************/ 723 /**************************************************************/
724 /* You can not used the 40MHz clock selection wich this board */ 724 /* You can not use the 40MHz clock selection with this board */
725 /**************************************************************/ 725 /**************************************************************/
726 726
727 DPRINTK("You can not used the 40MHz clock selection wich this board\n"); 727 DPRINTK("You can not used the 40MHz clock selection with this board\n");
728 i_ReturnValue = 728 i_ReturnValue =
729 -8; 729 -8;
730 } 730 }
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c b/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c
index 90e71e12784a..b973095146f9 100644
--- a/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c
@@ -59,7 +59,7 @@ You should also find the complete GPL in the COPYING file accompanying this sour
59/*+----------------------------------------------------------------------------+*/ 59/*+----------------------------------------------------------------------------+*/
60/*| Input Parameters : int i_NbOfWordsToRead : Nbr. of word to read |*/ 60/*| Input Parameters : int i_NbOfWordsToRead : Nbr. of word to read |*/
61/*| unsigned int dw_PCIBoardEepromAddress : Address of the eeprom |*/ 61/*| unsigned int dw_PCIBoardEepromAddress : Address of the eeprom |*/
62/*| unsigned short w_EepromStartAddress : Eeprom strat address |*/ 62/*| unsigned short w_EepromStartAddress : Eeprom start address |*/
63/*+----------------------------------------------------------------------------+*/ 63/*+----------------------------------------------------------------------------+*/
64/*| Output Parameters : unsigned short * pw_DataRead : Read data |*/ 64/*| Output Parameters : unsigned short * pw_DataRead : Read data |*/
65/*+----------------------------------------------------------------------------+*/ 65/*+----------------------------------------------------------------------------+*/
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c
index 9dd857df93c8..002297dfe33f 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c
@@ -498,7 +498,7 @@ void v_APCI2032_Interrupt(int irq, void *d)
498 struct comedi_device *dev = d; 498 struct comedi_device *dev = d;
499 unsigned int ui_DO; 499 unsigned int ui_DO;
500 500
501 ui_DO = inl(devpriv->iobase + APCI2032_DIGITAL_OP_IRQ) & 0x1; /* Check if VCC OR CC interrupt has occured. */ 501 ui_DO = inl(devpriv->iobase + APCI2032_DIGITAL_OP_IRQ) & 0x1; /* Check if VCC OR CC interrupt has occurred. */
502 502
503 if (ui_DO == 0) { 503 if (ui_DO == 0) {
504 printk("\nInterrupt from unKnown source\n"); 504 printk("\nInterrupt from unKnown source\n");
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index a813fdbbd96e..fc61214151b7 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -148,7 +148,7 @@ int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, struct comedi_subd
148 unsigned short us_ConvertTiming, us_TmpValue, i; 148 unsigned short us_ConvertTiming, us_TmpValue, i;
149 unsigned char b_Tmp; 149 unsigned char b_Tmp;
150 150
151 /* fix convertion time to 10 us */ 151 /* fix conversion time to 10 us */
152 if (!devpriv->ui_EocEosConversionTime) { 152 if (!devpriv->ui_EocEosConversionTime) {
153 printk("No timer0 Value using 10 us\n"); 153 printk("No timer0 Value using 10 us\n");
154 us_ConvertTiming = 10; 154 us_ConvertTiming = 10;
@@ -251,7 +251,7 @@ int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, struct comedi_subd
251 APCI3120_SELECT_TIMER_0_WORD; 251 APCI3120_SELECT_TIMER_0_WORD;
252 outb(b_Tmp, devpriv->iobase + APCI3120_TIMER_CRT0); 252 outb(b_Tmp, devpriv->iobase + APCI3120_TIMER_CRT0);
253 253
254 /* Set the convertion time */ 254 /* Set the conversion time */
255 outw(us_ConvertTiming, 255 outw(us_ConvertTiming,
256 devpriv->iobase + APCI3120_TIMER_VALUE); 256 devpriv->iobase + APCI3120_TIMER_VALUE);
257 257
@@ -311,7 +311,7 @@ int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, struct comedi_subd
311 APCI3120_SELECT_TIMER_0_WORD; 311 APCI3120_SELECT_TIMER_0_WORD;
312 outb(b_Tmp, devpriv->iobase + APCI3120_TIMER_CRT0); 312 outb(b_Tmp, devpriv->iobase + APCI3120_TIMER_CRT0);
313 313
314 /* Set the convertion time */ 314 /* Set the conversion time */
315 outw(us_ConvertTiming, 315 outw(us_ConvertTiming,
316 devpriv->iobase + APCI3120_TIMER_VALUE); 316 devpriv->iobase + APCI3120_TIMER_VALUE);
317 317
@@ -354,9 +354,9 @@ int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, struct comedi_subd
354 /* Start conversion */ 354 /* Start conversion */
355 outw(0, devpriv->iobase + APCI3120_START_CONVERSION); 355 outw(0, devpriv->iobase + APCI3120_START_CONVERSION);
356 356
357 /* Waiting of end of convertion if interrupt is not installed */ 357 /* Waiting of end of conversion if interrupt is not installed */
358 if (devpriv->b_EocEosInterrupt == APCI3120_DISABLE) { 358 if (devpriv->b_EocEosInterrupt == APCI3120_DISABLE) {
359 /* Waiting the end of convertion */ 359 /* Waiting the end of conversion */
360 do { 360 do {
361 us_TmpValue = 361 us_TmpValue =
362 inw(devpriv->iobase + 362 inw(devpriv->iobase +
@@ -854,7 +854,7 @@ int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device *dev,
854 b_DigitalOutputRegister) & 0xF0) | 854 b_DigitalOutputRegister) & 0xF0) |
855 APCI3120_SELECT_TIMER_0_WORD; 855 APCI3120_SELECT_TIMER_0_WORD;
856 outb(b_Tmp, dev->iobase + APCI3120_TIMER_CRT0); 856 outb(b_Tmp, dev->iobase + APCI3120_TIMER_CRT0);
857 /* Set the convertion time */ 857 /* Set the conversion time */
858 outw(((unsigned short) ui_TimerValue0), 858 outw(((unsigned short) ui_TimerValue0),
859 dev->iobase + APCI3120_TIMER_VALUE); 859 dev->iobase + APCI3120_TIMER_VALUE);
860 break; 860 break;
@@ -872,7 +872,7 @@ int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device *dev,
872 b_DigitalOutputRegister) & 0xF0) | 872 b_DigitalOutputRegister) & 0xF0) |
873 APCI3120_SELECT_TIMER_1_WORD; 873 APCI3120_SELECT_TIMER_1_WORD;
874 outb(b_Tmp, dev->iobase + APCI3120_TIMER_CRT0); 874 outb(b_Tmp, dev->iobase + APCI3120_TIMER_CRT0);
875 /* Set the convertion time */ 875 /* Set the conversion time */
876 outw(((unsigned short) ui_TimerValue1), 876 outw(((unsigned short) ui_TimerValue1),
877 dev->iobase + APCI3120_TIMER_VALUE); 877 dev->iobase + APCI3120_TIMER_VALUE);
878 878
@@ -889,7 +889,7 @@ int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device *dev,
889 APCI3120_SELECT_TIMER_0_WORD; 889 APCI3120_SELECT_TIMER_0_WORD;
890 outb(b_Tmp, dev->iobase + APCI3120_TIMER_CRT0); 890 outb(b_Tmp, dev->iobase + APCI3120_TIMER_CRT0);
891 891
892 /* Set the convertion time */ 892 /* Set the conversion time */
893 outw(((unsigned short) ui_TimerValue0), 893 outw(((unsigned short) ui_TimerValue0),
894 dev->iobase + APCI3120_TIMER_VALUE); 894 dev->iobase + APCI3120_TIMER_VALUE);
895 break; 895 break;
@@ -1104,7 +1104,7 @@ int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device *dev,
1104 1104
1105/* 1105/*
1106 * 4 1106 * 4
1107 * amount of bytes to be transfered set transfer count used ADDON 1107 * amount of bytes to be transferred set transfer count used ADDON
1108 * MWTC register commented testing 1108 * MWTC register commented testing
1109 * outl(devpriv->ui_DmaBufferUsesize[0], 1109 * outl(devpriv->ui_DmaBufferUsesize[0],
1110 * devpriv->i_IobaseAddon+AMCC_OP_REG_AMWTC); 1110 * devpriv->i_IobaseAddon+AMCC_OP_REG_AMWTC);
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h
index b3c81979f14d..50eb0a0a0a05 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h
@@ -169,7 +169,7 @@ struct str_AnalogReadInformation {
169 169
170 unsigned char b_Type; /* EOC or EOS */ 170 unsigned char b_Type; /* EOC or EOS */
171 unsigned char b_InterruptFlag; /* Interrupt use or not */ 171 unsigned char b_InterruptFlag; /* Interrupt use or not */
172 unsigned int ui_ConvertTiming; /* Selection of the convertion time */ 172 unsigned int ui_ConvertTiming; /* Selection of the conversion time */
173 unsigned char b_NbrOfChannel; /* Number of channel to read */ 173 unsigned char b_NbrOfChannel; /* Number of channel to read */
174 unsigned int ui_ChannelList[MAX_ANALOGINPUT_CHANNELS]; /* Number of the channel to be read */ 174 unsigned int ui_ChannelList[MAX_ANALOGINPUT_CHANNELS]; /* Number of the channel to be read */
175 unsigned int ui_RangeList[MAX_ANALOGINPUT_CHANNELS]; /* Gain of each channel */ 175 unsigned int ui_RangeList[MAX_ANALOGINPUT_CHANNELS]; /* Gain of each channel */
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
index a93e2349ad3a..c75a1a1fd775 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
@@ -103,7 +103,7 @@ struct str_BoardInfos s_BoardInfos[100]; /* 100 will be the max number of board
103/*+----------------------------------------------------------------------------+*/ 103/*+----------------------------------------------------------------------------+*/
104/*| Input Parameters : int i_NbOfWordsToRead : Nbr. of word to read |*/ 104/*| Input Parameters : int i_NbOfWordsToRead : Nbr. of word to read |*/
105/*| unsigned int dw_PCIBoardEepromAddress : Address of the eeprom |*/ 105/*| unsigned int dw_PCIBoardEepromAddress : Address of the eeprom |*/
106/*| unsigned short w_EepromStartAddress : Eeprom strat address |*/ 106/*| unsigned short w_EepromStartAddress : Eeprom start address |*/
107/*+----------------------------------------------------------------------------+*/ 107/*+----------------------------------------------------------------------------+*/
108/*| Output Parameters : unsigned short * pw_DataRead : Read data |*/ 108/*| Output Parameters : unsigned short * pw_DataRead : Read data |*/
109/*+----------------------------------------------------------------------------+*/ 109/*+----------------------------------------------------------------------------+*/
@@ -849,7 +849,7 @@ int i_APCI3200_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdev
849 | 0:Single Read 849 | 0:Single Read
850 | 1:Read more channel 850 | 1:Read more channel
851 2:Single scan 851 2:Single scan
852 | 3:Continous Scan 852 | 3:Continuous Scan
853 data[13] :Number of channels to read 853 data[13] :Number of channels to read
854 | data[14] :RTD connection type 854 | data[14] :RTD connection type
855 :0:RTD not used 855 :0:RTD not used
diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index 766103c882ad..632d5d0721cd 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -23,7 +23,7 @@ For AI:
23- If cmd->scan_begin_src=TRIG_EXT then trigger input is TGIN (pin 46). 23- If cmd->scan_begin_src=TRIG_EXT then trigger input is TGIN (pin 46).
24- If cmd->convert_src=TRIG_EXT then trigger input is EXTTRG (pin 44). 24- If cmd->convert_src=TRIG_EXT then trigger input is EXTTRG (pin 44).
25- If cmd->start_src/stop_src=TRIG_EXT then trigger input is TGIN (pin 46). 25- If cmd->start_src/stop_src=TRIG_EXT then trigger input is TGIN (pin 46).
26- It is not neccessary to have cmd.scan_end_arg=cmd.chanlist_len but 26- It is not necessary to have cmd.scan_end_arg=cmd.chanlist_len but
27 cmd.scan_end_arg modulo cmd.chanlist_len must by 0. 27 cmd.scan_end_arg modulo cmd.chanlist_len must by 0.
28- If return value of cmdtest is 5 then you've bad channel list 28- If return value of cmdtest is 5 then you've bad channel list
29 (it isn't possible mixture S.E. and DIFF inputs or bipolar and unipolar 29 (it isn't possible mixture S.E. and DIFF inputs or bipolar and unipolar
@@ -823,7 +823,7 @@ static void interrupt_pci9118_ai_dma(struct comedi_device *dev,
823 move_block_from_dma(dev, s, 823 move_block_from_dma(dev, s,
824 devpriv->dmabuf_virt[devpriv->dma_actbuf], 824 devpriv->dmabuf_virt[devpriv->dma_actbuf],
825 samplesinbuf); 825 samplesinbuf);
826 m = m - sampls; /* m= how many samples was transfered */ 826 m = m - sampls; /* m= how many samples was transferred */
827 } 827 }
828/* DPRINTK("YYY\n"); */ 828/* DPRINTK("YYY\n"); */
829 829
@@ -1297,7 +1297,7 @@ static int Compute_and_setup_dma(struct comedi_device *dev)
1297 DPRINTK("3 dmalen0=%d dmalen1=%d\n", dmalen0, dmalen1); 1297 DPRINTK("3 dmalen0=%d dmalen1=%d\n", dmalen0, dmalen1);
1298 /* transfer without TRIG_WAKE_EOS */ 1298 /* transfer without TRIG_WAKE_EOS */
1299 if (!(devpriv->ai_flags & TRIG_WAKE_EOS)) { 1299 if (!(devpriv->ai_flags & TRIG_WAKE_EOS)) {
1300 /* if it's possible then allign DMA buffers to length of scan */ 1300 /* if it's possible then align DMA buffers to length of scan */
1301 i = dmalen0; 1301 i = dmalen0;
1302 dmalen0 = 1302 dmalen0 =
1303 (dmalen0 / (devpriv->ai_n_realscanlen << 1)) * 1303 (dmalen0 / (devpriv->ai_n_realscanlen << 1)) *
diff --git a/drivers/staging/comedi/drivers/adq12b.c b/drivers/staging/comedi/drivers/adq12b.c
index 4b470000b69c..5361f318b010 100644
--- a/drivers/staging/comedi/drivers/adq12b.c
+++ b/drivers/staging/comedi/drivers/adq12b.c
@@ -65,7 +65,7 @@ If you do not specify any options, they will default to
65 written by jeremy theler <thelerg@ib.cnea.gov.ar> 65 written by jeremy theler <thelerg@ib.cnea.gov.ar>
66 66
67 instituto balseiro 67 instituto balseiro
68 comision nacional de energia atomica 68 commission nacional de energia atomica
69 universidad nacional de cuyo 69 universidad nacional de cuyo
70 argentina 70 argentina
71 71
@@ -342,7 +342,7 @@ static int adq12b_ai_rinsn(struct comedi_device *dev,
342 /* convert n samples */ 342 /* convert n samples */
343 for (n = 0; n < insn->n; n++) { 343 for (n = 0; n < insn->n; n++) {
344 344
345 /* wait for end of convertion */ 345 /* wait for end of conversion */
346 i = 0; 346 i = 0;
347 do { 347 do {
348 /* udelay(1); */ 348 /* udelay(1); */
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index 466e69f94ef2..da2b75b15d4e 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -98,7 +98,7 @@ Configuration options:
98#define Status_FE 0x0100 /* 1=FIFO is empty */ 98#define Status_FE 0x0100 /* 1=FIFO is empty */
99#define Status_FH 0x0200 /* 1=FIFO is half full */ 99#define Status_FH 0x0200 /* 1=FIFO is half full */
100#define Status_FF 0x0400 /* 1=FIFO is full, fatal error */ 100#define Status_FF 0x0400 /* 1=FIFO is full, fatal error */
101#define Status_IRQ 0x0800 /* 1=IRQ occured */ 101#define Status_IRQ 0x0800 /* 1=IRQ occurred */
102/* bits from control register (PCI171x_CONTROL) */ 102/* bits from control register (PCI171x_CONTROL) */
103#define Control_CNT0 0x0040 /* 1=CNT0 have external source, 103#define Control_CNT0 0x0040 /* 1=CNT0 have external source,
104 * 0=have internal 100kHz source */ 104 * 0=have internal 100kHz source */
@@ -1161,7 +1161,7 @@ static int check_channel_list(struct comedi_device *dev,
1161 } 1161 }
1162 1162
1163 if (n_chan > 1) { 1163 if (n_chan > 1) {
1164 chansegment[0] = chanlist[0]; /* first channel is everytime ok */ 1164 chansegment[0] = chanlist[0]; /* first channel is every time ok */
1165 for (i = 1, seglen = 1; i < n_chan; i++, seglen++) { /* build part of chanlist */ 1165 for (i = 1, seglen = 1; i < n_chan; i++, seglen++) { /* build part of chanlist */
1166 /* printk("%d. %d %d\n",i,CR_CHAN(chanlist[i]),CR_RANGE(chanlist[i])); */ 1166 /* printk("%d. %d %d\n",i,CR_CHAN(chanlist[i]),CR_RANGE(chanlist[i])); */
1167 if (chanlist[0] == chanlist[i]) 1167 if (chanlist[0] == chanlist[i])
@@ -1176,9 +1176,9 @@ static int check_channel_list(struct comedi_device *dev,
1176 (CR_CHAN(chansegment[i - 1]) + 1) % s->n_chan; 1176 (CR_CHAN(chansegment[i - 1]) + 1) % s->n_chan;
1177 if (CR_AREF(chansegment[i - 1]) == AREF_DIFF) 1177 if (CR_AREF(chansegment[i - 1]) == AREF_DIFF)
1178 nowmustbechan = (nowmustbechan + 1) % s->n_chan; 1178 nowmustbechan = (nowmustbechan + 1) % s->n_chan;
1179 if (nowmustbechan != CR_CHAN(chanlist[i])) { /* channel list isn't continous :-( */ 1179 if (nowmustbechan != CR_CHAN(chanlist[i])) { /* channel list isn't continuous :-( */
1180 printk 1180 printk
1181 ("channel list must be continous! chanlist[%i]=%d but must be %d or %d!\n", 1181 ("channel list must be continuous! chanlist[%i]=%d but must be %d or %d!\n",
1182 i, CR_CHAN(chanlist[i]), nowmustbechan, 1182 i, CR_CHAN(chanlist[i]), nowmustbechan,
1183 CR_CHAN(chanlist[0])); 1183 CR_CHAN(chanlist[0]));
1184 return 0; 1184 return 0;
diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index 0941643b3869..61968a505f24 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -115,7 +115,7 @@ analog triggering on 1602 series
115#define INT_MASK 0x3 /* mask of interrupt select bits */ 115#define INT_MASK 0x3 /* mask of interrupt select bits */
116#define INTE 0x4 /* interrupt enable */ 116#define INTE 0x4 /* interrupt enable */
117#define DAHFIE 0x8 /* dac half full interrupt enable */ 117#define DAHFIE 0x8 /* dac half full interrupt enable */
118#define EOAIE 0x10 /* end of aquisition interrupt enable */ 118#define EOAIE 0x10 /* end of acquisition interrupt enable */
119#define DAHFI 0x20 /* dac half full read status / write interrupt clear */ 119#define DAHFI 0x20 /* dac half full read status / write interrupt clear */
120#define EOAI 0x40 /* read end of acq. interrupt status / write clear */ 120#define EOAI 0x40 /* read end of acq. interrupt status / write clear */
121#define INT 0x80 /* read interrupt status / write clear */ 121#define INT 0x80 /* read interrupt status / write clear */
@@ -440,7 +440,7 @@ struct cb_pcidas_private {
440 unsigned int divisor1; 440 unsigned int divisor1;
441 unsigned int divisor2; 441 unsigned int divisor2;
442 volatile unsigned int count; /* number of analog input samples remaining */ 442 volatile unsigned int count; /* number of analog input samples remaining */
443 volatile unsigned int adc_fifo_bits; /* bits to write to interupt/adcfifo register */ 443 volatile unsigned int adc_fifo_bits; /* bits to write to interrupt/adcfifo register */
444 volatile unsigned int s5933_intcsr_bits; /* bits to write to amcc s5933 interrupt control/status register */ 444 volatile unsigned int s5933_intcsr_bits; /* bits to write to amcc s5933 interrupt control/status register */
445 volatile unsigned int ao_control_bits; /* bits to write to ao control and status register */ 445 volatile unsigned int ao_control_bits; /* bits to write to ao control and status register */
446 short ai_buffer[AI_BUFFER_SIZE]; 446 short ai_buffer[AI_BUFFER_SIZE];
@@ -1653,7 +1653,7 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d)
1653 spin_unlock_irqrestore(&dev->spinlock, flags); 1653 spin_unlock_irqrestore(&dev->spinlock, flags);
1654 } else if (status & EOAI) { 1654 } else if (status & EOAI) {
1655 comedi_error(dev, 1655 comedi_error(dev,
1656 "bug! encountered end of aquisition interrupt?"); 1656 "bug! encountered end of acquisition interrupt?");
1657 /* clear EOA interrupt latch */ 1657 /* clear EOA interrupt latch */
1658 spin_lock_irqsave(&dev->spinlock, flags); 1658 spin_lock_irqsave(&dev->spinlock, flags);
1659 outw(devpriv->adc_fifo_bits | EOAI, 1659 outw(devpriv->adc_fifo_bits | EOAI,
diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c
index 2583e16cd02a..1e324198996c 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -104,7 +104,7 @@ TODO:
104#endif 104#endif
105 105
106#define TIMER_BASE 25 /* 40MHz master clock */ 106#define TIMER_BASE 25 /* 40MHz master clock */
107#define PRESCALED_TIMER_BASE 10000 /* 100kHz 'prescaled' clock for slow aquisition, maybe I'll support this someday */ 107#define PRESCALED_TIMER_BASE 10000 /* 100kHz 'prescaled' clock for slow acquisition, maybe I'll support this someday */
108#define DMA_BUFFER_SIZE 0x1000 108#define DMA_BUFFER_SIZE 0x1000
109 109
110#define PCI_VENDOR_ID_COMPUTERBOARDS 0x1307 110#define PCI_VENDOR_ID_COMPUTERBOARDS 0x1307
@@ -136,7 +136,7 @@ enum write_only_registers {
136 ADC_DELAY_INTERVAL_UPPER_REG = 0x1c, /* upper 8 bits of delay interval counter */ 136 ADC_DELAY_INTERVAL_UPPER_REG = 0x1c, /* upper 8 bits of delay interval counter */
137 ADC_COUNT_LOWER_REG = 0x1e, /* lower 16 bits of hardware conversion/scan counter */ 137 ADC_COUNT_LOWER_REG = 0x1e, /* lower 16 bits of hardware conversion/scan counter */
138 ADC_COUNT_UPPER_REG = 0x20, /* upper 8 bits of hardware conversion/scan counter */ 138 ADC_COUNT_UPPER_REG = 0x20, /* upper 8 bits of hardware conversion/scan counter */
139 ADC_START_REG = 0x22, /* software trigger to start aquisition */ 139 ADC_START_REG = 0x22, /* software trigger to start acquisition */
140 ADC_CONVERT_REG = 0x24, /* initiates single conversion */ 140 ADC_CONVERT_REG = 0x24, /* initiates single conversion */
141 ADC_QUEUE_CLEAR_REG = 0x26, /* clears adc queue */ 141 ADC_QUEUE_CLEAR_REG = 0x26, /* clears adc queue */
142 ADC_QUEUE_LOAD_REG = 0x28, /* loads adc queue */ 142 ADC_QUEUE_LOAD_REG = 0x28, /* loads adc queue */
@@ -199,7 +199,7 @@ enum intr_enable_contents {
199 ADC_INTR_EOSCAN_BITS = 0x2, /* interrupt end of scan */ 199 ADC_INTR_EOSCAN_BITS = 0x2, /* interrupt end of scan */
200 ADC_INTR_EOSEQ_BITS = 0x3, /* interrupt end of sequence (probably wont use this it's pretty fancy) */ 200 ADC_INTR_EOSEQ_BITS = 0x3, /* interrupt end of sequence (probably wont use this it's pretty fancy) */
201 EN_ADC_INTR_SRC_BIT = 0x4, /* enable adc interrupt source */ 201 EN_ADC_INTR_SRC_BIT = 0x4, /* enable adc interrupt source */
202 EN_ADC_DONE_INTR_BIT = 0x8, /* enable adc aquisition done interrupt */ 202 EN_ADC_DONE_INTR_BIT = 0x8, /* enable adc acquisition done interrupt */
203 DAC_INTR_SRC_MASK = 0x30, 203 DAC_INTR_SRC_MASK = 0x30,
204 DAC_INTR_QEMPTY_BITS = 0x0, 204 DAC_INTR_QEMPTY_BITS = 0x0,
205 DAC_INTR_HIGH_CHAN_BITS = 0x10, 205 DAC_INTR_HIGH_CHAN_BITS = 0x10,
@@ -2867,7 +2867,7 @@ static int ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
2867 2867
2868 spin_unlock_irqrestore(&dev->spinlock, flags); 2868 spin_unlock_irqrestore(&dev->spinlock, flags);
2869 2869
2870 /* start aquisition */ 2870 /* start acquisition */
2871 if (cmd->start_src == TRIG_NOW) { 2871 if (cmd->start_src == TRIG_NOW) {
2872 writew(0, priv(dev)->main_iobase + ADC_START_REG); 2872 writew(0, priv(dev)->main_iobase + ADC_START_REG);
2873 DEBUG_PRINT("soft trig\n"); 2873 DEBUG_PRINT("soft trig\n");
@@ -2942,7 +2942,7 @@ static void pio_drain_ai_fifo_16(struct comedi_device *dev)
2942/* Read from 32 bit wide ai fifo of 4020 - deal with insane grey coding of pointers. 2942/* Read from 32 bit wide ai fifo of 4020 - deal with insane grey coding of pointers.
2943 * The pci-4020 hardware only supports 2943 * The pci-4020 hardware only supports
2944 * dma transfers (it only supports the use of pio for draining the last remaining 2944 * dma transfers (it only supports the use of pio for draining the last remaining
2945 * points from the fifo when a data aquisition operation has completed). 2945 * points from the fifo when a data acquisition operation has completed).
2946 */ 2946 */
2947static void pio_drain_ai_fifo_32(struct comedi_device *dev) 2947static void pio_drain_ai_fifo_32(struct comedi_device *dev)
2948{ 2948{
@@ -3046,7 +3046,7 @@ static void handle_ai_interrupt(struct comedi_device *dev,
3046 comedi_error(dev, "fifo overrun"); 3046 comedi_error(dev, "fifo overrun");
3047 async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; 3047 async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
3048 } 3048 }
3049 /* spin lock makes sure noone else changes plx dma control reg */ 3049 /* spin lock makes sure no one else changes plx dma control reg */
3050 spin_lock_irqsave(&dev->spinlock, flags); 3050 spin_lock_irqsave(&dev->spinlock, flags);
3051 dma1_status = readb(priv(dev)->plx9080_iobase + PLX_DMA1_CS_REG); 3051 dma1_status = readb(priv(dev)->plx9080_iobase + PLX_DMA1_CS_REG);
3052 if (plx_status & ICS_DMA1_A) { /* dma chan 1 interrupt */ 3052 if (plx_status & ICS_DMA1_A) { /* dma chan 1 interrupt */
@@ -3170,7 +3170,7 @@ static void handle_ao_interrupt(struct comedi_device *dev,
3170 async = s->async; 3170 async = s->async;
3171 cmd = &async->cmd; 3171 cmd = &async->cmd;
3172 3172
3173 /* spin lock makes sure noone else changes plx dma control reg */ 3173 /* spin lock makes sure no one else changes plx dma control reg */
3174 spin_lock_irqsave(&dev->spinlock, flags); 3174 spin_lock_irqsave(&dev->spinlock, flags);
3175 dma0_status = readb(priv(dev)->plx9080_iobase + PLX_DMA0_CS_REG); 3175 dma0_status = readb(priv(dev)->plx9080_iobase + PLX_DMA0_CS_REG);
3176 if (plx_status & ICS_DMA0_A) { /* dma chan 0 interrupt */ 3176 if (plx_status & ICS_DMA0_A) { /* dma chan 0 interrupt */
diff --git a/drivers/staging/comedi/drivers/comedi_test.c b/drivers/staging/comedi/drivers/comedi_test.c
index b220b3055412..a804742b8022 100644
--- a/drivers/staging/comedi/drivers/comedi_test.c
+++ b/drivers/staging/comedi/drivers/comedi_test.c
@@ -81,7 +81,7 @@ static const struct waveform_board waveform_boards[] = {
81/* Data unique to this driver */ 81/* Data unique to this driver */
82struct waveform_private { 82struct waveform_private {
83 struct timer_list timer; 83 struct timer_list timer;
84 struct timeval last; /* time at which last timer interrupt occured */ 84 struct timeval last; /* time at which last timer interrupt occurred */
85 unsigned int uvolt_amplitude; /* waveform amplitude in microvolts */ 85 unsigned int uvolt_amplitude; /* waveform amplitude in microvolts */
86 unsigned long usec_period; /* waveform period in microseconds */ 86 unsigned long usec_period; /* waveform period in microseconds */
87 unsigned long usec_current; /* current time (modulo waveform period) */ 87 unsigned long usec_current; /* current time (modulo waveform period) */
diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c
index 6ea93f9c0b48..60c2b12d6ffb 100644
--- a/drivers/staging/comedi/drivers/das1800.c
+++ b/drivers/staging/comedi/drivers/das1800.c
@@ -1087,7 +1087,7 @@ static void das1800_flush_dma_channel(struct comedi_device *dev,
1087 return; 1087 return;
1088} 1088}
1089 1089
1090/* flushes remaining data from board when external trigger has stopped aquisition 1090/* flushes remaining data from board when external trigger has stopped acquisition
1091 * and we are using dma transfers */ 1091 * and we are using dma transfers */
1092static void das1800_flush_dma(struct comedi_device *dev, 1092static void das1800_flush_dma(struct comedi_device *dev,
1093 struct comedi_subdevice *s) 1093 struct comedi_subdevice *s)
diff --git a/drivers/staging/comedi/drivers/das800.c b/drivers/staging/comedi/drivers/das800.c
index aecaedc5027e..96d41ad76956 100644
--- a/drivers/staging/comedi/drivers/das800.c
+++ b/drivers/staging/comedi/drivers/das800.c
@@ -391,7 +391,7 @@ static irqreturn_t das800_interrupt(int irq, void *d)
391 spin_lock_irqsave(&dev->spinlock, irq_flags); 391 spin_lock_irqsave(&dev->spinlock, irq_flags);
392 outb(CONTROL1, dev->iobase + DAS800_GAIN); /* select base address + 7 to be STATUS2 register */ 392 outb(CONTROL1, dev->iobase + DAS800_GAIN); /* select base address + 7 to be STATUS2 register */
393 status = inb(dev->iobase + DAS800_STATUS2) & STATUS2_HCEN; 393 status = inb(dev->iobase + DAS800_STATUS2) & STATUS2_HCEN;
394 /* don't release spinlock yet since we want to make sure noone else disables hardware conversions */ 394 /* don't release spinlock yet since we want to make sure no one else disables hardware conversions */
395 if (status == 0) { 395 if (status == 0) {
396 spin_unlock_irqrestore(&dev->spinlock, irq_flags); 396 spin_unlock_irqrestore(&dev->spinlock, irq_flags);
397 return IRQ_HANDLED; 397 return IRQ_HANDLED;
diff --git a/drivers/staging/comedi/drivers/dmm32at.c b/drivers/staging/comedi/drivers/dmm32at.c
index 693728e14bdb..2b4e6e6eb825 100644
--- a/drivers/staging/comedi/drivers/dmm32at.c
+++ b/drivers/staging/comedi/drivers/dmm32at.c
@@ -532,7 +532,7 @@ static int dmm32at_ai_rinsn(struct comedi_device *dev,
532 msb = dmm_inb(dev, DMM32AT_AIMSB); 532 msb = dmm_inb(dev, DMM32AT_AIMSB);
533 533
534 /* invert sign bit to make range unsigned, this is an 534 /* invert sign bit to make range unsigned, this is an
535 idiosyncracy of the diamond board, it return 535 idiosyncrasy of the diamond board, it return
536 conversions as a signed value, i.e. -32768 to 536 conversions as a signed value, i.e. -32768 to
537 32767, flipping the bit and interpreting it as 537 32767, flipping the bit and interpreting it as
538 signed gives you a range of 0 to 65535 which is 538 signed gives you a range of 0 to 65535 which is
diff --git a/drivers/staging/comedi/drivers/dt2811.c b/drivers/staging/comedi/drivers/dt2811.c
index a1664caa1d96..0131d5225b52 100644
--- a/drivers/staging/comedi/drivers/dt2811.c
+++ b/drivers/staging/comedi/drivers/dt2811.c
@@ -560,7 +560,7 @@ int dt2811_adtrig(kdev_t minor, comedi_adtrig *adtrig)
560 switch (dev->i_admode) { 560 switch (dev->i_admode) {
561 case COMEDI_MDEMAND: 561 case COMEDI_MDEMAND:
562 dev->ntrig = adtrig->n - 1; 562 dev->ntrig = adtrig->n - 1;
563 /* not neccessary */ 563 /* not necessary */
564 /*printk("dt2811: AD soft trigger\n"); */ 564 /*printk("dt2811: AD soft trigger\n"); */
565 /*outb(DT2811_CLRERROR|DT2811_INTENB, 565 /*outb(DT2811_CLRERROR|DT2811_INTENB,
566 dev->iobase+DT2811_ADCSR); */ 566 dev->iobase+DT2811_ADCSR); */
diff --git a/drivers/staging/comedi/drivers/dt9812.c b/drivers/staging/comedi/drivers/dt9812.c
index 06059850dae2..32d9c42e9659 100644
--- a/drivers/staging/comedi/drivers/dt9812.c
+++ b/drivers/staging/comedi/drivers/dt9812.c
@@ -773,7 +773,7 @@ static int dt9812_probe(struct usb_interface *interface,
773 retval = dt9812_read_info(dev, 1, &fw, sizeof(fw)); 773 retval = dt9812_read_info(dev, 1, &fw, sizeof(fw));
774 if (retval == 0) { 774 if (retval == 0) {
775 dev_info(&interface->dev, 775 dev_info(&interface->dev,
776 "usb_reset_configuration succeded " 776 "usb_reset_configuration succeeded "
777 "after %d iterations\n", i); 777 "after %d iterations\n", i);
778 break; 778 break;
779 } 779 }
diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c
index 1661b57ca2ad..bc020dea141b 100644
--- a/drivers/staging/comedi/drivers/gsc_hpdi.c
+++ b/drivers/staging/comedi/drivers/gsc_hpdi.c
@@ -1031,7 +1031,7 @@ static irqreturn_t handle_interrupt(int irq, void *d)
1031 writel(hpdi_intr_status, 1031 writel(hpdi_intr_status,
1032 priv(dev)->hpdi_iobase + INTERRUPT_STATUS_REG); 1032 priv(dev)->hpdi_iobase + INTERRUPT_STATUS_REG);
1033 } 1033 }
1034 /* spin lock makes sure noone else changes plx dma control reg */ 1034 /* spin lock makes sure no one else changes plx dma control reg */
1035 spin_lock_irqsave(&dev->spinlock, flags); 1035 spin_lock_irqsave(&dev->spinlock, flags);
1036 dma0_status = readb(priv(dev)->plx9080_iobase + PLX_DMA0_CS_REG); 1036 dma0_status = readb(priv(dev)->plx9080_iobase + PLX_DMA0_CS_REG);
1037 if (plx_status & ICS_DMA0_A) { /* dma chan 0 interrupt */ 1037 if (plx_status & ICS_DMA0_A) { /* dma chan 0 interrupt */
@@ -1045,7 +1045,7 @@ static irqreturn_t handle_interrupt(int irq, void *d)
1045 } 1045 }
1046 spin_unlock_irqrestore(&dev->spinlock, flags); 1046 spin_unlock_irqrestore(&dev->spinlock, flags);
1047 1047
1048 /* spin lock makes sure noone else changes plx dma control reg */ 1048 /* spin lock makes sure no one else changes plx dma control reg */
1049 spin_lock_irqsave(&dev->spinlock, flags); 1049 spin_lock_irqsave(&dev->spinlock, flags);
1050 dma1_status = readb(priv(dev)->plx9080_iobase + PLX_DMA1_CS_REG); 1050 dma1_status = readb(priv(dev)->plx9080_iobase + PLX_DMA1_CS_REG);
1051 if (plx_status & ICS_DMA1_A) { /* XXX *//* dma chan 1 interrupt */ 1051 if (plx_status & ICS_DMA1_A) { /* XXX *//* dma chan 1 interrupt */
diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c
index 0bab39b3409b..126550f3c02b 100644
--- a/drivers/staging/comedi/drivers/icp_multi.c
+++ b/drivers/staging/comedi/drivers/icp_multi.c
@@ -715,7 +715,7 @@ Description:
715 is built correctly 715 is built correctly
716 716
717Parameters: 717Parameters:
718 struct comedi_device *dev Pointer to current sevice structure 718 struct comedi_device *dev Pointer to current service structure
719 struct comedi_subdevice *s Pointer to current subdevice structure 719 struct comedi_subdevice *s Pointer to current subdevice structure
720 unsigned int *chanlist Pointer to packed channel list 720 unsigned int *chanlist Pointer to packed channel list
721 unsigned int n_chan Number of channels to scan 721 unsigned int n_chan Number of channels to scan
@@ -772,7 +772,7 @@ Description:
772 Status register. 772 Status register.
773 773
774Parameters: 774Parameters:
775 struct comedi_device *dev Pointer to current sevice structure 775 struct comedi_device *dev Pointer to current service structure
776 struct comedi_subdevice *s Pointer to current subdevice structure 776 struct comedi_subdevice *s Pointer to current subdevice structure
777 unsigned int *chanlist Pointer to packed channel list 777 unsigned int *chanlist Pointer to packed channel list
778 unsigned int n_chan Number of channels to scan 778 unsigned int n_chan Number of channels to scan
@@ -848,7 +848,7 @@ Description:
848 This function resets the icp multi device to a 'safe' state 848 This function resets the icp multi device to a 'safe' state
849 849
850Parameters: 850Parameters:
851 struct comedi_device *dev Pointer to current sevice structure 851 struct comedi_device *dev Pointer to current service structure
852 852
853Returns:int 0 = success 853Returns:int 0 = success
854 854
diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index 75511bae0191..b692fea0d2b0 100644
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -1810,7 +1810,7 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id)
1810 ai_context->irq_status_reg) & 1810 ai_context->irq_status_reg) &
1811 ME4000_IRQ_STATUS_BIT_AI_HF) { 1811 ME4000_IRQ_STATUS_BIT_AI_HF) {
1812 ISR_PDEBUG 1812 ISR_PDEBUG
1813 ("me4000_ai_isr(): Fifo half full interrupt occured\n"); 1813 ("me4000_ai_isr(): Fifo half full interrupt occurred\n");
1814 1814
1815 /* Read status register to find out what happened */ 1815 /* Read status register to find out what happened */
1816 tmp = me4000_inl(dev, ai_context->ctrl_reg); 1816 tmp = me4000_inl(dev, ai_context->ctrl_reg);
@@ -1903,7 +1903,7 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id)
1903 if (me4000_inl(dev, 1903 if (me4000_inl(dev,
1904 ai_context->irq_status_reg) & ME4000_IRQ_STATUS_BIT_SC) { 1904 ai_context->irq_status_reg) & ME4000_IRQ_STATUS_BIT_SC) {
1905 ISR_PDEBUG 1905 ISR_PDEBUG
1906 ("me4000_ai_isr(): Sample counter interrupt occured\n"); 1906 ("me4000_ai_isr(): Sample counter interrupt occurred\n");
1907 1907
1908 s->async->events |= COMEDI_CB_BLOCK | COMEDI_CB_EOA; 1908 s->async->events |= COMEDI_CB_BLOCK | COMEDI_CB_EOA;
1909 1909
diff --git a/drivers/staging/comedi/drivers/mpc624.c b/drivers/staging/comedi/drivers/mpc624.c
index a89eebd23f65..dd09a6d46e5c 100644
--- a/drivers/staging/comedi/drivers/mpc624.c
+++ b/drivers/staging/comedi/drivers/mpc624.c
@@ -39,8 +39,8 @@ Status: working
39 39
40Configuration Options: 40Configuration Options:
41 [0] - I/O base address 41 [0] - I/O base address
42 [1] - convertion rate 42 [1] - conversion rate
43 Convertion rate RMS noise Effective Number Of Bits 43 Conversion rate RMS noise Effective Number Of Bits
44 0 3.52kHz 23uV 17 44 0 3.52kHz 23uV 17
45 1 1.76kHz 3.5uV 20 45 1 1.76kHz 3.5uV 20
46 2 880Hz 2uV 21.3 46 2 880Hz 2uV 21.3
@@ -93,8 +93,8 @@ Configuration Options:
93#define MPC624_DMY_BIT (1<<30) 93#define MPC624_DMY_BIT (1<<30)
94#define MPC624_SGN_BIT (1<<29) 94#define MPC624_SGN_BIT (1<<29)
95 95
96/* Convertion speeds */ 96/* Conversion speeds */
97/* OSR4 OSR3 OSR2 OSR1 OSR0 Convertion rate RMS noise ENOB^ 97/* OSR4 OSR3 OSR2 OSR1 OSR0 Conversion rate RMS noise ENOB^
98 * X 0 0 0 1 3.52kHz 23uV 17 98 * X 0 0 0 1 3.52kHz 23uV 17
99 * X 0 0 1 0 1.76kHz 3.5uV 20 99 * X 0 0 1 0 1.76kHz 3.5uV 20
100 * X 0 0 1 1 880Hz 2uV 21.3 100 * X 0 0 1 1 880Hz 2uV 21.3
@@ -227,7 +227,7 @@ static int mpc624_attach(struct comedi_device *dev, struct comedi_devconfig *it)
227 break; 227 break;
228 default: 228 default:
229 printk 229 printk
230 (KERN_ERR "illegal convertion rate setting!" 230 (KERN_ERR "illegal conversion rate setting!"
231 " Valid numbers are 0..9. Using 9 => 6.875 Hz, "); 231 " Valid numbers are 0..9. Using 9 => 6.875 Hz, ");
232 devpriv->ulConvertionRate = MPC624_SPEED_3_52_kHz; 232 devpriv->ulConvertionRate = MPC624_SPEED_3_52_kHz;
233 } 233 }
@@ -296,7 +296,7 @@ static int mpc624_ai_rinsn(struct comedi_device *dev,
296 } 296 }
297 297
298 for (n = 0; n < insn->n; n++) { 298 for (n = 0; n < insn->n; n++) {
299 /* Trigger the convertion */ 299 /* Trigger the conversion */
300 outb(MPC624_ADSCK, dev->iobase + MPC624_ADC); 300 outb(MPC624_ADSCK, dev->iobase + MPC624_ADC);
301 udelay(1); 301 udelay(1);
302 outb(MPC624_ADCS | MPC624_ADSCK, dev->iobase + MPC624_ADC); 302 outb(MPC624_ADCS | MPC624_ADSCK, dev->iobase + MPC624_ADC);
@@ -304,7 +304,7 @@ static int mpc624_ai_rinsn(struct comedi_device *dev,
304 outb(0, dev->iobase + MPC624_ADC); 304 outb(0, dev->iobase + MPC624_ADC);
305 udelay(1); 305 udelay(1);
306 306
307 /* Wait for the convertion to end */ 307 /* Wait for the conversion to end */
308 for (i = 0; i < TIMEOUT; i++) { 308 for (i = 0; i < TIMEOUT; i++) {
309 ucPort = inb(dev->iobase + MPC624_ADC); 309 ucPort = inb(dev->iobase + MPC624_ADC);
310 if (ucPort & MPC624_ADBUSY) 310 if (ucPort & MPC624_ADBUSY)
diff --git a/drivers/staging/comedi/drivers/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c
index 4d0053ea2465..c192b71ec04f 100644
--- a/drivers/staging/comedi/drivers/ni_at_a2150.c
+++ b/drivers/staging/comedi/drivers/ni_at_a2150.c
@@ -104,10 +104,10 @@ TRIG_WAKE_EOS
104#define STATUS_REG 0x12 /* read only */ 104#define STATUS_REG 0x12 /* read only */
105#define FNE_BIT 0x1 /* fifo not empty */ 105#define FNE_BIT 0x1 /* fifo not empty */
106#define OVFL_BIT 0x8 /* fifo overflow */ 106#define OVFL_BIT 0x8 /* fifo overflow */
107#define EDAQ_BIT 0x10 /* end of aquisition interrupt */ 107#define EDAQ_BIT 0x10 /* end of acquisition interrupt */
108#define DCAL_BIT 0x20 /* offset calibration in progress */ 108#define DCAL_BIT 0x20 /* offset calibration in progress */
109#define INTR_BIT 0x40 /* interrupt has occured */ 109#define INTR_BIT 0x40 /* interrupt has occurred */
110#define DMA_TC_BIT 0x80 /* dma terminal count interrupt has occured */ 110#define DMA_TC_BIT 0x80 /* dma terminal count interrupt has occurred */
111#define ID_BITS(x) (((x) >> 8) & 0x3) 111#define ID_BITS(x) (((x) >> 8) & 0x3)
112#define IRQ_DMA_CNTRL_REG 0x12 /* write only */ 112#define IRQ_DMA_CNTRL_REG 0x12 /* write only */
113#define DMA_CHAN_BITS(x) ((x) & 0x7) /* sets dma channel */ 113#define DMA_CHAN_BITS(x) ((x) & 0x7) /* sets dma channel */
@@ -434,7 +434,7 @@ static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it)
434 s->cancel = a2150_cancel; 434 s->cancel = a2150_cancel;
435 435
436 /* need to do this for software counting of completed conversions, to 436 /* need to do this for software counting of completed conversions, to
437 * prevent hardware count from stopping aquisition */ 437 * prevent hardware count from stopping acquisition */
438 outw(HW_COUNT_DISABLE, dev->iobase + I8253_MODE_REG); 438 outw(HW_COUNT_DISABLE, dev->iobase + I8253_MODE_REG);
439 439
440 /* set card's irq and dma levels */ 440 /* set card's irq and dma levels */
@@ -729,7 +729,7 @@ static int a2150_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
729 /* send trigger config bits */ 729 /* send trigger config bits */
730 outw(trigger_bits, dev->iobase + TRIGGER_REG); 730 outw(trigger_bits, dev->iobase + TRIGGER_REG);
731 731
732 /* start aquisition for soft trigger */ 732 /* start acquisition for soft trigger */
733 if (cmd->start_src == TRIG_NOW) { 733 if (cmd->start_src == TRIG_NOW) {
734 outw(0, dev->iobase + FIFO_START_REG); 734 outw(0, dev->iobase + FIFO_START_REG);
735 } 735 }
@@ -768,7 +768,7 @@ static int a2150_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
768 /* setup start triggering */ 768 /* setup start triggering */
769 outw(0, dev->iobase + TRIGGER_REG); 769 outw(0, dev->iobase + TRIGGER_REG);
770 770
771 /* start aquisition for soft trigger */ 771 /* start acquisition for soft trigger */
772 outw(0, dev->iobase + FIFO_START_REG); 772 outw(0, dev->iobase + FIFO_START_REG);
773 773
774 /* there is a 35.6 sample delay for data to get through the antialias filter */ 774 /* there is a 35.6 sample delay for data to get through the antialias filter */
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
index 241fe525abf0..ab8f37022a3c 100644
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -183,11 +183,11 @@ NI manuals:
183#define OVERRUN_BIT 0x2 183#define OVERRUN_BIT 0x2
184/* fifo overflow */ 184/* fifo overflow */
185#define OVERFLOW_BIT 0x4 185#define OVERFLOW_BIT 0x4
186/* timer interrupt has occured */ 186/* timer interrupt has occurred */
187#define TIMER_BIT 0x8 187#define TIMER_BIT 0x8
188/* dma terminal count has occured */ 188/* dma terminal count has occurred */
189#define DMATC_BIT 0x10 189#define DMATC_BIT 0x10
190/* external trigger has occured */ 190/* external trigger has occurred */
191#define EXT_TRIG_BIT 0x40 191#define EXT_TRIG_BIT 0x40
192/* 1200 boards only */ 192/* 1200 boards only */
193#define STATUS2_REG 0x1d 193#define STATUS2_REG 0x1d
@@ -1149,7 +1149,7 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
1149 range = CR_RANGE(cmd->chanlist[0]); 1149 range = CR_RANGE(cmd->chanlist[0]);
1150 aref = CR_AREF(cmd->chanlist[0]); 1150 aref = CR_AREF(cmd->chanlist[0]);
1151 1151
1152 /* make sure board is disabled before setting up aquisition */ 1152 /* make sure board is disabled before setting up acquisition */
1153 spin_lock_irqsave(&dev->spinlock, flags); 1153 spin_lock_irqsave(&dev->spinlock, flags);
1154 devpriv->command2_bits &= ~SWTRIG_BIT & ~HWTRIG_BIT & ~PRETRIG_BIT; 1154 devpriv->command2_bits &= ~SWTRIG_BIT & ~HWTRIG_BIT & ~PRETRIG_BIT;
1155 devpriv->write_byte(devpriv->command2_bits, dev->iobase + COMMAND2_REG); 1155 devpriv->write_byte(devpriv->command2_bits, dev->iobase + COMMAND2_REG);
@@ -1349,7 +1349,7 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
1349 devpriv->command3_bits &= ~ADC_FNE_INTR_EN_BIT; 1349 devpriv->command3_bits &= ~ADC_FNE_INTR_EN_BIT;
1350 devpriv->write_byte(devpriv->command3_bits, dev->iobase + COMMAND3_REG); 1350 devpriv->write_byte(devpriv->command3_bits, dev->iobase + COMMAND3_REG);
1351 1351
1352 /* startup aquisition */ 1352 /* startup acquisition */
1353 1353
1354 /* command2 reg */ 1354 /* command2 reg */
1355 /* use 2 cascaded counters for pacing */ 1355 /* use 2 cascaded counters for pacing */
@@ -1571,8 +1571,8 @@ static void handle_isa_dma(struct comedi_device *dev)
1571 devpriv->write_byte(0x1, dev->iobase + DMATC_CLEAR_REG); 1571 devpriv->write_byte(0x1, dev->iobase + DMATC_CLEAR_REG);
1572} 1572}
1573 1573
1574/* makes sure all data acquired by board is transfered to comedi (used 1574/* makes sure all data acquired by board is transferred to comedi (used
1575 * when aquisition is terminated by stop_src == TRIG_EXT). */ 1575 * when acquisition is terminated by stop_src == TRIG_EXT). */
1576static void labpc_drain_dregs(struct comedi_device *dev) 1576static void labpc_drain_dregs(struct comedi_device *dev)
1577{ 1577{
1578 if (devpriv->current_transfer == isa_dma_transfer) 1578 if (devpriv->current_transfer == isa_dma_transfer)
diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c
index 005d2fe86ee4..8dd3a01d48dd 100644
--- a/drivers/staging/comedi/drivers/ni_pcidio.c
+++ b/drivers/staging/comedi/drivers/ni_pcidio.c
@@ -821,7 +821,7 @@ static int ni_pcidio_cmdtest(struct comedi_device *dev,
821 cmd->scan_begin_arg = MAX_SPEED; 821 cmd->scan_begin_arg = MAX_SPEED;
822 err++; 822 err++;
823 } 823 }
824 /* no minumum speed */ 824 /* no minimum speed */
825 } else { 825 } else {
826 /* TRIG_EXT */ 826 /* TRIG_EXT */
827 /* should be level/edge, hi/lo specification here */ 827 /* should be level/edge, hi/lo specification here */
diff --git a/drivers/staging/comedi/drivers/pcl812.c b/drivers/staging/comedi/drivers/pcl812.c
index c6dce4a1425e..09ff4723b225 100644
--- a/drivers/staging/comedi/drivers/pcl812.c
+++ b/drivers/staging/comedi/drivers/pcl812.c
@@ -34,7 +34,7 @@
34 * and I cann't test all features.) 34 * and I cann't test all features.)
35 * 35 *
36 * This driver supports insn and cmd interfaces. Some boards support only insn 36 * This driver supports insn and cmd interfaces. Some boards support only insn
37 * becouse their hardware don't allow more (PCL-813/B, ACL-8113, ISO-813). 37 * because their hardware don't allow more (PCL-813/B, ACL-8113, ISO-813).
38 * Data transfer over DMA is supported only when you measure only one 38 * Data transfer over DMA is supported only when you measure only one
39 * channel, this is too hardware limitation of these boards. 39 * channel, this is too hardware limitation of these boards.
40 * 40 *
diff --git a/drivers/staging/comedi/drivers/pcl816.c b/drivers/staging/comedi/drivers/pcl816.c
index ef3cc4f3be6e..8f3fc6ee088b 100644
--- a/drivers/staging/comedi/drivers/pcl816.c
+++ b/drivers/staging/comedi/drivers/pcl816.c
@@ -954,7 +954,7 @@ check_channel_list(struct comedi_device *dev,
954 } 954 }
955 955
956 if (chanlen > 1) { 956 if (chanlen > 1) {
957 /* first channel is everytime ok */ 957 /* first channel is every time ok */
958 chansegment[0] = chanlist[0]; 958 chansegment[0] = chanlist[0];
959 for (i = 1, seglen = 1; i < chanlen; i++, seglen++) { 959 for (i = 1, seglen = 1; i < chanlen; i++, seglen++) {
960 /* build part of chanlist */ 960 /* build part of chanlist */
@@ -968,10 +968,10 @@ check_channel_list(struct comedi_device *dev,
968 nowmustbechan = 968 nowmustbechan =
969 (CR_CHAN(chansegment[i - 1]) + 1) % chanlen; 969 (CR_CHAN(chansegment[i - 1]) + 1) % chanlen;
970 if (nowmustbechan != CR_CHAN(chanlist[i])) { 970 if (nowmustbechan != CR_CHAN(chanlist[i])) {
971 /* channel list isn't continous :-( */ 971 /* channel list isn't continuous :-( */
972 printk(KERN_WARNING 972 printk(KERN_WARNING
973 "comedi%d: pcl816: channel list must " 973 "comedi%d: pcl816: channel list must "
974 "be continous! chanlist[%i]=%d but " 974 "be continuous! chanlist[%i]=%d but "
975 "must be %d or %d!\n", dev->minor, 975 "must be %d or %d!\n", dev->minor,
976 i, CR_CHAN(chanlist[i]), nowmustbechan, 976 i, CR_CHAN(chanlist[i]), nowmustbechan,
977 CR_CHAN(chanlist[0])); 977 CR_CHAN(chanlist[0]));
diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c
index f58d75be7295..e3eea09ae1fb 100644
--- a/drivers/staging/comedi/drivers/pcl818.c
+++ b/drivers/staging/comedi/drivers/pcl818.c
@@ -1231,7 +1231,7 @@ static int check_channel_list(struct comedi_device *dev,
1231 } 1231 }
1232 1232
1233 if (n_chan > 1) { 1233 if (n_chan > 1) {
1234 /* first channel is everytime ok */ 1234 /* first channel is every time ok */
1235 chansegment[0] = chanlist[0]; 1235 chansegment[0] = chanlist[0];
1236 /* build part of chanlist */ 1236 /* build part of chanlist */
1237 for (i = 1, seglen = 1; i < n_chan; i++, seglen++) { 1237 for (i = 1, seglen = 1; i < n_chan; i++, seglen++) {
@@ -1245,9 +1245,9 @@ static int check_channel_list(struct comedi_device *dev,
1245 break; 1245 break;
1246 nowmustbechan = 1246 nowmustbechan =
1247 (CR_CHAN(chansegment[i - 1]) + 1) % s->n_chan; 1247 (CR_CHAN(chansegment[i - 1]) + 1) % s->n_chan;
1248 if (nowmustbechan != CR_CHAN(chanlist[i])) { /* channel list isn't continous :-( */ 1248 if (nowmustbechan != CR_CHAN(chanlist[i])) { /* channel list isn't continuous :-( */
1249 printk 1249 printk
1250 ("comedi%d: pcl818: channel list must be continous! chanlist[%i]=%d but must be %d or %d!\n", 1250 ("comedi%d: pcl818: channel list must be continuous! chanlist[%i]=%d but must be %d or %d!\n",
1251 dev->minor, i, CR_CHAN(chanlist[i]), 1251 dev->minor, i, CR_CHAN(chanlist[i]),
1252 nowmustbechan, CR_CHAN(chanlist[0])); 1252 nowmustbechan, CR_CHAN(chanlist[0]));
1253 return 0; 1253 return 0;
diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c
index 5c832d7ed45d..f2e88e57d558 100644
--- a/drivers/staging/comedi/drivers/pcmmio.c
+++ b/drivers/staging/comedi/drivers/pcmmio.c
@@ -733,7 +733,7 @@ static int pcmmio_dio_insn_config(struct comedi_device *dev,
733 break; 733 break;
734 734
735 case INSN_CONFIG_DIO_QUERY: 735 case INSN_CONFIG_DIO_QUERY:
736 /* retreive from shadow register */ 736 /* retrieve from shadow register */
737 data[1] = 737 data[1] =
738 (s->io_bits & (1 << chan)) ? COMEDI_OUTPUT : COMEDI_INPUT; 738 (s->io_bits & (1 << chan)) ? COMEDI_OUTPUT : COMEDI_INPUT;
739 return insn->n; 739 return insn->n;
@@ -1279,7 +1279,7 @@ static int wait_dac_ready(unsigned long iobase)
1279 "no busy waiting" policy. The fact is that the hardware is 1279 "no busy waiting" policy. The fact is that the hardware is
1280 normally so fast that we usually only need one time through the loop 1280 normally so fast that we usually only need one time through the loop
1281 anyway. The longer timeout is for rare occasions and for detecting 1281 anyway. The longer timeout is for rare occasions and for detecting
1282 non-existant hardware. */ 1282 non-existent hardware. */
1283 1283
1284 while (retry--) { 1284 while (retry--) {
1285 if (inb(iobase + 3) & 0x80) 1285 if (inb(iobase + 3) & 0x80)
diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c
index 7a9287433b2e..b2c2c8971a32 100644
--- a/drivers/staging/comedi/drivers/pcmuio.c
+++ b/drivers/staging/comedi/drivers/pcmuio.c
@@ -605,7 +605,7 @@ static int pcmuio_dio_insn_config(struct comedi_device *dev,
605 break; 605 break;
606 606
607 case INSN_CONFIG_DIO_QUERY: 607 case INSN_CONFIG_DIO_QUERY:
608 /* retreive from shadow register */ 608 /* retrieve from shadow register */
609 data[1] = 609 data[1] =
610 (s->io_bits & (1 << chan)) ? COMEDI_OUTPUT : COMEDI_INPUT; 610 (s->io_bits & (1 << chan)) ? COMEDI_OUTPUT : COMEDI_INPUT;
611 return insn->n; 611 return insn->n;
diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index ebba9bb47777..82942e5728a5 100644
--- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -390,7 +390,7 @@ static int daqp_ai_insn_read(struct comedi_device *dev,
390 390
391 outb(v, dev->iobase + DAQP_CONTROL); 391 outb(v, dev->iobase + DAQP_CONTROL);
392 392
393 /* Reset any pending interrupts (my card has a tendancy to require 393 /* Reset any pending interrupts (my card has a tendency to require
394 * require multiple reads on the status register to achieve this) 394 * require multiple reads on the status register to achieve this)
395 */ 395 */
396 396
@@ -752,7 +752,7 @@ static int daqp_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
752 752
753 outb(v, dev->iobase + DAQP_CONTROL); 753 outb(v, dev->iobase + DAQP_CONTROL);
754 754
755 /* Reset any pending interrupts (my card has a tendancy to require 755 /* Reset any pending interrupts (my card has a tendency to require
756 * require multiple reads on the status register to achieve this) 756 * require multiple reads on the status register to achieve this)
757 */ 757 */
758 counter = 100; 758 counter = 100;
diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index 357858d27441..7f09ed755fe6 100644
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -75,7 +75,7 @@ Configuration options:
75 das1800, since they have the best documented code. Driver 75 das1800, since they have the best documented code. Driver
76 cb_pcidas64.c uses the same DMA controller. 76 cb_pcidas64.c uses the same DMA controller.
77 77
78 As far as I can tell, the About interrupt doesnt work if Sample is 78 As far as I can tell, the About interrupt doesn't work if Sample is
79 also enabled. It turns out that About really isn't needed, since 79 also enabled. It turns out that About really isn't needed, since
80 we always count down samples read. 80 we always count down samples read.
81 81
@@ -370,7 +370,7 @@ struct rtdPrivate {
370 /* timer gate (when enabled) */ 370 /* timer gate (when enabled) */
371 u8 utcGate[4]; /* 1 extra allows simple range check */ 371 u8 utcGate[4]; /* 1 extra allows simple range check */
372 372
373 /* shadow registers affect other registers, but cant be read back */ 373 /* shadow registers affect other registers, but can't be read back */
374 /* The macros below update these on writes */ 374 /* The macros below update these on writes */
375 u16 intMask; /* interrupt mask */ 375 u16 intMask; /* interrupt mask */
376 u16 intClearMask; /* interrupt clear mask */ 376 u16 intClearMask; /* interrupt clear mask */
@@ -485,7 +485,7 @@ struct rtdPrivate {
485#define RtdAdcFifoGet(dev) \ 485#define RtdAdcFifoGet(dev) \
486 readw(devpriv->las1+LAS1_ADC_FIFO) 486 readw(devpriv->las1+LAS1_ADC_FIFO)
487 487
488/* Read two ADC data values (DOESNT WORK) */ 488/* Read two ADC data values (DOESN'T WORK) */
489#define RtdAdcFifoGet2(dev) \ 489#define RtdAdcFifoGet2(dev) \
490 readl(devpriv->las1+LAS1_ADC_FIFO) 490 readl(devpriv->las1+LAS1_ADC_FIFO)
491 491
@@ -857,7 +857,7 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
857 DPRINTK("rtd520: PCI latency = %d\n", pci_latency); 857 DPRINTK("rtd520: PCI latency = %d\n", pci_latency);
858 } 858 }
859 859
860 /* Undocumented EPLD version (doesnt match RTD driver results) */ 860 /* Undocumented EPLD version (doesn't match RTD driver results) */
861 /*DPRINTK ("rtd520: Reading epld from %p\n", 861 /*DPRINTK ("rtd520: Reading epld from %p\n",
862 devpriv->las0+0); 862 devpriv->las0+0);
863 epld_version = readl (devpriv->las0+0); 863 epld_version = readl (devpriv->las0+0);
@@ -1291,7 +1291,7 @@ static int rtd520_probe_fifo_depth(struct comedi_device *dev)
1291/* 1291/*
1292 "instructions" read/write data in "one-shot" or "software-triggered" 1292 "instructions" read/write data in "one-shot" or "software-triggered"
1293 mode (simplest case). 1293 mode (simplest case).
1294 This doesnt use interrupts. 1294 This doesn't use interrupts.
1295 1295
1296 Note, we don't do any settling delays. Use a instruction list to 1296 Note, we don't do any settling delays. Use a instruction list to
1297 select, delay, then read. 1297 select, delay, then read.
@@ -2120,7 +2120,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
2120} 2120}
2121 2121
2122/* 2122/*
2123 Stop a running data aquisition. 2123 Stop a running data acquisition.
2124*/ 2124*/
2125static int rtd_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) 2125static int rtd_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
2126{ 2126{
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index d5ba3ab357a3..23fc64b9988e 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -139,7 +139,7 @@ struct s626_private {
139 int got_regions; 139 int got_regions;
140 short allocatedBuf; 140 short allocatedBuf;
141 uint8_t ai_cmd_running; /* ai_cmd is running */ 141 uint8_t ai_cmd_running; /* ai_cmd is running */
142 uint8_t ai_continous; /* continous aquisition */ 142 uint8_t ai_continous; /* continous acquisition */
143 int ai_sample_count; /* number of samples to acquire */ 143 int ai_sample_count; /* number of samples to acquire */
144 unsigned int ai_sample_timer; 144 unsigned int ai_sample_timer;
145 /* time between samples in units of the timer */ 145 /* time between samples in units of the timer */
@@ -1048,7 +1048,7 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
1048 uint8_t group; 1048 uint8_t group;
1049 uint16_t irqbit; 1049 uint16_t irqbit;
1050 1050
1051 DEBUG("s626_irq_handler: interrupt request recieved!!!\n"); 1051 DEBUG("s626_irq_handler: interrupt request received!!!\n");
1052 1052
1053 if (dev->attached == 0) 1053 if (dev->attached == 0)
1054 return IRQ_NONE; 1054 return IRQ_NONE;
@@ -1165,14 +1165,14 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
1165 (16 * group))) 1165 (16 * group)))
1166 == 1 && cmd->start_src == TRIG_EXT) { 1166 == 1 && cmd->start_src == TRIG_EXT) {
1167 DEBUG 1167 DEBUG
1168 ("s626_irq_handler: Edge capture interrupt recieved from channel %d\n", 1168 ("s626_irq_handler: Edge capture interrupt received from channel %d\n",
1169 cmd->start_arg); 1169 cmd->start_arg);
1170 1170
1171 /* Start executing the RPS program. */ 1171 /* Start executing the RPS program. */
1172 MC_ENABLE(P_MC1, MC1_ERPS1); 1172 MC_ENABLE(P_MC1, MC1_ERPS1);
1173 1173
1174 DEBUG 1174 DEBUG
1175 ("s626_irq_handler: aquisition start triggered!!!\n"); 1175 ("s626_irq_handler: acquisition start triggered!!!\n");
1176 1176
1177 if (cmd->scan_begin_src == 1177 if (cmd->scan_begin_src ==
1178 TRIG_EXT) { 1178 TRIG_EXT) {
@@ -1194,7 +1194,7 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
1194 && cmd->scan_begin_src == 1194 && cmd->scan_begin_src ==
1195 TRIG_EXT) { 1195 TRIG_EXT) {
1196 DEBUG 1196 DEBUG
1197 ("s626_irq_handler: Edge capture interrupt recieved from channel %d\n", 1197 ("s626_irq_handler: Edge capture interrupt received from channel %d\n",
1198 cmd->scan_begin_arg); 1198 cmd->scan_begin_arg);
1199 1199
1200 /* Trigger ADC scan loop start by setting RPS Signal 0. */ 1200 /* Trigger ADC scan loop start by setting RPS Signal 0. */
@@ -1236,7 +1236,7 @@ static irqreturn_t s626_irq_handler(int irq, void *d)
1236 == 1 1236 == 1
1237 && cmd->convert_src == TRIG_EXT) { 1237 && cmd->convert_src == TRIG_EXT) {
1238 DEBUG 1238 DEBUG
1239 ("s626_irq_handler: Edge capture interrupt recieved from channel %d\n", 1239 ("s626_irq_handler: Edge capture interrupt received from channel %d\n",
1240 cmd->convert_arg); 1240 cmd->convert_arg);
1241 1241
1242 /* Trigger ADC scan loop start by setting RPS Signal 0. */ 1242 /* Trigger ADC scan loop start by setting RPS Signal 0. */
@@ -1805,7 +1805,7 @@ static int s626_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
1805 DEBUG("s626_ai_cmd: NULL command\n"); 1805 DEBUG("s626_ai_cmd: NULL command\n");
1806 return -EINVAL; 1806 return -EINVAL;
1807 } else { 1807 } else {
1808 DEBUG("s626_ai_cmd: command recieved!!!\n"); 1808 DEBUG("s626_ai_cmd: command received!!!\n");
1809 } 1809 }
1810 1810
1811 if (dev->irq == 0) { 1811 if (dev->irq == 0) {
@@ -1880,7 +1880,7 @@ static int s626_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
1880 devpriv->ai_continous = 0; 1880 devpriv->ai_continous = 0;
1881 break; 1881 break;
1882 case TRIG_NONE: 1882 case TRIG_NONE:
1883 /* continous aquisition */ 1883 /* continous acquisition */
1884 devpriv->ai_continous = 1; 1884 devpriv->ai_continous = 1;
1885 devpriv->ai_sample_count = 0; 1885 devpriv->ai_sample_count = 0;
1886 break; 1886 break;
@@ -2570,7 +2570,7 @@ static uint32_t I2Chandshake(struct comedi_device *dev, uint32_t val)
2570 while ((RR7146(P_I2CCTRL) & (I2C_BUSY | I2C_ERR)) == I2C_BUSY) 2570 while ((RR7146(P_I2CCTRL) & (I2C_BUSY | I2C_ERR)) == I2C_BUSY)
2571 ; 2571 ;
2572 2572
2573 /* Return non-zero if I2C error occured. */ 2573 /* Return non-zero if I2C error occurred. */
2574 return RR7146(P_I2CCTRL) & I2C_ERR; 2574 return RR7146(P_I2CCTRL) & I2C_ERR;
2575 2575
2576} 2576}
diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c
index be93c30e4b15..e543e6c2b1bb 100644
--- a/drivers/staging/comedi/drivers/usbdux.c
+++ b/drivers/staging/comedi/drivers/usbdux.c
@@ -285,7 +285,7 @@ struct usbduxsub {
285 short int ao_cmd_running; 285 short int ao_cmd_running;
286 /* pwm is running */ 286 /* pwm is running */
287 short int pwm_cmd_running; 287 short int pwm_cmd_running;
288 /* continous aquisition */ 288 /* continous acquisition */
289 short int ai_continous; 289 short int ai_continous;
290 short int ao_continous; 290 short int ao_continous;
291 /* number of samples to acquire */ 291 /* number of samples to acquire */
@@ -500,7 +500,7 @@ static void usbduxsub_ai_IsocIrq(struct urb *urb)
500 500
501 /* test, if we transmit only a fixed number of samples */ 501 /* test, if we transmit only a fixed number of samples */
502 if (!(this_usbduxsub->ai_continous)) { 502 if (!(this_usbduxsub->ai_continous)) {
503 /* not continous, fixed number of samples */ 503 /* not continuous, fixed number of samples */
504 this_usbduxsub->ai_sample_count--; 504 this_usbduxsub->ai_sample_count--;
505 /* all samples received? */ 505 /* all samples received? */
506 if (this_usbduxsub->ai_sample_count < 0) { 506 if (this_usbduxsub->ai_sample_count < 0) {
@@ -653,7 +653,7 @@ static void usbduxsub_ao_IsocIrq(struct urb *urb)
653 /* timer zero */ 653 /* timer zero */
654 this_usbduxsub->ao_counter = this_usbduxsub->ao_timer; 654 this_usbduxsub->ao_counter = this_usbduxsub->ao_timer;
655 655
656 /* handle non continous aquisition */ 656 /* handle non continous acquisition */
657 if (!(this_usbduxsub->ao_continous)) { 657 if (!(this_usbduxsub->ao_continous)) {
658 /* fixed number of samples */ 658 /* fixed number of samples */
659 this_usbduxsub->ao_sample_count--; 659 this_usbduxsub->ao_sample_count--;
@@ -957,7 +957,7 @@ static int usbdux_ai_cmdtest(struct comedi_device *dev,
957 if (!cmd->scan_begin_src || tmp != cmd->scan_begin_src) 957 if (!cmd->scan_begin_src || tmp != cmd->scan_begin_src)
958 err++; 958 err++;
959 959
960 /* scanning is continous */ 960 /* scanning is continuous */
961 tmp = cmd->convert_src; 961 tmp = cmd->convert_src;
962 cmd->convert_src &= TRIG_NOW; 962 cmd->convert_src &= TRIG_NOW;
963 if (!cmd->convert_src || tmp != cmd->convert_src) 963 if (!cmd->convert_src || tmp != cmd->convert_src)
@@ -1222,7 +1222,7 @@ static int usbdux_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
1222 up(&this_usbduxsub->sem); 1222 up(&this_usbduxsub->sem);
1223 return -EBUSY; 1223 return -EBUSY;
1224 } 1224 }
1225 /* set current channel of the running aquisition to zero */ 1225 /* set current channel of the running acquisition to zero */
1226 s->async->cur_chan = 0; 1226 s->async->cur_chan = 0;
1227 1227
1228 this_usbduxsub->dux_commands[1] = cmd->chanlist_len; 1228 this_usbduxsub->dux_commands[1] = cmd->chanlist_len;
@@ -1284,7 +1284,7 @@ static int usbdux_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
1284 this_usbduxsub->ai_sample_count = cmd->stop_arg; 1284 this_usbduxsub->ai_sample_count = cmd->stop_arg;
1285 this_usbduxsub->ai_continous = 0; 1285 this_usbduxsub->ai_continous = 0;
1286 } else { 1286 } else {
1287 /* continous aquisition */ 1287 /* continous acquisition */
1288 this_usbduxsub->ai_continous = 1; 1288 this_usbduxsub->ai_continous = 1;
1289 this_usbduxsub->ai_sample_count = 0; 1289 this_usbduxsub->ai_sample_count = 0;
1290 } 1290 }
@@ -1515,7 +1515,7 @@ static int usbdux_ao_cmdtest(struct comedi_device *dev,
1515 /* just now we scan also in the high speed mode every frame */ 1515 /* just now we scan also in the high speed mode every frame */
1516 /* this is due to ehci driver limitations */ 1516 /* this is due to ehci driver limitations */
1517 if (0) { /* (this_usbduxsub->high_speed) */ 1517 if (0) { /* (this_usbduxsub->high_speed) */
1518 /* start immidiately a new scan */ 1518 /* start immediately a new scan */
1519 /* the sampling rate is set by the coversion rate */ 1519 /* the sampling rate is set by the coversion rate */
1520 cmd->scan_begin_src &= TRIG_FOLLOW; 1520 cmd->scan_begin_src &= TRIG_FOLLOW;
1521 } else { 1521 } else {
@@ -1525,7 +1525,7 @@ static int usbdux_ao_cmdtest(struct comedi_device *dev,
1525 if (!cmd->scan_begin_src || tmp != cmd->scan_begin_src) 1525 if (!cmd->scan_begin_src || tmp != cmd->scan_begin_src)
1526 err++; 1526 err++;
1527 1527
1528 /* scanning is continous */ 1528 /* scanning is continuous */
1529 tmp = cmd->convert_src; 1529 tmp = cmd->convert_src;
1530 /* we always output at 1kHz just now all channels at once */ 1530 /* we always output at 1kHz just now all channels at once */
1531 if (0) { /* (this_usbduxsub->high_speed) */ 1531 if (0) { /* (this_usbduxsub->high_speed) */
@@ -1645,7 +1645,7 @@ static int usbdux_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
1645 dev_dbg(&this_usbduxsub->interface->dev, 1645 dev_dbg(&this_usbduxsub->interface->dev,
1646 "comedi%d: %s\n", dev->minor, __func__); 1646 "comedi%d: %s\n", dev->minor, __func__);
1647 1647
1648 /* set current channel of the running aquisition to zero */ 1648 /* set current channel of the running acquisition to zero */
1649 s->async->cur_chan = 0; 1649 s->async->cur_chan = 0;
1650 for (i = 0; i < cmd->chanlist_len; ++i) { 1650 for (i = 0; i < cmd->chanlist_len; ++i) {
1651 chan = CR_CHAN(cmd->chanlist[i]); 1651 chan = CR_CHAN(cmd->chanlist[i]);
@@ -1694,7 +1694,7 @@ static int usbdux_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
1694 this_usbduxsub->ao_counter = this_usbduxsub->ao_timer; 1694 this_usbduxsub->ao_counter = this_usbduxsub->ao_timer;
1695 1695
1696 if (cmd->stop_src == TRIG_COUNT) { 1696 if (cmd->stop_src == TRIG_COUNT) {
1697 /* not continous */ 1697 /* not continuous */
1698 /* counter */ 1698 /* counter */
1699 /* high speed also scans everything at once */ 1699 /* high speed also scans everything at once */
1700 if (0) { /* (this_usbduxsub->high_speed) */ 1700 if (0) { /* (this_usbduxsub->high_speed) */
@@ -1708,7 +1708,7 @@ static int usbdux_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
1708 } 1708 }
1709 this_usbduxsub->ao_continous = 0; 1709 this_usbduxsub->ao_continous = 0;
1710 } else { 1710 } else {
1711 /* continous aquisition */ 1711 /* continous acquisition */
1712 this_usbduxsub->ao_continous = 1; 1712 this_usbduxsub->ao_continous = 1;
1713 this_usbduxsub->ao_sample_count = 0; 1713 this_usbduxsub->ao_sample_count = 0;
1714 } 1714 }
diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c
index 5b15e6df54e6..2a8e725b7859 100644
--- a/drivers/staging/comedi/drivers/usbduxfast.c
+++ b/drivers/staging/comedi/drivers/usbduxfast.c
@@ -180,7 +180,7 @@ struct usbduxfastsub_s {
180 /* comedi device for the interrupt context */ 180 /* comedi device for the interrupt context */
181 struct comedi_device *comedidev; 181 struct comedi_device *comedidev;
182 short int ai_cmd_running; /* asynchronous command is running */ 182 short int ai_cmd_running; /* asynchronous command is running */
183 short int ai_continous; /* continous aquisition */ 183 short int ai_continous; /* continous acquisition */
184 long int ai_sample_count; /* number of samples to acquire */ 184 long int ai_sample_count; /* number of samples to acquire */
185 uint8_t *dux_commands; /* commands */ 185 uint8_t *dux_commands; /* commands */
186 int ignore; /* counter which ignores the first 186 int ignore; /* counter which ignores the first
@@ -392,7 +392,7 @@ static void usbduxfastsub_ai_Irq(struct urb *urb)
392 p = urb->transfer_buffer; 392 p = urb->transfer_buffer;
393 if (!udfs->ignore) { 393 if (!udfs->ignore) {
394 if (!udfs->ai_continous) { 394 if (!udfs->ai_continous) {
395 /* not continous, fixed number of samples */ 395 /* not continuous, fixed number of samples */
396 n = urb->actual_length / sizeof(uint16_t); 396 n = urb->actual_length / sizeof(uint16_t);
397 if (unlikely(udfs->ai_sample_count < n)) { 397 if (unlikely(udfs->ai_sample_count < n)) {
398 /* 398 /*
@@ -775,7 +775,7 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
775 up(&udfs->sem); 775 up(&udfs->sem);
776 return -EBUSY; 776 return -EBUSY;
777 } 777 }
778 /* set current channel of the running aquisition to zero */ 778 /* set current channel of the running acquisition to zero */
779 s->async->cur_chan = 0; 779 s->async->cur_chan = 0;
780 780
781 /* 781 /*
@@ -1182,7 +1182,7 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
1182 } 1182 }
1183 udfs->ai_continous = 0; 1183 udfs->ai_continous = 0;
1184 } else { 1184 } else {
1185 /* continous aquisition */ 1185 /* continous acquisition */
1186 udfs->ai_continous = 1; 1186 udfs->ai_continous = 1;
1187 udfs->ai_sample_count = 0; 1187 udfs->ai_sample_count = 0;
1188 } 1188 }
diff --git a/drivers/staging/cptm1217/clearpad_tm1217.c b/drivers/staging/cptm1217/clearpad_tm1217.c
index 76e4b782d2fb..0fe713e72e9d 100644
--- a/drivers/staging/cptm1217/clearpad_tm1217.c
+++ b/drivers/staging/cptm1217/clearpad_tm1217.c
@@ -52,7 +52,7 @@
52#define TMA1217_DEV_STATUS 0x13 /* Device Status */ 52#define TMA1217_DEV_STATUS 0x13 /* Device Status */
53#define TMA1217_INT_STATUS 0x14 /* Interrupt Status */ 53#define TMA1217_INT_STATUS 0x14 /* Interrupt Status */
54 54
55/* Controller can detect upto 2 possible finger touches. 55/* Controller can detect up to 2 possible finger touches.
56 * Each finger touch provides 12 bit X Y co-ordinates, the values are split 56 * Each finger touch provides 12 bit X Y co-ordinates, the values are split
57 * across 2 registers, and an 8 bit Z value */ 57 * across 2 registers, and an 8 bit Z value */
58#define TMA1217_FINGER_STATE 0x18 /* Finger State */ 58#define TMA1217_FINGER_STATE 0x18 /* Finger State */
diff --git a/drivers/staging/crystalhd/crystalhd_cmds.c b/drivers/staging/crystalhd/crystalhd_cmds.c
index 1429608544d6..3735ed3da4c6 100644
--- a/drivers/staging/crystalhd/crystalhd_cmds.c
+++ b/drivers/staging/crystalhd/crystalhd_cmds.c
@@ -914,7 +914,7 @@ enum BC_STATUS crystalhd_user_open(struct crystalhd_cmd *ctx,
914 * Return: 914 * Return:
915 * status 915 * status
916 * 916 *
917 * Closer aplication handle and release app specific 917 * Closer application handle and release app specific
918 * resources. 918 * resources.
919 */ 919 */
920enum BC_STATUS crystalhd_user_close(struct crystalhd_cmd *ctx, struct crystalhd_user *uc) 920enum BC_STATUS crystalhd_user_close(struct crystalhd_cmd *ctx, struct crystalhd_user *uc)
diff --git a/drivers/staging/crystalhd/crystalhd_hw.c b/drivers/staging/crystalhd/crystalhd_hw.c
index 13a514dd0f79..5acf39e7cdef 100644
--- a/drivers/staging/crystalhd/crystalhd_hw.c
+++ b/drivers/staging/crystalhd/crystalhd_hw.c
@@ -302,7 +302,7 @@ static bool crystalhd_start_device(struct crystalhd_adp *adp)
302 crystalhd_enable_interrupts(adp); 302 crystalhd_enable_interrupts(adp);
303 303
304 /* Enable the option for getting the total no. of DWORDS 304 /* Enable the option for getting the total no. of DWORDS
305 * that have been transfered by the RXDMA engine 305 * that have been transferred by the RXDMA engine
306 */ 306 */
307 dbg_options = crystalhd_reg_rd(adp, MISC1_DMA_DEBUG_OPTIONS_REG); 307 dbg_options = crystalhd_reg_rd(adp, MISC1_DMA_DEBUG_OPTIONS_REG);
308 dbg_options |= 0x10; 308 dbg_options |= 0x10;
@@ -1776,7 +1776,7 @@ enum BC_STATUS crystalhd_do_fw_cmd(struct crystalhd_hw *hw,
1776 return sts; 1776 return sts;
1777 } 1777 }
1778 1778
1779 /*Get the Responce Address*/ 1779 /*Get the Response Address*/
1780 cmd_res_addr = bc_dec_reg_rd(hw->adp, Cpu2HstMbx1); 1780 cmd_res_addr = bc_dec_reg_rd(hw->adp, Cpu2HstMbx1);
1781 1781
1782 /*Read the Response*/ 1782 /*Read the Response*/
@@ -2367,7 +2367,7 @@ enum BC_STATUS crystalhd_hw_set_core_clock(struct crystalhd_hw *hw)
2367 BCMLOG(BCMLOG_INFO, "clock is moving to %d with n %d with vco_mg %d\n", 2367 BCMLOG(BCMLOG_INFO, "clock is moving to %d with n %d with vco_mg %d\n",
2368 hw->core_clock_mhz, n, vco_mg); 2368 hw->core_clock_mhz, n, vco_mg);
2369 2369
2370 /* Change the DRAM refresh rate to accomodate the new frequency */ 2370 /* Change the DRAM refresh rate to accommodate the new frequency */
2371 /* refresh reg = ((refresh_rate * clock_rate)/16) - 1; rounding up*/ 2371 /* refresh reg = ((refresh_rate * clock_rate)/16) - 1; rounding up*/
2372 refresh_reg = (7 * hw->core_clock_mhz / 16); 2372 refresh_reg = (7 * hw->core_clock_mhz / 16);
2373 bc_dec_reg_wr(hw->adp, SDRAM_REF_PARAM, ((1 << 12) | refresh_reg)); 2373 bc_dec_reg_wr(hw->adp, SDRAM_REF_PARAM, ((1 << 12) | refresh_reg));
diff --git a/drivers/staging/cxt1e1/musycc.c b/drivers/staging/cxt1e1/musycc.c
index f274c77fb3fc..5cc3423a6646 100644
--- a/drivers/staging/cxt1e1/musycc.c
+++ b/drivers/staging/cxt1e1/musycc.c
@@ -1455,7 +1455,7 @@ musycc_intr_bh_tasklet (ci_t * ci)
1455 /* 1455 /*
1456 * If the descriptor has not recovered, then leaving the EMPTY 1456 * If the descriptor has not recovered, then leaving the EMPTY
1457 * entry set will not signal to the MUSYCC that this descriptor 1457 * entry set will not signal to the MUSYCC that this descriptor
1458 * has been serviced. The Interrupt Queue can then start loosing 1458 * has been serviced. The Interrupt Queue can then start losing
1459 * available descriptors and MUSYCC eventually encounters and 1459 * available descriptors and MUSYCC eventually encounters and
1460 * reports the INTFULL condition. Per manual, changing any bit 1460 * reports the INTFULL condition. Per manual, changing any bit
1461 * marks descriptor as available, thus the use of different 1461 * marks descriptor as available, thus the use of different
diff --git a/drivers/staging/cxt1e1/musycc.h b/drivers/staging/cxt1e1/musycc.h
index d2c91ef686d1..68f3660f4477 100644
--- a/drivers/staging/cxt1e1/musycc.h
+++ b/drivers/staging/cxt1e1/musycc.h
@@ -74,7 +74,7 @@ extern "C"
74 74
75#define INT_QUEUE_SIZE MUSYCC_NIQD 75#define INT_QUEUE_SIZE MUSYCC_NIQD
76 76
77/* RAM image of MUSYCC registers layed out as a C structure */ 77/* RAM image of MUSYCC registers laid out as a C structure */
78 struct musycc_groupr 78 struct musycc_groupr
79 { 79 {
80 VINT32 thp[32]; /* Transmit Head Pointer [5-29] */ 80 VINT32 thp[32]; /* Transmit Head Pointer [5-29] */
@@ -96,7 +96,7 @@ extern "C"
96 VINT32 pcd; /* Port Configuration Descriptor [5-19] */ 96 VINT32 pcd; /* Port Configuration Descriptor [5-19] */
97 }; 97 };
98 98
99/* hardware MUSYCC registers layed out as a C structure */ 99/* hardware MUSYCC registers laid out as a C structure */
100 struct musycc_globalr 100 struct musycc_globalr
101 { 101 {
102 VINT32 gbp; /* Group Base Pointer */ 102 VINT32 gbp; /* Group Base Pointer */
diff --git a/drivers/staging/cxt1e1/pmcc4_defs.h b/drivers/staging/cxt1e1/pmcc4_defs.h
index 186347b8d565..a39505f45c29 100644
--- a/drivers/staging/cxt1e1/pmcc4_defs.h
+++ b/drivers/staging/cxt1e1/pmcc4_defs.h
@@ -54,8 +54,8 @@
54#define MUSYCC_MTU 2048 /* default */ 54#define MUSYCC_MTU 2048 /* default */
55#define MUSYCC_TXDESC_MIN 10 /* HDLC mode default */ 55#define MUSYCC_TXDESC_MIN 10 /* HDLC mode default */
56#define MUSYCC_RXDESC_MIN 18 /* HDLC mode default */ 56#define MUSYCC_RXDESC_MIN 18 /* HDLC mode default */
57#define MUSYCC_TXDESC_TRANS 4 /* Transparent mode minumum # of TX descriptors */ 57#define MUSYCC_TXDESC_TRANS 4 /* Transparent mode minimum # of TX descriptors */
58#define MUSYCC_RXDESC_TRANS 12 /* Transparent mode minumum # of RX descriptors */ 58#define MUSYCC_RXDESC_TRANS 12 /* Transparent mode minimum # of RX descriptors */
59 59
60#define MAX_DEFAULT_IFQLEN 32 /* network qlen */ 60#define MAX_DEFAULT_IFQLEN 32 /* network qlen */
61 61
diff --git a/drivers/staging/cxt1e1/sbecrc.c b/drivers/staging/cxt1e1/sbecrc.c
index 51232948091f..3f3cd60ac367 100644
--- a/drivers/staging/cxt1e1/sbecrc.c
+++ b/drivers/staging/cxt1e1/sbecrc.c
@@ -95,7 +95,7 @@ sbeCrc (u_int8_t *buffer, /* data buffer to crc */
95 95
96 /* 96 /*
97 * if table not yet created, do so. Don't care about "extra" time 97 * if table not yet created, do so. Don't care about "extra" time
98 * checking this everytime sbeCrc() is called, since CRC calculations are 98 * checking this every time sbeCrc() is called, since CRC calculations are
99 * already time consuming 99 * already time consuming
100 */ 100 */
101 if (!crcTableInit) 101 if (!crcTableInit)
diff --git a/drivers/staging/cxt1e1/sbeproc.c b/drivers/staging/cxt1e1/sbeproc.c
index 70b9b33f3522..f42531c3d8da 100644
--- a/drivers/staging/cxt1e1/sbeproc.c
+++ b/drivers/staging/cxt1e1/sbeproc.c
@@ -239,7 +239,7 @@ sbecom_proc_get_sbe_info (char *buffer, char **start, off_t offset,
239 */ 239 */
240 240
241#if 1 241#if 1
242 /* #4 - intepretation of above = set EOF, return len */ 242 /* #4 - interpretation of above = set EOF, return len */
243 *eof = 1; 243 *eof = 1;
244#endif 244#endif
245 245
diff --git a/drivers/staging/et131x/et1310_address_map.h b/drivers/staging/et131x/et1310_address_map.h
index e6c8cb3828e9..425e9274f28a 100644
--- a/drivers/staging/et131x/et1310_address_map.h
+++ b/drivers/staging/et131x/et1310_address_map.h
@@ -856,7 +856,7 @@ typedef union _RXMAC_UNI_PF_ADDR3_t {
856 */ 856 */
857 857
858/* 858/*
859 * structure for space availiable reg in rxmac address map. 859 * structure for space available reg in rxmac address map.
860 * located at address 0x4094 860 * located at address 0x4094
861 * 861 *
862 * 31-17: reserved 862 * 31-17: reserved
@@ -1031,7 +1031,7 @@ typedef struct _RXMAC_t { /* Location: */
1031 * 31: reset MII mgmt 1031 * 31: reset MII mgmt
1032 * 30-6: unused 1032 * 30-6: unused
1033 * 5: scan auto increment 1033 * 5: scan auto increment
1034 * 4: preamble supress 1034 * 4: preamble suppress
1035 * 3: undefined 1035 * 3: undefined
1036 * 2-0: mgmt clock reset 1036 * 2-0: mgmt clock reset
1037 */ 1037 */
diff --git a/drivers/staging/et131x/et1310_phy.h b/drivers/staging/et131x/et1310_phy.h
index 78349adc7d8e..946c0c547404 100644
--- a/drivers/staging/et131x/et1310_phy.h
+++ b/drivers/staging/et131x/et1310_phy.h
@@ -468,7 +468,7 @@ typedef union _MI_ANAR_t {
468#define TRUEPHY_ANEG_COMPLETE 1 468#define TRUEPHY_ANEG_COMPLETE 1
469#define TRUEPHY_ANEG_DISABLED 2 469#define TRUEPHY_ANEG_DISABLED 2
470 470
471/* Define duplex advertisment flags */ 471/* Define duplex advertisement flags */
472#define TRUEPHY_ADV_DUPLEX_NONE 0x00 472#define TRUEPHY_ADV_DUPLEX_NONE 0x00
473#define TRUEPHY_ADV_DUPLEX_FULL 0x01 473#define TRUEPHY_ADV_DUPLEX_FULL 0x01
474#define TRUEPHY_ADV_DUPLEX_HALF 0x02 474#define TRUEPHY_ADV_DUPLEX_HALF 0x02
diff --git a/drivers/staging/et131x/et1310_rx.c b/drivers/staging/et131x/et1310_rx.c
index 339136f64be1..fc6bd438366d 100644
--- a/drivers/staging/et131x/et1310_rx.c
+++ b/drivers/staging/et131x/et1310_rx.c
@@ -122,7 +122,7 @@ int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
122 * number of entries in FBR1. 122 * number of entries in FBR1.
123 * 123 *
124 * FBR1 holds "large" frames, FBR0 holds "small" frames. If FBR1 124 * FBR1 holds "large" frames, FBR0 holds "small" frames. If FBR1
125 * entries are huge in order to accomodate a "jumbo" frame, then it 125 * entries are huge in order to accommodate a "jumbo" frame, then it
126 * will have less entries. Conversely, FBR1 will now be relied upon 126 * will have less entries. Conversely, FBR1 will now be relied upon
127 * to carry more "normal" frames, thus it's entry size also increases 127 * to carry more "normal" frames, thus it's entry size also increases
128 * and the number of entries goes up too (since it now carries 128 * and the number of entries goes up too (since it now carries
diff --git a/drivers/staging/et131x/et131x_isr.c b/drivers/staging/et131x/et131x_isr.c
index ce4d93042679..f716e408712b 100644
--- a/drivers/staging/et131x/et131x_isr.c
+++ b/drivers/staging/et131x/et131x_isr.c
@@ -466,7 +466,7 @@ void et131x_isr_handler(struct work_struct *work)
466 /* Handle SLV Timeout Interrupt */ 466 /* Handle SLV Timeout Interrupt */
467 if (status & ET_INTR_SLV_TIMEOUT) { 467 if (status & ET_INTR_SLV_TIMEOUT) {
468 /* 468 /*
469 * This means a timeout has occured on a read or 469 * This means a timeout has occurred on a read or
470 * write request to one of the JAGCore registers. The 470 * write request to one of the JAGCore registers. The
471 * Global Resources block has terminated the request 471 * Global Resources block has terminated the request
472 * and on a read request, returned a "fake" value. 472 * and on a read request, returned a "fake" value.
diff --git a/drivers/staging/et131x/et131x_netdev.c b/drivers/staging/et131x/et131x_netdev.c
index 0c298cae90d9..b25bae29042e 100644
--- a/drivers/staging/et131x/et131x_netdev.c
+++ b/drivers/staging/et131x/et131x_netdev.c
@@ -415,7 +415,7 @@ void et131x_multicast(struct net_device *netdev)
415 */ 415 */
416 PacketFilter = adapter->PacketFilter; 416 PacketFilter = adapter->PacketFilter;
417 417
418 /* Clear the 'multicast' flag locally; becuase we only have a single 418 /* Clear the 'multicast' flag locally; because we only have a single
419 * flag to check multicast, and multiple multicast addresses can be 419 * flag to check multicast, and multiple multicast addresses can be
420 * set, this is the easiest way to determine if more than one 420 * set, this is the easiest way to determine if more than one
421 * multicast address is being set. 421 * multicast address is being set.
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h
index 4a89bd1bbf74..0b63f051f27c 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h
@@ -30,7 +30,7 @@
30//--------------------------------------------------------------------------- 30//---------------------------------------------------------------------------
31// 31//
32// Function: ft1000_read_reg 32// Function: ft1000_read_reg
33// Descripton: This function will read the value of a given ASIC register. 33// Description: This function will read the value of a given ASIC register.
34// Input: 34// Input:
35// dev - device structure 35// dev - device structure
36// offset - ASIC register offset 36// offset - ASIC register offset
@@ -49,7 +49,7 @@ static inline u16 ft1000_read_reg (struct net_device *dev, u16 offset) {
49//--------------------------------------------------------------------------- 49//---------------------------------------------------------------------------
50// 50//
51// Function: ft1000_write_reg 51// Function: ft1000_write_reg
52// Descripton: This function will set the value for a given ASIC register. 52// Description: This function will set the value for a given ASIC register.
53// Input: 53// Input:
54// dev - device structure 54// dev - device structure
55// offset - ASIC register offset 55// offset - ASIC register offset
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
index b0729fc3c89a..fb375ea26dd2 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
@@ -95,47 +95,47 @@ void put_request_value(struct net_device *dev, long lvalue);
95USHORT hdr_checksum(PPSEUDO_HDR pHdr); 95USHORT hdr_checksum(PPSEUDO_HDR pHdr);
96 96
97typedef struct _DSP_FILE_HDR { 97typedef struct _DSP_FILE_HDR {
98 long build_date; 98 u32 build_date;
99 long dsp_coff_date; 99 u32 dsp_coff_date;
100 long loader_code_address; 100 u32 loader_code_address;
101 long loader_code_size; 101 u32 loader_code_size;
102 long loader_code_end; 102 u32 loader_code_end;
103 long dsp_code_address; 103 u32 dsp_code_address;
104 long dsp_code_size; 104 u32 dsp_code_size;
105 long dsp_code_end; 105 u32 dsp_code_end;
106 long reserved[8]; 106 u32 reserved[8];
107} __attribute__ ((packed)) DSP_FILE_HDR, *PDSP_FILE_HDR; 107} __attribute__ ((packed)) DSP_FILE_HDR, *PDSP_FILE_HDR;
108 108
109typedef struct _DSP_FILE_HDR_5 { 109typedef struct _DSP_FILE_HDR_5 {
110 long version_id; // Version ID of this image format. 110 u32 version_id; // Version ID of this image format.
111 long package_id; // Package ID of code release. 111 u32 package_id; // Package ID of code release.
112 long build_date; // Date/time stamp when file was built. 112 u32 build_date; // Date/time stamp when file was built.
113 long commands_offset; // Offset to attached commands in Pseudo Hdr format. 113 u32 commands_offset; // Offset to attached commands in Pseudo Hdr format.
114 long loader_offset; // Offset to bootloader code. 114 u32 loader_offset; // Offset to bootloader code.
115 long loader_code_address; // Start address of bootloader. 115 u32 loader_code_address; // Start address of bootloader.
116 long loader_code_end; // Where bootloader code ends. 116 u32 loader_code_end; // Where bootloader code ends.
117 long loader_code_size; 117 u32 loader_code_size;
118 long version_data_offset; // Offset were scrambled version data begins. 118 u32 version_data_offset; // Offset were scrambled version data begins.
119 long version_data_size; // Size, in words, of scrambled version data. 119 u32 version_data_size; // Size, in words, of scrambled version data.
120 long nDspImages; // Number of DSP images in file. 120 u32 nDspImages; // Number of DSP images in file.
121} __attribute__ ((packed)) DSP_FILE_HDR_5, *PDSP_FILE_HDR_5; 121} __attribute__ ((packed)) DSP_FILE_HDR_5, *PDSP_FILE_HDR_5;
122 122
123typedef struct _DSP_IMAGE_INFO { 123typedef struct _DSP_IMAGE_INFO {
124 long coff_date; // Date/time when DSP Coff image was built. 124 u32 coff_date; // Date/time when DSP Coff image was built.
125 long begin_offset; // Offset in file where image begins. 125 u32 begin_offset; // Offset in file where image begins.
126 long end_offset; // Offset in file where image begins. 126 u32 end_offset; // Offset in file where image begins.
127 long run_address; // On chip Start address of DSP code. 127 u32 run_address; // On chip Start address of DSP code.
128 long image_size; // Size of image. 128 u32 image_size; // Size of image.
129 long version; // Embedded version # of DSP code. 129 u32 version; // Embedded version # of DSP code.
130} __attribute__ ((packed)) DSP_IMAGE_INFO, *PDSP_IMAGE_INFO; 130} __attribute__ ((packed)) DSP_IMAGE_INFO, *PDSP_IMAGE_INFO;
131 131
132typedef struct _DSP_IMAGE_INFO_V6 { 132typedef struct _DSP_IMAGE_INFO_V6 {
133 long coff_date; // Date/time when DSP Coff image was built. 133 u32 coff_date; // Date/time when DSP Coff image was built.
134 long begin_offset; // Offset in file where image begins. 134 u32 begin_offset; // Offset in file where image begins.
135 long end_offset; // Offset in file where image begins. 135 u32 end_offset; // Offset in file where image begins.
136 long run_address; // On chip Start address of DSP code. 136 u32 run_address; // On chip Start address of DSP code.
137 long image_size; // Size of image. 137 u32 image_size; // Size of image.
138 long version; // Embedded version # of DSP code. 138 u32 version; // Embedded version # of DSP code.
139 unsigned short checksum; // Dsp File checksum 139 unsigned short checksum; // Dsp File checksum
140 unsigned short pad1; 140 unsigned short pad1;
141} __attribute__ ((packed)) DSP_IMAGE_INFO_V6, *PDSP_IMAGE_INFO_V6; 141} __attribute__ ((packed)) DSP_IMAGE_INFO_V6, *PDSP_IMAGE_INFO_V6;
@@ -846,8 +846,8 @@ int card_download(struct net_device *dev, const u8 *pFileStart, UINT FileLength)
846 break; 846 break;
847 847
848 case STATE_DONE_DWNLD: 848 case STATE_DONE_DWNLD:
849 if (((UINT) (pUcFile) - (UINT) pFileStart) >= 849 if (((unsigned long) (pUcFile) - (unsigned long) pFileStart) >=
850 (UINT) FileLength) { 850 (unsigned long) FileLength) {
851 uiState = STATE_DONE_FILE; 851 uiState = STATE_DONE_FILE;
852 break; 852 break;
853 } 853 }
@@ -901,11 +901,11 @@ int card_download(struct net_device *dev, const u8 *pFileStart, UINT FileLength)
901 &info->prov_list); 901 &info->prov_list);
902 // Move to next entry if available 902 // Move to next entry if available
903 pUcFile = 903 pUcFile =
904 (UCHAR *) ((UINT) pUcFile + 904 (UCHAR *) ((unsigned long) pUcFile +
905 (UINT) ((usHdrLength + 1) & 0xFFFFFFFE) + sizeof(PSEUDO_HDR)); 905 (unsigned long) ((usHdrLength + 1) & 0xFFFFFFFE) + sizeof(PSEUDO_HDR));
906 if ((UINT) (pUcFile) - 906 if ((unsigned long) (pUcFile) -
907 (UINT) (pFileStart) >= 907 (unsigned long) (pFileStart) >=
908 (UINT) FileLength) { 908 (unsigned long) FileLength) {
909 uiState = 909 uiState =
910 STATE_DONE_FILE; 910 STATE_DONE_FILE;
911 } 911 }
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
index ff691d9b984e..eeb7dd43f9a8 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
@@ -90,7 +90,7 @@ MODULE_SUPPORTED_DEVICE("FT1000");
90//--------------------------------------------------------------------------- 90//---------------------------------------------------------------------------
91// 91//
92// Function: ft1000_asic_read 92// Function: ft1000_asic_read
93// Descripton: This function will retrieve the value of a specific ASIC 93// Description: This function will retrieve the value of a specific ASIC
94// register. 94// register.
95// Input: 95// Input:
96// dev - network device structure 96// dev - network device structure
@@ -107,7 +107,7 @@ inline u16 ft1000_asic_read(struct net_device *dev, u16 offset)
107//--------------------------------------------------------------------------- 107//---------------------------------------------------------------------------
108// 108//
109// Function: ft1000_asic_write 109// Function: ft1000_asic_write
110// Descripton: This function will set the value of a specific ASIC 110// Description: This function will set the value of a specific ASIC
111// register. 111// register.
112// Input: 112// Input:
113// dev - network device structure 113// dev - network device structure
@@ -124,7 +124,7 @@ inline void ft1000_asic_write(struct net_device *dev, u16 offset, u16 value)
124//--------------------------------------------------------------------------- 124//---------------------------------------------------------------------------
125// 125//
126// Function: ft1000_read_fifo_len 126// Function: ft1000_read_fifo_len
127// Descripton: This function will read the ASIC Uplink FIFO status register 127// Description: This function will read the ASIC Uplink FIFO status register
128// which will return the number of bytes remaining in the Uplink FIFO. 128// which will return the number of bytes remaining in the Uplink FIFO.
129// Sixteen bytes are subtracted to make sure that the ASIC does not 129// Sixteen bytes are subtracted to make sure that the ASIC does not
130// reach its threshold. 130// reach its threshold.
@@ -148,7 +148,7 @@ static inline u16 ft1000_read_fifo_len(struct net_device *dev)
148//--------------------------------------------------------------------------- 148//---------------------------------------------------------------------------
149// 149//
150// Function: ft1000_read_dpram 150// Function: ft1000_read_dpram
151// Descripton: This function will read the specific area of dpram 151// Description: This function will read the specific area of dpram
152// (Electrabuzz ASIC only) 152// (Electrabuzz ASIC only)
153// Input: 153// Input:
154// dev - device structure 154// dev - device structure
@@ -175,7 +175,7 @@ u16 ft1000_read_dpram(struct net_device * dev, int offset)
175//--------------------------------------------------------------------------- 175//---------------------------------------------------------------------------
176// 176//
177// Function: ft1000_write_dpram 177// Function: ft1000_write_dpram
178// Descripton: This function will write to a specific area of dpram 178// Description: This function will write to a specific area of dpram
179// (Electrabuzz ASIC only) 179// (Electrabuzz ASIC only)
180// Input: 180// Input:
181// dev - device structure 181// dev - device structure
@@ -201,7 +201,7 @@ static inline void ft1000_write_dpram(struct net_device *dev,
201//--------------------------------------------------------------------------- 201//---------------------------------------------------------------------------
202// 202//
203// Function: ft1000_read_dpram_mag_16 203// Function: ft1000_read_dpram_mag_16
204// Descripton: This function will read the specific area of dpram 204// Description: This function will read the specific area of dpram
205// (Magnemite ASIC only) 205// (Magnemite ASIC only)
206// Input: 206// Input:
207// dev - device structure 207// dev - device structure
@@ -233,7 +233,7 @@ u16 ft1000_read_dpram_mag_16(struct net_device *dev, int offset, int Index)
233//--------------------------------------------------------------------------- 233//---------------------------------------------------------------------------
234// 234//
235// Function: ft1000_write_dpram_mag_16 235// Function: ft1000_write_dpram_mag_16
236// Descripton: This function will write to a specific area of dpram 236// Description: This function will write to a specific area of dpram
237// (Magnemite ASIC only) 237// (Magnemite ASIC only)
238// Input: 238// Input:
239// dev - device structure 239// dev - device structure
@@ -263,7 +263,7 @@ static inline void ft1000_write_dpram_mag_16(struct net_device *dev,
263//--------------------------------------------------------------------------- 263//---------------------------------------------------------------------------
264// 264//
265// Function: ft1000_read_dpram_mag_32 265// Function: ft1000_read_dpram_mag_32
266// Descripton: This function will read the specific area of dpram 266// Description: This function will read the specific area of dpram
267// (Magnemite ASIC only) 267// (Magnemite ASIC only)
268// Input: 268// Input:
269// dev - device structure 269// dev - device structure
@@ -290,7 +290,7 @@ u32 ft1000_read_dpram_mag_32(struct net_device *dev, int offset)
290//--------------------------------------------------------------------------- 290//---------------------------------------------------------------------------
291// 291//
292// Function: ft1000_write_dpram_mag_32 292// Function: ft1000_write_dpram_mag_32
293// Descripton: This function will write to a specific area of dpram 293// Description: This function will write to a specific area of dpram
294// (Magnemite ASIC only) 294// (Magnemite ASIC only)
295// Input: 295// Input:
296// dev - device structure 296// dev - device structure
@@ -315,7 +315,7 @@ void ft1000_write_dpram_mag_32(struct net_device *dev, int offset, u32 value)
315//--------------------------------------------------------------------------- 315//---------------------------------------------------------------------------
316// 316//
317// Function: ft1000_enable_interrupts 317// Function: ft1000_enable_interrupts
318// Descripton: This function will enable interrupts base on the current interrupt mask. 318// Description: This function will enable interrupts base on the current interrupt mask.
319// Input: 319// Input:
320// dev - device structure 320// dev - device structure
321// Output: 321// Output:
@@ -340,7 +340,7 @@ static void ft1000_enable_interrupts(struct net_device *dev)
340//--------------------------------------------------------------------------- 340//---------------------------------------------------------------------------
341// 341//
342// Function: ft1000_disable_interrupts 342// Function: ft1000_disable_interrupts
343// Descripton: This function will disable all interrupts. 343// Description: This function will disable all interrupts.
344// Input: 344// Input:
345// dev - device structure 345// dev - device structure
346// Output: 346// Output:
@@ -364,7 +364,7 @@ static void ft1000_disable_interrupts(struct net_device *dev)
364//--------------------------------------------------------------------------- 364//---------------------------------------------------------------------------
365// 365//
366// Function: ft1000_reset_asic 366// Function: ft1000_reset_asic
367// Descripton: This function will call the Card Service function to reset the 367// Description: This function will call the Card Service function to reset the
368// ASIC. 368// ASIC.
369// Input: 369// Input:
370// dev - device structure 370// dev - device structure
@@ -408,7 +408,7 @@ static void ft1000_reset_asic(struct net_device *dev)
408//--------------------------------------------------------------------------- 408//---------------------------------------------------------------------------
409// 409//
410// Function: ft1000_reset_card 410// Function: ft1000_reset_card
411// Descripton: This function will reset the card 411// Description: This function will reset the card
412// Input: 412// Input:
413// dev - device structure 413// dev - device structure
414// Output: 414// Output:
@@ -571,7 +571,7 @@ static int ft1000_reset_card(struct net_device *dev)
571//--------------------------------------------------------------------------- 571//---------------------------------------------------------------------------
572// 572//
573// Function: ft1000_chkcard 573// Function: ft1000_chkcard
574// Descripton: This function will check if the device is presently available on 574// Description: This function will check if the device is presently available on
575// the system. 575// the system.
576// Input: 576// Input:
577// dev - device structure 577// dev - device structure
@@ -607,7 +607,7 @@ static int ft1000_chkcard(struct net_device *dev)
607//--------------------------------------------------------------------------- 607//---------------------------------------------------------------------------
608// 608//
609// Function: ft1000_hbchk 609// Function: ft1000_hbchk
610// Descripton: This function will perform the heart beat check of the DSP as 610// Description: This function will perform the heart beat check of the DSP as
611// well as the ASIC. 611// well as the ASIC.
612// Input: 612// Input:
613// dev - device structure 613// dev - device structure
@@ -828,7 +828,7 @@ static void ft1000_hbchk(u_long data)
828//--------------------------------------------------------------------------- 828//---------------------------------------------------------------------------
829// 829//
830// Function: ft1000_send_cmd 830// Function: ft1000_send_cmd
831// Descripton: 831// Description:
832// Input: 832// Input:
833// Output: 833// Output:
834// 834//
@@ -908,7 +908,7 @@ void ft1000_send_cmd (struct net_device *dev, u16 *ptempbuffer, int size, u16 qt
908//--------------------------------------------------------------------------- 908//---------------------------------------------------------------------------
909// 909//
910// Function: ft1000_receive_cmd 910// Function: ft1000_receive_cmd
911// Descripton: This function will read a message from the dpram area. 911// Description: This function will read a message from the dpram area.
912// Input: 912// Input:
913// dev - network device structure 913// dev - network device structure
914// pbuffer - caller supply address to buffer 914// pbuffer - caller supply address to buffer
@@ -1003,7 +1003,7 @@ BOOLEAN ft1000_receive_cmd(struct net_device *dev, u16 * pbuffer, int maxsz, u16
1003//--------------------------------------------------------------------------- 1003//---------------------------------------------------------------------------
1004// 1004//
1005// Function: ft1000_proc_drvmsg 1005// Function: ft1000_proc_drvmsg
1006// Descripton: This function will process the various driver messages. 1006// Description: This function will process the various driver messages.
1007// Input: 1007// Input:
1008// dev - device structure 1008// dev - device structure
1009// pnxtph - pointer to next pseudo header 1009// pnxtph - pointer to next pseudo header
@@ -1285,7 +1285,7 @@ void ft1000_proc_drvmsg(struct net_device *dev)
1285//--------------------------------------------------------------------------- 1285//---------------------------------------------------------------------------
1286// 1286//
1287// Function: ft1000_parse_dpram_msg 1287// Function: ft1000_parse_dpram_msg
1288// Descripton: This function will parse the message received from the DSP 1288// Description: This function will parse the message received from the DSP
1289// via the DPRAM interface. 1289// via the DPRAM interface.
1290// Input: 1290// Input:
1291// dev - device structure 1291// dev - device structure
@@ -1442,7 +1442,7 @@ int ft1000_parse_dpram_msg(struct net_device *dev)
1442//--------------------------------------------------------------------------- 1442//---------------------------------------------------------------------------
1443// 1443//
1444// Function: ft1000_flush_fifo 1444// Function: ft1000_flush_fifo
1445// Descripton: This function will flush one packet from the downlink 1445// Description: This function will flush one packet from the downlink
1446// FIFO. 1446// FIFO.
1447// Input: 1447// Input:
1448// dev - device structure 1448// dev - device structure
@@ -1587,7 +1587,7 @@ static void ft1000_flush_fifo(struct net_device *dev, u16 DrvErrNum)
1587//--------------------------------------------------------------------------- 1587//---------------------------------------------------------------------------
1588// 1588//
1589// Function: ft1000_copy_up_pkt 1589// Function: ft1000_copy_up_pkt
1590// Descripton: This function will pull Flarion packets out of the Downlink 1590// Description: This function will pull Flarion packets out of the Downlink
1591// FIFO and convert it to an ethernet packet. The ethernet packet will 1591// FIFO and convert it to an ethernet packet. The ethernet packet will
1592// then be deliver to the TCP/IP stack. 1592// then be deliver to the TCP/IP stack.
1593// Input: 1593// Input:
@@ -1773,7 +1773,7 @@ int ft1000_copy_up_pkt(struct net_device *dev)
1773//--------------------------------------------------------------------------- 1773//---------------------------------------------------------------------------
1774// 1774//
1775// Function: ft1000_copy_down_pkt 1775// Function: ft1000_copy_down_pkt
1776// Descripton: This function will take an ethernet packet and convert it to 1776// Description: This function will take an ethernet packet and convert it to
1777// a Flarion packet prior to sending it to the ASIC Downlink 1777// a Flarion packet prior to sending it to the ASIC Downlink
1778// FIFO. 1778// FIFO.
1779// Input: 1779// Input:
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
index 8e622425aa13..1972b72450d4 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c
@@ -488,7 +488,7 @@ static int check_buffers(u16 *buff_w, u16 *buff_r, int len, int offset)
488// Parameters: struct ft1000_device - device structure 488// Parameters: struct ft1000_device - device structure
489// u16 **pUsFile - DSP image file pointer in u16 489// u16 **pUsFile - DSP image file pointer in u16
490// u8 **pUcFile - DSP image file pointer in u8 490// u8 **pUcFile - DSP image file pointer in u8
491// long word_length - lenght of the buffer to be written 491// long word_length - length of the buffer to be written
492// to DPRAM 492// to DPRAM
493// 493//
494// Returns: STATUS_SUCCESS - success 494// Returns: STATUS_SUCCESS - success
@@ -628,7 +628,7 @@ static void usb_dnld_complete (struct urb *urb)
628// Parameters: struct ft1000_device - device structure 628// Parameters: struct ft1000_device - device structure
629// u16 **pUsFile - DSP image file pointer in u16 629// u16 **pUsFile - DSP image file pointer in u16
630// u8 **pUcFile - DSP image file pointer in u8 630// u8 **pUcFile - DSP image file pointer in u8
631// long word_length - lenght of the buffer to be written 631// long word_length - length of the buffer to be written
632// to DPRAM 632// to DPRAM
633// 633//
634// Returns: STATUS_SUCCESS - success 634// Returns: STATUS_SUCCESS - success
@@ -817,7 +817,7 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart,
817 * Error, beyond boot code range. 817 * Error, beyond boot code range.
818 */ 818 */
819 DEBUG 819 DEBUG
820 ("FT1000:download:Download error: Requested len=%d exceeds BOOT code boundry.\n", 820 ("FT1000:download:Download error: Requested len=%d exceeds BOOT code boundary.\n",
821 (int)word_length); 821 (int)word_length);
822 status = STATUS_FAILURE; 822 status = STATUS_FAILURE;
823 break; 823 break;
@@ -950,7 +950,7 @@ u16 scram_dnldr(struct ft1000_device *ft1000dev, void *pFileStart,
950 * Error, beyond boot code range. 950 * Error, beyond boot code range.
951 */ 951 */
952 DEBUG 952 DEBUG
953 ("FT1000:download:Download error: Requested len=%d exceeds DSP code boundry.\n", 953 ("FT1000:download:Download error: Requested len=%d exceeds DSP code boundary.\n",
954 (int)word_length); 954 (int)word_length);
955 status = STATUS_FAILURE; 955 status = STATUS_FAILURE;
956 break; 956 break;
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index 78dcd49bb985..684e69eacb71 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -585,7 +585,7 @@ int dsp_reload(struct ft1000_device *ft1000dev)
585//--------------------------------------------------------------------------- 585//---------------------------------------------------------------------------
586// 586//
587// Function: ft1000_reset_asic 587// Function: ft1000_reset_asic
588// Descripton: This function will call the Card Service function to reset the 588// Description: This function will call the Card Service function to reset the
589// ASIC. 589// ASIC.
590// Input: 590// Input:
591// dev - device structure 591// dev - device structure
@@ -626,7 +626,7 @@ static void ft1000_reset_asic(struct net_device *dev)
626//--------------------------------------------------------------------------- 626//---------------------------------------------------------------------------
627// 627//
628// Function: ft1000_reset_card 628// Function: ft1000_reset_card
629// Descripton: This function will reset the card 629// Description: This function will reset the card
630// Input: 630// Input:
631// dev - device structure 631// dev - device structure
632// Output: 632// Output:
@@ -917,7 +917,7 @@ static void ft1000_usb_transmit_complete(struct urb *urb)
917//--------------------------------------------------------------------------- 917//---------------------------------------------------------------------------
918// 918//
919// Function: ft1000_copy_down_pkt 919// Function: ft1000_copy_down_pkt
920// Descripton: This function will take an ethernet packet and convert it to 920// Description: This function will take an ethernet packet and convert it to
921// a Flarion packet prior to sending it to the ASIC Downlink 921// a Flarion packet prior to sending it to the ASIC Downlink
922// FIFO. 922// FIFO.
923// Input: 923// Input:
@@ -1075,10 +1075,10 @@ err:
1075//--------------------------------------------------------------------------- 1075//---------------------------------------------------------------------------
1076// 1076//
1077// Function: ft1000_copy_up_pkt 1077// Function: ft1000_copy_up_pkt
1078// Descripton: This function will take a packet from the FIFO up link and 1078// Description: This function will take a packet from the FIFO up link and
1079// convert it into an ethernet packet and deliver it to the IP stack 1079// convert it into an ethernet packet and deliver it to the IP stack
1080// Input: 1080// Input:
1081// urb - the receving usb urb 1081// urb - the receiving usb urb
1082// 1082//
1083// Output: 1083// Output:
1084// status - FAILURE 1084// status - FAILURE
@@ -1182,7 +1182,7 @@ static int ft1000_copy_up_pkt(struct urb *urb)
1182//--------------------------------------------------------------------------- 1182//---------------------------------------------------------------------------
1183// 1183//
1184// Function: ft1000_submit_rx_urb 1184// Function: ft1000_submit_rx_urb
1185// Descripton: the receiving function of the network driver 1185// Description: the receiving function of the network driver
1186// 1186//
1187// Input: 1187// Input:
1188// info - a private structure contains the device information 1188// info - a private structure contains the device information
@@ -1316,7 +1316,7 @@ Jim
1316//--------------------------------------------------------------------------- 1316//---------------------------------------------------------------------------
1317// 1317//
1318// Function: ft1000_chkcard 1318// Function: ft1000_chkcard
1319// Descripton: This function will check if the device is presently available on 1319// Description: This function will check if the device is presently available on
1320// the system. 1320// the system.
1321// Input: 1321// Input:
1322// dev - device structure 1322// dev - device structure
@@ -1363,7 +1363,7 @@ static int ft1000_chkcard(struct ft1000_device *dev)
1363//--------------------------------------------------------------------------- 1363//---------------------------------------------------------------------------
1364// 1364//
1365// Function: ft1000_receive_cmd 1365// Function: ft1000_receive_cmd
1366// Descripton: This function will read a message from the dpram area. 1366// Description: This function will read a message from the dpram area.
1367// Input: 1367// Input:
1368// dev - network device structure 1368// dev - network device structure
1369// pbuffer - caller supply address to buffer 1369// pbuffer - caller supply address to buffer
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h b/drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h
index 3f72d5bb3f92..6a8a1969f9e1 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h
@@ -55,7 +55,7 @@ struct pseudo_hdr {
55 unsigned char seq_num; //sequence number 55 unsigned char seq_num; //sequence number
56 unsigned char rsvd2; //reserved 56 unsigned char rsvd2; //reserved
57 unsigned short qos_class; //Quality of Service class (Not applicable on Mobile) 57 unsigned short qos_class; //Quality of Service class (Not applicable on Mobile)
58 unsigned short checksum; //Psuedo header checksum 58 unsigned short checksum; //Pseudo header checksum
59} __attribute__ ((packed)); 59} __attribute__ ((packed));
60 60
61typedef struct _IOCTL_GET_VER 61typedef struct _IOCTL_GET_VER
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
index e047c03fbf3a..f2ecb3eae9cd 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
@@ -364,7 +364,7 @@ struct prov_record {
364 364
365#define ISR_EMPTY (u8)0x00 // no bits set in ISR 365#define ISR_EMPTY (u8)0x00 // no bits set in ISR
366 366
367#define ISR_DOORBELL_ACK (u8)0x01 // the doorbell i sent has been recieved. 367#define ISR_DOORBELL_ACK (u8)0x01 // the doorbell i sent has been received.
368 368
369#define ISR_DOORBELL_PEND (u8)0x02 // doorbell for me 369#define ISR_DOORBELL_PEND (u8)0x02 // doorbell for me
370 370
diff --git a/drivers/staging/generic_serial/generic_serial.c b/drivers/staging/generic_serial/generic_serial.c
index 466988dbc37d..f29dda4e9f20 100644
--- a/drivers/staging/generic_serial/generic_serial.c
+++ b/drivers/staging/generic_serial/generic_serial.c
@@ -113,7 +113,7 @@ int gs_write(struct tty_struct * tty,
113 113
114 c = count; 114 c = count;
115 115
116 /* This is safe because we "OWN" the "head". Noone else can 116 /* This is safe because we "OWN" the "head". No one else can
117 change the "head": we own the port_write_mutex. */ 117 change the "head": we own the port_write_mutex. */
118 /* Don't overrun the end of the buffer */ 118 /* Don't overrun the end of the buffer */
119 t = SERIAL_XMIT_SIZE - port->xmit_head; 119 t = SERIAL_XMIT_SIZE - port->xmit_head;
diff --git a/drivers/staging/generic_serial/rio/map.h b/drivers/staging/generic_serial/rio/map.h
index 8366978578c1..28a66129293e 100644
--- a/drivers/staging/generic_serial/rio/map.h
+++ b/drivers/staging/generic_serial/rio/map.h
@@ -87,7 +87,7 @@ struct Map {
87** The Topology array contains the ID of the unit connected to each of the 87** The Topology array contains the ID of the unit connected to each of the
88** four links on this unit. The entry will be 0xFFFF if NOTHING is connected 88** four links on this unit. The entry will be 0xFFFF if NOTHING is connected
89** to the link, or will be 0xFF00 if an UNKNOWN unit is connected to the link. 89** to the link, or will be 0xFF00 if an UNKNOWN unit is connected to the link.
90** The Name field is a null-terminated string, upto 31 characters, containing 90** The Name field is a null-terminated string, up to 31 characters, containing
91** the 'cute' name that the sysadmin/users know the RTA by. It is permissible 91** the 'cute' name that the sysadmin/users know the RTA by. It is permissible
92** for this string to contain any character in the range \040 to \176 inclusive. 92** for this string to contain any character in the range \040 to \176 inclusive.
93** In particular, ctrl sequences and DEL (0x7F, \177) are not allowed. The 93** In particular, ctrl sequences and DEL (0x7F, \177) are not allowed. The
diff --git a/drivers/staging/generic_serial/rio/rioboot.c b/drivers/staging/generic_serial/rio/rioboot.c
index d956dd316005..ffa01c590216 100644
--- a/drivers/staging/generic_serial/rio/rioboot.c
+++ b/drivers/staging/generic_serial/rio/rioboot.c
@@ -109,7 +109,7 @@ int RIOBootCodeRTA(struct rio_info *p, struct DownLoad * rbp)
109 rio_dprintk(RIO_DEBUG_BOOT, "Data at user address %p\n", rbp->DataP); 109 rio_dprintk(RIO_DEBUG_BOOT, "Data at user address %p\n", rbp->DataP);
110 110
111 /* 111 /*
112 ** Check that we have set asside enough memory for this 112 ** Check that we have set aside enough memory for this
113 */ 113 */
114 if (rbp->Count > SIXTY_FOUR_K) { 114 if (rbp->Count > SIXTY_FOUR_K) {
115 rio_dprintk(RIO_DEBUG_BOOT, "RTA Boot Code Too Large!\n"); 115 rio_dprintk(RIO_DEBUG_BOOT, "RTA Boot Code Too Large!\n");
@@ -293,7 +293,7 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp)
293 /* 293 /*
294 ** S T O P ! 294 ** S T O P !
295 ** 295 **
296 ** Upto this point the code has been fairly rational, and possibly 296 ** Up to this point the code has been fairly rational, and possibly
297 ** even straight forward. What follows is a pile of crud that will 297 ** even straight forward. What follows is a pile of crud that will
298 ** magically turn into six bytes of transputer assembler. Normally 298 ** magically turn into six bytes of transputer assembler. Normally
299 ** you would expect an array or something, but, being me, I have 299 ** you would expect an array or something, but, being me, I have
@@ -419,7 +419,7 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp)
419 rio_dprintk(RIO_DEBUG_BOOT, "Set control port\n"); 419 rio_dprintk(RIO_DEBUG_BOOT, "Set control port\n");
420 420
421 /* 421 /*
422 ** Now, wait for upto five seconds for the Tp to setup the parmmap 422 ** Now, wait for up to five seconds for the Tp to setup the parmmap
423 ** pointer: 423 ** pointer:
424 */ 424 */
425 for (wait_count = 0; (wait_count < p->RIOConf.StartupTime) && (readw(&HostP->__ParmMapR) == OldParmMap); wait_count++) { 425 for (wait_count = 0; (wait_count < p->RIOConf.StartupTime) && (readw(&HostP->__ParmMapR) == OldParmMap); wait_count++) {
@@ -475,7 +475,7 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp)
475 475
476 /* 476 /*
477 ** now wait for the card to set all the parmmap->XXX stuff 477 ** now wait for the card to set all the parmmap->XXX stuff
478 ** this is a wait of upto two seconds.... 478 ** this is a wait of up to two seconds....
479 */ 479 */
480 rio_dprintk(RIO_DEBUG_BOOT, "Looking for init_done - %d ticks\n", p->RIOConf.StartupTime); 480 rio_dprintk(RIO_DEBUG_BOOT, "Looking for init_done - %d ticks\n", p->RIOConf.StartupTime);
481 HostP->timeout_id = 0; 481 HostP->timeout_id = 0;
diff --git a/drivers/staging/generic_serial/rio/riocmd.c b/drivers/staging/generic_serial/rio/riocmd.c
index f121357e5af0..61efd538e850 100644
--- a/drivers/staging/generic_serial/rio/riocmd.c
+++ b/drivers/staging/generic_serial/rio/riocmd.c
@@ -863,7 +863,7 @@ int RIOUnUse(unsigned long iPortP, struct CmdBlk *CmdBlkP)
863 ** being transferred from the write queue into the transmit packets 863 ** being transferred from the write queue into the transmit packets
864 ** (add_transmit) and no furthur transmit interrupt will be sent for that 864 ** (add_transmit) and no furthur transmit interrupt will be sent for that
865 ** data. The next interrupt will occur up to 500ms later (RIOIntr is called 865 ** data. The next interrupt will occur up to 500ms later (RIOIntr is called
866 ** twice a second as a saftey measure). This was the case when kermit was 866 ** twice a second as a safety measure). This was the case when kermit was
867 ** used to send data into a RIO port. After each packet was sent, TCFLSH 867 ** used to send data into a RIO port. After each packet was sent, TCFLSH
868 ** was called to flush the read queue preemptively. PortP->InUse was 868 ** was called to flush the read queue preemptively. PortP->InUse was
869 ** incremented, thereby blocking the 6 byte acknowledgement packet 869 ** incremented, thereby blocking the 6 byte acknowledgement packet
diff --git a/drivers/staging/generic_serial/rio/rioroute.c b/drivers/staging/generic_serial/rio/rioroute.c
index f9b936ac3394..8757378e8320 100644
--- a/drivers/staging/generic_serial/rio/rioroute.c
+++ b/drivers/staging/generic_serial/rio/rioroute.c
@@ -450,7 +450,7 @@ int RIORouteRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct
450 ** we reset the unit, because we didn't boot it. 450 ** we reset the unit, because we didn't boot it.
451 ** However, if the table is full, it could be that we did boot 451 ** However, if the table is full, it could be that we did boot
452 ** this unit, and so we won't reboot it, because it isn't really 452 ** this unit, and so we won't reboot it, because it isn't really
453 ** all that disasterous to keep the old bins in most cases. This 453 ** all that disastrous to keep the old bins in most cases. This
454 ** is a rather tacky feature, but we are on the edge of reallity 454 ** is a rather tacky feature, but we are on the edge of reallity
455 ** here, because the implication is that someone has connected 455 ** here, because the implication is that someone has connected
456 ** 16+MAX_EXTRA_UNITS onto one host. 456 ** 16+MAX_EXTRA_UNITS onto one host.
@@ -678,7 +678,7 @@ static int RIOCheck(struct Host *HostP, unsigned int UnitId)
678 678
679 HostP->Mapping[UnitId].Flags &= ~BEEN_HERE; 679 HostP->Mapping[UnitId].Flags &= ~BEEN_HERE;
680 680
681 /* rio_dprint(RIO_DEBUG_ROUTE, ("Unit %d DOESNT KNOW THE HOST!\n", UnitId)); */ 681 /* rio_dprint(RIO_DEBUG_ROUTE, ("Unit %d DOESN'T KNOW THE HOST!\n", UnitId)); */
682 682
683 return 0; 683 return 0;
684} 684}
diff --git a/drivers/staging/generic_serial/rio/riotty.c b/drivers/staging/generic_serial/rio/riotty.c
index 8a90393faf3c..e7e9911d7a72 100644
--- a/drivers/staging/generic_serial/rio/riotty.c
+++ b/drivers/staging/generic_serial/rio/riotty.c
@@ -124,7 +124,7 @@ int riotopen(struct tty_struct *tty, struct file *filp)
124 } 124 }
125 125
126 /* 126 /*
127 ** Grab pointer to the port stucture 127 ** Grab pointer to the port structure
128 */ 128 */
129 PortP = p->RIOPortp[SysPort]; /* Get control struc */ 129 PortP = p->RIOPortp[SysPort]; /* Get control struc */
130 rio_dprintk(RIO_DEBUG_TTY, "PortP: %p\n", PortP); 130 rio_dprintk(RIO_DEBUG_TTY, "PortP: %p\n", PortP);
@@ -161,7 +161,7 @@ int riotopen(struct tty_struct *tty, struct file *filp)
161 } 161 }
162 162
163 /* 163 /*
164 ** If the RTA has not booted yet and the user has choosen to block 164 ** If the RTA has not booted yet and the user has chosen to block
165 ** until the RTA is present then we must spin here waiting for 165 ** until the RTA is present then we must spin here waiting for
166 ** the RTA to boot. 166 ** the RTA to boot.
167 */ 167 */
diff --git a/drivers/staging/generic_serial/sx.c b/drivers/staging/generic_serial/sx.c
index 1291462bcddb..4f94aaffbe83 100644
--- a/drivers/staging/generic_serial/sx.c
+++ b/drivers/staging/generic_serial/sx.c
@@ -158,13 +158,13 @@
158 * Readying for release on 2.0.x (sorry David, 1.01 becomes 1.1 for RCS). 158 * Readying for release on 2.0.x (sorry David, 1.01 becomes 1.1 for RCS).
159 * 159 *
160 * Revision 0.12 1999/03/28 09:20:10 wolff 160 * Revision 0.12 1999/03/28 09:20:10 wolff
161 * Fixed problem in 0.11, continueing cleanup. 161 * Fixed problem in 0.11, continuing cleanup.
162 * 162 *
163 * Revision 0.11 1999/03/28 08:46:44 wolff 163 * Revision 0.11 1999/03/28 08:46:44 wolff
164 * cleanup. Not good. 164 * cleanup. Not good.
165 * 165 *
166 * Revision 0.10 1999/03/28 08:09:43 wolff 166 * Revision 0.10 1999/03/28 08:09:43 wolff
167 * Fixed loosing characters on close. 167 * Fixed losing characters on close.
168 * 168 *
169 * Revision 0.9 1999/03/21 22:52:01 wolff 169 * Revision 0.9 1999/03/21 22:52:01 wolff
170 * Ported back to 2.2.... (minor things) 170 * Ported back to 2.2.... (minor things)
@@ -1588,7 +1588,7 @@ static void sx_close(void *ptr)
1588#define R0 if (read_sx_byte(board, i) != 0x55) return 1 1588#define R0 if (read_sx_byte(board, i) != 0x55) return 1
1589#define R1 if (read_sx_byte(board, i) != 0xaa) return 1 1589#define R1 if (read_sx_byte(board, i) != 0xaa) return 1
1590 1590
1591/* This memtest takes a human-noticable time. You normally only do it 1591/* This memtest takes a human-noticeable time. You normally only do it
1592 once a boot, so I guess that it is worth it. */ 1592 once a boot, so I guess that it is worth it. */
1593static int do_memtest(struct sx_board *board, int min, int max) 1593static int do_memtest(struct sx_board *board, int min, int max)
1594{ 1594{
@@ -1645,7 +1645,7 @@ static int do_memtest(struct sx_board *board, int min, int max)
1645#define R1 if (read_sx_word(board, i) != 0xaa55) return 1 1645#define R1 if (read_sx_word(board, i) != 0xaa55) return 1
1646 1646
1647#if 0 1647#if 0
1648/* This memtest takes a human-noticable time. You normally only do it 1648/* This memtest takes a human-noticeable time. You normally only do it
1649 once a boot, so I guess that it is worth it. */ 1649 once a boot, so I guess that it is worth it. */
1650static int do_memtest_w(struct sx_board *board, int min, int max) 1650static int do_memtest_w(struct sx_board *board, int min, int max)
1651{ 1651{
diff --git a/drivers/staging/gma500/psb_drm.h b/drivers/staging/gma500/psb_drm.h
index fb9b4245bada..a339406052ef 100644
--- a/drivers/staging/gma500/psb_drm.h
+++ b/drivers/staging/gma500/psb_drm.h
@@ -131,7 +131,7 @@ struct drm_psb_reloc {
131 u32 pre_add; /* Destination format: */ 131 u32 pre_add; /* Destination format: */
132 u32 background; /* Destination add */ 132 u32 background; /* Destination add */
133 u32 dst_buffer; /* Destination buffer. Index into buffer_list */ 133 u32 dst_buffer; /* Destination buffer. Index into buffer_list */
134 u32 arg0; /* Reloc-op dependant */ 134 u32 arg0; /* Reloc-op dependent */
135 u32 arg1; 135 u32 arg1;
136}; 136};
137 137
diff --git a/drivers/staging/gma500/psb_drv.c b/drivers/staging/gma500/psb_drv.c
index 44cd095d2862..d01d45e7a14d 100644
--- a/drivers/staging/gma500/psb_drv.c
+++ b/drivers/staging/gma500/psb_drv.c
@@ -561,7 +561,7 @@ static int psb_driver_unload(struct drm_device *dev)
561 kfree(dev_priv); 561 kfree(dev_priv);
562 dev->dev_private = NULL; 562 dev->dev_private = NULL;
563 563
564 /*destory VBT data*/ 564 /*destroy VBT data*/
565 psb_intel_destroy_bios(dev); 565 psb_intel_destroy_bios(dev);
566 } 566 }
567 567
diff --git a/drivers/staging/gma500/psb_intel_bios.c b/drivers/staging/gma500/psb_intel_bios.c
index f5bcd119b87d..48ac8ba7f40b 100644
--- a/drivers/staging/gma500/psb_intel_bios.c
+++ b/drivers/staging/gma500/psb_intel_bios.c
@@ -271,7 +271,7 @@ bool psb_intel_init_bios(struct drm_device *dev)
271} 271}
272 272
273/** 273/**
274 * Destory and free VBT data 274 * Destroy and free VBT data
275 */ 275 */
276void psb_intel_destroy_bios(struct drm_device *dev) 276void psb_intel_destroy_bios(struct drm_device *dev)
277{ 277{
diff --git a/drivers/staging/gma500/psb_intel_sdvo.c b/drivers/staging/gma500/psb_intel_sdvo.c
index 731a5a2261d3..1d2bb021c0a5 100644
--- a/drivers/staging/gma500/psb_intel_sdvo.c
+++ b/drivers/staging/gma500/psb_intel_sdvo.c
@@ -573,7 +573,7 @@ static bool psb_sdvo_set_current_inoutmap(struct psb_intel_output *output,
573 /* Make all fields of the args/ret to zero */ 573 /* Make all fields of the args/ret to zero */
574 memset(byArgs, 0, sizeof(byArgs)); 574 memset(byArgs, 0, sizeof(byArgs));
575 575
576 /* Fill up the arguement values; */ 576 /* Fill up the argument values; */
577 byArgs[0] = (u8) (in0outputmask & 0xFF); 577 byArgs[0] = (u8) (in0outputmask & 0xFF);
578 byArgs[1] = (u8) ((in0outputmask >> 8) & 0xFF); 578 byArgs[1] = (u8) ((in0outputmask >> 8) & 0xFF);
579 byArgs[2] = (u8) (in1outputmask & 0xFF); 579 byArgs[2] = (u8) (in1outputmask & 0xFF);
diff --git a/drivers/staging/gma500/psb_intel_sdvo_regs.h b/drivers/staging/gma500/psb_intel_sdvo_regs.h
index a1d1475a9315..c7107a37e33d 100644
--- a/drivers/staging/gma500/psb_intel_sdvo_regs.h
+++ b/drivers/staging/gma500/psb_intel_sdvo_regs.h
@@ -217,7 +217,7 @@ struct psb_intel_sdvo_set_target_input_args {
217} __attribute__ ((packed)); 217} __attribute__ ((packed));
218 218
219/** 219/**
220 * Takes a struct psb_intel_sdvo_output_flags of which outputs are targetted by 220 * Takes a struct psb_intel_sdvo_output_flags of which outputs are targeted by
221 * future output commands. 221 * future output commands.
222 * 222 *
223 * Affected commands inclue SET_OUTPUT_TIMINGS_PART[12], 223 * Affected commands inclue SET_OUTPUT_TIMINGS_PART[12],
diff --git a/drivers/staging/gma500/psb_ttm_fence_user.h b/drivers/staging/gma500/psb_ttm_fence_user.h
index fc13f89c6e12..762a05728632 100644
--- a/drivers/staging/gma500/psb_ttm_fence_user.h
+++ b/drivers/staging/gma500/psb_ttm_fence_user.h
@@ -130,7 +130,7 @@ struct ttm_fence_unref_arg {
130}; 130};
131 131
132/* 132/*
133 * Ioctl offsets frome extenstion start. 133 * Ioctl offsets from extenstion start.
134 */ 134 */
135 135
136#define TTM_FENCE_SIGNALED 0x01 136#define TTM_FENCE_SIGNALED 0x01
diff --git a/drivers/staging/go7007/go7007.txt b/drivers/staging/go7007/go7007.txt
index 06a76da32128..9db1f3952fd2 100644
--- a/drivers/staging/go7007/go7007.txt
+++ b/drivers/staging/go7007/go7007.txt
@@ -2,7 +2,7 @@ This is a driver for the WIS GO7007SB multi-format video encoder.
2 2
3Pete Eberlein <pete@sensoray.com> 3Pete Eberlein <pete@sensoray.com>
4 4
5The driver was orignally released under the GPL and is currently hosted at: 5The driver was originally released under the GPL and is currently hosted at:
6http://nikosapi.org/wiki/index.php/WIS_Go7007_Linux_driver 6http://nikosapi.org/wiki/index.php/WIS_Go7007_Linux_driver
7The go7007 firmware can be acquired from the package on the site above. 7The go7007 firmware can be acquired from the package on the site above.
8 8
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index af789937be4e..68ad17d67098 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -894,7 +894,7 @@ static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req,
894 894
895/* 895/*
896 * We break the request into 1 or more blkvsc_requests and submit 896 * We break the request into 1 or more blkvsc_requests and submit
897 * them. If we cant submit them all, we put them on the 897 * them. If we can't submit them all, we put them on the
898 * pending_list. The blkvsc_request() will work on the pending_list. 898 * pending_list. The blkvsc_request() will work on the pending_list.
899 */ 899 */
900static int blkvsc_do_request(struct block_device_context *blkdev, 900static int blkvsc_do_request(struct block_device_context *blkdev,
diff --git a/drivers/staging/hv/channel.c b/drivers/staging/hv/channel.c
index 775a52a91222..f7ce7d2494b3 100644
--- a/drivers/staging/hv/channel.c
+++ b/drivers/staging/hv/channel.c
@@ -81,14 +81,14 @@ static void vmbus_setevent(struct vmbus_channel *channel)
81 81
82 if (channel->offermsg.monitor_allocated) { 82 if (channel->offermsg.monitor_allocated) {
83 /* Each u32 represents 32 channels */ 83 /* Each u32 represents 32 channels */
84 set_bit(channel->offermsg.child_relid & 31, 84 sync_set_bit(channel->offermsg.child_relid & 31,
85 (unsigned long *) vmbus_connection.send_int_page + 85 (unsigned long *) vmbus_connection.send_int_page +
86 (channel->offermsg.child_relid >> 5)); 86 (channel->offermsg.child_relid >> 5));
87 87
88 monitorpage = vmbus_connection.monitor_pages; 88 monitorpage = vmbus_connection.monitor_pages;
89 monitorpage++; /* Get the child to parent monitor page */ 89 monitorpage++; /* Get the child to parent monitor page */
90 90
91 set_bit(channel->monitor_bit, 91 sync_set_bit(channel->monitor_bit,
92 (unsigned long *)&monitorpage->trigger_group 92 (unsigned long *)&monitorpage->trigger_group
93 [channel->monitor_grp].pending); 93 [channel->monitor_grp].pending);
94 94
@@ -104,7 +104,7 @@ static void VmbusChannelClearEvent(struct vmbus_channel *channel)
104 104
105 if (Channel->offermsg.monitor_allocated) { 105 if (Channel->offermsg.monitor_allocated) {
106 /* Each u32 represents 32 channels */ 106 /* Each u32 represents 32 channels */
107 clear_bit(Channel->offermsg.child_relid & 31, 107 sync_clear_bit(Channel->offermsg.child_relid & 31,
108 (unsigned long *)vmbus_connection.send_int_page + 108 (unsigned long *)vmbus_connection.send_int_page +
109 (Channel->offermsg.child_relid >> 5)); 109 (Channel->offermsg.child_relid >> 5));
110 110
@@ -112,7 +112,7 @@ static void VmbusChannelClearEvent(struct vmbus_channel *channel)
112 vmbus_connection.monitor_pages; 112 vmbus_connection.monitor_pages;
113 monitorPage++; /* Get the child to parent monitor page */ 113 monitorPage++; /* Get the child to parent monitor page */
114 114
115 clear_bit(Channel->monitor_bit, 115 sync_clear_bit(Channel->monitor_bit,
116 (unsigned long *)&monitorPage->trigger_group 116 (unsigned long *)&monitorPage->trigger_group
117 [Channel->monitor_grp].Pending); 117 [Channel->monitor_grp].Pending);
118 } 118 }
diff --git a/drivers/staging/hv/channel_mgmt.c b/drivers/staging/hv/channel_mgmt.c
index bc0393a41d29..06b573227e8d 100644
--- a/drivers/staging/hv/channel_mgmt.c
+++ b/drivers/staging/hv/channel_mgmt.c
@@ -166,7 +166,7 @@ EXPORT_SYMBOL(prep_negotiate_resp);
166 * from Hyper-V. This stub responds to the default negotiate messages 166 * from Hyper-V. This stub responds to the default negotiate messages
167 * that come in for every non IDE/SCSI/Network request. 167 * that come in for every non IDE/SCSI/Network request.
168 * This behavior is normally overwritten in the hv_utils driver. That 168 * This behavior is normally overwritten in the hv_utils driver. That
169 * driver handles requests like gracefull shutdown, heartbeats etc. 169 * driver handles requests like graceful shutdown, heartbeats etc.
170 * 170 *
171 * Mainly used by Hyper-V drivers. 171 * Mainly used by Hyper-V drivers.
172 */ 172 */
diff --git a/drivers/staging/hv/connection.c b/drivers/staging/hv/connection.c
index 44b203b95a22..afc8116e7aa4 100644
--- a/drivers/staging/hv/connection.c
+++ b/drivers/staging/hv/connection.c
@@ -296,7 +296,7 @@ void vmbus_on_event(unsigned long data)
296 for (dword = 0; dword < maxdword; dword++) { 296 for (dword = 0; dword < maxdword; dword++) {
297 if (recv_int_page[dword]) { 297 if (recv_int_page[dword]) {
298 for (bit = 0; bit < 32; bit++) { 298 for (bit = 0; bit < 32; bit++) {
299 if (test_and_clear_bit(bit, 299 if (sync_test_and_clear_bit(bit,
300 (unsigned long *) 300 (unsigned long *)
301 &recv_int_page[dword])) { 301 &recv_int_page[dword])) {
302 relid = (dword << 5) + bit; 302 relid = (dword << 5) + bit;
@@ -338,7 +338,7 @@ int vmbus_post_msg(void *buffer, size_t buflen)
338int vmbus_set_event(u32 child_relid) 338int vmbus_set_event(u32 child_relid)
339{ 339{
340 /* Each u32 represents 32 channels */ 340 /* Each u32 represents 32 channels */
341 set_bit(child_relid & 31, 341 sync_set_bit(child_relid & 31,
342 (unsigned long *)vmbus_connection.send_int_page + 342 (unsigned long *)vmbus_connection.send_int_page +
343 (child_relid >> 5)); 343 (child_relid >> 5));
344 344
diff --git a/drivers/staging/hv/hv.c b/drivers/staging/hv/hv.c
index 2d492adb95bb..0b06f4fe5838 100644
--- a/drivers/staging/hv/hv.c
+++ b/drivers/staging/hv/hv.c
@@ -37,7 +37,7 @@ struct hv_context hv_context = {
37 37
38/* 38/*
39 * query_hypervisor_presence 39 * query_hypervisor_presence
40 * - Query the cpuid for presense of windows hypervisor 40 * - Query the cpuid for presence of windows hypervisor
41 */ 41 */
42static int query_hypervisor_presence(void) 42static int query_hypervisor_presence(void)
43{ 43{
diff --git a/drivers/staging/hv/hv_api.h b/drivers/staging/hv/hv_api.h
index 7114fceab21e..43a722888dc4 100644
--- a/drivers/staging/hv/hv_api.h
+++ b/drivers/staging/hv/hv_api.h
@@ -53,14 +53,14 @@ struct hv_guid {
53 53
54/* 54/*
55 * HV_STATUS_INVALID_ALIGNMENT 55 * HV_STATUS_INVALID_ALIGNMENT
56 * The hypervisor could not perform the operation beacuse a parameter has an 56 * The hypervisor could not perform the operation because a parameter has an
57 * invalid alignment. 57 * invalid alignment.
58 */ 58 */
59#define HV_STATUS_INVALID_ALIGNMENT ((u16)0x0004) 59#define HV_STATUS_INVALID_ALIGNMENT ((u16)0x0004)
60 60
61/* 61/*
62 * HV_STATUS_INVALID_PARAMETER 62 * HV_STATUS_INVALID_PARAMETER
63 * The hypervisor could not perform the operation beacuse an invalid parameter 63 * The hypervisor could not perform the operation because an invalid parameter
64 * was specified. 64 * was specified.
65 */ 65 */
66#define HV_STATUS_INVALID_PARAMETER ((u16)0x0005) 66#define HV_STATUS_INVALID_PARAMETER ((u16)0x0005)
diff --git a/drivers/staging/hv/hv_kvp.h b/drivers/staging/hv/hv_kvp.h
index e069f59b5135..8c402f357d37 100644
--- a/drivers/staging/hv/hv_kvp.h
+++ b/drivers/staging/hv/hv_kvp.h
@@ -36,7 +36,7 @@
36 * registry. 36 * registry.
37 * 37 *
38 * Note: This value is used in defining the KVP exchange message - this value 38 * Note: This value is used in defining the KVP exchange message - this value
39 * cannot be modified without affecting the message size and compatability. 39 * cannot be modified without affecting the message size and compatibility.
40 */ 40 */
41 41
42/* 42/*
diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c
index 50147f84741c..118c7be22562 100644
--- a/drivers/staging/hv/hv_mouse.c
+++ b/drivers/staging/hv/hv_mouse.c
@@ -14,6 +14,7 @@
14 */ 14 */
15#include <linux/init.h> 15#include <linux/init.h>
16#include <linux/module.h> 16#include <linux/module.h>
17#include <linux/delay.h>
17#include <linux/device.h> 18#include <linux/device.h>
18#include <linux/workqueue.h> 19#include <linux/workqueue.h>
19#include <linux/sched.h> 20#include <linux/sched.h>
@@ -23,6 +24,7 @@
23#include <linux/hiddev.h> 24#include <linux/hiddev.h>
24#include <linux/pci.h> 25#include <linux/pci.h>
25#include <linux/dmi.h> 26#include <linux/dmi.h>
27#include <linux/delay.h>
26 28
27#include "hv_api.h" 29#include "hv_api.h"
28#include "logging.h" 30#include "logging.h"
@@ -374,7 +376,7 @@ static void MousevscOnReceiveDeviceInfo(struct mousevsc_dev *InputDevice, struct
374 desc->desc[0].wDescriptorLength); 376 desc->desc[0].wDescriptorLength);
375 377
376 /* Send the ack */ 378 /* Send the ack */
377 memset(&ack, sizeof(struct mousevsc_prt_msg), 0); 379 memset(&ack, 0, sizeof(struct mousevsc_prt_msg));
378 380
379 ack.type = PipeMessageData; 381 ack.type = PipeMessageData;
380 ack.size = sizeof(struct synthhid_device_info_ack); 382 ack.size = sizeof(struct synthhid_device_info_ack);
@@ -595,7 +597,7 @@ static int MousevscConnectToVsp(struct hv_device *Device)
595 /* 597 /*
596 * Now, initiate the vsc/vsp initialization protocol on the open channel 598 * Now, initiate the vsc/vsp initialization protocol on the open channel
597 */ 599 */
598 memset(request, sizeof(struct mousevsc_prt_msg), 0); 600 memset(request, 0, sizeof(struct mousevsc_prt_msg));
599 601
600 request->type = PipeMessageData; 602 request->type = PipeMessageData;
601 request->size = sizeof(struct synthhid_protocol_request); 603 request->size = sizeof(struct synthhid_protocol_request);
diff --git a/drivers/staging/hv/hv_util.c b/drivers/staging/hv/hv_util.c
index 4792f2c402b2..2df15683f8fa 100644
--- a/drivers/staging/hv/hv_util.c
+++ b/drivers/staging/hv/hv_util.c
@@ -80,7 +80,7 @@ static void shutdown_onchannelcallback(void *context)
80 execute_shutdown = true; 80 execute_shutdown = true;
81 81
82 DPRINT_INFO(VMBUS, "Shutdown request received -" 82 DPRINT_INFO(VMBUS, "Shutdown request received -"
83 " gracefull shutdown initiated"); 83 " graceful shutdown initiated");
84 break; 84 break;
85 default: 85 default:
86 icmsghdrp->status = HV_E_FAIL; 86 icmsghdrp->status = HV_E_FAIL;
diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c
index 2d40f5f86b24..33973568214f 100644
--- a/drivers/staging/hv/netvsc_drv.c
+++ b/drivers/staging/hv/netvsc_drv.c
@@ -46,6 +46,7 @@ struct net_device_context {
46 /* point back to our device context */ 46 /* point back to our device context */
47 struct hv_device *device_ctx; 47 struct hv_device *device_ctx;
48 unsigned long avail; 48 unsigned long avail;
49 struct work_struct work;
49}; 50};
50 51
51 52
@@ -219,6 +220,7 @@ static void netvsc_linkstatus_callback(struct hv_device *device_obj,
219 unsigned int status) 220 unsigned int status)
220{ 221{
221 struct net_device *net = dev_get_drvdata(&device_obj->device); 222 struct net_device *net = dev_get_drvdata(&device_obj->device);
223 struct net_device_context *ndev_ctx;
222 224
223 if (!net) { 225 if (!net) {
224 DPRINT_ERR(NETVSC_DRV, "got link status but net device " 226 DPRINT_ERR(NETVSC_DRV, "got link status but net device "
@@ -230,6 +232,8 @@ static void netvsc_linkstatus_callback(struct hv_device *device_obj,
230 netif_carrier_on(net); 232 netif_carrier_on(net);
231 netif_wake_queue(net); 233 netif_wake_queue(net);
232 netif_notify_peers(net); 234 netif_notify_peers(net);
235 ndev_ctx = netdev_priv(net);
236 schedule_work(&ndev_ctx->work);
233 } else { 237 } else {
234 netif_carrier_off(net); 238 netif_carrier_off(net);
235 netif_stop_queue(net); 239 netif_stop_queue(net);
@@ -328,6 +332,25 @@ static const struct net_device_ops device_ops = {
328 .ndo_set_mac_address = eth_mac_addr, 332 .ndo_set_mac_address = eth_mac_addr,
329}; 333};
330 334
335/*
336 * Send GARP packet to network peers after migrations.
337 * After Quick Migration, the network is not immediately operational in the
338 * current context when receiving RNDIS_STATUS_MEDIA_CONNECT event. So, add
339 * another netif_notify_peers() into a scheduled work, otherwise GARP packet
340 * will not be sent after quick migration, and cause network disconnection.
341 */
342static void netvsc_send_garp(struct work_struct *w)
343{
344 struct net_device_context *ndev_ctx;
345 struct net_device *net;
346
347 msleep(20);
348 ndev_ctx = container_of(w, struct net_device_context, work);
349 net = dev_get_drvdata(&ndev_ctx->device_ctx->device);
350 netif_notify_peers(net);
351}
352
353
331static int netvsc_probe(struct device *device) 354static int netvsc_probe(struct device *device)
332{ 355{
333 struct hv_driver *drv = 356 struct hv_driver *drv =
@@ -353,6 +376,7 @@ static int netvsc_probe(struct device *device)
353 net_device_ctx->device_ctx = device_obj; 376 net_device_ctx->device_ctx = device_obj;
354 net_device_ctx->avail = ring_size; 377 net_device_ctx->avail = ring_size;
355 dev_set_drvdata(device, net); 378 dev_set_drvdata(device, net);
379 INIT_WORK(&net_device_ctx->work, netvsc_send_garp);
356 380
357 /* Notify the netvsc driver of the new device */ 381 /* Notify the netvsc driver of the new device */
358 ret = net_drv_obj->base.dev_add(device_obj, &device_info); 382 ret = net_drv_obj->base.dev_add(device_obj, &device_info);
diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/staging/hv/rndis_filter.c
index e7189cd324ca..048376b2b676 100644
--- a/drivers/staging/hv/rndis_filter.c
+++ b/drivers/staging/hv/rndis_filter.c
@@ -585,7 +585,7 @@ static int rndis_filter_set_packet_filter(struct rndis_device *dev,
585 ret = -1; 585 ret = -1;
586 DPRINT_ERR(NETVSC, "timeout before we got a set response..."); 586 DPRINT_ERR(NETVSC, "timeout before we got a set response...");
587 /* 587 /*
588 * We cant deallocate the request since we may still receive a 588 * We can't deallocate the request since we may still receive a
589 * send completion for it. 589 * send completion for it.
590 */ 590 */
591 goto Exit; 591 goto Exit;
diff --git a/drivers/staging/hv/tools/hv_kvp_daemon.c b/drivers/staging/hv/tools/hv_kvp_daemon.c
index f5a2dd694611..33f0f1c8ad73 100644
--- a/drivers/staging/hv/tools/hv_kvp_daemon.c
+++ b/drivers/staging/hv/tools/hv_kvp_daemon.c
@@ -102,22 +102,22 @@ static char kvp_send_buffer[4096];
102static char kvp_recv_buffer[4096]; 102static char kvp_recv_buffer[4096];
103static struct sockaddr_nl addr; 103static struct sockaddr_nl addr;
104 104
105static char os_name[100]; 105static char *os_name = "";
106static char os_major[50]; 106static char *os_major = "";
107static char os_minor[50]; 107static char *os_minor = "";
108static char processor_arch[50]; 108static char *processor_arch;
109static char os_build[100]; 109static char *os_build;
110static char *lic_version; 110static char *lic_version;
111static struct utsname uts_buf;
111 112
112void kvp_get_os_info(void) 113void kvp_get_os_info(void)
113{ 114{
114 FILE *file; 115 FILE *file;
115 char *eol; 116 char *p, buf[512];
116 struct utsname buf;
117 117
118 uname(&buf); 118 uname(&uts_buf);
119 strcpy(os_build, buf.release); 119 os_build = uts_buf.release;
120 strcpy(processor_arch, buf.machine); 120 processor_arch= uts_buf.machine;
121 121
122 file = fopen("/etc/SuSE-release", "r"); 122 file = fopen("/etc/SuSE-release", "r");
123 if (file != NULL) 123 if (file != NULL)
@@ -132,21 +132,46 @@ void kvp_get_os_info(void)
132 /* 132 /*
133 * We don't have information about the os. 133 * We don't have information about the os.
134 */ 134 */
135 strcpy(os_name, "Linux"); 135 os_name = uts_buf.sysname;
136 strcpy(os_major, "0");
137 strcpy(os_minor, "0");
138 return; 136 return;
139 137
140kvp_osinfo_found: 138kvp_osinfo_found:
141 fgets(os_name, 99, file); 139 /* up to three lines */
142 eol = index(os_name, '\n'); 140 p = fgets(buf, sizeof(buf), file);
143 *eol = '\0'; 141 if (p) {
144 fgets(os_major, 49, file); 142 p = strchr(buf, '\n');
145 eol = index(os_major, '\n'); 143 if (p)
146 *eol = '\0'; 144 *p = '\0';
147 fgets(os_minor, 49, file); 145 p = strdup(buf);
148 eol = index(os_minor, '\n'); 146 if (!p)
149 *eol = '\0'; 147 goto done;
148 os_name = p;
149
150 /* second line */
151 p = fgets(buf, sizeof(buf), file);
152 if (p) {
153 p = strchr(buf, '\n');
154 if (p)
155 *p = '\0';
156 p = strdup(buf);
157 if (!p)
158 goto done;
159 os_major = p;
160
161 /* third line */
162 p = fgets(buf, sizeof(buf), file);
163 if (p) {
164 p = strchr(buf, '\n');
165 if (p)
166 *p = '\0';
167 p = strdup(buf);
168 if (p)
169 os_minor = p;
170 }
171 }
172 }
173
174done:
150 fclose(file); 175 fclose(file);
151 return; 176 return;
152} 177}
@@ -202,7 +227,7 @@ kvp_get_ip_address(int family, char *buffer, int length)
202 227
203 /* 228 /*
204 * We only support AF_INET and AF_INET6 229 * We only support AF_INET and AF_INET6
205 * and the list of addresses is seperated by a ";". 230 * and the list of addresses is separated by a ";".
206 */ 231 */
207 struct sockaddr_in6 *addr = 232 struct sockaddr_in6 *addr =
208 (struct sockaddr_in6 *) curp->ifa_addr; 233 (struct sockaddr_in6 *) curp->ifa_addr;
@@ -293,7 +318,7 @@ netlink_send(int fd, struct cn_msg *msg)
293 return sendmsg(fd, &message, 0); 318 return sendmsg(fd, &message, 0);
294} 319}
295 320
296main(void) 321int main(void)
297{ 322{
298 int fd, len, sock_opt; 323 int fd, len, sock_opt;
299 int error; 324 int error;
@@ -301,9 +326,10 @@ main(void)
301 struct pollfd pfd; 326 struct pollfd pfd;
302 struct nlmsghdr *incoming_msg; 327 struct nlmsghdr *incoming_msg;
303 struct cn_msg *incoming_cn_msg; 328 struct cn_msg *incoming_cn_msg;
329 struct hv_ku_msg *hv_msg;
330 char *p;
304 char *key_value; 331 char *key_value;
305 char *key_name; 332 char *key_name;
306 int key_index;
307 333
308 daemon(1, 0); 334 daemon(1, 0);
309 openlog("KVP", 0, LOG_USER); 335 openlog("KVP", 0, LOG_USER);
@@ -373,9 +399,10 @@ main(void)
373 * Driver is registering with us; stash away the version 399 * Driver is registering with us; stash away the version
374 * information. 400 * information.
375 */ 401 */
376 lic_version = malloc(strlen(incoming_cn_msg->data) + 1); 402 p = (char *)incoming_cn_msg->data;
403 lic_version = malloc(strlen(p) + 1);
377 if (lic_version) { 404 if (lic_version) {
378 strcpy(lic_version, incoming_cn_msg->data); 405 strcpy(lic_version, p);
379 syslog(LOG_INFO, "KVP LIC Version: %s", 406 syslog(LOG_INFO, "KVP LIC Version: %s",
380 lic_version); 407 lic_version);
381 } else { 408 } else {
@@ -389,14 +416,11 @@ main(void)
389 continue; 416 continue;
390 } 417 }
391 418
392 key_index = 419 hv_msg = (struct hv_ku_msg *)incoming_cn_msg->data;
393 ((struct hv_ku_msg *)incoming_cn_msg->data)->kvp_index; 420 key_name = (char *)hv_msg->kvp_key;
394 key_name = 421 key_value = (char *)hv_msg->kvp_value;
395 ((struct hv_ku_msg *)incoming_cn_msg->data)->kvp_key;
396 key_value =
397 ((struct hv_ku_msg *)incoming_cn_msg->data)->kvp_value;
398 422
399 switch (key_index) { 423 switch (hv_msg->kvp_index) {
400 case FullyQualifiedDomainName: 424 case FullyQualifiedDomainName:
401 kvp_get_domain_name(key_value, 425 kvp_get_domain_name(key_value,
402 HV_KVP_EXCHANGE_MAX_VALUE_SIZE); 426 HV_KVP_EXCHANGE_MAX_VALUE_SIZE);
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index b473f468dd83..79089f85d903 100644
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -254,7 +254,7 @@ static int vmbus_on_isr(void)
254 event = (union hv_synic_event_flags *)page_addr + VMBUS_MESSAGE_SINT; 254 event = (union hv_synic_event_flags *)page_addr + VMBUS_MESSAGE_SINT;
255 255
256 /* Since we are a child, we only need to check bit 0 */ 256 /* Since we are a child, we only need to check bit 0 */
257 if (test_and_clear_bit(0, (unsigned long *) &event->flags32[0])) { 257 if (sync_test_and_clear_bit(0, (unsigned long *) &event->flags32[0])) {
258 DPRINT_DBG(VMBUS, "received event %d", event->flags32[0]); 258 DPRINT_DBG(VMBUS, "received event %d", event->flags32[0]);
259 ret |= 0x2; 259 ret |= 0x2;
260 } 260 }
diff --git a/drivers/staging/hv/vmbus_private.h b/drivers/staging/hv/vmbus_private.h
index ca050a499b99..6f0d8df5e178 100644
--- a/drivers/staging/hv/vmbus_private.h
+++ b/drivers/staging/hv/vmbus_private.h
@@ -31,6 +31,7 @@
31#include "channel_mgmt.h" 31#include "channel_mgmt.h"
32#include "ring_buffer.h" 32#include "ring_buffer.h"
33#include <linux/list.h> 33#include <linux/list.h>
34#include <asm/sync_bitops.h>
34 35
35 36
36/* 37/*
diff --git a/drivers/staging/iio/Documentation/iio_utils.h b/drivers/staging/iio/Documentation/iio_utils.h
index 8095727b3966..fd78e4ff99ae 100644
--- a/drivers/staging/iio/Documentation/iio_utils.h
+++ b/drivers/staging/iio/Documentation/iio_utils.h
@@ -556,7 +556,7 @@ int _write_sysfs_string(char *filename, char *basedir, char *val, int verify)
556 if (strcmp(temp, val) != 0) { 556 if (strcmp(temp, val) != 0) {
557 printf("Possible failure in string write of %s " 557 printf("Possible failure in string write of %s "
558 "Should be %s " 558 "Should be %s "
559 "writen to %s\%s\n", 559 "written to %s\%s\n",
560 temp, 560 temp,
561 val, 561 val,
562 basedir, 562 basedir,
diff --git a/drivers/staging/iio/accel/adis16201.h b/drivers/staging/iio/accel/adis16201.h
index c9bf22c13428..23fe54d09d12 100644
--- a/drivers/staging/iio/accel/adis16201.h
+++ b/drivers/staging/iio/accel/adis16201.h
@@ -70,7 +70,7 @@
70 * @indio_dev: industrial I/O device structure 70 * @indio_dev: industrial I/O device structure
71 * @trig: data ready trigger registered with iio 71 * @trig: data ready trigger registered with iio
72 * @tx: transmit buffer 72 * @tx: transmit buffer
73 * @rx: recieve buffer 73 * @rx: receive buffer
74 * @buf_lock: mutex to protect tx and rx 74 * @buf_lock: mutex to protect tx and rx
75 **/ 75 **/
76struct adis16201_state { 76struct adis16201_state {
diff --git a/drivers/staging/iio/accel/adis16203.h b/drivers/staging/iio/accel/adis16203.h
index b39323eac9e3..b88688128d61 100644
--- a/drivers/staging/iio/accel/adis16203.h
+++ b/drivers/staging/iio/accel/adis16203.h
@@ -65,7 +65,7 @@
65 * @indio_dev: industrial I/O device structure 65 * @indio_dev: industrial I/O device structure
66 * @trig: data ready trigger registered with iio 66 * @trig: data ready trigger registered with iio
67 * @tx: transmit buffer 67 * @tx: transmit buffer
68 * @rx: recieve buffer 68 * @rx: receive buffer
69 * @buf_lock: mutex to protect tx and rx 69 * @buf_lock: mutex to protect tx and rx
70 **/ 70 **/
71struct adis16203_state { 71struct adis16203_state {
diff --git a/drivers/staging/iio/accel/adis16204.h b/drivers/staging/iio/accel/adis16204.h
index e9ed7cb048cf..e61844684f99 100644
--- a/drivers/staging/iio/accel/adis16204.h
+++ b/drivers/staging/iio/accel/adis16204.h
@@ -73,7 +73,7 @@
73 * @indio_dev: industrial I/O device structure 73 * @indio_dev: industrial I/O device structure
74 * @trig: data ready trigger registered with iio 74 * @trig: data ready trigger registered with iio
75 * @tx: transmit buffer 75 * @tx: transmit buffer
76 * @rx: recieve buffer 76 * @rx: receive buffer
77 * @buf_lock: mutex to protect tx and rx 77 * @buf_lock: mutex to protect tx and rx
78 **/ 78 **/
79struct adis16204_state { 79struct adis16204_state {
diff --git a/drivers/staging/iio/accel/adis16209.h b/drivers/staging/iio/accel/adis16209.h
index 4e97596620ef..8b0da1349555 100644
--- a/drivers/staging/iio/accel/adis16209.h
+++ b/drivers/staging/iio/accel/adis16209.h
@@ -109,7 +109,7 @@
109 * @indio_dev: industrial I/O device structure 109 * @indio_dev: industrial I/O device structure
110 * @trig: data ready trigger registered with iio 110 * @trig: data ready trigger registered with iio
111 * @tx: transmit buffer 111 * @tx: transmit buffer
112 * @rx: recieve buffer 112 * @rx: receive buffer
113 * @buf_lock: mutex to protect tx and rx 113 * @buf_lock: mutex to protect tx and rx
114 **/ 114 **/
115struct adis16209_state { 115struct adis16209_state {
diff --git a/drivers/staging/iio/accel/adis16220.h b/drivers/staging/iio/accel/adis16220.h
index 7013314a9d77..4d5758c2c047 100644
--- a/drivers/staging/iio/accel/adis16220.h
+++ b/drivers/staging/iio/accel/adis16220.h
@@ -132,7 +132,7 @@
132 * @indio_dev: industrial I/O device structure 132 * @indio_dev: industrial I/O device structure
133 * @trig: data ready trigger registered with iio 133 * @trig: data ready trigger registered with iio
134 * @tx: transmit buffer 134 * @tx: transmit buffer
135 * @rx: recieve buffer 135 * @rx: receive buffer
136 * @buf_lock: mutex to protect tx and rx 136 * @buf_lock: mutex to protect tx and rx
137 **/ 137 **/
138struct adis16220_state { 138struct adis16220_state {
diff --git a/drivers/staging/iio/accel/adis16240.h b/drivers/staging/iio/accel/adis16240.h
index 51a807dde27c..76a45797b9dd 100644
--- a/drivers/staging/iio/accel/adis16240.h
+++ b/drivers/staging/iio/accel/adis16240.h
@@ -132,7 +132,7 @@
132 * @indio_dev: industrial I/O device structure 132 * @indio_dev: industrial I/O device structure
133 * @trig: data ready trigger registered with iio 133 * @trig: data ready trigger registered with iio
134 * @tx: transmit buffer 134 * @tx: transmit buffer
135 * @rx: recieve buffer 135 * @rx: receive buffer
136 * @buf_lock: mutex to protect tx and rx 136 * @buf_lock: mutex to protect tx and rx
137 **/ 137 **/
138struct adis16240_state { 138struct adis16240_state {
diff --git a/drivers/staging/iio/accel/lis3l02dq.h b/drivers/staging/iio/accel/lis3l02dq.h
index 579b3a26e5d7..11402187f9ae 100644
--- a/drivers/staging/iio/accel/lis3l02dq.h
+++ b/drivers/staging/iio/accel/lis3l02dq.h
@@ -57,7 +57,7 @@
57/* Reboot memory content */ 57/* Reboot memory content */
58#define LIS3L02DQ_REG_CTRL_2_REBOOT_MEMORY 0x10 58#define LIS3L02DQ_REG_CTRL_2_REBOOT_MEMORY 0x10
59 59
60/* Interupt Enable - applies data ready to the RDY pad */ 60/* Interrupt Enable - applies data ready to the RDY pad */
61#define LIS3L02DQ_REG_CTRL_2_ENABLE_INTERRUPT 0x08 61#define LIS3L02DQ_REG_CTRL_2_ENABLE_INTERRUPT 0x08
62 62
63/* Enable Data Ready Generation - relationship with previous unclear in docs */ 63/* Enable Data Ready Generation - relationship with previous unclear in docs */
@@ -70,34 +70,34 @@
70 * - option for 16 bit left justified */ 70 * - option for 16 bit left justified */
71#define LIS3L02DQ_REG_CTRL_2_DATA_ALIGNMENT_16_BIT_LEFT_JUSTIFIED 0x01 71#define LIS3L02DQ_REG_CTRL_2_DATA_ALIGNMENT_16_BIT_LEFT_JUSTIFIED 0x01
72 72
73/* Interupt related stuff */ 73/* Interrupt related stuff */
74#define LIS3L02DQ_REG_WAKE_UP_CFG_ADDR 0x23 74#define LIS3L02DQ_REG_WAKE_UP_CFG_ADDR 0x23
75 75
76/* Switch from or combination fo conditions to and */ 76/* Switch from or combination fo conditions to and */
77#define LIS3L02DQ_REG_WAKE_UP_CFG_BOOLEAN_AND 0x80 77#define LIS3L02DQ_REG_WAKE_UP_CFG_BOOLEAN_AND 0x80
78 78
79/* Latch interupt request, 79/* Latch interrupt request,
80 * if on ack must be given by reading the ack register */ 80 * if on ack must be given by reading the ack register */
81#define LIS3L02DQ_REG_WAKE_UP_CFG_LATCH_SRC 0x40 81#define LIS3L02DQ_REG_WAKE_UP_CFG_LATCH_SRC 0x40
82 82
83/* Z Interupt on High (above threshold)*/ 83/* Z Interrupt on High (above threshold)*/
84#define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_Z_HIGH 0x20 84#define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_Z_HIGH 0x20
85/* Z Interupt on Low */ 85/* Z Interrupt on Low */
86#define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_Z_LOW 0x10 86#define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_Z_LOW 0x10
87/* Y Interupt on High */ 87/* Y Interrupt on High */
88#define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_Y_HIGH 0x08 88#define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_Y_HIGH 0x08
89/* Y Interupt on Low */ 89/* Y Interrupt on Low */
90#define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_Y_LOW 0x04 90#define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_Y_LOW 0x04
91/* X Interupt on High */ 91/* X Interrupt on High */
92#define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_X_HIGH 0x02 92#define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_X_HIGH 0x02
93/* X Interupt on Low */ 93/* X Interrupt on Low */
94#define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_X_LOW 0x01 94#define LIS3L02DQ_REG_WAKE_UP_CFG_INTERRUPT_X_LOW 0x01
95 95
96/* Register that gives description of what caused interupt 96/* Register that gives description of what caused interrupt
97 * - latched if set in CFG_ADDRES */ 97 * - latched if set in CFG_ADDRES */
98#define LIS3L02DQ_REG_WAKE_UP_SRC_ADDR 0x24 98#define LIS3L02DQ_REG_WAKE_UP_SRC_ADDR 0x24
99/* top bit ignored */ 99/* top bit ignored */
100/* Interupt Active */ 100/* Interrupt Active */
101#define LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_ACTIVATED 0x40 101#define LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_ACTIVATED 0x40
102/* Interupts that have been triggered */ 102/* Interupts that have been triggered */
103#define LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_Z_HIGH 0x20 103#define LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_Z_HIGH 0x20
@@ -123,7 +123,7 @@
123#define LIS3L02DQ_REG_STATUS_X_NEW_DATA 0x01 123#define LIS3L02DQ_REG_STATUS_X_NEW_DATA 0x01
124 124
125/* The accelerometer readings - low and high bytes. 125/* The accelerometer readings - low and high bytes.
126Form of high byte dependant on justification set in ctrl reg */ 126Form of high byte dependent on justification set in ctrl reg */
127#define LIS3L02DQ_REG_OUT_X_L_ADDR 0x28 127#define LIS3L02DQ_REG_OUT_X_L_ADDR 0x28
128#define LIS3L02DQ_REG_OUT_X_H_ADDR 0x29 128#define LIS3L02DQ_REG_OUT_X_H_ADDR 0x29
129#define LIS3L02DQ_REG_OUT_Y_L_ADDR 0x2A 129#define LIS3L02DQ_REG_OUT_Y_L_ADDR 0x2A
@@ -155,7 +155,7 @@ Form of high byte dependant on justification set in ctrl reg */
155 * @inter: used to check if new interrupt has been triggered 155 * @inter: used to check if new interrupt has been triggered
156 * @trig: data ready trigger registered with iio 156 * @trig: data ready trigger registered with iio
157 * @tx: transmit buffer 157 * @tx: transmit buffer
158 * @rx: recieve buffer 158 * @rx: receive buffer
159 * @buf_lock: mutex to protect tx and rx 159 * @buf_lock: mutex to protect tx and rx
160 **/ 160 **/
161struct lis3l02dq_state { 161struct lis3l02dq_state {
diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c
index c4b4ab7e6423..3067f9662d20 100644
--- a/drivers/staging/iio/accel/lis3l02dq_core.c
+++ b/drivers/staging/iio/accel/lis3l02dq_core.c
@@ -77,7 +77,7 @@ int lis3l02dq_spi_read_reg_8(struct device *dev, u8 reg_address, u8 *val)
77/** 77/**
78 * lis3l02dq_spi_write_reg_8() - write single byte to a register 78 * lis3l02dq_spi_write_reg_8() - write single byte to a register
79 * @dev: device associated with child of actual device (iio_dev or iio_trig) 79 * @dev: device associated with child of actual device (iio_dev or iio_trig)
80 * @reg_address: the address of the register to be writen 80 * @reg_address: the address of the register to be written
81 * @val: the value to write 81 * @val: the value to write
82 **/ 82 **/
83int lis3l02dq_spi_write_reg_8(struct device *dev, 83int lis3l02dq_spi_write_reg_8(struct device *dev,
diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c
index 2c461a31f129..529a3cc6d0c7 100644
--- a/drivers/staging/iio/accel/lis3l02dq_ring.c
+++ b/drivers/staging/iio/accel/lis3l02dq_ring.c
@@ -217,7 +217,7 @@ static const u8 read_all_tx_array[] = {
217/** 217/**
218 * lis3l02dq_read_all() Reads all channels currently selected 218 * lis3l02dq_read_all() Reads all channels currently selected
219 * @st: device specific state 219 * @st: device specific state
220 * @rx_array: (dma capable) recieve array, must be at least 220 * @rx_array: (dma capable) receive array, must be at least
221 * 4*number of channels 221 * 4*number of channels
222 **/ 222 **/
223static int lis3l02dq_read_all(struct lis3l02dq_state *st, u8 *rx_array) 223static int lis3l02dq_read_all(struct lis3l02dq_state *st, u8 *rx_array)
@@ -409,7 +409,7 @@ static const struct attribute_group lis3l02dq_trigger_attr_group = {
409 * 409 *
410 * As the trigger may occur on any data element being updated it is 410 * As the trigger may occur on any data element being updated it is
411 * really rather likely to occur during the read from the previous 411 * really rather likely to occur during the read from the previous
412 * trigger event. The only way to discover if this has occured on 412 * trigger event. The only way to discover if this has occurred on
413 * boards not supporting level interrupts is to take a look at the line. 413 * boards not supporting level interrupts is to take a look at the line.
414 * If it is indicating another interrupt and we don't seem to have a 414 * If it is indicating another interrupt and we don't seem to have a
415 * handler looking at it, then we need to notify the core that we need 415 * handler looking at it, then we need to notify the core that we need
diff --git a/drivers/staging/iio/accel/sca3000.h b/drivers/staging/iio/accel/sca3000.h
index 23892848f5ae..db710334b99b 100644
--- a/drivers/staging/iio/accel/sca3000.h
+++ b/drivers/staging/iio/accel/sca3000.h
@@ -185,7 +185,7 @@ struct sca3000_state {
185}; 185};
186 186
187/** 187/**
188 * struct sca3000_chip_info - model dependant parameters 188 * struct sca3000_chip_info - model dependent parameters
189 * @name: model identification 189 * @name: model identification
190 * @scale: string containing floating point scale factor 190 * @scale: string containing floating point scale factor
191 * @temp_output: some devices have temperature sensors. 191 * @temp_output: some devices have temperature sensors.
@@ -213,7 +213,7 @@ struct sca3000_chip_info {
213 * sca3000_read_data() read a series of values from the device 213 * sca3000_read_data() read a series of values from the device
214 * @dev: device 214 * @dev: device
215 * @reg_address_high: start address (decremented read) 215 * @reg_address_high: start address (decremented read)
216 * @rx: pointer where recieved data is placed. Callee 216 * @rx: pointer where received data is placed. Callee
217 * responsible for freeing this. 217 * responsible for freeing this.
218 * @len: number of bytes to read 218 * @len: number of bytes to read
219 * 219 *
diff --git a/drivers/staging/iio/accel/sca3000_ring.c b/drivers/staging/iio/accel/sca3000_ring.c
index c872fddfb2bf..a730a7638de1 100644
--- a/drivers/staging/iio/accel/sca3000_ring.c
+++ b/drivers/staging/iio/accel/sca3000_ring.c
@@ -43,7 +43,7 @@
43 * leading byte used in bus comms. 43 * leading byte used in bus comms.
44 * 44 *
45 * Currently does not provide timestamps. As the hardware doesn't add them they 45 * Currently does not provide timestamps. As the hardware doesn't add them they
46 * can only be inferred aproximately from ring buffer events such as 50% full 46 * can only be inferred approximately from ring buffer events such as 50% full
47 * and knowledge of when buffer was last emptied. This is left to userspace. 47 * and knowledge of when buffer was last emptied. This is left to userspace.
48 **/ 48 **/
49static int sca3000_rip_hw_rb(struct iio_ring_buffer *r, 49static int sca3000_rip_hw_rb(struct iio_ring_buffer *r,
diff --git a/drivers/staging/iio/adc/ad7298_ring.c b/drivers/staging/iio/adc/ad7298_ring.c
index 19d1aced1e6c..9068d7f54d15 100644
--- a/drivers/staging/iio/adc/ad7298_ring.c
+++ b/drivers/staging/iio/adc/ad7298_ring.c
@@ -157,7 +157,7 @@ static int ad7298_ring_preenable(struct iio_dev *indio_dev)
157/** 157/**
158 * ad7298_poll_func_th() th of trigger launched polling to ring buffer 158 * ad7298_poll_func_th() th of trigger launched polling to ring buffer
159 * 159 *
160 * As sampling only occurs on spi comms occuring, leave timestamping until 160 * As sampling only occurs on spi comms occurring, leave timestamping until
161 * then. Some triggers will generate their own time stamp. Currently 161 * then. Some triggers will generate their own time stamp. Currently
162 * there is no way of notifying them when no one cares. 162 * there is no way of notifying them when no one cares.
163 **/ 163 **/
diff --git a/drivers/staging/iio/adc/ad7476_ring.c b/drivers/staging/iio/adc/ad7476_ring.c
index 1d654c86099d..92d93787d5b8 100644
--- a/drivers/staging/iio/adc/ad7476_ring.c
+++ b/drivers/staging/iio/adc/ad7476_ring.c
@@ -112,7 +112,7 @@ static int ad7476_ring_preenable(struct iio_dev *indio_dev)
112/** 112/**
113 * ad7476_poll_func_th() th of trigger launched polling to ring buffer 113 * ad7476_poll_func_th() th of trigger launched polling to ring buffer
114 * 114 *
115 * As sampling only occurs on i2c comms occuring, leave timestamping until 115 * As sampling only occurs on i2c comms occurring, leave timestamping until
116 * then. Some triggers will generate their own time stamp. Currently 116 * then. Some triggers will generate their own time stamp. Currently
117 * there is no way of notifying them when no one cares. 117 * there is no way of notifying them when no one cares.
118 **/ 118 **/
diff --git a/drivers/staging/iio/adc/ad7887_ring.c b/drivers/staging/iio/adc/ad7887_ring.c
index 2d7fe65049dd..da77f266c16b 100644
--- a/drivers/staging/iio/adc/ad7887_ring.c
+++ b/drivers/staging/iio/adc/ad7887_ring.c
@@ -165,7 +165,7 @@ static int ad7887_ring_postdisable(struct iio_dev *indio_dev)
165/** 165/**
166 * ad7887_poll_func_th() th of trigger launched polling to ring buffer 166 * ad7887_poll_func_th() th of trigger launched polling to ring buffer
167 * 167 *
168 * As sampling only occurs on spi comms occuring, leave timestamping until 168 * As sampling only occurs on spi comms occurring, leave timestamping until
169 * then. Some triggers will generate their own time stamp. Currently 169 * then. Some triggers will generate their own time stamp. Currently
170 * there is no way of notifying them when no one cares. 170 * there is no way of notifying them when no one cares.
171 **/ 171 **/
diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c
index e50841b3ac69..f04e642e7272 100644
--- a/drivers/staging/iio/adc/ad799x_core.c
+++ b/drivers/staging/iio/adc/ad799x_core.c
@@ -184,7 +184,7 @@ static ssize_t ad799x_read_single_channel(struct device *dev,
184 184
185 mutex_lock(&dev_info->mlock); 185 mutex_lock(&dev_info->mlock);
186 mask = 1 << this_attr->address; 186 mask = 1 << this_attr->address;
187 /* If ring buffer capture is occuring, query the buffer */ 187 /* If ring buffer capture is occurring, query the buffer */
188 if (iio_ring_enabled(dev_info)) { 188 if (iio_ring_enabled(dev_info)) {
189 data = ret = ad799x_single_channel_from_ring(st, mask); 189 data = ret = ad799x_single_channel_from_ring(st, mask);
190 if (ret < 0) 190 if (ret < 0)
diff --git a/drivers/staging/iio/adc/ad799x_ring.c b/drivers/staging/iio/adc/ad799x_ring.c
index 56abc395f177..0875a7ef67a5 100644
--- a/drivers/staging/iio/adc/ad799x_ring.c
+++ b/drivers/staging/iio/adc/ad799x_ring.c
@@ -101,7 +101,7 @@ static int ad799x_ring_preenable(struct iio_dev *indio_dev)
101/** 101/**
102 * ad799x_poll_func_th() th of trigger launched polling to ring buffer 102 * ad799x_poll_func_th() th of trigger launched polling to ring buffer
103 * 103 *
104 * As sampling only occurs on i2c comms occuring, leave timestamping until 104 * As sampling only occurs on i2c comms occurring, leave timestamping until
105 * then. Some triggers will generate their own time stamp. Currently 105 * then. Some triggers will generate their own time stamp. Currently
106 * there is no way of notifying them when no one cares. 106 * there is no way of notifying them when no one cares.
107 **/ 107 **/
diff --git a/drivers/staging/iio/adc/max1363_core.c b/drivers/staging/iio/adc/max1363_core.c
index dde097afb430..de83c3b37a2d 100644
--- a/drivers/staging/iio/adc/max1363_core.c
+++ b/drivers/staging/iio/adc/max1363_core.c
@@ -255,7 +255,7 @@ static ssize_t max1363_read_single_channel(struct device *dev,
255 goto error_ret; 255 goto error_ret;
256 } 256 }
257 257
258 /* If ring buffer capture is occuring, query the buffer */ 258 /* If ring buffer capture is occurring, query the buffer */
259 if (iio_ring_enabled(dev_info)) { 259 if (iio_ring_enabled(dev_info)) {
260 mask = max1363_mode_table[this_attr->address].modemask; 260 mask = max1363_mode_table[this_attr->address].modemask;
261 data = max1363_single_channel_from_ring(mask, st); 261 data = max1363_single_channel_from_ring(mask, st);
@@ -1425,7 +1425,7 @@ error_ret:
1425} 1425}
1426 1426
1427/* 1427/*
1428 * To keep this managable we always use one of 3 scan modes. 1428 * To keep this manageable we always use one of 3 scan modes.
1429 * Scan 0...3, 0-1,2-3 and 1-0,3-2 1429 * Scan 0...3, 0-1,2-3 and 1-0,3-2
1430 */ 1430 */
1431static inline int __max1363_check_event_mask(int thismask, int checkmask) 1431static inline int __max1363_check_event_mask(int thismask, int checkmask)
diff --git a/drivers/staging/iio/adc/max1363_ring.c b/drivers/staging/iio/adc/max1363_ring.c
index 5532f3e466bc..d36fcc62e976 100644
--- a/drivers/staging/iio/adc/max1363_ring.c
+++ b/drivers/staging/iio/adc/max1363_ring.c
@@ -108,7 +108,7 @@ static int max1363_ring_preenable(struct iio_dev *indio_dev)
108/** 108/**
109 * max1363_poll_func_th() - th of trigger launched polling to ring buffer 109 * max1363_poll_func_th() - th of trigger launched polling to ring buffer
110 * 110 *
111 * As sampling only occurs on i2c comms occuring, leave timestamping until 111 * As sampling only occurs on i2c comms occurring, leave timestamping until
112 * then. Some triggers will generate their own time stamp. Currently 112 * then. Some triggers will generate their own time stamp. Currently
113 * there is no way of notifying them when no one cares. 113 * there is no way of notifying them when no one cares.
114 **/ 114 **/
diff --git a/drivers/staging/iio/chrdev.h b/drivers/staging/iio/chrdev.h
index 98d1a2c12df2..4fcb99c816f9 100644
--- a/drivers/staging/iio/chrdev.h
+++ b/drivers/staging/iio/chrdev.h
@@ -33,7 +33,7 @@ struct iio_handler {
33/** 33/**
34 * struct iio_event_data - The actual event being pushed to userspace 34 * struct iio_event_data - The actual event being pushed to userspace
35 * @id: event identifier 35 * @id: event identifier
36 * @timestamp: best estimate of time of event occurance (often from 36 * @timestamp: best estimate of time of event occurrence (often from
37 * the interrupt handler) 37 * the interrupt handler)
38 */ 38 */
39struct iio_event_data { 39struct iio_event_data {
@@ -42,7 +42,7 @@ struct iio_event_data {
42}; 42};
43 43
44/** 44/**
45 * struct iio_detected_event_list - list element for events that have occured 45 * struct iio_detected_event_list - list element for events that have occurred
46 * @list: linked list header 46 * @list: linked list header
47 * @ev: the event itself 47 * @ev: the event itself
48 * @shared_pointer: used when the event is shared - i.e. can be escallated 48 * @shared_pointer: used when the event is shared - i.e. can be escallated
@@ -98,7 +98,7 @@ struct iio_event_interface {
98 * @list: list header 98 * @list: list header
99 * @refcount: as the handler may be shared between multiple device 99 * @refcount: as the handler may be shared between multiple device
100 * side events, reference counting ensures clean removal 100 * side events, reference counting ensures clean removal
101 * @exist_lock: prevents race conditions related to refcount useage. 101 * @exist_lock: prevents race conditions related to refcount usage.
102 * @handler: event handler function - called on event if this 102 * @handler: event handler function - called on event if this
103 * event_handler is enabled. 103 * event_handler is enabled.
104 * 104 *
diff --git a/drivers/staging/iio/gyro/adis16060_core.c b/drivers/staging/iio/gyro/adis16060_core.c
index 700eb3980f9e..ae53e71d1c2f 100644
--- a/drivers/staging/iio/gyro/adis16060_core.c
+++ b/drivers/staging/iio/gyro/adis16060_core.c
@@ -30,7 +30,7 @@
30 * @us_w: actual spi_device to write config 30 * @us_w: actual spi_device to write config
31 * @us_r: actual spi_device to read back data 31 * @us_r: actual spi_device to read back data
32 * @indio_dev: industrial I/O device structure 32 * @indio_dev: industrial I/O device structure
33 * @buf: transmit or recieve buffer 33 * @buf: transmit or receive buffer
34 * @buf_lock: mutex to protect tx and rx 34 * @buf_lock: mutex to protect tx and rx
35 **/ 35 **/
36struct adis16060_state { 36struct adis16060_state {
diff --git a/drivers/staging/iio/gyro/adis16080_core.c b/drivers/staging/iio/gyro/adis16080_core.c
index fb4336c7d2a6..ef9e304a226d 100644
--- a/drivers/staging/iio/gyro/adis16080_core.c
+++ b/drivers/staging/iio/gyro/adis16080_core.c
@@ -35,7 +35,7 @@
35 * struct adis16080_state - device instance specific data 35 * struct adis16080_state - device instance specific data
36 * @us: actual spi_device to write data 36 * @us: actual spi_device to write data
37 * @indio_dev: industrial I/O device structure 37 * @indio_dev: industrial I/O device structure
38 * @buf: transmit or recieve buffer 38 * @buf: transmit or receive buffer
39 * @buf_lock: mutex to protect tx and rx 39 * @buf_lock: mutex to protect tx and rx
40 **/ 40 **/
41struct adis16080_state { 41struct adis16080_state {
diff --git a/drivers/staging/iio/gyro/adis16260.h b/drivers/staging/iio/gyro/adis16260.h
index c1fd4364287f..1369501b4096 100644
--- a/drivers/staging/iio/gyro/adis16260.h
+++ b/drivers/staging/iio/gyro/adis16260.h
@@ -91,7 +91,7 @@
91 * @indio_dev: industrial I/O device structure 91 * @indio_dev: industrial I/O device structure
92 * @trig: data ready trigger registered with iio 92 * @trig: data ready trigger registered with iio
93 * @tx: transmit buffer 93 * @tx: transmit buffer
94 * @rx: recieve buffer 94 * @rx: receive buffer
95 * @buf_lock: mutex to protect tx and rx 95 * @buf_lock: mutex to protect tx and rx
96 * @negate: negate the scale parameter 96 * @negate: negate the scale parameter
97 **/ 97 **/
diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h
index 248bdd2846fd..7127f26f8d26 100644
--- a/drivers/staging/iio/iio.h
+++ b/drivers/staging/iio/iio.h
@@ -92,7 +92,7 @@ void iio_remove_event_from_list(struct iio_event_handler_list *el,
92 * changes 92 * changes
93 * @available_scan_masks: [DRIVER] optional array of allowed bitmasks 93 * @available_scan_masks: [DRIVER] optional array of allowed bitmasks
94 * @trig: [INTERN] current device trigger (ring buffer modes) 94 * @trig: [INTERN] current device trigger (ring buffer modes)
95 * @pollfunc: [DRIVER] function run on trigger being recieved 95 * @pollfunc: [DRIVER] function run on trigger being received
96 **/ 96 **/
97struct iio_dev { 97struct iio_dev {
98 int id; 98 int id;
diff --git a/drivers/staging/iio/imu/adis16300.h b/drivers/staging/iio/imu/adis16300.h
index 1f25d68064a0..c0957591aed7 100644
--- a/drivers/staging/iio/imu/adis16300.h
+++ b/drivers/staging/iio/imu/adis16300.h
@@ -99,7 +99,7 @@
99 * @indio_dev: industrial I/O device structure 99 * @indio_dev: industrial I/O device structure
100 * @trig: data ready trigger registered with iio 100 * @trig: data ready trigger registered with iio
101 * @tx: transmit buffer 101 * @tx: transmit buffer
102 * @rx: recieve buffer 102 * @rx: receive buffer
103 * @buf_lock: mutex to protect tx and rx 103 * @buf_lock: mutex to protect tx and rx
104 **/ 104 **/
105struct adis16300_state { 105struct adis16300_state {
diff --git a/drivers/staging/iio/imu/adis16350.h b/drivers/staging/iio/imu/adis16350.h
index b00001e3edd0..b1ad48662a2c 100644
--- a/drivers/staging/iio/imu/adis16350.h
+++ b/drivers/staging/iio/imu/adis16350.h
@@ -105,7 +105,7 @@
105 * @indio_dev: industrial I/O device structure 105 * @indio_dev: industrial I/O device structure
106 * @trig: data ready trigger registered with iio 106 * @trig: data ready trigger registered with iio
107 * @tx: transmit buffer 107 * @tx: transmit buffer
108 * @rx: recieve buffer 108 * @rx: receive buffer
109 * @buf_lock: mutex to protect tx and rx 109 * @buf_lock: mutex to protect tx and rx
110 **/ 110 **/
111struct adis16350_state { 111struct adis16350_state {
diff --git a/drivers/staging/iio/imu/adis16400.h b/drivers/staging/iio/imu/adis16400.h
index 6ff33e1ad8c1..e328bcc5922f 100644
--- a/drivers/staging/iio/imu/adis16400.h
+++ b/drivers/staging/iio/imu/adis16400.h
@@ -17,7 +17,8 @@
17#ifndef SPI_ADIS16400_H_ 17#ifndef SPI_ADIS16400_H_
18#define SPI_ADIS16400_H_ 18#define SPI_ADIS16400_H_
19 19
20#define ADIS16400_STARTUP_DELAY 220 /* ms */ 20#define ADIS16400_STARTUP_DELAY 290 /* ms */
21#define ADIS16400_MTEST_DELAY 90 /* ms */
21 22
22#define ADIS16400_READ_REG(a) a 23#define ADIS16400_READ_REG(a) a
23#define ADIS16400_WRITE_REG(a) ((a) | 0x80) 24#define ADIS16400_WRITE_REG(a) ((a) | 0x80)
@@ -131,7 +132,7 @@
131 * @indio_dev: industrial I/O device structure 132 * @indio_dev: industrial I/O device structure
132 * @trig: data ready trigger registered with iio 133 * @trig: data ready trigger registered with iio
133 * @tx: transmit buffer 134 * @tx: transmit buffer
134 * @rx: recieve buffer 135 * @rx: receive buffer
135 * @buf_lock: mutex to protect tx and rx 136 * @buf_lock: mutex to protect tx and rx
136 **/ 137 **/
137struct adis16400_state { 138struct adis16400_state {
diff --git a/drivers/staging/iio/imu/adis16400_core.c b/drivers/staging/iio/imu/adis16400_core.c
index cfb108a1545b..540bde69cc3b 100644
--- a/drivers/staging/iio/imu/adis16400_core.c
+++ b/drivers/staging/iio/imu/adis16400_core.c
@@ -6,6 +6,7 @@
6 * 6 *
7 * Copyright (c) 2009 Manuel Stahl <manuel.stahl@iis.fraunhofer.de> 7 * Copyright (c) 2009 Manuel Stahl <manuel.stahl@iis.fraunhofer.de>
8 * Copyright (c) 2007 Jonathan Cameron <jic23@cam.ac.uk> 8 * Copyright (c) 2007 Jonathan Cameron <jic23@cam.ac.uk>
9 * Copyright (c) 2011 Analog Devices Inc.
9 * 10 *
10 * This program is free software; you can redistribute it and/or modify 11 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License version 2 as 12 * it under the terms of the GNU General Public License version 2 as
@@ -93,7 +94,6 @@ static int adis16400_spi_write_reg_16(struct device *dev,
93 .tx_buf = st->tx + 2, 94 .tx_buf = st->tx + 2,
94 .bits_per_word = 8, 95 .bits_per_word = 8,
95 .len = 2, 96 .len = 2,
96 .cs_change = 1,
97 }, 97 },
98 }; 98 };
99 99
@@ -137,7 +137,6 @@ static int adis16400_spi_read_reg_16(struct device *dev,
137 .rx_buf = st->rx, 137 .rx_buf = st->rx,
138 .bits_per_word = 8, 138 .bits_per_word = 8,
139 .len = 2, 139 .len = 2,
140 .cs_change = 1,
141 }, 140 },
142 }; 141 };
143 142
@@ -375,7 +374,7 @@ static int adis16400_self_test(struct device *dev)
375 dev_err(dev, "problem starting self test"); 374 dev_err(dev, "problem starting self test");
376 goto err_ret; 375 goto err_ret;
377 } 376 }
378 377 msleep(ADIS16400_MTEST_DELAY);
379 adis16400_check_status(dev); 378 adis16400_check_status(dev);
380 379
381err_ret: 380err_ret:
@@ -471,10 +470,11 @@ static int adis16400_initial_setup(struct adis16400_state *st)
471 if (ret) 470 if (ret)
472 goto err_ret; 471 goto err_ret;
473 472
474 if (prod_id != ADIS16400_PRODUCT_ID_DEFAULT) 473 if ((prod_id & 0xF000) != ADIS16400_PRODUCT_ID_DEFAULT)
475 dev_warn(dev, "unknown product id"); 474 dev_warn(dev, "unknown product id");
476 475
477 printk(KERN_INFO DRIVER_NAME ": prod_id 0x%04x at CS%d (irq %d)\n", 476
477 dev_info(dev, ": prod_id 0x%04x at CS%d (irq %d)\n",
478 prod_id, st->us->chip_select, st->us->irq); 478 prod_id, st->us->chip_select, st->us->irq);
479 479
480 /* use high spi speed if possible */ 480 /* use high spi speed if possible */
@@ -497,12 +497,12 @@ err_ret:
497 _reg) 497 _reg)
498 498
499static ADIS16400_DEV_ATTR_CALIBBIAS(GYRO_X, ADIS16400_XGYRO_OFF); 499static ADIS16400_DEV_ATTR_CALIBBIAS(GYRO_X, ADIS16400_XGYRO_OFF);
500static ADIS16400_DEV_ATTR_CALIBBIAS(GYRO_Y, ADIS16400_XGYRO_OFF); 500static ADIS16400_DEV_ATTR_CALIBBIAS(GYRO_Y, ADIS16400_YGYRO_OFF);
501static ADIS16400_DEV_ATTR_CALIBBIAS(GYRO_Z, ADIS16400_XGYRO_OFF); 501static ADIS16400_DEV_ATTR_CALIBBIAS(GYRO_Z, ADIS16400_ZGYRO_OFF);
502 502
503static ADIS16400_DEV_ATTR_CALIBBIAS(ACCEL_X, ADIS16400_XACCL_OFF); 503static ADIS16400_DEV_ATTR_CALIBBIAS(ACCEL_X, ADIS16400_XACCL_OFF);
504static ADIS16400_DEV_ATTR_CALIBBIAS(ACCEL_Y, ADIS16400_XACCL_OFF); 504static ADIS16400_DEV_ATTR_CALIBBIAS(ACCEL_Y, ADIS16400_YACCL_OFF);
505static ADIS16400_DEV_ATTR_CALIBBIAS(ACCEL_Z, ADIS16400_XACCL_OFF); 505static ADIS16400_DEV_ATTR_CALIBBIAS(ACCEL_Z, ADIS16400_ZACCL_OFF);
506 506
507 507
508static IIO_DEV_ATTR_IN_NAMED_RAW(0, supply, adis16400_read_14bit_signed, 508static IIO_DEV_ATTR_IN_NAMED_RAW(0, supply, adis16400_read_14bit_signed,
@@ -647,7 +647,7 @@ static int __devinit adis16400_probe(struct spi_device *spi)
647 647
648 ret = iio_ring_buffer_register(st->indio_dev->ring, 0); 648 ret = iio_ring_buffer_register(st->indio_dev->ring, 0);
649 if (ret) { 649 if (ret) {
650 printk(KERN_ERR "failed to initialize the ring\n"); 650 dev_err(&spi->dev, "failed to initialize the ring\n");
651 goto error_unreg_ring_funcs; 651 goto error_unreg_ring_funcs;
652 } 652 }
653 653
diff --git a/drivers/staging/iio/imu/adis16400_ring.c b/drivers/staging/iio/imu/adis16400_ring.c
index 33293fba9bcc..da28cb4288af 100644
--- a/drivers/staging/iio/imu/adis16400_ring.c
+++ b/drivers/staging/iio/imu/adis16400_ring.c
@@ -122,12 +122,10 @@ static int adis16400_spi_read_burst(struct device *dev, u8 *rx)
122 .tx_buf = st->tx, 122 .tx_buf = st->tx,
123 .bits_per_word = 8, 123 .bits_per_word = 8,
124 .len = 2, 124 .len = 2,
125 .cs_change = 0,
126 }, { 125 }, {
127 .rx_buf = rx, 126 .rx_buf = rx,
128 .bits_per_word = 8, 127 .bits_per_word = 8,
129 .len = 24, 128 .len = 24,
130 .cs_change = 1,
131 }, 129 },
132 }; 130 };
133 131
@@ -162,9 +160,10 @@ static void adis16400_trigger_bh_to_ring(struct work_struct *work_s)
162 work_trigger_to_ring); 160 work_trigger_to_ring);
163 struct iio_ring_buffer *ring = st->indio_dev->ring; 161 struct iio_ring_buffer *ring = st->indio_dev->ring;
164 162
165 int i = 0; 163 int i = 0, j;
166 s16 *data; 164 s16 *data;
167 size_t datasize = ring->access.get_bytes_per_datum(ring); 165 size_t datasize = ring->access.get_bytes_per_datum(ring);
166 unsigned long mask = ring->scan_mask;
168 167
169 data = kmalloc(datasize , GFP_KERNEL); 168 data = kmalloc(datasize , GFP_KERNEL);
170 if (data == NULL) { 169 if (data == NULL) {
@@ -174,9 +173,12 @@ static void adis16400_trigger_bh_to_ring(struct work_struct *work_s)
174 173
175 if (ring->scan_count) 174 if (ring->scan_count)
176 if (adis16400_spi_read_burst(&st->indio_dev->dev, st->rx) >= 0) 175 if (adis16400_spi_read_burst(&st->indio_dev->dev, st->rx) >= 0)
177 for (; i < ring->scan_count; i++) 176 for (; i < ring->scan_count; i++) {
177 j = __ffs(mask);
178 mask &= ~(1 << j);
178 data[i] = be16_to_cpup( 179 data[i] = be16_to_cpup(
179 (__be16 *)&(st->rx[i*2])); 180 (__be16 *)&(st->rx[j*2]));
181 }
180 182
181 /* Guaranteed to be aligned with 8 byte boundary */ 183 /* Guaranteed to be aligned with 8 byte boundary */
182 if (ring->scan_timestamp) 184 if (ring->scan_timestamp)
diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
index f3bf111f354f..1795ee1e8207 100644
--- a/drivers/staging/iio/industrialio-core.c
+++ b/drivers/staging/iio/industrialio-core.c
@@ -258,7 +258,7 @@ static ssize_t iio_event_chrdev_read(struct file *filep,
258 ->det_events.list)); 258 ->det_events.list));
259 if (ret) 259 if (ret)
260 goto error_ret; 260 goto error_ret;
261 /* Single access device so noone else can get the data */ 261 /* Single access device so no one else can get the data */
262 mutex_lock(&ev_int->event_list_lock); 262 mutex_lock(&ev_int->event_list_lock);
263 } 263 }
264 264
diff --git a/drivers/staging/iio/meter/ade7753.h b/drivers/staging/iio/meter/ade7753.h
index 70dabae6efe9..3b9c7f6a50e7 100644
--- a/drivers/staging/iio/meter/ade7753.h
+++ b/drivers/staging/iio/meter/ade7753.h
@@ -62,7 +62,7 @@
62 * @us: actual spi_device 62 * @us: actual spi_device
63 * @indio_dev: industrial I/O device structure 63 * @indio_dev: industrial I/O device structure
64 * @tx: transmit buffer 64 * @tx: transmit buffer
65 * @rx: recieve buffer 65 * @rx: receive buffer
66 * @buf_lock: mutex to protect tx and rx 66 * @buf_lock: mutex to protect tx and rx
67 **/ 67 **/
68struct ade7753_state { 68struct ade7753_state {
diff --git a/drivers/staging/iio/meter/ade7754.h b/drivers/staging/iio/meter/ade7754.h
index 8faa9b3b48b6..0aa0522a33a3 100644
--- a/drivers/staging/iio/meter/ade7754.h
+++ b/drivers/staging/iio/meter/ade7754.h
@@ -80,7 +80,7 @@
80 * @us: actual spi_device 80 * @us: actual spi_device
81 * @indio_dev: industrial I/O device structure 81 * @indio_dev: industrial I/O device structure
82 * @tx: transmit buffer 82 * @tx: transmit buffer
83 * @rx: recieve buffer 83 * @rx: receive buffer
84 * @buf_lock: mutex to protect tx and rx 84 * @buf_lock: mutex to protect tx and rx
85 **/ 85 **/
86struct ade7754_state { 86struct ade7754_state {
diff --git a/drivers/staging/iio/meter/ade7758.h b/drivers/staging/iio/meter/ade7758.h
index df5bb7ba5a0f..c6fd94f3b3ee 100644
--- a/drivers/staging/iio/meter/ade7758.h
+++ b/drivers/staging/iio/meter/ade7758.h
@@ -98,7 +98,7 @@
98 * @indio_dev: industrial I/O device structure 98 * @indio_dev: industrial I/O device structure
99 * @trig: data ready trigger registered with iio 99 * @trig: data ready trigger registered with iio
100 * @tx: transmit buffer 100 * @tx: transmit buffer
101 * @rx: recieve buffer 101 * @rx: receive buffer
102 * @buf_lock: mutex to protect tx and rx 102 * @buf_lock: mutex to protect tx and rx
103 **/ 103 **/
104struct ade7758_state { 104struct ade7758_state {
diff --git a/drivers/staging/iio/meter/ade7759.h b/drivers/staging/iio/meter/ade7759.h
index e9d1c43336fe..cc76c2c4c039 100644
--- a/drivers/staging/iio/meter/ade7759.h
+++ b/drivers/staging/iio/meter/ade7759.h
@@ -43,7 +43,7 @@
43 * @us: actual spi_device 43 * @us: actual spi_device
44 * @indio_dev: industrial I/O device structure 44 * @indio_dev: industrial I/O device structure
45 * @tx: transmit buffer 45 * @tx: transmit buffer
46 * @rx: recieve buffer 46 * @rx: receive buffer
47 * @buf_lock: mutex to protect tx and rx 47 * @buf_lock: mutex to protect tx and rx
48 **/ 48 **/
49struct ade7759_state { 49struct ade7759_state {
diff --git a/drivers/staging/iio/meter/ade7854.h b/drivers/staging/iio/meter/ade7854.h
index 4ad84a3bb462..79a21109f4e2 100644
--- a/drivers/staging/iio/meter/ade7854.h
+++ b/drivers/staging/iio/meter/ade7854.h
@@ -149,7 +149,7 @@
149 * @spi: actual spi_device 149 * @spi: actual spi_device
150 * @indio_dev: industrial I/O device structure 150 * @indio_dev: industrial I/O device structure
151 * @tx: transmit buffer 151 * @tx: transmit buffer
152 * @rx: recieve buffer 152 * @rx: receive buffer
153 * @buf_lock: mutex to protect tx and rx 153 * @buf_lock: mutex to protect tx and rx
154 **/ 154 **/
155struct ade7854_state { 155struct ade7854_state {
diff --git a/drivers/staging/iio/ring_generic.h b/drivers/staging/iio/ring_generic.h
index f21ac09373cf..32948e55dc81 100644
--- a/drivers/staging/iio/ring_generic.h
+++ b/drivers/staging/iio/ring_generic.h
@@ -30,7 +30,7 @@ int iio_push_ring_event(struct iio_ring_buffer *ring_buf,
30 * @event_code: event indentification code 30 * @event_code: event indentification code
31 * @timestamp: time of event 31 * @timestamp: time of event
32 * 32 *
33 * Typical usecase is to escalate a 50% ring full to 75% full if noone has yet 33 * Typical usecase is to escalate a 50% ring full to 75% full if no one has yet
34 * read the first event. Clearly the 50% full is no longer of interest in 34 * read the first event. Clearly the 50% full is no longer of interest in
35 * typical use case. 35 * typical use case.
36 **/ 36 **/
diff --git a/drivers/staging/intel_sst/TODO b/drivers/staging/intel_sst/TODO
index a24e5ed5689c..c733d7011091 100644
--- a/drivers/staging/intel_sst/TODO
+++ b/drivers/staging/intel_sst/TODO
@@ -1,7 +1,7 @@
1TODO 1TODO
2---- 2----
3 3
4Get the memrar driver cleaned up and upstream (dependancy blocking SST) 4Get the memrar driver cleaned up and upstream (dependency blocking SST)
5Replace long/short press with two virtual buttons 5Replace long/short press with two virtual buttons
6Review the printks and kill off any left over ST_ERR: messages 6Review the printks and kill off any left over ST_ERR: messages
7Review the misc device ioctls for 32/64bit safety and sanity 7Review the misc device ioctls for 32/64bit safety and sanity
diff --git a/drivers/staging/intel_sst/intel_sst.c b/drivers/staging/intel_sst/intel_sst.c
index ce4a9f79ccd2..81c24d19eb9e 100644
--- a/drivers/staging/intel_sst/intel_sst.c
+++ b/drivers/staging/intel_sst/intel_sst.c
@@ -263,7 +263,7 @@ static int __devinit intel_sst_probe(struct pci_dev *pci,
263 /* Init the device */ 263 /* Init the device */
264 ret = pci_enable_device(pci); 264 ret = pci_enable_device(pci);
265 if (ret) { 265 if (ret) {
266 pr_err("device cant be enabled\n"); 266 pr_err("device can't be enabled\n");
267 goto do_free_mem; 267 goto do_free_mem;
268 } 268 }
269 sst_drv_ctx->pci = pci_dev_get(pci); 269 sst_drv_ctx->pci = pci_dev_get(pci);
@@ -453,7 +453,7 @@ int intel_sst_resume(struct pci_dev *pci)
453 pci_restore_state(pci); 453 pci_restore_state(pci);
454 ret = pci_enable_device(pci); 454 ret = pci_enable_device(pci);
455 if (ret) 455 if (ret)
456 pr_err("device cant be enabled\n"); 456 pr_err("device can't be enabled\n");
457 457
458 mutex_lock(&sst_drv_ctx->sst_lock); 458 mutex_lock(&sst_drv_ctx->sst_lock);
459 sst_drv_ctx->sst_state = SST_UN_INIT; 459 sst_drv_ctx->sst_state = SST_UN_INIT;
diff --git a/drivers/staging/intel_sst/intel_sst_app_interface.c b/drivers/staging/intel_sst/intel_sst_app_interface.c
index a367991d5600..1d0621260ea8 100644
--- a/drivers/staging/intel_sst/intel_sst_app_interface.c
+++ b/drivers/staging/intel_sst/intel_sst_app_interface.c
@@ -236,7 +236,7 @@ int intel_sst_mmap(struct file *file_ptr, struct vm_area_struct *vma)
236 if (!sst_drv_ctx->mmap_mem) 236 if (!sst_drv_ctx->mmap_mem)
237 return -EIO; 237 return -EIO;
238 238
239 /* round it up to the page bondary */ 239 /* round it up to the page boundary */
240 /*mem_area = (void *)((((unsigned long)sst_drv_ctx->mmap_mem) 240 /*mem_area = (void *)((((unsigned long)sst_drv_ctx->mmap_mem)
241 + PAGE_SIZE - 1) & PAGE_MASK);*/ 241 + PAGE_SIZE - 1) & PAGE_MASK);*/
242 mem_area = (void *) PAGE_ALIGN((unsigned int) sst_drv_ctx->mmap_mem); 242 mem_area = (void *) PAGE_ALIGN((unsigned int) sst_drv_ctx->mmap_mem);
@@ -871,7 +871,7 @@ int sst_send_algo_ipc(struct ipc_post **msg)
871} 871}
872 872
873/** 873/**
874 * intel_sst_ioctl_dsp - recieves the device ioctl's 874 * intel_sst_ioctl_dsp - receives the device ioctl's
875 * 875 *
876 * @cmd:Ioctl cmd 876 * @cmd:Ioctl cmd
877 * @arg:data 877 * @arg:data
@@ -1067,7 +1067,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
1067 retval = -EFAULT; 1067 retval = -EFAULT;
1068 break; 1068 break;
1069 } 1069 }
1070 pr_debug("SET_VOLUME recieved for %d!\n", 1070 pr_debug("SET_VOLUME received for %d!\n",
1071 set_vol.stream_id); 1071 set_vol.stream_id);
1072 if (minor == STREAM_MODULE && set_vol.stream_id == 0) { 1072 if (minor == STREAM_MODULE && set_vol.stream_id == 0) {
1073 pr_debug("invalid operation!\n"); 1073 pr_debug("invalid operation!\n");
@@ -1085,7 +1085,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
1085 retval = -EFAULT; 1085 retval = -EFAULT;
1086 break; 1086 break;
1087 } 1087 }
1088 pr_debug("IOCTL_GET_VOLUME recieved for stream = %d!\n", 1088 pr_debug("IOCTL_GET_VOLUME received for stream = %d!\n",
1089 get_vol.stream_id); 1089 get_vol.stream_id);
1090 if (minor == STREAM_MODULE && get_vol.stream_id == 0) { 1090 if (minor == STREAM_MODULE && get_vol.stream_id == 0) {
1091 pr_debug("invalid operation!\n"); 1091 pr_debug("invalid operation!\n");
@@ -1117,7 +1117,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
1117 retval = -EFAULT; 1117 retval = -EFAULT;
1118 break; 1118 break;
1119 } 1119 }
1120 pr_debug("SNDRV_SST_SET_VOLUME recieved for %d!\n", 1120 pr_debug("SNDRV_SST_SET_VOLUME received for %d!\n",
1121 set_mute.stream_id); 1121 set_mute.stream_id);
1122 if (minor == STREAM_MODULE && set_mute.stream_id == 0) { 1122 if (minor == STREAM_MODULE && set_mute.stream_id == 0) {
1123 retval = -EPERM; 1123 retval = -EPERM;
@@ -1153,7 +1153,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
1153 case _IOC_NR(SNDRV_SST_MMAP_CAPTURE): { 1153 case _IOC_NR(SNDRV_SST_MMAP_CAPTURE): {
1154 struct snd_sst_mmap_buffs mmap_buf; 1154 struct snd_sst_mmap_buffs mmap_buf;
1155 1155
1156 pr_debug("SNDRV_SST_MMAP_PLAY/CAPTURE recieved!\n"); 1156 pr_debug("SNDRV_SST_MMAP_PLAY/CAPTURE received!\n");
1157 if (minor != STREAM_MODULE) { 1157 if (minor != STREAM_MODULE) {
1158 retval = -EBADRQC; 1158 retval = -EBADRQC;
1159 break; 1159 break;
@@ -1239,7 +1239,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
1239 case _IOC_NR(SNDRV_SST_SET_TARGET_DEVICE): { 1239 case _IOC_NR(SNDRV_SST_SET_TARGET_DEVICE): {
1240 struct snd_sst_target_device target_device; 1240 struct snd_sst_target_device target_device;
1241 1241
1242 pr_debug("SET_TARGET_DEVICE recieved!\n"); 1242 pr_debug("SET_TARGET_DEVICE received!\n");
1243 if (copy_from_user(&target_device, (void __user *)arg, 1243 if (copy_from_user(&target_device, (void __user *)arg,
1244 sizeof(target_device))) { 1244 sizeof(target_device))) {
1245 retval = -EFAULT; 1245 retval = -EFAULT;
@@ -1256,7 +1256,7 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
1256 case _IOC_NR(SNDRV_SST_DRIVER_INFO): { 1256 case _IOC_NR(SNDRV_SST_DRIVER_INFO): {
1257 struct snd_sst_driver_info info; 1257 struct snd_sst_driver_info info;
1258 1258
1259 pr_debug("SNDRV_SST_DRIVER_INFO recived\n"); 1259 pr_debug("SNDRV_SST_DRIVER_INFO received\n");
1260 info.version = SST_VERSION_NUM; 1260 info.version = SST_VERSION_NUM;
1261 /* hard coding, shud get sumhow later */ 1261 /* hard coding, shud get sumhow later */
1262 info.active_pcm_streams = sst_drv_ctx->stream_cnt - 1262 info.active_pcm_streams = sst_drv_ctx->stream_cnt -
diff --git a/drivers/staging/intel_sst/intel_sst_drv_interface.c b/drivers/staging/intel_sst/intel_sst_drv_interface.c
index ea8e251b5099..e9c182108243 100644
--- a/drivers/staging/intel_sst/intel_sst_drv_interface.c
+++ b/drivers/staging/intel_sst/intel_sst_drv_interface.c
@@ -315,7 +315,7 @@ int sst_open_pcm_stream(struct snd_sst_params *str_param)
315 pm_runtime_get_sync(&sst_drv_ctx->pci->dev); 315 pm_runtime_get_sync(&sst_drv_ctx->pci->dev);
316 316
317 if (sst_drv_ctx->sst_state == SST_SUSPENDED) { 317 if (sst_drv_ctx->sst_state == SST_SUSPENDED) {
318 /* LPE is suspended, resume it before proceding*/ 318 /* LPE is suspended, resume it before proceeding*/
319 pr_debug("Resuming from Suspended state\n"); 319 pr_debug("Resuming from Suspended state\n");
320 retval = intel_sst_resume(sst_drv_ctx->pci); 320 retval = intel_sst_resume(sst_drv_ctx->pci);
321 if (retval) { 321 if (retval) {
diff --git a/drivers/staging/intel_sst/intel_sst_dsp.c b/drivers/staging/intel_sst/intel_sst_dsp.c
index 6e5c9152da9f..bffe4c6e2928 100644
--- a/drivers/staging/intel_sst/intel_sst_dsp.c
+++ b/drivers/staging/intel_sst/intel_sst_dsp.c
@@ -350,7 +350,7 @@ static int sst_download_library(const struct firmware *fw_lib,
350 350
351} 351}
352 352
353/* This function is called befoer downloading the codec/postprocessing 353/* This function is called before downloading the codec/postprocessing
354library is set for download to SST DSP*/ 354library is set for download to SST DSP*/
355static int sst_validate_library(const struct firmware *fw_lib, 355static int sst_validate_library(const struct firmware *fw_lib,
356 struct lib_slot_info *slot, 356 struct lib_slot_info *slot,
@@ -405,7 +405,7 @@ exit:
405 405
406} 406}
407 407
408/* This function is called when FW requests for a particular libary download 408/* This function is called when FW requests for a particular library download
409This function prepares the library to download*/ 409This function prepares the library to download*/
410int sst_load_library(struct snd_sst_lib_download *lib, u8 ops) 410int sst_load_library(struct snd_sst_lib_download *lib, u8 ops)
411{ 411{
diff --git a/drivers/staging/intel_sst/intel_sst_fw_ipc.h b/drivers/staging/intel_sst/intel_sst_fw_ipc.h
index 8df313d10d2a..0f0c5bbc5f4b 100644
--- a/drivers/staging/intel_sst/intel_sst_fw_ipc.h
+++ b/drivers/staging/intel_sst/intel_sst_fw_ipc.h
@@ -111,7 +111,7 @@
111#define IPC_SST_PERIOD_ELAPSED 0x97 /* period elapsed */ 111#define IPC_SST_PERIOD_ELAPSED 0x97 /* period elapsed */
112#define IPC_IA_TARGET_DEV_CHNGD 0x98 /* error in processing a stream */ 112#define IPC_IA_TARGET_DEV_CHNGD 0x98 /* error in processing a stream */
113 113
114#define IPC_SST_ERROR_EVENT 0x99 /* Buffer over run occured */ 114#define IPC_SST_ERROR_EVENT 0x99 /* Buffer over run occurred */
115/* L2S messages */ 115/* L2S messages */
116#define IPC_SC_DDR_LINK_UP 0xC0 116#define IPC_SC_DDR_LINK_UP 0xC0
117#define IPC_SC_DDR_LINK_DOWN 0xC1 117#define IPC_SC_DDR_LINK_DOWN 0xC1
diff --git a/drivers/staging/intel_sst/intel_sst_stream.c b/drivers/staging/intel_sst/intel_sst_stream.c
index 795e42ab7360..dd58be5b1975 100644
--- a/drivers/staging/intel_sst/intel_sst_stream.c
+++ b/drivers/staging/intel_sst/intel_sst_stream.c
@@ -98,7 +98,7 @@ static unsigned int get_mrst_stream_id(void)
98 if (sst_drv_ctx->streams[i].status == STREAM_UN_INIT) 98 if (sst_drv_ctx->streams[i].status == STREAM_UN_INIT)
99 return i; 99 return i;
100 } 100 }
101 pr_debug("Didnt find empty stream for mrst\n"); 101 pr_debug("Didn't find empty stream for mrst\n");
102 return -EBUSY; 102 return -EBUSY;
103} 103}
104 104
diff --git a/drivers/staging/intel_sst/intel_sst_stream_encoded.c b/drivers/staging/intel_sst/intel_sst_stream_encoded.c
index 29753c7519a7..d5f07b878828 100644
--- a/drivers/staging/intel_sst/intel_sst_stream_encoded.c
+++ b/drivers/staging/intel_sst/intel_sst_stream_encoded.c
@@ -914,7 +914,7 @@ static int sst_prepare_input_buffers_rar(struct stream_info *str_info,
914 (void *) ((unsigned long) rar_buffers.bus_address); 914 (void *) ((unsigned long) rar_buffers.bus_address);
915 pr_debug("RAR buf addr in DnR (input buffer function)0x%lu", 915 pr_debug("RAR buf addr in DnR (input buffer function)0x%lu",
916 (unsigned long) str_info->decode_ibuf); 916 (unsigned long) str_info->decode_ibuf);
917 pr_debug("rar in DnR decode funtion/output b_add rar =0x%lu", 917 pr_debug("rar in DnR decode function/output b_add rar =0x%lu",
918 (unsigned long) rar_buffers.bus_address); 918 (unsigned long) rar_buffers.bus_address);
919 *input_index = i + 1; 919 *input_index = i + 1;
920 str_info->decode_isize = dbufs->ibufs->buff_entry[i].size; 920 str_info->decode_isize = dbufs->ibufs->buff_entry[i].size;
diff --git a/drivers/staging/intel_sst/intelmid.c b/drivers/staging/intel_sst/intelmid.c
index fb2292186703..d207636a7b6d 100644
--- a/drivers/staging/intel_sst/intelmid.c
+++ b/drivers/staging/intel_sst/intelmid.c
@@ -773,7 +773,7 @@ static int __devinit snd_intelmad_sst_register(
773 if (ret_val) 773 if (ret_val)
774 return ret_val; 774 return ret_val;
775 sst_card_vendor_id = (vendor_addr.value & (MASK2|MASK1|MASK0)); 775 sst_card_vendor_id = (vendor_addr.value & (MASK2|MASK1|MASK0));
776 pr_debug("orginal n extrated vendor id = 0x%x %d\n", 776 pr_debug("original n extrated vendor id = 0x%x %d\n",
777 vendor_addr.value, sst_card_vendor_id); 777 vendor_addr.value, sst_card_vendor_id);
778 if (sst_card_vendor_id < 0 || sst_card_vendor_id > 2) { 778 if (sst_card_vendor_id < 0 || sst_card_vendor_id > 2) {
779 pr_err("vendor card not supported!!\n"); 779 pr_err("vendor card not supported!!\n");
diff --git a/drivers/staging/intel_sst/intelmid.h b/drivers/staging/intel_sst/intelmid.h
index ca881b790cb2..e77da87e1df0 100644
--- a/drivers/staging/intel_sst/intelmid.h
+++ b/drivers/staging/intel_sst/intelmid.h
@@ -90,7 +90,7 @@ struct mad_jack_msg_wq {
90 * @card_index: sound card index 90 * @card_index: sound card index
91 * @card_id: sound card id detected 91 * @card_id: sound card id detected
92 * @sstdrv_ops: ptr to sst driver ops 92 * @sstdrv_ops: ptr to sst driver ops
93 * @pdev: ptr to platfrom device 93 * @pdev: ptr to platform device
94 * @irq: interrupt number detected 94 * @irq: interrupt number detected
95 * @pmic_status: Device status of sound card 95 * @pmic_status: Device status of sound card
96 * @int_base: ptr to MMIO interrupt region 96 * @int_base: ptr to MMIO interrupt region
diff --git a/drivers/staging/keucr/init.c b/drivers/staging/keucr/init.c
index 5c01f28f0734..8af7c84daee2 100644
--- a/drivers/staging/keucr/init.c
+++ b/drivers/staging/keucr/init.c
@@ -90,7 +90,7 @@ int ENE_MSInit(struct us_data *us)
90 90
91 result = ENE_SendScsiCmd(us, FDIR_READ, &buf, 0); 91 result = ENE_SendScsiCmd(us, FDIR_READ, &buf, 0);
92 if (result != USB_STOR_XFER_GOOD) { 92 if (result != USB_STOR_XFER_GOOD) {
93 printk(KERN_ERR "Exection MS Init Code Fail !!\n"); 93 printk(KERN_ERR "Execution MS Init Code Fail !!\n");
94 return USB_STOR_TRANSPORT_ERROR; 94 return USB_STOR_TRANSPORT_ERROR;
95 } 95 }
96 96
@@ -145,7 +145,7 @@ int ENE_SMInit(struct us_data *us)
145 result = ENE_SendScsiCmd(us, FDIR_READ, &buf, 0); 145 result = ENE_SendScsiCmd(us, FDIR_READ, &buf, 0);
146 if (result != USB_STOR_XFER_GOOD) { 146 if (result != USB_STOR_XFER_GOOD) {
147 printk(KERN_ERR 147 printk(KERN_ERR
148 "Exection SM Init Code Fail !! result = %x\n", result); 148 "Execution SM Init Code Fail !! result = %x\n", result);
149 return USB_STOR_TRANSPORT_ERROR; 149 return USB_STOR_TRANSPORT_ERROR;
150 } 150 }
151 151
diff --git a/drivers/staging/keucr/smilmain.c b/drivers/staging/keucr/smilmain.c
index 2cbe9f897eef..95c688a5c95a 100644
--- a/drivers/staging/keucr/smilmain.c
+++ b/drivers/staging/keucr/smilmain.c
@@ -64,7 +64,7 @@ extern struct SSFDCTYPE Ssfdc;
64extern struct ADDRESS Media; 64extern struct ADDRESS Media;
65extern struct CIS_AREA CisArea; 65extern struct CIS_AREA CisArea;
66 66
67//BIT Controll Macro 67//BIT Control Macro
68BYTE BitData[] = { 0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80 } ; 68BYTE BitData[] = { 0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80 } ;
69#define Set_D_Bit(a,b) (a[(BYTE)((b)/8)]|= BitData[(b)%8]) 69#define Set_D_Bit(a,b) (a[(BYTE)((b)/8)]|= BitData[(b)%8])
70#define Clr_D_Bit(a,b) (a[(BYTE)((b)/8)]&=~BitData[(b)%8]) 70#define Clr_D_Bit(a,b) (a[(BYTE)((b)/8)]&=~BitData[(b)%8])
@@ -76,7 +76,7 @@ extern BYTE IsXDCompliance;
76 76
77 77
78// 78//
79////Power Controll & Media Exist Check Function 79////Power Control & Media Exist Check Function
80////----- Init_D_SmartMedia() -------------------------------------------- 80////----- Init_D_SmartMedia() --------------------------------------------
81//int Init_D_SmartMedia(void) 81//int Init_D_SmartMedia(void)
82//{ 82//{
@@ -575,7 +575,7 @@ int Media_D_OneSectWriteFlush(PFDO_DEVICE_EXTENSION fdoExt)
575// return(SUCCESS); 575// return(SUCCESS);
576//} 576//}
577// 577//
578////Power Controll & Media Exist Check Subroutine 578////Power Control & Media Exist Check Subroutine
579////----- Initialize_D_Media() ------------------------------------------- 579////----- Initialize_D_Media() -------------------------------------------
580//void Initialize_D_Media(void) 580//void Initialize_D_Media(void)
581//{ 581//{
@@ -738,7 +738,7 @@ int Check_D_MediaFmt(struct us_data *us)
738// return(SUCCESS); 738// return(SUCCESS);
739//} 739//}
740*/ 740*/
741//SmartMedia Physical Address Controll Subroutine 741//SmartMedia Physical Address Control Subroutine
742//----- Conv_D_MediaAddr() --------------------------------------------- 742//----- Conv_D_MediaAddr() ---------------------------------------------
743int Conv_D_MediaAddr(struct us_data *us, DWORD addr) 743int Conv_D_MediaAddr(struct us_data *us, DWORD addr)
744{ 744{
diff --git a/drivers/staging/keucr/smilsub.c b/drivers/staging/keucr/smilsub.c
index 80da61c37bff..4fe47422eb79 100644
--- a/drivers/staging/keucr/smilsub.c
+++ b/drivers/staging/keucr/smilsub.c
@@ -57,7 +57,7 @@ extern WORD WriteBlock;
57#define ODD 1 // Odd Page for 256byte/page 57#define ODD 1 // Odd Page for 256byte/page
58 58
59 59
60//SmartMedia Redundant buffer data Controll Subroutine 60//SmartMedia Redundant buffer data Control Subroutine
61//----- Check_D_DataBlank() -------------------------------------------- 61//----- Check_D_DataBlank() --------------------------------------------
62int Check_D_DataBlank(BYTE *redundant) 62int Check_D_DataBlank(BYTE *redundant)
63{ 63{
@@ -1367,7 +1367,7 @@ BYTE _Check_D_DevCode(BYTE dcode)
1367 } 1367 }
1368} 1368}
1369/* 1369/*
1370////SmartMedia Power Controll Subroutine 1370////SmartMedia Power Control Subroutine
1371////----- Cnt_D_Reset() ---------------------------------------------- 1371////----- Cnt_D_Reset() ----------------------------------------------
1372//void Cnt_D_Reset(void) 1372//void Cnt_D_Reset(void)
1373//{ 1373//{
@@ -1478,7 +1478,7 @@ BYTE _Check_D_DevCode(BYTE dcode)
1478//} 1478//}
1479// 1479//
1480*/ 1480*/
1481//SmartMedia ECC Controll Subroutine 1481//SmartMedia ECC Control Subroutine
1482//----- Check_D_ReadError() ---------------------------------------------- 1482//----- Check_D_ReadError() ----------------------------------------------
1483int Check_D_ReadError(BYTE *redundant) 1483int Check_D_ReadError(BYTE *redundant)
1484{ 1484{
diff --git a/drivers/staging/lirc/lirc_ene0100.h b/drivers/staging/lirc/lirc_ene0100.h
index 776b693bb307..06bebd6acc46 100644
--- a/drivers/staging/lirc/lirc_ene0100.h
+++ b/drivers/staging/lirc/lirc_ene0100.h
@@ -81,7 +81,7 @@
81 81
82/* CIR block settings */ 82/* CIR block settings */
83#define ENE_CIR_CONF1 0xFEC0 83#define ENE_CIR_CONF1 0xFEC0
84#define ENE_CIR_CONF1_ADC_ON 0x7 /* reciever on gpio40 enabled */ 84#define ENE_CIR_CONF1_ADC_ON 0x7 /* receiver on gpio40 enabled */
85#define ENE_CIR_CONF1_LEARN1 (1 << 3) /* enabled on learning mode */ 85#define ENE_CIR_CONF1_LEARN1 (1 << 3) /* enabled on learning mode */
86#define ENE_CIR_CONF1_TX_ON 0x30 /* enabled on transmit */ 86#define ENE_CIR_CONF1_TX_ON 0x30 /* enabled on transmit */
87#define ENE_CIR_CONF1_TX_CARR (1 << 7) /* send TX carrier or not */ 87#define ENE_CIR_CONF1_TX_CARR (1 << 7) /* send TX carrier or not */
@@ -96,7 +96,7 @@
96 96
97/* transmitter - not implemented yet */ 97/* transmitter - not implemented yet */
98/* KB3926C and higher */ 98/* KB3926C and higher */
99/* transmission is very similiar to recieving, a byte is written to */ 99/* transmission is very similar to receiving, a byte is written to */
100/* ENE_TX_INPUT, in same manner as it is read from sample buffer */ 100/* ENE_TX_INPUT, in same manner as it is read from sample buffer */
101/* sample period is fixed*/ 101/* sample period is fixed*/
102 102
diff --git a/drivers/staging/memrar/Kconfig b/drivers/staging/memrar/Kconfig
deleted file mode 100644
index cbeebc550904..000000000000
--- a/drivers/staging/memrar/Kconfig
+++ /dev/null
@@ -1,15 +0,0 @@
1config MRST_RAR_HANDLER
2 tristate "RAR handler driver for Intel Moorestown platform"
3 depends on RAR_REGISTER
4 ---help---
5 This driver provides a memory management interface to
6 restricted access regions (RAR) available on the Intel
7 Moorestown platform.
8
9 Once locked down, restricted access regions are only
10 accessible by specific hardware on the platform. The x86
11 CPU is typically not one of those platforms. As such this
12 driver does not access RAR, and only provides a buffer
13 allocation/bookkeeping mechanism.
14
15 If unsure, say N.
diff --git a/drivers/staging/memrar/Makefile b/drivers/staging/memrar/Makefile
deleted file mode 100644
index a3336c00cc5f..000000000000
--- a/drivers/staging/memrar/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
1obj-$(CONFIG_MRST_RAR_HANDLER) += memrar.o
2memrar-y := memrar_allocator.o memrar_handler.o
diff --git a/drivers/staging/memrar/TODO b/drivers/staging/memrar/TODO
deleted file mode 100644
index 435e09ba44c5..000000000000
--- a/drivers/staging/memrar/TODO
+++ /dev/null
@@ -1,43 +0,0 @@
1RAR Handler (memrar) Driver TODO Items
2======================================
3
4Maintainer: Eugene Epshteyn <eugene.epshteyn@intel.com>
5
6memrar.h
7--------
81. This header exposes the driver's user space and kernel space
9 interfaces. It should be moved to <linux/rar/memrar.h>, or
10 something along those lines, when this memrar driver is moved out
11 of `staging'.
12 a. It would be ideal if staging/rar_register/rar_register.h was
13 moved to the same directory.
14
15memrar_allocator.[ch]
16---------------------
171. Address potential fragmentation issues with the memrar_allocator.
18
192. Hide struct memrar_allocator details/fields. They need not be
20 exposed to the user.
21 a. Forward declare struct memrar_allocator.
22 b. Move all three struct definitions to `memrar_allocator.c'
23 source file.
24 c. Add a memrar_allocator_largest_free_area() function, or
25 something like that to get access to the value of the struct
26 memrar_allocator "largest_free_area" field. This allows the
27 struct memrar_allocator fields to be completely hidden from
28 the user. The memrar_handler code really only needs this for
29 statistic gathering on-demand.
30 d. Do the same for the "capacity" field as the
31 "largest_free_area" field.
32
333. Move memrar_allocator.* to kernel `lib' directory since it is HW
34 neutral.
35 a. Alternatively, use lib/genalloc.c instead.
36 b. A kernel port of Doug Lea's malloc() implementation may also
37 be an option.
38
39memrar_handler.c
40----------------
411. Split user space interface (ioctl code) from core/kernel code,
42 e.g.:
43 memrar_handler.c -> memrar_core.c, memrar_user.c
diff --git a/drivers/staging/memrar/memrar-abi b/drivers/staging/memrar/memrar-abi
deleted file mode 100644
index c23fc996a435..000000000000
--- a/drivers/staging/memrar/memrar-abi
+++ /dev/null
@@ -1,89 +0,0 @@
1What: /dev/memrar
2Date: March 2010
3KernelVersion: 2.6.34
4Contact: Eugene Epshteyn <eugene.epshteyn@intel.com>
5Description: The Intel Moorestown Restricted Access Region (RAR)
6 Handler driver exposes an ioctl() based interface that
7 allows a user to reserve and release blocks of RAR
8 memory.
9
10 Note: A sysfs based one was not appropriate for the
11 RAR handler's usage model.
12
13 =========================================================
14 ioctl() Requests
15 =========================================================
16 RAR_HANDLER_RESERVE
17 -------------------
18 Description: Reserve RAR block.
19 Type: struct RAR_block_info
20 Direction: in/out
21 Errors: EINVAL (invalid RAR type or size)
22 ENOMEM (not enough RAR memory)
23
24 RAR_HANDLER_STAT
25 ----------------
26 Description: Get RAR statistics.
27 Type: struct RAR_stat
28 Direction: in/out
29 Errors: EINVAL (invalid RAR type)
30
31 RAR_HANDLER_RELEASE
32 -------------------
33 Description: Release previously reserved RAR block.
34 Type: 32 bit unsigned integer
35 (e.g. uint32_t), i.e the RAR "handle".
36 Direction: in
37 Errors: EINVAL (invalid RAR handle)
38
39
40 =========================================================
41 ioctl() Request Parameter Types
42 =========================================================
43 The structures referred to above are defined as
44 follows:
45
46 /**
47 * struct RAR_block_info - user space struct that
48 * describes RAR buffer
49 * @type: Type of RAR memory (e.g.,
50 * RAR_TYPE_VIDEO or RAR_TYPE_AUDIO) [in]
51 * @size: Requested size of a block in bytes to
52 * be reserved in RAR. [in]
53 * @handle: Handle that can be used to refer to
54 * reserved block. [out]
55 *
56 * This is the basic structure exposed to the user
57 * space that describes a given RAR buffer. It used
58 * as the parameter for the RAR_HANDLER_RESERVE ioctl.
59 * The buffer's underlying bus address is not exposed
60 * to the user. User space code refers to the buffer
61 * entirely by "handle".
62 */
63 struct RAR_block_info {
64 __u32 type;
65 __u32 size;
66 __u32 handle;
67 };
68
69 /**
70 * struct RAR_stat - RAR statistics structure
71 * @type: Type of RAR memory (e.g.,
72 * RAR_TYPE_VIDEO or
73 * RAR_TYPE_AUDIO) [in]
74 * @capacity: Total size of RAR memory
75 * region. [out]
76 * @largest_block_size: Size of the largest reservable
77 * block. [out]
78 *
79 * This structure is used for RAR_HANDLER_STAT ioctl.
80 */
81 struct RAR_stat {
82 __u32 type;
83 __u32 capacity;
84 __u32 largest_block_size;
85 };
86
87 Lastly, the RAR_HANDLER_RELEASE ioctl expects a
88 "handle" to the RAR block of memory. It is a 32 bit
89 unsigned integer.
diff --git a/drivers/staging/memrar/memrar.h b/drivers/staging/memrar/memrar.h
deleted file mode 100644
index 0feb73b94c91..000000000000
--- a/drivers/staging/memrar/memrar.h
+++ /dev/null
@@ -1,174 +0,0 @@
1/*
2 * RAR Handler (/dev/memrar) internal driver API.
3 * Copyright (C) 2010 Intel Corporation. All rights reserved.
4 *
5 * This program is free software; you can redistribute it and/or
6 * modify it under the terms of version 2 of the GNU General
7 * Public License as published by the Free Software Foundation.
8 *
9 * This program is distributed in the hope that it will be
10 * useful, but WITHOUT ANY WARRANTY; without even the implied
11 * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
12 * PURPOSE. See the GNU General Public License for more details.
13 * You should have received a copy of the GNU General Public
14 * License along with this program; if not, write to the Free
15 * Software Foundation, Inc., 59 Temple Place - Suite 330,
16 * Boston, MA 02111-1307, USA.
17 * The full GNU General Public License is included in this
18 * distribution in the file called COPYING.
19 */
20
21
22#ifndef _MEMRAR_H
23#define _MEMRAR_H
24
25#include <linux/ioctl.h>
26#include <linux/types.h>
27
28
29/**
30 * struct RAR_stat - RAR statistics structure
31 * @type: Type of RAR memory (e.g., audio vs. video)
32 * @capacity: Total size of RAR memory region.
33 * @largest_block_size: Size of the largest reservable block.
34 *
35 * This structure is used for RAR_HANDLER_STAT ioctl and for the
36 * RAR_get_stat() user space wrapper function.
37 */
38struct RAR_stat {
39 __u32 type;
40 __u32 capacity;
41 __u32 largest_block_size;
42};
43
44
45/**
46 * struct RAR_block_info - user space struct that describes RAR buffer
47 * @type: Type of RAR memory (e.g., audio vs. video)
48 * @size: Requested size of a block to be reserved in RAR.
49 * @handle: Handle that can be used to refer to reserved block.
50 *
51 * This is the basic structure exposed to the user space that
52 * describes a given RAR buffer. The buffer's underlying bus address
53 * is not exposed to the user. User space code refers to the buffer
54 * entirely by "handle".
55 */
56struct RAR_block_info {
57 __u32 type;
58 __u32 size;
59 __u32 handle;
60};
61
62
63#define RAR_IOCTL_BASE 0xE0
64
65/* Reserve RAR block. */
66#define RAR_HANDLER_RESERVE _IOWR(RAR_IOCTL_BASE, 0x00, struct RAR_block_info)
67
68/* Release previously reserved RAR block. */
69#define RAR_HANDLER_RELEASE _IOW(RAR_IOCTL_BASE, 0x01, __u32)
70
71/* Get RAR stats. */
72#define RAR_HANDLER_STAT _IOWR(RAR_IOCTL_BASE, 0x02, struct RAR_stat)
73
74
75#ifdef __KERNEL__
76
77/* -------------------------------------------------------------- */
78/* Kernel Side RAR Handler Interface */
79/* -------------------------------------------------------------- */
80
81/**
82 * struct RAR_buffer - kernel space struct that describes RAR buffer
83 * @info: structure containing base RAR buffer information
84 * @bus_address: buffer bus address
85 *
86 * Structure that contains all information related to a given block of
87 * memory in RAR. It is generally only used when retrieving RAR
88 * related bus addresses.
89 *
90 * Note: This structure is used only by RAR-enabled drivers, and is
91 * not intended to be exposed to the user space.
92 */
93struct RAR_buffer {
94 struct RAR_block_info info;
95 dma_addr_t bus_address;
96};
97
98#if defined(CONFIG_MRST_RAR_HANDLER)
99/**
100 * rar_reserve() - reserve RAR buffers
101 * @buffers: array of RAR_buffers where type and size of buffers to
102 * reserve are passed in, handle and bus address are
103 * passed out
104 * @count: number of RAR_buffers in the "buffers" array
105 *
106 * This function will reserve buffers in the restricted access regions
107 * of given types.
108 *
109 * It returns the number of successfully reserved buffers. Successful
110 * buffer reservations will have the corresponding bus_address field
111 * set to a non-zero value in the given buffers vector.
112 */
113extern size_t rar_reserve(struct RAR_buffer *buffers,
114 size_t count);
115
116/**
117 * rar_release() - release RAR buffers
118 * @buffers: array of RAR_buffers where handles to buffers to be
119 * released are passed in
120 * @count: number of RAR_buffers in the "buffers" array
121 *
122 * This function will release RAR buffers that were retrieved through
123 * a call to rar_reserve() or rar_handle_to_bus() by decrementing the
124 * reference count. The RAR buffer will be reclaimed when the
125 * reference count drops to zero.
126 *
127 * It returns the number of successfully released buffers. Successful
128 * releases will have their handle field set to zero in the given
129 * buffers vector.
130 */
131extern size_t rar_release(struct RAR_buffer *buffers,
132 size_t count);
133
134/**
135 * rar_handle_to_bus() - convert a vector of RAR handles to bus addresses
136 * @buffers: array of RAR_buffers containing handles to be
137 * converted to bus_addresses
138 * @count: number of RAR_buffers in the "buffers" array
139
140 * This function will retrieve the RAR buffer bus addresses, type and
141 * size corresponding to the RAR handles provided in the buffers
142 * vector.
143 *
144 * It returns the number of successfully converted buffers. The bus
145 * address will be set to 0 for unrecognized handles.
146 *
147 * The reference count for each corresponding buffer in RAR will be
148 * incremented. Call rar_release() when done with the buffers.
149 */
150extern size_t rar_handle_to_bus(struct RAR_buffer *buffers,
151 size_t count);
152
153#else
154
155extern inline size_t rar_reserve(struct RAR_buffer *buffers, size_t count)
156{
157 return 0;
158}
159
160extern inline size_t rar_release(struct RAR_buffer *buffers, size_t count)
161{
162 return 0;
163}
164
165extern inline size_t rar_handle_to_bus(struct RAR_buffer *buffers,
166 size_t count)
167{
168 return 0;
169}
170
171#endif /* MRST_RAR_HANDLER */
172#endif /* __KERNEL__ */
173
174#endif /* _MEMRAR_H */
diff --git a/drivers/staging/memrar/memrar_allocator.c b/drivers/staging/memrar/memrar_allocator.c
deleted file mode 100644
index a4f8c5846a00..000000000000
--- a/drivers/staging/memrar/memrar_allocator.c
+++ /dev/null
@@ -1,432 +0,0 @@
1/*
2 * memrar_allocator 1.0: An allocator for Intel RAR.
3 *
4 * Copyright (C) 2010 Intel Corporation. All rights reserved.
5 *
6 * This program is free software; you can redistribute it and/or
7 * modify it under the terms of version 2 of the GNU General
8 * Public License as published by the Free Software Foundation.
9 *
10 * This program is distributed in the hope that it will be
11 * useful, but WITHOUT ANY WARRANTY; without even the implied
12 * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
13 * PURPOSE. See the GNU General Public License for more details.
14 * You should have received a copy of the GNU General Public
15 * License along with this program; if not, write to the Free
16 * Software Foundation, Inc., 59 Temple Place - Suite 330,
17 * Boston, MA 02111-1307, USA.
18 * The full GNU General Public License is included in this
19 * distribution in the file called COPYING.
20 *
21 *
22 * ------------------------------------------------------------------
23 *
24 * This simple allocator implementation provides a
25 * malloc()/free()-like interface for reserving space within a
26 * previously reserved block of memory. It is not specific to
27 * any hardware, nor is it coupled with the lower level paging
28 * mechanism.
29 *
30 * The primary goal of this implementation is to provide a means
31 * to partition an arbitrary block of memory without actually
32 * accessing the memory or incurring any hardware side-effects
33 * (e.g. paging). It is, in effect, a bookkeeping mechanism for
34 * buffers.
35 */
36
37
38#include "memrar_allocator.h"
39#include <linux/slab.h>
40#include <linux/bug.h>
41#include <linux/kernel.h>
42
43
44struct memrar_allocator *memrar_create_allocator(unsigned long base,
45 size_t capacity,
46 size_t block_size)
47{
48 struct memrar_allocator *allocator = NULL;
49 struct memrar_address_ranges *first_node = NULL;
50
51 /*
52 * Make sure the base address is aligned on a block_size
53 * boundary.
54 *
55 * @todo Is this necessary?
56 */
57 /* base = ALIGN(base, block_size); */
58
59 /* Validate parameters.
60 *
61 * Make sure we can allocate the entire memory space. Zero
62 * capacity or block size are obviously invalid.
63 */
64 if (base == 0
65 || capacity == 0
66 || block_size == 0
67 || ULONG_MAX - capacity < base
68 || capacity < block_size)
69 return allocator;
70
71 /*
72 * There isn't much point in creating a memory allocator that
73 * is only capable of holding one block but we'll allow it,
74 * and issue a diagnostic.
75 */
76 WARN(capacity < block_size * 2,
77 "memrar: Only one block available to allocator.\n");
78
79 allocator = kmalloc(sizeof(*allocator), GFP_KERNEL);
80
81 if (allocator == NULL)
82 return allocator;
83
84 mutex_init(&allocator->lock);
85 allocator->base = base;
86
87 /* Round the capacity down to a multiple of block_size. */
88 allocator->capacity = (capacity / block_size) * block_size;
89
90 allocator->block_size = block_size;
91
92 allocator->largest_free_area = allocator->capacity;
93
94 /* Initialize the handle and free lists. */
95 INIT_LIST_HEAD(&allocator->allocated_list.list);
96 INIT_LIST_HEAD(&allocator->free_list.list);
97
98 first_node = kmalloc(sizeof(*first_node), GFP_KERNEL);
99 if (first_node == NULL) {
100 kfree(allocator);
101 allocator = NULL;
102 } else {
103 /* Full range of blocks is available. */
104 first_node->range.begin = base;
105 first_node->range.end = base + allocator->capacity;
106 list_add(&first_node->list,
107 &allocator->free_list.list);
108 }
109
110 return allocator;
111}
112
113void memrar_destroy_allocator(struct memrar_allocator *allocator)
114{
115 /*
116 * Assume that the memory allocator lock isn't held at this
117 * point in time. Caller must ensure that.
118 */
119
120 struct memrar_address_ranges *pos = NULL;
121 struct memrar_address_ranges *n = NULL;
122
123 if (allocator == NULL)
124 return;
125
126 mutex_lock(&allocator->lock);
127
128 /* Reclaim free list resources. */
129 list_for_each_entry_safe(pos,
130 n,
131 &allocator->free_list.list,
132 list) {
133 list_del(&pos->list);
134 kfree(pos);
135 }
136
137 mutex_unlock(&allocator->lock);
138
139 kfree(allocator);
140}
141
142unsigned long memrar_allocator_alloc(struct memrar_allocator *allocator,
143 size_t size)
144{
145 struct memrar_address_ranges *pos = NULL;
146
147 size_t num_blocks;
148 unsigned long reserved_bytes;
149
150 /*
151 * Address of allocated buffer. We assume that zero is not a
152 * valid address.
153 */
154 unsigned long addr = 0;
155
156 if (allocator == NULL || size == 0)
157 return addr;
158
159 /* Reserve enough blocks to hold the amount of bytes requested. */
160 num_blocks = DIV_ROUND_UP(size, allocator->block_size);
161
162 reserved_bytes = num_blocks * allocator->block_size;
163
164 mutex_lock(&allocator->lock);
165
166 if (reserved_bytes > allocator->largest_free_area) {
167 mutex_unlock(&allocator->lock);
168 return addr;
169 }
170
171 /*
172 * Iterate through the free list to find a suitably sized
173 * range of free contiguous memory blocks.
174 *
175 * We also take the opportunity to reset the size of the
176 * largest free area size statistic.
177 */
178 list_for_each_entry(pos, &allocator->free_list.list, list) {
179 struct memrar_address_range * const fr = &pos->range;
180 size_t const curr_size = fr->end - fr->begin;
181
182 if (curr_size >= reserved_bytes && addr == 0) {
183 struct memrar_address_range *range = NULL;
184 struct memrar_address_ranges * const new_node =
185 kmalloc(sizeof(*new_node), GFP_KERNEL);
186
187 if (new_node == NULL)
188 break;
189
190 list_add(&new_node->list,
191 &allocator->allocated_list.list);
192
193 /*
194 * Carve out area of memory from end of free
195 * range.
196 */
197 range = &new_node->range;
198 range->end = fr->end;
199 fr->end -= reserved_bytes;
200 range->begin = fr->end;
201 addr = range->begin;
202
203 /*
204 * Check if largest area has decreased in
205 * size. We'll need to continue scanning for
206 * the next largest area if it has.
207 */
208 if (curr_size == allocator->largest_free_area)
209 allocator->largest_free_area -=
210 reserved_bytes;
211 else
212 break;
213 }
214
215 /*
216 * Reset largest free area size statistic as needed,
217 * but only if we've actually allocated memory.
218 */
219 if (addr != 0
220 && curr_size > allocator->largest_free_area) {
221 allocator->largest_free_area = curr_size;
222 break;
223 }
224 }
225
226 mutex_unlock(&allocator->lock);
227
228 return addr;
229}
230
231long memrar_allocator_free(struct memrar_allocator *allocator,
232 unsigned long addr)
233{
234 struct list_head *pos = NULL;
235 struct list_head *tmp = NULL;
236 struct list_head *dst = NULL;
237
238 struct memrar_address_ranges *allocated = NULL;
239 struct memrar_address_range const *handle = NULL;
240
241 unsigned long old_end = 0;
242 unsigned long new_chunk_size = 0;
243
244 if (allocator == NULL)
245 return -EINVAL;
246
247 if (addr == 0)
248 return 0; /* Ignore "free(0)". */
249
250 mutex_lock(&allocator->lock);
251
252 /* Find the corresponding handle. */
253 list_for_each_entry(allocated,
254 &allocator->allocated_list.list,
255 list) {
256 if (allocated->range.begin == addr) {
257 handle = &allocated->range;
258 break;
259 }
260 }
261
262 /* No such buffer created by this allocator. */
263 if (handle == NULL) {
264 mutex_unlock(&allocator->lock);
265 return -EFAULT;
266 }
267
268 /*
269 * Coalesce adjacent chunks of memory if possible.
270 *
271 * @note This isn't full blown coalescing since we're only
272 * coalescing at most three chunks of memory.
273 */
274 list_for_each_safe(pos, tmp, &allocator->free_list.list) {
275 /* @todo O(n) performance. Optimize. */
276
277 struct memrar_address_range * const chunk =
278 &list_entry(pos,
279 struct memrar_address_ranges,
280 list)->range;
281
282 /* Extend size of existing free adjacent chunk. */
283 if (chunk->end == handle->begin) {
284 /*
285 * Chunk "less than" than the one we're
286 * freeing is adjacent.
287 *
288 * Before:
289 *
290 * +-----+------+
291 * |chunk|handle|
292 * +-----+------+
293 *
294 * After:
295 *
296 * +------------+
297 * | chunk |
298 * +------------+
299 */
300
301 struct memrar_address_ranges const * const next =
302 list_entry(pos->next,
303 struct memrar_address_ranges,
304 list);
305
306 chunk->end = handle->end;
307
308 /*
309 * Now check if next free chunk is adjacent to
310 * the current extended free chunk.
311 *
312 * Before:
313 *
314 * +------------+----+
315 * | chunk |next|
316 * +------------+----+
317 *
318 * After:
319 *
320 * +-----------------+
321 * | chunk |
322 * +-----------------+
323 */
324 if (!list_is_singular(pos)
325 && chunk->end == next->range.begin) {
326 chunk->end = next->range.end;
327 list_del(pos->next);
328 kfree(next);
329 }
330
331 list_del(&allocated->list);
332
333 new_chunk_size = chunk->end - chunk->begin;
334
335 goto exit_memrar_free;
336
337 } else if (handle->end == chunk->begin) {
338 /*
339 * Chunk "greater than" than the one we're
340 * freeing is adjacent.
341 *
342 * +------+-----+
343 * |handle|chunk|
344 * +------+-----+
345 *
346 * After:
347 *
348 * +------------+
349 * | chunk |
350 * +------------+
351 */
352
353 struct memrar_address_ranges const * const prev =
354 list_entry(pos->prev,
355 struct memrar_address_ranges,
356 list);
357
358 chunk->begin = handle->begin;
359
360 /*
361 * Now check if previous free chunk is
362 * adjacent to the current extended free
363 * chunk.
364 *
365 *
366 * Before:
367 *
368 * +----+------------+
369 * |prev| chunk |
370 * +----+------------+
371 *
372 * After:
373 *
374 * +-----------------+
375 * | chunk |
376 * +-----------------+
377 */
378 if (!list_is_singular(pos)
379 && prev->range.end == chunk->begin) {
380 chunk->begin = prev->range.begin;
381 list_del(pos->prev);
382 kfree(prev);
383 }
384
385 list_del(&allocated->list);
386
387 new_chunk_size = chunk->end - chunk->begin;
388
389 goto exit_memrar_free;
390
391 } else if (chunk->end < handle->begin
392 && chunk->end > old_end) {
393 /* Keep track of where the entry could be
394 * potentially moved from the "allocated" list
395 * to the "free" list if coalescing doesn't
396 * occur, making sure the "free" list remains
397 * sorted.
398 */
399 old_end = chunk->end;
400 dst = pos;
401 }
402 }
403
404 /*
405 * Nothing to coalesce.
406 *
407 * Move the entry from the "allocated" list to the "free"
408 * list.
409 */
410 list_move(&allocated->list, dst);
411 new_chunk_size = handle->end - handle->begin;
412 allocated = NULL;
413
414exit_memrar_free:
415
416 if (new_chunk_size > allocator->largest_free_area)
417 allocator->largest_free_area = new_chunk_size;
418
419 mutex_unlock(&allocator->lock);
420
421 kfree(allocated);
422
423 return 0;
424}
425
426
427
428/*
429 Local Variables:
430 c-file-style: "linux"
431 End:
432*/
diff --git a/drivers/staging/memrar/memrar_allocator.h b/drivers/staging/memrar/memrar_allocator.h
deleted file mode 100644
index 0b80dead710f..000000000000
--- a/drivers/staging/memrar/memrar_allocator.h
+++ /dev/null
@@ -1,149 +0,0 @@
1/*
2 * Copyright (C) 2010 Intel Corporation. All rights reserved.
3 *
4 * This program is free software; you can redistribute it and/or
5 * modify it under the terms of version 2 of the GNU General
6 * Public License as published by the Free Software Foundation.
7 *
8 * This program is distributed in the hope that it will be
9 * useful, but WITHOUT ANY WARRANTY; without even the implied
10 * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
11 * PURPOSE. See the GNU General Public License for more details.
12 * You should have received a copy of the GNU General Public
13 * License along with this program; if not, write to the Free
14 * Software Foundation, Inc., 59 Temple Place - Suite 330,
15 * Boston, MA 02111-1307, USA.
16 * The full GNU General Public License is included in this
17 * distribution in the file called COPYING.
18 */
19
20#ifndef MEMRAR_ALLOCATOR_H
21#define MEMRAR_ALLOCATOR_H
22
23
24#include <linux/mutex.h>
25#include <linux/list.h>
26#include <linux/types.h>
27#include <linux/kernel.h>
28
29
30/**
31 * struct memrar_address_range - struct that describes a memory range
32 * @begin: Beginning of available address range.
33 * @end: End of available address range, one past the end,
34 * i.e. [begin, end).
35 */
36struct memrar_address_range {
37/* private: internal use only */
38 unsigned long begin;
39 unsigned long end;
40};
41
42/**
43 * struct memrar_address_ranges - list of areas of memory.
44 * @list: Linked list of address ranges.
45 * @range: Memory address range corresponding to given list node.
46 */
47struct memrar_address_ranges {
48/* private: internal use only */
49 struct list_head list;
50 struct memrar_address_range range;
51};
52
53/**
54 * struct memrar_allocator - encapsulation of the memory allocator state
55 * @lock: Lock used to synchronize access to the memory
56 * allocator state.
57 * @base: Base (start) address of the allocator memory
58 * space.
59 * @capacity: Size of the allocator memory space in bytes.
60 * @block_size: The size in bytes of individual blocks within
61 * the allocator memory space.
62 * @largest_free_area: Largest free area of memory in the allocator
63 * in bytes.
64 * @allocated_list: List of allocated memory block address
65 * ranges.
66 * @free_list: List of free address ranges.
67 *
68 * This structure contains all memory allocator state, including the
69 * base address, capacity, free list, lock, etc.
70 */
71struct memrar_allocator {
72/* private: internal use only */
73 struct mutex lock;
74 unsigned long base;
75 size_t capacity;
76 size_t block_size;
77 size_t largest_free_area;
78 struct memrar_address_ranges allocated_list;
79 struct memrar_address_ranges free_list;
80};
81
82/**
83 * memrar_create_allocator() - create a memory allocator
84 * @base: Address at which the memory allocator begins.
85 * @capacity: Desired size of the memory allocator. This value must
86 * be larger than the block_size, ideally more than twice
87 * as large since there wouldn't be much point in using a
88 * memory allocator otherwise.
89 * @block_size: The size of individual blocks within the memory
90 * allocator. This value must smaller than the
91 * capacity.
92 *
93 * Create a memory allocator with the given capacity and block size.
94 * The capacity will be reduced to be a multiple of the block size, if
95 * necessary.
96 *
97 * Returns an instance of the memory allocator, if creation succeeds,
98 * otherwise zero if creation fails. Failure may occur if not enough
99 * kernel memory exists to create the memrar_allocator instance
100 * itself, or if the capacity and block_size arguments are not
101 * compatible or make sense.
102 */
103struct memrar_allocator *memrar_create_allocator(unsigned long base,
104 size_t capacity,
105 size_t block_size);
106
107/**
108 * memrar_destroy_allocator() - destroy allocator
109 * @allocator: The allocator being destroyed.
110 *
111 * Reclaim resources held by the memory allocator. The caller must
112 * explicitly free all memory reserved by memrar_allocator_alloc()
113 * prior to calling this function. Otherwise leaks will occur.
114 */
115void memrar_destroy_allocator(struct memrar_allocator *allocator);
116
117/**
118 * memrar_allocator_alloc() - reserve an area of memory of given size
119 * @allocator: The allocator instance being used to reserve buffer.
120 * @size: The size in bytes of the buffer to allocate.
121 *
122 * This functions reserves an area of memory managed by the given
123 * allocator. It returns zero if allocation was not possible.
124 * Failure may occur if the allocator no longer has space available.
125 */
126unsigned long memrar_allocator_alloc(struct memrar_allocator *allocator,
127 size_t size);
128
129/**
130 * memrar_allocator_free() - release buffer starting at given address
131 * @allocator: The allocator instance being used to release the buffer.
132 * @address: The address of the buffer being released.
133 *
134 * Release an area of memory starting at the given address. Failure
135 * could occur if the given address is not in the address space
136 * managed by the allocator. Returns zero on success or an errno
137 * (negative value) on failure.
138 */
139long memrar_allocator_free(struct memrar_allocator *allocator,
140 unsigned long address);
141
142#endif /* MEMRAR_ALLOCATOR_H */
143
144
145/*
146 Local Variables:
147 c-file-style: "linux"
148 End:
149*/
diff --git a/drivers/staging/memrar/memrar_handler.c b/drivers/staging/memrar/memrar_handler.c
deleted file mode 100644
index cfcaa8e5b8e6..000000000000
--- a/drivers/staging/memrar/memrar_handler.c
+++ /dev/null
@@ -1,1007 +0,0 @@
1/*
2 * memrar_handler 1.0: An Intel restricted access region handler device
3 *
4 * Copyright (C) 2010 Intel Corporation. All rights reserved.
5 *
6 * This program is free software; you can redistribute it and/or
7 * modify it under the terms of version 2 of the GNU General
8 * Public License as published by the Free Software Foundation.
9 *
10 * This program is distributed in the hope that it will be
11 * useful, but WITHOUT ANY WARRANTY; without even the implied
12 * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
13 * PURPOSE. See the GNU General Public License for more details.
14 * You should have received a copy of the GNU General Public
15 * License along with this program; if not, write to the Free
16 * Software Foundation, Inc., 59 Temple Place - Suite 330,
17 * Boston, MA 02111-1307, USA.
18 * The full GNU General Public License is included in this
19 * distribution in the file called COPYING.
20 *
21 * -------------------------------------------------------------------
22 *
23 * Moorestown restricted access regions (RAR) provide isolated
24 * areas of main memory that are only acceessible by authorized
25 * devices.
26 *
27 * The Intel Moorestown RAR handler module exposes a kernel space
28 * RAR memory management mechanism. It is essentially a
29 * RAR-specific allocator.
30 *
31 * Besides providing RAR buffer management, the RAR handler also
32 * behaves in many ways like an OS virtual memory manager. For
33 * example, the RAR "handles" created by the RAR handler are
34 * analogous to user space virtual addresses.
35 *
36 * RAR memory itself is never accessed directly by the RAR
37 * handler.
38 */
39
40#include <linux/miscdevice.h>
41#include <linux/fs.h>
42#include <linux/slab.h>
43#include <linux/kref.h>
44#include <linux/mutex.h>
45#include <linux/kernel.h>
46#include <linux/uaccess.h>
47#include <linux/mm.h>
48#include <linux/ioport.h>
49#include <linux/io.h>
50#include <linux/rar_register.h>
51
52#include "memrar.h"
53#include "memrar_allocator.h"
54
55
56#define MEMRAR_VER "1.0"
57
58/*
59 * Moorestown supports three restricted access regions.
60 *
61 * We only care about the first two, video and audio. The third,
62 * reserved for Chaabi and the P-unit, will be handled by their
63 * respective drivers.
64 */
65#define MRST_NUM_RAR 2
66
67/* ---------------- -------------------- ------------------- */
68
69/**
70 * struct memrar_buffer_info - struct that keeps track of all RAR buffers
71 * @list: Linked list of memrar_buffer_info objects.
72 * @buffer: Core RAR buffer information.
73 * @refcount: Reference count.
74 * @owner: File handle corresponding to process that reserved the
75 * block of memory in RAR. This will be zero for buffers
76 * allocated by other drivers instead of by a user space
77 * process.
78 *
79 * This structure encapsulates a link list of RAR buffers, as well as
80 * other characteristics specific to a given list node, such as the
81 * reference count on the corresponding RAR buffer.
82 */
83struct memrar_buffer_info {
84 struct list_head list;
85 struct RAR_buffer buffer;
86 struct kref refcount;
87 struct file *owner;
88};
89
90/**
91 * struct memrar_rar_info - characteristics of a given RAR
92 * @base: Base bus address of the RAR.
93 * @length: Length of the RAR.
94 * @iobase: Virtual address of RAR mapped into kernel.
95 * @allocator: Allocator associated with the RAR. Note the allocator
96 * "capacity" may be smaller than the RAR length if the
97 * length is not a multiple of the configured allocator
98 * block size.
99 * @buffers: Table that keeps track of all reserved RAR buffers.
100 * @lock: Lock used to synchronize access to RAR-specific data
101 * structures.
102 *
103 * Each RAR has an associated memrar_rar_info structure that describes
104 * where in memory the RAR is located, how large it is, and a list of
105 * reserved RAR buffers inside that RAR. Each RAR also has a mutex
106 * associated with it to reduce lock contention when operations on
107 * multiple RARs are performed in parallel.
108 */
109struct memrar_rar_info {
110 dma_addr_t base;
111 unsigned long length;
112 void __iomem *iobase;
113 struct memrar_allocator *allocator;
114 struct memrar_buffer_info buffers;
115 struct mutex lock;
116 int allocated; /* True if we own this RAR */
117};
118
119/*
120 * Array of RAR characteristics.
121 */
122static struct memrar_rar_info memrars[MRST_NUM_RAR];
123
124/* ---------------- -------------------- ------------------- */
125
126/* Validate RAR type. */
127static inline int memrar_is_valid_rar_type(u32 type)
128{
129 return type == RAR_TYPE_VIDEO || type == RAR_TYPE_AUDIO;
130}
131
132/* Check if an address/handle falls with the given RAR memory range. */
133static inline int memrar_handle_in_range(struct memrar_rar_info *rar,
134 u32 vaddr)
135{
136 unsigned long const iobase = (unsigned long) (rar->iobase);
137 return (vaddr >= iobase && vaddr < iobase + rar->length);
138}
139
140/* Retrieve RAR information associated with the given handle. */
141static struct memrar_rar_info *memrar_get_rar_info(u32 vaddr)
142{
143 int i;
144 for (i = 0; i < MRST_NUM_RAR; ++i) {
145 struct memrar_rar_info * const rar = &memrars[i];
146 if (memrar_handle_in_range(rar, vaddr))
147 return rar;
148 }
149
150 return NULL;
151}
152
153/**
154 * memrar_get_bus address - handle to bus address
155 *
156 * Retrieve bus address from given handle.
157 *
158 * Returns address corresponding to given handle. Zero if handle is
159 * invalid.
160 */
161static dma_addr_t memrar_get_bus_address(
162 struct memrar_rar_info *rar,
163 u32 vaddr)
164{
165 unsigned long const iobase = (unsigned long) (rar->iobase);
166
167 if (!memrar_handle_in_range(rar, vaddr))
168 return 0;
169
170 /*
171 * An assumption is made that the virtual address offset is
172 * the same as the bus address offset, at least based on the
173 * way this driver is implemented. For example, vaddr + 2 ==
174 * baddr + 2.
175 *
176 * @todo Is that a valid assumption?
177 */
178 return rar->base + (vaddr - iobase);
179}
180
181/**
182 * memrar_get_physical_address - handle to physical address
183 *
184 * Retrieve physical address from given handle.
185 *
186 * Returns address corresponding to given handle. Zero if handle is
187 * invalid.
188 */
189static dma_addr_t memrar_get_physical_address(
190 struct memrar_rar_info *rar,
191 u32 vaddr)
192{
193 /*
194 * @todo This assumes that the bus address and physical
195 * address are the same. That is true for Moorestown
196 * but not necessarily on other platforms. This
197 * deficiency should be addressed at some point.
198 */
199 return memrar_get_bus_address(rar, vaddr);
200}
201
202/**
203 * memrar_release_block - release a block to the pool
204 * @kref: kref of block
205 *
206 * Core block release code. A node has hit zero references so can
207 * be released and the lists must be updated.
208 *
209 * Note: This code removes the node from a list. Make sure any list
210 * iteration is performed using list_for_each_safe().
211 */
212static void memrar_release_block_i(struct kref *ref)
213{
214 /*
215 * Last reference is being released. Remove from the table,
216 * and reclaim resources.
217 */
218
219 struct memrar_buffer_info * const node =
220 container_of(ref, struct memrar_buffer_info, refcount);
221
222 struct RAR_block_info * const user_info =
223 &node->buffer.info;
224
225 struct memrar_allocator * const allocator =
226 memrars[user_info->type].allocator;
227
228 list_del(&node->list);
229
230 memrar_allocator_free(allocator, user_info->handle);
231
232 kfree(node);
233}
234
235/**
236 * memrar_init_rar_resources - configure a RAR
237 * @rarnum: rar that has been allocated
238 * @devname: name of our device
239 *
240 * Initialize RAR parameters, such as bus addresses, etc and make
241 * the resource accessible.
242 */
243static int memrar_init_rar_resources(int rarnum, char const *devname)
244{
245 /* ---- Sanity Checks ----
246 * 1. RAR bus addresses in both Lincroft and Langwell RAR
247 * registers should be the same.
248 * a. There's no way we can do this through IA.
249 *
250 * 2. Secure device ID in Langwell RAR registers should be set
251 * appropriately, e.g. only LPE DMA for the audio RAR, and
252 * security for the other Langwell based RAR registers.
253 * a. There's no way we can do this through IA.
254 *
255 * 3. Audio and video RAR registers and RAR access should be
256 * locked down. If not, enable RAR access control. Except
257 * for debugging purposes, there is no reason for them to
258 * be unlocked.
259 * a. We can only do this for the Lincroft (IA) side.
260 *
261 * @todo Should the RAR handler driver even be aware of audio
262 * and video RAR settings?
263 */
264
265 /*
266 * RAR buffer block size.
267 *
268 * We choose it to be the size of a page to simplify the
269 * /dev/memrar mmap() implementation and usage. Otherwise
270 * paging is not involved once an RAR is locked down.
271 */
272 static size_t const RAR_BLOCK_SIZE = PAGE_SIZE;
273
274 dma_addr_t low, high;
275 struct memrar_rar_info * const rar = &memrars[rarnum];
276
277 BUG_ON(MRST_NUM_RAR != ARRAY_SIZE(memrars));
278 BUG_ON(!memrar_is_valid_rar_type(rarnum));
279 BUG_ON(rar->allocated);
280
281 if (rar_get_address(rarnum, &low, &high) != 0)
282 /* No RAR is available. */
283 return -ENODEV;
284
285 if (low == 0 || high == 0) {
286 rar->base = 0;
287 rar->length = 0;
288 rar->iobase = NULL;
289 rar->allocator = NULL;
290 return -ENOSPC;
291 }
292
293 /*
294 * @todo Verify that LNC and LNW RAR register contents
295 * addresses, security, etc are compatible and
296 * consistent).
297 */
298
299 rar->length = high - low + 1;
300
301 /* Claim RAR memory as our own. */
302 if (request_mem_region(low, rar->length, devname) == NULL) {
303 rar->length = 0;
304 pr_err("%s: Unable to claim RAR[%d] memory.\n",
305 devname, rarnum);
306 pr_err("%s: RAR[%d] disabled.\n", devname, rarnum);
307 return -EBUSY;
308 }
309
310 rar->base = low;
311
312 /*
313 * Now map it into the kernel address space.
314 *
315 * Note that the RAR memory may only be accessed by IA
316 * when debugging. Otherwise attempts to access the
317 * RAR memory when it is locked down will result in
318 * behavior similar to writing to /dev/null and
319 * reading from /dev/zero. This behavior is enforced
320 * by the hardware. Even if we don't access the
321 * memory, mapping it into the kernel provides us with
322 * a convenient RAR handle to bus address mapping.
323 */
324 rar->iobase = ioremap_nocache(rar->base, rar->length);
325 if (rar->iobase == NULL) {
326 pr_err("%s: Unable to map RAR memory.\n", devname);
327 release_mem_region(low, rar->length);
328 return -ENOMEM;
329 }
330
331 /* Initialize corresponding memory allocator. */
332 rar->allocator = memrar_create_allocator((unsigned long) rar->iobase,
333 rar->length, RAR_BLOCK_SIZE);
334 if (rar->allocator == NULL) {
335 iounmap(rar->iobase);
336 release_mem_region(low, rar->length);
337 return -ENOMEM;
338 }
339
340 pr_info("%s: BRAR[%d] bus address range = [0x%lx, 0x%lx]\n",
341 devname, rarnum, (unsigned long) low, (unsigned long) high);
342
343 pr_info("%s: BRAR[%d] size = %zu KiB\n",
344 devname, rarnum, rar->allocator->capacity / 1024);
345
346 rar->allocated = 1;
347 return 0;
348}
349
350/**
351 * memrar_fini_rar_resources - free up RAR resources
352 *
353 * Finalize RAR resources. Free up the resource tables, hand the memory
354 * back to the kernel, unmap the device and release the address space.
355 */
356static void memrar_fini_rar_resources(void)
357{
358 int z;
359 struct memrar_buffer_info *pos;
360 struct memrar_buffer_info *tmp;
361
362 /*
363 * @todo Do we need to hold a lock at this point in time?
364 * (module initialization failure or exit?)
365 */
366
367 for (z = MRST_NUM_RAR; z-- != 0; ) {
368 struct memrar_rar_info * const rar = &memrars[z];
369
370 if (!rar->allocated)
371 continue;
372
373 /* Clean up remaining resources. */
374
375 list_for_each_entry_safe(pos,
376 tmp,
377 &rar->buffers.list,
378 list) {
379 kref_put(&pos->refcount, memrar_release_block_i);
380 }
381
382 memrar_destroy_allocator(rar->allocator);
383 rar->allocator = NULL;
384
385 iounmap(rar->iobase);
386 release_mem_region(rar->base, rar->length);
387
388 rar->iobase = NULL;
389 rar->base = 0;
390 rar->length = 0;
391
392 unregister_rar(z);
393 }
394}
395
396/**
397 * memrar_reserve_block - handle an allocation request
398 * @request: block being requested
399 * @filp: owner it is tied to
400 *
401 * Allocate a block of the requested RAR. If successful return the
402 * request object filled in and zero, if not report an error code
403 */
404
405static long memrar_reserve_block(struct RAR_buffer *request,
406 struct file *filp)
407{
408 struct RAR_block_info * const rinfo = &request->info;
409 struct RAR_buffer *buffer;
410 struct memrar_buffer_info *buffer_info;
411 u32 handle;
412 struct memrar_rar_info *rar = NULL;
413
414 /* Prevent array overflow. */
415 if (!memrar_is_valid_rar_type(rinfo->type))
416 return -EINVAL;
417
418 rar = &memrars[rinfo->type];
419 if (!rar->allocated)
420 return -ENODEV;
421
422 /* Reserve memory in RAR. */
423 handle = memrar_allocator_alloc(rar->allocator, rinfo->size);
424 if (handle == 0)
425 return -ENOMEM;
426
427 buffer_info = kmalloc(sizeof(*buffer_info), GFP_KERNEL);
428
429 if (buffer_info == NULL) {
430 memrar_allocator_free(rar->allocator, handle);
431 return -ENOMEM;
432 }
433
434 buffer = &buffer_info->buffer;
435 buffer->info.type = rinfo->type;
436 buffer->info.size = rinfo->size;
437
438 /* Memory handle corresponding to the bus address. */
439 buffer->info.handle = handle;
440 buffer->bus_address = memrar_get_bus_address(rar, handle);
441
442 /*
443 * Keep track of owner so that we can later cleanup if
444 * necessary.
445 */
446 buffer_info->owner = filp;
447
448 kref_init(&buffer_info->refcount);
449
450 mutex_lock(&rar->lock);
451 list_add(&buffer_info->list, &rar->buffers.list);
452 mutex_unlock(&rar->lock);
453
454 rinfo->handle = buffer->info.handle;
455 request->bus_address = buffer->bus_address;
456
457 return 0;
458}
459
460/**
461 * memrar_release_block - release a RAR block
462 * @addr: address in RAR space
463 *
464 * Release a previously allocated block. Releases act on complete
465 * blocks, partially freeing a block is not supported
466 */
467
468static long memrar_release_block(u32 addr)
469{
470 struct memrar_buffer_info *pos;
471 struct memrar_buffer_info *tmp;
472 struct memrar_rar_info * const rar = memrar_get_rar_info(addr);
473 long result = -EINVAL;
474
475 if (rar == NULL)
476 return -ENOENT;
477
478 mutex_lock(&rar->lock);
479
480 /*
481 * Iterate through the buffer list to find the corresponding
482 * buffer to be released.
483 */
484 list_for_each_entry_safe(pos,
485 tmp,
486 &rar->buffers.list,
487 list) {
488 struct RAR_block_info * const info =
489 &pos->buffer.info;
490
491 /*
492 * Take into account handle offsets that may have been
493 * added to the base handle, such as in the following
494 * scenario:
495 *
496 * u32 handle = base + offset;
497 * rar_handle_to_bus(handle);
498 * rar_release(handle);
499 */
500 if (addr >= info->handle
501 && addr < (info->handle + info->size)
502 && memrar_is_valid_rar_type(info->type)) {
503 kref_put(&pos->refcount, memrar_release_block_i);
504 result = 0;
505 break;
506 }
507 }
508
509 mutex_unlock(&rar->lock);
510
511 return result;
512}
513
514/**
515 * memrar_get_stats - read statistics for a RAR
516 * @r: statistics to be filled in
517 *
518 * Returns the statistics data for the RAR, or an error code if
519 * the request cannot be completed
520 */
521static long memrar_get_stat(struct RAR_stat *r)
522{
523 struct memrar_allocator *allocator;
524
525 if (!memrar_is_valid_rar_type(r->type))
526 return -EINVAL;
527
528 if (!memrars[r->type].allocated)
529 return -ENODEV;
530
531 allocator = memrars[r->type].allocator;
532
533 BUG_ON(allocator == NULL);
534
535 /*
536 * Allocator capacity doesn't change over time. No
537 * need to synchronize.
538 */
539 r->capacity = allocator->capacity;
540
541 mutex_lock(&allocator->lock);
542 r->largest_block_size = allocator->largest_free_area;
543 mutex_unlock(&allocator->lock);
544 return 0;
545}
546
547/**
548 * memrar_ioctl - ioctl callback
549 * @filp: file issuing the request
550 * @cmd: command
551 * @arg: pointer to control information
552 *
553 * Perform one of the ioctls supported by the memrar device
554 */
555
556static long memrar_ioctl(struct file *filp,
557 unsigned int cmd,
558 unsigned long arg)
559{
560 void __user *argp = (void __user *)arg;
561 long result = 0;
562
563 struct RAR_buffer buffer;
564 struct RAR_block_info * const request = &buffer.info;
565 struct RAR_stat rar_info;
566 u32 rar_handle;
567
568 switch (cmd) {
569 case RAR_HANDLER_RESERVE:
570 if (copy_from_user(request,
571 argp,
572 sizeof(*request)))
573 return -EFAULT;
574
575 result = memrar_reserve_block(&buffer, filp);
576 if (result != 0)
577 return result;
578
579 return copy_to_user(argp, request, sizeof(*request));
580
581 case RAR_HANDLER_RELEASE:
582 if (copy_from_user(&rar_handle,
583 argp,
584 sizeof(rar_handle)))
585 return -EFAULT;
586
587 return memrar_release_block(rar_handle);
588
589 case RAR_HANDLER_STAT:
590 if (copy_from_user(&rar_info,
591 argp,
592 sizeof(rar_info)))
593 return -EFAULT;
594
595 /*
596 * Populate the RAR_stat structure based on the RAR
597 * type given by the user
598 */
599 if (memrar_get_stat(&rar_info) != 0)
600 return -EINVAL;
601
602 /*
603 * @todo Do we need to verify destination pointer
604 * "argp" is non-zero? Is that already done by
605 * copy_to_user()?
606 */
607 return copy_to_user(argp,
608 &rar_info,
609 sizeof(rar_info)) ? -EFAULT : 0;
610
611 default:
612 return -ENOTTY;
613 }
614
615 return 0;
616}
617
618/**
619 * memrar_mmap - mmap helper for deubgging
620 * @filp: handle doing the mapping
621 * @vma: memory area
622 *
623 * Support the mmap operation on the RAR space for debugging systems
624 * when the memory is not locked down.
625 */
626
627static int memrar_mmap(struct file *filp, struct vm_area_struct *vma)
628{
629 /*
630 * This mmap() implementation is predominantly useful for
631 * debugging since the CPU will be prevented from accessing
632 * RAR memory by the hardware when RAR is properly locked
633 * down.
634 *
635 * In order for this implementation to be useful RAR memory
636 * must be not be locked down. However, we only want to do
637 * that when debugging. DO NOT leave RAR memory unlocked in a
638 * deployed device that utilizes RAR.
639 */
640
641 size_t const size = vma->vm_end - vma->vm_start;
642
643 /* Users pass the RAR handle as the mmap() offset parameter. */
644 unsigned long const handle = vma->vm_pgoff << PAGE_SHIFT;
645
646 struct memrar_rar_info * const rar = memrar_get_rar_info(handle);
647 unsigned long pfn;
648
649 /* Only allow priviledged apps to go poking around this way */
650 if (!capable(CAP_SYS_RAWIO))
651 return -EPERM;
652
653 /* Invalid RAR handle or size passed to mmap(). */
654 if (rar == NULL
655 || handle == 0
656 || size > (handle - (unsigned long) rar->iobase))
657 return -EINVAL;
658
659 /*
660 * Retrieve physical address corresponding to the RAR handle,
661 * and convert it to a page frame.
662 */
663 pfn = memrar_get_physical_address(rar, handle) >> PAGE_SHIFT;
664
665
666 pr_debug("memrar: mapping RAR range [0x%lx, 0x%lx) into user space.\n",
667 handle,
668 handle + size);
669
670 /*
671 * Map RAR memory into user space. This is really only useful
672 * for debugging purposes since the memory won't be
673 * accessible, i.e. reads return zero and writes are ignored,
674 * when RAR access control is enabled.
675 */
676 if (remap_pfn_range(vma,
677 vma->vm_start,
678 pfn,
679 size,
680 vma->vm_page_prot))
681 return -EAGAIN;
682
683 /* vma->vm_ops = &memrar_mem_ops; */
684
685 return 0;
686}
687
688/**
689 * memrar_open - device open method
690 * @inode: inode to open
691 * @filp: file handle
692 *
693 * As we support multiple arbitary opens there is no work to be done
694 * really.
695 */
696
697static int memrar_open(struct inode *inode, struct file *filp)
698{
699 nonseekable_open(inode, filp);
700 return 0;
701}
702
703/**
704 * memrar_release - close method for miscev
705 * @inode: inode of device
706 * @filp: handle that is going away
707 *
708 * Free up all the regions that belong to this file handle. We use
709 * the handle as a natural Linux style 'lifetime' indicator and to
710 * ensure resources are not leaked when their owner explodes in an
711 * unplanned fashion.
712 */
713
714static int memrar_release(struct inode *inode, struct file *filp)
715{
716 /* Free all regions associated with the given file handle. */
717
718 struct memrar_buffer_info *pos;
719 struct memrar_buffer_info *tmp;
720 int z;
721
722 for (z = 0; z != MRST_NUM_RAR; ++z) {
723 struct memrar_rar_info * const rar = &memrars[z];
724
725 mutex_lock(&rar->lock);
726
727 list_for_each_entry_safe(pos,
728 tmp,
729 &rar->buffers.list,
730 list) {
731 if (filp == pos->owner)
732 kref_put(&pos->refcount,
733 memrar_release_block_i);
734 }
735
736 mutex_unlock(&rar->lock);
737 }
738
739 return 0;
740}
741
742/**
743 * rar_reserve - reserve RAR memory
744 * @buffers: buffers to reserve
745 * @count: number wanted
746 *
747 * Reserve a series of buffers in the RAR space. Returns the number of
748 * buffers successfully allocated
749 */
750
751size_t rar_reserve(struct RAR_buffer *buffers, size_t count)
752{
753 struct RAR_buffer * const end =
754 (buffers == NULL ? buffers : buffers + count);
755 struct RAR_buffer *i;
756
757 size_t reserve_count = 0;
758
759 for (i = buffers; i != end; ++i) {
760 if (memrar_reserve_block(i, NULL) == 0)
761 ++reserve_count;
762 else
763 i->bus_address = 0;
764 }
765
766 return reserve_count;
767}
768EXPORT_SYMBOL(rar_reserve);
769
770/**
771 * rar_release - return RAR buffers
772 * @buffers: buffers to release
773 * @size: size of released block
774 *
775 * Return a set of buffers to the RAR pool
776 */
777
778size_t rar_release(struct RAR_buffer *buffers, size_t count)
779{
780 struct RAR_buffer * const end =
781 (buffers == NULL ? buffers : buffers + count);
782 struct RAR_buffer *i;
783
784 size_t release_count = 0;
785
786 for (i = buffers; i != end; ++i) {
787 u32 * const handle = &i->info.handle;
788 if (memrar_release_block(*handle) == 0) {
789 /*
790 * @todo We assume we should do this each time
791 * the ref count is decremented. Should
792 * we instead only do this when the ref
793 * count has dropped to zero, and the
794 * buffer has been completely
795 * released/unmapped?
796 */
797 *handle = 0;
798 ++release_count;
799 }
800 }
801
802 return release_count;
803}
804EXPORT_SYMBOL(rar_release);
805
806/**
807 * rar_handle_to_bus - RAR to bus address
808 * @buffers: RAR buffer structure
809 * @count: number of buffers to convert
810 *
811 * Turn a list of RAR handle mappings into actual bus addresses. Note
812 * that when the device is locked down the bus addresses in question
813 * are not CPU accessible.
814 */
815
816size_t rar_handle_to_bus(struct RAR_buffer *buffers, size_t count)
817{
818 struct RAR_buffer * const end =
819 (buffers == NULL ? buffers : buffers + count);
820 struct RAR_buffer *i;
821 struct memrar_buffer_info *pos;
822
823 size_t conversion_count = 0;
824
825 /*
826 * Find all bus addresses corresponding to the given handles.
827 *
828 * @todo Not liking this nested loop. Optimize.
829 */
830 for (i = buffers; i != end; ++i) {
831 struct memrar_rar_info * const rar =
832 memrar_get_rar_info(i->info.handle);
833
834 /*
835 * Check if we have a bogus handle, and then continue
836 * with remaining buffers.
837 */
838 if (rar == NULL) {
839 i->bus_address = 0;
840 continue;
841 }
842
843 mutex_lock(&rar->lock);
844
845 list_for_each_entry(pos, &rar->buffers.list, list) {
846 struct RAR_block_info * const user_info =
847 &pos->buffer.info;
848
849 /*
850 * Take into account handle offsets that may
851 * have been added to the base handle, such as
852 * in the following scenario:
853 *
854 * u32 handle = base + offset;
855 * rar_handle_to_bus(handle);
856 */
857
858 if (i->info.handle >= user_info->handle
859 && i->info.handle < (user_info->handle
860 + user_info->size)) {
861 u32 const offset =
862 i->info.handle - user_info->handle;
863
864 i->info.type = user_info->type;
865 i->info.size = user_info->size - offset;
866 i->bus_address =
867 pos->buffer.bus_address
868 + offset;
869
870 /* Increment the reference count. */
871 kref_get(&pos->refcount);
872
873 ++conversion_count;
874 break;
875 } else {
876 i->bus_address = 0;
877 }
878 }
879
880 mutex_unlock(&rar->lock);
881 }
882
883 return conversion_count;
884}
885EXPORT_SYMBOL(rar_handle_to_bus);
886
887static const struct file_operations memrar_fops = {
888 .owner = THIS_MODULE,
889 .unlocked_ioctl = memrar_ioctl,
890 .mmap = memrar_mmap,
891 .open = memrar_open,
892 .release = memrar_release,
893 .llseek = no_llseek,
894};
895
896static struct miscdevice memrar_miscdev = {
897 .minor = MISC_DYNAMIC_MINOR, /* dynamic allocation */
898 .name = "memrar", /* /dev/memrar */
899 .fops = &memrar_fops
900};
901
902static char const banner[] __initdata =
903 KERN_INFO
904 "Intel RAR Handler: " MEMRAR_VER " initialized.\n";
905
906/**
907 * memrar_registration_callback - RAR obtained
908 * @rar: RAR number
909 *
910 * We have been granted ownership of the RAR. Add it to our memory
911 * management tables
912 */
913
914static int memrar_registration_callback(unsigned long rar)
915{
916 /*
917 * We initialize the RAR parameters early on so that we can
918 * discontinue memrar device initialization and registration
919 * if suitably configured RARs are not available.
920 */
921 return memrar_init_rar_resources(rar, memrar_miscdev.name);
922}
923
924/**
925 * memrar_init - initialise RAR support
926 *
927 * Initialise support for RAR handlers. This may get loaded before
928 * the RAR support is activated, but the callbacks on the registration
929 * will handle that situation for us anyway.
930 */
931
932static int __init memrar_init(void)
933{
934 int err;
935 int i;
936
937 printk(banner);
938
939 /*
940 * Some delayed initialization is performed in this driver.
941 * Make sure resources that are used during driver clean-up
942 * (e.g. during driver's release() function) are fully
943 * initialized before first use. This is particularly
944 * important for the case when the delayed initialization
945 * isn't completed, leaving behind a partially initialized
946 * driver.
947 *
948 * Such a scenario can occur when RAR is not available on the
949 * platform, and the driver is release()d.
950 */
951 for (i = 0; i != ARRAY_SIZE(memrars); ++i) {
952 struct memrar_rar_info * const rar = &memrars[i];
953 mutex_init(&rar->lock);
954 INIT_LIST_HEAD(&rar->buffers.list);
955 }
956
957 err = misc_register(&memrar_miscdev);
958 if (err)
959 return err;
960
961 /* Now claim the two RARs we want */
962 err = register_rar(0, memrar_registration_callback, 0);
963 if (err)
964 goto fail;
965
966 err = register_rar(1, memrar_registration_callback, 1);
967 if (err == 0)
968 return 0;
969
970 /* It is possible rar 0 registered and allocated resources then rar 1
971 failed so do a full resource free */
972 memrar_fini_rar_resources();
973fail:
974 misc_deregister(&memrar_miscdev);
975 return err;
976}
977
978/**
979 * memrar_exit - unregister and unload
980 *
981 * Unregister the device and then unload any mappings and release
982 * the RAR resources
983 */
984
985static void __exit memrar_exit(void)
986{
987 misc_deregister(&memrar_miscdev);
988 memrar_fini_rar_resources();
989}
990
991
992module_init(memrar_init);
993module_exit(memrar_exit);
994
995
996MODULE_AUTHOR("Ossama Othman <ossama.othman@intel.com>");
997MODULE_DESCRIPTION("Intel Restricted Access Region Handler");
998MODULE_LICENSE("GPL");
999MODULE_VERSION(MEMRAR_VER);
1000
1001
1002
1003/*
1004 Local Variables:
1005 c-file-style: "linux"
1006 End:
1007*/
diff --git a/drivers/staging/msm/mdp4_overlay.c b/drivers/staging/msm/mdp4_overlay.c
index de284c28faa1..b9acf5299297 100644
--- a/drivers/staging/msm/mdp4_overlay.c
+++ b/drivers/staging/msm/mdp4_overlay.c
@@ -696,7 +696,7 @@ void mdp4_mixer_stage_down(struct mdp4_overlay_pipe *pipe)
696 stage = pipe->mixer_stage; 696 stage = pipe->mixer_stage;
697 mixer = pipe->mixer_num; 697 mixer = pipe->mixer_num;
698 698
699 if (pipe != ctrl->stage[mixer][stage]) /* not runing */ 699 if (pipe != ctrl->stage[mixer][stage]) /* not running */
700 return; 700 return;
701 701
702 /* MDP_LAYERMIXER_IN_CFG, shard by both mixer 0 and 1 */ 702 /* MDP_LAYERMIXER_IN_CFG, shard by both mixer 0 and 1 */
diff --git a/drivers/staging/msm/mdp_ppp_dq.c b/drivers/staging/msm/mdp_ppp_dq.c
index 3dc1c0cc61f9..3a687c7a5695 100644
--- a/drivers/staging/msm/mdp_ppp_dq.c
+++ b/drivers/staging/msm/mdp_ppp_dq.c
@@ -200,7 +200,7 @@ static void mdp_ppp_flush_dirty_djobs(void *cond)
200 msm_fb_ensure_mem_coherency_after_dma(job->info, &job->req, 1); 200 msm_fb_ensure_mem_coherency_after_dma(job->info, &job->req, 1);
201 201
202 /* Schedule jobs for cleanup 202 /* Schedule jobs for cleanup
203 * A seperate worker thread does this */ 203 * A separate worker thread does this */
204 queue_delayed_work(mdp_ppp_djob_clnr, &job->cleaner, 204 queue_delayed_work(mdp_ppp_djob_clnr, &job->cleaner,
205 mdp_timer_duration); 205 mdp_timer_duration);
206 } 206 }
diff --git a/drivers/staging/msm/msm_fb.c b/drivers/staging/msm/msm_fb.c
index a2f29d464051..e7ef836eb8de 100644
--- a/drivers/staging/msm/msm_fb.c
+++ b/drivers/staging/msm/msm_fb.c
@@ -859,7 +859,7 @@ static int msm_fb_register(struct msm_fb_data_type *mfd)
859 break; 859 break;
860 860
861 default: 861 default:
862 MSM_FB_ERR("msm_fb_init: fb %d unkown image type!\n", 862 MSM_FB_ERR("msm_fb_init: fb %d unknown image type!\n",
863 mfd->index); 863 mfd->index);
864 return ret; 864 return ret;
865 } 865 }
@@ -1793,9 +1793,9 @@ static int msmfb_async_blit(struct fb_info *info, void __user *p)
1793/* 1793/*
1794 * NOTE: The userspace issues blit operations in a sequence, the sequence 1794 * NOTE: The userspace issues blit operations in a sequence, the sequence
1795 * start with a operation marked START and ends in an operation marked 1795 * start with a operation marked START and ends in an operation marked
1796 * END. It is guranteed by the userspace that all the blit operations 1796 * END. It is guaranteed by the userspace that all the blit operations
1797 * between START and END are only within the regions of areas designated 1797 * between START and END are only within the regions of areas designated
1798 * by the START and END operations and that the userspace doesnt modify 1798 * by the START and END operations and that the userspace doesn't modify
1799 * those areas. Hence it would be enough to perform barrier/cache operations 1799 * those areas. Hence it would be enough to perform barrier/cache operations
1800 * only on the START and END operations. 1800 * only on the START and END operations.
1801 */ 1801 */
diff --git a/drivers/staging/octeon/cvmx-cmd-queue.h b/drivers/staging/octeon/cvmx-cmd-queue.h
index 59d221422293..614653b686a0 100644
--- a/drivers/staging/octeon/cvmx-cmd-queue.h
+++ b/drivers/staging/octeon/cvmx-cmd-queue.h
@@ -214,7 +214,7 @@ static inline int __cvmx_cmd_queue_get_index(cvmx_cmd_queue_id_t queue_id)
214 /* 214 /*
215 * Warning: This code currently only works with devices that 215 * Warning: This code currently only works with devices that
216 * have 256 queues or less. Devices with more than 16 queues 216 * have 256 queues or less. Devices with more than 16 queues
217 * are layed out in memory to allow cores quick access to 217 * are laid out in memory to allow cores quick access to
218 * every 16th queue. This reduces cache thrashing when you are 218 * every 16th queue. This reduces cache thrashing when you are
219 * running 16 queues per port to support lockless operation. 219 * running 16 queues per port to support lockless operation.
220 */ 220 */
diff --git a/drivers/staging/octeon/cvmx-fpa.h b/drivers/staging/octeon/cvmx-fpa.h
index 50a8c91778fa..1f04f9658736 100644
--- a/drivers/staging/octeon/cvmx-fpa.h
+++ b/drivers/staging/octeon/cvmx-fpa.h
@@ -195,7 +195,7 @@ static inline void cvmx_fpa_async_alloc(uint64_t scr_addr, uint64_t pool)
195 cvmx_fpa_iobdma_data_t data; 195 cvmx_fpa_iobdma_data_t data;
196 196
197 /* 197 /*
198 * Hardware only uses 64 bit alligned locations, so convert 198 * Hardware only uses 64 bit aligned locations, so convert
199 * from byte address to 64-bit index 199 * from byte address to 64-bit index
200 */ 200 */
201 data.s.scraddr = scr_addr >> 3; 201 data.s.scraddr = scr_addr >> 3;
diff --git a/drivers/staging/octeon/cvmx-helper-board.h b/drivers/staging/octeon/cvmx-helper-board.h
index 611a8e03c216..b465bec43553 100644
--- a/drivers/staging/octeon/cvmx-helper-board.h
+++ b/drivers/staging/octeon/cvmx-helper-board.h
@@ -81,7 +81,7 @@ extern int cvmx_helper_board_get_mii_address(int ipd_port);
81 * @phy_addr: The address of the PHY to program 81 * @phy_addr: The address of the PHY to program
82 * @link_flags: 82 * @link_flags:
83 * Flags to control autonegotiation. Bit 0 is autonegotiation 83 * Flags to control autonegotiation. Bit 0 is autonegotiation
84 * enable/disable to maintain backware compatability. 84 * enable/disable to maintain backware compatibility.
85 * @link_info: Link speed to program. If the speed is zero and autonegotiation 85 * @link_info: Link speed to program. If the speed is zero and autonegotiation
86 * is enabled, all possible negotiation speeds are advertised. 86 * is enabled, all possible negotiation speeds are advertised.
87 * 87 *
diff --git a/drivers/staging/octeon/cvmx-helper-util.c b/drivers/staging/octeon/cvmx-helper-util.c
index 41ef8a40bb03..131182bf5abb 100644
--- a/drivers/staging/octeon/cvmx-helper-util.c
+++ b/drivers/staging/octeon/cvmx-helper-util.c
@@ -362,7 +362,7 @@ int __cvmx_helper_setup_gmx(int interface, int num_ports)
362} 362}
363 363
364/** 364/**
365 * Returns the IPD/PKO port number for a port on teh given 365 * Returns the IPD/PKO port number for a port on the given
366 * interface. 366 * interface.
367 * 367 *
368 * @interface: Interface to use 368 * @interface: Interface to use
diff --git a/drivers/staging/octeon/cvmx-helper.c b/drivers/staging/octeon/cvmx-helper.c
index 591506643d02..e9c5c836ceff 100644
--- a/drivers/staging/octeon/cvmx-helper.c
+++ b/drivers/staging/octeon/cvmx-helper.c
@@ -691,7 +691,7 @@ int __cvmx_helper_errata_fix_ipd_ptr_alignment(void)
691 691
692 if (!retry_cnt) 692 if (!retry_cnt)
693 cvmx_dprintf("WARNING: FIX_IPD_PTR_ALIGNMENT " 693 cvmx_dprintf("WARNING: FIX_IPD_PTR_ALIGNMENT "
694 "get_work() timeout occured.\n"); 694 "get_work() timeout occurred.\n");
695 695
696 /* Free packet */ 696 /* Free packet */
697 if (work) 697 if (work)
diff --git a/drivers/staging/octeon/cvmx-mdio.h b/drivers/staging/octeon/cvmx-mdio.h
index f45dc49512f2..d88ab8d8e37d 100644
--- a/drivers/staging/octeon/cvmx-mdio.h
+++ b/drivers/staging/octeon/cvmx-mdio.h
@@ -254,7 +254,7 @@ typedef union {
254#define MDIO_CLAUSE_45_READ_INC 2 254#define MDIO_CLAUSE_45_READ_INC 2
255#define MDIO_CLAUSE_45_READ 3 255#define MDIO_CLAUSE_45_READ 3
256 256
257/* MMD identifiers, mostly for accessing devices withing XENPAK modules. */ 257/* MMD identifiers, mostly for accessing devices within XENPAK modules. */
258#define CVMX_MMD_DEVICE_PMA_PMD 1 258#define CVMX_MMD_DEVICE_PMA_PMD 1
259#define CVMX_MMD_DEVICE_WIS 2 259#define CVMX_MMD_DEVICE_WIS 2
260#define CVMX_MMD_DEVICE_PCS 3 260#define CVMX_MMD_DEVICE_PCS 3
diff --git a/drivers/staging/octeon/cvmx-pko.h b/drivers/staging/octeon/cvmx-pko.h
index f068c1982497..de3412aada5d 100644
--- a/drivers/staging/octeon/cvmx-pko.h
+++ b/drivers/staging/octeon/cvmx-pko.h
@@ -98,7 +98,7 @@ typedef enum {
98 /* 98 /*
99 * PKO doesn't do any locking. It is the responsibility of the 99 * PKO doesn't do any locking. It is the responsibility of the
100 * application to make sure that no other core is accessing 100 * application to make sure that no other core is accessing
101 * the same queue at the smae time 101 * the same queue at the same time
102 */ 102 */
103 CVMX_PKO_LOCK_NONE = 0, 103 CVMX_PKO_LOCK_NONE = 0,
104 /* 104 /*
@@ -324,7 +324,7 @@ static inline void cvmx_pko_doorbell(uint64_t port, uint64_t queue,
324 * - CVMX_PKO_LOCK_NONE 324 * - CVMX_PKO_LOCK_NONE
325 * - PKO doesn't do any locking. It is the responsibility 325 * - PKO doesn't do any locking. It is the responsibility
326 * of the application to make sure that no other core 326 * of the application to make sure that no other core
327 * is accessing the same queue at the smae time. 327 * is accessing the same queue at the same time.
328 * - CVMX_PKO_LOCK_ATOMIC_TAG 328 * - CVMX_PKO_LOCK_ATOMIC_TAG
329 * - PKO performs an atomic tagswitch to insure exclusive 329 * - PKO performs an atomic tagswitch to insure exclusive
330 * access to the output queue. This will maintain 330 * access to the output queue. This will maintain
diff --git a/drivers/staging/octeon/cvmx-pow.h b/drivers/staging/octeon/cvmx-pow.h
index bf9e069a898c..999aefe3274c 100644
--- a/drivers/staging/octeon/cvmx-pow.h
+++ b/drivers/staging/octeon/cvmx-pow.h
@@ -1492,8 +1492,8 @@ static inline void cvmx_pow_tag_sw_full(cvmx_wqe_t *wqp, uint32_t tag,
1492/** 1492/**
1493 * Switch to a NULL tag, which ends any ordering or 1493 * Switch to a NULL tag, which ends any ordering or
1494 * synchronization provided by the POW for the current 1494 * synchronization provided by the POW for the current
1495 * work queue entry. This operation completes immediatly, 1495 * work queue entry. This operation completes immediately,
1496 * so completetion should not be waited for. 1496 * so completion should not be waited for.
1497 * This function does NOT wait for previous tag switches to complete, 1497 * This function does NOT wait for previous tag switches to complete,
1498 * so the caller must ensure that any previous tag switches have completed. 1498 * so the caller must ensure that any previous tag switches have completed.
1499 */ 1499 */
@@ -1532,8 +1532,8 @@ static inline void cvmx_pow_tag_sw_null_nocheck(void)
1532/** 1532/**
1533 * Switch to a NULL tag, which ends any ordering or 1533 * Switch to a NULL tag, which ends any ordering or
1534 * synchronization provided by the POW for the current 1534 * synchronization provided by the POW for the current
1535 * work queue entry. This operation completes immediatly, 1535 * work queue entry. This operation completes immediately,
1536 * so completetion should not be waited for. 1536 * so completion should not be waited for.
1537 * This function waits for any pending tag switches to complete 1537 * This function waits for any pending tag switches to complete
1538 * before requesting the switch to NULL. 1538 * before requesting the switch to NULL.
1539 */ 1539 */
@@ -1672,7 +1672,7 @@ static inline void cvmx_pow_set_priority(uint64_t core_num,
1672 1672
1673/** 1673/**
1674 * Performs a tag switch and then an immediate deschedule. This completes 1674 * Performs a tag switch and then an immediate deschedule. This completes
1675 * immediatly, so completion must not be waited for. This function does NOT 1675 * immediately, so completion must not be waited for. This function does NOT
1676 * update the wqe in DRAM to match arguments. 1676 * update the wqe in DRAM to match arguments.
1677 * 1677 *
1678 * This function does NOT wait for any prior tag switches to complete, so the 1678 * This function does NOT wait for any prior tag switches to complete, so the
@@ -1758,7 +1758,7 @@ static inline void cvmx_pow_tag_sw_desched_nocheck(
1758 1758
1759/** 1759/**
1760 * Performs a tag switch and then an immediate deschedule. This completes 1760 * Performs a tag switch and then an immediate deschedule. This completes
1761 * immediatly, so completion must not be waited for. This function does NOT 1761 * immediately, so completion must not be waited for. This function does NOT
1762 * update the wqe in DRAM to match arguments. 1762 * update the wqe in DRAM to match arguments.
1763 * 1763 *
1764 * This function waits for any prior tag switches to complete, so the 1764 * This function waits for any prior tag switches to complete, so the
diff --git a/drivers/staging/octeon/ethernet-util.h b/drivers/staging/octeon/ethernet-util.h
index 23467563fe57..c745a72a0594 100644
--- a/drivers/staging/octeon/ethernet-util.h
+++ b/drivers/staging/octeon/ethernet-util.h
@@ -55,7 +55,7 @@ static inline int INTERFACE(int ipd_port)
55 return 2; 55 return 2;
56 else if (ipd_port < 40) /* Interface 3 for loopback */ 56 else if (ipd_port < 40) /* Interface 3 for loopback */
57 return 3; 57 return 3;
58 else if (ipd_port == 40) /* Non existant interface for POW0 */ 58 else if (ipd_port == 40) /* Non existent interface for POW0 */
59 return 4; 59 return 4;
60 else 60 else
61 panic("Illegal ipd_port %d passed to INTERFACE\n", ipd_port); 61 panic("Illegal ipd_port %d passed to INTERFACE\n", ipd_port);
diff --git a/drivers/staging/olpc_dcon/Kconfig b/drivers/staging/olpc_dcon/Kconfig
index f1082f50fdce..b05306766870 100644
--- a/drivers/staging/olpc_dcon/Kconfig
+++ b/drivers/staging/olpc_dcon/Kconfig
@@ -9,7 +9,7 @@ config FB_OLPC_DCON
9 9
10config FB_OLPC_DCON_1 10config FB_OLPC_DCON_1
11 bool "OLPC XO-1 DCON support" 11 bool "OLPC XO-1 DCON support"
12 depends on FB_OLPC_DCON 12 depends on FB_OLPC_DCON && GPIO_CS5535
13 default y 13 default y
14 ---help--- 14 ---help---
15 Enable support for the DCON in XO-1 model laptops. The kernel 15 Enable support for the DCON in XO-1 model laptops. The kernel
diff --git a/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c b/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
index b154be7a2fe6..b5d21f6497f9 100644
--- a/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
@@ -80,7 +80,7 @@ static int dcon_init_xo_1(struct dcon_priv *dcon)
80 lob &= ~(1 << DCON_IRQ); 80 lob &= ~(1 << DCON_IRQ);
81 outb(lob, 0x4d0); 81 outb(lob, 0x4d0);
82 82
83 /* Register the interupt handler */ 83 /* Register the interrupt handler */
84 if (request_irq(DCON_IRQ, &dcon_interrupt, 0, "DCON", dcon)) { 84 if (request_irq(DCON_IRQ, &dcon_interrupt, 0, "DCON", dcon)) {
85 printk(KERN_ERR "olpc-dcon: failed to request DCON's irq\n"); 85 printk(KERN_ERR "olpc-dcon: failed to request DCON's irq\n");
86 goto err_req_irq; 86 goto err_req_irq;
diff --git a/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c b/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
index e213b63f8116..7aa9b1a45bd6 100644
--- a/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
@@ -7,6 +7,7 @@
7 */ 7 */
8 8
9#include <linux/acpi.h> 9#include <linux/acpi.h>
10#include <linux/delay.h>
10#include <linux/pci.h> 11#include <linux/pci.h>
11#include <linux/gpio.h> 12#include <linux/gpio.h>
12#include <asm/olpc.h> 13#include <asm/olpc.h>
diff --git a/drivers/staging/pohmelfs/crypto.c b/drivers/staging/pohmelfs/crypto.c
index 6540864216c8..5cca24fcf6ca 100644
--- a/drivers/staging/pohmelfs/crypto.c
+++ b/drivers/staging/pohmelfs/crypto.c
@@ -745,7 +745,7 @@ static int pohmelfs_crypto_init_handshake(struct pohmelfs_sb *psb)
745 745
746 /* 746 /*
747 * At this point NETFS_CAPABILITIES response command 747 * At this point NETFS_CAPABILITIES response command
748 * should setup superblock in a way, which is acceptible 748 * should setup superblock in a way, which is acceptable
749 * for both client and server, so if server refuses connection, 749 * for both client and server, so if server refuses connection,
750 * it will send error in transaction response. 750 * it will send error in transaction response.
751 */ 751 */
diff --git a/drivers/staging/quatech_usb2/quatech_usb2.c b/drivers/staging/quatech_usb2/quatech_usb2.c
index c45b09ed0d35..ca098cabc2bc 100644
--- a/drivers/staging/quatech_usb2/quatech_usb2.c
+++ b/drivers/staging/quatech_usb2/quatech_usb2.c
@@ -148,7 +148,7 @@ static struct usb_driver quausb2_usb_driver = {
148 * value of the line status flags from the port 148 * value of the line status flags from the port
149 * @shadowMSR: Last received state of the modem status register, holds 149 * @shadowMSR: Last received state of the modem status register, holds
150 * the value of the modem status received from the port 150 * the value of the modem status received from the port
151 * @rcv_flush: Flag indicating that a receive flush has occured on 151 * @rcv_flush: Flag indicating that a receive flush has occurred on
152 * the hardware. 152 * the hardware.
153 * @xmit_flush: Flag indicating that a transmit flush has been processed by 153 * @xmit_flush: Flag indicating that a transmit flush has been processed by
154 * the hardware. 154 * the hardware.
@@ -156,7 +156,7 @@ static struct usb_driver quausb2_usb_driver = {
156 * includes the size (excluding header) of URBs that have been submitted but 156 * includes the size (excluding header) of URBs that have been submitted but
157 * have not yet been sent to to the device, and bytes that have been sent out 157 * have not yet been sent to to the device, and bytes that have been sent out
158 * of the port but not yet reported sent by the "xmit_empty" messages (which 158 * of the port but not yet reported sent by the "xmit_empty" messages (which
159 * indicate the number of bytes sent each time they are recieved, despite the 159 * indicate the number of bytes sent each time they are received, despite the
160 * misleading name). 160 * misleading name).
161 * - Starts at zero when port is initialised. 161 * - Starts at zero when port is initialised.
162 * - is incremented by the size of the data to be written (no headers) 162 * - is incremented by the size of the data to be written (no headers)
@@ -649,7 +649,7 @@ static void qt2_close(struct usb_serial_port *port)
649 /* although the USB side is now empty, the UART itself may 649 /* although the USB side is now empty, the UART itself may
650 * still be pushing characters out over the line, so we have to 650 * still be pushing characters out over the line, so we have to
651 * wait testing the actual line status until the lines change 651 * wait testing the actual line status until the lines change
652 * indicating that the data is done transfering. */ 652 * indicating that the data is done transferring. */
653 /* FIXME: slow this polling down so it doesn't run the USB bus flat out 653 /* FIXME: slow this polling down so it doesn't run the USB bus flat out
654 * if it actually has to spend any time in this loop (which it normally 654 * if it actually has to spend any time in this loop (which it normally
655 * doesn't because the buffer is nearly empty) */ 655 * doesn't because the buffer is nearly empty) */
@@ -726,7 +726,7 @@ static int qt2_write(struct tty_struct *tty, struct usb_serial_port *port,
726 return 0; 726 return 0;
727 } else if (port_extra->tx_pending_bytes >= QT2_FIFO_DEPTH) { 727 } else if (port_extra->tx_pending_bytes >= QT2_FIFO_DEPTH) {
728 /* buffer is full (==). > should not occur, but would indicate 728 /* buffer is full (==). > should not occur, but would indicate
729 * that an overflow had occured */ 729 * that an overflow had occurred */
730 dbg("%s(): port transmit buffer is full!", __func__); 730 dbg("%s(): port transmit buffer is full!", __func__);
731 /* schedule_work(&port->work); commented in vendor driver */ 731 /* schedule_work(&port->work); commented in vendor driver */
732 return 0; 732 return 0;
@@ -823,7 +823,7 @@ static int qt2_write_room(struct tty_struct *tty)
823 * reduce the free space count by the size of the dispatched write. 823 * reduce the free space count by the size of the dispatched write.
824 * When a "transmit empty" message comes back up the USB read stream, 824 * When a "transmit empty" message comes back up the USB read stream,
825 * we decrement the count by the number of bytes reported sent, thus 825 * we decrement the count by the number of bytes reported sent, thus
826 * keeping track of the difference between sent and recieved bytes. 826 * keeping track of the difference between sent and received bytes.
827 */ 827 */
828 828
829 room = (QT2_FIFO_DEPTH - port_extra->tx_pending_bytes); 829 room = (QT2_FIFO_DEPTH - port_extra->tx_pending_bytes);
@@ -1795,7 +1795,7 @@ static void qt2_process_rx_char(struct usb_serial_port *port,
1795 } 1795 }
1796} 1796}
1797 1797
1798/** @brief Retreive the value of a register from the device 1798/** @brief Retrieve the value of a register from the device
1799 * 1799 *
1800 * Issues a GET_REGISTER vendor-spcific request over the USB control 1800 * Issues a GET_REGISTER vendor-spcific request over the USB control
1801 * pipe to obtain a value back from a specific register on a specific 1801 * pipe to obtain a value back from a specific register on a specific
diff --git a/drivers/staging/rt2860/chip/rtmp_phy.h b/drivers/staging/rt2860/chip/rtmp_phy.h
index 98454df30a22..a52221f1294e 100644
--- a/drivers/staging/rt2860/chip/rtmp_phy.h
+++ b/drivers/staging/rt2860/chip/rtmp_phy.h
@@ -467,7 +467,7 @@
467 DBGPRINT_ERR("BBP write R%d=0x%x fail. BusyCnt= %d.bPCIclkOff = %d. \n", _I, BbpCsr.word, BusyCnt, (_A)->bPCIclkOff); \ 467 DBGPRINT_ERR("BBP write R%d=0x%x fail. BusyCnt= %d.bPCIclkOff = %d. \n", _I, BbpCsr.word, BusyCnt, (_A)->bPCIclkOff); \
468 } \ 468 } \
469 } else { \ 469 } else { \
470 DBGPRINT_ERR("****** BBP_Write_Latch Buffer exceeds max boundry ****** \n"); \ 470 DBGPRINT_ERR("****** BBP_Write_Latch Buffer exceeds max boundary ****** \n"); \
471 } \ 471 } \
472} 472}
473#endif /* RTMP_MAC_PCI // */ 473#endif /* RTMP_MAC_PCI // */
diff --git a/drivers/staging/rt2860/common/ba_action.c b/drivers/staging/rt2860/common/ba_action.c
index 62f6f6be4acb..133bc1b87d2c 100644
--- a/drivers/staging/rt2860/common/ba_action.c
+++ b/drivers/staging/rt2860/common/ba_action.c
@@ -28,7 +28,7 @@
28#include "../rt_config.h" 28#include "../rt_config.h"
29#include <linux/kernel.h> 29#include <linux/kernel.h>
30 30
31#define BA_ORI_INIT_SEQ (pEntry->TxSeq[TID]) /*1 // inital sequence number of BA session */ 31#define BA_ORI_INIT_SEQ (pEntry->TxSeq[TID]) /*1 // initial sequence number of BA session */
32 32
33#define ORI_SESSION_MAX_RETRY 8 33#define ORI_SESSION_MAX_RETRY 8
34#define ORI_BA_SESSION_TIMEOUT (2000) /* ms */ 34#define ORI_BA_SESSION_TIMEOUT (2000) /* ms */
@@ -1487,7 +1487,7 @@ static void ba_enqueue_reordering_packet(struct rt_rtmp_adapter *pAd,
1487 1487
1488 /* 1488 /*
1489 * flush all pending reordering mpdus 1489 * flush all pending reordering mpdus
1490 * and receving mpdu to upper layer 1490 * and receiving mpdu to upper layer
1491 * make tcp/ip to take care reordering mechanism 1491 * make tcp/ip to take care reordering mechanism
1492 */ 1492 */
1493 /*ba_refresh_reordering_mpdus(pAd, pBAEntry); */ 1493 /*ba_refresh_reordering_mpdus(pAd, pBAEntry); */
diff --git a/drivers/staging/rt2860/common/cmm_aes.c b/drivers/staging/rt2860/common/cmm_aes.c
index a99879bada42..d70d229a6e53 100644
--- a/drivers/staging/rt2860/common/cmm_aes.c
+++ b/drivers/staging/rt2860/common/cmm_aes.c
@@ -858,7 +858,7 @@ static uint32 KT1[256];
858static uint32 KT2[256]; 858static uint32 KT2[256];
859static uint32 KT3[256]; 859static uint32 KT3[256];
860 860
861/* platform-independant 32-bit integer manipulation macros */ 861/* platform-independent 32-bit integer manipulation macros */
862 862
863#define GET_UINT32(n,b,i) \ 863#define GET_UINT32(n,b,i) \
864{ \ 864{ \
diff --git a/drivers/staging/rt2860/common/cmm_cfg.c b/drivers/staging/rt2860/common/cmm_cfg.c
index 24f439378439..727f79929258 100644
--- a/drivers/staging/rt2860/common/cmm_cfg.c
+++ b/drivers/staging/rt2860/common/cmm_cfg.c
@@ -223,7 +223,7 @@ int RT_CfgSetWepKey(struct rt_rtmp_adapter *pAd,
223 pAdapter Pointer to our adapter 223 pAdapter Pointer to our adapter
224 keyString WPA pre-shared key string 224 keyString WPA pre-shared key string
225 pHashStr String used for password hash function 225 pHashStr String used for password hash function
226 hashStrLen Lenght of the hash string 226 hashStrLen Length of the hash string
227 pPMKBuf Output buffer of WPAPSK key 227 pPMKBuf Output buffer of WPAPSK key
228 228
229 Return: 229 Return:
diff --git a/drivers/staging/rt2860/common/cmm_data.c b/drivers/staging/rt2860/common/cmm_data.c
index f6c193cb84ee..33799e1449ae 100644
--- a/drivers/staging/rt2860/common/cmm_data.c
+++ b/drivers/staging/rt2860/common/cmm_data.c
@@ -337,7 +337,7 @@ int MlmeHardTransmitMgmtRing(struct rt_rtmp_adapter *pAd,
337 337
338 /* */ 338 /* */
339 /* In WMM-UAPSD, mlme frame should be set psm as power saving but probe request frame */ 339 /* In WMM-UAPSD, mlme frame should be set psm as power saving but probe request frame */
340 /* Data-Null packets alse pass through MMRequest in RT2860, however, we hope control the psm bit to pass APSD */ 340 /* Data-Null packets also pass through MMRequest in RT2860, however, we hope control the psm bit to pass APSD */
341/* if ((pHeader_802_11->FC.Type != BTYPE_DATA) && (pHeader_802_11->FC.Type != BTYPE_CNTL)) */ 341/* if ((pHeader_802_11->FC.Type != BTYPE_DATA) && (pHeader_802_11->FC.Type != BTYPE_CNTL)) */
342 { 342 {
343 if ((pHeader_802_11->FC.SubType == SUBTYPE_ACTION) || 343 if ((pHeader_802_11->FC.SubType == SUBTYPE_ACTION) ||
@@ -1933,7 +1933,7 @@ BOOLEAN RTMPCheckEtherType(struct rt_rtmp_adapter *pAd, void *pPacket)
1933 1933
1934 if (TypeLen <= 1500) { /* 802.3, 802.3 LLC */ 1934 if (TypeLen <= 1500) { /* 802.3, 802.3 LLC */
1935 /* 1935 /*
1936 DestMAC(6) + SrcMAC(6) + Lenght(2) + 1936 DestMAC(6) + SrcMAC(6) + Length(2) +
1937 DSAP(1) + SSAP(1) + Control(1) + 1937 DSAP(1) + SSAP(1) + Control(1) +
1938 if the DSAP = 0xAA, SSAP=0xAA, Contorl = 0x03, it has a 5-bytes SNAP header. 1938 if the DSAP = 0xAA, SSAP=0xAA, Contorl = 0x03, it has a 5-bytes SNAP header.
1939 => + SNAP (5, OriginationID(3) + etherType(2)) 1939 => + SNAP (5, OriginationID(3) + etherType(2))
diff --git a/drivers/staging/rt2860/common/cmm_data_pci.c b/drivers/staging/rt2860/common/cmm_data_pci.c
index 7af59ff9e220..bef0bbd8cef7 100644
--- a/drivers/staging/rt2860/common/cmm_data_pci.c
+++ b/drivers/staging/rt2860/common/cmm_data_pci.c
@@ -438,13 +438,13 @@ int RTMPCheckRxError(struct rt_rtmp_adapter *pAd,
438 /* Add Rx size to channel load counter, we should ignore error counts */ 438 /* Add Rx size to channel load counter, we should ignore error counts */
439 pAd->StaCfg.CLBusyBytes += (pRxD->SDL0 + 14); 439 pAd->StaCfg.CLBusyBytes += (pRxD->SDL0 + 14);
440 440
441 /* Drop ToDs promiscous frame, it is opened due to CCX 2 channel load statistics */ 441 /* Drop ToDs promiscuous frame, it is opened due to CCX 2 channel load statistics */
442 if (pHeader != NULL) { 442 if (pHeader != NULL) {
443 if (pHeader->FC.ToDs) { 443 if (pHeader->FC.ToDs) {
444 return (NDIS_STATUS_FAILURE); 444 return (NDIS_STATUS_FAILURE);
445 } 445 }
446 } 446 }
447 /* Drop not U2M frames, cant's drop here because we will drop beacon in this case */ 447 /* Drop not U2M frames, can't's drop here because we will drop beacon in this case */
448 /* I am kind of doubting the U2M bit operation */ 448 /* I am kind of doubting the U2M bit operation */
449 /* if (pRxD->U2M == 0) */ 449 /* if (pRxD->U2M == 0) */
450 /* return(NDIS_STATUS_FAILURE); */ 450 /* return(NDIS_STATUS_FAILURE); */
@@ -939,7 +939,7 @@ int MlmeHardTransmitTxRing(struct rt_rtmp_adapter *pAd,
939 /* */ 939 /* */
940 /* */ 940 /* */
941 /* In WMM-UAPSD, mlme frame should be set psm as power saving but probe request frame */ 941 /* In WMM-UAPSD, mlme frame should be set psm as power saving but probe request frame */
942 /* Data-Null packets alse pass through MMRequest in RT2860, however, we hope control the psm bit to pass APSD */ 942 /* Data-Null packets also pass through MMRequest in RT2860, however, we hope control the psm bit to pass APSD */
943 if (pHeader_802_11->FC.Type != BTYPE_DATA) { 943 if (pHeader_802_11->FC.Type != BTYPE_DATA) {
944 if ((pHeader_802_11->FC.SubType == SUBTYPE_PROBE_REQ) 944 if ((pHeader_802_11->FC.SubType == SUBTYPE_PROBE_REQ)
945 || !(pAd->CommonCfg.bAPSDCapable 945 || !(pAd->CommonCfg.bAPSDCapable
diff --git a/drivers/staging/rt2860/common/cmm_data_usb.c b/drivers/staging/rt2860/common/cmm_data_usb.c
index 7c56c2f51987..5637857ae9eb 100644
--- a/drivers/staging/rt2860/common/cmm_data_usb.c
+++ b/drivers/staging/rt2860/common/cmm_data_usb.c
@@ -702,7 +702,7 @@ Arguments:
702 *pRxPending pending received packet flag 702 *pRxPending pending received packet flag
703 703
704Return Value: 704Return Value:
705 the recieved packet 705 the received packet
706 706
707Note: 707Note:
708======================================================================== 708========================================================================
@@ -850,7 +850,7 @@ int RTMPCheckRxError(struct rt_rtmp_adapter *pAd,
850 /* Add Rx size to channel load counter, we should ignore error counts */ 850 /* Add Rx size to channel load counter, we should ignore error counts */
851 pAd->StaCfg.CLBusyBytes += (pRxWI->MPDUtotalByteCount + 14); 851 pAd->StaCfg.CLBusyBytes += (pRxWI->MPDUtotalByteCount + 14);
852 852
853 /* Drop ToDs promiscous frame, it is opened due to CCX 2 channel load statistics */ 853 /* Drop ToDs promiscuous frame, it is opened due to CCX 2 channel load statistics */
854 if (pHeader->FC.ToDs) { 854 if (pHeader->FC.ToDs) {
855 DBGPRINT_RAW(RT_DEBUG_ERROR, ("Err;FC.ToDs\n")); 855 DBGPRINT_RAW(RT_DEBUG_ERROR, ("Err;FC.ToDs\n"));
856 return NDIS_STATUS_FAILURE; 856 return NDIS_STATUS_FAILURE;
@@ -860,7 +860,7 @@ int RTMPCheckRxError(struct rt_rtmp_adapter *pAd,
860 DBGPRINT_RAW(RT_DEBUG_ERROR, ("received packet too long\n")); 860 DBGPRINT_RAW(RT_DEBUG_ERROR, ("received packet too long\n"));
861 return NDIS_STATUS_FAILURE; 861 return NDIS_STATUS_FAILURE;
862 } 862 }
863 /* Drop not U2M frames, cant's drop here because we will drop beacon in this case */ 863 /* Drop not U2M frames, can't's drop here because we will drop beacon in this case */
864 /* I am kind of doubting the U2M bit operation */ 864 /* I am kind of doubting the U2M bit operation */
865 /* if (pRxD->U2M == 0) */ 865 /* if (pRxD->U2M == 0) */
866 /* return(NDIS_STATUS_FAILURE); */ 866 /* return(NDIS_STATUS_FAILURE); */
diff --git a/drivers/staging/rt2860/common/cmm_mac_pci.c b/drivers/staging/rt2860/common/cmm_mac_pci.c
index 21eed2507e1c..d06f0a6dc379 100644
--- a/drivers/staging/rt2860/common/cmm_mac_pci.c
+++ b/drivers/staging/rt2860/common/cmm_mac_pci.c
@@ -1446,7 +1446,7 @@ BOOLEAN RT28xxPciAsicRadioOff(struct rt_rtmp_adapter *pAd,
1446 pAd->CheckDmaBusyCount = 0; 1446 pAd->CheckDmaBusyCount = 0;
1447 } 1447 }
1448 */ 1448 */
1449/*KH Debug:My original codes have the follwoing codes, but currecnt codes do not have it. */ 1449/*KH Debug:My original codes have the following codes, but currecnt codes do not have it. */
1450/* Disable for stability. If PCIE Link Control is modified for advance power save, re-covery this code segment. */ 1450/* Disable for stability. If PCIE Link Control is modified for advance power save, re-covery this code segment. */
1451 RTMP_IO_WRITE32(pAd, PBF_SYS_CTRL, 0x1280); 1451 RTMP_IO_WRITE32(pAd, PBF_SYS_CTRL, 0x1280);
1452/*OPSTATUS_SET_FLAG(pAd, fOP_STATUS_CLKSELECT_40MHZ); */ 1452/*OPSTATUS_SET_FLAG(pAd, fOP_STATUS_CLKSELECT_40MHZ); */
diff --git a/drivers/staging/rt2860/common/cmm_sanity.c b/drivers/staging/rt2860/common/cmm_sanity.c
index 6b003c903444..3bfb4ad00c1a 100644
--- a/drivers/staging/rt2860/common/cmm_sanity.c
+++ b/drivers/staging/rt2860/common/cmm_sanity.c
@@ -67,7 +67,7 @@ BOOLEAN MlmeAddBAReqSanity(struct rt_rtmp_adapter *pAd,
67 67
68 if ((MsgLen != sizeof(struct rt_mlme_addba_req))) { 68 if ((MsgLen != sizeof(struct rt_mlme_addba_req))) {
69 DBGPRINT(RT_DEBUG_TRACE, 69 DBGPRINT(RT_DEBUG_TRACE,
70 ("MlmeAddBAReqSanity fail - message lenght not correct.\n")); 70 ("MlmeAddBAReqSanity fail - message length not correct.\n"));
71 return FALSE; 71 return FALSE;
72 } 72 }
73 73
@@ -104,7 +104,7 @@ BOOLEAN MlmeDelBAReqSanity(struct rt_rtmp_adapter *pAd, void * Msg, unsigned lon
104 104
105 if ((MsgLen != sizeof(struct rt_mlme_delba_req))) { 105 if ((MsgLen != sizeof(struct rt_mlme_delba_req))) {
106 DBGPRINT(RT_DEBUG_ERROR, 106 DBGPRINT(RT_DEBUG_ERROR,
107 ("MlmeDelBAReqSanity fail - message lenght not correct.\n")); 107 ("MlmeDelBAReqSanity fail - message length not correct.\n"));
108 return FALSE; 108 return FALSE;
109 } 109 }
110 110
diff --git a/drivers/staging/rt2860/common/cmm_sync.c b/drivers/staging/rt2860/common/cmm_sync.c
index f84194da47bc..aefe1b774650 100644
--- a/drivers/staging/rt2860/common/cmm_sync.c
+++ b/drivers/staging/rt2860/common/cmm_sync.c
@@ -694,7 +694,7 @@ void ScanNextChannel(struct rt_rtmp_adapter *pAd)
694 MiniportMMRequest(pAd, 0, pOutBuffer, FrameLen); 694 MiniportMMRequest(pAd, 0, pOutBuffer, FrameLen);
695 MlmeFreeMemory(pAd, pOutBuffer); 695 MlmeFreeMemory(pAd, pOutBuffer);
696 } 696 }
697 /* For SCAN_CISCO_PASSIVE, do nothing and silently wait for beacon or other probe reponse */ 697 /* For SCAN_CISCO_PASSIVE, do nothing and silently wait for beacon or other probe response */
698 698
699 pAd->Mlme.SyncMachine.CurrState = SCAN_LISTEN; 699 pAd->Mlme.SyncMachine.CurrState = SCAN_LISTEN;
700 } 700 }
diff --git a/drivers/staging/rt2860/common/cmm_wpa.c b/drivers/staging/rt2860/common/cmm_wpa.c
index 0040f45b629b..616ebec50c61 100644
--- a/drivers/staging/rt2860/common/cmm_wpa.c
+++ b/drivers/staging/rt2860/common/cmm_wpa.c
@@ -1222,7 +1222,7 @@ void PeerGroupMsg2Action(struct rt_rtmp_adapter *pAd,
1222 1222
1223 Note: 1223 Note:
1224 All these constants are defined in wpa.h 1224 All these constants are defined in wpa.h
1225 For supplicant, there is only EAPOL Key message avaliable 1225 For supplicant, there is only EAPOL Key message available
1226 1226
1227 ======================================================================== 1227 ========================================================================
1228*/ 1228*/
@@ -1267,7 +1267,7 @@ BOOLEAN WpaMsgTypeSubst(u8 EAPType, int * MsgType)
1267 int prefix_len - the length of the label 1267 int prefix_len - the length of the label
1268 u8 *data - a specific data with variable length 1268 u8 *data - a specific data with variable length
1269 int data_len - the length of a specific data 1269 int data_len - the length of a specific data
1270 int len - the output lenght 1270 int len - the output length
1271 1271
1272 Return Value: 1272 Return Value:
1273 u8 *output - the calculated result 1273 u8 *output - the calculated result
diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c
index d9c3fd5c2166..e48eac0f3a29 100644
--- a/drivers/staging/rt2860/common/mlme.c
+++ b/drivers/staging/rt2860/common/mlme.c
@@ -632,7 +632,7 @@ void MlmeHalt(struct rt_rtmp_adapter *pAd)
632 pChipOps->AsicHaltAction(pAd); 632 pChipOps->AsicHaltAction(pAd);
633 } 633 }
634 634
635 RTMPusecDelay(5000); /* 5 msec to gurantee Ant Diversity timer canceled */ 635 RTMPusecDelay(5000); /* 5 msec to guarantee Ant Diversity timer canceled */
636 636
637 MlmeQueueDestroy(&pAd->Mlme.Queue); 637 MlmeQueueDestroy(&pAd->Mlme.Queue);
638 NdisFreeSpinLock(&pAd->Mlme.TaskLock); 638 NdisFreeSpinLock(&pAd->Mlme.TaskLock);
@@ -1107,14 +1107,14 @@ void MlmeSelectTxRateTable(struct rt_rtmp_adapter *pAd,
1107 *pInitTxRateIdx = 1107 *pInitTxRateIdx =
1108 RateSwitchTable11N1S[1]; 1108 RateSwitchTable11N1S[1];
1109 DBGPRINT_RAW(RT_DEBUG_ERROR, 1109 DBGPRINT_RAW(RT_DEBUG_ERROR,
1110 ("DRS: unkown mode,default use 11N 1S AP \n")); 1110 ("DRS: unknown mode,default use 11N 1S AP \n"));
1111 } else { 1111 } else {
1112 *ppTable = RateSwitchTable11N2S; 1112 *ppTable = RateSwitchTable11N2S;
1113 *pTableSize = RateSwitchTable11N2S[0]; 1113 *pTableSize = RateSwitchTable11N2S[0];
1114 *pInitTxRateIdx = 1114 *pInitTxRateIdx =
1115 RateSwitchTable11N2S[1]; 1115 RateSwitchTable11N2S[1];
1116 DBGPRINT_RAW(RT_DEBUG_ERROR, 1116 DBGPRINT_RAW(RT_DEBUG_ERROR,
1117 ("DRS: unkown mode,default use 11N 2S AP \n")); 1117 ("DRS: unknown mode,default use 11N 2S AP \n"));
1118 } 1118 }
1119 } else { 1119 } else {
1120 if (pAd->CommonCfg.TxStream == 1) { 1120 if (pAd->CommonCfg.TxStream == 1) {
@@ -1123,7 +1123,7 @@ void MlmeSelectTxRateTable(struct rt_rtmp_adapter *pAd,
1123 *pInitTxRateIdx = 1123 *pInitTxRateIdx =
1124 RateSwitchTable11N1S[1]; 1124 RateSwitchTable11N1S[1];
1125 DBGPRINT_RAW(RT_DEBUG_ERROR, 1125 DBGPRINT_RAW(RT_DEBUG_ERROR,
1126 ("DRS: unkown mode,default use 11N 1S AP \n")); 1126 ("DRS: unknown mode,default use 11N 1S AP \n"));
1127 } else { 1127 } else {
1128 *ppTable = RateSwitchTable11N2SForABand; 1128 *ppTable = RateSwitchTable11N2SForABand;
1129 *pTableSize = 1129 *pTableSize =
@@ -1131,11 +1131,11 @@ void MlmeSelectTxRateTable(struct rt_rtmp_adapter *pAd,
1131 *pInitTxRateIdx = 1131 *pInitTxRateIdx =
1132 RateSwitchTable11N2SForABand[1]; 1132 RateSwitchTable11N2SForABand[1];
1133 DBGPRINT_RAW(RT_DEBUG_ERROR, 1133 DBGPRINT_RAW(RT_DEBUG_ERROR,
1134 ("DRS: unkown mode,default use 11N 2S AP \n")); 1134 ("DRS: unknown mode,default use 11N 2S AP \n"));
1135 } 1135 }
1136 } 1136 }
1137 DBGPRINT_RAW(RT_DEBUG_ERROR, 1137 DBGPRINT_RAW(RT_DEBUG_ERROR,
1138 ("DRS: unkown mode (SupRateLen=%d, ExtRateLen=%d, MCSSet[0]=0x%x, MCSSet[1]=0x%x)\n", 1138 ("DRS: unknown mode (SupRateLen=%d, ExtRateLen=%d, MCSSet[0]=0x%x, MCSSet[1]=0x%x)\n",
1139 pAd->StaActive.SupRateLen, 1139 pAd->StaActive.SupRateLen,
1140 pAd->StaActive.ExtRateLen, 1140 pAd->StaActive.ExtRateLen,
1141 pAd->StaActive.SupportedPhyInfo.MCSSet[0], 1141 pAd->StaActive.SupportedPhyInfo.MCSSet[0],
@@ -1368,7 +1368,7 @@ void STAMlmePeriodicExec(struct rt_rtmp_adapter *pAd)
1368 if ((pAd->StaCfg.LastScanTime + 1368 if ((pAd->StaCfg.LastScanTime +
1369 10 * OS_HZ) < pAd->Mlme.Now32) { 1369 10 * OS_HZ) < pAd->Mlme.Now32) {
1370 DBGPRINT(RT_DEBUG_TRACE, 1370 DBGPRINT(RT_DEBUG_TRACE,
1371 ("MMCHK - Roaming, No eligable entry, try new scan!\n")); 1371 ("MMCHK - Roaming, No eligible entry, try new scan!\n"));
1372 pAd->StaCfg.ScanCnt = 2; 1372 pAd->StaCfg.ScanCnt = 2;
1373 pAd->StaCfg.LastScanTime = 1373 pAd->StaCfg.LastScanTime =
1374 pAd->Mlme.Now32; 1374 pAd->Mlme.Now32;
@@ -2828,7 +2828,7 @@ void UpdateBasicRateBitmap(struct rt_rtmp_adapter *pAdapter)
2828 2828
2829/* IRQL = PASSIVE_LEVEL */ 2829/* IRQL = PASSIVE_LEVEL */
2830/* IRQL = DISPATCH_LEVEL */ 2830/* IRQL = DISPATCH_LEVEL */
2831/* bLinkUp is to identify the inital link speed. */ 2831/* bLinkUp is to identify the initial link speed. */
2832/* TRUE indicates the rate update at linkup, we should not try to set the rate at 54Mbps. */ 2832/* TRUE indicates the rate update at linkup, we should not try to set the rate at 54Mbps. */
2833void MlmeUpdateTxRates(struct rt_rtmp_adapter *pAd, IN BOOLEAN bLinkUp, u8 apidx) 2833void MlmeUpdateTxRates(struct rt_rtmp_adapter *pAd, IN BOOLEAN bLinkUp, u8 apidx)
2834{ 2834{
diff --git a/drivers/staging/rt2860/common/rtmp_init.c b/drivers/staging/rt2860/common/rtmp_init.c
index d359a14f5d4d..5fa193eac0d3 100644
--- a/drivers/staging/rt2860/common/rtmp_init.c
+++ b/drivers/staging/rt2860/common/rtmp_init.c
@@ -2037,7 +2037,7 @@ void NICUpdateFifoStaCounters(struct rt_rtmp_adapter *pAd)
2037 2037
2038 pEntry->FIFOCount = 0; 2038 pEntry->FIFOCount = 0;
2039 pEntry->OneSecTxNoRetryOkCount++; 2039 pEntry->OneSecTxNoRetryOkCount++;
2040 /* update NoDataIdleCount when sucessful send packet to STA. */ 2040 /* update NoDataIdleCount when successful send packet to STA. */
2041 pEntry->NoDataIdleCount = 0; 2041 pEntry->NoDataIdleCount = 0;
2042 pEntry->ContinueTxFailCnt = 0; 2042 pEntry->ContinueTxFailCnt = 0;
2043 } 2043 }
@@ -2516,7 +2516,7 @@ void UserCfgInit(struct rt_rtmp_adapter *pAd)
2516 /*pAd->TurnAggrBulkInCount = 0; */ 2516 /*pAd->TurnAggrBulkInCount = 0; */
2517 pAd->bUsbTxBulkAggre = 0; 2517 pAd->bUsbTxBulkAggre = 0;
2518 2518
2519 /* init as unsed value to ensure driver will set to MCU once. */ 2519 /* init as unused value to ensure driver will set to MCU once. */
2520 pAd->LedIndicatorStrength = 0xFF; 2520 pAd->LedIndicatorStrength = 0xFF;
2521 2521
2522 pAd->CommonCfg.MaxPktOneTxBulk = 2; 2522 pAd->CommonCfg.MaxPktOneTxBulk = 2;
@@ -3076,11 +3076,11 @@ void RTMPSetLED(struct rt_rtmp_adapter *pAd, u8 Status)
3076 ======================================================================== 3076 ========================================================================
3077 3077
3078 Routine Description: 3078 Routine Description:
3079 Set LED Signal Stregth 3079 Set LED Signal Strength
3080 3080
3081 Arguments: 3081 Arguments:
3082 pAd Pointer to our adapter 3082 pAd Pointer to our adapter
3083 Dbm Signal Stregth 3083 Dbm Signal Strength
3084 3084
3085 Return Value: 3085 Return Value:
3086 None 3086 None
@@ -3090,7 +3090,7 @@ void RTMPSetLED(struct rt_rtmp_adapter *pAd, u8 Status)
3090 Note: 3090 Note:
3091 Can be run on any IRQL level. 3091 Can be run on any IRQL level.
3092 3092
3093 According to Microsoft Zero Config Wireless Signal Stregth definition as belows. 3093 According to Microsoft Zero Config Wireless Signal Strength definition as belows.
3094 <= -90 No Signal 3094 <= -90 No Signal
3095 <= -81 Very Low 3095 <= -81 Very Low
3096 <= -71 Low 3096 <= -71 Low
@@ -3118,7 +3118,7 @@ void RTMPSetSignalLED(struct rt_rtmp_adapter *pAd, IN NDIS_802_11_RSSI Dbm)
3118 nLed = 31; 3118 nLed = 31;
3119 3119
3120 /* */ 3120 /* */
3121 /* Update Signal Stregth to firmware if changed. */ 3121 /* Update Signal Strength to firmware if changed. */
3122 /* */ 3122 /* */
3123 if (pAd->LedIndicatorStrength != nLed) { 3123 if (pAd->LedIndicatorStrength != nLed) {
3124 AsicSendCommandToMcu(pAd, 0x51, 0xff, nLed, 3124 AsicSendCommandToMcu(pAd, 0x51, 0xff, nLed,
@@ -3166,7 +3166,7 @@ void RTMPEnableRxTx(struct rt_rtmp_adapter *pAd)
3166 if (pAd->CommonCfg.PSPXlink) 3166 if (pAd->CommonCfg.PSPXlink)
3167 rx_filter_flag = PSPXLINK; 3167 rx_filter_flag = PSPXLINK;
3168 else 3168 else
3169 rx_filter_flag = STANORMAL; /* Staion not drop control frame will fail WiFi Certification. */ 3169 rx_filter_flag = STANORMAL; /* Station not drop control frame will fail WiFi Certification. */
3170 RTMP_IO_WRITE32(pAd, RX_FILTR_CFG, rx_filter_flag); 3170 RTMP_IO_WRITE32(pAd, RX_FILTR_CFG, rx_filter_flag);
3171 } 3171 }
3172 3172
diff --git a/drivers/staging/rt2860/common/spectrum.c b/drivers/staging/rt2860/common/spectrum.c
index c0d2f428069c..ceb622df12d7 100644
--- a/drivers/staging/rt2860/common/spectrum.c
+++ b/drivers/staging/rt2860/common/spectrum.c
@@ -1058,8 +1058,8 @@ static void InsertMeasureReqIE(struct rt_rtmp_adapter *pAd,
1058 3. Measure Token. 1058 3. Measure Token.
1059 4. Measure Request Mode. 1059 4. Measure Request Mode.
1060 5. Measure Request Type. 1060 5. Measure Request Type.
1061 6. Length of Report Infomation 1061 6. Length of Report Information
1062 7. Pointer of Report Infomation Buffer. 1062 7. Pointer of Report Information Buffer.
1063 1063
1064 Return : None. 1064 Return : None.
1065 ========================================================================== 1065 ==========================================================================
@@ -1400,7 +1400,7 @@ static void StartDFSProcedure(struct rt_rtmp_adapter *pAd,
1400 Parametrs: 1400 Parametrs:
1401 1. MLME message containing the received frame 1401 1. MLME message containing the received frame
1402 2. message length. 1402 2. message length.
1403 3. Channel switch announcement infomation buffer. 1403 3. Channel switch announcement information buffer.
1404 1404
1405 Return : None. 1405 Return : None.
1406 ========================================================================== 1406 ==========================================================================
@@ -1465,7 +1465,7 @@ static BOOLEAN PeerChSwAnnSanity(struct rt_rtmp_adapter *pAd,
1465 Parametrs: 1465 Parametrs:
1466 1. MLME message containing the received frame 1466 1. MLME message containing the received frame
1467 2. message length. 1467 2. message length.
1468 3. Measurement request infomation buffer. 1468 3. Measurement request information buffer.
1469 1469
1470 Return : None. 1470 Return : None.
1471 ========================================================================== 1471 ==========================================================================
@@ -1538,8 +1538,8 @@ static BOOLEAN PeerMeasureReqSanity(struct rt_rtmp_adapter *pAd,
1538 Parametrs: 1538 Parametrs:
1539 1. MLME message containing the received frame 1539 1. MLME message containing the received frame
1540 2. message length. 1540 2. message length.
1541 3. Measurement report infomation buffer. 1541 3. Measurement report information buffer.
1542 4. basic report infomation buffer. 1542 4. basic report information buffer.
1543 1543
1544 Return : None. 1544 Return : None.
1545 ========================================================================== 1545 ==========================================================================
diff --git a/drivers/staging/rt2860/mlme.h b/drivers/staging/rt2860/mlme.h
index cd1ee3d7a91d..a285851692ee 100644
--- a/drivers/staging/rt2860/mlme.h
+++ b/drivers/staging/rt2860/mlme.h
@@ -374,7 +374,7 @@ struct PACKED rt_sec_cha_offset_ie {
374struct rt_ht_phy_info { 374struct rt_ht_phy_info {
375 BOOLEAN bHtEnable; /* If we should use ht rate. */ 375 BOOLEAN bHtEnable; /* If we should use ht rate. */
376 BOOLEAN bPreNHt; /* If we should use ht rate. */ 376 BOOLEAN bPreNHt; /* If we should use ht rate. */
377 /*Substract from HT Capability IE */ 377 /*Subtract from HT Capability IE */
378 u8 MCSSet[16]; 378 u8 MCSSet[16];
379}; 379};
380 380
@@ -392,7 +392,7 @@ struct rt_ht_capability {
392 u16 AmsduSize:1; /* Max receiving A-MSDU size */ 392 u16 AmsduSize:1; /* Max receiving A-MSDU size */
393 u16 rsv:5; 393 u16 rsv:5;
394 394
395 /*Substract from Addiont HT INFO IE */ 395 /*Subtract from Addiont HT INFO IE */
396 u8 MaxRAmpduFactor:2; 396 u8 MaxRAmpduFactor:2;
397 u8 MpduDensity:3; 397 u8 MpduDensity:3;
398 u8 ExtChanOffset:2; /* Please note the difference with following u8 NewExtChannelOffset; from 802.11n */ 398 u8 ExtChanOffset:2; /* Please note the difference with following u8 NewExtChannelOffset; from 802.11n */
@@ -410,7 +410,7 @@ struct rt_ht_capability {
410 u8 BSSCoexist2040; 410 u8 BSSCoexist2040;
411}; 411};
412 412
413/* field in Addtional HT Information IE . */ 413/* field in Additional HT Information IE . */
414struct PACKED rt_add_htinfo { 414struct PACKED rt_add_htinfo {
415 u8 ExtChanOffset:2; 415 u8 ExtChanOffset:2;
416 u8 RecomWidth:1; 416 u8 RecomWidth:1;
@@ -857,7 +857,7 @@ struct rt_state_machine {
857}; 857};
858 858
859/* MLME AUX data structure that holds temporarliy settings during a connection attempt. */ 859/* MLME AUX data structure that holds temporarliy settings during a connection attempt. */
860/* Once this attemp succeeds, all settings will be copy to pAd->StaActive. */ 860/* Once this attempt succeeds, all settings will be copy to pAd->StaActive. */
861/* A connection attempt (user set OID, roaming, CCX fast roaming,..) consists of */ 861/* A connection attempt (user set OID, roaming, CCX fast roaming,..) consists of */
862/* several steps (JOIN, AUTH, ASSOC or REASSOC) and may fail at any step. We purposely */ 862/* several steps (JOIN, AUTH, ASSOC or REASSOC) and may fail at any step. We purposely */
863/* separate this under-trial settings away from pAd->StaActive so that once */ 863/* separate this under-trial settings away from pAd->StaActive so that once */
diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c
index e5b042712430..1583347fcd52 100644
--- a/drivers/staging/rt2860/rt_linux.c
+++ b/drivers/staging/rt2860/rt_linux.c
@@ -283,7 +283,7 @@ BOOLEAN OS_Need_Clone_Packet(void)
283 Arguments: 283 Arguments:
284 pAd Pointer to our adapter 284 pAd Pointer to our adapter
285 pInsAMSDUHdr EWC A-MSDU format has extra 14-bytes header. if TRUE, insert this 14-byte hdr in front of MSDU. 285 pInsAMSDUHdr EWC A-MSDU format has extra 14-bytes header. if TRUE, insert this 14-byte hdr in front of MSDU.
286 *pSrcTotalLen return total packet length. This lenght is calculated with 802.3 format packet. 286 *pSrcTotalLen return total packet length. This length is calculated with 802.3 format packet.
287 287
288 Return Value: 288 Return Value:
289 NDIS_STATUS_SUCCESS 289 NDIS_STATUS_SUCCESS
diff --git a/drivers/staging/rt2860/rt_pci_rbus.c b/drivers/staging/rt2860/rt_pci_rbus.c
index e5fb67cd9a68..f80ab4e6a0ac 100644
--- a/drivers/staging/rt2860/rt_pci_rbus.c
+++ b/drivers/staging/rt2860/rt_pci_rbus.c
@@ -619,7 +619,7 @@ IRQ_HANDLE_TYPE rt2860_interrupt(int irq, void *dev_instance)
619 Or kernel will panic after ifconfig ra0 down sometimes */ 619 Or kernel will panic after ifconfig ra0 down sometimes */
620 620
621 /* */ 621 /* */
622 /* Inital the Interrupt source. */ 622 /* Initial the Interrupt source. */
623 /* */ 623 /* */
624 IntSource.word = 0x00000000L; 624 IntSource.word = 0x00000000L;
625/* McuIntSource.word = 0x00000000L; */ 625/* McuIntSource.word = 0x00000000L; */
diff --git a/drivers/staging/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h
index d16b06a6e2ac..3c31340c946a 100644
--- a/drivers/staging/rt2860/rtmp.h
+++ b/drivers/staging/rt2860/rtmp.h
@@ -756,7 +756,7 @@ struct rt_tkip_key_info {
756/* */ 756/* */
757struct rt_private { 757struct rt_private {
758 u32 SystemResetCnt; /* System reset counter */ 758 u32 SystemResetCnt; /* System reset counter */
759 u32 TxRingFullCnt; /* Tx ring full occurrance number */ 759 u32 TxRingFullCnt; /* Tx ring full occurrence number */
760 u32 PhyRxErrCnt; /* PHY Rx error count, for debug purpose, might move to global counter */ 760 u32 PhyRxErrCnt; /* PHY Rx error count, for debug purpose, might move to global counter */
761 /* Variables for WEP encryption / decryption in rtmp_wep.c */ 761 /* Variables for WEP encryption / decryption in rtmp_wep.c */
762 u32 FCSCRC32; 762 u32 FCSCRC32;
@@ -925,7 +925,7 @@ struct rt_mlme {
925 **************************************************************************/ 925 **************************************************************************/
926struct reordering_mpdu { 926struct reordering_mpdu {
927 struct reordering_mpdu *next; 927 struct reordering_mpdu *next;
928 void *pPacket; /* coverted to 802.3 frame */ 928 void *pPacket; /* converted to 802.3 frame */
929 int Sequence; /* sequence number of MPDU */ 929 int Sequence; /* sequence number of MPDU */
930 BOOLEAN bAMSDU; 930 BOOLEAN bAMSDU;
931}; 931};
diff --git a/drivers/staging/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c
index 5717e12a9544..49b1013e7a03 100644
--- a/drivers/staging/rt2860/sta_ioctl.c
+++ b/drivers/staging/rt2860/sta_ioctl.c
@@ -2460,7 +2460,7 @@ int rt28xx_sta_ioctl(IN struct net_device *net_dev,
2460 } 2460 }
2461 } 2461 }
2462 2462
2463 { /* determine this ioctl command is comming from which interface. */ 2463 { /* determine this ioctl command is coming from which interface. */
2464 pObj->ioctl_if_type = INT_MAIN; 2464 pObj->ioctl_if_type = INT_MAIN;
2465 pObj->ioctl_if = MAIN_MBSSID; 2465 pObj->ioctl_if = MAIN_MBSSID;
2466 } 2466 }
diff --git a/drivers/staging/rt2870/common/rtusb_bulk.c b/drivers/staging/rt2870/common/rtusb_bulk.c
index d2746f8732e6..679b802d2169 100644
--- a/drivers/staging/rt2870/common/rtusb_bulk.c
+++ b/drivers/staging/rt2870/common/rtusb_bulk.c
@@ -298,7 +298,7 @@ void RTUSBBulkOutDataPacket(struct rt_rtmp_adapter *pAd,
298 /*|| ( (ThisBulkSize != 0) && (pTxWI->AMPDU == 0)) */ 298 /*|| ( (ThisBulkSize != 0) && (pTxWI->AMPDU == 0)) */
299 ) { 299 ) {
300 /* For USB 1.1 or peer which didn't support AMPDU, limit the BulkOut size. */ 300 /* For USB 1.1 or peer which didn't support AMPDU, limit the BulkOut size. */
301 /* For performence in b/g mode, now just check for USB 1.1 and didn't care about the APMDU or not! 2008/06/04. */ 301 /* For performance in b/g mode, now just check for USB 1.1 and didn't care about the APMDU or not! 2008/06/04. */
302 pHTTXContext->ENextBulkOutPosition = 302 pHTTXContext->ENextBulkOutPosition =
303 TmpBulkEndPos; 303 TmpBulkEndPos;
304 break; 304 break;
@@ -311,7 +311,7 @@ void RTUSBBulkOutDataPacket(struct rt_rtmp_adapter *pAd,
311 TmpBulkEndPos; 311 TmpBulkEndPos;
312 break; 312 break;
313 } else if (((pAd->BulkOutMaxPacketSize < 512) && ((ThisBulkSize & 0xfffff800) != 0)) /*|| ( (ThisBulkSize != 0) && (pTxWI->AMPDU == 0)) */) { /* For USB 1.1 or peer which didn't support AMPDU, limit the BulkOut size. */ 313 } else if (((pAd->BulkOutMaxPacketSize < 512) && ((ThisBulkSize & 0xfffff800) != 0)) /*|| ( (ThisBulkSize != 0) && (pTxWI->AMPDU == 0)) */) { /* For USB 1.1 or peer which didn't support AMPDU, limit the BulkOut size. */
314 /* For performence in b/g mode, now just check for USB 1.1 and didn't care about the APMDU or not! 2008/06/04. */ 314 /* For performance in b/g mode, now just check for USB 1.1 and didn't care about the APMDU or not! 2008/06/04. */
315 pHTTXContext->ENextBulkOutPosition = 315 pHTTXContext->ENextBulkOutPosition =
316 TmpBulkEndPos; 316 TmpBulkEndPos;
317 break; 317 break;
@@ -1016,7 +1016,7 @@ void RTUSBKickBulkOut(struct rt_rtmp_adapter *pAd)
1016 RTUSBBulkOutNullFrame(pAd); 1016 RTUSBBulkOutNullFrame(pAd);
1017 } 1017 }
1018 } 1018 }
1019 /* 8. No data avaliable */ 1019 /* 8. No data available */
1020 else 1020 else
1021 ; 1021 ;
1022 } 1022 }
diff --git a/drivers/staging/rt2870/common/rtusb_data.c b/drivers/staging/rt2870/common/rtusb_data.c
index 69368862217c..5b72bcdaa78f 100644
--- a/drivers/staging/rt2870/common/rtusb_data.c
+++ b/drivers/staging/rt2870/common/rtusb_data.c
@@ -71,7 +71,7 @@ void REPORT_AMSDU_FRAMES_TO_LLC(struct rt_rtmp_adapter *pAd,
71 71
72 Routine Description: 72 Routine Description:
73 This subroutine will scan through releative ring descriptor to find 73 This subroutine will scan through releative ring descriptor to find
74 out avaliable free ring descriptor and compare with request size. 74 out available free ring descriptor and compare with request size.
75 75
76 Arguments: 76 Arguments:
77 pAd Pointer to our adapter 77 pAd Pointer to our adapter
diff --git a/drivers/staging/rtl8187se/Kconfig b/drivers/staging/rtl8187se/Kconfig
index 1b3103fbf29c..3162aabbeb07 100644
--- a/drivers/staging/rtl8187se/Kconfig
+++ b/drivers/staging/rtl8187se/Kconfig
@@ -1,6 +1,7 @@
1config R8187SE 1config R8187SE
2 tristate "RealTek RTL8187SE Wireless LAN NIC driver" 2 tristate "RealTek RTL8187SE Wireless LAN NIC driver"
3 depends on PCI && WLAN 3 depends on PCI && WLAN
4 depends on m
4 select WIRELESS_EXT 5 select WIRELESS_EXT
5 select WEXT_PRIV 6 select WEXT_PRIV
6 select EEPROM_93CX6 7 select EEPROM_93CX6
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211.h b/drivers/staging/rtl8187se/ieee80211/ieee80211.h
index dc608c70deb1..16aa6a8952fd 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211.h
@@ -1099,7 +1099,7 @@ struct ieee80211_device {
1099 * not set. As some cards may have different HW queues that 1099 * not set. As some cards may have different HW queues that
1100 * one might want to use for data and management frames 1100 * one might want to use for data and management frames
1101 * the option to have two callbacks might be useful. 1101 * the option to have two callbacks might be useful.
1102 * This fucntion can't sleep. 1102 * This function can't sleep.
1103 */ 1103 */
1104 int (*softmac_hard_start_xmit)(struct sk_buff *skb, 1104 int (*softmac_hard_start_xmit)(struct sk_buff *skb,
1105 struct net_device *dev); 1105 struct net_device *dev);
@@ -1138,9 +1138,9 @@ struct ieee80211_device {
1138 * it is called in a work_queue when swithcing to ad-hoc mode 1138 * it is called in a work_queue when swithcing to ad-hoc mode
1139 * or in behalf of iwlist scan when the card is associated 1139 * or in behalf of iwlist scan when the card is associated
1140 * and root user ask for a scan. 1140 * and root user ask for a scan.
1141 * the fucntion stop_scan should stop both the syncro and 1141 * the function stop_scan should stop both the syncro and
1142 * background scanning and can sleep. 1142 * background scanning and can sleep.
1143 * The fucntion start_scan should initiate the background 1143 * The function start_scan should initiate the background
1144 * scanning and can't sleep. 1144 * scanning and can't sleep.
1145 */ 1145 */
1146 void (*scan_syncro)(struct net_device *dev); 1146 void (*scan_syncro)(struct net_device *dev);
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
index 771e0196842e..736a1404f287 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
@@ -1954,7 +1954,7 @@ associate_complete:
1954 1954
1955 1955
1956 1956
1957/* following are for a simplier TX queue management. 1957/* following are for a simpler TX queue management.
1958 * Instead of using netif_[stop/wake]_queue the driver 1958 * Instead of using netif_[stop/wake]_queue the driver
1959 * will uses these two function (plus a reset one), that 1959 * will uses these two function (plus a reset one), that
1960 * will internally uses the kernel netif_* and takes 1960 * will internally uses the kernel netif_* and takes
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index 70ab0084e5f5..2155a771c339 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -1591,7 +1591,7 @@ void rtl8180_rx(struct net_device *dev)
1591 priv->RSSI = RSSI; 1591 priv->RSSI = RSSI;
1592 /* SQ translation formula is provided by SD3 DZ. 2006.06.27 */ 1592 /* SQ translation formula is provided by SD3 DZ. 2006.06.27 */
1593 if (quality >= 127) 1593 if (quality >= 127)
1594 quality = 1; /*0; */ /* 0 will cause epc to show signal zero , walk aroud now; */ 1594 quality = 1; /*0; */ /* 0 will cause epc to show signal zero , walk around now; */
1595 else if (quality < 27) 1595 else if (quality < 27)
1596 quality = 100; 1596 quality = 100;
1597 else 1597 else
@@ -3883,7 +3883,7 @@ void rtl8180_tx_isr(struct net_device *dev, int pri, short error)
3883 * If the packet previous of the nic pointer has been 3883 * If the packet previous of the nic pointer has been
3884 * processed this doesn't matter: it will be checked 3884 * processed this doesn't matter: it will be checked
3885 * here at the next round. Anyway if no more packet are 3885 * here at the next round. Anyway if no more packet are
3886 * TXed no memory leak occour at all. 3886 * TXed no memory leak occur at all.
3887 */ 3887 */
3888 3888
3889 switch (pri) { 3889 switch (pri) {
diff --git a/drivers/staging/rtl8187se/r8180_dm.c b/drivers/staging/rtl8187se/r8180_dm.c
index fc4907839c58..261085d4b74a 100644
--- a/drivers/staging/rtl8187se/r8180_dm.c
+++ b/drivers/staging/rtl8187se/r8180_dm.c
@@ -123,7 +123,7 @@ DoTxHighPower(
123// 123//
124// Description: 124// Description:
125// Callback function of UpdateTxPowerWorkItem. 125// Callback function of UpdateTxPowerWorkItem.
126// Because of some event happend, e.g. CCX TPC, High Power Mechanism, 126// Because of some event happened, e.g. CCX TPC, High Power Mechanism,
127// We update Tx power of current channel again. 127// We update Tx power of current channel again.
128// 128//
129void rtl8180_tx_pw_wq (struct work_struct *work) 129void rtl8180_tx_pw_wq (struct work_struct *work)
@@ -984,7 +984,7 @@ StaRateAdaptive87SE(
984 { 984 {
985 priv->TryupingCount = 0; 985 priv->TryupingCount = 0;
986 // 986 //
987 // When transfering from CCK to OFDM, DIG is an important issue. 987 // When transferring from CCK to OFDM, DIG is an important issue.
988 // 988 //
989 if(priv->CurrentOperaRate == 22) 989 if(priv->CurrentOperaRate == 22)
990 bUpdateInitialGain = true; 990 bUpdateInitialGain = true;
diff --git a/drivers/staging/rtl8187se/r8180_rtl8225z2.c b/drivers/staging/rtl8187se/r8180_rtl8225z2.c
index 2a2afd51cf42..3f09f76080af 100644
--- a/drivers/staging/rtl8187se/r8180_rtl8225z2.c
+++ b/drivers/staging/rtl8187se/r8180_rtl8225z2.c
@@ -378,7 +378,7 @@ static u32 read_rtl8225(struct net_device *dev, u8 adr)
378 mask = (low2high) ? 0x01 : (((u32)0x01) << (12-1)); 378 mask = (low2high) ? 0x01 : (((u32)0x01) << (12-1));
379 379
380 /* 380 /*
381 * We must set data pin to HW controled, otherwise RF can't driver it 381 * We must set data pin to HW controlled, otherwise RF can't driver it
382 * and value RF register won't be able to read back properly. 382 * and value RF register won't be able to read back properly.
383 */ 383 */
384 write_nic_word(dev, RFPinsEnable, (oval2 & (~0x01))); 384 write_nic_word(dev, RFPinsEnable, (oval2 & (~0x01)));
diff --git a/drivers/staging/rtl8187se/r8185b_init.c b/drivers/staging/rtl8187se/r8185b_init.c
index 3bdf9b31cc4e..4b0b830f9ab6 100644
--- a/drivers/staging/rtl8187se/r8185b_init.c
+++ b/drivers/staging/rtl8187se/r8185b_init.c
@@ -1273,7 +1273,7 @@ MgntDisconnectIBSS(
1273 /* 1273 /*
1274 Stop Beacon. 1274 Stop Beacon.
1275 1275
1276 Vista add a Adhoc profile, HW radio off untill OID_DOT11_RESET_REQUEST 1276 Vista add a Adhoc profile, HW radio off until OID_DOT11_RESET_REQUEST
1277 Driver would set MSR=NO_LINK, then HW Radio ON, MgntQueue Stuck. 1277 Driver would set MSR=NO_LINK, then HW Radio ON, MgntQueue Stuck.
1278 Because Bcn DMA isn't complete, mgnt queue would stuck until Bcn packet send. 1278 Because Bcn DMA isn't complete, mgnt queue would stuck until Bcn packet send.
1279 1279
diff --git a/drivers/staging/rtl8192e/Kconfig b/drivers/staging/rtl8192e/Kconfig
index 2e64b239e241..750c347bfbe1 100644
--- a/drivers/staging/rtl8192e/Kconfig
+++ b/drivers/staging/rtl8192e/Kconfig
@@ -1,6 +1,7 @@
1config RTL8192E 1config RTL8192E
2 tristate "RealTek RTL8192E Wireless LAN NIC driver" 2 tristate "RealTek RTL8192E Wireless LAN NIC driver"
3 depends on PCI && WLAN 3 depends on PCI && WLAN
4 depends on m
4 select WIRELESS_EXT 5 select WIRELESS_EXT
5 select WEXT_PRIV 6 select WEXT_PRIV
6 select CRYPTO 7 select CRYPTO
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211.h b/drivers/staging/rtl8192e/ieee80211/ieee80211.h
index 3ca388152616..dbe21ab0dbf7 100644
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211.h
@@ -1967,7 +1967,7 @@ struct ieee80211_device {
1967 u16 prev_seq_ctl; /* used to drop duplicate frames */ 1967 u16 prev_seq_ctl; /* used to drop duplicate frames */
1968 1968
1969 /* map of allowed channels. 0 is dummy */ 1969 /* map of allowed channels. 0 is dummy */
1970 // FIXME: remeber to default to a basic channel plan depending of the PHY type 1970 // FIXME: remember to default to a basic channel plan depending of the PHY type
1971#ifdef ENABLE_DOT11D 1971#ifdef ENABLE_DOT11D
1972 void* pDot11dInfo; 1972 void* pDot11dInfo;
1973 bool bGlobalDomain; 1973 bool bGlobalDomain;
@@ -2121,7 +2121,7 @@ struct ieee80211_device {
2121 * not set. As some cards may have different HW queues that 2121 * not set. As some cards may have different HW queues that
2122 * one might want to use for data and management frames 2122 * one might want to use for data and management frames
2123 * the option to have two callbacks might be useful. 2123 * the option to have two callbacks might be useful.
2124 * This fucntion can't sleep. 2124 * This function can't sleep.
2125 */ 2125 */
2126 int (*softmac_hard_start_xmit)(struct sk_buff *skb, 2126 int (*softmac_hard_start_xmit)(struct sk_buff *skb,
2127 struct ieee80211_device *ieee80211); 2127 struct ieee80211_device *ieee80211);
@@ -2160,9 +2160,9 @@ struct ieee80211_device {
2160 * it is called in a work_queue when swithcing to ad-hoc mode 2160 * it is called in a work_queue when swithcing to ad-hoc mode
2161 * or in behalf of iwlist scan when the card is associated 2161 * or in behalf of iwlist scan when the card is associated
2162 * and root user ask for a scan. 2162 * and root user ask for a scan.
2163 * the fucntion stop_scan should stop both the syncro and 2163 * the function stop_scan should stop both the syncro and
2164 * background scanning and can sleep. 2164 * background scanning and can sleep.
2165 * The fucntion start_scan should initiate the background 2165 * The function start_scan should initiate the background
2166 * scanning and can't sleep. 2166 * scanning and can't sleep.
2167 */ 2167 */
2168 void (*scan_syncro)(struct ieee80211_device *ieee80211); 2168 void (*scan_syncro)(struct ieee80211_device *ieee80211);
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c
index add015ebba1c..ed5a38023094 100644
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c
@@ -1426,7 +1426,7 @@ int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
1426static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 }; 1426static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 };
1427 1427
1428/* 1428/*
1429* Make ther structure we read from the beacon packet has 1429* Make the structure we read from the beacon packet to have
1430* the right values 1430* the right values
1431*/ 1431*/
1432static int ieee80211_verify_qos_info(struct ieee80211_qos_information_element 1432static int ieee80211_verify_qos_info(struct ieee80211_qos_information_element
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
index f6922d40a88a..7d4cba3a7c12 100644
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
@@ -2023,7 +2023,7 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
2023 return 1; 2023 return 1;
2024 } 2024 }
2025 else 2025 else
2026 { //filling the PeerHTCap. //maybe not neccesary as we can get its info from current_network. 2026 { //filling the PeerHTCap. //maybe not necessary as we can get its info from current_network.
2027 memcpy(ieee->pHTInfo->PeerHTCapBuf, network->bssht.bdHTCapBuf, network->bssht.bdHTCapLen); 2027 memcpy(ieee->pHTInfo->PeerHTCapBuf, network->bssht.bdHTCapBuf, network->bssht.bdHTCapLen);
2028 memcpy(ieee->pHTInfo->PeerHTInfoBuf, network->bssht.bdHTInfoBuf, network->bssht.bdHTInfoLen); 2028 memcpy(ieee->pHTInfo->PeerHTInfoBuf, network->bssht.bdHTInfoBuf, network->bssht.bdHTInfoLen);
2029 } 2029 }
@@ -2163,7 +2163,7 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
2163 return 0; 2163 return 0;
2164} 2164}
2165 2165
2166/* following are for a simplier TX queue management. 2166/* following are for a simpler TX queue management.
2167 * Instead of using netif_[stop/wake]_queue the driver 2167 * Instead of using netif_[stop/wake]_queue the driver
2168 * will uses these two function (plus a reset one), that 2168 * will uses these two function (plus a reset one), that
2169 * will internally uses the kernel netif_* and takes 2169 * will internally uses the kernel netif_* and takes
diff --git a/drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h b/drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h
index f968817d073c..56a120cf6291 100644
--- a/drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h
@@ -64,7 +64,7 @@ typedef enum _HT_CHANNEL_WIDTH{
64}HT_CHANNEL_WIDTH, *PHT_CHANNEL_WIDTH; 64}HT_CHANNEL_WIDTH, *PHT_CHANNEL_WIDTH;
65 65
66// 66//
67// Represent Extention Channel Offset in HT Capabilities 67// Represent Extension Channel Offset in HT Capabilities
68// This is available only in 40Mhz mode. 68// This is available only in 40Mhz mode.
69// 69//
70typedef enum _HT_EXTCHNL_OFFSET{ 70typedef enum _HT_EXTCHNL_OFFSET{
diff --git a/drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c
index a2a4fe9dd9da..f7a9da3ec829 100644
--- a/drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c
@@ -459,7 +459,7 @@ u8 HTIOTActIsForcedCTS2Self(struct ieee80211_device *ieee, struct ieee80211_netw
459/** 459/**
460* Function: HTIOTActIsDisableMCS15 460* Function: HTIOTActIsDisableMCS15
461* 461*
462* Overview: Check whether driver should declare capability of receving MCS15 462* Overview: Check whether driver should declare capability of receiving MCS15
463* 463*
464* Input: 464* Input:
465* PADAPTER Adapter, 465* PADAPTER Adapter,
@@ -496,7 +496,7 @@ bool HTIOTActIsDisableMCS15(struct ieee80211_device* ieee)
496/** 496/**
497* Function: HTIOTActIsDisableMCSTwoSpatialStream 497* Function: HTIOTActIsDisableMCSTwoSpatialStream
498* 498*
499* Overview: Check whether driver should declare capability of receving All 2 ss packets 499* Overview: Check whether driver should declare capability of receiving All 2 ss packets
500* 500*
501* Input: 501* Input:
502* PADAPTER Adapter, 502* PADAPTER Adapter,
@@ -1681,7 +1681,7 @@ void HTSetConnectBwMode(struct ieee80211_device* ieee, HT_CHANNEL_WIDTH Bandwidt
1681 //if in half N mode, set to 20M bandwidth please 09.08.2008 WB. 1681 //if in half N mode, set to 20M bandwidth please 09.08.2008 WB.
1682 if (Bandwidth==HT_CHANNEL_WIDTH_20_40 && (!ieee->GetHalfNmodeSupportByAPsHandler(ieee))) 1682 if (Bandwidth==HT_CHANNEL_WIDTH_20_40 && (!ieee->GetHalfNmodeSupportByAPsHandler(ieee)))
1683 { 1683 {
1684 // Handle Illegal extention channel offset!! 1684 // Handle Illegal extension channel offset!!
1685 if(ieee->current_network.channel<2 && Offset==HT_EXTCHNL_OFFSET_LOWER) 1685 if(ieee->current_network.channel<2 && Offset==HT_EXTCHNL_OFFSET_LOWER)
1686 Offset = HT_EXTCHNL_OFFSET_NO_EXT; 1686 Offset = HT_EXTCHNL_OFFSET_NO_EXT;
1687 if(Offset==HT_EXTCHNL_OFFSET_UPPER || Offset==HT_EXTCHNL_OFFSET_LOWER) { 1687 if(Offset==HT_EXTCHNL_OFFSET_UPPER || Offset==HT_EXTCHNL_OFFSET_LOWER) {
@@ -1698,7 +1698,7 @@ void HTSetConnectBwMode(struct ieee80211_device* ieee, HT_CHANNEL_WIDTH Bandwidt
1698 1698
1699 pHTInfo->bSwBwInProgress = true; 1699 pHTInfo->bSwBwInProgress = true;
1700 1700
1701 // TODO: 2007.7.13 by Emily Wait 2000ms in order to garantee that switching 1701 // TODO: 2007.7.13 by Emily Wait 2000ms in order to guarantee that switching
1702 // bandwidth is executed after scan is finished. It is a temporal solution 1702 // bandwidth is executed after scan is finished. It is a temporal solution
1703 // because software should ganrantee the last operation of switching bandwidth 1703 // because software should ganrantee the last operation of switching bandwidth
1704 // is executed properlly. 1704 // is executed properlly.
diff --git a/drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h b/drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h
index baaac2149de1..e7e26fd96395 100644
--- a/drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h
+++ b/drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h
@@ -44,7 +44,7 @@ typedef struct _RX_TS_RECORD {
44 u16 RxTimeoutIndicateSeq; 44 u16 RxTimeoutIndicateSeq;
45 struct list_head RxPendingPktList; 45 struct list_head RxPendingPktList;
46 struct timer_list RxPktPendingTimer; 46 struct timer_list RxPktPendingTimer;
47 BA_RECORD RxAdmittedBARecord; // For BA Recepient 47 BA_RECORD RxAdmittedBARecord; // For BA Recipient
48 u16 RxLastSeqNum; 48 u16 RxLastSeqNum;
49 u8 RxLastFragNum; 49 u8 RxLastFragNum;
50 u8 num; 50 u8 num;
diff --git a/drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c b/drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c
index 29eecf0ab769..ad6872dcf1c2 100644
--- a/drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c
+++ b/drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c
@@ -135,7 +135,7 @@ void ResetRxTsEntry(PRX_TS_RECORD pTS)
135 ResetTsCommonInfo(&pTS->TsCommonInfo); 135 ResetTsCommonInfo(&pTS->TsCommonInfo);
136 pTS->RxIndicateSeq = 0xffff; // This indicate the RxIndicateSeq is not used now!! 136 pTS->RxIndicateSeq = 0xffff; // This indicate the RxIndicateSeq is not used now!!
137 pTS->RxTimeoutIndicateSeq = 0xffff; // This indicate the RxTimeoutIndicateSeq is not used now!! 137 pTS->RxTimeoutIndicateSeq = 0xffff; // This indicate the RxTimeoutIndicateSeq is not used now!!
138 ResetBaEntry(&pTS->RxAdmittedBARecord); // For BA Recepient 138 ResetBaEntry(&pTS->RxAdmittedBARecord); // For BA Recipient
139} 139}
140 140
141void TSInitialize(struct ieee80211_device *ieee) 141void TSInitialize(struct ieee80211_device *ieee)
diff --git a/drivers/staging/rtl8192e/r819xE_phy.c b/drivers/staging/rtl8192e/r819xE_phy.c
index dfa4e112ef46..9e7828ef1cbe 100644
--- a/drivers/staging/rtl8192e/r819xE_phy.c
+++ b/drivers/staging/rtl8192e/r819xE_phy.c
@@ -2032,13 +2032,13 @@ void rtl8192_SetBWModeWorkItem(struct r8192_priv *priv)
2032 { 2032 {
2033 case HT_CHANNEL_WIDTH_20: 2033 case HT_CHANNEL_WIDTH_20:
2034 regBwOpMode |= BW_OPMODE_20MHZ; 2034 regBwOpMode |= BW_OPMODE_20MHZ;
2035 // 2007/02/07 Mark by Emily becasue we have not verify whether this register works 2035 // 2007/02/07 Mark by Emily because we have not verify whether this register works
2036 write_nic_byte(priv, BW_OPMODE, regBwOpMode); 2036 write_nic_byte(priv, BW_OPMODE, regBwOpMode);
2037 break; 2037 break;
2038 2038
2039 case HT_CHANNEL_WIDTH_20_40: 2039 case HT_CHANNEL_WIDTH_20_40:
2040 regBwOpMode &= ~BW_OPMODE_20MHZ; 2040 regBwOpMode &= ~BW_OPMODE_20MHZ;
2041 // 2007/02/07 Mark by Emily becasue we have not verify whether this register works 2041 // 2007/02/07 Mark by Emily because we have not verify whether this register works
2042 write_nic_byte(priv, BW_OPMODE, regBwOpMode); 2042 write_nic_byte(priv, BW_OPMODE, regBwOpMode);
2043 break; 2043 break;
2044 2044
@@ -2116,7 +2116,7 @@ void rtl8192_SetBWModeWorkItem(struct r8192_priv *priv)
2116} 2116}
2117 2117
2118/****************************************************************************** 2118/******************************************************************************
2119 *function: This function schedules bandwith switch work. 2119 *function: This function schedules bandwidth switch work.
2120 * input: struct net_device *dev 2120 * input: struct net_device *dev
2121 * HT_CHANNEL_WIDTH Bandwidth //20M or 40M 2121 * HT_CHANNEL_WIDTH Bandwidth //20M or 40M
2122 * HT_EXTCHNL_OFFSET Offset //Upper, Lower, or Don't care 2122 * HT_EXTCHNL_OFFSET Offset //Upper, Lower, or Don't care
diff --git a/drivers/staging/rtl8192u/Kconfig b/drivers/staging/rtl8192u/Kconfig
index 28969198e7e2..3f055091b35f 100644
--- a/drivers/staging/rtl8192u/Kconfig
+++ b/drivers/staging/rtl8192u/Kconfig
@@ -1,6 +1,7 @@
1config RTL8192U 1config RTL8192U
2 tristate "RealTek RTL8192U Wireless LAN NIC driver" 2 tristate "RealTek RTL8192U Wireless LAN NIC driver"
3 depends on PCI && WLAN && USB 3 depends on PCI && WLAN && USB
4 depends on m
4 select WIRELESS_EXT 5 select WIRELESS_EXT
5 select WEXT_PRIV 6 select WEXT_PRIV
6 select CRYPTO 7 select CRYPTO
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
index c0b844d75c0d..e716f7b1144f 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
@@ -1965,7 +1965,7 @@ struct ieee80211_device {
1965 u16 prev_seq_ctl; /* used to drop duplicate frames */ 1965 u16 prev_seq_ctl; /* used to drop duplicate frames */
1966 1966
1967 /* map of allowed channels. 0 is dummy */ 1967 /* map of allowed channels. 0 is dummy */
1968 // FIXME: remeber to default to a basic channel plan depending of the PHY type 1968 // FIXME: remember to default to a basic channel plan depending of the PHY type
1969 void* pDot11dInfo; 1969 void* pDot11dInfo;
1970 bool bGlobalDomain; 1970 bool bGlobalDomain;
1971 int rate; /* current rate */ 1971 int rate; /* current rate */
@@ -2119,7 +2119,7 @@ struct ieee80211_device {
2119 * not set. As some cards may have different HW queues that 2119 * not set. As some cards may have different HW queues that
2120 * one might want to use for data and management frames 2120 * one might want to use for data and management frames
2121 * the option to have two callbacks might be useful. 2121 * the option to have two callbacks might be useful.
2122 * This fucntion can't sleep. 2122 * This function can't sleep.
2123 */ 2123 */
2124 int (*softmac_hard_start_xmit)(struct sk_buff *skb, 2124 int (*softmac_hard_start_xmit)(struct sk_buff *skb,
2125 struct net_device *dev); 2125 struct net_device *dev);
@@ -2158,9 +2158,9 @@ struct ieee80211_device {
2158 * it is called in a work_queue when swithcing to ad-hoc mode 2158 * it is called in a work_queue when swithcing to ad-hoc mode
2159 * or in behalf of iwlist scan when the card is associated 2159 * or in behalf of iwlist scan when the card is associated
2160 * and root user ask for a scan. 2160 * and root user ask for a scan.
2161 * the fucntion stop_scan should stop both the syncro and 2161 * the function stop_scan should stop both the syncro and
2162 * background scanning and can sleep. 2162 * background scanning and can sleep.
2163 * The fucntion start_scan should initiate the background 2163 * The function start_scan should initiate the background
2164 * scanning and can't sleep. 2164 * scanning and can't sleep.
2165 */ 2165 */
2166 void (*scan_syncro)(struct net_device *dev); 2166 void (*scan_syncro)(struct net_device *dev);
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
index 498b520efcf4..a414303aef54 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
@@ -1399,7 +1399,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
1399static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 }; 1399static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 };
1400 1400
1401/* 1401/*
1402* Make ther structure we read from the beacon packet has 1402* Make the structure we read from the beacon packet to have
1403* the right values 1403* the right values
1404*/ 1404*/
1405static int ieee80211_verify_qos_info(struct ieee80211_qos_information_element 1405static int ieee80211_verify_qos_info(struct ieee80211_qos_information_element
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
index 4992d630f984..4ec0a6520ddc 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
@@ -1973,7 +1973,7 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
1973 return 1; 1973 return 1;
1974 } 1974 }
1975 else 1975 else
1976 { //filling the PeerHTCap. //maybe not neccesary as we can get its info from current_network. 1976 { //filling the PeerHTCap. //maybe not necessary as we can get its info from current_network.
1977 memcpy(ieee->pHTInfo->PeerHTCapBuf, network->bssht.bdHTCapBuf, network->bssht.bdHTCapLen); 1977 memcpy(ieee->pHTInfo->PeerHTCapBuf, network->bssht.bdHTCapBuf, network->bssht.bdHTCapLen);
1978 memcpy(ieee->pHTInfo->PeerHTInfoBuf, network->bssht.bdHTInfoBuf, network->bssht.bdHTInfoLen); 1978 memcpy(ieee->pHTInfo->PeerHTInfoBuf, network->bssht.bdHTInfoBuf, network->bssht.bdHTInfoLen);
1979 } 1979 }
@@ -2113,7 +2113,7 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
2113 return 0; 2113 return 0;
2114} 2114}
2115 2115
2116/* following are for a simplier TX queue management. 2116/* following are for a simpler TX queue management.
2117 * Instead of using netif_[stop/wake]_queue the driver 2117 * Instead of using netif_[stop/wake]_queue the driver
2118 * will uses these two function (plus a reset one), that 2118 * will uses these two function (plus a reset one), that
2119 * will internally uses the kernel netif_* and takes 2119 * will internally uses the kernel netif_* and takes
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h
index cde603f67f43..0b1a1fc09391 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h
@@ -64,7 +64,7 @@ typedef enum _HT_CHANNEL_WIDTH{
64}HT_CHANNEL_WIDTH, *PHT_CHANNEL_WIDTH; 64}HT_CHANNEL_WIDTH, *PHT_CHANNEL_WIDTH;
65 65
66// 66//
67// Represent Extention Channel Offset in HT Capabilities 67// Represent Extension Channel Offset in HT Capabilities
68// This is available only in 40Mhz mode. 68// This is available only in 40Mhz mode.
69// 69//
70typedef enum _HT_EXTCHNL_OFFSET{ 70typedef enum _HT_EXTCHNL_OFFSET{
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
index 50f4f5943e75..e88a839b2a91 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
@@ -423,7 +423,7 @@ u8 HTIOTActIsDisableMCS14(struct ieee80211_device* ieee, u8* PeerMacAddr)
423/** 423/**
424* Function: HTIOTActIsDisableMCS15 424* Function: HTIOTActIsDisableMCS15
425* 425*
426* Overview: Check whether driver should declare capability of receving MCS15 426* Overview: Check whether driver should declare capability of receiving MCS15
427* 427*
428* Input: 428* Input:
429* PADAPTER Adapter, 429* PADAPTER Adapter,
@@ -460,7 +460,7 @@ bool HTIOTActIsDisableMCS15(struct ieee80211_device* ieee)
460/** 460/**
461* Function: HTIOTActIsDisableMCSTwoSpatialStream 461* Function: HTIOTActIsDisableMCSTwoSpatialStream
462* 462*
463* Overview: Check whether driver should declare capability of receving All 2 ss packets 463* Overview: Check whether driver should declare capability of receiving All 2 ss packets
464* 464*
465* Input: 465* Input:
466* PADAPTER Adapter, 466* PADAPTER Adapter,
@@ -1409,7 +1409,7 @@ void HTSetConnectBwMode(struct ieee80211_device* ieee, HT_CHANNEL_WIDTH Bandwidt
1409 //if in half N mode, set to 20M bandwidth please 09.08.2008 WB. 1409 //if in half N mode, set to 20M bandwidth please 09.08.2008 WB.
1410 if(Bandwidth==HT_CHANNEL_WIDTH_20_40 && (!ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev))) 1410 if(Bandwidth==HT_CHANNEL_WIDTH_20_40 && (!ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev)))
1411 { 1411 {
1412 // Handle Illegal extention channel offset!! 1412 // Handle Illegal extension channel offset!!
1413 if(ieee->current_network.channel<2 && Offset==HT_EXTCHNL_OFFSET_LOWER) 1413 if(ieee->current_network.channel<2 && Offset==HT_EXTCHNL_OFFSET_LOWER)
1414 Offset = HT_EXTCHNL_OFFSET_NO_EXT; 1414 Offset = HT_EXTCHNL_OFFSET_NO_EXT;
1415 if(Offset==HT_EXTCHNL_OFFSET_UPPER || Offset==HT_EXTCHNL_OFFSET_LOWER) { 1415 if(Offset==HT_EXTCHNL_OFFSET_UPPER || Offset==HT_EXTCHNL_OFFSET_LOWER) {
@@ -1426,7 +1426,7 @@ void HTSetConnectBwMode(struct ieee80211_device* ieee, HT_CHANNEL_WIDTH Bandwidt
1426 1426
1427 pHTInfo->bSwBwInProgress = true; 1427 pHTInfo->bSwBwInProgress = true;
1428 1428
1429 // TODO: 2007.7.13 by Emily Wait 2000ms in order to garantee that switching 1429 // TODO: 2007.7.13 by Emily Wait 2000ms in order to guarantee that switching
1430 // bandwidth is executed after scan is finished. It is a temporal solution 1430 // bandwidth is executed after scan is finished. It is a temporal solution
1431 // because software should ganrantee the last operation of switching bandwidth 1431 // because software should ganrantee the last operation of switching bandwidth
1432 // is executed properlly. 1432 // is executed properlly.
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
index baaac2149de1..e7e26fd96395 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
@@ -44,7 +44,7 @@ typedef struct _RX_TS_RECORD {
44 u16 RxTimeoutIndicateSeq; 44 u16 RxTimeoutIndicateSeq;
45 struct list_head RxPendingPktList; 45 struct list_head RxPendingPktList;
46 struct timer_list RxPktPendingTimer; 46 struct timer_list RxPktPendingTimer;
47 BA_RECORD RxAdmittedBARecord; // For BA Recepient 47 BA_RECORD RxAdmittedBARecord; // For BA Recipient
48 u16 RxLastSeqNum; 48 u16 RxLastSeqNum;
49 u8 RxLastFragNum; 49 u8 RxLastFragNum;
50 u8 num; 50 u8 num;
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
index c3fcaae0750d..957ce4ef48b5 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
@@ -135,7 +135,7 @@ void ResetRxTsEntry(PRX_TS_RECORD pTS)
135 ResetTsCommonInfo(&pTS->TsCommonInfo); 135 ResetTsCommonInfo(&pTS->TsCommonInfo);
136 pTS->RxIndicateSeq = 0xffff; // This indicate the RxIndicateSeq is not used now!! 136 pTS->RxIndicateSeq = 0xffff; // This indicate the RxIndicateSeq is not used now!!
137 pTS->RxTimeoutIndicateSeq = 0xffff; // This indicate the RxTimeoutIndicateSeq is not used now!! 137 pTS->RxTimeoutIndicateSeq = 0xffff; // This indicate the RxTimeoutIndicateSeq is not used now!!
138 ResetBaEntry(&pTS->RxAdmittedBARecord); // For BA Recepient 138 ResetBaEntry(&pTS->RxAdmittedBARecord); // For BA Recipient
139} 139}
140 140
141void TSInitialize(struct ieee80211_device *ieee) 141void TSInitialize(struct ieee80211_device *ieee)
diff --git a/drivers/staging/rtl8192u/ieee80211/scatterwalk.c b/drivers/staging/rtl8192u/ieee80211/scatterwalk.c
index 49f401fbce88..3543a6145046 100644
--- a/drivers/staging/rtl8192u/ieee80211/scatterwalk.c
+++ b/drivers/staging/rtl8192u/ieee80211/scatterwalk.c
@@ -71,7 +71,7 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out,
71 unsigned int more) 71 unsigned int more)
72{ 72{
73 /* walk->data may be pointing the first byte of the next page; 73 /* walk->data may be pointing the first byte of the next page;
74 however, we know we transfered at least one byte. So, 74 however, we know we transferred at least one byte. So,
75 walk->data - 1 will be a virtual address in the mapped page. */ 75 walk->data - 1 will be a virtual address in the mapped page. */
76 76
77 if (out) 77 if (out)
diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index da612e6d994e..e81b8ab6aa9d 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -460,7 +460,7 @@ u32 read_nic_dword(struct net_device *dev, int indx)
460/* u8 read_phy_cck(struct net_device *dev, u8 adr); */ 460/* u8 read_phy_cck(struct net_device *dev, u8 adr); */
461/* u8 read_phy_ofdm(struct net_device *dev, u8 adr); */ 461/* u8 read_phy_ofdm(struct net_device *dev, u8 adr); */
462/* this might still called in what was the PHY rtl8185/rtl8192 common code 462/* this might still called in what was the PHY rtl8185/rtl8192 common code
463 * plans are to possibilty turn it again in one common code... 463 * plans are to possibility turn it again in one common code...
464 */ 464 */
465inline void force_pci_posting(struct net_device *dev) 465inline void force_pci_posting(struct net_device *dev)
466{ 466{
@@ -1378,7 +1378,7 @@ struct sk_buff *DrvAggr_Aggregation(struct net_device *dev, struct ieee80211_drv
1378 //tx_agg_desc->LINIP = 0; 1378 //tx_agg_desc->LINIP = 0;
1379 //tx_agg_desc->CmdInit = 1; 1379 //tx_agg_desc->CmdInit = 1;
1380 tx_agg_desc->Offset = sizeof(tx_fwinfo_819x_usb) + 8; 1380 tx_agg_desc->Offset = sizeof(tx_fwinfo_819x_usb) + 8;
1381 /* already raw data, need not to substract header length */ 1381 /* already raw data, need not to subtract header length */
1382 tx_agg_desc->PktSize = skb->len & 0xffff; 1382 tx_agg_desc->PktSize = skb->len & 0xffff;
1383 1383
1384 /*DWORD 1*/ 1384 /*DWORD 1*/
@@ -2888,7 +2888,7 @@ static void rtl8192_get_eeprom_size(struct net_device* dev)
2888 RT_TRACE(COMP_EPROM, "<===========%s(), epromtype:%d\n", __FUNCTION__, priv->epromtype); 2888 RT_TRACE(COMP_EPROM, "<===========%s(), epromtype:%d\n", __FUNCTION__, priv->epromtype);
2889} 2889}
2890 2890
2891//used to swap endian. as ntohl & htonl are not neccessary to swap endian, so use this instead. 2891//used to swap endian. as ntohl & htonl are not necessary to swap endian, so use this instead.
2892static inline u16 endian_swap(u16* data) 2892static inline u16 endian_swap(u16* data)
2893{ 2893{
2894 u16 tmp = *data; 2894 u16 tmp = *data;
diff --git a/drivers/staging/rtl8192u/r819xU_HTType.h b/drivers/staging/rtl8192u/r819xU_HTType.h
index 01f58b902028..2ac421626e7c 100644
--- a/drivers/staging/rtl8192u/r819xU_HTType.h
+++ b/drivers/staging/rtl8192u/r819xU_HTType.h
@@ -65,7 +65,7 @@ typedef enum _HT_CHANNEL_WIDTH{
65}HT_CHANNEL_WIDTH, *PHT_CHANNEL_WIDTH; 65}HT_CHANNEL_WIDTH, *PHT_CHANNEL_WIDTH;
66 66
67// 67//
68// Represent Extention Channel Offset in HT Capabilities 68// Represent Extension Channel Offset in HT Capabilities
69// This is available only in 40Mhz mode. 69// This is available only in 40Mhz mode.
70// 70//
71typedef enum _HT_EXTCHNL_OFFSET{ 71typedef enum _HT_EXTCHNL_OFFSET{
diff --git a/drivers/staging/rtl8192u/r819xU_phy.c b/drivers/staging/rtl8192u/r819xU_phy.c
index 41684e8fcf4c..c4586b0817d1 100644
--- a/drivers/staging/rtl8192u/r819xU_phy.c
+++ b/drivers/staging/rtl8192u/r819xU_phy.c
@@ -1531,13 +1531,13 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev)
1531 { 1531 {
1532 case HT_CHANNEL_WIDTH_20: 1532 case HT_CHANNEL_WIDTH_20:
1533 regBwOpMode |= BW_OPMODE_20MHZ; 1533 regBwOpMode |= BW_OPMODE_20MHZ;
1534 // 2007/02/07 Mark by Emily becasue we have not verify whether this register works 1534 // 2007/02/07 Mark by Emily because we have not verify whether this register works
1535 write_nic_byte(dev, BW_OPMODE, regBwOpMode); 1535 write_nic_byte(dev, BW_OPMODE, regBwOpMode);
1536 break; 1536 break;
1537 1537
1538 case HT_CHANNEL_WIDTH_20_40: 1538 case HT_CHANNEL_WIDTH_20_40:
1539 regBwOpMode &= ~BW_OPMODE_20MHZ; 1539 regBwOpMode &= ~BW_OPMODE_20MHZ;
1540 // 2007/02/07 Mark by Emily becasue we have not verify whether this register works 1540 // 2007/02/07 Mark by Emily because we have not verify whether this register works
1541 write_nic_byte(dev, BW_OPMODE, regBwOpMode); 1541 write_nic_byte(dev, BW_OPMODE, regBwOpMode);
1542 break; 1542 break;
1543 1543
@@ -1647,7 +1647,7 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev)
1647} 1647}
1648 1648
1649/****************************************************************************** 1649/******************************************************************************
1650 *function: This function schedules bandwith switch work. 1650 *function: This function schedules bandwidth switch work.
1651 * input: struct net_device *dev 1651 * input: struct net_device *dev
1652 * HT_CHANNEL_WIDTH Bandwidth //20M or 40M 1652 * HT_CHANNEL_WIDTH Bandwidth //20M or 40M
1653 * HT_EXTCHNL_OFFSET Offset //Upper, Lower, or Don't care 1653 * HT_EXTCHNL_OFFSET Offset //Upper, Lower, or Don't care
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.h b/drivers/staging/rtl8712/rtl871x_cmd.h
index 3a945b5f0e01..2dc78476b7d3 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.h
+++ b/drivers/staging/rtl8712/rtl871x_cmd.h
@@ -656,7 +656,7 @@ struct PT_param {
656/* 656/*
657 * Result: 657 * Result:
658 * 0x00: success 658 * 0x00: success
659 * 0x01: sucess, and check Response. 659 * 0x01: success, and check Response.
660 * 0x02: cmd ignored due to duplicated sequcne number 660 * 0x02: cmd ignored due to duplicated sequcne number
661 * 0x03: cmd dropped due to invalid cmd code 661 * 0x03: cmd dropped due to invalid cmd code
662 * 0x04: reserved. 662 * 0x04: reserved.
diff --git a/drivers/staging/rtl8712/rtl871x_led.h b/drivers/staging/rtl8712/rtl871x_led.h
index 994ef82141ab..8085e5eb82b1 100644
--- a/drivers/staging/rtl8712/rtl871x_led.h
+++ b/drivers/staging/rtl8712/rtl871x_led.h
@@ -78,14 +78,14 @@ struct LED_871x {
78}; 78};
79 79
80struct led_priv { 80struct led_priv {
81 /* add for led controll */ 81 /* add for led control */
82 struct LED_871x SwLed0; 82 struct LED_871x SwLed0;
83 struct LED_871x SwLed1; 83 struct LED_871x SwLed1;
84 enum LED_STRATEGY_871x LedStrategy; 84 enum LED_STRATEGY_871x LedStrategy;
85 u8 bRegUseLed; 85 u8 bRegUseLed;
86 void (*LedControlHandler)(struct _adapter *padapter, 86 void (*LedControlHandler)(struct _adapter *padapter,
87 enum LED_CTL_MODE LedAction); 87 enum LED_CTL_MODE LedAction);
88 /* add for led controll */ 88 /* add for led control */
89}; 89};
90 90
91/*=========================================================================== 91/*===========================================================================
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index 98ba7602e250..866554d48d86 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -1663,7 +1663,7 @@ void r8712_update_registrypriv_dev_network(struct _adapter *adapter)
1663 (struct ndis_wlan_bssid_ex *)pdev_network); 1663 (struct ndis_wlan_bssid_ex *)pdev_network);
1664} 1664}
1665 1665
1666/*the fucntion is at passive_level*/ 1666/*the function is at passive_level*/
1667void r8712_joinbss_reset(struct _adapter *padapter) 1667void r8712_joinbss_reset(struct _adapter *padapter)
1668{ 1668{
1669 int i; 1669 int i;
@@ -1726,7 +1726,7 @@ unsigned int r8712_restructure_ht_ie(struct _adapter *padapter, u8 *in_ie,
1726 return phtpriv->ht_option; 1726 return phtpriv->ht_option;
1727} 1727}
1728 1728
1729/* the fucntion is > passive_level (in critical_section) */ 1729/* the function is > passive_level (in critical_section) */
1730static void update_ht_cap(struct _adapter *padapter, u8 *pie, uint ie_len) 1730static void update_ht_cap(struct _adapter *padapter, u8 *pie, uint ie_len)
1731{ 1731{
1732 u8 *p, max_ampdu_sz; 1732 u8 *p, max_ampdu_sz;
@@ -1803,7 +1803,7 @@ void r8712_issue_addbareq_cmd(struct _adapter *padapter, int priority)
1803 } 1803 }
1804} 1804}
1805 1805
1806/*the fucntion is >= passive_level*/ 1806/*the function is >= passive_level*/
1807unsigned int r8712_add_ht_addt_info(struct _adapter *padapter, 1807unsigned int r8712_add_ht_addt_info(struct _adapter *padapter,
1808 u8 *in_ie, u8 *out_ie, 1808 u8 *in_ie, u8 *out_ie,
1809 uint in_len, uint *pout_len) 1809 uint in_len, uint *pout_len)
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.h b/drivers/staging/rtl8712/rtl871x_mlme.h
index 2b35b740ab89..2794804d0822 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.h
+++ b/drivers/staging/rtl8712/rtl871x_mlme.h
@@ -29,7 +29,7 @@
29 * single-tone*/ 29 * single-tone*/
30#define WIFI_MP_CTX_BACKGROUND_PENDING 0x00080000 /* pending in cont, tx 30#define WIFI_MP_CTX_BACKGROUND_PENDING 0x00080000 /* pending in cont, tx
31 * background due to out of skb*/ 31 * background due to out of skb*/
32#define WIFI_MP_CTX_CCK_HW 0x00100000 /* in continous tx*/ 32#define WIFI_MP_CTX_CCK_HW 0x00100000 /* in continuous tx*/
33#define WIFI_MP_CTX_CCK_CS 0x00200000 /* in cont, tx with carrier 33#define WIFI_MP_CTX_CCK_CS 0x00200000 /* in cont, tx with carrier
34 * suppression*/ 34 * suppression*/
35#define WIFI_MP_LPBK_STATE 0x00400000 35#define WIFI_MP_LPBK_STATE 0x00400000
diff --git a/drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h b/drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h
index e386fb0aac3e..23532a793859 100644
--- a/drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h
+++ b/drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h
@@ -38,7 +38,7 @@
38 * 2. 0x800/0x900/0xA00/0xC00/0xD00/0xE00 38 * 2. 0x800/0x900/0xA00/0xC00/0xD00/0xE00
39 * 3. RF register 0x00-2E 39 * 3. RF register 0x00-2E
40 * 4. Bit Mask for BB/RF register 40 * 4. Bit Mask for BB/RF register
41 * 5. Other defintion for BB/RF R/W 41 * 5. Other definition for BB/RF R/W
42 * 42 *
43 * 1. PMAC duplicate register due to connection: RF_Mode, TRxRN, NumOf L-STF 43 * 1. PMAC duplicate register due to connection: RF_Mode, TRxRN, NumOf L-STF
44 * 1. Page1(0x100) 44 * 1. Page1(0x100)
diff --git a/drivers/staging/rtl8712/usb_halinit.c b/drivers/staging/rtl8712/usb_halinit.c
index 0e9483bbabe1..46287c17a417 100644
--- a/drivers/staging/rtl8712/usb_halinit.c
+++ b/drivers/staging/rtl8712/usb_halinit.c
@@ -112,7 +112,7 @@ u8 r8712_usb_hal_bus_init(struct _adapter *padapter)
112 /* Initialization for power on sequence, */ 112 /* Initialization for power on sequence, */
113 r8712_write8(padapter, SPS0_CTRL + 1, 0x53); 113 r8712_write8(padapter, SPS0_CTRL + 1, 0x53);
114 r8712_write8(padapter, SPS0_CTRL, 0x57); 114 r8712_write8(padapter, SPS0_CTRL, 0x57);
115 /* Enable AFE Macro Block's Bandgap adn Enable AFE Macro 115 /* Enable AFE Macro Block's Bandgap and Enable AFE Macro
116 * Block's Mbias 116 * Block's Mbias
117 */ 117 */
118 val8 = r8712_read8(padapter, AFE_MISC); 118 val8 = r8712_read8(padapter, AFE_MISC);
diff --git a/drivers/staging/rts_pstor/rtsx.c b/drivers/staging/rts_pstor/rtsx.c
index 4514419a5fb8..02525d57ba83 100644
--- a/drivers/staging/rts_pstor/rtsx.c
+++ b/drivers/staging/rts_pstor/rtsx.c
@@ -824,13 +824,13 @@ static void rtsx_init_options(struct rtsx_chip *chip)
824 chip->fpga_ms_hg_clk = CLK_80; 824 chip->fpga_ms_hg_clk = CLK_80;
825 chip->fpga_ms_4bit_clk = CLK_80; 825 chip->fpga_ms_4bit_clk = CLK_80;
826 chip->fpga_ms_1bit_clk = CLK_40; 826 chip->fpga_ms_1bit_clk = CLK_40;
827 chip->asic_sd_sdr104_clk = 207; 827 chip->asic_sd_sdr104_clk = 203;
828 chip->asic_sd_sdr50_clk = 99; 828 chip->asic_sd_sdr50_clk = 98;
829 chip->asic_sd_ddr50_clk = 99; 829 chip->asic_sd_ddr50_clk = 98;
830 chip->asic_sd_hs_clk = 99; 830 chip->asic_sd_hs_clk = 98;
831 chip->asic_mmc_52m_clk = 99; 831 chip->asic_mmc_52m_clk = 98;
832 chip->asic_ms_hg_clk = 119; 832 chip->asic_ms_hg_clk = 117;
833 chip->asic_ms_4bit_clk = 79; 833 chip->asic_ms_4bit_clk = 78;
834 chip->asic_ms_1bit_clk = 39; 834 chip->asic_ms_1bit_clk = 39;
835 chip->ssc_depth_sd_sdr104 = SSC_DEPTH_2M; 835 chip->ssc_depth_sd_sdr104 = SSC_DEPTH_2M;
836 chip->ssc_depth_sd_sdr50 = SSC_DEPTH_2M; 836 chip->ssc_depth_sd_sdr50 = SSC_DEPTH_2M;
diff --git a/drivers/staging/rts_pstor/rtsx_chip.c b/drivers/staging/rts_pstor/rtsx_chip.c
index f443d97a56f8..d2f1c715a684 100644
--- a/drivers/staging/rts_pstor/rtsx_chip.c
+++ b/drivers/staging/rts_pstor/rtsx_chip.c
@@ -684,6 +684,11 @@ static int rts5209_init(struct rtsx_chip *chip)
684 RTSX_DEBUGP("dw in 0x724: 0x%x\n", lval); 684 RTSX_DEBUGP("dw in 0x724: 0x%x\n", lval);
685 val = (u8)lval; 685 val = (u8)lval;
686 if (!(val & 0x80)) { 686 if (!(val & 0x80)) {
687 if (val & 0x08)
688 chip->lun_mode = DEFAULT_SINGLE;
689 else
690 chip->lun_mode = SD_MS_2LUN;
691
687 if (val & 0x04) { 692 if (val & 0x04) {
688 SET_SDIO_EXIST(chip); 693 SET_SDIO_EXIST(chip);
689 } else { 694 } else {
@@ -705,12 +710,6 @@ static int rts5209_init(struct rtsx_chip *chip)
705 710
706 chip->aspm_l0s_l1_en = (val >> 5) & 0x03; 711 chip->aspm_l0s_l1_en = (val >> 5) & 0x03;
707 712
708 if (val & 0x08) {
709 chip->lun_mode = DEFAULT_SINGLE;
710 } else {
711 chip->lun_mode = SD_MS_2LUN;
712 }
713
714 val = (u8)(lval >> 8); 713 val = (u8)(lval >> 8);
715 714
716 clk = (val >> 5) & 0x07; 715 clk = (val >> 5) & 0x07;
diff --git a/drivers/staging/rts_pstor/rtsx_chip.h b/drivers/staging/rts_pstor/rtsx_chip.h
index 713c5eaadacd..9f7cd82a1541 100644
--- a/drivers/staging/rts_pstor/rtsx_chip.h
+++ b/drivers/staging/rts_pstor/rtsx_chip.h
@@ -180,8 +180,8 @@
180#define CUR_ERR 0x70 /* current error */ 180#define CUR_ERR 0x70 /* current error */
181#define DEF_ERR 0x71 /* specific command error */ 181#define DEF_ERR 0x71 /* specific command error */
182 182
183/*---- sense key Infomation ----*/ 183/*---- sense key Information ----*/
184#define SNSKEYINFO_LEN 3 /* length of sense key infomation */ 184#define SNSKEYINFO_LEN 3 /* length of sense key information */
185 185
186#define SKSV 0x80 186#define SKSV 0x80
187#define CDB_ILLEGAL 0x40 187#define CDB_ILLEGAL 0x40
@@ -235,13 +235,13 @@ struct sense_data_t {
235 unsigned char seg_no; /* segment No. */ 235 unsigned char seg_no; /* segment No. */
236 unsigned char sense_key; /* byte5 : ILI */ 236 unsigned char sense_key; /* byte5 : ILI */
237 /* bit3-0 : sense key */ 237 /* bit3-0 : sense key */
238 unsigned char info[4]; /* infomation */ 238 unsigned char info[4]; /* information */
239 unsigned char ad_sense_len; /* additional sense data length */ 239 unsigned char ad_sense_len; /* additional sense data length */
240 unsigned char cmd_info[4]; /* command specific infomation */ 240 unsigned char cmd_info[4]; /* command specific information */
241 unsigned char asc; /* ASC */ 241 unsigned char asc; /* ASC */
242 unsigned char ascq; /* ASCQ */ 242 unsigned char ascq; /* ASCQ */
243 unsigned char rfu; /* FRU */ 243 unsigned char rfu; /* FRU */
244 unsigned char sns_key_info[3]; /* sense key specific infomation */ 244 unsigned char sns_key_info[3]; /* sense key specific information */
245}; 245};
246 246
247/* PCI Operation Register Address */ 247/* PCI Operation Register Address */
diff --git a/drivers/staging/rts_pstor/rtsx_scsi.h b/drivers/staging/rts_pstor/rtsx_scsi.h
index fac122c1eabd..64b84992fdb3 100644
--- a/drivers/staging/rts_pstor/rtsx_scsi.h
+++ b/drivers/staging/rts_pstor/rtsx_scsi.h
@@ -85,7 +85,7 @@
85#define CHIP_NORMALMODE 0x00 85#define CHIP_NORMALMODE 0x00
86#define CHIP_DEBUGMODE 0x01 86#define CHIP_DEBUGMODE 0x01
87 87
88/* SD Pass Through Command Extention */ 88/* SD Pass Through Command Extension */
89#define SD_PASS_THRU_MODE 0xD0 89#define SD_PASS_THRU_MODE 0xD0
90#define SD_EXECUTE_NO_DATA 0xD1 90#define SD_EXECUTE_NO_DATA 0xD1
91#define SD_EXECUTE_READ 0xD2 91#define SD_EXECUTE_READ 0xD2
diff --git a/drivers/staging/rts_pstor/sd.c b/drivers/staging/rts_pstor/sd.c
index 21bfa5755bec..8d066bd428c4 100644
--- a/drivers/staging/rts_pstor/sd.c
+++ b/drivers/staging/rts_pstor/sd.c
@@ -1719,7 +1719,7 @@ static u8 sd_search_final_phase(struct rtsx_chip *chip, u32 phase_map, u8 tune_d
1719 } 1719 }
1720 1720
1721Search_Finish: 1721Search_Finish:
1722 RTSX_DEBUGP("Final choosen phase: %d\n", final_phase); 1722 RTSX_DEBUGP("Final chosen phase: %d\n", final_phase);
1723 return final_phase; 1723 return final_phase;
1724} 1724}
1725 1725
diff --git a/drivers/staging/sep/sep_driver.c b/drivers/staging/sep/sep_driver.c
index 71a5fbc041e4..890eede5e3f9 100644
--- a/drivers/staging/sep/sep_driver.c
+++ b/drivers/staging/sep/sep_driver.c
@@ -55,8 +55,6 @@
55#include <linux/jiffies.h> 55#include <linux/jiffies.h>
56#include <linux/rar_register.h> 56#include <linux/rar_register.h>
57 57
58#include "../memrar/memrar.h"
59
60#include "sep_driver_hw_defs.h" 58#include "sep_driver_hw_defs.h"
61#include "sep_driver_config.h" 59#include "sep_driver_config.h"
62#include "sep_driver_api.h" 60#include "sep_driver_api.h"
@@ -586,7 +584,7 @@ static unsigned int sep_poll(struct file *filp, poll_table *wait)
586 dev_dbg(&sep->pdev->dev, "poll: send_ct is %lx reply ct is %lx\n", 584 dev_dbg(&sep->pdev->dev, "poll: send_ct is %lx reply ct is %lx\n",
587 sep->send_ct, sep->reply_ct); 585 sep->send_ct, sep->reply_ct);
588 586
589 /* Check if error occured during poll */ 587 /* Check if error occurred during poll */
590 retval2 = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR3_REG_ADDR); 588 retval2 = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR3_REG_ADDR);
591 if (retval2 != 0x0) { 589 if (retval2 != 0x0) {
592 dev_warn(&sep->pdev->dev, "poll; poll error %x\n", retval2); 590 dev_warn(&sep->pdev->dev, "poll; poll error %x\n", retval2);
@@ -1106,7 +1104,7 @@ static int sep_lock_user_pages(struct sep_device *sep,
1106 lli_array[count].block_size); 1104 lli_array[count].block_size);
1107 } 1105 }
1108 1106
1109 /* Set output params acording to the in_out flag */ 1107 /* Set output params according to the in_out flag */
1110 if (in_out_flag == SEP_DRIVER_IN_FLAG) { 1108 if (in_out_flag == SEP_DRIVER_IN_FLAG) {
1111 *lli_array_ptr = lli_array; 1109 *lli_array_ptr = lli_array;
1112 sep->dma_res_arr[sep->nr_dcb_creat].in_num_pages = num_pages; 1110 sep->dma_res_arr[sep->nr_dcb_creat].in_num_pages = num_pages;
@@ -1577,7 +1575,7 @@ static int sep_prepare_input_dma_table(struct sep_device *sep,
1577 1575
1578 /* 1576 /*
1579 * If this is not the last table - 1577 * If this is not the last table -
1580 * then allign it to the block size 1578 * then align it to the block size
1581 */ 1579 */
1582 if (!last_table_flag) 1580 if (!last_table_flag)
1583 table_data_size = 1581 table_data_size =
@@ -1974,7 +1972,7 @@ static int sep_prepare_input_output_dma_table(struct sep_device *sep,
1974 dev_dbg(&sep->pdev->dev, "SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP is %x\n", 1972 dev_dbg(&sep->pdev->dev, "SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP is %x\n",
1975 SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP); 1973 SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP);
1976 1974
1977 /* Call the fucntion that creates table from the lli arrays */ 1975 /* Call the function that creates table from the lli arrays */
1978 error = sep_construct_dma_tables_from_lli(sep, lli_in_array, 1976 error = sep_construct_dma_tables_from_lli(sep, lli_in_array,
1979 sep->dma_res_arr[sep->nr_dcb_creat].in_num_pages, 1977 sep->dma_res_arr[sep->nr_dcb_creat].in_num_pages,
1980 lli_out_array, 1978 lli_out_array,
@@ -2372,7 +2370,6 @@ static int sep_rar_prepare_output_msg_handler(struct sep_device *sep,
2372 int error = 0; 2370 int error = 0;
2373 /* Command args */ 2371 /* Command args */
2374 struct rar_hndl_to_bus_struct command_args; 2372 struct rar_hndl_to_bus_struct command_args;
2375 struct RAR_buffer rar_buf;
2376 /* Bus address */ 2373 /* Bus address */
2377 dma_addr_t rar_bus = 0; 2374 dma_addr_t rar_bus = 0;
2378 /* Holds the RAR address in the system memory offset */ 2375 /* Holds the RAR address in the system memory offset */
@@ -2386,16 +2383,8 @@ static int sep_rar_prepare_output_msg_handler(struct sep_device *sep,
2386 } 2383 }
2387 2384
2388 /* Call to translation function only if user handle is not NULL */ 2385 /* Call to translation function only if user handle is not NULL */
2389 if (command_args.rar_handle) { 2386 if (command_args.rar_handle)
2390 memset(&rar_buf, 0, sizeof(rar_buf)); 2387 return -EOPNOTSUPP;
2391 rar_buf.info.handle = (u32)command_args.rar_handle;
2392
2393 if (rar_handle_to_bus(&rar_buf, 1) != 1) {
2394 error = -EFAULT;
2395 goto end_function;
2396 }
2397 rar_bus = rar_buf.bus_address;
2398 }
2399 dev_dbg(&sep->pdev->dev, "rar msg; rar_addr_bus = %x\n", (u32)rar_bus); 2388 dev_dbg(&sep->pdev->dev, "rar msg; rar_addr_bus = %x\n", (u32)rar_bus);
2400 2389
2401 /* Set value in the SYSTEM MEMORY offset */ 2390 /* Set value in the SYSTEM MEMORY offset */
@@ -2416,7 +2405,7 @@ end_function:
2416 * @cmd: command 2405 * @cmd: command
2417 * @arg: pointer to argument structure 2406 * @arg: pointer to argument structure
2418 * 2407 *
2419 * Implement the ioctl methods availble on the SEP device. 2408 * Implement the ioctl methods available on the SEP device.
2420 */ 2409 */
2421static long sep_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 2410static long sep_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
2422{ 2411{
diff --git a/drivers/staging/sep/sep_driver_config.h b/drivers/staging/sep/sep_driver_config.h
index d3b9220f3963..1033425c9c30 100644
--- a/drivers/staging/sep/sep_driver_config.h
+++ b/drivers/staging/sep/sep_driver_config.h
@@ -65,11 +65,11 @@
65#define SEP_DRIVER_MIN_DATA_SIZE_PER_TABLE 16 65#define SEP_DRIVER_MIN_DATA_SIZE_PER_TABLE 16
66 66
67/* flag that signifies tah the lock is 67/* flag that signifies tah the lock is
68currently held by the proccess (struct file) */ 68currently held by the process (struct file) */
69#define SEP_DRIVER_OWN_LOCK_FLAG 1 69#define SEP_DRIVER_OWN_LOCK_FLAG 1
70 70
71/* flag that signifies tah the lock is currently NOT 71/* flag that signifies tah the lock is currently NOT
72held by the proccess (struct file) */ 72held by the process (struct file) */
73#define SEP_DRIVER_DISOWN_LOCK_FLAG 0 73#define SEP_DRIVER_DISOWN_LOCK_FLAG 0
74 74
75/* indicates whether driver has mapped/unmapped shared area */ 75/* indicates whether driver has mapped/unmapped shared area */
diff --git a/drivers/staging/slicoss/README b/drivers/staging/slicoss/README
index 70f49099c065..b83bba19b7f0 100644
--- a/drivers/staging/slicoss/README
+++ b/drivers/staging/slicoss/README
@@ -33,7 +33,7 @@ TODO:
33 - NAPI? 33 - NAPI?
34 - wasted overhead of extra stats 34 - wasted overhead of extra stats
35 - state variables for things that are 35 - state variables for things that are
36 easily availble and shouldn't be kept in card structure, cardnum, ... 36 easily available and shouldn't be kept in card structure, cardnum, ...
37 slotnumber, events, ... 37 slotnumber, events, ...
38 - get rid of slic_spinlock wrapper 38 - get rid of slic_spinlock wrapper
39 - volatile == bad design => bad code 39 - volatile == bad design => bad code
diff --git a/drivers/staging/sm7xx/smtcfb.c b/drivers/staging/sm7xx/smtcfb.c
index d007e4a12c14..3e2230f0879a 100644
--- a/drivers/staging/sm7xx/smtcfb.c
+++ b/drivers/staging/sm7xx/smtcfb.c
@@ -26,10 +26,6 @@
26 * Boyod.yang <boyod.yang@siliconmotion.com.cn> 26 * Boyod.yang <boyod.yang@siliconmotion.com.cn>
27 */ 27 */
28 28
29#ifndef __KERNEL__
30#define __KERNEL__
31#endif
32
33#include <linux/io.h> 29#include <linux/io.h>
34#include <linux/fb.h> 30#include <linux/fb.h>
35#include <linux/pci.h> 31#include <linux/pci.h>
@@ -965,7 +961,7 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,
965 goto failed; 961 goto failed;
966 962
967 smtcfb_setmode(sfb); 963 smtcfb_setmode(sfb);
968 /* Primary display starting from 0 postion */ 964 /* Primary display starting from 0 position */
969 hw.BaseAddressInVRAM = 0; 965 hw.BaseAddressInVRAM = 0;
970 sfb->fb.par = &hw; 966 sfb->fb.par = &hw;
971 967
@@ -1019,6 +1015,7 @@ static void __devexit smtcfb_pci_remove(struct pci_dev *pdev)
1019 smtc_free_fb_info(sfb); 1015 smtc_free_fb_info(sfb);
1020} 1016}
1021 1017
1018#ifdef CONFIG_PM
1022/* Jason (08/14/2009) 1019/* Jason (08/14/2009)
1023 * suspend function, called when the suspend event is triggered 1020 * suspend function, called when the suspend event is triggered
1024 */ 1021 */
@@ -1055,7 +1052,7 @@ static int __maybe_unused smtcfb_suspend(struct pci_dev *pdev, pm_message_t msg)
1055 1052
1056 pdev->dev.power.power_state = msg; 1053 pdev->dev.power.power_state = msg;
1057 1054
1058 /* additionaly turn off all function blocks including internal PLLs */ 1055 /* additionally turn off all function blocks including internal PLLs */
1059 smtc_seqw(0x21, 0xff); 1056 smtc_seqw(0x21, 0xff);
1060 1057
1061 return 0; 1058 return 0;
@@ -1111,6 +1108,7 @@ static int __maybe_unused smtcfb_resume(struct pci_dev *pdev)
1111 1108
1112 return 0; 1109 return 0;
1113} 1110}
1111#endif
1114 1112
1115/* Jason (08/13/2009) 1113/* Jason (08/13/2009)
1116 * pci_driver struct used to wrap the original driver 1114 * pci_driver struct used to wrap the original driver
diff --git a/drivers/staging/speakup/keyhelp.c b/drivers/staging/speakup/keyhelp.c
index 23cf7f44f450..170f38815ffd 100644
--- a/drivers/staging/speakup/keyhelp.c
+++ b/drivers/staging/speakup/keyhelp.c
@@ -69,7 +69,7 @@ static void build_key_data(void)
69 memset(key_offsets, 0, sizeof(key_offsets)); 69 memset(key_offsets, 0, sizeof(key_offsets));
70 kp = state_tbl + nstates + 1; 70 kp = state_tbl + nstates + 1;
71 while (*kp++) { 71 while (*kp++) {
72 /* count occurrances of each function */ 72 /* count occurrences of each function */
73 for (i = 0; i < nstates; i++, kp++) { 73 for (i = 0; i < nstates; i++, kp++) {
74 if (!*kp) 74 if (!*kp)
75 continue; 75 continue;
diff --git a/drivers/staging/speakup/spkguide.txt b/drivers/staging/speakup/spkguide.txt
index 24362eb7b8f1..f3210571e396 100644
--- a/drivers/staging/speakup/spkguide.txt
+++ b/drivers/staging/speakup/spkguide.txt
@@ -1091,7 +1091,7 @@ screen that is constantly changing, such as a clock or status line.
1091 1091
1092There is no way to save these window settings, and you can only have one 1092There is no way to save these window settings, and you can only have one
1093window defined for each virtual console. There is also no way to have 1093window defined for each virtual console. There is also no way to have
1094windows automaticly defined for specific applications. 1094windows automatically defined for specific applications.
1095 1095
1096In order to define a window, use the review keys to move your reading 1096In order to define a window, use the review keys to move your reading
1097cursor to the beginning of the area you want to define. Then press 1097cursor to the beginning of the area you want to define. Then press
diff --git a/drivers/staging/spectra/ffsport.c b/drivers/staging/spectra/ffsport.c
index 007b24b54e25..20dae73d3b78 100644
--- a/drivers/staging/spectra/ffsport.c
+++ b/drivers/staging/spectra/ffsport.c
@@ -38,7 +38,7 @@
38* Outputs: Number of Used Bits 38* Outputs: Number of Used Bits
39* 0, if the argument is 0 39* 0, if the argument is 0
40* Description: Calculate the number of bits used by a given power of 2 number 40* Description: Calculate the number of bits used by a given power of 2 number
41* Number can be upto 32 bit 41* Number can be up to 32 bit
42*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/ 42*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
43int GLOB_Calc_Used_Bits(u32 n) 43int GLOB_Calc_Used_Bits(u32 n)
44{ 44{
@@ -653,7 +653,7 @@ static int SBD_setup_device(struct spectra_nand_dev *dev, int which)
653 } 653 }
654 dev->queue->queuedata = dev; 654 dev->queue->queuedata = dev;
655 655
656 /* As Linux block layer doens't support >4KB hardware sector, */ 656 /* As Linux block layer does't support >4KB hardware sector, */
657 /* Here we force report 512 byte hardware sector size to Kernel */ 657 /* Here we force report 512 byte hardware sector size to Kernel */
658 blk_queue_logical_block_size(dev->queue, 512); 658 blk_queue_logical_block_size(dev->queue, 512);
659 659
diff --git a/drivers/staging/spectra/flash.c b/drivers/staging/spectra/flash.c
index a2f820025ae4..aead358e5c2a 100644
--- a/drivers/staging/spectra/flash.c
+++ b/drivers/staging/spectra/flash.c
@@ -965,7 +965,7 @@ static void process_cmd_fail_abort(int *first_failed_cmd,
965 if (0 == *first_failed_cmd) 965 if (0 == *first_failed_cmd)
966 *first_failed_cmd = PendingCMD[idx].SBDCmdIndex; 966 *first_failed_cmd = PendingCMD[idx].SBDCmdIndex;
967 967
968 nand_dbg_print(NAND_DBG_DEBUG, "Uncorrectable error has occured " 968 nand_dbg_print(NAND_DBG_DEBUG, "Uncorrectable error has occurred "
969 "while executing %u Command %u accesing Block %u\n", 969 "while executing %u Command %u accesing Block %u\n",
970 (unsigned int)p_BTableChangesDelta->ftl_cmd_cnt, 970 (unsigned int)p_BTableChangesDelta->ftl_cmd_cnt,
971 PendingCMD[idx].CMD, 971 PendingCMD[idx].CMD,
@@ -1879,7 +1879,7 @@ static int write_back_to_l2_cache(u8 *buf, u64 logical_addr)
1879} 1879}
1880 1880
1881/* 1881/*
1882 * Seach in the Level2 Cache table to find the cache item. 1882 * Search in the Level2 Cache table to find the cache item.
1883 * If find, read the data from the NAND page of L2 Cache, 1883 * If find, read the data from the NAND page of L2 Cache,
1884 * Otherwise, return FAIL. 1884 * Otherwise, return FAIL.
1885 */ 1885 */
@@ -3989,7 +3989,7 @@ int GLOB_FTL_Block_Erase(u64 blk_addr)
3989* Inputs: index to block that was just incremented and is at the max 3989* Inputs: index to block that was just incremented and is at the max
3990* Outputs: PASS=0 / FAIL=1 3990* Outputs: PASS=0 / FAIL=1
3991* Description: If any erase counts at MAX, adjusts erase count of every 3991* Description: If any erase counts at MAX, adjusts erase count of every
3992* block by substracting least worn 3992* block by subtracting least worn
3993* counter from counter value of every entry in wear table 3993* counter from counter value of every entry in wear table
3994*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/ 3994*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
3995static int FTL_Adjust_Relative_Erase_Count(u32 Index_of_MAX) 3995static int FTL_Adjust_Relative_Erase_Count(u32 Index_of_MAX)
diff --git a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
index d55a8e40318b..3e68d58fdffd 100644
--- a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
+++ b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
@@ -71,7 +71,7 @@
71#define SYNAPTICS_RMI4_DEVICE_CONTROL_FUNC_NUM (0x01) 71#define SYNAPTICS_RMI4_DEVICE_CONTROL_FUNC_NUM (0x01)
72 72
73/** 73/**
74 * struct synaptics_rmi4_fn_desc - contains the funtion descriptor information 74 * struct synaptics_rmi4_fn_desc - contains the function descriptor information
75 * @query_base_addr: base address for query 75 * @query_base_addr: base address for query
76 * @cmd_base_addr: base address for command 76 * @cmd_base_addr: base address for command
77 * @ctrl_base_addr: base address for control 77 * @ctrl_base_addr: base address for control
@@ -92,7 +92,7 @@ struct synaptics_rmi4_fn_desc {
92}; 92};
93 93
94/** 94/**
95 * struct synaptics_rmi4_fn - contains the funtion information 95 * struct synaptics_rmi4_fn - contains the function information
96 * @fn_number: function number 96 * @fn_number: function number
97 * @num_of_data_sources: number of data sources 97 * @num_of_data_sources: number of data sources
98 * @num_of_data_points: number of fingers touched 98 * @num_of_data_points: number of fingers touched
@@ -151,7 +151,7 @@ struct synaptics_rmi4_device_info {
151 * @input_dev: pointer for input device 151 * @input_dev: pointer for input device
152 * @i2c_client: pointer for i2c client 152 * @i2c_client: pointer for i2c client
153 * @board: constant pointer for touch platform data 153 * @board: constant pointer for touch platform data
154 * @fn_list_mutex: mutex for funtion list 154 * @fn_list_mutex: mutex for function list
155 * @rmi4_page_mutex: mutex for rmi4 page 155 * @rmi4_page_mutex: mutex for rmi4 page
156 * @current_page: variable for integer 156 * @current_page: variable for integer
157 * @number_of_interrupt_register: interrupt registers count 157 * @number_of_interrupt_register: interrupt registers count
@@ -278,7 +278,7 @@ static int synaptics_rmi4_i2c_byte_write(struct synaptics_rmi4_data *pdata,
278 txbuf[0] = address & MASK_8BIT; 278 txbuf[0] = address & MASK_8BIT;
279 txbuf[1] = data; 279 txbuf[1] = data;
280 retval = i2c_master_send(pdata->i2c_client, txbuf, 2); 280 retval = i2c_master_send(pdata->i2c_client, txbuf, 2);
281 /* Add in retry on writes only in certian error return values */ 281 /* Add in retry on writes only in certain error return values */
282 if (retval != 2) { 282 if (retval != 2) {
283 dev_err(&i2c->dev, "%s:failed:%d\n", __func__, retval); 283 dev_err(&i2c->dev, "%s:failed:%d\n", __func__, retval);
284 retval = -EIO; 284 retval = -EIO;
@@ -561,7 +561,7 @@ static int synpatics_rmi4_touchpad_detect(struct synaptics_rmi4_data *pdata,
561 } 561 }
562 /* 562 /*
563 * 2D data sources have only 3 bits for the number of fingers 563 * 2D data sources have only 3 bits for the number of fingers
564 * supported - so the encoding is a bit wierd. 564 * supported - so the encoding is a bit weird.
565 */ 565 */
566 if ((queries[1] & MASK_3BIT) <= 4) 566 if ((queries[1] & MASK_3BIT) <= 4)
567 /* add 1 since zero based */ 567 /* add 1 since zero based */
@@ -1027,7 +1027,7 @@ err_input:
1027 * synaptics_rmi4_remove() - Removes the i2c-client touchscreen driver 1027 * synaptics_rmi4_remove() - Removes the i2c-client touchscreen driver
1028 * @client: i2c client structure pointer 1028 * @client: i2c client structure pointer
1029 * 1029 *
1030 * This funtion uses to remove the i2c-client 1030 * This function uses to remove the i2c-client
1031 * touchscreen driver and returns integer. 1031 * touchscreen driver and returns integer.
1032 */ 1032 */
1033static int __devexit synaptics_rmi4_remove(struct i2c_client *client) 1033static int __devexit synaptics_rmi4_remove(struct i2c_client *client)
@@ -1053,7 +1053,7 @@ static int __devexit synaptics_rmi4_remove(struct i2c_client *client)
1053 * synaptics_rmi4_suspend() - suspend the touch screen controller 1053 * synaptics_rmi4_suspend() - suspend the touch screen controller
1054 * @dev: pointer to device structure 1054 * @dev: pointer to device structure
1055 * 1055 *
1056 * This funtion is used to suspend the 1056 * This function is used to suspend the
1057 * touch panel controller and returns integer 1057 * touch panel controller and returns integer
1058 */ 1058 */
1059static int synaptics_rmi4_suspend(struct device *dev) 1059static int synaptics_rmi4_suspend(struct device *dev)
@@ -1089,7 +1089,7 @@ static int synaptics_rmi4_suspend(struct device *dev)
1089 * synaptics_rmi4_resume() - resume the touch screen controller 1089 * synaptics_rmi4_resume() - resume the touch screen controller
1090 * @dev: pointer to device structure 1090 * @dev: pointer to device structure
1091 * 1091 *
1092 * This funtion is used to resume the touch panel 1092 * This function is used to resume the touch panel
1093 * controller and returns integer. 1093 * controller and returns integer.
1094 */ 1094 */
1095static int synaptics_rmi4_resume(struct device *dev) 1095static int synaptics_rmi4_resume(struct device *dev)
@@ -1148,7 +1148,7 @@ static struct i2c_driver synaptics_rmi4_driver = {
1148/** 1148/**
1149 * synaptics_rmi4_init() - Initialize the touchscreen driver 1149 * synaptics_rmi4_init() - Initialize the touchscreen driver
1150 * 1150 *
1151 * This funtion uses to initializes the synaptics 1151 * This function uses to initializes the synaptics
1152 * touchscreen driver and returns integer. 1152 * touchscreen driver and returns integer.
1153 */ 1153 */
1154static int __init synaptics_rmi4_init(void) 1154static int __init synaptics_rmi4_init(void)
@@ -1158,7 +1158,7 @@ static int __init synaptics_rmi4_init(void)
1158/** 1158/**
1159 * synaptics_rmi4_exit() - De-initialize the touchscreen driver 1159 * synaptics_rmi4_exit() - De-initialize the touchscreen driver
1160 * 1160 *
1161 * This funtion uses to de-initialize the synaptics 1161 * This function uses to de-initialize the synaptics
1162 * touchscreen driver and returns none. 1162 * touchscreen driver and returns none.
1163 */ 1163 */
1164static void __exit synaptics_rmi4_exit(void) 1164static void __exit synaptics_rmi4_exit(void)
diff --git a/drivers/staging/tidspbridge/core/_tiomap.h b/drivers/staging/tidspbridge/core/_tiomap.h
index 1e0273e50d2b..7cb587103975 100644
--- a/drivers/staging/tidspbridge/core/_tiomap.h
+++ b/drivers/staging/tidspbridge/core/_tiomap.h
@@ -366,7 +366,7 @@ extern s32 dsp_debug;
366 * ======== sm_interrupt_dsp ======== 366 * ======== sm_interrupt_dsp ========
367 * Purpose: 367 * Purpose:
368 * Set interrupt value & send an interrupt to the DSP processor(s). 368 * Set interrupt value & send an interrupt to the DSP processor(s).
369 * This is typicaly used when mailbox interrupt mechanisms allow data 369 * This is typically used when mailbox interrupt mechanisms allow data
370 * to be associated with interrupt such as for OMAP's CMD/DATA regs. 370 * to be associated with interrupt such as for OMAP's CMD/DATA regs.
371 * Parameters: 371 * Parameters:
372 * dev_context: Handle to Bridge driver defined device info. 372 * dev_context: Handle to Bridge driver defined device info.
diff --git a/drivers/staging/tidspbridge/core/chnl_sm.c b/drivers/staging/tidspbridge/core/chnl_sm.c
index 8381130e1460..6d66e7d0fba8 100644
--- a/drivers/staging/tidspbridge/core/chnl_sm.c
+++ b/drivers/staging/tidspbridge/core/chnl_sm.c
@@ -578,7 +578,7 @@ int bridge_chnl_get_ioc(struct chnl_object *chnl_obj, u32 timeout,
578 } else if (stat_sync == -EPERM) { 578 } else if (stat_sync == -EPERM) {
579 /* This can occur when the user mode thread is 579 /* This can occur when the user mode thread is
580 * aborted (^C), or when _VWIN32_WaitSingleObject() 580 * aborted (^C), or when _VWIN32_WaitSingleObject()
581 * fails due to unkown causes. */ 581 * fails due to unknown causes. */
582 /* Even though Wait failed, there may be something in 582 /* Even though Wait failed, there may be something in
583 * the Q: */ 583 * the Q: */
584 if (list_empty(&pchnl->io_completions)) { 584 if (list_empty(&pchnl->io_completions)) {
diff --git a/drivers/staging/tidspbridge/dynload/cload.c b/drivers/staging/tidspbridge/dynload/cload.c
index 390040984e03..5cecd237e3f6 100644
--- a/drivers/staging/tidspbridge/dynload/cload.c
+++ b/drivers/staging/tidspbridge/dynload/cload.c
@@ -718,7 +718,7 @@ static void dload_symbols(struct dload_state *dlthis)
718 * as a temporary for .dllview record construction. 718 * as a temporary for .dllview record construction.
719 * Allocate storage for the whole table. Add 1 to the section count 719 * Allocate storage for the whole table. Add 1 to the section count
720 * in case a trampoline section is auto-generated as well as the 720 * in case a trampoline section is auto-generated as well as the
721 * size of the trampoline section name so DLLView doens't get lost. 721 * size of the trampoline section name so DLLView does't get lost.
722 */ 722 */
723 723
724 siz = sym_count * sizeof(struct local_symbol); 724 siz = sym_count * sizeof(struct local_symbol);
diff --git a/drivers/staging/tidspbridge/hw/hw_mmu.c b/drivers/staging/tidspbridge/hw/hw_mmu.c
index 014f5d5293ae..c214df9b205e 100644
--- a/drivers/staging/tidspbridge/hw/hw_mmu.c
+++ b/drivers/staging/tidspbridge/hw/hw_mmu.c
@@ -59,7 +59,7 @@ enum hw_mmu_page_size_t {
59 * RETURNS: 59 * RETURNS:
60 * 60 *
61 * Type : hw_status 61 * Type : hw_status
62 * Description : 0 -- No errors occured 62 * Description : 0 -- No errors occurred
63 * RET_BAD_NULL_PARAM -- A Pointer 63 * RET_BAD_NULL_PARAM -- A Pointer
64 * Paramater was set to NULL 64 * Paramater was set to NULL
65 * 65 *
@@ -102,7 +102,7 @@ static hw_status mmu_flush_entry(const void __iomem *base_address);
102 * RETURNS: 102 * RETURNS:
103 * 103 *
104 * Type : hw_status 104 * Type : hw_status
105 * Description : 0 -- No errors occured 105 * Description : 0 -- No errors occurred
106 * RET_BAD_NULL_PARAM -- A Pointer Paramater 106 * RET_BAD_NULL_PARAM -- A Pointer Paramater
107 * was set to NULL 107 * was set to NULL
108 * RET_PARAM_OUT_OF_RANGE -- Input Parameter out 108 * RET_PARAM_OUT_OF_RANGE -- Input Parameter out
@@ -147,7 +147,7 @@ static hw_status mmu_set_cam_entry(const void __iomem *base_address,
147 * RETURNS: 147 * RETURNS:
148 * 148 *
149 * Type : hw_status 149 * Type : hw_status
150 * Description : 0 -- No errors occured 150 * Description : 0 -- No errors occurred
151 * RET_BAD_NULL_PARAM -- A Pointer Paramater 151 * RET_BAD_NULL_PARAM -- A Pointer Paramater
152 * was set to NULL 152 * was set to NULL
153 * RET_PARAM_OUT_OF_RANGE -- Input Parameter 153 * RET_PARAM_OUT_OF_RANGE -- Input Parameter
diff --git a/drivers/staging/tidspbridge/include/dspbridge/_chnl_sm.h b/drivers/staging/tidspbridge/include/dspbridge/_chnl_sm.h
index d60e25258020..6e7ab4fd8c39 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/_chnl_sm.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/_chnl_sm.h
@@ -144,7 +144,7 @@ struct chnl_object {
144 s8 chnl_mode; /* Chnl mode and attributes */ 144 s8 chnl_mode; /* Chnl mode and attributes */
145 /* Chnl I/O completion event (user mode) */ 145 /* Chnl I/O completion event (user mode) */
146 void *user_event; 146 void *user_event;
147 /* Abstract syncronization object */ 147 /* Abstract synchronization object */
148 struct sync_object *sync_event; 148 struct sync_object *sync_event;
149 u32 process; /* Process which created this channel */ 149 u32 process; /* Process which created this channel */
150 u32 cb_arg; /* Argument to use with callback */ 150 u32 cb_arg; /* Argument to use with callback */
@@ -156,7 +156,7 @@ struct chnl_object {
156 struct list_head io_completions; 156 struct list_head io_completions;
157 struct list_head free_packets_list; /* List of free Irps */ 157 struct list_head free_packets_list; /* List of free Irps */
158 struct ntfy_object *ntfy_obj; 158 struct ntfy_object *ntfy_obj;
159 u32 bytes_moved; /* Total number of bytes transfered */ 159 u32 bytes_moved; /* Total number of bytes transferred */
160 160
161 /* For DSP-DMA */ 161 /* For DSP-DMA */
162 162
diff --git a/drivers/staging/tidspbridge/include/dspbridge/clk.h b/drivers/staging/tidspbridge/include/dspbridge/clk.h
index b23950323421..685341c50693 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/clk.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/clk.h
@@ -55,7 +55,7 @@ extern void dsp_clk_exit(void);
55 * Initializes private state of CLK module. 55 * Initializes private state of CLK module.
56 * Parameters: 56 * Parameters:
57 * Returns: 57 * Returns:
58 * TRUE if initialized; FALSE if error occured. 58 * TRUE if initialized; FALSE if error occurred.
59 * Requires: 59 * Requires:
60 * Ensures: 60 * Ensures:
61 * CLK initialized. 61 * CLK initialized.
@@ -71,7 +71,7 @@ void dsp_gpt_wait_overflow(short int clk_id, unsigned int load);
71 * Parameters: 71 * Parameters:
72 * Returns: 72 * Returns:
73 * 0: Success. 73 * 0: Success.
74 * -EPERM: Error occured while enabling the clock. 74 * -EPERM: Error occurred while enabling the clock.
75 * Requires: 75 * Requires:
76 * Ensures: 76 * Ensures:
77 */ 77 */
@@ -86,7 +86,7 @@ u32 dsp_clock_enable_all(u32 dsp_per_clocks);
86 * Parameters: 86 * Parameters:
87 * Returns: 87 * Returns:
88 * 0: Success. 88 * 0: Success.
89 * -EPERM: Error occured while disabling the clock. 89 * -EPERM: Error occurred while disabling the clock.
90 * Requires: 90 * Requires:
91 * Ensures: 91 * Ensures:
92 */ 92 */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/cmm.h b/drivers/staging/tidspbridge/include/dspbridge/cmm.h
index 27a21b5f3ff0..aff22051cf57 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/cmm.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/cmm.h
@@ -190,7 +190,7 @@ extern int cmm_get_info(struct cmm_object *hcmm_mgr,
190 * Initializes private state of CMM module. 190 * Initializes private state of CMM module.
191 * Parameters: 191 * Parameters:
192 * Returns: 192 * Returns:
193 * TRUE if initialized; FALSE if error occured. 193 * TRUE if initialized; FALSE if error occurred.
194 * Requires: 194 * Requires:
195 * Ensures: 195 * Ensures:
196 * CMM initialized. 196 * CMM initialized.
diff --git a/drivers/staging/tidspbridge/include/dspbridge/cod.h b/drivers/staging/tidspbridge/include/dspbridge/cod.h
index 53bd4bb8b0bb..cb684c11b302 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/cod.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/cod.h
@@ -249,7 +249,7 @@ extern int cod_get_sym_value(struct cod_manager *cod_mgr_obj,
249 * Parameters: 249 * Parameters:
250 * None. 250 * None.
251 * Returns: 251 * Returns:
252 * TRUE if initialized; FALSE if error occured. 252 * TRUE if initialized; FALSE if error occurred.
253 * Requires: 253 * Requires:
254 * Ensures: 254 * Ensures:
255 * A requirement for each of the other public COD functions. 255 * A requirement for each of the other public COD functions.
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dev.h b/drivers/staging/tidspbridge/include/dspbridge/dev.h
index f41e4783157f..f92b4be0b413 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dev.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dev.h
@@ -497,7 +497,7 @@ extern void dev_exit(void);
497 * Initialize DEV's private state, keeping a reference count on each call. 497 * Initialize DEV's private state, keeping a reference count on each call.
498 * Parameters: 498 * Parameters:
499 * Returns: 499 * Returns:
500 * TRUE if initialized; FALSE if error occured. 500 * TRUE if initialized; FALSE if error occurred.
501 * Requires: 501 * Requires:
502 * Ensures: 502 * Ensures:
503 * TRUE: A requirement for the other public DEV functions. 503 * TRUE: A requirement for the other public DEV functions.
diff --git a/drivers/staging/tidspbridge/include/dspbridge/drv.h b/drivers/staging/tidspbridge/include/dspbridge/drv.h
index 25ef1a2c58eb..9cdbd955dce9 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/drv.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/drv.h
@@ -154,7 +154,7 @@ struct process_context {
154 * Parameters: 154 * Parameters:
155 * drv_obj: Location to store created DRV Object handle. 155 * drv_obj: Location to store created DRV Object handle.
156 * Returns: 156 * Returns:
157 * 0: Sucess 157 * 0: Success
158 * -ENOMEM: Failed in Memory allocation 158 * -ENOMEM: Failed in Memory allocation
159 * -EPERM: General Failure 159 * -EPERM: General Failure
160 * Requires: 160 * Requires:
@@ -170,7 +170,7 @@ struct process_context {
170 * There is one Driver Object for the Driver representing 170 * There is one Driver Object for the Driver representing
171 * the driver itself. It contains the list of device 171 * the driver itself. It contains the list of device
172 * Objects and the list of Device Extensions in the system. 172 * Objects and the list of Device Extensions in the system.
173 * Also it can hold other neccessary 173 * Also it can hold other necessary
174 * information in its storage area. 174 * information in its storage area.
175 */ 175 */
176extern int drv_create(struct drv_object **drv_obj); 176extern int drv_create(struct drv_object **drv_obj);
@@ -180,7 +180,7 @@ extern int drv_create(struct drv_object **drv_obj);
180 * Purpose: 180 * Purpose:
181 * destroys the Dev Object list, DrvExt list 181 * destroys the Dev Object list, DrvExt list
182 * and destroy the DRV object 182 * and destroy the DRV object
183 * Called upon driver unLoading.or unsuccesful loading of the driver. 183 * Called upon driver unLoading.or unsuccessful loading of the driver.
184 * Parameters: 184 * Parameters:
185 * driver_obj: Handle to Driver object . 185 * driver_obj: Handle to Driver object .
186 * Returns: 186 * Returns:
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h b/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
index c2ba26c09308..ed32bf383132 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
@@ -52,7 +52,7 @@ struct bridge_dev_context;
52 * dev_ctxt: Handle to Bridge driver defined device context. 52 * dev_ctxt: Handle to Bridge driver defined device context.
53 * Returns: 53 * Returns:
54 * 0: Success. 54 * 0: Success.
55 * -ETIMEDOUT: Timeout occured waiting for a response from hardware. 55 * -ETIMEDOUT: Timeout occurred waiting for a response from hardware.
56 * -EPERM: Other, unspecified error. 56 * -EPERM: Other, unspecified error.
57 * Requires: 57 * Requires:
58 * dev_ctxt != NULL 58 * dev_ctxt != NULL
@@ -91,7 +91,7 @@ typedef int(*fxn_brd_setstate) (struct bridge_dev_context
91 * dsp_addr: DSP address at which to start execution. 91 * dsp_addr: DSP address at which to start execution.
92 * Returns: 92 * Returns:
93 * 0: Success. 93 * 0: Success.
94 * -ETIMEDOUT: Timeout occured waiting for a response from hardware. 94 * -ETIMEDOUT: Timeout occurred waiting for a response from hardware.
95 * -EPERM: Other, unspecified error. 95 * -EPERM: Other, unspecified error.
96 * Requires: 96 * Requires:
97 * dev_ctxt != NULL 97 * dev_ctxt != NULL
@@ -142,7 +142,7 @@ typedef int(*fxn_brd_memcopy) (struct bridge_dev_context
142 * mem_type: Memory space on DSP to which to transfer. 142 * mem_type: Memory space on DSP to which to transfer.
143 * Returns: 143 * Returns:
144 * 0: Success. 144 * 0: Success.
145 * -ETIMEDOUT: Timeout occured waiting for a response from hardware. 145 * -ETIMEDOUT: Timeout occurred waiting for a response from hardware.
146 * -EPERM: Other, unspecified error. 146 * -EPERM: Other, unspecified error.
147 * Requires: 147 * Requires:
148 * dev_ctxt != NULL; 148 * dev_ctxt != NULL;
@@ -205,7 +205,7 @@ typedef int(*fxn_brd_memunmap) (struct bridge_dev_context
205 * dev_ctxt: Handle to Bridge driver defined device context. 205 * dev_ctxt: Handle to Bridge driver defined device context.
206 * Returns: 206 * Returns:
207 * 0: Success. 207 * 0: Success.
208 * -ETIMEDOUT: Timeout occured waiting for a response from hardware. 208 * -ETIMEDOUT: Timeout occurred waiting for a response from hardware.
209 * -EPERM: Other, unspecified error. 209 * -EPERM: Other, unspecified error.
210 * Requires: 210 * Requires:
211 * dev_ctxt != NULL 211 * dev_ctxt != NULL
@@ -248,7 +248,7 @@ typedef int(*fxn_brd_status) (struct bridge_dev_context *dev_ctxt,
248 * mem_type: Memory space on DSP from which to transfer. 248 * mem_type: Memory space on DSP from which to transfer.
249 * Returns: 249 * Returns:
250 * 0: Success. 250 * 0: Success.
251 * -ETIMEDOUT: Timeout occured waiting for a response from hardware. 251 * -ETIMEDOUT: Timeout occurred waiting for a response from hardware.
252 * -EPERM: Other, unspecified error. 252 * -EPERM: Other, unspecified error.
253 * Requires: 253 * Requires:
254 * dev_ctxt != NULL; 254 * dev_ctxt != NULL;
@@ -274,7 +274,7 @@ typedef int(*fxn_brd_read) (struct bridge_dev_context *dev_ctxt,
274 * mem_type: Memory space on DSP to which to transfer. 274 * mem_type: Memory space on DSP to which to transfer.
275 * Returns: 275 * Returns:
276 * 0: Success. 276 * 0: Success.
277 * -ETIMEDOUT: Timeout occured waiting for a response from hardware. 277 * -ETIMEDOUT: Timeout occurred waiting for a response from hardware.
278 * -EPERM: Other, unspecified error. 278 * -EPERM: Other, unspecified error.
279 * Requires: 279 * Requires:
280 * dev_ctxt != NULL; 280 * dev_ctxt != NULL;
@@ -601,7 +601,7 @@ typedef int(*fxn_chnl_getmgrinfo) (struct chnl_mgr
601 * Returns: 601 * Returns:
602 * 0: Success; 602 * 0: Success;
603 * -EFAULT: Invalid chnl_obj. 603 * -EFAULT: Invalid chnl_obj.
604 * -ETIMEDOUT: Timeout occured before channel could be idled. 604 * -ETIMEDOUT: Timeout occurred before channel could be idled.
605 * Requires: 605 * Requires:
606 * Ensures: 606 * Ensures:
607 */ 607 */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/mgr.h b/drivers/staging/tidspbridge/include/dspbridge/mgr.h
index e506c4d49472..47b0318430e1 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/mgr.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/mgr.h
@@ -176,7 +176,7 @@ extern void mgr_exit(void);
176 * mgr_handle: Handle to the Manager Object 176 * mgr_handle: Handle to the Manager Object
177 * dcd_handle: Ptr to receive the DCD Handle. 177 * dcd_handle: Ptr to receive the DCD Handle.
178 * Returns: 178 * Returns:
179 * 0: Sucess 179 * 0: Success
180 * -EPERM: Failure to get the Handle 180 * -EPERM: Failure to get the Handle
181 * Requires: 181 * Requires:
182 * MGR is initialized. 182 * MGR is initialized.
@@ -195,7 +195,7 @@ extern int mgr_get_dcd_handle(struct mgr_object
195 * call. Initializes the DCD. 195 * call. Initializes the DCD.
196 * Parameters: 196 * Parameters:
197 * Returns: 197 * Returns:
198 * TRUE if initialized; FALSE if error occured. 198 * TRUE if initialized; FALSE if error occurred.
199 * Requires: 199 * Requires:
200 * Ensures: 200 * Ensures:
201 * TRUE: A requirement for the other public MGR functions. 201 * TRUE: A requirement for the other public MGR functions.
diff --git a/drivers/staging/tidspbridge/include/dspbridge/node.h b/drivers/staging/tidspbridge/include/dspbridge/node.h
index 53da0ef483c8..16371d818e3d 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/node.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/node.h
@@ -44,7 +44,7 @@
44 * -ESPIPE: iAlg functions not found for a DAIS node. 44 * -ESPIPE: iAlg functions not found for a DAIS node.
45 * -EDOM: attr_in != NULL and attr_in->prio out of 45 * -EDOM: attr_in != NULL and attr_in->prio out of
46 * range. 46 * range.
47 * -EPERM: A failure occured, unable to allocate node. 47 * -EPERM: A failure occurred, unable to allocate node.
48 * -EBADR: Proccessor is not in the running state. 48 * -EBADR: Proccessor is not in the running state.
49 * Requires: 49 * Requires:
50 * node_init(void) called. 50 * node_init(void) called.
diff --git a/drivers/staging/tidspbridge/include/dspbridge/proc.h b/drivers/staging/tidspbridge/include/dspbridge/proc.h
index 5e09fd165d9d..f00dffd51989 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/proc.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/proc.h
@@ -89,7 +89,7 @@ extern int proc_auto_start(struct cfg_devnode *dev_node_obj,
89 * Returns: 89 * Returns:
90 * 0 : SUCCESS 90 * 0 : SUCCESS
91 * -EFAULT : Invalid processor handle. 91 * -EFAULT : Invalid processor handle.
92 * -ETIME: A Timeout Occured before the Control information 92 * -ETIME: A Timeout Occurred before the Control information
93 * could be sent. 93 * could be sent.
94 * -EPERM : General Failure. 94 * -EPERM : General Failure.
95 * Requires: 95 * Requires:
@@ -169,7 +169,7 @@ extern int proc_enum_nodes(void *hprocessor,
169 * 0 : Success. 169 * 0 : Success.
170 * -EFAULT : Invalid processor handle. 170 * -EFAULT : Invalid processor handle.
171 * -EBADR: The processor is not in the PROC_RUNNING state. 171 * -EBADR: The processor is not in the PROC_RUNNING state.
172 * -ETIME: A timeout occured before the DSP responded to the 172 * -ETIME: A timeout occurred before the DSP responded to the
173 * querry. 173 * querry.
174 * -EPERM : Unable to get Resource Information 174 * -EPERM : Unable to get Resource Information
175 * Requires: 175 * Requires:
@@ -229,7 +229,7 @@ extern int proc_get_dev_object(void *hprocessor,
229 * call. 229 * call.
230 * Parameters: 230 * Parameters:
231 * Returns: 231 * Returns:
232 * TRUE if initialized; FALSE if error occured. 232 * TRUE if initialized; FALSE if error occurred.
233 * Requires: 233 * Requires:
234 * Ensures: 234 * Ensures:
235 * TRUE: A requirement for the other public PROC functions. 235 * TRUE: A requirement for the other public PROC functions.
diff --git a/drivers/staging/tidspbridge/include/dspbridge/pwr.h b/drivers/staging/tidspbridge/include/dspbridge/pwr.h
index 5e3ab2123aaa..0fb066488da9 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/pwr.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/pwr.h
@@ -46,7 +46,7 @@
46 * 0: Success. 46 * 0: Success.
47 * 0: Success, but the DSP was already asleep. 47 * 0: Success, but the DSP was already asleep.
48 * -EINVAL: The specified sleep_code is not supported. 48 * -EINVAL: The specified sleep_code is not supported.
49 * -ETIME: A timeout occured while waiting for DSP sleep 49 * -ETIME: A timeout occurred while waiting for DSP sleep
50 * confirmation. 50 * confirmation.
51 * -EPERM: General failure, unable to send sleep command to 51 * -EPERM: General failure, unable to send sleep command to
52 * the DSP. 52 * the DSP.
@@ -67,7 +67,7 @@ extern int pwr_sleep_dsp(const u32 sleep_code, const u32 timeout);
67 * Returns: 67 * Returns:
68 * 0: Success. 68 * 0: Success.
69 * 0: Success, but the DSP was already awake. 69 * 0: Success, but the DSP was already awake.
70 * -ETIME: A timeout occured while waiting for wake 70 * -ETIME: A timeout occurred while waiting for wake
71 * confirmation. 71 * confirmation.
72 * -EPERM: General failure, unable to send wake command to 72 * -EPERM: General failure, unable to send wake command to
73 * the DSP. 73 * the DSP.
@@ -85,7 +85,7 @@ extern int pwr_wake_dsp(const u32 timeout);
85 * Returns: 85 * Returns:
86 * 0: Success. 86 * 0: Success.
87 * 0: Success, but the DSP was already awake. 87 * 0: Success, but the DSP was already awake.
88 * -ETIME: A timeout occured while waiting for wake 88 * -ETIME: A timeout occurred while waiting for wake
89 * confirmation. 89 * confirmation.
90 * -EPERM: General failure, unable to send wake command to 90 * -EPERM: General failure, unable to send wake command to
91 * the DSP. 91 * the DSP.
@@ -103,7 +103,7 @@ extern int pwr_pm_pre_scale(u16 voltage_domain, u32 level);
103 * Returns: 103 * Returns:
104 * 0: Success. 104 * 0: Success.
105 * 0: Success, but the DSP was already awake. 105 * 0: Success, but the DSP was already awake.
106 * -ETIME: A timeout occured while waiting for wake 106 * -ETIME: A timeout occurred while waiting for wake
107 * confirmation. 107 * confirmation.
108 * -EPERM: General failure, unable to send wake command to 108 * -EPERM: General failure, unable to send wake command to
109 * the DSP. 109 * the DSP.
diff --git a/drivers/staging/tidspbridge/pmgr/dev.c b/drivers/staging/tidspbridge/pmgr/dev.c
index 9a38d86a84a0..522810bc7427 100644
--- a/drivers/staging/tidspbridge/pmgr/dev.c
+++ b/drivers/staging/tidspbridge/pmgr/dev.c
@@ -787,7 +787,7 @@ int dev_notify_clients(struct dev_object *dev_obj, u32 ret)
787 787
788 /* 788 /*
789 * FIXME: this code needs struct proc_object to have a list_head 789 * FIXME: this code needs struct proc_object to have a list_head
790 * at the begining. If not, this can go horribly wrong. 790 * at the beginning. If not, this can go horribly wrong.
791 */ 791 */
792 list_for_each(curr, &dev_obj->proc_list) 792 list_for_each(curr, &dev_obj->proc_list)
793 proc_notify_clients((void *)curr, ret); 793 proc_notify_clients((void *)curr, ret);
@@ -810,7 +810,7 @@ int dev_remove_device(struct cfg_devnode *dev_node_obj)
810 if (!dev_node_obj) 810 if (!dev_node_obj)
811 status = -EFAULT; 811 status = -EFAULT;
812 812
813 /* Retrieve the device object handle originaly stored with 813 /* Retrieve the device object handle originally stored with
814 * the dev_node: */ 814 * the dev_node: */
815 if (!status) { 815 if (!status) {
816 /* check the device string and then store dev object */ 816 /* check the device string and then store dev object */
@@ -986,7 +986,7 @@ int dev_insert_proc_object(struct dev_object *hdev_obj,
986 /* Add DevObject to tail. */ 986 /* Add DevObject to tail. */
987 /* 987 /*
988 * FIXME: this code needs struct proc_object to have a list_head 988 * FIXME: this code needs struct proc_object to have a list_head
989 * at the begining. If not, this can go horribly wrong. 989 * at the beginning. If not, this can go horribly wrong.
990 */ 990 */
991 list_add_tail((struct list_head *)proc_obj, &dev_obj->proc_list); 991 list_add_tail((struct list_head *)proc_obj, &dev_obj->proc_list);
992 992
diff --git a/drivers/staging/tidspbridge/rmgr/drv.c b/drivers/staging/tidspbridge/rmgr/drv.c
index 8c88583364eb..db8215f540d8 100644
--- a/drivers/staging/tidspbridge/rmgr/drv.c
+++ b/drivers/staging/tidspbridge/rmgr/drv.c
@@ -609,7 +609,7 @@ int drv_request_resources(u32 dw_context, u32 *dev_node_strg)
609 DBC_REQUIRE(dev_node_strg != NULL); 609 DBC_REQUIRE(dev_node_strg != NULL);
610 610
611 /* 611 /*
612 * Allocate memory to hold the string. This will live untill 612 * Allocate memory to hold the string. This will live until
613 * it is freed in the Release resources. Update the driver object 613 * it is freed in the Release resources. Update the driver object
614 * list. 614 * list.
615 */ 615 */
diff --git a/drivers/staging/tidspbridge/rmgr/nldr.c b/drivers/staging/tidspbridge/rmgr/nldr.c
index fb5c2ba01d47..0e70cba15ebc 100644
--- a/drivers/staging/tidspbridge/rmgr/nldr.c
+++ b/drivers/staging/tidspbridge/rmgr/nldr.c
@@ -57,9 +57,9 @@
57 * uuuuuuuu|fueeeeee|fudddddd|fucccccc| 57 * uuuuuuuu|fueeeeee|fudddddd|fucccccc|
58 * where 58 * where
59 * u = unused 59 * u = unused
60 * cccccc = prefered/required dynamic mem segid for create phase data/code 60 * cccccc = preferred/required dynamic mem segid for create phase data/code
61 * dddddd = prefered/required dynamic mem segid for delete phase data/code 61 * dddddd = preferred/required dynamic mem segid for delete phase data/code
62 * eeeeee = prefered/req. dynamic mem segid for execute phase data/code 62 * eeeeee = preferred/req. dynamic mem segid for execute phase data/code
63 * f = flag indicating if memory is preferred or required: 63 * f = flag indicating if memory is preferred or required:
64 * f = 1 if required, f = 0 if preferred. 64 * f = 1 if required, f = 0 if preferred.
65 * 65 *
diff --git a/drivers/staging/tidspbridge/rmgr/proc.c b/drivers/staging/tidspbridge/rmgr/proc.c
index c4e5c4e0d71c..242dd1399996 100644
--- a/drivers/staging/tidspbridge/rmgr/proc.c
+++ b/drivers/staging/tidspbridge/rmgr/proc.c
@@ -1670,7 +1670,7 @@ int proc_stop(void *hprocessor)
1670 if (!status) { 1670 if (!status) {
1671 dev_dbg(bridge, "%s: processor in standby mode\n", __func__); 1671 dev_dbg(bridge, "%s: processor in standby mode\n", __func__);
1672 p_proc_object->proc_state = PROC_STOPPED; 1672 p_proc_object->proc_state = PROC_STOPPED;
1673 /* Destory the Node Manager, msg_ctrl Manager */ 1673 /* Destroy the Node Manager, msg_ctrl Manager */
1674 if (!(dev_destroy2(p_proc_object->dev_obj))) { 1674 if (!(dev_destroy2(p_proc_object->dev_obj))) {
1675 /* Destroy the msg_ctrl by calling msg_delete */ 1675 /* Destroy the msg_ctrl by calling msg_delete */
1676 dev_get_msg_mgr(p_proc_object->dev_obj, &hmsg_mgr); 1676 dev_get_msg_mgr(p_proc_object->dev_obj, &hmsg_mgr);
@@ -1827,7 +1827,7 @@ static int proc_monitor(struct proc_object *proc_obj)
1827 1827
1828 /* This is needed only when Device is loaded when it is 1828 /* This is needed only when Device is loaded when it is
1829 * already 'ACTIVE' */ 1829 * already 'ACTIVE' */
1830 /* Destory the Node Manager, msg_ctrl Manager */ 1830 /* Destroy the Node Manager, msg_ctrl Manager */
1831 if (!dev_destroy2(proc_obj->dev_obj)) { 1831 if (!dev_destroy2(proc_obj->dev_obj)) {
1832 /* Destroy the msg_ctrl by calling msg_delete */ 1832 /* Destroy the msg_ctrl by calling msg_delete */
1833 dev_get_msg_mgr(proc_obj->dev_obj, &hmsg_mgr); 1833 dev_get_msg_mgr(proc_obj->dev_obj, &hmsg_mgr);
diff --git a/drivers/staging/tm6000/tm6000-video.c b/drivers/staging/tm6000/tm6000-video.c
index c80a316d9d8f..17db6684abbe 100644
--- a/drivers/staging/tm6000/tm6000-video.c
+++ b/drivers/staging/tm6000/tm6000-video.c
@@ -182,7 +182,7 @@ static inline void get_next_buf(struct tm6000_dmaqueue *dma_q,
182 if (!buf) 182 if (!buf)
183 return; 183 return;
184 184
185 /* Cleans up buffer - Usefull for testing for frame/URB loss */ 185 /* Cleans up buffer - Useful for testing for frame/URB loss */
186 outp = videobuf_to_vmalloc(&(*buf)->vb); 186 outp = videobuf_to_vmalloc(&(*buf)->vb);
187 187
188 return; 188 return;
diff --git a/drivers/staging/tty/cd1865.h b/drivers/staging/tty/cd1865.h
index 9940966e7a1d..8c2ad654b79d 100644
--- a/drivers/staging/tty/cd1865.h
+++ b/drivers/staging/tty/cd1865.h
@@ -9,7 +9,7 @@
9 * Please DO contact io8-linux@specialix.co.uk if you require 9 * Please DO contact io8-linux@specialix.co.uk if you require
10 * support. 10 * support.
11 * 11 *
12 * This driver was developped in the BitWizard linux device 12 * This driver was developed in the BitWizard linux device
13 * driver service. If you require a linux device driver for your 13 * driver service. If you require a linux device driver for your
14 * product, please contact devices@BitWizard.nl for a quote. 14 * product, please contact devices@BitWizard.nl for a quote.
15 * 15 *
diff --git a/drivers/staging/tty/epca.c b/drivers/staging/tty/epca.c
index 7ad3638967ae..7f1369e5b418 100644
--- a/drivers/staging/tty/epca.c
+++ b/drivers/staging/tty/epca.c
@@ -7,7 +7,7 @@
7 ** This driver is no longer supported by Digi ** 7 ** This driver is no longer supported by Digi **
8 8
9 Much of this design and code came from epca.c which was 9 Much of this design and code came from epca.c which was
10 copyright (C) 1994, 1995 Troy De Jongh, and subsquently 10 copyright (C) 1994, 1995 Troy De Jongh, and subsequently
11 modified by David Nugent, Christoph Lameter, Mike McLagan. 11 modified by David Nugent, Christoph Lameter, Mike McLagan.
12 12
13 This program is free software; you can redistribute it and/or modify 13 This program is free software; you can redistribute it and/or modify
@@ -471,7 +471,7 @@ static void shutdown(struct channel *ch, struct tty_struct *tty)
471 memoff(ch); 471 memoff(ch);
472 472
473 /* 473 /*
474 * The channel has officialy been closed. The next time it is opened it 474 * The channel has officially been closed. The next time it is opened it
475 * will have to reinitialized. Set a flag to indicate this. 475 * will have to reinitialized. Set a flag to indicate this.
476 */ 476 */
477 /* Prevent future Digi programmed interrupts from coming active */ 477 /* Prevent future Digi programmed interrupts from coming active */
@@ -975,7 +975,7 @@ static int __init pc_init(void)
975 975
976 /* 976 /*
977 * Note : If lilo was used to configure the driver and the ignore 977 * Note : If lilo was used to configure the driver and the ignore
978 * epcaconfig option was choosen (digiepca=2) then nbdevs and num_cards 978 * epcaconfig option was chosen (digiepca=2) then nbdevs and num_cards
979 * will equal 0 at this point. This is okay; PCI cards will still be 979 * will equal 0 at this point. This is okay; PCI cards will still be
980 * picked up if detected. 980 * picked up if detected.
981 */ 981 */
@@ -1230,14 +1230,14 @@ static void post_fep_init(unsigned int crd)
1230 memaddr = bd->re_map_membase; 1230 memaddr = bd->re_map_membase;
1231 1231
1232 /* 1232 /*
1233 * The below assignment will set bc to point at the BEGINING of the 1233 * The below assignment will set bc to point at the BEGINNING of the
1234 * cards channel structures. For 1 card there will be between 8 and 64 1234 * cards channel structures. For 1 card there will be between 8 and 64
1235 * of these structures. 1235 * of these structures.
1236 */ 1236 */
1237 bc = memaddr + CHANSTRUCT; 1237 bc = memaddr + CHANSTRUCT;
1238 1238
1239 /* 1239 /*
1240 * The below assignment will set gd to point at the BEGINING of global 1240 * The below assignment will set gd to point at the BEGINNING of global
1241 * memory address 0xc00. The first data in that global memory actually 1241 * memory address 0xc00. The first data in that global memory actually
1242 * starts at address 0xc1a. The command in pointer begins at 0xd10. 1242 * starts at address 0xc1a. The command in pointer begins at 0xd10.
1243 */ 1243 */
@@ -1492,7 +1492,7 @@ static void doevent(int crd)
1492 /* 1492 /*
1493 * The two assignments below get the current modem status 1493 * The two assignments below get the current modem status
1494 * (mstat) and the previous modem status (lstat). These are 1494 * (mstat) and the previous modem status (lstat). These are
1495 * useful becuase an event could signal a change in modem 1495 * useful because an event could signal a change in modem
1496 * signals itself. 1496 * signals itself.
1497 */ 1497 */
1498 mstat = readb(eventbuf + 2); 1498 mstat = readb(eventbuf + 2);
@@ -1897,7 +1897,7 @@ static void receive_data(struct channel *ch, struct tty_struct *tty)
1897 /* 1897 /*
1898 * Even if head has wrapped around only report the amount of 1898 * Even if head has wrapped around only report the amount of
1899 * data to be equal to the size - tail. Remember memcpy can't 1899 * data to be equal to the size - tail. Remember memcpy can't
1900 * automaticly wrap around the receive buffer. 1900 * automatically wrap around the receive buffer.
1901 */ 1901 */
1902 dataToRead = (wrapgap < bytesAvailable) ? wrapgap 1902 dataToRead = (wrapgap < bytesAvailable) ? wrapgap
1903 : bytesAvailable; 1903 : bytesAvailable;
@@ -2543,7 +2543,7 @@ static void __init epca_setup(char *str, int *ints)
2543 break; 2543 break;
2544 /* 2544 /*
2545 * If the index incremented above refers to a 2545 * If the index incremented above refers to a
2546 * legitamate board type set it here. 2546 * legitimate board type set it here.
2547 */ 2547 */
2548 if (index < EPCA_NUM_TYPES) 2548 if (index < EPCA_NUM_TYPES)
2549 board.type = loop; 2549 board.type = loop;
diff --git a/drivers/staging/tty/ip2/i2hw.h b/drivers/staging/tty/ip2/i2hw.h
index c0ba6c05f0cd..8df2f487217a 100644
--- a/drivers/staging/tty/ip2/i2hw.h
+++ b/drivers/staging/tty/ip2/i2hw.h
@@ -335,7 +335,7 @@ be off by a factor of five. The important point is that the first command reset
335in fact generates a reset pulse on the board. This pulse is guaranteed to last 335in fact generates a reset pulse on the board. This pulse is guaranteed to last
336less than 10 milliseconds. The additional delay ensures the 1400 has had the 336less than 10 milliseconds. The additional delay ensures the 1400 has had the
337chance to respond sufficiently to the first reset. Why not a longer delay? Much 337chance to respond sufficiently to the first reset. Why not a longer delay? Much
338more than 50 milliseconds gets to be noticable, but the board would still work. 338more than 50 milliseconds gets to be noticeable, but the board would still work.
339 339
340Once all 16 bytes of the Power-on Reset Message have been read, the bootstrap 340Once all 16 bytes of the Power-on Reset Message have been read, the bootstrap
341firmware is ready to receive loadware. 341firmware is ready to receive loadware.
@@ -399,7 +399,7 @@ typedef union _porStr // "por" stands for Power On Reset
399 // expandable products must report a MAP of available channels. Since 399 // expandable products must report a MAP of available channels. Since
400 // each UART supports four ports, we represent each UART found by a 400 // each UART supports four ports, we represent each UART found by a
401 // single bit. Using two bytes to supply the mapping information we 401 // single bit. Using two bytes to supply the mapping information we
402 // report the presense or absense of up to 16 UARTS, or 64 ports in 402 // report the presence or absence of up to 16 UARTS, or 64 ports in
403 // steps of 4 ports. For -IIEX products, the ports are numbered 403 // steps of 4 ports. For -IIEX products, the ports are numbered
404 // starting at the box closest to the controller in the "chain". 404 // starting at the box closest to the controller in the "chain".
405 405
diff --git a/drivers/staging/tty/ip2/i2lib.c b/drivers/staging/tty/ip2/i2lib.c
index 0d10b89218ed..13a3caba85f2 100644
--- a/drivers/staging/tty/ip2/i2lib.c
+++ b/drivers/staging/tty/ip2/i2lib.c
@@ -821,7 +821,7 @@ i2GetStatus(i2ChanStrPtr pCh, int resetBits)
821// 821//
822// Description: 822// Description:
823// Strips data from the input buffer and writes it to pDest. If there is a 823// Strips data from the input buffer and writes it to pDest. If there is a
824// collosal blunder, (invalid structure pointers or the like), returns -1. 824// colossal blunder, (invalid structure pointers or the like), returns -1.
825// Otherwise, returns the number of bytes read. 825// Otherwise, returns the number of bytes read.
826//****************************************************************************** 826//******************************************************************************
827static int 827static int
@@ -909,7 +909,7 @@ i2Input_exit:
909// Returns: Number of bytes stripped, or -1 for error 909// Returns: Number of bytes stripped, or -1 for error
910// 910//
911// Description: 911// Description:
912// Strips any data from the input buffer. If there is a collosal blunder, 912// Strips any data from the input buffer. If there is a colossal blunder,
913// (invalid structure pointers or the like), returns -1. Otherwise, returns the 913// (invalid structure pointers or the like), returns -1. Otherwise, returns the
914// number of bytes stripped. 914// number of bytes stripped.
915//****************************************************************************** 915//******************************************************************************
@@ -963,7 +963,7 @@ i2InputFlush(i2ChanStrPtr pCh)
963// Returns: Number of bytes available, or -1 for error 963// Returns: Number of bytes available, or -1 for error
964// 964//
965// Description: 965// Description:
966// If there is a collosal blunder, (invalid structure pointers or the like), 966// If there is a colossal blunder, (invalid structure pointers or the like),
967// returns -1. Otherwise, returns the number of bytes stripped. Otherwise, 967// returns -1. Otherwise, returns the number of bytes stripped. Otherwise,
968// returns the number of bytes available in the buffer. 968// returns the number of bytes available in the buffer.
969//****************************************************************************** 969//******************************************************************************
@@ -1001,7 +1001,7 @@ i2InputAvailable(i2ChanStrPtr pCh)
1001// 1001//
1002// Description: 1002// Description:
1003// Queues the data at pSource to be sent as data packets to the board. If there 1003// Queues the data at pSource to be sent as data packets to the board. If there
1004// is a collosal blunder, (invalid structure pointers or the like), returns -1. 1004// is a colossal blunder, (invalid structure pointers or the like), returns -1.
1005// Otherwise, returns the number of bytes written. What if there is not enough 1005// Otherwise, returns the number of bytes written. What if there is not enough
1006// room for all the data? If pCh->channelOptions & CO_NBLOCK_WRITE is set, then 1006// room for all the data? If pCh->channelOptions & CO_NBLOCK_WRITE is set, then
1007// we transfer as many characters as we can now, then return. If this bit is 1007// we transfer as many characters as we can now, then return. If this bit is
diff --git a/drivers/staging/tty/ip2/ip2main.c b/drivers/staging/tty/ip2/ip2main.c
index ea7a8fb08283..ba074fbb4ce2 100644
--- a/drivers/staging/tty/ip2/ip2main.c
+++ b/drivers/staging/tty/ip2/ip2main.c
@@ -1824,7 +1824,7 @@ ip2_flush_chars( PTTY tty )
1824// ip2trace (CHANN, ITRC_PUTC, 10, 1, strip ); 1824// ip2trace (CHANN, ITRC_PUTC, 10, 1, strip );
1825 1825
1826 // 1826 //
1827 // We may need to restart i2Output if it does not fullfill this request 1827 // We may need to restart i2Output if it does not fulfill this request
1828 // 1828 //
1829 strip = i2Output( pCh, pCh->Pbuf, pCh->Pbuf_stuff); 1829 strip = i2Output( pCh, pCh->Pbuf, pCh->Pbuf_stuff);
1830 if ( strip != pCh->Pbuf_stuff ) { 1830 if ( strip != pCh->Pbuf_stuff ) {
diff --git a/drivers/staging/tty/specialix.c b/drivers/staging/tty/specialix.c
index 17a1be536a46..cb24c6d999db 100644
--- a/drivers/staging/tty/specialix.c
+++ b/drivers/staging/tty/specialix.c
@@ -9,7 +9,7 @@
9 * support. But please read the documentation (specialix.txt) 9 * support. But please read the documentation (specialix.txt)
10 * first. 10 * first.
11 * 11 *
12 * This driver was developped in the BitWizard linux device 12 * This driver was developed in the BitWizard linux device
13 * driver service. If you require a linux device driver for your 13 * driver service. If you require a linux device driver for your
14 * product, please contact devices@BitWizard.nl for a quote. 14 * product, please contact devices@BitWizard.nl for a quote.
15 * 15 *
@@ -978,7 +978,7 @@ static void sx_change_speed(struct specialix_board *bp,
978 spin_lock_irqsave(&bp->lock, flags); 978 spin_lock_irqsave(&bp->lock, flags);
979 sx_out(bp, CD186x_CAR, port_No(port)); 979 sx_out(bp, CD186x_CAR, port_No(port));
980 980
981 /* The Specialix board doens't implement the RTS lines. 981 /* The Specialix board does't implement the RTS lines.
982 They are used to set the IRQ level. Don't touch them. */ 982 They are used to set the IRQ level. Don't touch them. */
983 if (sx_crtscts(tty)) 983 if (sx_crtscts(tty))
984 port->MSVR = MSVR_DTR | (sx_in(bp, CD186x_MSVR) & MSVR_RTS); 984 port->MSVR = MSVR_DTR | (sx_in(bp, CD186x_MSVR) & MSVR_RTS);
diff --git a/drivers/staging/tty/specialix_io8.h b/drivers/staging/tty/specialix_io8.h
index c63005274d9b..1215d7e2cb37 100644
--- a/drivers/staging/tty/specialix_io8.h
+++ b/drivers/staging/tty/specialix_io8.h
@@ -10,7 +10,7 @@
10 * Please DO contact io8-linux@specialix.co.uk if you require 10 * Please DO contact io8-linux@specialix.co.uk if you require
11 * support. 11 * support.
12 * 12 *
13 * This driver was developped in the BitWizard linux device 13 * This driver was developed in the BitWizard linux device
14 * driver service. If you require a linux device driver for your 14 * driver service. If you require a linux device driver for your
15 * product, please contact devices@BitWizard.nl for a quote. 15 * product, please contact devices@BitWizard.nl for a quote.
16 * 16 *
@@ -79,7 +79,7 @@ more than a few PCI versions of the card. */
79 79
80#define SPECIALIX_MAGIC 0x0907 80#define SPECIALIX_MAGIC 0x0907
81 81
82#define SX_CCR_TIMEOUT 10000 /* CCR timeout. You may need to wait upto 82#define SX_CCR_TIMEOUT 10000 /* CCR timeout. You may need to wait up to
83 10 milliseconds before the internal 83 10 milliseconds before the internal
84 processor is available again after 84 processor is available again after
85 you give it a command */ 85 you give it a command */
diff --git a/drivers/staging/usbip/stub_dev.c b/drivers/staging/usbip/stub_dev.c
index 8214c353d9f5..bce7d039346c 100644
--- a/drivers/staging/usbip/stub_dev.c
+++ b/drivers/staging/usbip/stub_dev.c
@@ -220,8 +220,10 @@ static void stub_shutdown_connection(struct usbip_device *ud)
220 } 220 }
221 221
222 /* 1. stop threads */ 222 /* 1. stop threads */
223 kthread_stop(ud->tcp_rx); 223 if (ud->tcp_rx && !task_is_dead(ud->tcp_rx))
224 kthread_stop(ud->tcp_tx); 224 kthread_stop(ud->tcp_rx);
225 if (ud->tcp_tx && !task_is_dead(ud->tcp_tx))
226 kthread_stop(ud->tcp_tx);
225 227
226 /* 2. close the socket */ 228 /* 2. close the socket */
227 /* 229 /*
diff --git a/drivers/staging/usbip/stub_rx.c b/drivers/staging/usbip/stub_rx.c
index 6445f12cb4fd..51fbd0986475 100644
--- a/drivers/staging/usbip/stub_rx.c
+++ b/drivers/staging/usbip/stub_rx.c
@@ -171,33 +171,23 @@ static int tweak_set_configuration_cmd(struct urb *urb)
171 171
172static int tweak_reset_device_cmd(struct urb *urb) 172static int tweak_reset_device_cmd(struct urb *urb)
173{ 173{
174 struct usb_ctrlrequest *req; 174 struct stub_priv *priv = (struct stub_priv *) urb->context;
175 __u16 value; 175 struct stub_device *sdev = priv->sdev;
176 __u16 index;
177 int ret;
178
179 req = (struct usb_ctrlrequest *) urb->setup_packet;
180 value = le16_to_cpu(req->wValue);
181 index = le16_to_cpu(req->wIndex);
182
183 usbip_uinfo("reset_device (port %d) to %s\n", index,
184 dev_name(&urb->dev->dev));
185 176
186 /* all interfaces should be owned by usbip driver, so just reset it. */ 177 usbip_uinfo("reset_device %s\n", dev_name(&urb->dev->dev));
187 ret = usb_lock_device_for_reset(urb->dev, NULL);
188 if (ret < 0) {
189 dev_err(&urb->dev->dev, "lock for reset\n");
190 return ret;
191 }
192
193 /* try to reset the device */
194 ret = usb_reset_device(urb->dev);
195 if (ret < 0)
196 dev_err(&urb->dev->dev, "device reset\n");
197 178
198 usb_unlock_device(urb->dev); 179 /*
199 180 * usb_lock_device_for_reset caused a deadlock: it causes the driver
200 return ret; 181 * to unbind. In the shutdown the rx thread is signalled to shut down
182 * but this thread is pending in the usb_lock_device_for_reset.
183 *
184 * Instead queue the reset.
185 *
186 * Unfortunatly an existing usbip connection will be dropped due to
187 * driver unbinding.
188 */
189 usb_queue_reset_device(sdev->interface);
190 return 0;
201} 191}
202 192
203/* 193/*
diff --git a/drivers/staging/usbip/stub_tx.c b/drivers/staging/usbip/stub_tx.c
index 5523f25998e6..64a52b26dcf6 100644
--- a/drivers/staging/usbip/stub_tx.c
+++ b/drivers/staging/usbip/stub_tx.c
@@ -170,7 +170,6 @@ static int stub_send_ret_submit(struct stub_device *sdev)
170 struct stub_priv *priv, *tmp; 170 struct stub_priv *priv, *tmp;
171 171
172 struct msghdr msg; 172 struct msghdr msg;
173 struct kvec iov[3];
174 size_t txsize; 173 size_t txsize;
175 174
176 size_t total_size = 0; 175 size_t total_size = 0;
@@ -180,28 +179,73 @@ static int stub_send_ret_submit(struct stub_device *sdev)
180 struct urb *urb = priv->urb; 179 struct urb *urb = priv->urb;
181 struct usbip_header pdu_header; 180 struct usbip_header pdu_header;
182 void *iso_buffer = NULL; 181 void *iso_buffer = NULL;
182 struct kvec *iov = NULL;
183 int iovnum = 0;
183 184
184 txsize = 0; 185 txsize = 0;
185 memset(&pdu_header, 0, sizeof(pdu_header)); 186 memset(&pdu_header, 0, sizeof(pdu_header));
186 memset(&msg, 0, sizeof(msg)); 187 memset(&msg, 0, sizeof(msg));
187 memset(&iov, 0, sizeof(iov));
188 188
189 usbip_dbg_stub_tx("setup txdata urb %p\n", urb); 189 if (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS)
190 iovnum = 2 + urb->number_of_packets;
191 else
192 iovnum = 2;
193
194 iov = kzalloc(iovnum * sizeof(struct kvec), GFP_KERNEL);
190 195
196 if (!iov) {
197 usbip_event_add(&sdev->ud, SDEV_EVENT_ERROR_MALLOC);
198 return -1;
199 }
200
201 iovnum = 0;
191 202
192 /* 1. setup usbip_header */ 203 /* 1. setup usbip_header */
193 setup_ret_submit_pdu(&pdu_header, urb); 204 setup_ret_submit_pdu(&pdu_header, urb);
205 usbip_dbg_stub_tx("setup txdata seqnum: %d urb: %p\n",
206 pdu_header.base.seqnum, urb);
207 /*usbip_dump_header(pdu_header);*/
194 usbip_header_correct_endian(&pdu_header, 1); 208 usbip_header_correct_endian(&pdu_header, 1);
195 209
196 iov[0].iov_base = &pdu_header; 210 iov[iovnum].iov_base = &pdu_header;
197 iov[0].iov_len = sizeof(pdu_header); 211 iov[iovnum].iov_len = sizeof(pdu_header);
212 iovnum++;
198 txsize += sizeof(pdu_header); 213 txsize += sizeof(pdu_header);
199 214
200 /* 2. setup transfer buffer */ 215 /* 2. setup transfer buffer */
201 if (usb_pipein(urb->pipe) && urb->actual_length > 0) { 216 if (usb_pipein(urb->pipe) &&
202 iov[1].iov_base = urb->transfer_buffer; 217 usb_pipetype(urb->pipe) != PIPE_ISOCHRONOUS &&
203 iov[1].iov_len = urb->actual_length; 218 urb->actual_length > 0) {
219 iov[iovnum].iov_base = urb->transfer_buffer;
220 iov[iovnum].iov_len = urb->actual_length;
221 iovnum++;
204 txsize += urb->actual_length; 222 txsize += urb->actual_length;
223 } else if (usb_pipein(urb->pipe) &&
224 usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS) {
225 /*
226 * For isochronous packets: actual length is the sum of
227 * the actual length of the individual, packets, but as
228 * the packet offsets are not changed there will be
229 * padding between the packets. To optimally use the
230 * bandwidth the padding is not transmitted.
231 */
232
233 int i;
234 for (i = 0; i < urb->number_of_packets; i++) {
235 iov[iovnum].iov_base = urb->transfer_buffer + urb->iso_frame_desc[i].offset;
236 iov[iovnum].iov_len = urb->iso_frame_desc[i].actual_length;
237 iovnum++;
238 txsize += urb->iso_frame_desc[i].actual_length;
239 }
240
241 if (txsize != sizeof(pdu_header) + urb->actual_length) {
242 dev_err(&sdev->interface->dev,
243 "actual length of urb (%d) does not match iso packet sizes (%d)\n",
244 urb->actual_length, txsize-sizeof(pdu_header));
245 kfree(iov);
246 usbip_event_add(&sdev->ud, SDEV_EVENT_ERROR_TCP);
247 return -1;
248 }
205 } 249 }
206 250
207 /* 3. setup iso_packet_descriptor */ 251 /* 3. setup iso_packet_descriptor */
@@ -212,32 +256,34 @@ static int stub_send_ret_submit(struct stub_device *sdev)
212 if (!iso_buffer) { 256 if (!iso_buffer) {
213 usbip_event_add(&sdev->ud, 257 usbip_event_add(&sdev->ud,
214 SDEV_EVENT_ERROR_MALLOC); 258 SDEV_EVENT_ERROR_MALLOC);
259 kfree(iov);
215 return -1; 260 return -1;
216 } 261 }
217 262
218 iov[2].iov_base = iso_buffer; 263 iov[iovnum].iov_base = iso_buffer;
219 iov[2].iov_len = len; 264 iov[iovnum].iov_len = len;
220 txsize += len; 265 txsize += len;
266 iovnum++;
221 } 267 }
222 268
223 ret = kernel_sendmsg(sdev->ud.tcp_socket, &msg, iov, 269 ret = kernel_sendmsg(sdev->ud.tcp_socket, &msg,
224 3, txsize); 270 iov, iovnum, txsize);
225 if (ret != txsize) { 271 if (ret != txsize) {
226 dev_err(&sdev->interface->dev, 272 dev_err(&sdev->interface->dev,
227 "sendmsg failed!, retval %d for %zd\n", 273 "sendmsg failed!, retval %d for %zd\n",
228 ret, txsize); 274 ret, txsize);
275 kfree(iov);
229 kfree(iso_buffer); 276 kfree(iso_buffer);
230 usbip_event_add(&sdev->ud, SDEV_EVENT_ERROR_TCP); 277 usbip_event_add(&sdev->ud, SDEV_EVENT_ERROR_TCP);
231 return -1; 278 return -1;
232 } 279 }
233 280
281 kfree(iov);
234 kfree(iso_buffer); 282 kfree(iso_buffer);
235 usbip_dbg_stub_tx("send txdata\n");
236 283
237 total_size += txsize; 284 total_size += txsize;
238 } 285 }
239 286
240
241 spin_lock_irqsave(&sdev->priv_lock, flags); 287 spin_lock_irqsave(&sdev->priv_lock, flags);
242 288
243 list_for_each_entry_safe(priv, tmp, &sdev->priv_free, list) { 289 list_for_each_entry_safe(priv, tmp, &sdev->priv_free, list) {
diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/staging/usbip/usbip_common.c
index 337abc48f714..7b1fe45bf7dd 100644
--- a/drivers/staging/usbip/usbip_common.c
+++ b/drivers/staging/usbip/usbip_common.c
@@ -333,10 +333,11 @@ void usbip_dump_header(struct usbip_header *pdu)
333 usbip_udbg("CMD_UNLINK: seq %u\n", pdu->u.cmd_unlink.seqnum); 333 usbip_udbg("CMD_UNLINK: seq %u\n", pdu->u.cmd_unlink.seqnum);
334 break; 334 break;
335 case USBIP_RET_SUBMIT: 335 case USBIP_RET_SUBMIT:
336 usbip_udbg("RET_SUBMIT: st %d al %u sf %d ec %d\n", 336 usbip_udbg("RET_SUBMIT: st %d al %u sf %d #p %d ec %d\n",
337 pdu->u.ret_submit.status, 337 pdu->u.ret_submit.status,
338 pdu->u.ret_submit.actual_length, 338 pdu->u.ret_submit.actual_length,
339 pdu->u.ret_submit.start_frame, 339 pdu->u.ret_submit.start_frame,
340 pdu->u.ret_submit.number_of_packets,
340 pdu->u.ret_submit.error_count); 341 pdu->u.ret_submit.error_count);
341 case USBIP_RET_UNLINK: 342 case USBIP_RET_UNLINK:
342 usbip_udbg("RET_UNLINK: status %d\n", pdu->u.ret_unlink.status); 343 usbip_udbg("RET_UNLINK: status %d\n", pdu->u.ret_unlink.status);
@@ -520,6 +521,7 @@ static void usbip_pack_ret_submit(struct usbip_header *pdu, struct urb *urb,
520 rpdu->status = urb->status; 521 rpdu->status = urb->status;
521 rpdu->actual_length = urb->actual_length; 522 rpdu->actual_length = urb->actual_length;
522 rpdu->start_frame = urb->start_frame; 523 rpdu->start_frame = urb->start_frame;
524 rpdu->number_of_packets = urb->number_of_packets;
523 rpdu->error_count = urb->error_count; 525 rpdu->error_count = urb->error_count;
524 } else { 526 } else {
525 /* vhci_rx.c */ 527 /* vhci_rx.c */
@@ -527,6 +529,7 @@ static void usbip_pack_ret_submit(struct usbip_header *pdu, struct urb *urb,
527 urb->status = rpdu->status; 529 urb->status = rpdu->status;
528 urb->actual_length = rpdu->actual_length; 530 urb->actual_length = rpdu->actual_length;
529 urb->start_frame = rpdu->start_frame; 531 urb->start_frame = rpdu->start_frame;
532 urb->number_of_packets = rpdu->number_of_packets;
530 urb->error_count = rpdu->error_count; 533 urb->error_count = rpdu->error_count;
531 } 534 }
532} 535}
@@ -595,11 +598,13 @@ static void correct_endian_ret_submit(struct usbip_header_ret_submit *pdu,
595 cpu_to_be32s(&pdu->status); 598 cpu_to_be32s(&pdu->status);
596 cpu_to_be32s(&pdu->actual_length); 599 cpu_to_be32s(&pdu->actual_length);
597 cpu_to_be32s(&pdu->start_frame); 600 cpu_to_be32s(&pdu->start_frame);
601 cpu_to_be32s(&pdu->number_of_packets);
598 cpu_to_be32s(&pdu->error_count); 602 cpu_to_be32s(&pdu->error_count);
599 } else { 603 } else {
600 be32_to_cpus(&pdu->status); 604 be32_to_cpus(&pdu->status);
601 be32_to_cpus(&pdu->actual_length); 605 be32_to_cpus(&pdu->actual_length);
602 be32_to_cpus(&pdu->start_frame); 606 be32_to_cpus(&pdu->start_frame);
607 cpu_to_be32s(&pdu->number_of_packets);
603 be32_to_cpus(&pdu->error_count); 608 be32_to_cpus(&pdu->error_count);
604 } 609 }
605} 610}
@@ -725,6 +730,7 @@ int usbip_recv_iso(struct usbip_device *ud, struct urb *urb)
725 int size = np * sizeof(*iso); 730 int size = np * sizeof(*iso);
726 int i; 731 int i;
727 int ret; 732 int ret;
733 int total_length = 0;
728 734
729 if (!usb_pipeisoc(urb->pipe)) 735 if (!usb_pipeisoc(urb->pipe))
730 return 0; 736 return 0;
@@ -754,19 +760,75 @@ int usbip_recv_iso(struct usbip_device *ud, struct urb *urb)
754 return -EPIPE; 760 return -EPIPE;
755 } 761 }
756 762
763
757 for (i = 0; i < np; i++) { 764 for (i = 0; i < np; i++) {
758 iso = buff + (i * sizeof(*iso)); 765 iso = buff + (i * sizeof(*iso));
759 766
760 usbip_iso_pakcet_correct_endian(iso, 0); 767 usbip_iso_pakcet_correct_endian(iso, 0);
761 usbip_pack_iso(iso, &urb->iso_frame_desc[i], 0); 768 usbip_pack_iso(iso, &urb->iso_frame_desc[i], 0);
769 total_length += urb->iso_frame_desc[i].actual_length;
762 } 770 }
763 771
764 kfree(buff); 772 kfree(buff);
765 773
774 if (total_length != urb->actual_length) {
775 dev_err(&urb->dev->dev,
776 "total length of iso packets (%d) not equal to actual length of buffer (%d)\n",
777 total_length, urb->actual_length);
778
779 if (ud->side == USBIP_STUB)
780 usbip_event_add(ud, SDEV_EVENT_ERROR_TCP);
781 else
782 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
783
784 return -EPIPE;
785 }
786
766 return ret; 787 return ret;
767} 788}
768EXPORT_SYMBOL_GPL(usbip_recv_iso); 789EXPORT_SYMBOL_GPL(usbip_recv_iso);
769 790
791/*
792 * This functions restores the padding which was removed for optimizing
793 * the bandwidth during transfer over tcp/ip
794 *
795 * buffer and iso packets need to be stored and be in propeper endian in urb
796 * before calling this function
797 */
798int usbip_pad_iso(struct usbip_device *ud, struct urb *urb)
799{
800 int np = urb->number_of_packets;
801 int i;
802 int ret;
803 int actualoffset = urb->actual_length;
804
805 if (!usb_pipeisoc(urb->pipe))
806 return 0;
807
808 /* if no packets or length of data is 0, then nothing to unpack */
809 if (np == 0 || urb->actual_length == 0)
810 return 0;
811
812 /*
813 * if actual_length is transfer_buffer_length then no padding is
814 * present.
815 */
816 if (urb->actual_length == urb->transfer_buffer_length)
817 return 0;
818
819 /*
820 * loop over all packets from last to first (to prevent overwritting
821 * memory when padding) and move them into the proper place
822 */
823 for (i = np-1; i > 0; i--) {
824 actualoffset -= urb->iso_frame_desc[i].actual_length;
825 memmove(urb->transfer_buffer + urb->iso_frame_desc[i].offset,
826 urb->transfer_buffer + actualoffset,
827 urb->iso_frame_desc[i].actual_length);
828 }
829 return ret;
830}
831EXPORT_SYMBOL_GPL(usbip_pad_iso);
770 832
771/* some members of urb must be substituted before. */ 833/* some members of urb must be substituted before. */
772int usbip_recv_xbuff(struct usbip_device *ud, struct urb *urb) 834int usbip_recv_xbuff(struct usbip_device *ud, struct urb *urb)
diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h
index 9f809c315d92..c767f52be5fb 100644
--- a/drivers/staging/usbip/usbip_common.h
+++ b/drivers/staging/usbip/usbip_common.h
@@ -379,6 +379,8 @@ void usbip_header_correct_endian(struct usbip_header *pdu, int send);
379int usbip_recv_xbuff(struct usbip_device *ud, struct urb *urb); 379int usbip_recv_xbuff(struct usbip_device *ud, struct urb *urb);
380/* some members of urb must be substituted before. */ 380/* some members of urb must be substituted before. */
381int usbip_recv_iso(struct usbip_device *ud, struct urb *urb); 381int usbip_recv_iso(struct usbip_device *ud, struct urb *urb);
382/* some members of urb must be substituted before. */
383int usbip_pad_iso(struct usbip_device *ud, struct urb *urb);
382void *usbip_alloc_iso_desc_pdu(struct urb *urb, ssize_t *bufflen); 384void *usbip_alloc_iso_desc_pdu(struct urb *urb, ssize_t *bufflen);
383 385
384 386
diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
index e23484998598..0f02a4b12ae4 100644
--- a/drivers/staging/usbip/vhci_hcd.c
+++ b/drivers/staging/usbip/vhci_hcd.c
@@ -194,7 +194,7 @@ void rh_port_disconnect(int rhport)
194 * 194 *
195 * So, the maximum number of ports is 31 ( port 0 to port 30) ? 195 * So, the maximum number of ports is 31 ( port 0 to port 30) ?
196 * 196 *
197 * The return value is the actual transfered length in byte. If nothing has 197 * The return value is the actual transferred length in byte. If nothing has
198 * been changed, return 0. In the case that the number of ports is less than or 198 * been changed, return 0. In the case that the number of ports is less than or
199 * equal to 6 (VHCI_NPORTS==7), return 1. 199 * equal to 6 (VHCI_NPORTS==7), return 1.
200 * 200 *
diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
index 09bf2355934b..2ffc96a4c0d4 100644
--- a/drivers/staging/usbip/vhci_rx.c
+++ b/drivers/staging/usbip/vhci_rx.c
@@ -100,6 +100,9 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
100 if (usbip_recv_iso(ud, urb) < 0) 100 if (usbip_recv_iso(ud, urb) < 0)
101 return; 101 return;
102 102
103 /* restore the padding in iso packets */
104 if (usbip_pad_iso(ud, urb) < 0)
105 return;
103 106
104 if (usbip_dbg_flag_vhci_rx) 107 if (usbip_dbg_flag_vhci_rx)
105 usbip_dump_urb(urb); 108 usbip_dump_urb(urb);
diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.c b/drivers/staging/vme/bridges/vme_ca91cx42.c
index d4a48c4e59c2..a4007287ef47 100644
--- a/drivers/staging/vme/bridges/vme_ca91cx42.c
+++ b/drivers/staging/vme/bridges/vme_ca91cx42.c
@@ -621,7 +621,7 @@ static int ca91cx42_master_set(struct vme_master_resource *image, int enabled,
621 621
622 /* 622 /*
623 * Let's allocate the resource here rather than further up the stack as 623 * Let's allocate the resource here rather than further up the stack as
624 * it avoids pushing loads of bus dependant stuff up the stack 624 * it avoids pushing loads of bus dependent stuff up the stack
625 */ 625 */
626 retval = ca91cx42_alloc_resource(image, size); 626 retval = ca91cx42_alloc_resource(image, size);
627 if (retval) { 627 if (retval) {
@@ -1052,7 +1052,7 @@ static int ca91cx42_dma_list_add(struct vme_dma_list *list,
1052 pci_attr = dest->private; 1052 pci_attr = dest->private;
1053 } 1053 }
1054 1054
1055 /* Check we can do fullfill required attributes */ 1055 /* Check we can do fulfill required attributes */
1056 if ((vme_attr->aspace & ~(VME_A16 | VME_A24 | VME_A32 | VME_USER1 | 1056 if ((vme_attr->aspace & ~(VME_A16 | VME_A24 | VME_A32 | VME_USER1 |
1057 VME_USER2)) != 0) { 1057 VME_USER2)) != 0) {
1058 1058
@@ -1069,7 +1069,7 @@ static int ca91cx42_dma_list_add(struct vme_dma_list *list,
1069 goto err_cycle; 1069 goto err_cycle;
1070 } 1070 }
1071 1071
1072 /* Check to see if we can fullfill source and destination */ 1072 /* Check to see if we can fulfill source and destination */
1073 if (!(((src->type == VME_DMA_PCI) && (dest->type == VME_DMA_VME)) || 1073 if (!(((src->type == VME_DMA_PCI) && (dest->type == VME_DMA_VME)) ||
1074 ((src->type == VME_DMA_VME) && (dest->type == VME_DMA_PCI)))) { 1074 ((src->type == VME_DMA_VME) && (dest->type == VME_DMA_PCI)))) {
1075 1075
diff --git a/drivers/staging/vme/bridges/vme_tsi148.c b/drivers/staging/vme/bridges/vme_tsi148.c
index b00a53e793e7..106aa9daff48 100644
--- a/drivers/staging/vme/bridges/vme_tsi148.c
+++ b/drivers/staging/vme/bridges/vme_tsi148.c
@@ -928,7 +928,7 @@ static int tsi148_master_set(struct vme_master_resource *image, int enabled,
928 spin_lock(&image->lock); 928 spin_lock(&image->lock);
929 929
930 /* Let's allocate the resource here rather than further up the stack as 930 /* Let's allocate the resource here rather than further up the stack as
931 * it avoids pushing loads of bus dependant stuff up the stack. If size 931 * it avoids pushing loads of bus dependent stuff up the stack. If size
932 * is zero, any existing resource will be freed. 932 * is zero, any existing resource will be freed.
933 */ 933 */
934 retval = tsi148_alloc_resource(image, size); 934 retval = tsi148_alloc_resource(image, size);
@@ -1320,7 +1320,7 @@ static ssize_t tsi148_master_write(struct vme_master_resource *image, void *buf,
1320 1320
1321 /* 1321 /*
1322 * Writes are posted. We need to do a read on the VME bus to flush out 1322 * Writes are posted. We need to do a read on the VME bus to flush out
1323 * all of the writes before we check for errors. We can't guarentee 1323 * all of the writes before we check for errors. We can't guarantee
1324 * that reading the data we have just written is safe. It is believed 1324 * that reading the data we have just written is safe. It is believed
1325 * that there isn't any read, write re-ordering, so we can read any 1325 * that there isn't any read, write re-ordering, so we can read any
1326 * location in VME space, so lets read the Device ID from the tsi148's 1326 * location in VME space, so lets read the Device ID from the tsi148's
diff --git a/drivers/staging/vme/bridges/vme_tsi148.h b/drivers/staging/vme/bridges/vme_tsi148.h
index 9f97fa8084e8..a3ac2fe98816 100644
--- a/drivers/staging/vme/bridges/vme_tsi148.h
+++ b/drivers/staging/vme/bridges/vme_tsi148.h
@@ -212,7 +212,7 @@ static const int TSI148_LCSR_OT[8] = { TSI148_LCSR_OT0, TSI148_LCSR_OT1,
212#define TSI148_LCSR_OFFSET_OTAT 0x1C 212#define TSI148_LCSR_OFFSET_OTAT 0x1C
213 213
214/* 214/*
215 * VMEbus interupt ack 215 * VMEbus interrupt ack
216 * offset 200 216 * offset 200
217 */ 217 */
218#define TSI148_LCSR_VIACK1 0x204 218#define TSI148_LCSR_VIACK1 0x204
@@ -613,7 +613,7 @@ static const int TSI148_GCSR_MBOX[4] = { TSI148_GCSR_MBOX0,
613/* 613/*
614 * PCI-X Status Register (CRG +$054) 614 * PCI-X Status Register (CRG +$054)
615 */ 615 */
616#define TSI148_PCFS_PCIXSTAT_RSCEM (1<<29) /* Recieved Split Comp Error */ 616#define TSI148_PCFS_PCIXSTAT_RSCEM (1<<29) /* Received Split Comp Error */
617#define TSI148_PCFS_PCIXSTAT_DMCRS_M (7<<26) /* max Cumulative Read Size */ 617#define TSI148_PCFS_PCIXSTAT_DMCRS_M (7<<26) /* max Cumulative Read Size */
618#define TSI148_PCFS_PCIXSTAT_DMOST_M (7<<23) /* max outstanding Split Trans 618#define TSI148_PCFS_PCIXSTAT_DMOST_M (7<<23) /* max outstanding Split Trans
619 */ 619 */
@@ -982,8 +982,8 @@ static const int TSI148_GCSR_MBOX[4] = { TSI148_GCSR_MBOX0,
982#define TSI148_LCSR_VICR_CNTS_IRQ1 (2<<22) /* IRQ1 to Cntr */ 982#define TSI148_LCSR_VICR_CNTS_IRQ1 (2<<22) /* IRQ1 to Cntr */
983#define TSI148_LCSR_VICR_CNTS_IRQ2 (3<<22) /* IRQ2 to Cntr */ 983#define TSI148_LCSR_VICR_CNTS_IRQ2 (3<<22) /* IRQ2 to Cntr */
984 984
985#define TSI148_LCSR_VICR_EDGIS_M (3<<20) /* Edge interupt MASK */ 985#define TSI148_LCSR_VICR_EDGIS_M (3<<20) /* Edge interrupt MASK */
986#define TSI148_LCSR_VICR_EDGIS_DIS (1<<20) /* Edge interupt Disable */ 986#define TSI148_LCSR_VICR_EDGIS_DIS (1<<20) /* Edge interrupt Disable */
987#define TSI148_LCSR_VICR_EDGIS_IRQ1 (2<<20) /* IRQ1 to Edge */ 987#define TSI148_LCSR_VICR_EDGIS_IRQ1 (2<<20) /* IRQ1 to Edge */
988#define TSI148_LCSR_VICR_EDGIS_IRQ2 (3<<20) /* IRQ2 to Edge */ 988#define TSI148_LCSR_VICR_EDGIS_IRQ2 (3<<20) /* IRQ2 to Edge */
989 989
diff --git a/drivers/staging/vme/vme_api.txt b/drivers/staging/vme/vme_api.txt
index a910a0c4388b..4910e92c52af 100644
--- a/drivers/staging/vme/vme_api.txt
+++ b/drivers/staging/vme/vme_api.txt
@@ -6,7 +6,7 @@ Driver registration
6 6
7As with other subsystems within the Linux kernel, VME device drivers register 7As with other subsystems within the Linux kernel, VME device drivers register
8with the VME subsystem, typically called from the devices init routine. This is 8with the VME subsystem, typically called from the devices init routine. This is
9achieved via a call to the follwoing function: 9achieved via a call to the following function:
10 10
11 int vme_register_driver (struct vme_driver *driver); 11 int vme_register_driver (struct vme_driver *driver);
12 12
@@ -108,7 +108,7 @@ Master windows
108============== 108==============
109 109
110Master windows provide access from the local processor[s] out onto the VME bus. 110Master windows provide access from the local processor[s] out onto the VME bus.
111The number of windows available and the available access modes is dependant on 111The number of windows available and the available access modes is dependent on
112the underlying chipset. A window must be configured before it can be used. 112the underlying chipset. A window must be configured before it can be used.
113 113
114 114
@@ -163,7 +163,7 @@ Slave windows
163 163
164Slave windows provide devices on the VME bus access into mapped portions of the 164Slave windows provide devices on the VME bus access into mapped portions of the
165local memory. The number of windows available and the access modes that can be 165local memory. The number of windows available and the access modes that can be
166used is dependant on the underlying chipset. A window must be configured before 166used is dependent on the underlying chipset. A window must be configured before
167it can be used. 167it can be used.
168 168
169 169
diff --git a/drivers/staging/vt6655/Kconfig b/drivers/staging/vt6655/Kconfig
index 061e730df2d0..c3ba693a8cad 100644
--- a/drivers/staging/vt6655/Kconfig
+++ b/drivers/staging/vt6655/Kconfig
@@ -1,6 +1,6 @@
1config VT6655 1config VT6655
2 tristate "VIA Technologies VT6655 support" 2 tristate "VIA Technologies VT6655 support"
3 depends on PCI && WLAN 3 depends on PCI && WLAN && m
4 select WIRELESS_EXT 4 select WIRELESS_EXT
5 select WEXT_PRIV 5 select WEXT_PRIV
6 ---help--- 6 ---help---
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 951a3a8ddcb2..2721e0798496 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -1186,7 +1186,7 @@ CARDbStartMeasure (
1186 wDuration += 1; // 1 TU for channel switching 1186 wDuration += 1; // 1 TU for channel switching
1187 1187
1188 if ((LODWORD(qwStartTSF) == 0) && (HIDWORD(qwStartTSF) == 0)) { 1188 if ((LODWORD(qwStartTSF) == 0) && (HIDWORD(qwStartTSF) == 0)) {
1189 // start imediately by setting start TSF == current TSF + 2 TU 1189 // start immediately by setting start TSF == current TSF + 2 TU
1190 LODWORD(qwStartTSF) = LODWORD(qwCurrTSF) + 2048; 1190 LODWORD(qwStartTSF) = LODWORD(qwCurrTSF) + 2048;
1191 HIDWORD(qwStartTSF) = HIDWORD(qwCurrTSF); 1191 HIDWORD(qwStartTSF) = HIDWORD(qwCurrTSF);
1192 if (LODWORD(qwCurrTSF) > LODWORD(qwStartTSF)) { 1192 if (LODWORD(qwCurrTSF) > LODWORD(qwStartTSF)) {
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index efaf19bc07b7..ad39c8727e9b 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -137,7 +137,7 @@ DEVICE_PARAM(TxDescriptors1,"Number of transmit descriptors1");
137/* IP_byte_align[] is used for IP header unsigned long byte aligned 137/* IP_byte_align[] is used for IP header unsigned long byte aligned
138 0: indicate the IP header won't be unsigned long byte aligned.(Default) . 138 0: indicate the IP header won't be unsigned long byte aligned.(Default) .
139 1: indicate the IP header will be unsigned long byte aligned. 139 1: indicate the IP header will be unsigned long byte aligned.
140 In some enviroment, the IP header should be unsigned long byte aligned, 140 In some environment, the IP header should be unsigned long byte aligned,
141 or the packet will be droped when we receive it. (eg: IPVS) 141 or the packet will be droped when we receive it. (eg: IPVS)
142*/ 142*/
143DEVICE_PARAM(IP_byte_align,"Enable IP header dword aligned"); 143DEVICE_PARAM(IP_byte_align,"Enable IP header dword aligned");
diff --git a/drivers/staging/vt6655/wcmd.c b/drivers/staging/vt6655/wcmd.c
index abd6745bc3fe..c30170a2bc44 100644
--- a/drivers/staging/vt6655/wcmd.c
+++ b/drivers/staging/vt6655/wcmd.c
@@ -587,7 +587,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
587 if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED)) { 587 if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED)) {
588 588
589 // Call mgr to begin the deauthentication 589 // Call mgr to begin the deauthentication
590 // reason = (3) beacuse sta has left ESS 590 // reason = (3) because sta has left ESS
591 if (pMgmt->eCurrState>= WMAC_STATE_AUTH) { 591 if (pMgmt->eCurrState>= WMAC_STATE_AUTH) {
592 vMgrDeAuthenBeginSta((void *)pDevice, pMgmt, pMgmt->abyCurrBSSID, (3), &Status); 592 vMgrDeAuthenBeginSta((void *)pDevice, pMgmt, pMgmt->abyCurrBSSID, (3), &Status);
593 } 593 }
diff --git a/drivers/staging/vt6655/wmgr.h b/drivers/staging/vt6655/wmgr.h
index 141e80b843af..e3ae562f521a 100644
--- a/drivers/staging/vt6655/wmgr.h
+++ b/drivers/staging/vt6655/wmgr.h
@@ -220,7 +220,7 @@ typedef enum tagWMAC_POWER_MODE {
220*/ 220*/
221 221
222 222
223// Tx Managment Packet descriptor 223// Tx Management Packet descriptor
224typedef struct tagSTxMgmtPacket { 224typedef struct tagSTxMgmtPacket {
225 225
226 PUWLAN_80211HDR p80211Header; 226 PUWLAN_80211HDR p80211Header;
@@ -230,7 +230,7 @@ typedef struct tagSTxMgmtPacket {
230} STxMgmtPacket, *PSTxMgmtPacket; 230} STxMgmtPacket, *PSTxMgmtPacket;
231 231
232 232
233// Rx Managment Packet descriptor 233// Rx Management Packet descriptor
234typedef struct tagSRxMgmtPacket { 234typedef struct tagSRxMgmtPacket {
235 235
236 PUWLAN_80211HDR p80211Header; 236 PUWLAN_80211HDR p80211Header;
diff --git a/drivers/staging/vt6656/Kconfig b/drivers/staging/vt6656/Kconfig
index a441ba513c40..f89ab205c8e0 100644
--- a/drivers/staging/vt6656/Kconfig
+++ b/drivers/staging/vt6656/Kconfig
@@ -1,6 +1,6 @@
1config VT6656 1config VT6656
2 tristate "VIA Technologies VT6656 support" 2 tristate "VIA Technologies VT6656 support"
3 depends on USB && WLAN 3 depends on USB && WLAN && m
4 select WIRELESS_EXT 4 select WIRELESS_EXT
5 select WEXT_PRIV 5 select WEXT_PRIV
6 select FW_LOADER 6 select FW_LOADER
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 8f18578a5903..5185d61564d7 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -1938,7 +1938,7 @@ s_vGenerateMACHeader (
1938 * Out: 1938 * Out:
1939 * none 1939 * none
1940 * 1940 *
1941 * Return Value: CMD_STATUS_PENDING if MAC Tx resource avaliable; otherwise FALSE 1941 * Return Value: CMD_STATUS_PENDING if MAC Tx resource available; otherwise FALSE
1942 * 1942 *
1943-*/ 1943-*/
1944 1944
diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
index b83b660b1f0f..019fb52de366 100644
--- a/drivers/staging/vt6656/wcmd.c
+++ b/drivers/staging/vt6656/wcmd.c
@@ -421,7 +421,7 @@ void vRunCommand(void *hDeviceContext)
421 pMgmt->eScanState = WMAC_IS_SCANNING; 421 pMgmt->eScanState = WMAC_IS_SCANNING;
422 pDevice->byScanBBType = pDevice->byBBType; //lucas 422 pDevice->byScanBBType = pDevice->byBBType; //lucas
423 pDevice->bStopDataPkt = TRUE; 423 pDevice->bStopDataPkt = TRUE;
424 // Turn off RCR_BSSID filter everytime 424 // Turn off RCR_BSSID filter every time
425 MACvRegBitsOff(pDevice, MAC_REG_RCR, RCR_BSSID); 425 MACvRegBitsOff(pDevice, MAC_REG_RCR, RCR_BSSID);
426 pDevice->byRxMode &= ~RCR_BSSID; 426 pDevice->byRxMode &= ~RCR_BSSID;
427 427
@@ -604,7 +604,7 @@ void vRunCommand(void *hDeviceContext)
604 // if Infra mode 604 // if Infra mode
605 if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED)) { 605 if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED)) {
606 // Call mgr to begin the deauthentication 606 // Call mgr to begin the deauthentication
607 // reason = (3) beacuse sta has left ESS 607 // reason = (3) because sta has left ESS
608 if (pMgmt->eCurrState >= WMAC_STATE_AUTH) { 608 if (pMgmt->eCurrState >= WMAC_STATE_AUTH) {
609 vMgrDeAuthenBeginSta((void *)pDevice, 609 vMgrDeAuthenBeginSta((void *)pDevice,
610 pMgmt, 610 pMgmt,
diff --git a/drivers/staging/vt6656/wmgr.h b/drivers/staging/vt6656/wmgr.h
index 594f3a89d8a7..13dfb3bf8328 100644
--- a/drivers/staging/vt6656/wmgr.h
+++ b/drivers/staging/vt6656/wmgr.h
@@ -218,7 +218,7 @@ typedef enum tagWMAC_POWER_MODE {
218 218
219 219
220 220
221// Tx Managment Packet descriptor 221// Tx Management Packet descriptor
222typedef struct tagSTxMgmtPacket { 222typedef struct tagSTxMgmtPacket {
223 223
224 PUWLAN_80211HDR p80211Header; 224 PUWLAN_80211HDR p80211Header;
@@ -228,7 +228,7 @@ typedef struct tagSTxMgmtPacket {
228} STxMgmtPacket, *PSTxMgmtPacket; 228} STxMgmtPacket, *PSTxMgmtPacket;
229 229
230 230
231// Rx Managment Packet descriptor 231// Rx Management Packet descriptor
232typedef struct tagSRxMgmtPacket { 232typedef struct tagSRxMgmtPacket {
233 233
234 PUWLAN_80211HDR p80211Header; 234 PUWLAN_80211HDR p80211Header;
diff --git a/drivers/staging/westbridge/astoria/api/src/cyasdma.c b/drivers/staging/westbridge/astoria/api/src/cyasdma.c
index 16b8ec124510..c461d4f60bfb 100644
--- a/drivers/staging/westbridge/astoria/api/src/cyasdma.c
+++ b/drivers/staging/westbridge/astoria/api/src/cyasdma.c
@@ -1082,7 +1082,7 @@ cy_as_dma_received_data(cy_as_device *dev_p,
1082 /* 1082 /*
1083 * if the data received exceeds the size of the DMA buffer, 1083 * if the data received exceeds the size of the DMA buffer,
1084 * clip the data to the size of the buffer. this can lead 1084 * clip the data to the size of the buffer. this can lead
1085 * to loosing some data, but is not different than doing 1085 * to losing some data, but is not different than doing
1086 * non-packet reads on the other endpoints. 1086 * non-packet reads on the other endpoints.
1087 */ 1087 */
1088 if (dsize > dma_p->size - dma_p->offset) 1088 if (dsize > dma_p->size - dma_p->offset)
diff --git a/drivers/staging/westbridge/astoria/api/src/cyaslep2pep.c b/drivers/staging/westbridge/astoria/api/src/cyaslep2pep.c
index 60b6f3525332..76821e51b817 100644
--- a/drivers/staging/westbridge/astoria/api/src/cyaslep2pep.c
+++ b/drivers/staging/westbridge/astoria/api/src/cyaslep2pep.c
@@ -126,7 +126,7 @@ find_endpoint_directions(cy_as_device *dev_p,
126 cy_as_physical_endpoint_state desired; 126 cy_as_physical_endpoint_state desired;
127 127
128 /* 128 /*
129 * note, there is no error checking here becuase 129 * note, there is no error checking here because
130 * ISO error checking happens when the API is called. 130 * ISO error checking happens when the API is called.
131 */ 131 */
132 for (i = 0; i < 10; i++) { 132 for (i = 0; i < 10; i++) {
diff --git a/drivers/staging/westbridge/astoria/api/src/cyaslowlevel.c b/drivers/staging/westbridge/astoria/api/src/cyaslowlevel.c
index d43dd858de58..96a86d088305 100644
--- a/drivers/staging/westbridge/astoria/api/src/cyaslowlevel.c
+++ b/drivers/staging/westbridge/astoria/api/src/cyaslowlevel.c
@@ -432,7 +432,7 @@ cy_as_mail_box_queued_data_handler(cy_as_device *dev_p)
432* is received. When a complete request is received, the callback 432* is received. When a complete request is received, the callback
433* associated with requests on that context is called. When a complete 433* associated with requests on that context is called. When a complete
434* response is recevied, the callback associated with the request that 434* response is recevied, the callback associated with the request that
435* generated the reponse is called. 435* generated the response is called.
436*/ 436*/
437void 437void
438cy_as_mail_box_interrupt_handler(cy_as_device *dev_p) 438cy_as_mail_box_interrupt_handler(cy_as_device *dev_p)
diff --git a/drivers/staging/westbridge/astoria/api/src/cyasmisc.c b/drivers/staging/westbridge/astoria/api/src/cyasmisc.c
index 7852410b0a4c..4564fc11df22 100644
--- a/drivers/staging/westbridge/astoria/api/src/cyasmisc.c
+++ b/drivers/staging/westbridge/astoria/api/src/cyasmisc.c
@@ -428,7 +428,7 @@ my_misc_callback(cy_as_device *dev_p, uint8_t context,
428 if (v & CY_AS_MEM_P0_VM_SET_CFGMODE) 428 if (v & CY_AS_MEM_P0_VM_SET_CFGMODE)
429 cy_as_hal_print_message( 429 cy_as_hal_print_message(
430 "initialization message " 430 "initialization message "
431 "recieved, but config bit " 431 "received, but config bit "
432 "still set\n"); 432 "still set\n");
433 433
434 v = cy_as_hal_read_register(dev_p->tag, 434 v = cy_as_hal_read_register(dev_p->tag,
@@ -436,7 +436,7 @@ my_misc_callback(cy_as_device *dev_p, uint8_t context,
436 if ((v & CY_AS_MEM_RST_RSTCMPT) == 0) 436 if ((v & CY_AS_MEM_RST_RSTCMPT) == 0)
437 cy_as_hal_print_message( 437 cy_as_hal_print_message(
438 "initialization message " 438 "initialization message "
439 "recieved, but reset complete " 439 "received, but reset complete "
440 "bit still not set\n"); 440 "bit still not set\n");
441 } 441 }
442 break; 442 break;
@@ -2381,7 +2381,7 @@ try_wakeup_again:
2381 /* 2381 /*
2382 * release the west bridge micro-_controller from reset, 2382 * release the west bridge micro-_controller from reset,
2383 * so that firmware initialization can complete. the attempt 2383 * so that firmware initialization can complete. the attempt
2384 * to release antioch reset is made upto 8 times. 2384 * to release antioch reset is made up to 8 times.
2385 */ 2385 */
2386 v = 0x03; 2386 v = 0x03;
2387 count = 0x08; 2387 count = 0x08;
diff --git a/drivers/staging/westbridge/astoria/api/src/cyasmtp.c b/drivers/staging/westbridge/astoria/api/src/cyasmtp.c
index 368984633874..8598364f7ab7 100644
--- a/drivers/staging/westbridge/astoria/api/src/cyasmtp.c
+++ b/drivers/staging/westbridge/astoria/api/src/cyasmtp.c
@@ -346,7 +346,7 @@ cy_as_mtp_start(cy_as_device_handle handle,
346 346
347 dev_p->mtp_event_cb = event_c_b; 347 dev_p->mtp_event_cb = event_c_b;
348 /* 348 /*
349 * we register here becuase the start request may cause 349 * we register here because the start request may cause
350 * events to occur before the response to the start request. 350 * events to occur before the response to the start request.
351 */ 351 */
352 cy_as_ll_register_request_callback(dev_p, 352 cy_as_ll_register_request_callback(dev_p,
@@ -424,7 +424,7 @@ my_handle_response_mtp_stop(cy_as_device *dev_p,
424 goto destroy; 424 goto destroy;
425 425
426 /* 426 /*
427 * we sucessfully shutdown the stack, so decrement 427 * we successfully shutdown the stack, so decrement
428 * to make the count zero. 428 * to make the count zero.
429 */ 429 */
430 dev_p->mtp_count--; 430 dev_p->mtp_count--;
diff --git a/drivers/staging/westbridge/astoria/api/src/cyasstorage.c b/drivers/staging/westbridge/astoria/api/src/cyasstorage.c
index 2451404b88d4..7abd6a35e828 100644
--- a/drivers/staging/westbridge/astoria/api/src/cyasstorage.c
+++ b/drivers/staging/westbridge/astoria/api/src/cyasstorage.c
@@ -1773,7 +1773,7 @@ cy_as_storage_async_oper(cy_as_device *dev_p, cy_as_end_point_number_t ep,
1773 if (unit > 255) 1773 if (unit > 255)
1774 return CY_AS_ERROR_NO_SUCH_UNIT; 1774 return CY_AS_ERROR_NO_SUCH_UNIT;
1775 1775
1776 /* We are supposed to return sucess if the number of 1776 /* We are supposed to return success if the number of
1777 * blocks is zero 1777 * blocks is zero
1778 */ 1778 */
1779 if (num_blocks == 0) { 1779 if (num_blocks == 0) {
@@ -1969,7 +1969,7 @@ cy_as_storage_sync_oper(cy_as_device *dev_p,
1969 if (cy_as_device_is_usb_async_pending(dev_p, 6)) 1969 if (cy_as_device_is_usb_async_pending(dev_p, 6))
1970 return CY_AS_ERROR_ASYNC_PENDING; 1970 return CY_AS_ERROR_ASYNC_PENDING;
1971 1971
1972 /* We are supposed to return sucess if the number of 1972 /* We are supposed to return success if the number of
1973 * blocks is zero 1973 * blocks is zero
1974 */ 1974 */
1975 if (num_blocks == 0) 1975 if (num_blocks == 0)
@@ -3285,7 +3285,7 @@ cy_as_sdio_extended_i_o_async(
3285 if (callback == 0) 3285 if (callback == 0)
3286 return CY_AS_ERROR_NULL_CALLBACK; 3286 return CY_AS_ERROR_NULL_CALLBACK;
3287 3287
3288 /* We are supposed to return sucess if the number of 3288 /* We are supposed to return success if the number of
3289 * blocks is zero 3289 * blocks is zero
3290 */ 3290 */
3291 if (((misc_buf&CY_SDIO_BLOCKMODE) != 0) && (argument == 0)) { 3291 if (((misc_buf&CY_SDIO_BLOCKMODE) != 0) && (argument == 0)) {
diff --git a/drivers/staging/westbridge/astoria/api/src/cyasusb.c b/drivers/staging/westbridge/astoria/api/src/cyasusb.c
index 92ea42503bf3..1b55e611191e 100644
--- a/drivers/staging/westbridge/astoria/api/src/cyasusb.c
+++ b/drivers/staging/westbridge/astoria/api/src/cyasusb.c
@@ -739,7 +739,7 @@ cy_as_usb_start(cy_as_device_handle handle,
739 cy_as_usb_reset_e_p0_state(dev_p); 739 cy_as_usb_reset_e_p0_state(dev_p);
740 740
741 /* 741 /*
742 * we register here becuase the start request may cause 742 * we register here because the start request may cause
743 * events to occur before the response to the start request. 743 * events to occur before the response to the start request.
744 */ 744 */
745 cy_as_ll_register_request_callback(dev_p, 745 cy_as_ll_register_request_callback(dev_p,
@@ -867,7 +867,7 @@ my_handle_response_usb_stop(cy_as_device *dev_p,
867 goto destroy; 867 goto destroy;
868 868
869 /* 869 /*
870 * we sucessfully shutdown the stack, so 870 * we successfully shutdown the stack, so
871 * decrement to make the count zero. 871 * decrement to make the count zero.
872 */ 872 */
873 cy_as_usb_cleanup(dev_p); 873 cy_as_usb_cleanup(dev_p);
diff --git a/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c b/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c
index 21cdb0637beb..3bcedce13f4a 100644
--- a/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c
+++ b/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c
@@ -87,7 +87,7 @@
87 87
88 88
89/* 89/*
90 * For performance reasons, we handle storage endpoint transfers upto 4 KB 90 * For performance reasons, we handle storage endpoint transfers up to 4 KB
91 * within the HAL itself. 91 * within the HAL itself.
92 */ 92 */
93 #define CYASSTORAGE_WRITE_EP_NUM (4) 93 #define CYASSTORAGE_WRITE_EP_NUM (4)
@@ -108,12 +108,12 @@
108 ((ep) == 6) || ((ep) == 8)) 108 ((ep) == 6) || ((ep) == 8))
109 109
110/* 110/*
111 * persistant, stores current GPMC interface cfg mode 111 * persistent, stores current GPMC interface cfg mode
112 */ 112 */
113static uint8_t pnand_16bit; 113static uint8_t pnand_16bit;
114 114
115/* 115/*
116 * keep processing new WB DRQ in ISR untill all handled (performance feature) 116 * keep processing new WB DRQ in ISR until all handled (performance feature)
117 */ 117 */
118#define PROCESS_MULTIPLE_DRQ_IN_ISR (1) 118#define PROCESS_MULTIPLE_DRQ_IN_ISR (1)
119 119
@@ -157,7 +157,7 @@ typedef struct cy_as_hal_endpoint_dma {
157 * dma_xfer_sz - size of the next dma xfer on P port 157 * dma_xfer_sz - size of the next dma xfer on P port
158 * seg_xfer_cnt - counts xfered bytes for in current sg_list 158 * seg_xfer_cnt - counts xfered bytes for in current sg_list
159 * memory segment 159 * memory segment
160 * req_xfer_cnt - total number of bytes transfered so far in 160 * req_xfer_cnt - total number of bytes transferred so far in
161 * current request 161 * current request
162 * req_length - total request length 162 * req_length - total request length
163 */ 163 */
@@ -2160,7 +2160,7 @@ void cy_as_hal_mem_set(void *ptr, uint8_t value, uint32_t cnt)
2160/* 2160/*
2161 * This function is expected to create a sleep channel. 2161 * This function is expected to create a sleep channel.
2162 * The data structure that represents the sleep channel object 2162 * The data structure that represents the sleep channel object
2163 * sleep channel (which is Linux "wait_queue_head_t wq" for this paticular HAL) 2163 * sleep channel (which is Linux "wait_queue_head_t wq" for this particular HAL)
2164 * passed as a pointer, and allpocated by the caller 2164 * passed as a pointer, and allpocated by the caller
2165 * (typically as a local var on the stack) "Create" word should read as 2165 * (typically as a local var on the stack) "Create" word should read as
2166 * "SleepOn", this func doesn't actually create anything 2166 * "SleepOn", this func doesn't actually create anything
@@ -2364,7 +2364,7 @@ int start_o_m_a_p_kernel(const char *pgm,
2364 */ 2364 */
2365 cy_as_hal_gpmc_enable_16bit_bus(cy_true); 2365 cy_as_hal_gpmc_enable_16bit_bus(cy_true);
2366#else 2366#else
2367 /* Astoria and GPMC are already in 8 bit mode, jsut initialize PNAND_CFG */ 2367 /* Astoria and GPMC are already in 8 bit mode, just initialize PNAND_CFG */
2368 ast_p_nand_casdi_write(CY_AS_MEM_PNAND_CFG, 0x0000); 2368 ast_p_nand_casdi_write(CY_AS_MEM_PNAND_CFG, 0x0000);
2369#endif 2369#endif
2370 2370
diff --git a/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h b/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h
index 80dd530bc4fd..6426ea61f3d4 100644
--- a/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h
+++ b/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h
@@ -20,7 +20,7 @@
20*/ 20*/
21 21
22/* 22/*
23 * This file contains the defintion of the hardware abstraction 23 * This file contains the definition of the hardware abstraction
24 * layer on OMAP3430 talking to the West Bridge Astoria device 24 * layer on OMAP3430 talking to the West Bridge Astoria device
25 */ 25 */
26 26
diff --git a/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h b/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h
index 3eee192ffe89..46f06ee29357 100644
--- a/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h
+++ b/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h
@@ -51,7 +51,7 @@
51 * GPMC_ADDR 51 * GPMC_ADDR
52 * [A8:A1]->upD[7:0] 52 * [A8:A1]->upD[7:0]
53 * INT# -GPMC_nWP_GPIO_62 53 * INT# -GPMC_nWP_GPIO_62
54 * DACK -N/C not conected 54 * DACK -N/C not connected
55 * WAKEUP-GPIO_167 55 * WAKEUP-GPIO_167
56 * RESET-GPIO_126 56 * RESET-GPIO_126
57 * R/B -GPMC_WAIT2_GPIO_64 57 * R/B -GPMC_WAIT2_GPIO_64
@@ -108,7 +108,7 @@
108 * will be monitored 108 * will be monitored
109 * PF_EN_ENGINE - 1- ENABLES ENGINE, but it needs to be started after 109 * PF_EN_ENGINE - 1- ENABLES ENGINE, but it needs to be started after
110 * that C ctrl reg bit 0 110 * that C ctrl reg bit 0
111 * PF_FIFO_THRESHOLD - FIFO threshhold in number of BUS(8 or 16) words 111 * PF_FIFO_THRESHOLD - FIFO threshold in number of BUS(8 or 16) words
112 * PF_WEIGHTED_PRIO - NUM of cycles granted to PFE if RND_ROBIN 112 * PF_WEIGHTED_PRIO - NUM of cycles granted to PFE if RND_ROBIN
113 * prioritization is enabled 113 * prioritization is enabled
114 * PF_ROUND_ROBIN - if enabled, gives priority to other CS, but 114 * PF_ROUND_ROBIN - if enabled, gives priority to other CS, but
diff --git a/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c b/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c
index 0bbb8a3e191d..d1996a27515e 100644
--- a/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c
+++ b/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c
@@ -222,7 +222,7 @@ static int cyasblkdev_queue_thread(void *d)
222 continue; 222 continue;
223 } 223 }
224 224
225 /* new req recieved, issue it to the driver */ 225 /* new req received, issue it to the driver */
226 set_current_state(TASK_RUNNING); 226 set_current_state(TASK_RUNNING);
227 227
228 #ifndef WESTBRIDGE_NDEBUG 228 #ifndef WESTBRIDGE_NDEBUG
diff --git a/drivers/staging/westbridge/astoria/gadget/cyasgadget.c b/drivers/staging/westbridge/astoria/gadget/cyasgadget.c
index defa05cd5e50..be851ca54cec 100644
--- a/drivers/staging/westbridge/astoria/gadget/cyasgadget.c
+++ b/drivers/staging/westbridge/astoria/gadget/cyasgadget.c
@@ -587,6 +587,7 @@ static int cyasgadget_enable(
587 "cy_as_usb_end_point_config EP %s mismatch " 587 "cy_as_usb_end_point_config EP %s mismatch "
588 "on enabled\n", an_ep->usb_ep_inst.name); 588 "on enabled\n", an_ep->usb_ep_inst.name);
589 #endif 589 #endif
590 spin_unlock_irqrestore(&an_dev->lock, flags);
590 return -EINVAL; 591 return -EINVAL;
591 } 592 }
592 593
diff --git a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdevice.h b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdevice.h
index 0c0726b678ad..6452a9070091 100644
--- a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdevice.h
+++ b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdevice.h
@@ -119,7 +119,7 @@
119#define CY_AS_REQUEST_LIST_STATE_QUEUED (0x00) 119#define CY_AS_REQUEST_LIST_STATE_QUEUED (0x00)
120/* The request is sent, waiting for response */ 120/* The request is sent, waiting for response */
121#define CY_AS_REQUEST_LIST_STATE_WAITING (0x01) 121#define CY_AS_REQUEST_LIST_STATE_WAITING (0x01)
122/* The response has been received, processing reponse */ 122/* The response has been received, processing response */
123#define CY_AS_REQUEST_LIST_STATE_RECEIVED (0x02) 123#define CY_AS_REQUEST_LIST_STATE_RECEIVED (0x02)
124/* The request/response is being canceled */ 124/* The request/response is being canceled */
125#define CY_AS_REQUEST_LIST_STATE_CANCELING (0x03) 125#define CY_AS_REQUEST_LIST_STATE_CANCELING (0x03)
@@ -517,7 +517,7 @@ typedef struct cy_as_context {
517 cy_as_ll_request_list_node *request_queue_p; 517 cy_as_ll_request_list_node *request_queue_p;
518 /* The list node in the request queue */ 518 /* The list node in the request queue */
519 cy_as_ll_request_list_node *last_node_p; 519 cy_as_ll_request_list_node *last_node_p;
520 /* Index upto which data is stored. */ 520 /* Index up to which data is stored. */
521 uint16_t queue_index; 521 uint16_t queue_index;
522 /* Index to the next request in the queue. */ 522 /* Index to the next request in the queue. */
523 uint16_t rqt_index; 523 uint16_t rqt_index;
@@ -768,7 +768,7 @@ struct cy_as_device {
768 uint32_t mtp_count; 768 uint32_t mtp_count;
769 /* The MTP event callback supplied by the client */ 769 /* The MTP event callback supplied by the client */
770 cy_as_mtp_event_callback mtp_event_cb; 770 cy_as_mtp_event_callback mtp_event_cb;
771 /* The current block table to be transfered */ 771 /* The current block table to be transferred */
772 cy_as_mtp_block_table *tp_blk_tbl; 772 cy_as_mtp_block_table *tp_blk_tbl;
773 773
774 cy_as_c_b_queue *func_cbs_mtp; 774 cy_as_c_b_queue *func_cbs_mtp;
diff --git a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdma.h b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdma.h
index 8dab5e900149..16dc9f96018c 100644
--- a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdma.h
+++ b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdma.h
@@ -108,7 +108,7 @@ typedef enum cy_as_dma_direction {
108 completes a requested DMA operation. 108 completes a requested DMA operation.
109 109
110 Returns 110 Returns
111 CY_AS_ERROR_SUCCESS - the module initialized sucessfully 111 CY_AS_ERROR_SUCCESS - the module initialized successfully
112 CY_AS_ERROR_OUT_OF_MEMORY - memory allocation failed during 112 CY_AS_ERROR_OUT_OF_MEMORY - memory allocation failed during
113 initialization 113 initialization
114 CY_AS_ERROR_ALREADY_RUNNING - the DMA module was already running 114 CY_AS_ERROR_ALREADY_RUNNING - the DMA module was already running
@@ -131,7 +131,7 @@ cy_as_dma_start(
131 then freeing the resources associated with each DMA endpoint. 131 then freeing the resources associated with each DMA endpoint.
132 132
133 Returns 133 Returns
134 CY_AS_ERROR_SUCCESS - the module shutdown sucessfully 134 CY_AS_ERROR_SUCCESS - the module shutdown successfully
135 CY_AS_ERROR_NOT_RUNNING - the DMA module was not running 135 CY_AS_ERROR_NOT_RUNNING - the DMA module was not running
136 136
137 See Also 137 See Also
@@ -161,7 +161,7 @@ cy_as_dma_stop(
161 161
162 Returns 162 Returns
163 CY_AS_ERROR_SUCCESS - the traffic on the endpoint is canceled 163 CY_AS_ERROR_SUCCESS - the traffic on the endpoint is canceled
164 sucessfully 164 successfully
165 165
166 See Also 166 See Also
167*/ 167*/
@@ -266,7 +266,7 @@ cy_as_dma_queue_request(
266 will have to maintain a list of sleep channels to wake. 266 will have to maintain a list of sleep channels to wake.
267 267
268 Returns 268 Returns
269 * CY_AS_ERROR_SUCCESS - the queue has drained sucessfully 269 * CY_AS_ERROR_SUCCESS - the queue has drained successfully
270 * CY_AS_ERROR_INVALID_ENDPOINT - the endpoint given is not valid 270 * CY_AS_ERROR_INVALID_ENDPOINT - the endpoint given is not valid
271 * CY_AS_ERROR_NESTED_SLEEP - CyAsDmaQueueRequest() was requested 271 * CY_AS_ERROR_NESTED_SLEEP - CyAsDmaQueueRequest() was requested
272 * on an endpoint where CyAsDmaQueueRequest was already called 272 * on an endpoint where CyAsDmaQueueRequest was already called
@@ -295,7 +295,7 @@ cy_as_dma_drain_queue(
295 CyAsHalDmaSetupRead() functoins. 295 CyAsHalDmaSetupRead() functoins.
296 296
297 Returns 297 Returns
298 * CY_AS_ERROR_SUCCESS - the value was set sucessfully 298 * CY_AS_ERROR_SUCCESS - the value was set successfully
299 * CY_AS_ERROR_INVALID_SIZE - the size value was not valid 299 * CY_AS_ERROR_INVALID_SIZE - the size value was not valid
300*/ 300*/
301extern cy_as_return_status_t 301extern cy_as_return_status_t
diff --git a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyaserr.h b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyaserr.h
index f78d60270d45..2cd0af1ed781 100644
--- a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyaserr.h
+++ b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyaserr.h
@@ -29,7 +29,7 @@
29*/ 29*/
30 30
31/* Summary 31/* Summary
32 The function completed sucessfully 32 The function completed successfully
33*/ 33*/
34#define CY_AS_ERROR_SUCCESS (0) 34#define CY_AS_ERROR_SUCCESS (0)
35 35
@@ -796,7 +796,7 @@
796 Description 796 Description
797 This error is returned when an operation is attempted that cannot be 797 This error is returned when an operation is attempted that cannot be
798 completed while the USB stack is connected to a USB host. In order 798 completed while the USB stack is connected to a USB host. In order
799 to sucessfully complete the desired operation, CyAsUsbDisconnect() 799 to successfully complete the desired operation, CyAsUsbDisconnect()
800 must be called to disconnect from the host. 800 must be called to disconnect from the host.
801*/ 801*/
802#define CY_AS_ERROR_USB_CONNECTED (53) 802#define CY_AS_ERROR_USB_CONNECTED (53)
diff --git a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyashaldoc.h b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyashaldoc.h
index 28136ad75115..5bcbe9bf2f5d 100644
--- a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyashaldoc.h
+++ b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyashaldoc.h
@@ -597,7 +597,7 @@ cy_as_mem_set(
597 CyAsHalSleepChannel. 597 CyAsHalSleepChannel.
598 598
599 Returns 599 Returns
600 CyTrue is the initialization was sucessful, and CyFalse otherwise 600 CyTrue is the initialization was successful, and CyFalse otherwise
601 601
602 See Also 602 See Also
603 * CyAsHalSleepChannel 603 * CyAsHalSleepChannel
diff --git a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasintr.h b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasintr.h
index 3d7063ea3093..60a6fffb5d53 100644
--- a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasintr.h
+++ b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasintr.h
@@ -69,7 +69,7 @@ cy_as_intr_start(
69 69
70 Returns 70 Returns
71 * CY_AS_ERROR_SUCCESS - the interrupt module was stopped 71 * CY_AS_ERROR_SUCCESS - the interrupt module was stopped
72 * sucessfully 72 * successfully
73 * CY_AS_ERROR_NOT_RUNNING - the interrupt module was not 73 * CY_AS_ERROR_NOT_RUNNING - the interrupt module was not
74 * running 74 * running
75 75
diff --git a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmisc.h b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmisc.h
index 2f0701850561..df7c2b66cf27 100644
--- a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmisc.h
+++ b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmisc.h
@@ -620,7 +620,7 @@ cy_as_misc_in_standby(
620 * Nestable: YES 620 * Nestable: YES
621 621
622 Returns 622 Returns
623 * CY_AS_ERROR_SUCCESS - the firmware was sucessfully downloaded 623 * CY_AS_ERROR_SUCCESS - the firmware was successfully downloaded
624 * CY_AS_ERROR_INVALID_HANDLE 624 * CY_AS_ERROR_INVALID_HANDLE
625 * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device 625 * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device
626 * was not configured 626 * was not configured
@@ -836,7 +836,7 @@ cy_as_misc_reset(
836 ownership. 836 ownership.
837 837
838 Returns 838 Returns
839 * CY_AS_ERROR_SUCCESS - the p port sucessfully acquired the 839 * CY_AS_ERROR_SUCCESS - the p port successfully acquired the
840 * resource of interest 840 * resource of interest
841 * CY_AS_ERROR_INVALID_HANDLE 841 * CY_AS_ERROR_INVALID_HANDLE
842 * CY_AS_ERROR_NOT_CONFIGURED 842 * CY_AS_ERROR_NOT_CONFIGURED
@@ -879,7 +879,7 @@ cy_as_misc_acquire_resource(
879 * Valid In Asynchronous Callback: NO 879 * Valid In Asynchronous Callback: NO
880 880
881 Returns 881 Returns
882 * CY_AS_ERROR_SUCCESS - the p port sucessfully released 882 * CY_AS_ERROR_SUCCESS - the p port successfully released
883 * the resource of interest 883 * the resource of interest
884 * CY_AS_ERROR_INVALID_HANDLE 884 * CY_AS_ERROR_INVALID_HANDLE
885 * CY_AS_ERROR_NOT_CONFIGURED 885 * CY_AS_ERROR_NOT_CONFIGURED
@@ -929,7 +929,7 @@ cy_as_misc_release_resource(
929 929
930 Returns 930 Returns
931 * CY_AS_ERROR_SUCCESS - the trace configuration has been 931 * CY_AS_ERROR_SUCCESS - the trace configuration has been
932 * sucessfully changed 932 * successfully changed
933 * CY_AS_ERROR_NO_SUCH_BUS - the bus specified does not exist 933 * CY_AS_ERROR_NO_SUCH_BUS - the bus specified does not exist
934 * CY_AS_ERROR_NO_SUCH_DEVICE - the specified media/device 934 * CY_AS_ERROR_NO_SUCH_DEVICE - the specified media/device
935 * pair does not exist 935 * pair does not exist
diff --git a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasprotocol.h b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasprotocol.h
index 317805fc4ff4..773b645ea7eb 100644
--- a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasprotocol.h
+++ b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasprotocol.h
@@ -756,7 +756,7 @@
756 * 1 : Debug mode 756 * 1 : Debug mode
757 757
758 Description 758 Description
759 This reponse is sent to return the firmware version 759 This response is sent to return the firmware version
760 number to the requestor. 760 number to the requestor.
761 */ 761 */
762#define CY_RESP_FIRMWARE_VERSION (16) 762#define CY_RESP_FIRMWARE_VERSION (16)
@@ -3655,7 +3655,7 @@
3655 This request is sent to the West Bridge when the P port 3655 This request is sent to the West Bridge when the P port
3656 needs to send data to the Host in a Turbo Endpoint. 3656 needs to send data to the Host in a Turbo Endpoint.
3657 Upon receiving this event, Firmware will make the end point 3657 Upon receiving this event, Firmware will make the end point
3658 avilable for the P port. If the length is zero, then 3658 available for the P port. If the length is zero, then
3659 firmware will send a zero length packet. 3659 firmware will send a zero length packet.
3660 3660
3661 Direction 3661 Direction
diff --git a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasstorage.h b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasstorage.h
index 64f078cf202c..52b93c3e4813 100644
--- a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasstorage.h
+++ b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasstorage.h
@@ -832,7 +832,7 @@ typedef struct cy_as_sdio_func {
832 * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been 832 * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been
833 * loaded into West Bridge 833 * loaded into West Bridge
834 * CY_AS_ERROR_INVALID_HANDLE - an invalid handle was passed in 834 * CY_AS_ERROR_INVALID_HANDLE - an invalid handle was passed in
835 * CY_AS_ERROR_SUCCESS - the module started sucessfully 835 * CY_AS_ERROR_SUCCESS - the module started successfully
836 * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating 836 * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating
837 * with the West Bridge device 837 * with the West Bridge device
838 * CY_AS_ERROR_OUT_OF_MEMORY 838 * CY_AS_ERROR_OUT_OF_MEMORY
@@ -882,7 +882,7 @@ cy_as_storage_start(
882 * CY_AS_ERROR_INVALID_HANDLE - an invalid handle was 882 * CY_AS_ERROR_INVALID_HANDLE - an invalid handle was
883 * passed in 883 * passed in
884 * CY_AS_ERROR_SUCCESS - this module was shut 884 * CY_AS_ERROR_SUCCESS - this module was shut
885 * down sucessfully 885 * down successfully
886 * CY_AS_ERROR_TIMEOUT - a timeout occurred 886 * CY_AS_ERROR_TIMEOUT - a timeout occurred
887 * communicating with the West Bridge device 887 * communicating with the West Bridge device
888 * CY_AS_ERROR_NOT_RUNNING 888 * CY_AS_ERROR_NOT_RUNNING
@@ -934,7 +934,7 @@ cy_as_storage_stop(
934 * CY_AS_ERROR_INVALID_HANDLE - an invalid handle 934 * CY_AS_ERROR_INVALID_HANDLE - an invalid handle
935 * was passed in 935 * was passed in
936 * CY_AS_ERROR_SUCCESS - the function was registered 936 * CY_AS_ERROR_SUCCESS - the function was registered
937 * sucessfully 937 * successfully
938 * CY_AS_ERROR_NOT_RUNNING - the stack is not running 938 * CY_AS_ERROR_NOT_RUNNING - the stack is not running
939 939
940 See Also 940 See Also
@@ -981,7 +981,7 @@ cy_as_storage_register_callback(
981 * been started 981 * been started
982 * CY_AS_ERROR_INVALID_HANDLE - an invalid handle was 982 * CY_AS_ERROR_INVALID_HANDLE - an invalid handle was
983 * passed in 983 * passed in
984 * CY_AS_ERROR_SUCCESS - this request was sucessfully 984 * CY_AS_ERROR_SUCCESS - this request was successfully
985 * transmitted to the West Bridge device 985 * transmitted to the West Bridge device
986 * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating 986 * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating
987 * with the West Bridge device 987 * with the West Bridge device
@@ -1034,7 +1034,7 @@ cy_as_storage_claim(
1034 * been started 1034 * been started
1035 * CY_AS_ERROR_INVALID_HANDLE - an invalid handle 1035 * CY_AS_ERROR_INVALID_HANDLE - an invalid handle
1036 * was passed in 1036 * was passed in
1037 * CY_AS_ERROR_SUCCESS - the media was sucessfully 1037 * CY_AS_ERROR_SUCCESS - the media was successfully
1038 * released 1038 * released
1039 * CY_AS_ERROR_MEDIA_NOT_CLAIMED - the media was not 1039 * CY_AS_ERROR_MEDIA_NOT_CLAIMED - the media was not
1040 * claimed by the P port 1040 * claimed by the P port
@@ -1905,7 +1905,7 @@ cy_as_storage_get_transfer_amount(
1905 differ between SD cards. 1905 differ between SD cards.
1906 1906
1907 A large erase can take a while to complete depending on the SD 1907 A large erase can take a while to complete depending on the SD
1908 card. In such a case it is reccomended that an async call is made. 1908 card. In such a case it is recommended that an async call is made.
1909 1909
1910 Returns 1910 Returns
1911 * CY_AS_ERROR_SUCCESS - API call completed successfully 1911 * CY_AS_ERROR_SUCCESS - API call completed successfully
@@ -1926,7 +1926,7 @@ cy_as_storage_get_transfer_amount(
1926 * required before erase is allowed 1926 * required before erase is allowed
1927 * CY_AS_ERROR_NO_SUCH_BUS 1927 * CY_AS_ERROR_NO_SUCH_BUS
1928 * CY_AS_ERROR_NO_SUCH_DEVICE 1928 * CY_AS_ERROR_NO_SUCH_DEVICE
1929 * CY_AS_ERROR_NOT_SUPPORTED - Erase is currenly only supported 1929 * CY_AS_ERROR_NOT_SUPPORTED - Erase is currently only supported
1930 * on SD and using SD only firmware 1930 * on SD and using SD only firmware
1931 * CY_AS_ERROR_OUT_OF_MEMORY 1931 * CY_AS_ERROR_OUT_OF_MEMORY
1932 1932
@@ -1985,7 +1985,7 @@ cy_as_storage_erase(
1985 * type was made 1985 * type was made
1986 * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available 1986 * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available
1987 * CY_AS_ERROR_INVALID_RESPONSE - an error message was 1987 * CY_AS_ERROR_INVALID_RESPONSE - an error message was
1988 * recieved from the firmware 1988 * received from the firmware
1989 * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in 1989 * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in
1990 * reading from the media 1990 * reading from the media
1991 * CY_AS_ERROR_INVALID_FUNCTION - An IO attempt was made to 1991 * CY_AS_ERROR_INVALID_FUNCTION - An IO attempt was made to
@@ -2047,7 +2047,7 @@ cy_as_sdio_get_c_i_s_info(
2047 * pair does not exist 2047 * pair does not exist
2048 * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available 2048 * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available
2049 * CY_AS_ERROR_INVALID_RESPONSE - an error message was 2049 * CY_AS_ERROR_INVALID_RESPONSE - an error message was
2050 * recieved from the firmware 2050 * received from the firmware
2051 2051
2052*/ 2052*/
2053cy_as_return_status_t 2053cy_as_return_status_t
@@ -2095,7 +2095,7 @@ cy_as_sdio_query_card(
2095 * pair does not exist 2095 * pair does not exist
2096 * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available 2096 * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available
2097 * CY_AS_ERROR_INVALID_RESPONSE - an error message was 2097 * CY_AS_ERROR_INVALID_RESPONSE - an error message was
2098 * recieved from the firmware 2098 * received from the firmware
2099 */ 2099 */
2100cy_as_return_status_t 2100cy_as_return_status_t
2101cy_as_sdio_reset_card( 2101cy_as_sdio_reset_card(
@@ -2139,7 +2139,7 @@ cy_as_sdio_reset_card(
2139 * CY_AS_ERROR_NO_SUCH_DEVICE - the specified media/device pair 2139 * CY_AS_ERROR_NO_SUCH_DEVICE - the specified media/device pair
2140 * does not exist 2140 * does not exist
2141 * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available 2141 * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available
2142 * CY_AS_ERROR_INVALID_RESPONSE - an error message was recieved 2142 * CY_AS_ERROR_INVALID_RESPONSE - an error message was received
2143 * from the firmware 2143 * from the firmware
2144 * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in reading 2144 * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in reading
2145 * from the media 2145 * from the media
@@ -2198,7 +2198,7 @@ cy_as_sdio_direct_read(
2198 * CY_AS_ERROR_NO_SUCH_DEVICE - the specified media/device 2198 * CY_AS_ERROR_NO_SUCH_DEVICE - the specified media/device
2199 * pair does not exist 2199 * pair does not exist
2200 * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available 2200 * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available
2201 * CY_AS_ERROR_INVALID_RESPONSE - an error message was recieved 2201 * CY_AS_ERROR_INVALID_RESPONSE - an error message was received
2202 * from the firmware 2202 * from the firmware
2203 * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in 2203 * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in
2204 * reading from the media 2204 * reading from the media
@@ -2262,7 +2262,7 @@ cy_as_sdio_direct_write(
2262 * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory 2262 * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory
2263 * available 2263 * available
2264 * CY_AS_ERROR_INVALID_RESPONSE - an error message was 2264 * CY_AS_ERROR_INVALID_RESPONSE - an error message was
2265 * recieved from the firmware 2265 * received from the firmware
2266 * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in 2266 * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in
2267 * reading from the media 2267 * reading from the media
2268 * CY_AS_ERROR_INVALID_FUNCTION - An IO attempt was made 2268 * CY_AS_ERROR_INVALID_FUNCTION - An IO attempt was made
@@ -2319,7 +2319,7 @@ cy_as_sdio_set_blocksize(
2319 * pair does not exist 2319 * pair does not exist
2320 * CY_AS_ERROR_ASYNC_PENDING - an async operation is pending 2320 * CY_AS_ERROR_ASYNC_PENDING - an async operation is pending
2321 * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available 2321 * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available
2322 * CY_AS_ERROR_INVALID_RESPONSE - an error message was recieved 2322 * CY_AS_ERROR_INVALID_RESPONSE - an error message was received
2323 * from the firmware 2323 * from the firmware
2324 * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in 2324 * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in
2325 * reading from the media 2325 * reading from the media
@@ -2396,7 +2396,7 @@ cy_as_sdio_extended_read(
2396 * CY_AS_ERROR_ASYNC_PENDING - an async operation is pending 2396 * CY_AS_ERROR_ASYNC_PENDING - an async operation is pending
2397 * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available 2397 * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available
2398 * CY_AS_ERROR_INVALID_RESPONSE - an error message was 2398 * CY_AS_ERROR_INVALID_RESPONSE - an error message was
2399 * recieved from the firmware 2399 * received from the firmware
2400 * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in 2400 * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in
2401 * reading from the media 2401 * reading from the media
2402 * CY_AS_ERROR_INVALID_FUNCTION - An IO attempt was made 2402 * CY_AS_ERROR_INVALID_FUNCTION - An IO attempt was made
@@ -2471,7 +2471,7 @@ cy_as_sdio_extended_write(
2471 * pair does not exist 2471 * pair does not exist
2472 * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available 2472 * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory available
2473 * CY_AS_ERROR_INVALID_RESPONSE - an error message was 2473 * CY_AS_ERROR_INVALID_RESPONSE - an error message was
2474 * recieved from the firmware 2474 * received from the firmware
2475 * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in 2475 * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error in
2476 * reading from the media 2476 * reading from the media
2477 * CY_AS_ERROR_INVALID_FUNCTION - An IO attempt was made 2477 * CY_AS_ERROR_INVALID_FUNCTION - An IO attempt was made
@@ -2714,7 +2714,7 @@ cy_as_sdio_suspend(
2714 * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory 2714 * CY_AS_ERROR_OUT_OF_MEMORY - insufficient memory
2715 * available 2715 * available
2716 * CY_AS_ERROR_INVALID_RESPONSE - an error message was 2716 * CY_AS_ERROR_INVALID_RESPONSE - an error message was
2717 * recieved from the firmware 2717 * received from the firmware
2718 * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error 2718 * CY_AS_ERROR_MEDIA_ACCESS_FAILURE - there was error
2719 * in reading from the media 2719 * in reading from the media
2720 * CY_AS_ERROR_INVALID_FUNCTION - An IO attempt was 2720 * CY_AS_ERROR_INVALID_FUNCTION - An IO attempt was
diff --git a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasusb.h b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasusb.h
index 4a549e146812..e3ba9ca4c75f 100644
--- a/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasusb.h
+++ b/drivers/staging/westbridge/astoria/include/linux/westbridge/cyasusb.h
@@ -464,7 +464,7 @@ typedef struct cy_as_usb_end_point_config {
464 be selected on a partitioned storage device. 464 be selected on a partitioned storage device.
465 465
466 Description 466 Description
467 West Bridge firmware supports creating upto two 467 West Bridge firmware supports creating up to two
468 partitions on mass storage devices connected to 468 partitions on mass storage devices connected to
469 West Bridge. When there are two partitions on a device, 469 West Bridge. When there are two partitions on a device,
470 the user can choose which of these partitions should be 470 the user can choose which of these partitions should be
@@ -698,7 +698,7 @@ cy_as_usb_start(
698 * been configured 698 * been configured
699 * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded 699 * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded
700 * into West Bridge 700 * into West Bridge
701 * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully 701 * CY_AS_ERROR_SUCCESS - this module was shut down successfully
702 * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating with 702 * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating with
703 * the West Bridge device 703 * the West Bridge device
704 704
@@ -752,7 +752,7 @@ cy_as_usb_register_callback(
752 * Nestable: YES 752 * Nestable: YES
753 753
754 Returns 754 Returns
755 * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully 755 * CY_AS_ERROR_SUCCESS - this module was shut down successfully
756 * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not 756 * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not
757 * been configured 757 * been configured
758 * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded 758 * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded
@@ -791,7 +791,7 @@ cy_as_usb_connect(
791 * Nestable: YES 791 * Nestable: YES
792 792
793 Returns 793 Returns
794 * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully 794 * CY_AS_ERROR_SUCCESS - this module was shut down successfully
795 * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not 795 * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not
796 * been configured 796 * been configured
797 * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded 797 * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded
@@ -825,7 +825,7 @@ cy_as_usb_disconnect(
825 * Valid In Asynchronous Callback: Yes (if cb supplied) 825 * Valid In Asynchronous Callback: Yes (if cb supplied)
826 826
827 Returns 827 Returns
828 * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully 828 * CY_AS_ERROR_SUCCESS - this module was shut down successfully
829 * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not 829 * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not
830 * been configured 830 * been configured
831 * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded 831 * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded
@@ -855,13 +855,13 @@ cy_as_usb_set_enum_config(
855 the USB stack 855 the USB stack
856 856
857 Description 857 Description
858 This function sends a request to West Bridge to retreive 858 This function sends a request to West Bridge to retrieve
859 the current configuration 859 the current configuration
860 860
861 * Valid In Asynchronous Callback: Yes (if cb supplied) 861 * Valid In Asynchronous Callback: Yes (if cb supplied)
862 862
863 Returns 863 Returns
864 * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully 864 * CY_AS_ERROR_SUCCESS - this module was shut down successfully
865 * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not 865 * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not
866 * been configured 866 * been configured
867 * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded 867 * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded
@@ -906,7 +906,7 @@ cy_as_usb_get_enum_config(
906 Chapter 9. 906 Chapter 9.
907 907
908 Returns 908 Returns
909 * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully 909 * CY_AS_ERROR_SUCCESS - this module was shut down successfully
910 * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not 910 * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not
911 * been configured 911 * been configured
912 * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded 912 * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded
@@ -993,7 +993,7 @@ cy_as_usb_clear_descriptors(
993 Description 993 Description
994 This data structure the buffer to hold the descriptor 994 This data structure the buffer to hold the descriptor
995 data, and an in/out parameter ti indicate the 995 data, and an in/out parameter ti indicate the
996 lenght of the buffer and descriptor data in bytes. 996 length of the buffer and descriptor data in bytes.
997 997
998 See Also 998 See Also
999 * CyAsUsbGetDescriptor 999 * CyAsUsbGetDescriptor
@@ -1027,7 +1027,7 @@ typedef struct cy_as_get_descriptor_data {
1027 Chapter 9. 1027 Chapter 9.
1028 1028
1029 Returns 1029 Returns
1030 * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully 1030 * CY_AS_ERROR_SUCCESS - this module was shut down successfully
1031 * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not 1031 * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not
1032 * been configured 1032 * been configured
1033 * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded 1033 * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded
@@ -1106,7 +1106,7 @@ cy_as_usb_get_descriptor(
1106 * Valid In Asynchronous Callback: NO 1106 * Valid In Asynchronous Callback: NO
1107 1107
1108 Returns 1108 Returns
1109 * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully 1109 * CY_AS_ERROR_SUCCESS - this module was shut down successfully
1110 * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not 1110 * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not
1111 * been configured 1111 * been configured
1112 * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded 1112 * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded
@@ -1140,7 +1140,7 @@ cy_as_usb_set_physical_configuration(
1140 Add documentation about endpoint configuration limitations 1140 Add documentation about endpoint configuration limitations
1141 1141
1142 Returns 1142 Returns
1143 * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully 1143 * CY_AS_ERROR_SUCCESS - this module was shut down successfully
1144 * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not 1144 * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not
1145 * been configured 1145 * been configured
1146 * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded 1146 * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded
@@ -1181,7 +1181,7 @@ cy_as_usb_set_end_point_config(
1181 * Valid In Asynchronous Callback: NO 1181 * Valid In Asynchronous Callback: NO
1182 1182
1183 Returns 1183 Returns
1184 * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully 1184 * CY_AS_ERROR_SUCCESS - this module was shut down successfully
1185 * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not 1185 * CY_AS_ERROR_NOT_CONFIGURED - the West Bridge device has not
1186 * been configured 1186 * been configured
1187 * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded 1187 * CY_AS_ERROR_NO_FIRMWARE - the firmware has not been loaded
@@ -1219,7 +1219,7 @@ cy_as_usb_get_end_point_config(
1219 functions store away the configuration information and this 1219 functions store away the configuration information and this
1220 CyAsUsbCommitConfig() actually finds the 1220 CyAsUsbCommitConfig() actually finds the
1221 best hardware configuration based on the requested endpoint 1221 best hardware configuration based on the requested endpoint
1222 configuration and sends thsi optimal 1222 configuration and sends this optimal
1223 confiuration down to the West Bridge device. 1223 confiuration down to the West Bridge device.
1224 1224
1225 * Valid In Asynchronous Callback: YES (if cb supplied) 1225 * Valid In Asynchronous Callback: YES (if cb supplied)
@@ -1268,7 +1268,7 @@ cy_as_usb_commit_config(
1268 * Valid In Asynchronous Callback: NO 1268 * Valid In Asynchronous Callback: NO
1269 1269
1270 Returns 1270 Returns
1271 * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully 1271 * CY_AS_ERROR_SUCCESS - this module was shut down successfully
1272 * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating with 1272 * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating with
1273 * the West Bridge device 1273 * the West Bridge device
1274 * CY_AS_ERROR_NOT_RUNNING - the USB stack is not running 1274 * CY_AS_ERROR_NOT_RUNNING - the USB stack is not running
@@ -1311,7 +1311,7 @@ cy_as_usb_read_data(
1311 * Valid In Asynchronous Callback: YES 1311 * Valid In Asynchronous Callback: YES
1312 1312
1313 Returns 1313 Returns
1314 * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully 1314 * CY_AS_ERROR_SUCCESS - this module was shut down successfully
1315 * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating with 1315 * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating with
1316 * the West Bridge device 1316 * the West Bridge device
1317 * CY_AS_ERROR_NOT_RUNNING - the USB stack is not running 1317 * CY_AS_ERROR_NOT_RUNNING - the USB stack is not running
@@ -1355,7 +1355,7 @@ cy_as_usb_read_data_async(
1355 a zero length packet transmitted to the USB host. 1355 a zero length packet transmitted to the USB host.
1356 1356
1357 Returns 1357 Returns
1358 * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully 1358 * CY_AS_ERROR_SUCCESS - this module was shut down successfully
1359 * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating with 1359 * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating with
1360 * the West Bridge device 1360 * the West Bridge device
1361 * CY_AS_ERROR_NOT_RUNNING - the USB stack is not running 1361 * CY_AS_ERROR_NOT_RUNNING - the USB stack is not running
@@ -1395,7 +1395,7 @@ cy_as_usb_write_data(
1395 in a zero length packet transmitted to the USB host. 1395 in a zero length packet transmitted to the USB host.
1396 1396
1397 Returns 1397 Returns
1398 * CY_AS_ERROR_SUCCESS - this module was shut down sucessfully 1398 * CY_AS_ERROR_SUCCESS - this module was shut down successfully
1399 * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating with 1399 * CY_AS_ERROR_TIMEOUT - a timeout occurred communicating with
1400 * the West Bridge device 1400 * the West Bridge device
1401 * CY_AS_ERROR_NOT_RUNNING - the USB stack is not running 1401 * CY_AS_ERROR_NOT_RUNNING - the USB stack is not running
@@ -1435,7 +1435,7 @@ cy_as_usb_write_data_async(
1435 1435
1436 Returns 1436 Returns
1437 * CY_AS_ERROR_SUCCESS - this module was shut down 1437 * CY_AS_ERROR_SUCCESS - this module was shut down
1438 * sucessfully 1438 * successfully
1439 * CY_AS_ERROR_NOT_RUNNING - the USB stack is not 1439 * CY_AS_ERROR_NOT_RUNNING - the USB stack is not
1440 * running 1440 * running
1441 * CY_AS_ERROR_ASYNC_NOT_PENDING - no asynchronous USB 1441 * CY_AS_ERROR_ASYNC_NOT_PENDING - no asynchronous USB
@@ -1791,7 +1791,7 @@ cy_as_usb_set_m_s_report_threshold(
1791 device should be made visible to USB. 1791 device should be made visible to USB.
1792 1792
1793 Description 1793 Description
1794 West Bridge firmware supports the creation of upto two 1794 West Bridge firmware supports the creation of up to two
1795 partitions on mass storage devices connected to the West Bridge 1795 partitions on mass storage devices connected to the West Bridge
1796 device. When there are two partitions on a device, the user can 1796 device. When there are two partitions on a device, the user can
1797 choose which of these partitions should be made visible to the 1797 choose which of these partitions should be made visible to the
diff --git a/drivers/staging/winbond/mds.c b/drivers/staging/winbond/mds.c
index 9cfea94bcea5..c9f0e8f856a0 100644
--- a/drivers/staging/winbond/mds.c
+++ b/drivers/staging/winbond/mds.c
@@ -492,7 +492,7 @@ Mds_Tx(struct wbsoft_priv *adapter)
492 492
493 TxDesIndex = pMds->TxDesIndex; /* Get the current ID */ 493 TxDesIndex = pMds->TxDesIndex; /* Get the current ID */
494 pTxDes->Descriptor_ID = TxDesIndex; 494 pTxDes->Descriptor_ID = TxDesIndex;
495 pMds->TxDesFrom[TxDesIndex] = 2; /* Storing the information of source comming from */ 495 pMds->TxDesFrom[TxDesIndex] = 2; /* Storing the information of source coming from */
496 pMds->TxDesIndex++; 496 pMds->TxDesIndex++;
497 pMds->TxDesIndex %= MAX_USB_TX_DESCRIPTOR; 497 pMds->TxDesIndex %= MAX_USB_TX_DESCRIPTOR;
498 498
diff --git a/drivers/staging/wlags49_h2/README.ubuntu b/drivers/staging/wlags49_h2/README.ubuntu
index 47beaec86e4a..edee8b9385be 100644
--- a/drivers/staging/wlags49_h2/README.ubuntu
+++ b/drivers/staging/wlags49_h2/README.ubuntu
@@ -116,7 +116,7 @@ LICENSE
116 116
117The Agere Systems license applies. This is why I include the original 117The Agere Systems license applies. This is why I include the original
118README.wlags49. The instructions in that file are bogus now. I also 118README.wlags49. The instructions in that file are bogus now. I also
119include the man page. Eventhough setting parameters on the module 119include the man page. Even though setting parameters on the module
120does not work anymore but it provides some information about all the 120does not work anymore but it provides some information about all the
121settings. 121settings.
122 122
diff --git a/drivers/staging/wlags49_h2/TODO b/drivers/staging/wlags49_h2/TODO
index 14aa415b1a82..94032b6ac2b5 100644
--- a/drivers/staging/wlags49_h2/TODO
+++ b/drivers/staging/wlags49_h2/TODO
@@ -1,7 +1,7 @@
1First of all, the best thing would be that this driver becomes obsolte by 1First of all, the best thing would be that this driver becomes obsolte by
2adding support for Hermes II and Hermes II.5 cards to the existing orinoco 2adding support for Hermes II and Hermes II.5 cards to the existing orinoco
3driver. The orinoco driver currently only supports Hermes I based cards. 3driver. The orinoco driver currently only supports Hermes I based cards.
4Since this will not happen by magic and has not happend until now this 4Since this will not happen by magic and has not happened until now this
5driver provides a stop-gap solution for these type of cards. 5driver provides a stop-gap solution for these type of cards.
6 6
7Having said that, the following wishlist comes to mind to make the driver 7Having said that, the following wishlist comes to mind to make the driver
@@ -18,7 +18,7 @@ TODO:
18 - the driver is split into a Hermes II and a Hermes II.5 part, it 18 - the driver is split into a Hermes II and a Hermes II.5 part, it
19 would be nice to handle both with one module instead of two 19 would be nice to handle both with one module instead of two
20 - review by the wireless developer community 20 - review by the wireless developer community
21 - verify the code against the coding standards for a propper linux 21 - verify the code against the coding standards for a proper linux
22 driver 22 driver
23 - resolve license issues (?) 23 - resolve license issues (?)
24 24
diff --git a/drivers/staging/wlags49_h2/hcf.c b/drivers/staging/wlags49_h2/hcf.c
index d4bdd3ee8be1..a73317ef9350 100644
--- a/drivers/staging/wlags49_h2/hcf.c
+++ b/drivers/staging/wlags49_h2/hcf.c
@@ -540,7 +540,7 @@ HCF_STATIC hcf_16* BASED xxxx[ ] = {
540* 540*
541*.CONDITIONS 541*.CONDITIONS
542* Except for hcf_action with HCF_ACT_INT_FORCE_ON or HCF_ACT_INT_OFF as parameter or hcf_connect with an I/O 542* Except for hcf_action with HCF_ACT_INT_FORCE_ON or HCF_ACT_INT_OFF as parameter or hcf_connect with an I/O
543* address (i.e. not HCF_DISCONNECT), all hcf-function calls MUST be preceeded by a call of hcf_action with 543* address (i.e. not HCF_DISCONNECT), all hcf-function calls MUST be preceded by a call of hcf_action with
544* HCF_ACT_INT_OFF as parameter. 544* HCF_ACT_INT_OFF as parameter.
545* Note that hcf_connect defaults to NIC interrupt disabled mode, i.e. as if hcf_action( HCF_ACT_INT_OFF ) 545* Note that hcf_connect defaults to NIC interrupt disabled mode, i.e. as if hcf_action( HCF_ACT_INT_OFF )
546* was called. 546* was called.
@@ -843,7 +843,7 @@ hcf_16 i;
843*.MODULE int hcf_cntl( IFBP ifbp, hcf_16 cmd ) 843*.MODULE int hcf_cntl( IFBP ifbp, hcf_16 cmd )
844*.PURPOSE Connect or disconnect a specific port to a specific network. 844*.PURPOSE Connect or disconnect a specific port to a specific network.
845*!! ;???????????????? continue needs more explanation 845*!! ;???????????????? continue needs more explanation
846* recovers by means of "continue" when the connect proces in CCX mode fails 846* recovers by means of "continue" when the connect process in CCX mode fails
847* Enables or disables data transmission and reception for the NIC. 847* Enables or disables data transmission and reception for the NIC.
848* Activates static NIC configuration for a specific port at connect. 848* Activates static NIC configuration for a specific port at connect.
849* Activates static configuration for all ports at enable. 849* Activates static configuration for all ports at enable.
@@ -1170,12 +1170,12 @@ LTV_STRCT x;
1170 io_addr = io_base; 1170 io_addr = io_base;
1171 } 1171 }
1172 1172
1173#if 0 //;? if a subsequent hcf_connect is preceeded by an hcf_disconnect the wakeup is not needed !! 1173#if 0 //;? if a subsequent hcf_connect is preceded by an hcf_disconnect the wakeup is not needed !!
1174#if HCF_SLEEP 1174#if HCF_SLEEP
1175 OUT_PORT_WORD( .....+HREG_IO, HREG_IO_WAKEUP_ASYNC ); //OPW not yet useable 1175 OUT_PORT_WORD( .....+HREG_IO, HREG_IO_WAKEUP_ASYNC ); //OPW not yet useable
1176 MSF_WAIT(800); // MSF-defined function to wait n microseconds. 1176 MSF_WAIT(800); // MSF-defined function to wait n microseconds.
1177 note that MSF_WAIT uses not yet defined!!!! IFB_IOBase and IFB_TickIni (via PROT_CNT_INI) 1177 note that MSF_WAIT uses not yet defined!!!! IFB_IOBase and IFB_TickIni (via PROT_CNT_INI)
1178 so be carefull if this code is restored 1178 so be careful if this code is restored
1179#endif // HCF_SLEEP 1179#endif // HCF_SLEEP
1180#endif // 0 1180#endif // 0
1181 1181
@@ -1563,7 +1563,7 @@ DESC_STRCT *p = descp->next_desc_addr; //pointer to 2nd descriptor of frame
1563* This function is called by the MSF to supply the HCF with new/more buffers for receive purposes. 1563* This function is called by the MSF to supply the HCF with new/more buffers for receive purposes.
1564* The HCF can be used in 2 fashions: with and without encapsulation for data transfer. 1564* The HCF can be used in 2 fashions: with and without encapsulation for data transfer.
1565* This is controlled at compile time by the HCF_ENC bit of the HCF_ENCAP system constant. 1565* This is controlled at compile time by the HCF_ENC bit of the HCF_ENCAP system constant.
1566* As a consequence, some additional constaints apply to the number of descriptor and the buffers associated 1566* As a consequence, some additional constraints apply to the number of descriptor and the buffers associated
1567* with the first 2 descriptors. Independent of the encapsulation feature, the COUNT fields are ignored. 1567* with the first 2 descriptors. Independent of the encapsulation feature, the COUNT fields are ignored.
1568* A special case is the supplying of the DELWA descriptor, which must be supplied as the first descriptor. 1568* A special case is the supplying of the DELWA descriptor, which must be supplied as the first descriptor.
1569* 1569*
@@ -1735,7 +1735,7 @@ DESC_STRCT *descp; // pointer to start of FrameList
1735* - in case encapsulation by the HCF is selected: 1735* - in case encapsulation by the HCF is selected:
1736* - The FrameList does not consists of at least 2 Descriptors. 1736* - The FrameList does not consists of at least 2 Descriptors.
1737* - The first databuffer does not contain exactly the (space for) the 802.11 header (== 28 words) 1737* - The first databuffer does not contain exactly the (space for) the 802.11 header (== 28 words)
1738* - The first databuffer does not have a size to additionally accomodate the 802.3 header and the 1738* - The first databuffer does not have a size to additionally accommodate the 802.3 header and the
1739* SNAP header of the frame after encapsulation (== 39 words). 1739* SNAP header of the frame after encapsulation (== 39 words).
1740* - The second databuffer does not contain at least DA, SA and 'type/length' (==14 bytes or 7 words) 1740* - The second databuffer does not contain at least DA, SA and 'type/length' (==14 bytes or 7 words)
1741*!! The 2nd part of the list of asserts should be kept in sync with put_frame_lst, in order to get 1741*!! The 2nd part of the list of asserts should be kept in sync with put_frame_lst, in order to get
@@ -1762,14 +1762,14 @@ DESC_STRCT *descp; // pointer to start of FrameList
1762* - Copy DA/SA fields from the 2nd buffer 1762* - Copy DA/SA fields from the 2nd buffer
1763* - Calculate total length of the message (snap-header + type-field + the length of all buffer fragments 1763* - Calculate total length of the message (snap-header + type-field + the length of all buffer fragments
1764* associated with the 802.3 frame (i.e all descriptors except the first), but not the DestinationAddress, 1764* associated with the 802.3 frame (i.e all descriptors except the first), but not the DestinationAddress,
1765* SourceAddress and lenght-field) 1765* SourceAddress and length-field)
1766* Assert the message length 1766* Assert the message length
1767* Write length. Note that the message is in BE format, hence on LE platforms the length must be converted 1767* Write length. Note that the message is in BE format, hence on LE platforms the length must be converted
1768* ;? THIS IS NOT WHAT CURRENTLY IS IMPLEMENTED 1768* ;? THIS IS NOT WHAT CURRENTLY IS IMPLEMENTED
1769* - Write snap header. Note that the last byte of the snap header is NOT copied, that byte is already in 1769* - Write snap header. Note that the last byte of the snap header is NOT copied, that byte is already in
1770* place as result of the call to hcf_encap. 1770* place as result of the call to hcf_encap.
1771* Note that there are many ways to skin a cat. To express the offsets in the 1st buffer while writing 1771* Note that there are many ways to skin a cat. To express the offsets in the 1st buffer while writing
1772* the snap header, HFS_TYPE is choosen as a reference point to make it easier to grasp that the snap header 1772* the snap header, HFS_TYPE is chosen as a reference point to make it easier to grasp that the snap header
1773* and encapsualtion type are at least relative in the right. 1773* and encapsualtion type are at least relative in the right.
1774*8: modify 1st descriptor to reflect moved part of the 802.3 header + Snap-header 1774*8: modify 1st descriptor to reflect moved part of the 802.3 header + Snap-header
1775* modify 2nd descriptor to skip the moved part of the 802.3 header (DA/SA 1775* modify 2nd descriptor to skip the moved part of the 802.3 header (DA/SA
@@ -1933,7 +1933,7 @@ hcf_16 t = (hcf_16)(*type<<8) + *(type+1); /* 2 */
1933* HCF_SUCCESS Success 1933* HCF_SUCCESS Success
1934*!! via cmd_exe ( type >= CFG_RID_FW_MIN ) 1934*!! via cmd_exe ( type >= CFG_RID_FW_MIN )
1935* HCF_ERR_NO_NIC NIC removed during retrieval 1935* HCF_ERR_NO_NIC NIC removed during retrieval
1936* HCF_ERR_TIME_OUT Expected Hermes event did not occure in expected time 1936* HCF_ERR_TIME_OUT Expected Hermes event did not occur in expected time
1937*!! via cmd_exe and setup_bap (type >= CFG_RID_FW_MIN ) 1937*!! via cmd_exe and setup_bap (type >= CFG_RID_FW_MIN )
1938* HCF_ERR_DEFUNCT_... HCF is in defunct mode (bits 0x7F reflect cause) 1938* HCF_ERR_DEFUNCT_... HCF is in defunct mode (bits 0x7F reflect cause)
1939* 1939*
@@ -2958,7 +2958,7 @@ or
2958* hcf_service_nic is also skipped in those cases. 2958* hcf_service_nic is also skipped in those cases.
2959* To prevent that hcf_service_nic reports bogus information to the MSF with all - possibly difficult to 2959* To prevent that hcf_service_nic reports bogus information to the MSF with all - possibly difficult to
2960* debug - undesirable side effects, it is paramount to check the NIC presence. In former days the presence 2960* debug - undesirable side effects, it is paramount to check the NIC presence. In former days the presence
2961* test was based on the Hermes register HREG_SW_0. Since in HCF_ACT_INT_OFF is choosen for strategy based on 2961* test was based on the Hermes register HREG_SW_0. Since in HCF_ACT_INT_OFF is chosen for strategy based on
2962* HREG_EV_STAT, this is now also used in hcf_service_nic. The motivation to change strategy is partly 2962* HREG_EV_STAT, this is now also used in hcf_service_nic. The motivation to change strategy is partly
2963* due to inconsistent F/W implementations with respect to HREG_SW_0 manipulation around reset and download. 2963* due to inconsistent F/W implementations with respect to HREG_SW_0 manipulation around reset and download.
2964* Note that in polled environments Card Removal is not detected by INT_OFF which makes the check in 2964* Note that in polled environments Card Removal is not detected by INT_OFF which makes the check in
@@ -4048,7 +4048,7 @@ hcf_32 FAR *p4; //prevent side effects from macro
4048 HCFASSERT( word_len == 0 || word_len == 2 || word_len == 4, word_len ) 4048 HCFASSERT( word_len == 0 || word_len == 2 || word_len == 4, word_len )
4049 HCFASSERT( word_len == 0 || ((hcf_32)bufp & 1 ) == 0, (hcf_32)bufp ) 4049 HCFASSERT( word_len == 0 || ((hcf_32)bufp & 1 ) == 0, (hcf_32)bufp )
4050 HCFASSERT( word_len <= len, MERGE2( word_len, len ) ) 4050 HCFASSERT( word_len <= len, MERGE2( word_len, len ) )
4051 //see put_frag for an alternative implementation, but be carefull about what are int's and what are 4051 //see put_frag for an alternative implementation, but be careful about what are int's and what are
4052 //hcf_16's 4052 //hcf_16's
4053 if ( word_len ) { //. if there is anything to convert 4053 if ( word_len ) { //. if there is anything to convert
4054hcf_8 c; 4054hcf_8 c;
@@ -4712,7 +4712,7 @@ int rc = HCF_SUCCESS;
4712* Note that len is unsigned, so even MSF I/F violation works out O.K. 4712* Note that len is unsigned, so even MSF I/F violation works out O.K.
4713* The '2' in the expression "len+2" is used because 1 word is needed for L itself and 1 word is needed 4713* The '2' in the expression "len+2" is used because 1 word is needed for L itself and 1 word is needed
4714* for the zero-sentinel 4714* for the zero-sentinel
4715*8: update MailBox Info length report to MSF with "oldest" MB Info Block size. Be carefull here, if you get 4715*8: update MailBox Info length report to MSF with "oldest" MB Info Block size. Be careful here, if you get
4716* here before the MailBox is registered, you can't read from the buffer addressed by IFB_MBp (it is the 4716* here before the MailBox is registered, you can't read from the buffer addressed by IFB_MBp (it is the
4717* Null buffer) so don't move this code till the end of this routine but keep it where there is garuanteed 4717* Null buffer) so don't move this code till the end of this routine but keep it where there is garuanteed
4718* a buffer. 4718* a buffer.
diff --git a/drivers/staging/wlags49_h2/hcfdef.h b/drivers/staging/wlags49_h2/hcfdef.h
index 4e20171b7829..cb1966d8473f 100644
--- a/drivers/staging/wlags49_h2/hcfdef.h
+++ b/drivers/staging/wlags49_h2/hcfdef.h
@@ -315,7 +315,7 @@ err: these values should match;
315 315
316#if HCF_DMA 316#if HCF_DMA
317//************************* DMA (bus mastering) 317//************************* DMA (bus mastering)
318 // Be carefull to use these registers only at a genuine 32 bits NIC 318 // Be careful to use these registers only at a genuine 32 bits NIC
319 // On 16 bits NICs, these addresses are mapped into the range 0x00 through 0x3F with all consequences 319 // On 16 bits NICs, these addresses are mapped into the range 0x00 through 0x3F with all consequences
320 // thereof, e.g. HREG_DMA_CTRL register maps to HREG_CMD. 320 // thereof, e.g. HREG_DMA_CTRL register maps to HREG_CMD.
321#define HREG_DMA_CTRL 0x0040 321#define HREG_DMA_CTRL 0x0040
diff --git a/drivers/staging/wlags49_h2/wl_wext.c b/drivers/staging/wlags49_h2/wl_wext.c
index 9e5da0815371..522a31090c58 100644
--- a/drivers/staging/wlags49_h2/wl_wext.c
+++ b/drivers/staging/wlags49_h2/wl_wext.c
@@ -2575,7 +2575,7 @@ static int wireless_set_scan(struct net_device *dev, struct iw_request_info *inf
2575 * This looks like a nice place to test if the HCF is still 2575 * This looks like a nice place to test if the HCF is still
2576 * communicating with the card. It seems that sometimes BAP_1 2576 * communicating with the card. It seems that sometimes BAP_1
2577 * gets corrupted. By looking at the comments in HCF the 2577 * gets corrupted. By looking at the comments in HCF the
2578 * cause is still a mistery. Okay, the communication to the 2578 * cause is still a mystery. Okay, the communication to the
2579 * card is dead, reset the card to revive. 2579 * card is dead, reset the card to revive.
2580 */ 2580 */
2581 if((lp->hcfCtx.IFB_CardStat & CARD_STAT_DEFUNCT) != 0) 2581 if((lp->hcfCtx.IFB_CardStat & CARD_STAT_DEFUNCT) != 0)
@@ -3924,7 +3924,7 @@ void wl_wext_event_mic_failed( struct net_device *dev )
3924 memset( msg, 0, sizeof( msg )); 3924 memset( msg, 0, sizeof( msg ));
3925 3925
3926 3926
3927 /* Becuase MIC failures are not part of the Wireless Extensions yet, they 3927 /* Because MIC failures are not part of the Wireless Extensions yet, they
3928 must be passed as a string using an IWEVCUSTOM event. In order for the 3928 must be passed as a string using an IWEVCUSTOM event. In order for the
3929 event to be effective, the string format must be known by both the 3929 event to be effective, the string format must be known by both the
3930 driver and the supplicant. The following is the string format used by the 3930 driver and the supplicant. The following is the string format used by the
@@ -3999,7 +3999,7 @@ void wl_wext_event_assoc_ie( struct net_device *dev )
3999 memcpy( &data.rawData, &( lp->ltvRecord.u.u8[1] ), 88 ); 3999 memcpy( &data.rawData, &( lp->ltvRecord.u.u8[1] ), 88 );
4000 wpa_ie = wl_parse_wpa_ie( &data, &length ); 4000 wpa_ie = wl_parse_wpa_ie( &data, &length );
4001 4001
4002 /* Becuase this event (Association WPA-IE) is not part of the Wireless 4002 /* Because this event (Association WPA-IE) is not part of the Wireless
4003 Extensions yet, it must be passed as a string using an IWEVCUSTOM event. 4003 Extensions yet, it must be passed as a string using an IWEVCUSTOM event.
4004 In order for the event to be effective, the string format must be known 4004 In order for the event to be effective, the string format must be known
4005 by both the driver and the supplicant. The following is the string format 4005 by both the driver and the supplicant. The following is the string format
diff --git a/drivers/staging/wlags49_h25/TODO b/drivers/staging/wlags49_h25/TODO
index 14aa415b1a82..94032b6ac2b5 100644
--- a/drivers/staging/wlags49_h25/TODO
+++ b/drivers/staging/wlags49_h25/TODO
@@ -1,7 +1,7 @@
1First of all, the best thing would be that this driver becomes obsolte by 1First of all, the best thing would be that this driver becomes obsolte by
2adding support for Hermes II and Hermes II.5 cards to the existing orinoco 2adding support for Hermes II and Hermes II.5 cards to the existing orinoco
3driver. The orinoco driver currently only supports Hermes I based cards. 3driver. The orinoco driver currently only supports Hermes I based cards.
4Since this will not happen by magic and has not happend until now this 4Since this will not happen by magic and has not happened until now this
5driver provides a stop-gap solution for these type of cards. 5driver provides a stop-gap solution for these type of cards.
6 6
7Having said that, the following wishlist comes to mind to make the driver 7Having said that, the following wishlist comes to mind to make the driver
@@ -18,7 +18,7 @@ TODO:
18 - the driver is split into a Hermes II and a Hermes II.5 part, it 18 - the driver is split into a Hermes II and a Hermes II.5 part, it
19 would be nice to handle both with one module instead of two 19 would be nice to handle both with one module instead of two
20 - review by the wireless developer community 20 - review by the wireless developer community
21 - verify the code against the coding standards for a propper linux 21 - verify the code against the coding standards for a proper linux
22 driver 22 driver
23 - resolve license issues (?) 23 - resolve license issues (?)
24 24
diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
index ed751f418db9..21f25a21c291 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -1976,7 +1976,7 @@ static wlandevice_t *create_wlan(void)
1976 1976
1977 wlandev->nsdcaps = P80211_NSDCAP_HWFRAGMENT | P80211_NSDCAP_AUTOJOIN; 1977 wlandev->nsdcaps = P80211_NSDCAP_HWFRAGMENT | P80211_NSDCAP_AUTOJOIN;
1978 1978
1979 /* Initialize the device private data stucture. */ 1979 /* Initialize the device private data structure. */
1980 hw->dot11_desired_bss_type = 1; 1980 hw->dot11_desired_bss_type = 1;
1981 1981
1982 return wlandev; 1982 return wlandev;
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 8762a5327693..9669c22cc82c 100644
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -7834,7 +7834,7 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE,
7834 == 600)) { 7834 == 600)) {
7835 index++; 7835 index++;
7836 } 7836 }
7837 /* Alan 10/19/2007; do the similiar adjustment like XGISearchCRT1Rate() */ 7837 /* Alan 10/19/2007; do the similar adjustment like XGISearchCRT1Rate() */
7838 if ((pVBInfo->RefIndex[RefreshRateTableIndex].XRes == 1024) 7838 if ((pVBInfo->RefIndex[RefreshRateTableIndex].XRes == 1024)
7839 && (pVBInfo->RefIndex[RefreshRateTableIndex].YRes 7839 && (pVBInfo->RefIndex[RefreshRateTableIndex].YRes
7840 == 768)) { 7840 == 768)) {
diff --git a/drivers/staging/xgifb/vgatypes.h b/drivers/staging/xgifb/vgatypes.h
index 4b87951f4322..d613e84aab62 100644
--- a/drivers/staging/xgifb/vgatypes.h
+++ b/drivers/staging/xgifb/vgatypes.h
@@ -85,7 +85,7 @@ struct xgi_hw_device_info
85 unsigned long *); 85 unsigned long *);
86}; 86};
87 87
88/* Addtional IOCTL for communication xgifb <> X driver */ 88/* Additional IOCTL for communication xgifb <> X driver */
89/* If changing this, xgifb.h must also be changed (for xgifb) */ 89/* If changing this, xgifb.h must also be changed (for xgifb) */
90 90
91 91
diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c
index 2c5fcfed5934..30cbb743d9ba 100644
--- a/drivers/target/target_core_alua.c
+++ b/drivers/target/target_core_alua.c
@@ -496,8 +496,8 @@ static int core_alua_state_check(
496 nonop_delay_msecs = tg_pt_gp->tg_pt_gp_nonop_delay_msecs; 496 nonop_delay_msecs = tg_pt_gp->tg_pt_gp_nonop_delay_msecs;
497 spin_unlock(&tg_pt_gp_mem->tg_pt_gp_mem_lock); 497 spin_unlock(&tg_pt_gp_mem->tg_pt_gp_mem_lock);
498 /* 498 /*
499 * Process ALUA_ACCESS_STATE_ACTIVE_OPTMIZED in a seperate conditional 499 * Process ALUA_ACCESS_STATE_ACTIVE_OPTMIZED in a separate conditional
500 * statement so the complier knows explictly to check this case first. 500 * statement so the compiler knows explicitly to check this case first.
501 * For the Optimized ALUA access state case, we want to process the 501 * For the Optimized ALUA access state case, we want to process the
502 * incoming fabric cmd ASAP.. 502 * incoming fabric cmd ASAP..
503 */ 503 */
@@ -1157,7 +1157,7 @@ void core_alua_free_lu_gp(struct t10_alua_lu_gp *lu_gp)
1157 spin_unlock(&lu_gp->lu_gp_lock); 1157 spin_unlock(&lu_gp->lu_gp_lock);
1158 /* 1158 /*
1159 * 1159 *
1160 * lu_gp_mem is assoicated with a single 1160 * lu_gp_mem is associated with a single
1161 * struct se_device->dev_alua_lu_gp_mem, and is released when 1161 * struct se_device->dev_alua_lu_gp_mem, and is released when
1162 * struct se_device is released via core_alua_free_lu_gp_mem(). 1162 * struct se_device is released via core_alua_free_lu_gp_mem().
1163 * 1163 *
@@ -1429,7 +1429,7 @@ void core_alua_free_tg_pt_gp(
1429 } 1429 }
1430 spin_unlock(&tg_pt_gp->tg_pt_gp_lock); 1430 spin_unlock(&tg_pt_gp->tg_pt_gp_lock);
1431 /* 1431 /*
1432 * tg_pt_gp_mem is assoicated with a single 1432 * tg_pt_gp_mem is associated with a single
1433 * se_port->sep_alua_tg_pt_gp_mem, and is released via 1433 * se_port->sep_alua_tg_pt_gp_mem, and is released via
1434 * core_alua_free_tg_pt_gp_mem(). 1434 * core_alua_free_tg_pt_gp_mem().
1435 * 1435 *
@@ -1963,7 +1963,7 @@ int core_setup_alua(struct se_device *dev, int force_pt)
1963 printk(KERN_INFO "%s: Enabling ALUA Emulation for SPC-3" 1963 printk(KERN_INFO "%s: Enabling ALUA Emulation for SPC-3"
1964 " device\n", TRANSPORT(dev)->name); 1964 " device\n", TRANSPORT(dev)->name);
1965 /* 1965 /*
1966 * Assoicate this struct se_device with the default ALUA 1966 * Associate this struct se_device with the default ALUA
1967 * LUN Group. 1967 * LUN Group.
1968 */ 1968 */
1969 lu_gp_mem = core_alua_allocate_lu_gp_mem(dev); 1969 lu_gp_mem = core_alua_allocate_lu_gp_mem(dev);
diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
index 3fb8e32506ed..d25e20829012 100644
--- a/drivers/target/target_core_device.c
+++ b/drivers/target/target_core_device.c
@@ -371,7 +371,7 @@ int core_update_device_list_for_node(
371 if (!(enable)) { 371 if (!(enable)) {
372 /* 372 /*
373 * deve->se_lun_acl will be NULL for demo-mode created LUNs 373 * deve->se_lun_acl will be NULL for demo-mode created LUNs
374 * that have not been explictly concerted to MappedLUNs -> 374 * that have not been explicitly concerted to MappedLUNs ->
375 * struct se_lun_acl, but we remove deve->alua_port_list from 375 * struct se_lun_acl, but we remove deve->alua_port_list from
376 * port->sep_alua_list. This also means that active UAs and 376 * port->sep_alua_list. This also means that active UAs and
377 * NodeACL context specific PR metadata for demo-mode 377 * NodeACL context specific PR metadata for demo-mode
diff --git a/drivers/target/target_core_fabric_lib.c b/drivers/target/target_core_fabric_lib.c
index d57ad672677f..1e193f324895 100644
--- a/drivers/target/target_core_fabric_lib.c
+++ b/drivers/target/target_core_fabric_lib.c
@@ -433,7 +433,7 @@ char *iscsi_parse_pr_out_transport_id(
433 /* 433 /*
434 * Go ahead and do the lower case conversion of the received 434 * Go ahead and do the lower case conversion of the received
435 * 12 ASCII characters representing the ISID in the TransportID 435 * 12 ASCII characters representing the ISID in the TransportID
436 * for comparision against the running iSCSI session's ISID from 436 * for comparison against the running iSCSI session's ISID from
437 * iscsi_target.c:lio_sess_get_initiator_sid() 437 * iscsi_target.c:lio_sess_get_initiator_sid()
438 */ 438 */
439 for (i = 0; i < 12; i++) { 439 for (i = 0; i < 12; i++) {
diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c
index 02f553aef43d..150c4305f385 100644
--- a/drivers/target/target_core_file.c
+++ b/drivers/target/target_core_file.c
@@ -159,7 +159,7 @@ static struct se_device *fd_create_virtdevice(
159#endif 159#endif
160/* flags |= O_DIRECT; */ 160/* flags |= O_DIRECT; */
161 /* 161 /*
162 * If fd_buffered_io=1 has not been set explictly (the default), 162 * If fd_buffered_io=1 has not been set explicitly (the default),
163 * use O_SYNC to force FILEIO writes to disk. 163 * use O_SYNC to force FILEIO writes to disk.
164 */ 164 */
165 if (!(fd_dev->fbd_flags & FDBD_USE_BUFFERED_IO)) 165 if (!(fd_dev->fbd_flags & FDBD_USE_BUFFERED_IO))
diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
index 2521f75362c3..a79f518ca6e2 100644
--- a/drivers/target/target_core_pr.c
+++ b/drivers/target/target_core_pr.c
@@ -478,7 +478,7 @@ static int core_scsi3_pr_seq_non_holder(
478 break; 478 break;
479 } 479 }
480 /* 480 /*
481 * Case where the CDB is explictly allowed in the above switch 481 * Case where the CDB is explicitly allowed in the above switch
482 * statement. 482 * statement.
483 */ 483 */
484 if (!(ret) && !(other_cdb)) { 484 if (!(ret) && !(other_cdb)) {
@@ -3735,7 +3735,7 @@ static int core_scsi3_emulate_pr_out(struct se_cmd *cmd, unsigned char *cdb)
3735 return PYX_TRANSPORT_LU_COMM_FAILURE; 3735 return PYX_TRANSPORT_LU_COMM_FAILURE;
3736 3736
3737 if (cmd->data_length < 24) { 3737 if (cmd->data_length < 24) {
3738 printk(KERN_WARNING "SPC-PR: Recieved PR OUT parameter list" 3738 printk(KERN_WARNING "SPC-PR: Received PR OUT parameter list"
3739 " length too small: %u\n", cmd->data_length); 3739 " length too small: %u\n", cmd->data_length);
3740 return PYX_TRANSPORT_INVALID_PARAMETER_LIST; 3740 return PYX_TRANSPORT_INVALID_PARAMETER_LIST;
3741 } 3741 }
@@ -3778,7 +3778,7 @@ static int core_scsi3_emulate_pr_out(struct se_cmd *cmd, unsigned char *cdb)
3778 */ 3778 */
3779 if (!(spec_i_pt) && ((cdb[1] & 0x1f) != PRO_REGISTER_AND_MOVE) && 3779 if (!(spec_i_pt) && ((cdb[1] & 0x1f) != PRO_REGISTER_AND_MOVE) &&
3780 (cmd->data_length != 24)) { 3780 (cmd->data_length != 24)) {
3781 printk(KERN_WARNING "SPC-PR: Recieved PR OUT illegal parameter" 3781 printk(KERN_WARNING "SPC-PR: Received PR OUT illegal parameter"
3782 " list length: %u\n", cmd->data_length); 3782 " list length: %u\n", cmd->data_length);
3783 return PYX_TRANSPORT_INVALID_PARAMETER_LIST; 3783 return PYX_TRANSPORT_INVALID_PARAMETER_LIST;
3784 } 3784 }
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index bf6aa8a9f1d8..9583b23c9c84 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -719,7 +719,7 @@ static int transport_cmd_check_stop(
719 cmd->se_lun = NULL; 719 cmd->se_lun = NULL;
720 /* 720 /*
721 * Some fabric modules like tcm_loop can release 721 * Some fabric modules like tcm_loop can release
722 * their internally allocated I/O refrence now and 722 * their internally allocated I/O reference now and
723 * struct se_cmd now. 723 * struct se_cmd now.
724 */ 724 */
725 if (CMD_TFO(cmd)->check_stop_free != NULL) { 725 if (CMD_TFO(cmd)->check_stop_free != NULL) {
@@ -2029,7 +2029,7 @@ int transport_generic_handle_data(
2029 * If the received CDB has aleady been ABORTED by the generic 2029 * If the received CDB has aleady been ABORTED by the generic
2030 * target engine, we now call transport_check_aborted_status() 2030 * target engine, we now call transport_check_aborted_status()
2031 * to queue any delated TASK_ABORTED status for the received CDB to the 2031 * to queue any delated TASK_ABORTED status for the received CDB to the
2032 * fabric module as we are expecting no futher incoming DATA OUT 2032 * fabric module as we are expecting no further incoming DATA OUT
2033 * sequences at this point. 2033 * sequences at this point.
2034 */ 2034 */
2035 if (transport_check_aborted_status(cmd, 1) != 0) 2035 if (transport_check_aborted_status(cmd, 1) != 0)
@@ -2501,7 +2501,7 @@ static inline int transport_execute_task_attr(struct se_cmd *cmd)
2501 if (SE_DEV(cmd)->dev_task_attr_type != SAM_TASK_ATTR_EMULATED) 2501 if (SE_DEV(cmd)->dev_task_attr_type != SAM_TASK_ATTR_EMULATED)
2502 return 1; 2502 return 1;
2503 /* 2503 /*
2504 * Check for the existance of HEAD_OF_QUEUE, and if true return 1 2504 * Check for the existence of HEAD_OF_QUEUE, and if true return 1
2505 * to allow the passed struct se_cmd list of tasks to the front of the list. 2505 * to allow the passed struct se_cmd list of tasks to the front of the list.
2506 */ 2506 */
2507 if (cmd->sam_task_attr == TASK_ATTR_HOQ) { 2507 if (cmd->sam_task_attr == TASK_ATTR_HOQ) {
@@ -2547,7 +2547,7 @@ static inline int transport_execute_task_attr(struct se_cmd *cmd)
2547 if (atomic_read(&SE_DEV(cmd)->dev_ordered_sync) != 0) { 2547 if (atomic_read(&SE_DEV(cmd)->dev_ordered_sync) != 0) {
2548 /* 2548 /*
2549 * Otherwise, add cmd w/ tasks to delayed cmd queue that 2549 * Otherwise, add cmd w/ tasks to delayed cmd queue that
2550 * will be drained upon competion of HEAD_OF_QUEUE task. 2550 * will be drained upon completion of HEAD_OF_QUEUE task.
2551 */ 2551 */
2552 spin_lock(&SE_DEV(cmd)->delayed_cmd_lock); 2552 spin_lock(&SE_DEV(cmd)->delayed_cmd_lock);
2553 cmd->se_cmd_flags |= SCF_DELAYED_CMD_FROM_SAM_ATTR; 2553 cmd->se_cmd_flags |= SCF_DELAYED_CMD_FROM_SAM_ATTR;
@@ -2589,7 +2589,7 @@ static int transport_execute_tasks(struct se_cmd *cmd)
2589 } 2589 }
2590 /* 2590 /*
2591 * Call transport_cmd_check_stop() to see if a fabric exception 2591 * Call transport_cmd_check_stop() to see if a fabric exception
2592 * has occured that prevents execution. 2592 * has occurred that prevents execution.
2593 */ 2593 */
2594 if (!(transport_cmd_check_stop(cmd, 0, TRANSPORT_PROCESSING))) { 2594 if (!(transport_cmd_check_stop(cmd, 0, TRANSPORT_PROCESSING))) {
2595 /* 2595 /*
@@ -3109,7 +3109,7 @@ static int transport_generic_cmd_sequencer(
3109 if (ret != 0) { 3109 if (ret != 0) {
3110 cmd->transport_wait_for_tasks = &transport_nop_wait_for_tasks; 3110 cmd->transport_wait_for_tasks = &transport_nop_wait_for_tasks;
3111 /* 3111 /*
3112 * Set SCSI additional sense code (ASC) to 'LUN Not Accessable'; 3112 * Set SCSI additional sense code (ASC) to 'LUN Not Accessible';
3113 * The ALUA additional sense code qualifier (ASCQ) is determined 3113 * The ALUA additional sense code qualifier (ASCQ) is determined
3114 * by the ALUA primary or secondary access state.. 3114 * by the ALUA primary or secondary access state..
3115 */ 3115 */
@@ -3867,7 +3867,7 @@ static void transport_generic_complete_ok(struct se_cmd *cmd)
3867 } 3867 }
3868 } 3868 }
3869 /* 3869 /*
3870 * Check for a callback, used by amoungst other things 3870 * Check for a callback, used by amongst other things
3871 * XDWRITE_READ_10 emulation. 3871 * XDWRITE_READ_10 emulation.
3872 */ 3872 */
3873 if (cmd->transport_complete_callback) 3873 if (cmd->transport_complete_callback)
diff --git a/drivers/target/target_core_ua.c b/drivers/target/target_core_ua.c
index a2ef346087e8..df355176a377 100644
--- a/drivers/target/target_core_ua.c
+++ b/drivers/target/target_core_ua.c
@@ -247,7 +247,7 @@ void core_scsi3_ua_for_check_condition(
247 } 247 }
248 /* 248 /*
249 * Otherwise for the default 00b, release the UNIT ATTENTION 249 * Otherwise for the default 00b, release the UNIT ATTENTION
250 * condition. Return the ASC/ASCQ of the higest priority UA 250 * condition. Return the ASC/ASCQ of the highest priority UA
251 * (head of the list) in the outgoing CHECK_CONDITION + sense. 251 * (head of the list) in the outgoing CHECK_CONDITION + sense.
252 */ 252 */
253 if (head) { 253 if (head) {
@@ -304,7 +304,7 @@ int core_scsi3_ua_clear_for_request_sense(
304 * matching struct se_lun. 304 * matching struct se_lun.
305 * 305 *
306 * Once the returning ASC/ASCQ values are set, we go ahead and 306 * Once the returning ASC/ASCQ values are set, we go ahead and
307 * release all of the Unit Attention conditions for the assoicated 307 * release all of the Unit Attention conditions for the associated
308 * struct se_lun. 308 * struct se_lun.
309 */ 309 */
310 spin_lock(&deve->ua_lock); 310 spin_lock(&deve->ua_lock);
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c
index b00101972f20..d5f923bcdffe 100644
--- a/drivers/telephony/ixj.c
+++ b/drivers/telephony/ixj.c
@@ -169,7 +169,7 @@
169 * Added support for Linux 2.4.x kernels. 169 * Added support for Linux 2.4.x kernels.
170 * 170 *
171 * Revision 3.77 2001/01/09 04:00:52 eokerson 171 * Revision 3.77 2001/01/09 04:00:52 eokerson
172 * Linetest will now test the line, even if it has previously succeded. 172 * Linetest will now test the line, even if it has previously succeeded.
173 * 173 *
174 * Revision 3.76 2001/01/08 19:27:00 eokerson 174 * Revision 3.76 2001/01/08 19:27:00 eokerson
175 * Fixed problem with standard cable on Internet PhoneCARD. 175 * Fixed problem with standard cable on Internet PhoneCARD.
@@ -352,7 +352,7 @@ static void ixj_fsk_alloc(IXJ *j)
352 } else { 352 } else {
353 j->fsksize = 8000; 353 j->fsksize = 8000;
354 if(ixjdebug & 0x0200) { 354 if(ixjdebug & 0x0200) {
355 printk("IXJ phone%d - allocate succeded\n", j->board); 355 printk("IXJ phone%d - allocate succeeded\n", j->board);
356 } 356 }
357 } 357 }
358 } 358 }
@@ -487,7 +487,7 @@ DSPbase +
4878-9 Hardware Status Register Read Only 4878-9 Hardware Status Register Read Only
488A-B Hardware Control Register Read Write 488A-B Hardware Control Register Read Write
489C-D Host Transmit (Write) Data Buffer Access Port (buffer input)Write Only 489C-D Host Transmit (Write) Data Buffer Access Port (buffer input)Write Only
490E-F Host Recieve (Read) Data Buffer Access Port (buffer input) Read Only 490E-F Host Receive (Read) Data Buffer Access Port (buffer input) Read Only
491************************************************************************/ 491************************************************************************/
492 492
493static inline void ixj_read_HSR(IXJ *j) 493static inline void ixj_read_HSR(IXJ *j)
@@ -4195,7 +4195,7 @@ static void ixj_aec_start(IXJ *j, int level)
4195 ixj_WriteDSPCommand(0xE338, j); /* Set Echo Suppresser Attenuation to 0dB */ 4195 ixj_WriteDSPCommand(0xE338, j); /* Set Echo Suppresser Attenuation to 0dB */
4196 4196
4197 /* Now we can set the AGC initial parameters and turn it on */ 4197 /* Now we can set the AGC initial parameters and turn it on */
4198 ixj_WriteDSPCommand(0xCF90, j); /* Set AGC Minumum gain */ 4198 ixj_WriteDSPCommand(0xCF90, j); /* Set AGC Minimum gain */
4199 ixj_WriteDSPCommand(0x0020, j); /* to 0.125 (-18dB) */ 4199 ixj_WriteDSPCommand(0x0020, j); /* to 0.125 (-18dB) */
4200 4200
4201 ixj_WriteDSPCommand(0xCF91, j); /* Set AGC Maximum gain */ 4201 ixj_WriteDSPCommand(0xCF91, j); /* Set AGC Maximum gain */
diff --git a/drivers/telephony/ixj.h b/drivers/telephony/ixj.h
index 4c32a43b7914..2c841134f61c 100644
--- a/drivers/telephony/ixj.h
+++ b/drivers/telephony/ixj.h
@@ -1149,7 +1149,7 @@ typedef struct {
1149 unsigned int firstring:1; /* First ring cadence is complete */ 1149 unsigned int firstring:1; /* First ring cadence is complete */
1150 unsigned int pstncheck:1; /* Currently checking the PSTN Line */ 1150 unsigned int pstncheck:1; /* Currently checking the PSTN Line */
1151 unsigned int pstn_rmr:1; 1151 unsigned int pstn_rmr:1;
1152 unsigned int x:3; /* unsed bits */ 1152 unsigned int x:3; /* unused bits */
1153 1153
1154} IXJ_FLAGS; 1154} IXJ_FLAGS;
1155 1155
diff --git a/drivers/tty/hvc/hvc_iucv.c b/drivers/tty/hvc/hvc_iucv.c
index c3425bb3a1f6..b6f7d52f7c35 100644
--- a/drivers/tty/hvc/hvc_iucv.c
+++ b/drivers/tty/hvc/hvc_iucv.c
@@ -255,7 +255,7 @@ static int hvc_iucv_write(struct hvc_iucv_private *priv,
255 default: 255 default:
256 written = -EIO; 256 written = -EIO;
257 } 257 }
258 /* remove buffer if an error has occured or received data 258 /* remove buffer if an error has occurred or received data
259 * is not correct */ 259 * is not correct */
260 if (rc || (rb->mbuf->version != MSG_VERSION) || 260 if (rc || (rb->mbuf->version != MSG_VERSION) ||
261 (rb->msg.length != MSG_SIZE(rb->mbuf->datalen))) 261 (rb->msg.length != MSG_SIZE(rb->mbuf->datalen)))
@@ -620,7 +620,7 @@ static void hvc_iucv_hangup(struct hvc_iucv_private *priv)
620 * the index of an struct hvc_iucv_private instance. 620 * the index of an struct hvc_iucv_private instance.
621 * 621 *
622 * This routine notifies the HVC back-end that a tty hangup (carrier loss, 622 * This routine notifies the HVC back-end that a tty hangup (carrier loss,
623 * virtual or otherwise) has occured. 623 * virtual or otherwise) has occurred.
624 * The z/VM IUCV HVC device driver ignores virtual hangups (vhangup()) 624 * The z/VM IUCV HVC device driver ignores virtual hangups (vhangup())
625 * to keep an existing IUCV communication path established. 625 * to keep an existing IUCV communication path established.
626 * (Background: vhangup() is called from user space (by getty or login) to 626 * (Background: vhangup() is called from user space (by getty or login) to
diff --git a/drivers/tty/hvc/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c
index 5e2f52b33327..e6eea1485244 100644
--- a/drivers/tty/hvc/hvc_vio.c
+++ b/drivers/tty/hvc/hvc_vio.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * vio driver interface to hvc_console.c 2 * vio driver interface to hvc_console.c
3 * 3 *
4 * This code was moved here to allow the remaing code to be reused as a 4 * This code was moved here to allow the remaining code to be reused as a
5 * generic polling mode with semi-reliable transport driver core to the 5 * generic polling mode with semi-reliable transport driver core to the
6 * console and tty subsystems. 6 * console and tty subsystems.
7 * 7 *
diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
index bef238f9ffd7..4c8b66546930 100644
--- a/drivers/tty/hvc/hvcs.c
+++ b/drivers/tty/hvc/hvcs.c
@@ -118,7 +118,7 @@
118 * arch/powerepc/include/asm/hvcserver.h 118 * arch/powerepc/include/asm/hvcserver.h
119 * 119 *
120 * 1.3.2 -> 1.3.3 Replaced yield() in hvcs_close() with tty_wait_until_sent() to 120 * 1.3.2 -> 1.3.3 Replaced yield() in hvcs_close() with tty_wait_until_sent() to
121 * prevent possible lockup with realtime scheduling as similarily pointed out by 121 * prevent possible lockup with realtime scheduling as similarly pointed out by
122 * akpm in hvc_console. Changed resulted in the removal of hvcs_final_close() 122 * akpm in hvc_console. Changed resulted in the removal of hvcs_final_close()
123 * to reorder cleanup operations and prevent discarding of pending data during 123 * to reorder cleanup operations and prevent discarding of pending data during
124 * an hvcs_close(). Removed spinlock protection of hvcs_struct data members in 124 * an hvcs_close(). Removed spinlock protection of hvcs_struct data members in
@@ -581,7 +581,7 @@ static void hvcs_try_write(struct hvcs_struct *hvcsd)
581 /* 581 /*
582 * We are still obligated to deliver the data to the 582 * We are still obligated to deliver the data to the
583 * hypervisor even if the tty has been closed because 583 * hypervisor even if the tty has been closed because
584 * we commited to delivering it. But don't try to wake 584 * we committed to delivering it. But don't try to wake
585 * a non-existent tty. 585 * a non-existent tty.
586 */ 586 */
587 if (tty) { 587 if (tty) {
@@ -1349,7 +1349,7 @@ static int hvcs_write(struct tty_struct *tty,
1349 spin_lock_irqsave(&hvcsd->lock, flags); 1349 spin_lock_irqsave(&hvcsd->lock, flags);
1350 1350
1351 /* 1351 /*
1352 * Somehow an open succedded but the device was removed or the 1352 * Somehow an open succeeded but the device was removed or the
1353 * connection terminated between the vty-server and partner vty during 1353 * connection terminated between the vty-server and partner vty during
1354 * the middle of a write operation? This is a crummy place to do this 1354 * the middle of a write operation? This is a crummy place to do this
1355 * but we want to keep it all in the spinlock. 1355 * but we want to keep it all in the spinlock.
@@ -1420,7 +1420,7 @@ static int hvcs_write(struct tty_struct *tty,
1420} 1420}
1421 1421
1422/* 1422/*
1423 * This is really asking how much can we guarentee that we can send or that we 1423 * This is really asking how much can we guarantee that we can send or that we
1424 * absolutely WILL BUFFER if we can't send it. This driver MUST honor the 1424 * absolutely WILL BUFFER if we can't send it. This driver MUST honor the
1425 * return value, hence the reason for hvcs_struct buffering. 1425 * return value, hence the reason for hvcs_struct buffering.
1426 */ 1426 */
diff --git a/drivers/tty/mxser.h b/drivers/tty/mxser.h
index 41878a69203d..0bf794313ffd 100644
--- a/drivers/tty/mxser.h
+++ b/drivers/tty/mxser.h
@@ -113,7 +113,7 @@
113#define MOXA_MUST_IIR_RTO 0x0C 113#define MOXA_MUST_IIR_RTO 0x0C
114#define MOXA_MUST_IIR_LSR 0x06 114#define MOXA_MUST_IIR_LSR 0x06
115 115
116/* recieved Xon/Xoff or specical interrupt pending */ 116/* received Xon/Xoff or specical interrupt pending */
117#define MOXA_MUST_IIR_XSC 0x10 117#define MOXA_MUST_IIR_XSC 0x10
118 118
119/* RTS/CTS change state interrupt pending */ 119/* RTS/CTS change state interrupt pending */
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index 176f63256b37..47f8cdb207f1 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -74,7 +74,7 @@ module_param(debug, int, 0600);
74#endif 74#endif
75 75
76/* 76/*
77 * Semi-arbitary buffer size limits. 0710 is normally run with 32-64 byte 77 * Semi-arbitrary buffer size limits. 0710 is normally run with 32-64 byte
78 * limits so this is plenty 78 * limits so this is plenty
79 */ 79 */
80#define MAX_MRU 512 80#define MAX_MRU 512
@@ -82,7 +82,7 @@ module_param(debug, int, 0600);
82 82
83/* 83/*
84 * Each block of data we have queued to go out is in the form of 84 * Each block of data we have queued to go out is in the form of
85 * a gsm_msg which holds everything we need in a link layer independant 85 * a gsm_msg which holds everything we need in a link layer independent
86 * format 86 * format
87 */ 87 */
88 88
@@ -1193,8 +1193,8 @@ static void gsm_control_message(struct gsm_mux *gsm, unsigned int command,
1193 break; 1193 break;
1194 /* Optional unsupported commands */ 1194 /* Optional unsupported commands */
1195 case CMD_PN: /* Parameter negotiation */ 1195 case CMD_PN: /* Parameter negotiation */
1196 case CMD_RPN: /* Remote port negotation */ 1196 case CMD_RPN: /* Remote port negotiation */
1197 case CMD_SNC: /* Service negotation command */ 1197 case CMD_SNC: /* Service negotiation command */
1198 default: 1198 default:
1199 /* Reply to bad commands with an NSC */ 1199 /* Reply to bad commands with an NSC */
1200 buf[0] = command; 1200 buf[0] = command;
@@ -2026,7 +2026,7 @@ EXPORT_SYMBOL_GPL(gsm_activate_mux);
2026 * @mux: mux to free 2026 * @mux: mux to free
2027 * 2027 *
2028 * Dispose of allocated resources for a dead mux. No refcounting 2028 * Dispose of allocated resources for a dead mux. No refcounting
2029 * at present so the mux must be truely dead. 2029 * at present so the mux must be truly dead.
2030 */ 2030 */
2031void gsm_free_mux(struct gsm_mux *gsm) 2031void gsm_free_mux(struct gsm_mux *gsm)
2032{ 2032{
diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index f4f11164efe5..fd0a98524d51 100644
--- a/drivers/tty/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -1673,7 +1673,7 @@ static void ntty_hangup(struct tty_struct *tty)
1673 1673
1674/* 1674/*
1675 * called when the userspace process writes to the tty (/dev/noz*). 1675 * called when the userspace process writes to the tty (/dev/noz*).
1676 * Data is inserted into a fifo, which is then read and transfered to the modem. 1676 * Data is inserted into a fifo, which is then read and transferred to the modem.
1677 */ 1677 */
1678static int ntty_write(struct tty_struct *tty, const unsigned char *buffer, 1678static int ntty_write(struct tty_struct *tty, const unsigned char *buffer,
1679 int count) 1679 int count)
diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
index 3780da8ad12d..036feeb5e3f6 100644
--- a/drivers/tty/rocket.c
+++ b/drivers/tty/rocket.c
@@ -2060,7 +2060,7 @@ static __init int register_PCI(int i, struct pci_dev *dev)
2060 sClockPrescale = 0x19; 2060 sClockPrescale = 0x19;
2061 rp_baud_base[i] = 230400; 2061 rp_baud_base[i] = 230400;
2062 } else { 2062 } else {
2063 /* mod 4 (devide by 5) prescale */ 2063 /* mod 4 (divide by 5) prescale */
2064 sClockPrescale = 0x14; 2064 sClockPrescale = 0x14;
2065 rp_baud_base[i] = 460800; 2065 rp_baud_base[i] = 460800;
2066 } 2066 }
@@ -2183,7 +2183,7 @@ static int __init init_ISA(int i)
2183 sClockPrescale = 0x19; /* mod 9 (divide by 10) prescale */ 2183 sClockPrescale = 0x19; /* mod 9 (divide by 10) prescale */
2184 rp_baud_base[i] = 230400; 2184 rp_baud_base[i] = 230400;
2185 } else { 2185 } else {
2186 sClockPrescale = 0x14; /* mod 4 (devide by 5) prescale */ 2186 sClockPrescale = 0x14; /* mod 4 (divide by 5) prescale */
2187 rp_baud_base[i] = 460800; 2187 rp_baud_base[i] = 460800;
2188 } 2188 }
2189 2189
diff --git a/drivers/tty/serial/8250.c b/drivers/tty/serial/8250.c
index b3b881bc4712..6611535f4440 100644
--- a/drivers/tty/serial/8250.c
+++ b/drivers/tty/serial/8250.c
@@ -1629,7 +1629,7 @@ static irqreturn_t serial8250_interrupt(int irq, void *dev_id)
1629 up->port.iotype == UPIO_DWAPB32) && 1629 up->port.iotype == UPIO_DWAPB32) &&
1630 (iir & UART_IIR_BUSY) == UART_IIR_BUSY) { 1630 (iir & UART_IIR_BUSY) == UART_IIR_BUSY) {
1631 /* The DesignWare APB UART has an Busy Detect (0x07) 1631 /* The DesignWare APB UART has an Busy Detect (0x07)
1632 * interrupt meaning an LCR write attempt occured while the 1632 * interrupt meaning an LCR write attempt occurred while the
1633 * UART was busy. The interrupt must be cleared by reading 1633 * UART was busy. The interrupt must be cleared by reading
1634 * the UART status register (USR) and the LCR re-written. */ 1634 * the UART status register (USR) and the LCR re-written. */
1635 unsigned int status; 1635 unsigned int status;
diff --git a/drivers/tty/serial/8250_pci.c b/drivers/tty/serial/8250_pci.c
index 8b8930f700b5..738cec9807d3 100644
--- a/drivers/tty/serial/8250_pci.c
+++ b/drivers/tty/serial/8250_pci.c
@@ -433,7 +433,7 @@ static void __devexit sbs_exit(struct pci_dev *dev)
433/* 433/*
434 * SIIG serial cards have an PCI interface chip which also controls 434 * SIIG serial cards have an PCI interface chip which also controls
435 * the UART clocking frequency. Each UART can be clocked independently 435 * the UART clocking frequency. Each UART can be clocked independently
436 * (except cards equiped with 4 UARTs) and initial clocking settings 436 * (except cards equipped with 4 UARTs) and initial clocking settings
437 * are stored in the EEPROM chip. It can cause problems because this 437 * are stored in the EEPROM chip. It can cause problems because this
438 * version of serial driver doesn't support differently clocked UART's 438 * version of serial driver doesn't support differently clocked UART's
439 * on single PCI card. To prevent this, initialization functions set 439 * on single PCI card. To prevent this, initialization functions set
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 57731e870085..6deee4e546be 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -520,7 +520,7 @@ static bool pl011_dma_tx_irq(struct uart_amba_port *uap)
520 520
521 /* 521 /*
522 * We don't have a TX buffer queued, so try to queue one. 522 * We don't have a TX buffer queued, so try to queue one.
523 * If we succesfully queued a buffer, mask the TX IRQ. 523 * If we successfully queued a buffer, mask the TX IRQ.
524 */ 524 */
525 if (pl011_dma_tx_refill(uap) > 0) { 525 if (pl011_dma_tx_refill(uap) > 0) {
526 uap->im &= ~UART011_TXIM; 526 uap->im &= ~UART011_TXIM;
diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c
index 53a468227056..8a869e58f6d7 100644
--- a/drivers/tty/serial/icom.c
+++ b/drivers/tty/serial/icom.c
@@ -1248,7 +1248,7 @@ static void icom_set_termios(struct uart_port *port,
1248 } 1248 }
1249 } 1249 }
1250 1250
1251 /* Enable Transmitter and Reciever */ 1251 /* Enable Transmitter and Receiver */
1252 offset = 1252 offset =
1253 (unsigned long) &ICOM_PORT->statStg->rcv[0] - 1253 (unsigned long) &ICOM_PORT->statStg->rcv[0] -
1254 (unsigned long) ICOM_PORT->statStg; 1254 (unsigned long) ICOM_PORT->statStg;
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index dfcf4b1878aa..cb36b0d4ef3c 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -78,7 +78,7 @@
78#define URXD_FRMERR (1<<12) 78#define URXD_FRMERR (1<<12)
79#define URXD_BRK (1<<11) 79#define URXD_BRK (1<<11)
80#define URXD_PRERR (1<<10) 80#define URXD_PRERR (1<<10)
81#define UCR1_ADEN (1<<15) /* Auto dectect interrupt */ 81#define UCR1_ADEN (1<<15) /* Auto detect interrupt */
82#define UCR1_ADBR (1<<14) /* Auto detect baud rate */ 82#define UCR1_ADBR (1<<14) /* Auto detect baud rate */
83#define UCR1_TRDYEN (1<<13) /* Transmitter ready interrupt enable */ 83#define UCR1_TRDYEN (1<<13) /* Transmitter ready interrupt enable */
84#define UCR1_IDEN (1<<12) /* Idle condition interrupt */ 84#define UCR1_IDEN (1<<12) /* Idle condition interrupt */
diff --git a/drivers/tty/serial/ip22zilog.c b/drivers/tty/serial/ip22zilog.c
index ebff4a1d4bcc..7b1cda59ebb5 100644
--- a/drivers/tty/serial/ip22zilog.c
+++ b/drivers/tty/serial/ip22zilog.c
@@ -375,7 +375,7 @@ static void ip22zilog_transmit_chars(struct uart_ip22zilog_port *up,
375 * be nice to transmit console writes just like we normally would for 375 * be nice to transmit console writes just like we normally would for
376 * a TTY line. (ie. buffered and TX interrupt driven). That is not 376 * a TTY line. (ie. buffered and TX interrupt driven). That is not
377 * easy because console writes cannot sleep. One solution might be 377 * easy because console writes cannot sleep. One solution might be
378 * to poll on enough port->xmit space becomming free. -DaveM 378 * to poll on enough port->xmit space becoming free. -DaveM
379 */ 379 */
380 if (!(status & Tx_BUF_EMP)) 380 if (!(status & Tx_BUF_EMP))
381 return; 381 return;
diff --git a/drivers/tty/serial/jsm/jsm.h b/drivers/tty/serial/jsm/jsm.h
index 38a509c684cd..b704c8ce0d71 100644
--- a/drivers/tty/serial/jsm/jsm.h
+++ b/drivers/tty/serial/jsm/jsm.h
@@ -273,7 +273,7 @@ struct neo_uart_struct {
273 u8 fctr; /* WR FCTR - Feature Control Reg */ 273 u8 fctr; /* WR FCTR - Feature Control Reg */
274 u8 efr; /* WR EFR - Enhanced Function Reg */ 274 u8 efr; /* WR EFR - Enhanced Function Reg */
275 u8 tfifo; /* WR TXCNT/TXTRG - Transmit FIFO Reg */ 275 u8 tfifo; /* WR TXCNT/TXTRG - Transmit FIFO Reg */
276 u8 rfifo; /* WR RXCNT/RXTRG - Recieve FIFO Reg */ 276 u8 rfifo; /* WR RXCNT/RXTRG - Receive FIFO Reg */
277 u8 xoffchar1; /* WR XOFF 1 - XOff Character 1 Reg */ 277 u8 xoffchar1; /* WR XOFF 1 - XOff Character 1 Reg */
278 u8 xoffchar2; /* WR XOFF 2 - XOff Character 2 Reg */ 278 u8 xoffchar2; /* WR XOFF 2 - XOff Character 2 Reg */
279 u8 xonchar1; /* WR XON 1 - Xon Character 1 Reg */ 279 u8 xonchar1; /* WR XON 1 - Xon Character 1 Reg */
diff --git a/drivers/tty/serial/jsm/jsm_neo.c b/drivers/tty/serial/jsm/jsm_neo.c
index 7960d9633c15..4538c3e3646e 100644
--- a/drivers/tty/serial/jsm/jsm_neo.c
+++ b/drivers/tty/serial/jsm/jsm_neo.c
@@ -381,7 +381,7 @@ static void neo_copy_data_from_uart_to_queue(struct jsm_channel *ch)
381 /* Copy data from uart to the queue */ 381 /* Copy data from uart to the queue */
382 memcpy_fromio(ch->ch_rqueue + head, &ch->ch_neo_uart->txrxburst, n); 382 memcpy_fromio(ch->ch_rqueue + head, &ch->ch_neo_uart->txrxburst, n);
383 /* 383 /*
384 * Since RX_FIFO_DATA_ERROR was 0, we are guarenteed 384 * Since RX_FIFO_DATA_ERROR was 0, we are guaranteed
385 * that all the data currently in the FIFO is free of 385 * that all the data currently in the FIFO is free of
386 * breaks and parity/frame/orun errors. 386 * breaks and parity/frame/orun errors.
387 */ 387 */
@@ -1210,7 +1210,7 @@ static irqreturn_t neo_intr(int irq, void *voidbrd)
1210 * Why would I check EVERY possibility of type of 1210 * Why would I check EVERY possibility of type of
1211 * interrupt, when we know its TXRDY??? 1211 * interrupt, when we know its TXRDY???
1212 * Becuz for some reason, even tho we got triggered for TXRDY, 1212 * Becuz for some reason, even tho we got triggered for TXRDY,
1213 * it seems to be occassionally wrong. Instead of TX, which 1213 * it seems to be occasionally wrong. Instead of TX, which
1214 * it should be, I was getting things like RXDY too. Weird. 1214 * it should be, I was getting things like RXDY too. Weird.
1215 */ 1215 */
1216 neo_parse_isr(brd, port); 1216 neo_parse_isr(brd, port);
diff --git a/drivers/tty/serial/max3107.h b/drivers/tty/serial/max3107.h
index 7ab632392502..8415fc723b96 100644
--- a/drivers/tty/serial/max3107.h
+++ b/drivers/tty/serial/max3107.h
@@ -369,7 +369,7 @@ struct max3107_port {
369 struct spi_device *spi; 369 struct spi_device *spi;
370 370
371#if defined(CONFIG_GPIOLIB) 371#if defined(CONFIG_GPIOLIB)
372 /* GPIO chip stucture */ 372 /* GPIO chip structure */
373 struct gpio_chip chip; 373 struct gpio_chip chip;
374#endif 374#endif
375 375
diff --git a/drivers/tty/serial/mrst_max3110.c b/drivers/tty/serial/mrst_max3110.c
index 37e13c3d91d9..2f548af4e98a 100644
--- a/drivers/tty/serial/mrst_max3110.c
+++ b/drivers/tty/serial/mrst_max3110.c
@@ -23,7 +23,7 @@
23 * 1 word. If SPI master controller doesn't support sclk frequency change, 23 * 1 word. If SPI master controller doesn't support sclk frequency change,
24 * then the char need be sent out one by one with some delay 24 * then the char need be sent out one by one with some delay
25 * 25 *
26 * 2. Currently only RX availabe interrrupt is used, no need for waiting TXE 26 * 2. Currently only RX available interrrupt is used, no need for waiting TXE
27 * interrupt for a low speed UART device 27 * interrupt for a low speed UART device
28 */ 28 */
29 29
diff --git a/drivers/tty/serial/mrst_max3110.h b/drivers/tty/serial/mrst_max3110.h
index d1ef43af397c..c37ea48c825a 100644
--- a/drivers/tty/serial/mrst_max3110.h
+++ b/drivers/tty/serial/mrst_max3110.h
@@ -21,7 +21,7 @@
21 21
22#define WC_IRQ_MASK (0xF << 8) 22#define WC_IRQ_MASK (0xF << 8)
23#define WC_TXE_IRQ_ENABLE (1 << 11) /* TX empty irq */ 23#define WC_TXE_IRQ_ENABLE (1 << 11) /* TX empty irq */
24#define WC_RXA_IRQ_ENABLE (1 << 10) /* RX availabe irq */ 24#define WC_RXA_IRQ_ENABLE (1 << 10) /* RX available irq */
25#define WC_PAR_HIGH_IRQ_ENABLE (1 << 9) 25#define WC_PAR_HIGH_IRQ_ENABLE (1 << 9)
26#define WC_REC_ACT_IRQ_ENABLE (1 << 8) 26#define WC_REC_ACT_IRQ_ENABLE (1 << 8)
27 27
diff --git a/drivers/tty/serial/msm_serial_hs.c b/drivers/tty/serial/msm_serial_hs.c
index b906f11f7c1a..624701f8138a 100644
--- a/drivers/tty/serial/msm_serial_hs.c
+++ b/drivers/tty/serial/msm_serial_hs.c
@@ -495,7 +495,7 @@ static void msm_hs_pm(struct uart_port *uport, unsigned int state,
495 * 495 *
496 * Interrupts should be disabled before we are called, as 496 * Interrupts should be disabled before we are called, as
497 * we modify Set Baud rate 497 * we modify Set Baud rate
498 * Set receive stale interrupt level, dependant on Bit Rate 498 * Set receive stale interrupt level, dependent on Bit Rate
499 * Goal is to have around 8 ms before indicate stale. 499 * Goal is to have around 8 ms before indicate stale.
500 * roundup (((Bit Rate * .008) / 10) + 1 500 * roundup (((Bit Rate * .008) / 10) + 1
501 */ 501 */
@@ -1350,7 +1350,7 @@ static irqreturn_t msm_hs_rx_wakeup_isr(int irq, void *dev)
1350 1350
1351 spin_lock_irqsave(&uport->lock, flags); 1351 spin_lock_irqsave(&uport->lock, flags);
1352 if (msm_uport->clk_state == MSM_HS_CLK_OFF) { 1352 if (msm_uport->clk_state == MSM_HS_CLK_OFF) {
1353 /* ignore the first irq - it is a pending irq that occured 1353 /* ignore the first irq - it is a pending irq that occurred
1354 * before enable_irq() */ 1354 * before enable_irq() */
1355 if (msm_uport->rx_wakeup.ignore) 1355 if (msm_uport->rx_wakeup.ignore)
1356 msm_uport->rx_wakeup.ignore = 0; 1356 msm_uport->rx_wakeup.ignore = 0;
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 763537943a53..47cadf474149 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -13,7 +13,7 @@
13 * the Free Software Foundation; either version 2 of the License, or 13 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 14 * (at your option) any later version.
15 * 15 *
16 * Note: This driver is made seperate from 8250 driver as we cannot 16 * Note: This driver is made separate from 8250 driver as we cannot
17 * over load 8250 driver with omap platform specific configuration for 17 * over load 8250 driver with omap platform specific configuration for
18 * features like DMA, it makes easier to implement features like DMA and 18 * features like DMA, it makes easier to implement features like DMA and
19 * hardware flow control and software flow control configuration with 19 * hardware flow control and software flow control configuration with
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index 5b9cde79e4ea..e1c8d4f1ce58 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -330,7 +330,7 @@ static struct tty_struct *pmz_receive_chars(struct uart_pmac_port *uap)
330 * When that happens, I disable the receive side of the driver. 330 * When that happens, I disable the receive side of the driver.
331 * Note that what I've been experiencing is a real irq loop where 331 * Note that what I've been experiencing is a real irq loop where
332 * I'm getting flooded regardless of the actual port speed. 332 * I'm getting flooded regardless of the actual port speed.
333 * Something stange is going on with the HW 333 * Something strange is going on with the HW
334 */ 334 */
335 if ((++loops) > 1000) 335 if ((++loops) > 1000)
336 goto flood; 336 goto flood;
@@ -396,7 +396,7 @@ static void pmz_transmit_chars(struct uart_pmac_port *uap)
396 * be nice to transmit console writes just like we normally would for 396 * be nice to transmit console writes just like we normally would for
397 * a TTY line. (ie. buffered and TX interrupt driven). That is not 397 * a TTY line. (ie. buffered and TX interrupt driven). That is not
398 * easy because console writes cannot sleep. One solution might be 398 * easy because console writes cannot sleep. One solution might be
399 * to poll on enough port->xmit space becomming free. -DaveM 399 * to poll on enough port->xmit space becoming free. -DaveM
400 */ 400 */
401 if (!(status & Tx_BUF_EMP)) 401 if (!(status & Tx_BUF_EMP))
402 return; 402 return;
@@ -809,7 +809,7 @@ static int pmz_set_scc_power(struct uart_pmac_port *uap, int state)
809#endif /* !CONFIG_PPC_PMAC */ 809#endif /* !CONFIG_PPC_PMAC */
810 810
811/* 811/*
812 * FixZeroBug....Works around a bug in the SCC receving channel. 812 * FixZeroBug....Works around a bug in the SCC receiving channel.
813 * Inspired from Darwin code, 15 Sept. 2000 -DanM 813 * Inspired from Darwin code, 15 Sept. 2000 -DanM
814 * 814 *
815 * The following sequence prevents a problem that is seen with O'Hare ASICs 815 * The following sequence prevents a problem that is seen with O'Hare ASICs
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index 2335edafe903..9e2fa8d784e2 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -64,7 +64,7 @@
64#define tx_enabled(port) ((port)->unused[0]) 64#define tx_enabled(port) ((port)->unused[0])
65#define rx_enabled(port) ((port)->unused[1]) 65#define rx_enabled(port) ((port)->unused[1])
66 66
67/* flag to ignore all characters comming in */ 67/* flag to ignore all characters coming in */
68#define RXSTAT_DUMMY_READ (0x10000000) 68#define RXSTAT_DUMMY_READ (0x10000000)
69 69
70static inline struct s3c24xx_uart_port *to_ourport(struct uart_port *port) 70static inline struct s3c24xx_uart_port *to_ourport(struct uart_port *port)
@@ -291,7 +291,7 @@ static irqreturn_t s3c24xx_serial_tx_chars(int irq, void *id)
291 goto out; 291 goto out;
292 } 292 }
293 293
294 /* if there isnt anything more to transmit, or the uart is now 294 /* if there isn't anything more to transmit, or the uart is now
295 * stopped, disable the uart and exit 295 * stopped, disable the uart and exit
296 */ 296 */
297 297
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index eb7958c675a8..a7b083f4ea78 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -812,7 +812,7 @@ static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr)
812} 812}
813 813
814/* 814/*
815 * Here we define a transistion notifier so that we can update all of our 815 * Here we define a transition notifier so that we can update all of our
816 * ports' baud rate when the peripheral clock changes. 816 * ports' baud rate when the peripheral clock changes.
817 */ 817 */
818static int sci_notifier(struct notifier_block *self, 818static int sci_notifier(struct notifier_block *self,
diff --git a/drivers/tty/serial/sn_console.c b/drivers/tty/serial/sn_console.c
index cff9a306660f..377ae74e7154 100644
--- a/drivers/tty/serial/sn_console.c
+++ b/drivers/tty/serial/sn_console.c
@@ -146,7 +146,7 @@ static struct sn_sal_ops intr_ops = {
146}; 146};
147 147
148/* the console does output in two distinctly different ways: 148/* the console does output in two distinctly different ways:
149 * synchronous (raw) and asynchronous (buffered). initally, early_printk 149 * synchronous (raw) and asynchronous (buffered). initially, early_printk
150 * does synchronous output. any data written goes directly to the SAL 150 * does synchronous output. any data written goes directly to the SAL
151 * to be output (incidentally, it is internally buffered by the SAL) 151 * to be output (incidentally, it is internally buffered by the SAL)
152 * after interrupts and timers are initialized and available for use, 152 * after interrupts and timers are initialized and available for use,
@@ -481,7 +481,7 @@ sn_receive_chars(struct sn_cons_port *port, unsigned long flags)
481 while (port->sc_ops->sal_input_pending()) { 481 while (port->sc_ops->sal_input_pending()) {
482 ch = port->sc_ops->sal_getc(); 482 ch = port->sc_ops->sal_getc();
483 if (ch < 0) { 483 if (ch < 0) {
484 printk(KERN_ERR "sn_console: An error occured while " 484 printk(KERN_ERR "sn_console: An error occurred while "
485 "obtaining data from the console (0x%0x)\n", ch); 485 "obtaining data from the console (0x%0x)\n", ch);
486 break; 486 break;
487 } 487 }
diff --git a/drivers/tty/serial/sunzilog.c b/drivers/tty/serial/sunzilog.c
index 99ff9abf57ce..8e916e76b7b5 100644
--- a/drivers/tty/serial/sunzilog.c
+++ b/drivers/tty/serial/sunzilog.c
@@ -474,7 +474,7 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_port *up,
474 * be nice to transmit console writes just like we normally would for 474 * be nice to transmit console writes just like we normally would for
475 * a TTY line. (ie. buffered and TX interrupt driven). That is not 475 * a TTY line. (ie. buffered and TX interrupt driven). That is not
476 * easy because console writes cannot sleep. One solution might be 476 * easy because console writes cannot sleep. One solution might be
477 * to poll on enough port->xmit space becomming free. -DaveM 477 * to poll on enough port->xmit space becoming free. -DaveM
478 */ 478 */
479 if (!(status & Tx_BUF_EMP)) 479 if (!(status & Tx_BUF_EMP))
480 return; 480 return;
diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
index 18888d005a0a..27da23d98e3f 100644
--- a/drivers/tty/synclink.c
+++ b/drivers/tty/synclink.c
@@ -4072,7 +4072,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
4072 4072
4073 if ( request_irq(info->irq_level,mgsl_interrupt,info->irq_flags, 4073 if ( request_irq(info->irq_level,mgsl_interrupt,info->irq_flags,
4074 info->device_name, info ) < 0 ) { 4074 info->device_name, info ) < 0 ) {
4075 printk( "%s(%d):Cant request interrupt on device %s IRQ=%d\n", 4075 printk( "%s(%d):Can't request interrupt on device %s IRQ=%d\n",
4076 __FILE__,__LINE__,info->device_name, info->irq_level ); 4076 __FILE__,__LINE__,info->device_name, info->irq_level );
4077 goto errout; 4077 goto errout;
4078 } 4078 }
@@ -4095,7 +4095,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
4095 info->memory_base = ioremap_nocache(info->phys_memory_base, 4095 info->memory_base = ioremap_nocache(info->phys_memory_base,
4096 0x40000); 4096 0x40000);
4097 if (!info->memory_base) { 4097 if (!info->memory_base) {
4098 printk( "%s(%d):Cant map shared memory on device %s MemAddr=%08X\n", 4098 printk( "%s(%d):Can't map shared memory on device %s MemAddr=%08X\n",
4099 __FILE__,__LINE__,info->device_name, info->phys_memory_base ); 4099 __FILE__,__LINE__,info->device_name, info->phys_memory_base );
4100 goto errout; 4100 goto errout;
4101 } 4101 }
@@ -4109,7 +4109,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
4109 info->lcr_base = ioremap_nocache(info->phys_lcr_base, 4109 info->lcr_base = ioremap_nocache(info->phys_lcr_base,
4110 PAGE_SIZE); 4110 PAGE_SIZE);
4111 if (!info->lcr_base) { 4111 if (!info->lcr_base) {
4112 printk( "%s(%d):Cant map LCR memory on device %s MemAddr=%08X\n", 4112 printk( "%s(%d):Can't map LCR memory on device %s MemAddr=%08X\n",
4113 __FILE__,__LINE__,info->device_name, info->phys_lcr_base ); 4113 __FILE__,__LINE__,info->device_name, info->phys_lcr_base );
4114 goto errout; 4114 goto errout;
4115 } 4115 }
@@ -4119,7 +4119,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
4119 /* claim DMA channel */ 4119 /* claim DMA channel */
4120 4120
4121 if (request_dma(info->dma_level,info->device_name) < 0){ 4121 if (request_dma(info->dma_level,info->device_name) < 0){
4122 printk( "%s(%d):Cant request DMA channel on device %s DMA=%d\n", 4122 printk( "%s(%d):Can't request DMA channel on device %s DMA=%d\n",
4123 __FILE__,__LINE__,info->device_name, info->dma_level ); 4123 __FILE__,__LINE__,info->device_name, info->dma_level );
4124 mgsl_release_resources( info ); 4124 mgsl_release_resources( info );
4125 return -ENODEV; 4125 return -ENODEV;
@@ -4132,7 +4132,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
4132 } 4132 }
4133 4133
4134 if ( mgsl_allocate_dma_buffers(info) < 0 ) { 4134 if ( mgsl_allocate_dma_buffers(info) < 0 ) {
4135 printk( "%s(%d):Cant allocate DMA buffers on device %s DMA=%d\n", 4135 printk( "%s(%d):Can't allocate DMA buffers on device %s DMA=%d\n",
4136 __FILE__,__LINE__,info->device_name, info->dma_level ); 4136 __FILE__,__LINE__,info->device_name, info->dma_level );
4137 goto errout; 4137 goto errout;
4138 } 4138 }
diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
index a35dd549a008..18b48cd3b41d 100644
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -3491,7 +3491,7 @@ static int claim_resources(struct slgt_info *info)
3491 3491
3492 info->reg_addr = ioremap_nocache(info->phys_reg_addr, SLGT_REG_SIZE); 3492 info->reg_addr = ioremap_nocache(info->phys_reg_addr, SLGT_REG_SIZE);
3493 if (!info->reg_addr) { 3493 if (!info->reg_addr) {
3494 DBGERR(("%s cant map device registers, addr=%08X\n", 3494 DBGERR(("%s can't map device registers, addr=%08X\n",
3495 info->device_name, info->phys_reg_addr)); 3495 info->device_name, info->phys_reg_addr));
3496 info->init_error = DiagStatus_CantAssignPciResources; 3496 info->init_error = DiagStatus_CantAssignPciResources;
3497 goto errout; 3497 goto errout;
diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
index 327343694473..c77831c7675a 100644
--- a/drivers/tty/synclinkmp.c
+++ b/drivers/tty/synclinkmp.c
@@ -3595,7 +3595,7 @@ static int claim_resources(SLMP_INFO *info)
3595 info->memory_base = ioremap_nocache(info->phys_memory_base, 3595 info->memory_base = ioremap_nocache(info->phys_memory_base,
3596 SCA_MEM_SIZE); 3596 SCA_MEM_SIZE);
3597 if (!info->memory_base) { 3597 if (!info->memory_base) {
3598 printk( "%s(%d):%s Cant map shared memory, MemAddr=%08X\n", 3598 printk( "%s(%d):%s Can't map shared memory, MemAddr=%08X\n",
3599 __FILE__,__LINE__,info->device_name, info->phys_memory_base ); 3599 __FILE__,__LINE__,info->device_name, info->phys_memory_base );
3600 info->init_error = DiagStatus_CantAssignPciResources; 3600 info->init_error = DiagStatus_CantAssignPciResources;
3601 goto errout; 3601 goto errout;
@@ -3603,7 +3603,7 @@ static int claim_resources(SLMP_INFO *info)
3603 3603
3604 info->lcr_base = ioremap_nocache(info->phys_lcr_base, PAGE_SIZE); 3604 info->lcr_base = ioremap_nocache(info->phys_lcr_base, PAGE_SIZE);
3605 if (!info->lcr_base) { 3605 if (!info->lcr_base) {
3606 printk( "%s(%d):%s Cant map LCR memory, MemAddr=%08X\n", 3606 printk( "%s(%d):%s Can't map LCR memory, MemAddr=%08X\n",
3607 __FILE__,__LINE__,info->device_name, info->phys_lcr_base ); 3607 __FILE__,__LINE__,info->device_name, info->phys_lcr_base );
3608 info->init_error = DiagStatus_CantAssignPciResources; 3608 info->init_error = DiagStatus_CantAssignPciResources;
3609 goto errout; 3609 goto errout;
@@ -3612,7 +3612,7 @@ static int claim_resources(SLMP_INFO *info)
3612 3612
3613 info->sca_base = ioremap_nocache(info->phys_sca_base, PAGE_SIZE); 3613 info->sca_base = ioremap_nocache(info->phys_sca_base, PAGE_SIZE);
3614 if (!info->sca_base) { 3614 if (!info->sca_base) {
3615 printk( "%s(%d):%s Cant map SCA memory, MemAddr=%08X\n", 3615 printk( "%s(%d):%s Can't map SCA memory, MemAddr=%08X\n",
3616 __FILE__,__LINE__,info->device_name, info->phys_sca_base ); 3616 __FILE__,__LINE__,info->device_name, info->phys_sca_base );
3617 info->init_error = DiagStatus_CantAssignPciResources; 3617 info->init_error = DiagStatus_CantAssignPciResources;
3618 goto errout; 3618 goto errout;
@@ -3622,7 +3622,7 @@ static int claim_resources(SLMP_INFO *info)
3622 info->statctrl_base = ioremap_nocache(info->phys_statctrl_base, 3622 info->statctrl_base = ioremap_nocache(info->phys_statctrl_base,
3623 PAGE_SIZE); 3623 PAGE_SIZE);
3624 if (!info->statctrl_base) { 3624 if (!info->statctrl_base) {
3625 printk( "%s(%d):%s Cant map SCA Status/Control memory, MemAddr=%08X\n", 3625 printk( "%s(%d):%s Can't map SCA Status/Control memory, MemAddr=%08X\n",
3626 __FILE__,__LINE__,info->device_name, info->phys_statctrl_base ); 3626 __FILE__,__LINE__,info->device_name, info->phys_statctrl_base );
3627 info->init_error = DiagStatus_CantAssignPciResources; 3627 info->init_error = DiagStatus_CantAssignPciResources;
3628 goto errout; 3628 goto errout;
@@ -3869,7 +3869,7 @@ static void device_init(int adapter_num, struct pci_dev *pdev)
3869 port_array[0]->irq_flags, 3869 port_array[0]->irq_flags,
3870 port_array[0]->device_name, 3870 port_array[0]->device_name,
3871 port_array[0]) < 0 ) { 3871 port_array[0]) < 0 ) {
3872 printk( "%s(%d):%s Cant request interrupt, IRQ=%d\n", 3872 printk( "%s(%d):%s Can't request interrupt, IRQ=%d\n",
3873 __FILE__,__LINE__, 3873 __FILE__,__LINE__,
3874 port_array[0]->device_name, 3874 port_array[0]->device_name,
3875 port_array[0]->irq_level ); 3875 port_array[0]->irq_level );
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 936a4ead6c21..d7d50b48287e 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -2134,7 +2134,7 @@ done:
2134 * actually has driver level meaning and triggers a VC resize. 2134 * actually has driver level meaning and triggers a VC resize.
2135 * 2135 *
2136 * Locking: 2136 * Locking:
2137 * Driver dependant. The default do_resize method takes the 2137 * Driver dependent. The default do_resize method takes the
2138 * tty termios mutex and ctrl_lock. The console takes its own lock 2138 * tty termios mutex and ctrl_lock. The console takes its own lock
2139 * then calls into the default method. 2139 * then calls into the default method.
2140 */ 2140 */
@@ -2155,7 +2155,7 @@ static int tiocswinsz(struct tty_struct *tty, struct winsize __user *arg)
2155 * tioccons - allow admin to move logical console 2155 * tioccons - allow admin to move logical console
2156 * @file: the file to become console 2156 * @file: the file to become console
2157 * 2157 *
2158 * Allow the adminstrator to move the redirected console device 2158 * Allow the administrator to move the redirected console device
2159 * 2159 *
2160 * Locking: uses redirect_lock to guard the redirect information 2160 * Locking: uses redirect_lock to guard the redirect information
2161 */ 2161 */
@@ -2290,7 +2290,7 @@ EXPORT_SYMBOL_GPL(tty_get_pgrp);
2290/** 2290/**
2291 * tiocgpgrp - get process group 2291 * tiocgpgrp - get process group
2292 * @tty: tty passed by user 2292 * @tty: tty passed by user
2293 * @real_tty: tty side of the tty pased by the user if a pty else the tty 2293 * @real_tty: tty side of the tty passed by the user if a pty else the tty
2294 * @p: returned pid 2294 * @p: returned pid
2295 * 2295 *
2296 * Obtain the process group of the tty. If there is no process group 2296 * Obtain the process group of the tty. If there is no process group
@@ -2367,7 +2367,7 @@ out_unlock:
2367/** 2367/**
2368 * tiocgsid - get session id 2368 * tiocgsid - get session id
2369 * @tty: tty passed by user 2369 * @tty: tty passed by user
2370 * @real_tty: tty side of the tty pased by the user if a pty else the tty 2370 * @real_tty: tty side of the tty passed by the user if a pty else the tty
2371 * @p: pointer to returned session id 2371 * @p: pointer to returned session id
2372 * 2372 *
2373 * Obtain the session id of the tty. If there is no session 2373 * Obtain the session id of the tty. If there is no session
diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c
index 1a1135d580a2..21574cb32343 100644
--- a/drivers/tty/tty_ioctl.c
+++ b/drivers/tty/tty_ioctl.c
@@ -247,7 +247,7 @@ speed_t tty_termios_baud_rate(struct ktermios *termios)
247 cbaud = termios->c_cflag & CBAUD; 247 cbaud = termios->c_cflag & CBAUD;
248 248
249#ifdef BOTHER 249#ifdef BOTHER
250 /* Magic token for arbitary speed via c_ispeed/c_ospeed */ 250 /* Magic token for arbitrary speed via c_ispeed/c_ospeed */
251 if (cbaud == BOTHER) 251 if (cbaud == BOTHER)
252 return termios->c_ospeed; 252 return termios->c_ospeed;
253#endif 253#endif
@@ -283,7 +283,7 @@ speed_t tty_termios_input_baud_rate(struct ktermios *termios)
283 if (cbaud == B0) 283 if (cbaud == B0)
284 return tty_termios_baud_rate(termios); 284 return tty_termios_baud_rate(termios);
285 285
286 /* Magic token for arbitary speed via c_ispeed*/ 286 /* Magic token for arbitrary speed via c_ispeed*/
287 if (cbaud == BOTHER) 287 if (cbaud == BOTHER)
288 return termios->c_ispeed; 288 return termios->c_ispeed;
289 289
@@ -449,7 +449,7 @@ EXPORT_SYMBOL(tty_get_baud_rate);
449 * @new: New termios 449 * @new: New termios
450 * @old: Old termios 450 * @old: Old termios
451 * 451 *
452 * Propogate the hardware specific terminal setting bits from 452 * Propagate the hardware specific terminal setting bits from
453 * the old termios structure to the new one. This is used in cases 453 * the old termios structure to the new one. This is used in cases
454 * where the hardware does not support reconfiguration or as a helper 454 * where the hardware does not support reconfiguration or as a helper
455 * in some cases where only minimal reconfiguration is supported 455 * in some cases where only minimal reconfiguration is supported
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index c83cdfb56fcc..4bea1efaec98 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -3963,7 +3963,7 @@ void reset_palette(struct vc_data *vc)
3963 * of 32 pixels. Userspace fontdata is stored with 32 bytes (shorts/ints, 3963 * of 32 pixels. Userspace fontdata is stored with 32 bytes (shorts/ints,
3964 * depending on width) reserved for each character which is kinda wasty, but 3964 * depending on width) reserved for each character which is kinda wasty, but
3965 * this is done in order to maintain compatibility with the EGA/VGA fonts. It 3965 * this is done in order to maintain compatibility with the EGA/VGA fonts. It
3966 * is upto the actual low-level console-driver convert data into its favorite 3966 * is up to the actual low-level console-driver convert data into its favorite
3967 * format (maybe we should add a `fontoffset' field to the `display' 3967 * format (maybe we should add a `fontoffset' field to the `display'
3968 * structure so we won't have to convert the fontdata all the time. 3968 * structure so we won't have to convert the fontdata all the time.
3969 * /Jes 3969 * /Jes
diff --git a/drivers/uio/uio_pruss.c b/drivers/uio/uio_pruss.c
index daf6e77de2b1..e67b566e7aa3 100644
--- a/drivers/uio/uio_pruss.c
+++ b/drivers/uio/uio_pruss.c
@@ -39,7 +39,7 @@ module_param(extram_pool_sz, int, 0);
39MODULE_PARM_DESC(extram_pool_sz, "external ram pool size to allocate"); 39MODULE_PARM_DESC(extram_pool_sz, "external ram pool size to allocate");
40 40
41/* 41/*
42 * Host event IRQ numbers from PRUSS - PRUSS can generate upto 8 interrupt 42 * Host event IRQ numbers from PRUSS - PRUSS can generate up to 8 interrupt
43 * events to AINTC of ARM host processor - which can be used for IPC b/w PRUSS 43 * events to AINTC of ARM host processor - which can be used for IPC b/w PRUSS
44 * firmware and user space application, async notification from PRU firmware 44 * firmware and user space application, async notification from PRU firmware
45 * to user space application 45 * to user space application
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index b268e9fccb47..e71521ce3010 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -1283,7 +1283,7 @@ static void uea_set_bulk_timeout(struct uea_softc *sc, u32 dsrate)
1283 1283
1284 /* in bulk mode the modem have problem with high rate 1284 /* in bulk mode the modem have problem with high rate
1285 * changing internal timing could improve things, but the 1285 * changing internal timing could improve things, but the
1286 * value is misterious. 1286 * value is mysterious.
1287 * ADI930 don't support it (-EPIPE error). 1287 * ADI930 don't support it (-EPIPE error).
1288 */ 1288 */
1289 1289
@@ -1743,7 +1743,7 @@ static int uea_send_cmvs_e1(struct uea_softc *sc)
1743 goto out; 1743 goto out;
1744 } 1744 }
1745 } else { 1745 } else {
1746 /* This realy should not happen */ 1746 /* This really should not happen */
1747 uea_err(INS_TO_USBDEV(sc), "bad cmvs version %d\n", ver); 1747 uea_err(INS_TO_USBDEV(sc), "bad cmvs version %d\n", ver);
1748 goto out; 1748 goto out;
1749 } 1749 }
@@ -1798,7 +1798,7 @@ static int uea_send_cmvs_e4(struct uea_softc *sc)
1798 goto out; 1798 goto out;
1799 } 1799 }
1800 } else { 1800 } else {
1801 /* This realy should not happen */ 1801 /* This really should not happen */
1802 uea_err(INS_TO_USBDEV(sc), "bad cmvs version %d\n", ver); 1802 uea_err(INS_TO_USBDEV(sc), "bad cmvs version %d\n", ver);
1803 goto out; 1803 goto out;
1804 } 1804 }
@@ -1829,7 +1829,7 @@ static int uea_start_reset(struct uea_softc *sc)
1829 1829
1830 /* mask interrupt */ 1830 /* mask interrupt */
1831 sc->booting = 1; 1831 sc->booting = 1;
1832 /* We need to set this here because, a ack timeout could have occured, 1832 /* We need to set this here because, a ack timeout could have occurred,
1833 * but before we start the reboot, the ack occurs and set this to 1. 1833 * but before we start the reboot, the ack occurs and set this to 1.
1834 * So we will failed to wait Ready CMV. 1834 * So we will failed to wait Ready CMV.
1835 */ 1835 */
diff --git a/drivers/usb/c67x00/c67x00-drv.c b/drivers/usb/c67x00/c67x00-drv.c
index b6d49234e521..62050f7a4f97 100644
--- a/drivers/usb/c67x00/c67x00-drv.c
+++ b/drivers/usb/c67x00/c67x00-drv.c
@@ -27,7 +27,7 @@
27 * the link between the common hardware parts and the subdrivers (e.g. 27 * the link between the common hardware parts and the subdrivers (e.g.
28 * interrupt handling). 28 * interrupt handling).
29 * 29 *
30 * The c67x00 has 2 SIE's (serial interface engine) wich can be configured 30 * The c67x00 has 2 SIE's (serial interface engine) which can be configured
31 * to be host, device or OTG (with some limitations, E.G. only SIE1 can be OTG). 31 * to be host, device or OTG (with some limitations, E.G. only SIE1 can be OTG).
32 * 32 *
33 * Depending on the platform configuration, the SIE's are created and 33 * Depending on the platform configuration, the SIE's are created and
diff --git a/drivers/usb/c67x00/c67x00-hcd.h b/drivers/usb/c67x00/c67x00-hcd.h
index 74e44621e313..e3d493d4d61a 100644
--- a/drivers/usb/c67x00/c67x00-hcd.h
+++ b/drivers/usb/c67x00/c67x00-hcd.h
@@ -34,7 +34,7 @@
34/* 34/*
35 * The following parameters depend on the CPU speed, bus speed, ... 35 * The following parameters depend on the CPU speed, bus speed, ...
36 * These can be tuned for specific use cases, e.g. if isochronous transfers 36 * These can be tuned for specific use cases, e.g. if isochronous transfers
37 * are very important, bandwith can be sacrificed to guarantee that the 37 * are very important, bandwidth can be sacrificed to guarantee that the
38 * 1ms deadline will be met. 38 * 1ms deadline will be met.
39 * If bulk transfers are important, the MAX_FRAME_BW can be increased, 39 * If bulk transfers are important, the MAX_FRAME_BW can be increased,
40 * but some (or many) isochronous deadlines might not be met. 40 * but some (or many) isochronous deadlines might not be met.
diff --git a/drivers/usb/c67x00/c67x00-sched.c b/drivers/usb/c67x00/c67x00-sched.c
index f6b3c253f3fa..a03fbc15fa9c 100644
--- a/drivers/usb/c67x00/c67x00-sched.c
+++ b/drivers/usb/c67x00/c67x00-sched.c
@@ -907,7 +907,7 @@ static inline int c67x00_end_of_data(struct c67x00_td *td)
907 907
908/* Remove all td's from the list which come 908/* Remove all td's from the list which come
909 * after last_td and are meant for the same pipe. 909 * after last_td and are meant for the same pipe.
910 * This is used when a short packet has occured */ 910 * This is used when a short packet has occurred */
911static inline void c67x00_clear_pipe(struct c67x00_hcd *c67x00, 911static inline void c67x00_clear_pipe(struct c67x00_hcd *c67x00,
912 struct c67x00_td *last_td) 912 struct c67x00_td *last_td)
913{ 913{
diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h
index 5eeb570b9a61..b4ea54dbf323 100644
--- a/drivers/usb/class/cdc-acm.h
+++ b/drivers/usb/class/cdc-acm.h
@@ -52,7 +52,7 @@
52 */ 52 */
53 53
54/* 54/*
55 * The only reason to have several buffers is to accomodate assumptions 55 * The only reason to have several buffers is to accommodate assumptions
56 * in line disciplines. They ask for empty space amount, receive our URB size, 56 * in line disciplines. They ask for empty space amount, receive our URB size,
57 * and proceed to issue several 1-character writes, assuming they will fit. 57 * and proceed to issue several 1-character writes, assuming they will fit.
58 * The very first write takes a complete URB. Fortunately, this only happens 58 * The very first write takes a complete URB. Fortunately, this only happens
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 6a54634ab823..385acb895ab3 100644
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -483,7 +483,7 @@ static ssize_t usbtmc_read(struct file *filp, char __user *buf,
483 } 483 }
484 484
485 done += n_characters; 485 done += n_characters;
486 /* Terminate if end-of-message bit recieved from device */ 486 /* Terminate if end-of-message bit received from device */
487 if ((buffer[8] & 0x01) && (actual >= n_characters + 12)) 487 if ((buffer[8] & 0x01) && (actual >= n_characters + 12))
488 remaining = 0; 488 remaining = 0;
489 else 489 else
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 02b4dbfa488a..8eed05d23838 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -700,7 +700,7 @@ void usb_hcd_poll_rh_status(struct usb_hcd *hcd)
700 /* The USB 2.0 spec says 256 ms. This is close enough and won't 700 /* The USB 2.0 spec says 256 ms. This is close enough and won't
701 * exceed that limit if HZ is 100. The math is more clunky than 701 * exceed that limit if HZ is 100. The math is more clunky than
702 * maybe expected, this is to make sure that all timers for USB devices 702 * maybe expected, this is to make sure that all timers for USB devices
703 * fire at the same time to give the CPU a break inbetween */ 703 * fire at the same time to give the CPU a break in between */
704 if (hcd->uses_new_polling ? HCD_POLL_RH(hcd) : 704 if (hcd->uses_new_polling ? HCD_POLL_RH(hcd) :
705 (length == 0 && hcd->status_urb != NULL)) 705 (length == 0 && hcd->status_urb != NULL))
706 mod_timer (&hcd->rh_timer, (jiffies/(HZ/4) + 1) * (HZ/4)); 706 mod_timer (&hcd->rh_timer, (jiffies/(HZ/4) + 1) * (HZ/4));
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 564eaa5525d7..8fb754916c67 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1649,7 +1649,7 @@ void usb_disconnect(struct usb_device **pdev)
1649 1649
1650 /* mark the device as inactive, so any further urb submissions for 1650 /* mark the device as inactive, so any further urb submissions for
1651 * this device (and any of its children) will fail immediately. 1651 * this device (and any of its children) will fail immediately.
1652 * this quiesces everyting except pending urbs. 1652 * this quiesces everything except pending urbs.
1653 */ 1653 */
1654 usb_set_device_state(udev, USB_STATE_NOTATTACHED); 1654 usb_set_device_state(udev, USB_STATE_NOTATTACHED);
1655 dev_info(&udev->dev, "USB disconnect, device number %d\n", 1655 dev_info(&udev->dev, "USB disconnect, device number %d\n",
diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
index 0bc06e2bcfcb..a6a350f5827b 100644
--- a/drivers/usb/early/ehci-dbgp.c
+++ b/drivers/usb/early/ehci-dbgp.c
@@ -648,7 +648,7 @@ static int ehci_reset_port(int port)
648 if (!(portsc & PORT_CONNECT)) 648 if (!(portsc & PORT_CONNECT))
649 return -ENOTCONN; 649 return -ENOTCONN;
650 650
651 /* bomb out completely if something weird happend */ 651 /* bomb out completely if something weird happened */
652 if ((portsc & PORT_CSC)) 652 if ((portsc & PORT_CSC))
653 return -EINVAL; 653 return -EINVAL;
654 654
diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
index f8dd7269d79c..6e42aab75806 100644
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@ -278,7 +278,7 @@ static int udc_enable_dev_setup_interrupts(struct udc *dev)
278 return 0; 278 return 0;
279} 279}
280 280
281/* Calculates fifo start of endpoint based on preceeding endpoints */ 281/* Calculates fifo start of endpoint based on preceding endpoints */
282static int udc_set_txfifo_addr(struct udc_ep *ep) 282static int udc_set_txfifo_addr(struct udc_ep *ep)
283{ 283{
284 struct udc *dev; 284 struct udc *dev;
@@ -2137,7 +2137,7 @@ static irqreturn_t udc_data_out_isr(struct udc *dev, int ep_ix)
2137 if (use_dma) { 2137 if (use_dma) {
2138 /* BNA event ? */ 2138 /* BNA event ? */
2139 if (tmp & AMD_BIT(UDC_EPSTS_BNA)) { 2139 if (tmp & AMD_BIT(UDC_EPSTS_BNA)) {
2140 DBG(dev, "BNA ep%dout occured - DESPTR = %x \n", 2140 DBG(dev, "BNA ep%dout occurred - DESPTR = %x \n",
2141 ep->num, readl(&ep->regs->desptr)); 2141 ep->num, readl(&ep->regs->desptr));
2142 /* clear BNA */ 2142 /* clear BNA */
2143 writel(tmp | AMD_BIT(UDC_EPSTS_BNA), &ep->regs->sts); 2143 writel(tmp | AMD_BIT(UDC_EPSTS_BNA), &ep->regs->sts);
@@ -2151,7 +2151,7 @@ static irqreturn_t udc_data_out_isr(struct udc *dev, int ep_ix)
2151 } 2151 }
2152 /* HE event ? */ 2152 /* HE event ? */
2153 if (tmp & AMD_BIT(UDC_EPSTS_HE)) { 2153 if (tmp & AMD_BIT(UDC_EPSTS_HE)) {
2154 dev_err(&dev->pdev->dev, "HE ep%dout occured\n", ep->num); 2154 dev_err(&dev->pdev->dev, "HE ep%dout occurred\n", ep->num);
2155 2155
2156 /* clear HE */ 2156 /* clear HE */
2157 writel(tmp | AMD_BIT(UDC_EPSTS_HE), &ep->regs->sts); 2157 writel(tmp | AMD_BIT(UDC_EPSTS_HE), &ep->regs->sts);
@@ -2354,7 +2354,7 @@ static irqreturn_t udc_data_in_isr(struct udc *dev, int ep_ix)
2354 /* BNA ? */ 2354 /* BNA ? */
2355 if (epsts & AMD_BIT(UDC_EPSTS_BNA)) { 2355 if (epsts & AMD_BIT(UDC_EPSTS_BNA)) {
2356 dev_err(&dev->pdev->dev, 2356 dev_err(&dev->pdev->dev,
2357 "BNA ep%din occured - DESPTR = %08lx \n", 2357 "BNA ep%din occurred - DESPTR = %08lx \n",
2358 ep->num, 2358 ep->num,
2359 (unsigned long) readl(&ep->regs->desptr)); 2359 (unsigned long) readl(&ep->regs->desptr));
2360 2360
@@ -2367,7 +2367,7 @@ static irqreturn_t udc_data_in_isr(struct udc *dev, int ep_ix)
2367 /* HE event ? */ 2367 /* HE event ? */
2368 if (epsts & AMD_BIT(UDC_EPSTS_HE)) { 2368 if (epsts & AMD_BIT(UDC_EPSTS_HE)) {
2369 dev_err(&dev->pdev->dev, 2369 dev_err(&dev->pdev->dev,
2370 "HE ep%dn occured - DESPTR = %08lx \n", 2370 "HE ep%dn occurred - DESPTR = %08lx \n",
2371 ep->num, (unsigned long) readl(&ep->regs->desptr)); 2371 ep->num, (unsigned long) readl(&ep->regs->desptr));
2372 2372
2373 /* clear HE */ 2373 /* clear HE */
@@ -2384,7 +2384,7 @@ static irqreturn_t udc_data_in_isr(struct udc *dev, int ep_ix)
2384 req = list_entry(ep->queue.next, 2384 req = list_entry(ep->queue.next,
2385 struct udc_request, queue); 2385 struct udc_request, queue);
2386 /* 2386 /*
2387 * length bytes transfered 2387 * length bytes transferred
2388 * check dma done of last desc. in PPBDU mode 2388 * check dma done of last desc. in PPBDU mode
2389 */ 2389 */
2390 if (use_dma_ppb_du) { 2390 if (use_dma_ppb_du) {
@@ -2784,7 +2784,7 @@ static irqreturn_t udc_control_in_isr(struct udc *dev)
2784 /* write fifo */ 2784 /* write fifo */
2785 udc_txfifo_write(ep, &req->req); 2785 udc_txfifo_write(ep, &req->req);
2786 2786
2787 /* lengh bytes transfered */ 2787 /* lengh bytes transferred */
2788 len = req->req.length - req->req.actual; 2788 len = req->req.length - req->req.actual;
2789 if (len > ep->ep.maxpacket) 2789 if (len > ep->ep.maxpacket)
2790 len = ep->ep.maxpacket; 2790 len = ep->ep.maxpacket;
diff --git a/drivers/usb/gadget/amd5536udc.h b/drivers/usb/gadget/amd5536udc.h
index 4bbabbbfc93f..1d1c7543468e 100644
--- a/drivers/usb/gadget/amd5536udc.h
+++ b/drivers/usb/gadget/amd5536udc.h
@@ -584,7 +584,7 @@ union udc_setup_data {
584 * SET and GET bitfields in u32 values 584 * SET and GET bitfields in u32 values
585 * via constants for mask/offset: 585 * via constants for mask/offset:
586 * <bit_field_stub_name> is the text between 586 * <bit_field_stub_name> is the text between
587 * UDC_ and _MASK|_OFS of appropiate 587 * UDC_ and _MASK|_OFS of appropriate
588 * constant 588 * constant
589 * 589 *
590 * set bitfield value in u32 u32Val 590 * set bitfield value in u32 u32Val
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index bb8ddf0469f9..9b7cdb16f26b 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -826,7 +826,7 @@ done:
826 return status; 826 return status;
827} 827}
828 828
829/* reinit == restore inital software state */ 829/* reinit == restore initial software state */
830static void udc_reinit(struct at91_udc *udc) 830static void udc_reinit(struct at91_udc *udc)
831{ 831{
832 u32 i; 832 u32 i;
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index c2251c40a205..82314ed22506 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -42,7 +42,7 @@
42static struct usb_composite_driver *composite; 42static struct usb_composite_driver *composite;
43static int (*composite_gadget_bind)(struct usb_composite_dev *cdev); 43static int (*composite_gadget_bind)(struct usb_composite_dev *cdev);
44 44
45/* Some systems will need runtime overrides for the product identifers 45/* Some systems will need runtime overrides for the product identifiers
46 * published in the device descriptor, either numbers or strings or both. 46 * published in the device descriptor, either numbers or strings or both.
47 * String parameters are in UTF-8 (superset of ASCII's 7 bit characters). 47 * String parameters are in UTF-8 (superset of ASCII's 7 bit characters).
48 */ 48 */
@@ -205,14 +205,14 @@ int usb_function_activate(struct usb_function *function)
205 * usb_interface_id() is called from usb_function.bind() callbacks to 205 * usb_interface_id() is called from usb_function.bind() callbacks to
206 * allocate new interface IDs. The function driver will then store that 206 * allocate new interface IDs. The function driver will then store that
207 * ID in interface, association, CDC union, and other descriptors. It 207 * ID in interface, association, CDC union, and other descriptors. It
208 * will also handle any control requests targetted at that interface, 208 * will also handle any control requests targeted at that interface,
209 * particularly changing its altsetting via set_alt(). There may 209 * particularly changing its altsetting via set_alt(). There may
210 * also be class-specific or vendor-specific requests to handle. 210 * also be class-specific or vendor-specific requests to handle.
211 * 211 *
212 * All interface identifier should be allocated using this routine, to 212 * All interface identifier should be allocated using this routine, to
213 * ensure that for example different functions don't wrongly assign 213 * ensure that for example different functions don't wrongly assign
214 * different meanings to the same identifier. Note that since interface 214 * different meanings to the same identifier. Note that since interface
215 * identifers are configuration-specific, functions used in more than 215 * identifiers are configuration-specific, functions used in more than
216 * one configuration (or more than once in a given configuration) need 216 * one configuration (or more than once in a given configuration) need
217 * multiple versions of the relevant descriptors. 217 * multiple versions of the relevant descriptors.
218 * 218 *
diff --git a/drivers/usb/gadget/f_audio.c b/drivers/usb/gadget/f_audio.c
index 00975ed903d1..9abecfddb27d 100644
--- a/drivers/usb/gadget/f_audio.c
+++ b/drivers/usb/gadget/f_audio.c
@@ -742,7 +742,7 @@ int __init control_selector_init(struct f_audio *audio)
742} 742}
743 743
744/** 744/**
745 * audio_bind_config - add USB audio fucntion to a configuration 745 * audio_bind_config - add USB audio function to a configuration
746 * @c: the configuration to supcard the USB audio function 746 * @c: the configuration to supcard the USB audio function
747 * Context: single threaded during gadget setup 747 * Context: single threaded during gadget setup
748 * 748 *
diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
index 130eee678c8b..86902a60bcdb 100644
--- a/drivers/usb/gadget/f_ncm.c
+++ b/drivers/usb/gadget/f_ncm.c
@@ -111,7 +111,7 @@ static inline unsigned ncm_bitrate(struct usb_gadget *g)
111#define NTB_OUT_SIZE 16384 111#define NTB_OUT_SIZE 16384
112 112
113/* 113/*
114 * skbs of size less than that will not be alligned 114 * skbs of size less than that will not be aligned
115 * to NCM's dwNtbInMaxSize to save bus bandwidth 115 * to NCM's dwNtbInMaxSize to save bus bandwidth
116 */ 116 */
117 117
diff --git a/drivers/usb/gadget/fsl_qe_udc.h b/drivers/usb/gadget/fsl_qe_udc.h
index bea5b827bebe..e35e24fd64bb 100644
--- a/drivers/usb/gadget/fsl_qe_udc.h
+++ b/drivers/usb/gadget/fsl_qe_udc.h
@@ -208,14 +208,14 @@ struct qe_frame{
208/* Frame status field */ 208/* Frame status field */
209/* Receive side */ 209/* Receive side */
210#define FRAME_OK 0x00000000 /* Frame tranmitted or received OK */ 210#define FRAME_OK 0x00000000 /* Frame tranmitted or received OK */
211#define FRAME_ERROR 0x80000000 /* Error occured on frame */ 211#define FRAME_ERROR 0x80000000 /* Error occurred on frame */
212#define START_FRAME_LOST 0x40000000 /* START_FRAME_LOST */ 212#define START_FRAME_LOST 0x40000000 /* START_FRAME_LOST */
213#define END_FRAME_LOST 0x20000000 /* END_FRAME_LOST */ 213#define END_FRAME_LOST 0x20000000 /* END_FRAME_LOST */
214#define RX_ER_NONOCT 0x10000000 /* Rx Non Octet Aligned Packet */ 214#define RX_ER_NONOCT 0x10000000 /* Rx Non Octet Aligned Packet */
215#define RX_ER_BITSTUFF 0x08000000 /* Frame Aborted --Received packet 215#define RX_ER_BITSTUFF 0x08000000 /* Frame Aborted --Received packet
216 with bit stuff error */ 216 with bit stuff error */
217#define RX_ER_CRC 0x04000000 /* Received packet with CRC error */ 217#define RX_ER_CRC 0x04000000 /* Received packet with CRC error */
218#define RX_ER_OVERUN 0x02000000 /* Over-run occured on reception */ 218#define RX_ER_OVERUN 0x02000000 /* Over-run occurred on reception */
219#define RX_ER_PID 0x01000000 /* Wrong PID received */ 219#define RX_ER_PID 0x01000000 /* Wrong PID received */
220/* Tranmit side */ 220/* Tranmit side */
221#define TX_ER_NAK 0x00800000 /* Received NAK handshake */ 221#define TX_ER_NAK 0x00800000 /* Received NAK handshake */
@@ -379,7 +379,7 @@ struct qe_udc {
379#define T_LSP 0x01000000 /* Low-speed transaction */ 379#define T_LSP 0x01000000 /* Low-speed transaction */
380#define T_PID 0x00c00000 /* packet id */ 380#define T_PID 0x00c00000 /* packet id */
381#define T_NAK 0x00100000 /* No ack. */ 381#define T_NAK 0x00100000 /* No ack. */
382#define T_STAL 0x00080000 /* Stall recieved */ 382#define T_STAL 0x00080000 /* Stall received */
383#define T_TO 0x00040000 /* time out */ 383#define T_TO 0x00040000 /* time out */
384#define T_UN 0x00020000 /* underrun */ 384#define T_UN 0x00020000 /* underrun */
385 385
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index 912cb8e63fe3..07499c1cdcc4 100644
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -464,7 +464,7 @@ static int fsl_ep_enable(struct usb_ep *_ep,
464 464
465 max = le16_to_cpu(desc->wMaxPacketSize); 465 max = le16_to_cpu(desc->wMaxPacketSize);
466 466
467 /* Disable automatic zlp generation. Driver is reponsible to indicate 467 /* Disable automatic zlp generation. Driver is responsible to indicate
468 * explicitly through req->req.zero. This is needed to enable multi-td 468 * explicitly through req->req.zero. This is needed to enable multi-td
469 * request. */ 469 * request. */
470 zlt = 1; 470 zlt = 1;
@@ -648,7 +648,7 @@ static void fsl_queue_td(struct fsl_ep *ep, struct fsl_req *req)
648 | EP_QUEUE_HEAD_STATUS_HALT)); 648 | EP_QUEUE_HEAD_STATUS_HALT));
649 dQH->size_ioc_int_sts &= temp; 649 dQH->size_ioc_int_sts &= temp;
650 650
651 /* Ensure that updates to the QH will occure before priming. */ 651 /* Ensure that updates to the QH will occur before priming. */
652 wmb(); 652 wmb();
653 653
654 /* Prime endpoint by writing 1 to ENDPTPRIME */ 654 /* Prime endpoint by writing 1 to ENDPTPRIME */
@@ -1459,7 +1459,7 @@ static int process_ep_req(struct fsl_udc *udc, int pipe,
1459 status = -EILSEQ; 1459 status = -EILSEQ;
1460 break; 1460 break;
1461 } else 1461 } else
1462 ERR("Unknown error has occured (0x%x)!\n", 1462 ERR("Unknown error has occurred (0x%x)!\n",
1463 errors); 1463 errors);
1464 1464
1465 } else if (le32_to_cpu(curr_td->size_ioc_sts) 1465 } else if (le32_to_cpu(curr_td->size_ioc_sts)
diff --git a/drivers/usb/gadget/fsl_usb2_udc.h b/drivers/usb/gadget/fsl_usb2_udc.h
index 20aeceed48c7..e88cce5c2c0d 100644
--- a/drivers/usb/gadget/fsl_usb2_udc.h
+++ b/drivers/usb/gadget/fsl_usb2_udc.h
@@ -15,7 +15,7 @@ struct usb_dr_device {
15 u8 res1[256]; 15 u8 res1[256];
16 u16 caplength; /* Capability Register Length */ 16 u16 caplength; /* Capability Register Length */
17 u16 hciversion; /* Host Controller Interface Version */ 17 u16 hciversion; /* Host Controller Interface Version */
18 u32 hcsparams; /* Host Controller Structual Parameters */ 18 u32 hcsparams; /* Host Controller Structural Parameters */
19 u32 hccparams; /* Host Controller Capability Parameters */ 19 u32 hccparams; /* Host Controller Capability Parameters */
20 u8 res2[20]; 20 u8 res2[20];
21 u32 dciversion; /* Device Controller Interface Version */ 21 u32 dciversion; /* Device Controller Interface Version */
@@ -52,7 +52,7 @@ struct usb_dr_host {
52 u8 res1[256]; 52 u8 res1[256];
53 u16 caplength; /* Capability Register Length */ 53 u16 caplength; /* Capability Register Length */
54 u16 hciversion; /* Host Controller Interface Version */ 54 u16 hciversion; /* Host Controller Interface Version */
55 u32 hcsparams; /* Host Controller Structual Parameters */ 55 u32 hcsparams; /* Host Controller Structural Parameters */
56 u32 hccparams; /* Host Controller Capability Parameters */ 56 u32 hccparams; /* Host Controller Capability Parameters */
57 u8 res2[20]; 57 u8 res2[20];
58 u32 dciversion; /* Device Controller Interface Version */ 58 u32 dciversion; /* Device Controller Interface Version */
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index 0ab7e141d494..47b86b99d449 100644
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -67,7 +67,7 @@ MODULE_PARM_DESC(index, "Index value for the USB MIDI Gadget adapter.");
67module_param(id, charp, 0444); 67module_param(id, charp, 0444);
68MODULE_PARM_DESC(id, "ID string for the USB MIDI Gadget adapter."); 68MODULE_PARM_DESC(id, "ID string for the USB MIDI Gadget adapter.");
69 69
70/* Some systems will want different product identifers published in the 70/* Some systems will want different product identifiers published in the
71 * device descriptor, either numbers or strings or both. These string 71 * device descriptor, either numbers or strings or both. These string
72 * parameters are in UTF-8 (superset of ASCII's 7 bit characters). 72 * parameters are in UTF-8 (superset of ASCII's 7 bit characters).
73 */ 73 */
diff --git a/drivers/usb/gadget/langwell_udc.c b/drivers/usb/gadget/langwell_udc.c
index 1eca8b47ce3c..9cee88a43a73 100644
--- a/drivers/usb/gadget/langwell_udc.c
+++ b/drivers/usb/gadget/langwell_udc.c
@@ -642,7 +642,7 @@ static int queue_dtd(struct langwell_ep *ep, struct langwell_request *req)
642 dqh->dtd_status &= dtd_status; 642 dqh->dtd_status &= dtd_status;
643 dev_vdbg(&dev->pdev->dev, "dqh->dtd_status = 0x%x\n", dqh->dtd_status); 643 dev_vdbg(&dev->pdev->dev, "dqh->dtd_status = 0x%x\n", dqh->dtd_status);
644 644
645 /* ensure that updates to the dQH will occure before priming */ 645 /* ensure that updates to the dQH will occur before priming */
646 wmb(); 646 wmb();
647 647
648 /* write 1 to endptprime register to PRIME endpoint */ 648 /* write 1 to endptprime register to PRIME endpoint */
diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c
index d5468a7f38e0..b62b2640deb0 100644
--- a/drivers/usb/gadget/mv_udc_core.c
+++ b/drivers/usb/gadget/mv_udc_core.c
@@ -325,7 +325,7 @@ static int queue_dtd(struct mv_ep *ep, struct mv_req *req)
325 325
326 /* 326 /*
327 * Ensure that updates to the QH will 327 * Ensure that updates to the QH will
328 * occure before priming. 328 * occur before priming.
329 */ 329 */
330 wmb(); 330 wmb();
331 331
@@ -338,7 +338,7 @@ static int queue_dtd(struct mv_ep *ep, struct mv_req *req)
338 & EP_QUEUE_HEAD_NEXT_POINTER_MASK;; 338 & EP_QUEUE_HEAD_NEXT_POINTER_MASK;;
339 dqh->size_ioc_int_sts = 0; 339 dqh->size_ioc_int_sts = 0;
340 340
341 /* Ensure that updates to the QH will occure before priming. */ 341 /* Ensure that updates to the QH will occur before priming. */
342 wmb(); 342 wmb();
343 343
344 /* Prime the Endpoint */ 344 /* Prime the Endpoint */
@@ -1845,7 +1845,7 @@ static irqreturn_t mv_udc_irq(int irq, void *dev)
1845 return IRQ_NONE; 1845 return IRQ_NONE;
1846 } 1846 }
1847 1847
1848 /* Clear all the interrupts occured */ 1848 /* Clear all the interrupts occurred */
1849 writel(status, &udc->op_regs->usbsts); 1849 writel(status, &udc->op_regs->usbsts);
1850 1850
1851 if (status & USBSTS_ERR) 1851 if (status & USBSTS_ERR)
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index d09155b25d73..24696f7fa6a9 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -117,7 +117,7 @@ module_param (fifo_mode, ushort, 0644);
117 117
118/* enable_suspend -- When enabled, the driver will respond to 118/* enable_suspend -- When enabled, the driver will respond to
119 * USB suspend requests by powering down the NET2280. Otherwise, 119 * USB suspend requests by powering down the NET2280. Otherwise,
120 * USB suspend requests will be ignored. This is acceptible for 120 * USB suspend requests will be ignored. This is acceptable for
121 * self-powered devices 121 * self-powered devices
122 */ 122 */
123static int enable_suspend = 0; 123static int enable_suspend = 0;
diff --git a/drivers/usb/gadget/nokia.c b/drivers/usb/gadget/nokia.c
index b5364f9d7cd2..55ca63ad3506 100644
--- a/drivers/usb/gadget/nokia.c
+++ b/drivers/usb/gadget/nokia.c
@@ -203,7 +203,7 @@ static int __init nokia_bind(struct usb_composite_dev *cdev)
203 goto err_usb; 203 goto err_usb;
204 } 204 }
205 205
206 /* finaly register the configuration */ 206 /* finally register the configuration */
207 status = usb_add_config(cdev, &nokia_config_500ma_driver, 207 status = usb_add_config(cdev, &nokia_config_500ma_driver,
208 nokia_bind_config); 208 nokia_bind_config);
209 if (status < 0) 209 if (status < 0)
diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c
index 12ff6cffedc9..c3f2bd42bd5a 100644
--- a/drivers/usb/gadget/printer.c
+++ b/drivers/usb/gadget/printer.c
@@ -126,7 +126,7 @@ static struct printer_dev usb_printer_gadget;
126#define PRINTER_VENDOR_NUM 0x0525 /* NetChip */ 126#define PRINTER_VENDOR_NUM 0x0525 /* NetChip */
127#define PRINTER_PRODUCT_NUM 0xa4a8 /* Linux-USB Printer Gadget */ 127#define PRINTER_PRODUCT_NUM 0xa4a8 /* Linux-USB Printer Gadget */
128 128
129/* Some systems will want different product identifers published in the 129/* Some systems will want different product identifiers published in the
130 * device descriptor, either numbers or strings or both. These string 130 * device descriptor, either numbers or strings or both. These string
131 * parameters are in UTF-8 (superset of ASCII's 7 bit characters). 131 * parameters are in UTF-8 (superset of ASCII's 7 bit characters).
132 */ 132 */
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 2efd6732d130..78a39a41547d 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -602,7 +602,7 @@ static void inc_ep_stats_reqs(struct pxa_ep *ep, int is_in)
602/** 602/**
603 * inc_ep_stats_bytes - Update ep stats counts 603 * inc_ep_stats_bytes - Update ep stats counts
604 * @ep: physical endpoint 604 * @ep: physical endpoint
605 * @count: bytes transfered on endpoint 605 * @count: bytes transferred on endpoint
606 * @is_in: ep direction (USB_DIR_IN or 0) 606 * @is_in: ep direction (USB_DIR_IN or 0)
607 */ 607 */
608static void inc_ep_stats_bytes(struct pxa_ep *ep, int count, int is_in) 608static void inc_ep_stats_bytes(struct pxa_ep *ep, int count, int is_in)
@@ -877,7 +877,7 @@ static void nuke(struct pxa_ep *ep, int status)
877 * If there is less space in request than bytes received in OUT endpoint, 877 * If there is less space in request than bytes received in OUT endpoint,
878 * bytes are left in the OUT endpoint. 878 * bytes are left in the OUT endpoint.
879 * 879 *
880 * Returns how many bytes were actually transfered 880 * Returns how many bytes were actually transferred
881 */ 881 */
882static int read_packet(struct pxa_ep *ep, struct pxa27x_request *req) 882static int read_packet(struct pxa_ep *ep, struct pxa27x_request *req)
883{ 883{
@@ -914,7 +914,7 @@ static int read_packet(struct pxa_ep *ep, struct pxa27x_request *req)
914 * endpoint. If there are no bytes to transfer, doesn't write anything 914 * endpoint. If there are no bytes to transfer, doesn't write anything
915 * to physical endpoint. 915 * to physical endpoint.
916 * 916 *
917 * Returns how many bytes were actually transfered. 917 * Returns how many bytes were actually transferred.
918 */ 918 */
919static int write_packet(struct pxa_ep *ep, struct pxa27x_request *req, 919static int write_packet(struct pxa_ep *ep, struct pxa27x_request *req,
920 unsigned int max) 920 unsigned int max)
@@ -991,7 +991,7 @@ static int read_fifo(struct pxa_ep *ep, struct pxa27x_request *req)
991 * caller guarantees at least one packet buffer is ready (or a zlp). 991 * caller guarantees at least one packet buffer is ready (or a zlp).
992 * Doesn't complete the request, that's the caller's job 992 * Doesn't complete the request, that's the caller's job
993 * 993 *
994 * Returns 1 if request fully transfered, 0 if partial transfer 994 * Returns 1 if request fully transferred, 0 if partial transfer
995 */ 995 */
996static int write_fifo(struct pxa_ep *ep, struct pxa27x_request *req) 996static int write_fifo(struct pxa_ep *ep, struct pxa27x_request *req)
997{ 997{
@@ -1094,7 +1094,7 @@ static int read_ep0_fifo(struct pxa_ep *ep, struct pxa27x_request *req)
1094 * Sends a request (or a part of the request) to the control endpoint (ep0 in). 1094 * Sends a request (or a part of the request) to the control endpoint (ep0 in).
1095 * If the request doesn't fit, the remaining part will be sent from irq. 1095 * If the request doesn't fit, the remaining part will be sent from irq.
1096 * The request is considered fully written only if either : 1096 * The request is considered fully written only if either :
1097 * - last write transfered all remaining bytes, but fifo was not fully filled 1097 * - last write transferred all remaining bytes, but fifo was not fully filled
1098 * - last write was a 0 length write 1098 * - last write was a 0 length write
1099 * 1099 *
1100 * Returns 1 if request fully written, 0 if request only partially sent 1100 * Returns 1 if request fully written, 0 if request only partially sent
@@ -1548,7 +1548,7 @@ static int pxa_udc_get_frame(struct usb_gadget *_gadget)
1548 * pxa_udc_wakeup - Force udc device out of suspend 1548 * pxa_udc_wakeup - Force udc device out of suspend
1549 * @_gadget: usb gadget 1549 * @_gadget: usb gadget
1550 * 1550 *
1551 * Returns 0 if successfull, error code otherwise 1551 * Returns 0 if successful, error code otherwise
1552 */ 1552 */
1553static int pxa_udc_wakeup(struct usb_gadget *_gadget) 1553static int pxa_udc_wakeup(struct usb_gadget *_gadget)
1554{ 1554{
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index ef825c3baed9..0912679de99a 100644
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -41,8 +41,8 @@
41/* EP0_MPS_LIMIT 41/* EP0_MPS_LIMIT
42 * 42 *
43 * Unfortunately there seems to be a limit of the amount of data that can 43 * Unfortunately there seems to be a limit of the amount of data that can
44 * be transfered by IN transactions on EP0. This is either 127 bytes or 3 44 * be transferred by IN transactions on EP0. This is either 127 bytes or 3
45 * packets (which practially means 1 packet and 63 bytes of data) when the 45 * packets (which practically means 1 packet and 63 bytes of data) when the
46 * MPS is set to 64. 46 * MPS is set to 64.
47 * 47 *
48 * This means if we are wanting to move >127 bytes of data, we need to 48 * This means if we are wanting to move >127 bytes of data, we need to
@@ -783,7 +783,7 @@ static void s3c_hsotg_start_req(struct s3c_hsotg *hsotg,
783 hsotg->regs + S3C_DIEPINT(index)); 783 hsotg->regs + S3C_DIEPINT(index));
784 784
785 /* Note, trying to clear the NAK here causes problems with transmit 785 /* Note, trying to clear the NAK here causes problems with transmit
786 * on the S3C6400 ending up with the TXFIFO becomming full. */ 786 * on the S3C6400 ending up with the TXFIFO becoming full. */
787 787
788 /* check ep is enabled */ 788 /* check ep is enabled */
789 if (!(readl(hsotg->regs + epctrl_reg) & S3C_DxEPCTL_EPEna)) 789 if (!(readl(hsotg->regs + epctrl_reg) & S3C_DxEPCTL_EPEna))
@@ -1176,10 +1176,10 @@ static void s3c_hsotg_process_control(struct s3c_hsotg *hsotg,
1176 writel(ctrl, hsotg->regs + reg); 1176 writel(ctrl, hsotg->regs + reg);
1177 1177
1178 dev_dbg(hsotg->dev, 1178 dev_dbg(hsotg->dev,
1179 "writen DxEPCTL=0x%08x to %08x (DxEPCTL=0x%08x)\n", 1179 "written DxEPCTL=0x%08x to %08x (DxEPCTL=0x%08x)\n",
1180 ctrl, reg, readl(hsotg->regs + reg)); 1180 ctrl, reg, readl(hsotg->regs + reg));
1181 1181
1182 /* don't belive we need to anything more to get the EP 1182 /* don't believe we need to anything more to get the EP
1183 * to reply with a STALL packet */ 1183 * to reply with a STALL packet */
1184 } 1184 }
1185} 1185}
@@ -1416,7 +1416,7 @@ static void s3c_hsotg_rx_data(struct s3c_hsotg *hsotg, int ep_idx, int size)
1416 * transaction. 1416 * transaction.
1417 * 1417 *
1418 * Note, since we don't write any data to the TxFIFO, then it is 1418 * Note, since we don't write any data to the TxFIFO, then it is
1419 * currently belived that we do not need to wait for any space in 1419 * currently believed that we do not need to wait for any space in
1420 * the TxFIFO. 1420 * the TxFIFO.
1421 */ 1421 */
1422static void s3c_hsotg_send_zlp(struct s3c_hsotg *hsotg, 1422static void s3c_hsotg_send_zlp(struct s3c_hsotg *hsotg,
@@ -1540,7 +1540,7 @@ static u32 s3c_hsotg_read_frameno(struct s3c_hsotg *hsotg)
1540 * that requires processing, so find out what is in there and do the 1540 * that requires processing, so find out what is in there and do the
1541 * appropriate read. 1541 * appropriate read.
1542 * 1542 *
1543 * The RXFIFO is a true FIFO, the packets comming out are still in packet 1543 * The RXFIFO is a true FIFO, the packets coming out are still in packet
1544 * chunks, so if you have x packets received on an endpoint you'll get x 1544 * chunks, so if you have x packets received on an endpoint you'll get x
1545 * FIFO events delivered, each with a packet's worth of data in it. 1545 * FIFO events delivered, each with a packet's worth of data in it.
1546 * 1546 *
@@ -2188,7 +2188,7 @@ irq_retry:
2188 2188
2189 /* these next two seem to crop-up occasionally causing the core 2189 /* these next two seem to crop-up occasionally causing the core
2190 * to shutdown the USB transfer, so try clearing them and logging 2190 * to shutdown the USB transfer, so try clearing them and logging
2191 * the occurence. */ 2191 * the occurrence. */
2192 2192
2193 if (gintsts & S3C_GINTSTS_GOUTNakEff) { 2193 if (gintsts & S3C_GINTSTS_GOUTNakEff) {
2194 dev_info(hsotg->dev, "GOUTNakEff triggered\n"); 2194 dev_info(hsotg->dev, "GOUTNakEff triggered\n");
@@ -2469,7 +2469,7 @@ static struct usb_ep_ops s3c_hsotg_ep_ops = {
2469 .queue = s3c_hsotg_ep_queue, 2469 .queue = s3c_hsotg_ep_queue,
2470 .dequeue = s3c_hsotg_ep_dequeue, 2470 .dequeue = s3c_hsotg_ep_dequeue,
2471 .set_halt = s3c_hsotg_ep_sethalt, 2471 .set_halt = s3c_hsotg_ep_sethalt,
2472 /* note, don't belive we have any call for the fifo routines */ 2472 /* note, don't believe we have any call for the fifo routines */
2473}; 2473};
2474 2474
2475/** 2475/**
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 9483acdf2e9e..e0e0787b724b 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -402,7 +402,7 @@ config FHCI_DEBUG
402 depends on USB_FHCI_HCD && DEBUG_FS 402 depends on USB_FHCI_HCD && DEBUG_FS
403 help 403 help
404 Say "y" to see some FHCI debug information and statistics 404 Say "y" to see some FHCI debug information and statistics
405 throught debugfs. 405 through debugfs.
406 406
407config USB_U132_HCD 407config USB_U132_HCD
408 tristate "Elan U132 Adapter Host Controller" 408 tristate "Elan U132 Adapter Host Controller"
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index f86d3fa20214..333ddc156919 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -644,7 +644,7 @@ static inline void ehci_writel(const struct ehci_hcd *ehci,
644/* 644/*
645 * On certain ppc-44x SoC there is a HW issue, that could only worked around with 645 * On certain ppc-44x SoC there is a HW issue, that could only worked around with
646 * explicit suspend/operate of OHCI. This function hereby makes sense only on that arch. 646 * explicit suspend/operate of OHCI. This function hereby makes sense only on that arch.
647 * Other common bits are dependant on has_amcc_usb23 quirk flag. 647 * Other common bits are dependent on has_amcc_usb23 quirk flag.
648 */ 648 */
649#ifdef CONFIG_44x 649#ifdef CONFIG_44x
650static inline void set_ohci_hcfs(struct ehci_hcd *ehci, int operational) 650static inline void set_ohci_hcfs(struct ehci_hcd *ehci, int operational)
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c
index b84ff7e51896..19223c7449e1 100644
--- a/drivers/usb/host/fhci-hcd.c
+++ b/drivers/usb/host/fhci-hcd.c
@@ -401,7 +401,7 @@ static int fhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
401 /* 1 td fro setup,1 for ack */ 401 /* 1 td fro setup,1 for ack */
402 size = 2; 402 size = 2;
403 case PIPE_BULK: 403 case PIPE_BULK:
404 /* one td for every 4096 bytes(can be upto 8k) */ 404 /* one td for every 4096 bytes(can be up to 8k) */
405 size += urb->transfer_buffer_length / 4096; 405 size += urb->transfer_buffer_length / 4096;
406 /* ...add for any remaining bytes... */ 406 /* ...add for any remaining bytes... */
407 if ((urb->transfer_buffer_length % 4096) != 0) 407 if ((urb->transfer_buffer_length % 4096) != 0)
diff --git a/drivers/usb/host/fhci-tds.c b/drivers/usb/host/fhci-tds.c
index 38fe058fbe61..0ea577bfca2a 100644
--- a/drivers/usb/host/fhci-tds.c
+++ b/drivers/usb/host/fhci-tds.c
@@ -40,7 +40,7 @@
40#define TD_RXER 0x0020 /* Rx error or not */ 40#define TD_RXER 0x0020 /* Rx error or not */
41 41
42#define TD_NAK 0x0010 /* No ack. */ 42#define TD_NAK 0x0010 /* No ack. */
43#define TD_STAL 0x0008 /* Stall recieved */ 43#define TD_STAL 0x0008 /* Stall received */
44#define TD_TO 0x0004 /* time out */ 44#define TD_TO 0x0004 /* time out */
45#define TD_UN 0x0002 /* underrun */ 45#define TD_UN 0x0002 /* underrun */
46#define TD_NO 0x0010 /* Rx Non Octet Aligned Packet */ 46#define TD_NO 0x0010 /* Rx Non Octet Aligned Packet */
@@ -274,7 +274,7 @@ void fhci_init_ep_registers(struct fhci_usb *usb, struct endpoint *ep,
274 * It is also preparing the TDs for new frames. If the Tx interrupts 274 * It is also preparing the TDs for new frames. If the Tx interrupts
275 * are disabled, the application should call that routine to get 275 * are disabled, the application should call that routine to get
276 * confirmation about the submitted frames. Otherwise, the routine is 276 * confirmation about the submitted frames. Otherwise, the routine is
277 * called frome the interrupt service routine during the Tx interrupt. 277 * called from the interrupt service routine during the Tx interrupt.
278 * In that case the application is informed by calling the application 278 * In that case the application is informed by calling the application
279 * specific 'fhci_transaction_confirm' routine 279 * specific 'fhci_transaction_confirm' routine
280 */ 280 */
@@ -337,7 +337,7 @@ static void fhci_td_transaction_confirm(struct fhci_usb *usb)
337 pkt->status = USB_TD_RX_ER_NONOCT; 337 pkt->status = USB_TD_RX_ER_NONOCT;
338 else 338 else
339 fhci_err(usb->fhci, "illegal error " 339 fhci_err(usb->fhci, "illegal error "
340 "occured\n"); 340 "occurred\n");
341 } else if (td_status & TD_NAK) 341 } else if (td_status & TD_NAK)
342 pkt->status = USB_TD_TX_ER_NAK; 342 pkt->status = USB_TD_TX_ER_NAK;
343 else if (td_status & TD_TO) 343 else if (td_status & TD_TO)
@@ -347,7 +347,7 @@ static void fhci_td_transaction_confirm(struct fhci_usb *usb)
347 else if (td_status & TD_STAL) 347 else if (td_status & TD_STAL)
348 pkt->status = USB_TD_TX_ER_STALL; 348 pkt->status = USB_TD_TX_ER_STALL;
349 else 349 else
350 fhci_err(usb->fhci, "illegal error occured\n"); 350 fhci_err(usb->fhci, "illegal error occurred\n");
351 } else if ((extra_data & TD_TOK_IN) && 351 } else if ((extra_data & TD_TOK_IN) &&
352 pkt->len > td_length - CRC_SIZE) { 352 pkt->len > td_length - CRC_SIZE) {
353 pkt->status = USB_TD_RX_DATA_UNDERUN; 353 pkt->status = USB_TD_RX_DATA_UNDERUN;
diff --git a/drivers/usb/host/fhci.h b/drivers/usb/host/fhci.h
index 71c3caaea4c1..dc6939a44a1a 100644
--- a/drivers/usb/host/fhci.h
+++ b/drivers/usb/host/fhci.h
@@ -82,7 +82,7 @@
82#define USB_TD_RX_ER_NONOCT 0x40000000 /* Tx Non Octet Aligned Packet */ 82#define USB_TD_RX_ER_NONOCT 0x40000000 /* Tx Non Octet Aligned Packet */
83#define USB_TD_RX_ER_BITSTUFF 0x20000000 /* Frame Aborted-Received pkt */ 83#define USB_TD_RX_ER_BITSTUFF 0x20000000 /* Frame Aborted-Received pkt */
84#define USB_TD_RX_ER_CRC 0x10000000 /* CRC error */ 84#define USB_TD_RX_ER_CRC 0x10000000 /* CRC error */
85#define USB_TD_RX_ER_OVERUN 0x08000000 /* Over - run occured */ 85#define USB_TD_RX_ER_OVERUN 0x08000000 /* Over - run occurred */
86#define USB_TD_RX_ER_PID 0x04000000 /* wrong PID received */ 86#define USB_TD_RX_ER_PID 0x04000000 /* wrong PID received */
87#define USB_TD_RX_DATA_UNDERUN 0x02000000 /* shorter than expected */ 87#define USB_TD_RX_DATA_UNDERUN 0x02000000 /* shorter than expected */
88#define USB_TD_RX_DATA_OVERUN 0x01000000 /* longer than expected */ 88#define USB_TD_RX_DATA_OVERUN 0x01000000 /* longer than expected */
@@ -363,7 +363,7 @@ struct ed {
363struct td { 363struct td {
364 void *data; /* a pointer to the data buffer */ 364 void *data; /* a pointer to the data buffer */
365 unsigned int len; /* length of the data to be submitted */ 365 unsigned int len; /* length of the data to be submitted */
366 unsigned int actual_len; /* actual bytes transfered on this td */ 366 unsigned int actual_len; /* actual bytes transferred on this td */
367 enum fhci_ta_type type; /* transaction type */ 367 enum fhci_ta_type type; /* transaction type */
368 u8 toggle; /* toggle for next trans. within this TD */ 368 u8 toggle; /* toggle for next trans. within this TD */
369 u16 iso_index; /* ISO transaction index */ 369 u16 iso_index; /* ISO transaction index */
diff --git a/drivers/usb/host/imx21-hcd.c b/drivers/usb/host/imx21-hcd.c
index 2562e92e3178..af05718bdc73 100644
--- a/drivers/usb/host/imx21-hcd.c
+++ b/drivers/usb/host/imx21-hcd.c
@@ -1323,7 +1323,7 @@ static void process_etds(struct usb_hcd *hcd, struct imx21 *imx21, int sof)
1323 * (and hence no interrupt occurs). 1323 * (and hence no interrupt occurs).
1324 * This causes the transfer in question to hang. 1324 * This causes the transfer in question to hang.
1325 * The kludge below checks for this condition at each SOF and processes any 1325 * The kludge below checks for this condition at each SOF and processes any
1326 * blocked ETDs (after an arbitary 10 frame wait) 1326 * blocked ETDs (after an arbitrary 10 frame wait)
1327 * 1327 *
1328 * With a single active transfer the usbtest test suite will run for days 1328 * With a single active transfer the usbtest test suite will run for days
1329 * without the kludge. 1329 * without the kludge.
diff --git a/drivers/usb/host/isp116x.h b/drivers/usb/host/isp116x.h
index 12db961acdfb..9a2c400e6090 100644
--- a/drivers/usb/host/isp116x.h
+++ b/drivers/usb/host/isp116x.h
@@ -13,7 +13,7 @@
13 13
14/* Full speed: max # of bytes to transfer for a single urb 14/* Full speed: max # of bytes to transfer for a single urb
15 at a time must be < 1024 && must be multiple of 64. 15 at a time must be < 1024 && must be multiple of 64.
16 832 allows transfering 4kiB within 5 frames. */ 16 832 allows transferring 4kiB within 5 frames. */
17#define MAX_TRANSFER_SIZE_FULLSPEED 832 17#define MAX_TRANSFER_SIZE_FULLSPEED 832
18 18
19/* Low speed: there is no reason to schedule in very big 19/* Low speed: there is no reason to schedule in very big
diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c
index 662cd002adfc..f97570a847ca 100644
--- a/drivers/usb/host/isp1362-hcd.c
+++ b/drivers/usb/host/isp1362-hcd.c
@@ -546,7 +546,7 @@ static void postproc_ep(struct isp1362_hcd *isp1362_hcd, struct isp1362_ep *ep)
546 if (usb_pipecontrol(urb->pipe)) { 546 if (usb_pipecontrol(urb->pipe)) {
547 ep->nextpid = USB_PID_ACK; 547 ep->nextpid = USB_PID_ACK;
548 /* save the data underrun error code for later and 548 /* save the data underrun error code for later and
549 * procede with the status stage 549 * proceed with the status stage
550 */ 550 */
551 urb->actual_length += PTD_GET_COUNT(ptd); 551 urb->actual_length += PTD_GET_COUNT(ptd);
552 BUG_ON(urb->actual_length > urb->transfer_buffer_length); 552 BUG_ON(urb->actual_length > urb->transfer_buffer_length);
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index e7288639edb0..d55723514860 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -162,7 +162,7 @@ static int ohci_urb_enqueue (
162 // case PIPE_INTERRUPT: 162 // case PIPE_INTERRUPT:
163 // case PIPE_BULK: 163 // case PIPE_BULK:
164 default: 164 default:
165 /* one TD for every 4096 Bytes (can be upto 8K) */ 165 /* one TD for every 4096 Bytes (can be up to 8K) */
166 size += urb->transfer_buffer_length / 4096; 166 size += urb->transfer_buffer_length / 4096;
167 /* ... and for any remaining bytes ... */ 167 /* ... and for any remaining bytes ... */
168 if ((urb->transfer_buffer_length % 4096) != 0) 168 if ((urb->transfer_buffer_length % 4096) != 0)
diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c
index 44e4deb362e1..4a771f6cc822 100644
--- a/drivers/usb/host/oxu210hp-hcd.c
+++ b/drivers/usb/host/oxu210hp-hcd.c
@@ -2879,7 +2879,7 @@ static int oxu_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
2879 /* Ok, we have more job to do! :) */ 2879 /* Ok, we have more job to do! :) */
2880 2880
2881 for (i = 0; i < num - 1; i++) { 2881 for (i = 0; i < num - 1; i++) {
2882 /* Get free micro URB poll till a free urb is recieved */ 2882 /* Get free micro URB poll till a free urb is received */
2883 2883
2884 do { 2884 do {
2885 murb = (struct urb *) oxu_murb_alloc(oxu); 2885 murb = (struct urb *) oxu_murb_alloc(oxu);
@@ -2911,7 +2911,7 @@ static int oxu_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
2911 2911
2912 /* Last urb requires special handling */ 2912 /* Last urb requires special handling */
2913 2913
2914 /* Get free micro URB poll till a free urb is recieved */ 2914 /* Get free micro URB poll till a free urb is received */
2915 do { 2915 do {
2916 murb = (struct urb *) oxu_murb_alloc(oxu); 2916 murb = (struct urb *) oxu_murb_alloc(oxu);
2917 if (!murb) 2917 if (!murb)
diff --git a/drivers/usb/host/whci/qset.c b/drivers/usb/host/whci/qset.c
index dc0ab8382f5d..d6e175428618 100644
--- a/drivers/usb/host/whci/qset.c
+++ b/drivers/usb/host/whci/qset.c
@@ -739,7 +739,7 @@ static int get_urb_status_from_qtd(struct urb *urb, u32 status)
739 * process_inactive_qtd - process an inactive (but not halted) qTD. 739 * process_inactive_qtd - process an inactive (but not halted) qTD.
740 * 740 *
741 * Update the urb with the transfer bytes from the qTD, if the urb is 741 * Update the urb with the transfer bytes from the qTD, if the urb is
742 * completely transfered or (in the case of an IN only) the LPF is 742 * completely transferred or (in the case of an IN only) the LPF is
743 * set, then the transfer is complete and the urb should be returned 743 * set, then the transfer is complete and the urb should be returned
744 * to the system. 744 * to the system.
745 */ 745 */
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 9a3645fd759b..196e0181b2ed 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -741,7 +741,7 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
741 int retval; 741 int retval;
742 742
743 /* Wait a bit if either of the roothubs need to settle from the 743 /* Wait a bit if either of the roothubs need to settle from the
744 * transistion into bus suspend. 744 * transition into bus suspend.
745 */ 745 */
746 if (time_before(jiffies, xhci->bus_state[0].next_statechange) || 746 if (time_before(jiffies, xhci->bus_state[0].next_statechange) ||
747 time_before(jiffies, 747 time_before(jiffies,
@@ -2072,7 +2072,7 @@ int xhci_alloc_streams(struct usb_hcd *hcd, struct usb_device *udev,
2072 return -EINVAL; 2072 return -EINVAL;
2073 } 2073 }
2074 vdev = xhci->devs[udev->slot_id]; 2074 vdev = xhci->devs[udev->slot_id];
2075 /* Mark each endpoint as being in transistion, so 2075 /* Mark each endpoint as being in transition, so
2076 * xhci_urb_enqueue() will reject all URBs. 2076 * xhci_urb_enqueue() will reject all URBs.
2077 */ 2077 */
2078 for (i = 0; i < num_eps; i++) { 2078 for (i = 0; i < num_eps; i++) {
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 711de253bc0f..07e263063e37 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -873,7 +873,7 @@ struct xhci_transfer_event {
873#define COMP_CMD_ABORT 25 873#define COMP_CMD_ABORT 25
874/* Stopped - transfer was terminated by a stop endpoint command */ 874/* Stopped - transfer was terminated by a stop endpoint command */
875#define COMP_STOP 26 875#define COMP_STOP 26
876/* Same as COMP_EP_STOPPED, but the transfered length in the event is invalid */ 876/* Same as COMP_EP_STOPPED, but the transferred length in the event is invalid */
877#define COMP_STOP_INVAL 27 877#define COMP_STOP_INVAL 27
878/* Control Abort Error - Debug Capability - control pipe aborted */ 878/* Control Abort Error - Debug Capability - control pipe aborted */
879#define COMP_DBG_ABORT 28 879#define COMP_DBG_ABORT 28
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index c90c89dc0003..a0037961e5bd 100644
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -69,7 +69,7 @@
69 * 20000513 added IDs for all products supported by Windows driver (john) 69 * 20000513 added IDs for all products supported by Windows driver (john)
70 * 20000514 Rewrote mts_scsi_queuecommand to use URBs (john) 70 * 20000514 Rewrote mts_scsi_queuecommand to use URBs (john)
71 * 20000514 Version 0.0.8j 71 * 20000514 Version 0.0.8j
72 * 20000514 Fix reporting of non-existant devices to SCSI layer (john) 72 * 20000514 Fix reporting of non-existent devices to SCSI layer (john)
73 * 20000514 Added MTS_DEBUG_INT (john) 73 * 20000514 Added MTS_DEBUG_INT (john)
74 * 20000514 Changed "usb-microtek" to "microtek" for consistency (john) 74 * 20000514 Changed "usb-microtek" to "microtek" for consistency (john)
75 * 20000514 Stupid bug fixes (john) 75 * 20000514 Stupid bug fixes (john)
@@ -557,14 +557,14 @@ mts_build_transfer_context(struct scsi_cmnd *srb, struct mts_desc* desc)
557 557
558 if ( !memcmp( srb->cmnd, mts_read_image_sig, mts_read_image_sig_len ) 558 if ( !memcmp( srb->cmnd, mts_read_image_sig, mts_read_image_sig_len )
559) { pipe = usb_rcvbulkpipe(desc->usb_dev,desc->ep_image); 559) { pipe = usb_rcvbulkpipe(desc->usb_dev,desc->ep_image);
560 MTS_DEBUG( "transfering from desc->ep_image == %d\n", 560 MTS_DEBUG( "transferring from desc->ep_image == %d\n",
561 (int)desc->ep_image ); 561 (int)desc->ep_image );
562 } else if ( MTS_DIRECTION_IS_IN(srb->cmnd[0]) ) { 562 } else if ( MTS_DIRECTION_IS_IN(srb->cmnd[0]) ) {
563 pipe = usb_rcvbulkpipe(desc->usb_dev,desc->ep_response); 563 pipe = usb_rcvbulkpipe(desc->usb_dev,desc->ep_response);
564 MTS_DEBUG( "transfering from desc->ep_response == %d\n", 564 MTS_DEBUG( "transferring from desc->ep_response == %d\n",
565 (int)desc->ep_response); 565 (int)desc->ep_response);
566 } else { 566 } else {
567 MTS_DEBUG("transfering to desc->ep_out == %d\n", 567 MTS_DEBUG("transferring to desc->ep_out == %d\n",
568 (int)desc->ep_out); 568 (int)desc->ep_out);
569 pipe = usb_sndbulkpipe(desc->usb_dev,desc->ep_out); 569 pipe = usb_sndbulkpipe(desc->usb_dev,desc->ep_out);
570 } 570 }
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c
index e573e4704015..a2190b983f52 100644
--- a/drivers/usb/misc/iowarrior.c
+++ b/drivers/usb/misc/iowarrior.c
@@ -40,7 +40,7 @@
40#ifdef CONFIG_USB_DYNAMIC_MINORS 40#ifdef CONFIG_USB_DYNAMIC_MINORS
41#define IOWARRIOR_MINOR_BASE 0 41#define IOWARRIOR_MINOR_BASE 0
42#else 42#else
43#define IOWARRIOR_MINOR_BASE 208 // SKELETON_MINOR_BASE 192 + 16, not offical yet 43#define IOWARRIOR_MINOR_BASE 208 // SKELETON_MINOR_BASE 192 + 16, not official yet
44#endif 44#endif
45 45
46/* interrupt input queue size */ 46/* interrupt input queue size */
diff --git a/drivers/usb/otg/isp1301_omap.c b/drivers/usb/otg/isp1301_omap.c
index 8c6fdef61d1c..e25700f44b6f 100644
--- a/drivers/usb/otg/isp1301_omap.c
+++ b/drivers/usb/otg/isp1301_omap.c
@@ -1531,7 +1531,7 @@ isp1301_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
1531 i2c_set_clientdata(i2c, isp); 1531 i2c_set_clientdata(i2c, isp);
1532 isp->client = i2c; 1532 isp->client = i2c;
1533 1533
1534 /* verify the chip (shouldn't be necesary) */ 1534 /* verify the chip (shouldn't be necessary) */
1535 status = isp1301_get_u16(isp, ISP1301_VENDOR_ID); 1535 status = isp1301_get_u16(isp, ISP1301_VENDOR_ID);
1536 if (status != I2C_VENDOR_ID_PHILIPS) { 1536 if (status != I2C_VENDOR_ID_PHILIPS) {
1537 dev_dbg(&i2c->dev, "not philips id: %d\n", status); 1537 dev_dbg(&i2c->dev, "not philips id: %d\n", status);
diff --git a/drivers/usb/otg/langwell_otg.c b/drivers/usb/otg/langwell_otg.c
index 7f9b8cd4514b..e973ff19c55a 100644
--- a/drivers/usb/otg/langwell_otg.c
+++ b/drivers/usb/otg/langwell_otg.c
@@ -580,7 +580,7 @@ static void langwell_otg_add_ktimer(enum langwell_otg_timer_type timers)
580 time = TB_BUS_SUSPEND; 580 time = TB_BUS_SUSPEND;
581 break; 581 break;
582 default: 582 default:
583 dev_dbg(lnw->dev, "unkown timer, cannot enable it\n"); 583 dev_dbg(lnw->dev, "unknown timer, cannot enable it\n");
584 return; 584 return;
585 } 585 }
586 586
@@ -1381,7 +1381,7 @@ static void langwell_otg_work(struct work_struct *work)
1381 } else if (!iotg->hsm.a_bus_req && iotg->otg.host && 1381 } else if (!iotg->hsm.a_bus_req && iotg->otg.host &&
1382 iotg->otg.host->b_hnp_enable) { 1382 iotg->otg.host->b_hnp_enable) {
1383 /* It is not safe enough to do a fast 1383 /* It is not safe enough to do a fast
1384 * transistion from A_WAIT_BCON to 1384 * transition from A_WAIT_BCON to
1385 * A_SUSPEND */ 1385 * A_SUSPEND */
1386 msleep(10000); 1386 msleep(10000);
1387 if (iotg->hsm.a_bus_req) 1387 if (iotg->hsm.a_bus_req)
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c
index 0db6ace16f7b..aba201cb872c 100644
--- a/drivers/usb/serial/aircable.c
+++ b/drivers/usb/serial/aircable.c
@@ -16,7 +16,7 @@
16 * When reading the process is almost equal except that the header starts with 16 * When reading the process is almost equal except that the header starts with
17 * 0x00 0x20. 17 * 0x00 0x20.
18 * 18 *
19 * The device simply need some stuff to understand data comming from the usb 19 * The device simply need some stuff to understand data coming from the usb
20 * buffer: The First and Second byte is used for a Header, the Third and Fourth 20 * buffer: The First and Second byte is used for a Header, the Third and Fourth
21 * tells the device the amount of information the package holds. 21 * tells the device the amount of information the package holds.
22 * Packages are 60 bytes long Header Stuff. 22 * Packages are 60 bytes long Header Stuff.
@@ -30,7 +30,7 @@
30 * one. 30 * one.
31 * 31 *
32 * The driver registers himself with the USB-serial core and the USB Core. I had 32 * The driver registers himself with the USB-serial core and the USB Core. I had
33 * to implement a probe function agains USB-serial, because other way, the 33 * to implement a probe function against USB-serial, because other way, the
34 * driver was attaching himself to both interfaces. I have tryed with different 34 * driver was attaching himself to both interfaces. I have tryed with different
35 * configurations of usb_serial_driver with out exit, only the probe function 35 * configurations of usb_serial_driver with out exit, only the probe function
36 * could handle this correctly. 36 * could handle this correctly.
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index 4df3e0cecbae..0f11afdda134 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -101,7 +101,7 @@ static const struct usb_device_id id_table[] = {
101 { USB_DEVICE(0x10C4, 0x81F2) }, /* C1007 HF band RFID controller */ 101 { USB_DEVICE(0x10C4, 0x81F2) }, /* C1007 HF band RFID controller */
102 { USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */ 102 { USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */
103 { USB_DEVICE(0x10C4, 0x822B) }, /* Modem EDGE(GSM) Comander 2 */ 103 { USB_DEVICE(0x10C4, 0x822B) }, /* Modem EDGE(GSM) Comander 2 */
104 { USB_DEVICE(0x10C4, 0x826B) }, /* Cygnal Integrated Products, Inc., Fasttrax GPS demostration module */ 104 { USB_DEVICE(0x10C4, 0x826B) }, /* Cygnal Integrated Products, Inc., Fasttrax GPS demonstration module */
105 { USB_DEVICE(0x10C4, 0x8293) }, /* Telegesys ETRX2USB */ 105 { USB_DEVICE(0x10C4, 0x8293) }, /* Telegesys ETRX2USB */
106 { USB_DEVICE(0x10C4, 0x82F9) }, /* Procyon AVS */ 106 { USB_DEVICE(0x10C4, 0x82F9) }, /* Procyon AVS */
107 { USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */ 107 { USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index 987e9bf7bd02..d9906eb9d16a 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -35,7 +35,7 @@
35 * 35 *
36 * Lonnie Mendez <dignome@gmail.com> 36 * Lonnie Mendez <dignome@gmail.com>
37 * 04-10-2004 37 * 04-10-2004
38 * Driver modified to support dynamic line settings. Various improvments 38 * Driver modified to support dynamic line settings. Various improvements
39 * and features. 39 * and features.
40 * 40 *
41 * Neil Whelchel 41 * Neil Whelchel
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 65967b36365f..a973c7a29d6e 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -17,7 +17,7 @@
17 * See Documentation/usb/usb-serial.txt for more information on using this 17 * See Documentation/usb/usb-serial.txt for more information on using this
18 * driver 18 * driver
19 * 19 *
20 * See http://ftdi-usb-sio.sourceforge.net for upto date testing info 20 * See http://ftdi-usb-sio.sourceforge.net for up to date testing info
21 * and extra documentation 21 * and extra documentation
22 * 22 *
23 * Change entries from 2004 and earlier can be found in versions of this 23 * Change entries from 2004 and earlier can be found in versions of this
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index f1aedfa7c420..abf095be5753 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -1981,7 +1981,7 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial,
1981 if (code == IOSP_STATUS_OPEN_RSP) { 1981 if (code == IOSP_STATUS_OPEN_RSP) {
1982 edge_port->txCredits = GET_TX_BUFFER_SIZE(byte3); 1982 edge_port->txCredits = GET_TX_BUFFER_SIZE(byte3);
1983 edge_port->maxTxCredits = edge_port->txCredits; 1983 edge_port->maxTxCredits = edge_port->txCredits;
1984 dbg("%s - Port %u Open Response Inital MSR = %02x TxBufferSize = %d", __func__, edge_serial->rxPort, byte2, edge_port->txCredits); 1984 dbg("%s - Port %u Open Response Initial MSR = %02x TxBufferSize = %d", __func__, edge_serial->rxPort, byte2, edge_port->txCredits);
1985 handle_new_msr(edge_port, byte2); 1985 handle_new_msr(edge_port, byte2);
1986 1986
1987 /* send the current line settings to the port so we are 1987 /* send the current line settings to the port so we are
diff --git a/drivers/usb/serial/io_edgeport.h b/drivers/usb/serial/io_edgeport.h
index dced7ec65470..ad9c1d47a619 100644
--- a/drivers/usb/serial/io_edgeport.h
+++ b/drivers/usb/serial/io_edgeport.h
@@ -68,7 +68,7 @@ struct comMapper {
68#define PROC_SET_COM_ENTRY 2 68#define PROC_SET_COM_ENTRY 2
69 69
70 70
71/* The following sturcture is passed to the write */ 71/* The following structure is passed to the write */
72struct procWrite { 72struct procWrite {
73 int Command; 73 int Command;
74 union { 74 union {
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index d8434910fa7b..0aac00afb5c8 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -433,7 +433,7 @@ static int write_i2c_mem(struct edgeport_serial *serial,
433 433
434 /* We can only send a maximum of 1 aligned byte page at a time */ 434 /* We can only send a maximum of 1 aligned byte page at a time */
435 435
436 /* calulate the number of bytes left in the first page */ 436 /* calculate the number of bytes left in the first page */
437 write_length = EPROM_PAGE_SIZE - 437 write_length = EPROM_PAGE_SIZE -
438 (start_address & (EPROM_PAGE_SIZE - 1)); 438 (start_address & (EPROM_PAGE_SIZE - 1));
439 439
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index a1dd4d4fa192..1b5633f46984 100644
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -116,7 +116,7 @@ static void opticon_read_bulk_callback(struct urb *urb)
116 } else { 116 } else {
117 if ((data[0] == 0x00) && (data[1] == 0x01)) { 117 if ((data[0] == 0x00) && (data[1] == 0x01)) {
118 spin_lock_irqsave(&priv->lock, flags); 118 spin_lock_irqsave(&priv->lock, flags);
119 /* CTS status infomation package */ 119 /* CTS status information package */
120 if (data[2] == 0x00) 120 if (data[2] == 0x00)
121 priv->cts = false; 121 priv->cts = false;
122 else 122 else
diff --git a/drivers/usb/storage/ene_ub6250.c b/drivers/usb/storage/ene_ub6250.c
index 08e03745e251..0e5aafda4537 100644
--- a/drivers/usb/storage/ene_ub6250.c
+++ b/drivers/usb/storage/ene_ub6250.c
@@ -562,7 +562,7 @@ static int ene_sd_init(struct us_data *us)
562 562
563 result = ene_send_scsi_cmd(us, FDIR_READ, NULL, 0); 563 result = ene_send_scsi_cmd(us, FDIR_READ, NULL, 0);
564 if (result != USB_STOR_XFER_GOOD) { 564 if (result != USB_STOR_XFER_GOOD) {
565 US_DEBUGP("Exection SD Init Code Fail !!\n"); 565 US_DEBUGP("Execution SD Init Code Fail !!\n");
566 return USB_STOR_TRANSPORT_ERROR; 566 return USB_STOR_TRANSPORT_ERROR;
567 } 567 }
568 568
@@ -581,7 +581,7 @@ static int ene_sd_init(struct us_data *us)
581 581
582 result = ene_send_scsi_cmd(us, FDIR_READ, &buf, 0); 582 result = ene_send_scsi_cmd(us, FDIR_READ, &buf, 0);
583 if (result != USB_STOR_XFER_GOOD) { 583 if (result != USB_STOR_XFER_GOOD) {
584 US_DEBUGP("Exection SD Init Code Fail !!\n"); 584 US_DEBUGP("Execution SD Init Code Fail !!\n");
585 return USB_STOR_TRANSPORT_ERROR; 585 return USB_STOR_TRANSPORT_ERROR;
586 } 586 }
587 587
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index 6b9982cd5423..09e52ba47ddf 100644
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -1510,7 +1510,7 @@ static int isd200_Initialization(struct us_data *us)
1510 * Protocol and Transport for the ISD200 ASIC 1510 * Protocol and Transport for the ISD200 ASIC
1511 * 1511 *
1512 * This protocol and transport are for ATA devices connected to an ISD200 1512 * This protocol and transport are for ATA devices connected to an ISD200
1513 * ASIC. An ATAPI device that is conected as a slave device will be 1513 * ASIC. An ATAPI device that is connected as a slave device will be
1514 * detected in the driver initialization function and the protocol will 1514 * detected in the driver initialization function and the protocol will
1515 * be changed to an ATAPI protocol (Transparent SCSI). 1515 * be changed to an ATAPI protocol (Transparent SCSI).
1516 * 1516 *
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 689ee1fb702a..13b8bcdf3dba 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -123,7 +123,7 @@ static int slave_configure(struct scsi_device *sdev)
123{ 123{
124 struct us_data *us = host_to_us(sdev->host); 124 struct us_data *us = host_to_us(sdev->host);
125 125
126 /* Many devices have trouble transfering more than 32KB at a time, 126 /* Many devices have trouble transferring more than 32KB at a time,
127 * while others have trouble with more than 64K. At this time we 127 * while others have trouble with more than 64K. At this time we
128 * are limiting both to 32K (64 sectores). 128 * are limiting both to 32K (64 sectores).
129 */ 129 */
diff --git a/drivers/usb/storage/shuttle_usbat.c b/drivers/usb/storage/shuttle_usbat.c
index bd3f415893d8..0b00091d2ae9 100644
--- a/drivers/usb/storage/shuttle_usbat.c
+++ b/drivers/usb/storage/shuttle_usbat.c
@@ -340,7 +340,7 @@ static int usbat_check_status(struct us_data *us)
340} 340}
341 341
342/* 342/*
343 * Stores critical information in internal registers in prepartion for the execution 343 * Stores critical information in internal registers in preparation for the execution
344 * of a conditional usbat_read_blocks or usbat_write_blocks call. 344 * of a conditional usbat_read_blocks or usbat_write_blocks call.
345 */ 345 */
346static int usbat_set_shuttle_features(struct us_data *us, 346static int usbat_set_shuttle_features(struct us_data *us,
diff --git a/drivers/usb/wusbcore/crypto.c b/drivers/usb/wusbcore/crypto.c
index 827c87f10cc5..7e4bf95f8f7b 100644
--- a/drivers/usb/wusbcore/crypto.c
+++ b/drivers/usb/wusbcore/crypto.c
@@ -180,7 +180,7 @@ static void bytewise_xor(void *_bo, const void *_bi1, const void *_bi2,
180 * using the 14 bytes of @a to fill up 180 * using the 14 bytes of @a to fill up
181 * b1.{mac_header,e0,security_reserved,padding}. 181 * b1.{mac_header,e0,security_reserved,padding}.
182 * 182 *
183 * NOTE: The definiton of l(a) in WUSB1.0[6.5] vs the definition of 183 * NOTE: The definition of l(a) in WUSB1.0[6.5] vs the definition of
184 * l(m) is orthogonal, they bear no relationship, so it is not 184 * l(m) is orthogonal, they bear no relationship, so it is not
185 * in conflict with the parameter's relation that 185 * in conflict with the parameter's relation that
186 * WUSB1.0[6.4.2]) defines. 186 * WUSB1.0[6.4.2]) defines.
@@ -272,7 +272,7 @@ static int wusb_ccm_mac(struct crypto_blkcipher *tfm_cbc,
272 272
273 /* Now we crypt the MIC Tag (*iv) with Ax -- values per WUSB1.0[6.5] 273 /* Now we crypt the MIC Tag (*iv) with Ax -- values per WUSB1.0[6.5]
274 * The procedure is to AES crypt the A0 block and XOR the MIC 274 * The procedure is to AES crypt the A0 block and XOR the MIC
275 * Tag agains it; we only do the first 8 bytes and place it 275 * Tag against it; we only do the first 8 bytes and place it
276 * directly in the destination buffer. 276 * directly in the destination buffer.
277 * 277 *
278 * POS Crypto API: size is assumed to be AES's block size. 278 * POS Crypto API: size is assumed to be AES's block size.
diff --git a/drivers/usb/wusbcore/reservation.c b/drivers/usb/wusbcore/reservation.c
index 4ed97360c046..6f4fafdc2401 100644
--- a/drivers/usb/wusbcore/reservation.c
+++ b/drivers/usb/wusbcore/reservation.c
@@ -71,7 +71,7 @@ static void wusbhc_rsv_complete_cb(struct uwb_rsv *rsv)
71 71
72/** 72/**
73 * wusbhc_rsv_establish - establish a reservation for the cluster 73 * wusbhc_rsv_establish - establish a reservation for the cluster
74 * @wusbhc: the WUSB HC requesting a bandwith reservation 74 * @wusbhc: the WUSB HC requesting a bandwidth reservation
75 */ 75 */
76int wusbhc_rsv_establish(struct wusbhc *wusbhc) 76int wusbhc_rsv_establish(struct wusbhc *wusbhc)
77{ 77{
diff --git a/drivers/usb/wusbcore/rh.c b/drivers/usb/wusbcore/rh.c
index c175b7300c73..39de3900ad20 100644
--- a/drivers/usb/wusbcore/rh.c
+++ b/drivers/usb/wusbcore/rh.c
@@ -133,7 +133,7 @@ static int wusbhc_rh_port_reset(struct wusbhc *wusbhc, u8 port_idx)
133 * big of a problem [and we can't make it an spinlock 133 * big of a problem [and we can't make it an spinlock
134 * because other parts need to take it and sleep] . 134 * because other parts need to take it and sleep] .
135 * 135 *
136 * @usb_hcd is refcounted, so it won't dissapear under us 136 * @usb_hcd is refcounted, so it won't disappear under us
137 * and before killing a host, the polling of the root hub 137 * and before killing a host, the polling of the root hub
138 * would be stopped anyway. 138 * would be stopped anyway.
139 */ 139 */
diff --git a/drivers/usb/wusbcore/wa-rpipe.c b/drivers/usb/wusbcore/wa-rpipe.c
index 8cb9d80207fa..ca80171f42c6 100644
--- a/drivers/usb/wusbcore/wa-rpipe.c
+++ b/drivers/usb/wusbcore/wa-rpipe.c
@@ -24,7 +24,7 @@
24 * 24 *
25 * RPIPE 25 * RPIPE
26 * 26 *
27 * Targetted at different downstream endpoints 27 * Targeted at different downstream endpoints
28 * 28 *
29 * Descriptor: use to config the remote pipe. 29 * Descriptor: use to config the remote pipe.
30 * 30 *
diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
index 84b744c428a4..6ccd93a9b909 100644
--- a/drivers/usb/wusbcore/wa-xfer.c
+++ b/drivers/usb/wusbcore/wa-xfer.c
@@ -61,7 +61,7 @@
61 * 61 *
62 * Two methods it could be done: 62 * Two methods it could be done:
63 * 63 *
64 * (a) set up a timer everytime an rpipe's use count drops to 1 64 * (a) set up a timer every time an rpipe's use count drops to 1
65 * (which means unused) or when a transfer ends. Reset the 65 * (which means unused) or when a transfer ends. Reset the
66 * timer when a xfer is queued. If the timer expires, release 66 * timer when a xfer is queued. If the timer expires, release
67 * the rpipe [see rpipe_ep_disable()]. 67 * the rpipe [see rpipe_ep_disable()].
@@ -140,7 +140,7 @@ struct wa_xfer {
140 140
141 struct wahc *wa; /* Wire adapter we are plugged to */ 141 struct wahc *wa; /* Wire adapter we are plugged to */
142 struct usb_host_endpoint *ep; 142 struct usb_host_endpoint *ep;
143 struct urb *urb; /* URB we are transfering for */ 143 struct urb *urb; /* URB we are transferring for */
144 struct wa_seg **seg; /* transfer segments */ 144 struct wa_seg **seg; /* transfer segments */
145 u8 segs, segs_submitted, segs_done; 145 u8 segs, segs_submitted, segs_done;
146 unsigned is_inbound:1; 146 unsigned is_inbound:1;
@@ -161,7 +161,7 @@ static inline void wa_xfer_init(struct wa_xfer *xfer)
161} 161}
162 162
163/* 163/*
164 * Destory a transfer structure 164 * Destroy a transfer structure
165 * 165 *
166 * Note that the xfer->seg[index] thingies follow the URB life cycle, 166 * Note that the xfer->seg[index] thingies follow the URB life cycle,
167 * so we need to put them, not free them. 167 * so we need to put them, not free them.
@@ -494,7 +494,7 @@ static void __wa_xfer_setup_hdr0(struct wa_xfer *xfer,
494 * function does almost the same thing and they work closely 494 * function does almost the same thing and they work closely
495 * together. 495 * together.
496 * 496 *
497 * If the seg request has failed but this DTO phase has suceeded, 497 * If the seg request has failed but this DTO phase has succeeded,
498 * wa_seg_cb() has already failed the segment and moved the 498 * wa_seg_cb() has already failed the segment and moved the
499 * status to WA_SEG_ERROR, so this will go through 'case 0' and 499 * status to WA_SEG_ERROR, so this will go through 'case 0' and
500 * effectively do nothing. 500 * effectively do nothing.
diff --git a/drivers/usb/wusbcore/wusbhc.h b/drivers/usb/wusbcore/wusbhc.h
index 6bd426b7ec07..3a2d09162e70 100644
--- a/drivers/usb/wusbcore/wusbhc.h
+++ b/drivers/usb/wusbcore/wusbhc.h
@@ -231,7 +231,7 @@ struct wusb_port {
231 * 231 *
232 * Most of the times when you need to use it, it will be non-NULL, 232 * Most of the times when you need to use it, it will be non-NULL,
233 * so there is no real need to check for it (wusb_dev will 233 * so there is no real need to check for it (wusb_dev will
234 * dissapear before usb_dev). 234 * disappear before usb_dev).
235 * 235 *
236 * - The following fields need to be filled out before calling 236 * - The following fields need to be filled out before calling
237 * wusbhc_create(): ports_max, mmcies_max, mmcie_{add,rm}. 237 * wusbhc_create(): ports_max, mmcies_max, mmcie_{add,rm}.
diff --git a/drivers/uwb/driver.c b/drivers/uwb/driver.c
index 08bd6dbfd4a6..3e5454aba5d4 100644
--- a/drivers/uwb/driver.c
+++ b/drivers/uwb/driver.c
@@ -61,7 +61,7 @@
61 61
62 62
63/** 63/**
64 * If a beacon dissapears for longer than this, then we consider the 64 * If a beacon disappears for longer than this, then we consider the
65 * device who was represented by that beacon to be gone. 65 * device who was represented by that beacon to be gone.
66 * 66 *
67 * ECMA-368[17.2.3, last para] establishes that a device must not 67 * ECMA-368[17.2.3, last para] establishes that a device must not
diff --git a/drivers/uwb/drp.c b/drivers/uwb/drp.c
index a8d83e25e3b6..3fbcf789dfaa 100644
--- a/drivers/uwb/drp.c
+++ b/drivers/uwb/drp.c
@@ -27,7 +27,7 @@
27 27
28/* DRP Conflict Actions ([ECMA-368 2nd Edition] 17.4.6) */ 28/* DRP Conflict Actions ([ECMA-368 2nd Edition] 17.4.6) */
29enum uwb_drp_conflict_action { 29enum uwb_drp_conflict_action {
30 /* Reservation is mantained, no action needed */ 30 /* Reservation is maintained, no action needed */
31 UWB_DRP_CONFLICT_MANTAIN = 0, 31 UWB_DRP_CONFLICT_MANTAIN = 0,
32 32
33 /* the device shall not transmit frames in conflicting MASs in 33 /* the device shall not transmit frames in conflicting MASs in
@@ -741,12 +741,12 @@ void uwb_drp_process_all(struct uwb_rc *rc, struct uwb_rc_evt_drp *drp_evt,
741 * DRP notifications can occur for three different reasons: 741 * DRP notifications can occur for three different reasons:
742 * 742 *
743 * - UWB_DRP_NOTIF_DRP_IE_RECVD: one or more DRP IEs with the RC as 743 * - UWB_DRP_NOTIF_DRP_IE_RECVD: one or more DRP IEs with the RC as
744 * the target or source have been recieved. 744 * the target or source have been received.
745 * 745 *
746 * These DRP IEs could be new or for an existing reservation. 746 * These DRP IEs could be new or for an existing reservation.
747 * 747 *
748 * If the DRP IE for an existing reservation ceases to be to 748 * If the DRP IE for an existing reservation ceases to be to
749 * recieved for at least mMaxLostBeacons, the reservation should be 749 * received for at least mMaxLostBeacons, the reservation should be
750 * considered to be terminated. Note that the TERMINATE reason (see 750 * considered to be terminated. Note that the TERMINATE reason (see
751 * below) may not always be signalled (e.g., the remote device has 751 * below) may not always be signalled (e.g., the remote device has
752 * two or more reservations established with the RC). 752 * two or more reservations established with the RC).
diff --git a/drivers/uwb/lc-rc.c b/drivers/uwb/lc-rc.c
index b0091c771b9a..b4395f41a007 100644
--- a/drivers/uwb/lc-rc.c
+++ b/drivers/uwb/lc-rc.c
@@ -168,7 +168,7 @@ int uwb_rc_mac_addr_setup(struct uwb_rc *rc)
168 } 168 }
169 169
170 if (uwb_mac_addr_unset(&addr) || uwb_mac_addr_bcast(&addr)) { 170 if (uwb_mac_addr_unset(&addr) || uwb_mac_addr_bcast(&addr)) {
171 addr.data[0] = 0x02; /* locally adminstered and unicast */ 171 addr.data[0] = 0x02; /* locally administered and unicast */
172 get_random_bytes(&addr.data[1], sizeof(addr.data)-1); 172 get_random_bytes(&addr.data[1], sizeof(addr.data)-1);
173 173
174 result = uwb_rc_mac_addr_set(rc, &addr); 174 result = uwb_rc_mac_addr_set(rc, &addr);
diff --git a/drivers/uwb/reset.c b/drivers/uwb/reset.c
index 27849292b552..3de630b0f691 100644
--- a/drivers/uwb/reset.c
+++ b/drivers/uwb/reset.c
@@ -52,7 +52,7 @@ const char *__strerror[] = {
52 "cancelled", 52 "cancelled",
53 "invalid state", 53 "invalid state",
54 "invalid size", 54 "invalid size",
55 "ack not recieved", 55 "ack not received",
56 "no more asie notification", 56 "no more asie notification",
57}; 57};
58 58
diff --git a/drivers/uwb/umc-dev.c b/drivers/uwb/umc-dev.c
index ccd2184e05d2..b2948ec57878 100644
--- a/drivers/uwb/umc-dev.c
+++ b/drivers/uwb/umc-dev.c
@@ -78,7 +78,7 @@ EXPORT_SYMBOL_GPL(umc_device_register);
78 * First we unregister the device, make sure the driver can do it's 78 * First we unregister the device, make sure the driver can do it's
79 * resource release thing and then we try to release any left over 79 * resource release thing and then we try to release any left over
80 * resources. We take a ref to the device, to make sure it doesn't 80 * resources. We take a ref to the device, to make sure it doesn't
81 * dissapear under our feet. 81 * disappear under our feet.
82 */ 82 */
83void umc_device_unregister(struct umc_dev *umc) 83void umc_device_unregister(struct umc_dev *umc)
84{ 84{
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index ccecf9974587..4484c721f0f9 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -637,7 +637,7 @@ static inline unsigned int chan_to_field(unsigned int chan, const struct fb_bitf
637 * magnitude which needs to be scaled in this function for the hardware. 637 * magnitude which needs to be scaled in this function for the hardware.
638 * Things to take into consideration are how many color registers, if 638 * Things to take into consideration are how many color registers, if
639 * any, are supported with the current color visual. With truecolor mode 639 * any, are supported with the current color visual. With truecolor mode
640 * no color palettes are supported. Here a psuedo palette is created 640 * no color palettes are supported. Here a pseudo palette is created
641 * which we store the value in pseudo_palette in struct fb_info. For 641 * which we store the value in pseudo_palette in struct fb_info. For
642 * pseudocolor mode we have a limited color palette. To deal with this 642 * pseudocolor mode we have a limited color palette. To deal with this
643 * we can program what color is displayed for a particular pixel value. 643 * we can program what color is displayed for a particular pixel value.
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index d437b3daf1f5..ebb893c49e90 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -3124,12 +3124,12 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
3124 M = pll_regs[2]; 3124 M = pll_regs[2];
3125 3125
3126 /* 3126 /*
3127 * PLL Feedback Divider N (Dependant on CLOCK_CNTL): 3127 * PLL Feedback Divider N (Dependent on CLOCK_CNTL):
3128 */ 3128 */
3129 N = pll_regs[7 + (clock_cntl & 3)]; 3129 N = pll_regs[7 + (clock_cntl & 3)];
3130 3130
3131 /* 3131 /*
3132 * PLL Post Divider P (Dependant on CLOCK_CNTL): 3132 * PLL Post Divider P (Dependent on CLOCK_CNTL):
3133 */ 3133 */
3134 P = 1 << (pll_regs[6] >> ((clock_cntl & 3) << 1)); 3134 P = 1 << (pll_regs[6] >> ((clock_cntl & 3) << 1));
3135 3135
diff --git a/drivers/video/aty/mach64_cursor.c b/drivers/video/aty/mach64_cursor.c
index 2ba8b3c421a1..46f72ed53510 100644
--- a/drivers/video/aty/mach64_cursor.c
+++ b/drivers/video/aty/mach64_cursor.c
@@ -51,7 +51,7 @@
51 * to a larger number and saturate CUR_HORZ_POSN to zero. 51 * to a larger number and saturate CUR_HORZ_POSN to zero.
52 * 52 *
53 * if Y becomes negative, CUR_VERT_OFFSET must be adjusted to a larger number, 53 * if Y becomes negative, CUR_VERT_OFFSET must be adjusted to a larger number,
54 * CUR_OFFSET must be adjusted to a point to the appropraite line in the cursor 54 * CUR_OFFSET must be adjusted to a point to the appropriate line in the cursor
55 * definitation and CUR_VERT_POSN must be saturated to zero. 55 * definitation and CUR_VERT_POSN must be saturated to zero.
56 */ 56 */
57 57
diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c
index 4ea187d93768..5dff32ac8044 100644
--- a/drivers/video/au1200fb.c
+++ b/drivers/video/au1200fb.c
@@ -1572,7 +1572,7 @@ static int au1200fb_init_fbinfo(struct au1200fb_device *fbdev)
1572 /* Copy monitor specs from panel data */ 1572 /* Copy monitor specs from panel data */
1573 /* fixme: we're setting up LCD controller windows, so these dont give a 1573 /* fixme: we're setting up LCD controller windows, so these dont give a
1574 damn as to what the monitor specs are (the panel itself does, but that 1574 damn as to what the monitor specs are (the panel itself does, but that
1575 isnt done here...so maybe need a generic catchall monitor setting??? */ 1575 isn't done here...so maybe need a generic catchall monitor setting??? */
1576 memcpy(&fbi->monspecs, &panel->monspecs, sizeof(struct fb_monspecs)); 1576 memcpy(&fbi->monspecs, &panel->monspecs, sizeof(struct fb_monspecs));
1577 1577
1578 /* We first try the user mode passed in argument. If that failed, 1578 /* We first try the user mode passed in argument. If that failed,
diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backlight/corgi_lcd.c
index af6098396fe6..c6533bad26f8 100644
--- a/drivers/video/backlight/corgi_lcd.c
+++ b/drivers/video/backlight/corgi_lcd.c
@@ -109,7 +109,7 @@ static unsigned long corgibl_flags;
109#define CORGIBL_BATTLOW 0x02 109#define CORGIBL_BATTLOW 0x02
110 110
111/* 111/*
112 * This is only a psuedo I2C interface. We can't use the standard kernel 112 * This is only a pseudo I2C interface. We can't use the standard kernel
113 * routines as the interface is write only. We just assume the data is acked... 113 * routines as the interface is write only. We just assume the data is acked...
114 */ 114 */
115static void lcdtg_ssp_i2c_send(struct corgi_lcd *lcd, uint8_t data) 115static void lcdtg_ssp_i2c_send(struct corgi_lcd *lcd, uint8_t data)
diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c
index bbca3127071e..be20b5cbe26c 100644
--- a/drivers/video/backlight/locomolcd.c
+++ b/drivers/video/backlight/locomolcd.c
@@ -6,7 +6,7 @@
6 * GPL v2 6 * GPL v2
7 * 7 *
8 * This driver assumes single CPU. That's okay, because collie is 8 * This driver assumes single CPU. That's okay, because collie is
9 * slightly old hardware, and noone is going to retrofit second CPU to 9 * slightly old hardware, and no one is going to retrofit second CPU to
10 * old PDA. 10 * old PDA.
11 */ 11 */
12 12
diff --git a/drivers/video/bfin_adv7393fb.h b/drivers/video/bfin_adv7393fb.h
index 8c7f9e4fc6eb..cd591b5152a5 100644
--- a/drivers/video/bfin_adv7393fb.h
+++ b/drivers/video/bfin_adv7393fb.h
@@ -87,12 +87,12 @@ static const u8 init_NTSC_TESTPATTERN[] = {
87 87
88static const u8 init_NTSC[] = { 88static const u8 init_NTSC[] = {
89 0x00, 0x1E, /* Power up all DACs and PLL */ 89 0x00, 0x1E, /* Power up all DACs and PLL */
90 0xC3, 0x26, /* Program RGB->YCrCb Color Space convertion matrix */ 90 0xC3, 0x26, /* Program RGB->YCrCb Color Space conversion matrix */
91 0xC5, 0x12, /* Program RGB->YCrCb Color Space convertion matrix */ 91 0xC5, 0x12, /* Program RGB->YCrCb Color Space conversion matrix */
92 0xC2, 0x4A, /* Program RGB->YCrCb Color Space convertion matrix */ 92 0xC2, 0x4A, /* Program RGB->YCrCb Color Space conversion matrix */
93 0xC6, 0x5E, /* Program RGB->YCrCb Color Space convertion matrix */ 93 0xC6, 0x5E, /* Program RGB->YCrCb Color Space conversion matrix */
94 0xBD, 0x19, /* Program RGB->YCrCb Color Space convertion matrix */ 94 0xBD, 0x19, /* Program RGB->YCrCb Color Space conversion matrix */
95 0xBF, 0x42, /* Program RGB->YCrCb Color Space convertion matrix */ 95 0xBF, 0x42, /* Program RGB->YCrCb Color Space conversion matrix */
96 0x8C, 0x1F, /* NTSC Subcarrier Frequency */ 96 0x8C, 0x1F, /* NTSC Subcarrier Frequency */
97 0x8D, 0x7C, /* NTSC Subcarrier Frequency */ 97 0x8D, 0x7C, /* NTSC Subcarrier Frequency */
98 0x8E, 0xF0, /* NTSC Subcarrier Frequency */ 98 0x8E, 0xF0, /* NTSC Subcarrier Frequency */
@@ -109,12 +109,12 @@ static const u8 init_NTSC[] = {
109 109
110static const u8 init_PAL[] = { 110static const u8 init_PAL[] = {
111 0x00, 0x1E, /* Power up all DACs and PLL */ 111 0x00, 0x1E, /* Power up all DACs and PLL */
112 0xC3, 0x26, /* Program RGB->YCrCb Color Space convertion matrix */ 112 0xC3, 0x26, /* Program RGB->YCrCb Color Space conversion matrix */
113 0xC5, 0x12, /* Program RGB->YCrCb Color Space convertion matrix */ 113 0xC5, 0x12, /* Program RGB->YCrCb Color Space conversion matrix */
114 0xC2, 0x4A, /* Program RGB->YCrCb Color Space convertion matrix */ 114 0xC2, 0x4A, /* Program RGB->YCrCb Color Space conversion matrix */
115 0xC6, 0x5E, /* Program RGB->YCrCb Color Space convertion matrix */ 115 0xC6, 0x5E, /* Program RGB->YCrCb Color Space conversion matrix */
116 0xBD, 0x19, /* Program RGB->YCrCb Color Space convertion matrix */ 116 0xBD, 0x19, /* Program RGB->YCrCb Color Space conversion matrix */
117 0xBF, 0x42, /* Program RGB->YCrCb Color Space convertion matrix */ 117 0xBF, 0x42, /* Program RGB->YCrCb Color Space conversion matrix */
118 0x8C, 0xCB, /* PAL Subcarrier Frequency */ 118 0x8C, 0xCB, /* PAL Subcarrier Frequency */
119 0x8D, 0x8A, /* PAL Subcarrier Frequency */ 119 0x8D, 0x8A, /* PAL Subcarrier Frequency */
120 0x8E, 0x09, /* PAL Subcarrier Frequency */ 120 0x8E, 0x09, /* PAL Subcarrier Frequency */
diff --git a/drivers/video/console/font_mini_4x6.c b/drivers/video/console/font_mini_4x6.c
index a19a7f33133e..fa6e698e63c4 100644
--- a/drivers/video/console/font_mini_4x6.c
+++ b/drivers/video/console/font_mini_4x6.c
@@ -1,5 +1,5 @@
1 1
2/* Hand composed "Miniscule" 4x6 font, with binary data generated using 2/* Hand composed "Minuscule" 4x6 font, with binary data generated using
3 * Perl stub. 3 * Perl stub.
4 * 4 *
5 * Use 'perl -x mini_4x6.c < mini_4x6.c > new_version.c' to regenerate 5 * Use 'perl -x mini_4x6.c < mini_4x6.c > new_version.c' to regenerate
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index 8d61ef96eedd..8b7d47386f39 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -763,7 +763,7 @@ static int fb_wait_for_vsync(struct fb_info *info)
763 763
764 /* 764 /*
765 * Set flag to 0 and wait for isr to set to 1. It would seem there is a 765 * Set flag to 0 and wait for isr to set to 1. It would seem there is a
766 * race condition here where the ISR could have occured just before or 766 * race condition here where the ISR could have occurred just before or
767 * just after this set. But since we are just coarsely waiting for 767 * just after this set. But since we are just coarsely waiting for
768 * a frame to complete then that's OK. i.e. if the frame completed 768 * a frame to complete then that's OK. i.e. if the frame completed
769 * just before this code executed then we have to wait another full 769 * just before this code executed then we have to wait another full
diff --git a/drivers/video/display/display-sysfs.c b/drivers/video/display/display-sysfs.c
index f6a09ab0dac6..0c647d7af0ee 100644
--- a/drivers/video/display/display-sysfs.c
+++ b/drivers/video/display/display-sysfs.c
@@ -182,7 +182,7 @@ void display_device_unregister(struct display_device *ddev)
182 mutex_lock(&ddev->lock); 182 mutex_lock(&ddev->lock);
183 device_unregister(ddev->dev); 183 device_unregister(ddev->dev);
184 mutex_unlock(&ddev->lock); 184 mutex_unlock(&ddev->lock);
185 // Mark device index as avaliable 185 // Mark device index as available
186 mutex_lock(&allocated_dsp_lock); 186 mutex_lock(&allocated_dsp_lock);
187 idr_remove(&allocated_dsp, ddev->idx); 187 idr_remove(&allocated_dsp, ddev->idx);
188 mutex_unlock(&allocated_dsp_lock); 188 mutex_unlock(&allocated_dsp_lock);
diff --git a/drivers/video/ep93xx-fb.c b/drivers/video/ep93xx-fb.c
index b358d045f130..cbdb1bd77c21 100644
--- a/drivers/video/ep93xx-fb.c
+++ b/drivers/video/ep93xx-fb.c
@@ -456,7 +456,7 @@ static int __init ep93xxfb_alloc_videomem(struct fb_info *info)
456 * There is a bug in the ep93xx framebuffer which causes problems 456 * There is a bug in the ep93xx framebuffer which causes problems
457 * if bit 27 of the physical address is set. 457 * if bit 27 of the physical address is set.
458 * See: http://marc.info/?l=linux-arm-kernel&m=110061245502000&w=2 458 * See: http://marc.info/?l=linux-arm-kernel&m=110061245502000&w=2
459 * There does not seem to be any offical errata for this, but I 459 * There does not seem to be any official errata for this, but I
460 * have confirmed the problem exists on my hardware (ep9315) at 460 * have confirmed the problem exists on my hardware (ep9315) at
461 * least. 461 * least.
462 */ 462 */
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
index f4a32779168b..04251ce89184 100644
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
@@ -33,7 +33,7 @@
33 * for driver private data (info->par). info->par (if any) will be 33 * for driver private data (info->par). info->par (if any) will be
34 * aligned to sizeof(long). 34 * aligned to sizeof(long).
35 * 35 *
36 * Returns the new structure, or NULL if an error occured. 36 * Returns the new structure, or NULL if an error occurred.
37 * 37 *
38 */ 38 */
39struct fb_info *framebuffer_alloc(size_t size, struct device *dev) 39struct fb_info *framebuffer_alloc(size_t size, struct device *dev)
diff --git a/drivers/video/fm2fb.c b/drivers/video/fm2fb.c
index 1b0feb8e7244..d0533b7aad79 100644
--- a/drivers/video/fm2fb.c
+++ b/drivers/video/fm2fb.c
@@ -45,7 +45,7 @@
45 * buffer needs an amount of memory of 1.769.472 bytes which 45 * buffer needs an amount of memory of 1.769.472 bytes which
46 * is near to 2 MByte (the allocated address space of Zorro2). 46 * is near to 2 MByte (the allocated address space of Zorro2).
47 * The memory is channel interleaved. That means every channel 47 * The memory is channel interleaved. That means every channel
48 * owns four VRAMs. Unfortunatly most FrameMasters II are 48 * owns four VRAMs. Unfortunately most FrameMasters II are
49 * not assembled with memory for the alpha channel. In this 49 * not assembled with memory for the alpha channel. In this
50 * case it could be possible to add the frame buffer into the 50 * case it could be possible to add the frame buffer into the
51 * normal memory pool. 51 * normal memory pool.
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index 9048f87fa8c1..bedf5be27f05 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -882,7 +882,7 @@ static inline __u32 CNVT_TOHW(__u32 val, __u32 width)
882 * which needs to be scaled in this function for the hardware. Things to take 882 * which needs to be scaled in this function for the hardware. Things to take
883 * into consideration are how many color registers, if any, are supported with 883 * into consideration are how many color registers, if any, are supported with
884 * the current color visual. With truecolor mode no color palettes are 884 * the current color visual. With truecolor mode no color palettes are
885 * supported. Here a psuedo palette is created which we store the value in 885 * supported. Here a pseudo palette is created which we store the value in
886 * pseudo_palette in struct fb_info. For pseudocolor mode we have a limited 886 * pseudo_palette in struct fb_info. For pseudocolor mode we have a limited
887 * color palette. 887 * color palette.
888 */ 888 */
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c
index 933899dca33a..7e7b7a9ba274 100644
--- a/drivers/video/gbefb.c
+++ b/drivers/video/gbefb.c
@@ -721,7 +721,7 @@ static int gbefb_set_par(struct fb_info *info)
721 721
722 Tiles have the advantage that they can be allocated individually in 722 Tiles have the advantage that they can be allocated individually in
723 memory. However, this mapping is not linear at all, which is not 723 memory. However, this mapping is not linear at all, which is not
724 really convienient. In order to support linear addressing, the GBE 724 really convenient. In order to support linear addressing, the GBE
725 DMA hardware is fooled into thinking the screen is only one tile 725 DMA hardware is fooled into thinking the screen is only one tile
726 large and but has a greater height, so that the DMA transfer covers 726 large and but has a greater height, so that the DMA transfer covers
727 the same region. 727 the same region.
diff --git a/drivers/video/geode/lxfb.h b/drivers/video/geode/lxfb.h
index be8ccb47ebe0..cfcd8090f313 100644
--- a/drivers/video/geode/lxfb.h
+++ b/drivers/video/geode/lxfb.h
@@ -117,7 +117,7 @@ enum gp_registers {
117}; 117};
118 118
119#define GP_BLT_STATUS_CE (1 << 4) /* cmd buf empty */ 119#define GP_BLT_STATUS_CE (1 << 4) /* cmd buf empty */
120#define GP_BLT_STATUS_PB (1 << 0) /* primative busy */ 120#define GP_BLT_STATUS_PB (1 << 0) /* primitive busy */
121 121
122 122
123/* Display Controller registers (table 6-47 from the data book) */ 123/* Display Controller registers (table 6-47 from the data book) */
diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
index f5bedee4310a..7672d2ea9b35 100644
--- a/drivers/video/i810/i810_accel.c
+++ b/drivers/video/i810/i810_accel.c
@@ -112,7 +112,7 @@ static inline int wait_for_engine_idle(struct fb_info *info)
112 * @par: pointer to i810fb_par structure 112 * @par: pointer to i810fb_par structure
113 * 113 *
114 * DESCRIPTION: 114 * DESCRIPTION:
115 * Checks/waits for sufficent space in ringbuffer of size 115 * Checks/waits for sufficient space in ringbuffer of size
116 * space. Returns the tail of the buffer 116 * space. Returns the tail of the buffer
117 */ 117 */
118static inline u32 begin_iring(struct fb_info *info, u32 space) 118static inline u32 begin_iring(struct fb_info *info, u32 space)
diff --git a/drivers/video/kyro/STG4000OverlayDevice.c b/drivers/video/kyro/STG4000OverlayDevice.c
index a8c9713413e6..0aeeaa10708b 100644
--- a/drivers/video/kyro/STG4000OverlayDevice.c
+++ b/drivers/video/kyro/STG4000OverlayDevice.c
@@ -417,7 +417,7 @@ int SetOverlayViewPort(volatile STG4000REG __iomem *pSTGReg,
417 /***************** Horizontal decimation/scaling ***************************/ 417 /***************** Horizontal decimation/scaling ***************************/
418 418
419 /* 419 /*
420 * Now we handle the horizontal case, this is a simplified verison of 420 * Now we handle the horizontal case, this is a simplified version of
421 * the vertical case in that we decimate by factors of 2. as we are 421 * the vertical case in that we decimate by factors of 2. as we are
422 * working in words we should always be able to decimate by these 422 * working in words we should always be able to decimate by these
423 * factors. as we always have to have a buffer which is aligned to a 423 * factors. as we always have to have a buffer which is aligned to a
diff --git a/drivers/video/kyro/STG4000Reg.h b/drivers/video/kyro/STG4000Reg.h
index 244549e61368..5d6269882589 100644
--- a/drivers/video/kyro/STG4000Reg.h
+++ b/drivers/video/kyro/STG4000Reg.h
@@ -16,7 +16,7 @@
16 16
17/* 17/*
18 * Macros that access memory mapped card registers in PCI space 18 * Macros that access memory mapped card registers in PCI space
19 * Add an appropraite section for your OS or processor architecture. 19 * Add an appropriate section for your OS or processor architecture.
20 */ 20 */
21#if defined(__KERNEL__) 21#if defined(__KERNEL__)
22#include <asm/page.h> 22#include <asm/page.h>
diff --git a/drivers/video/matrox/matroxfb_DAC1064.h b/drivers/video/matrox/matroxfb_DAC1064.h
index c6ed7801efe2..1e6e45b57b78 100644
--- a/drivers/video/matrox/matroxfb_DAC1064.h
+++ b/drivers/video/matrox/matroxfb_DAC1064.h
@@ -46,7 +46,7 @@ void DAC1064_global_restore(struct matrox_fb_info *minfo);
46#define M1064_XDVICLKCTRL_DVILOOPCTL 0x30 46#define M1064_XDVICLKCTRL_DVILOOPCTL 0x30
47 /* CRTC2 pixel clock allowed to(0)/blocked from(1) driving CRTC2 */ 47 /* CRTC2 pixel clock allowed to(0)/blocked from(1) driving CRTC2 */
48#define M1064_XDVICLKCTRL_C2DVICLKEN 0x40 48#define M1064_XDVICLKCTRL_C2DVICLKEN 0x40
49 /* P1PLL loop filter bandwith selection */ 49 /* P1PLL loop filter bandwidth selection */
50#define M1064_XDVICLKCTRL_P1LOOPBWDTCTL 0x80 50#define M1064_XDVICLKCTRL_P1LOOPBWDTCTL 0x80
51#define M1064_XCURCOL0RED 0x08 51#define M1064_XCURCOL0RED 0x08
52#define M1064_XCURCOL0GREEN 0x09 52#define M1064_XCURCOL0GREEN 0x09
diff --git a/drivers/video/matrox/matroxfb_Ti3026.c b/drivers/video/matrox/matroxfb_Ti3026.c
index 835aaaae6b96..9a44cec394b5 100644
--- a/drivers/video/matrox/matroxfb_Ti3026.c
+++ b/drivers/video/matrox/matroxfb_Ti3026.c
@@ -387,7 +387,7 @@ static int Ti3026_init(struct matrox_fb_info *minfo, struct my_timming *m)
387 hw->DACreg[POS3026_XMISCCTRL] = TVP3026_XMISCCTRL_DAC_PUP | TVP3026_XMISCCTRL_DAC_8BIT | TVP3026_XMISCCTRL_PSEL_DIS | TVP3026_XMISCCTRL_PSEL_LOW; 387 hw->DACreg[POS3026_XMISCCTRL] = TVP3026_XMISCCTRL_DAC_PUP | TVP3026_XMISCCTRL_DAC_8BIT | TVP3026_XMISCCTRL_PSEL_DIS | TVP3026_XMISCCTRL_PSEL_LOW;
388 break; 388 break;
389 case 16: 389 case 16:
390 /* XLATCHCTRL should be _4_1 / _2_1... Why is not? (_2_1 is used everytime) */ 390 /* XLATCHCTRL should be _4_1 / _2_1... Why is not? (_2_1 is used every time) */
391 hw->DACreg[POS3026_XTRUECOLORCTRL] = (minfo->fbcon.var.green.length == 5) ? (TVP3026_XTRUECOLORCTRL_DIRECTCOLOR | TVP3026_XTRUECOLORCTRL_ORGB_1555) : (TVP3026_XTRUECOLORCTRL_DIRECTCOLOR | TVP3026_XTRUECOLORCTRL_RGB_565); 391 hw->DACreg[POS3026_XTRUECOLORCTRL] = (minfo->fbcon.var.green.length == 5) ? (TVP3026_XTRUECOLORCTRL_DIRECTCOLOR | TVP3026_XTRUECOLORCTRL_ORGB_1555) : (TVP3026_XTRUECOLORCTRL_DIRECTCOLOR | TVP3026_XTRUECOLORCTRL_RGB_565);
392 hw->DACreg[POS3026_XMUXCTRL] = muxctrl | TVP3026_XMUXCTRL_PIXEL_16BIT; 392 hw->DACreg[POS3026_XMUXCTRL] = muxctrl | TVP3026_XMUXCTRL_PIXEL_16BIT;
393 hw->DACreg[POS3026_XCLKCTRL] = TVP3026_XCLKCTRL_SRC_PLL | TVP3026_XCLKCTRL_DIV2; 393 hw->DACreg[POS3026_XCLKCTRL] = TVP3026_XCLKCTRL_SRC_PLL | TVP3026_XCLKCTRL_DIV2;
@@ -399,7 +399,7 @@ static int Ti3026_init(struct matrox_fb_info *minfo, struct my_timming *m)
399 hw->DACreg[POS3026_XCLKCTRL] = TVP3026_XCLKCTRL_SRC_PLL | TVP3026_XCLKCTRL_DIV4; 399 hw->DACreg[POS3026_XCLKCTRL] = TVP3026_XCLKCTRL_SRC_PLL | TVP3026_XCLKCTRL_DIV4;
400 break; 400 break;
401 case 32: 401 case 32:
402 /* XLATCHCTRL should be _2_1 / _1_1... Why is not? (_2_1 is used everytime) */ 402 /* XLATCHCTRL should be _2_1 / _1_1... Why is not? (_2_1 is used every time) */
403 hw->DACreg[POS3026_XMUXCTRL] = muxctrl | TVP3026_XMUXCTRL_PIXEL_32BIT; 403 hw->DACreg[POS3026_XMUXCTRL] = muxctrl | TVP3026_XMUXCTRL_PIXEL_32BIT;
404 break; 404 break;
405 default: 405 default:
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index 5ce6fa6e59f0..44bf8d4a216b 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -621,7 +621,7 @@ static int matroxfb_decode_var(const struct matrox_fb_info *minfo,
621 var->yoffset = var->yres_virtual - var->yres; 621 var->yoffset = var->yres_virtual - var->yres;
622 622
623 if (bpp == 16 && var->green.length == 5) { 623 if (bpp == 16 && var->green.length == 5) {
624 bpp--; /* an artifical value - 15 */ 624 bpp--; /* an artificial value - 15 */
625 } 625 }
626 626
627 for (rgbt = table; rgbt->bpp < bpp; rgbt++); 627 for (rgbt = table; rgbt->bpp < bpp; rgbt++);
diff --git a/drivers/video/matrox/matroxfb_base.h b/drivers/video/matrox/matroxfb_base.h
index f96a471cb1a8..11ed57bb704e 100644
--- a/drivers/video/matrox/matroxfb_base.h
+++ b/drivers/video/matrox/matroxfb_base.h
@@ -12,7 +12,7 @@
12#undef MATROXFB_DEBUG 12#undef MATROXFB_DEBUG
13 13
14/* heavy debugging: */ 14/* heavy debugging: */
15/* -- logs putc[s], so everytime a char is displayed, it's logged */ 15/* -- logs putc[s], so every time a char is displayed, it's logged */
16#undef MATROXFB_DEBUG_HEAVY 16#undef MATROXFB_DEBUG_HEAVY
17 17
18/* This one _could_ cause infinite loops */ 18/* This one _could_ cause infinite loops */
diff --git a/drivers/video/nuc900fb.h b/drivers/video/nuc900fb.h
index 6c23aa3d3b89..bc7c9300f276 100644
--- a/drivers/video/nuc900fb.h
+++ b/drivers/video/nuc900fb.h
@@ -8,7 +8,7 @@
8 * the Free Software Foundation; either version 2 of the License, or 8 * the Free Software Foundation; either version 2 of the License, or
9 * (at your option) any later version. 9 * (at your option) any later version.
10 * 10 *
11 * Auther: 11 * Author:
12 * Wang Qiang(rurality.linux@gmail.com) 2009/12/16 12 * Wang Qiang(rurality.linux@gmail.com) 2009/12/16
13 */ 13 */
14 14
diff --git a/drivers/video/omap/Kconfig b/drivers/video/omap/Kconfig
index 15e7f1912af9..196fa2e7f438 100644
--- a/drivers/video/omap/Kconfig
+++ b/drivers/video/omap/Kconfig
@@ -64,7 +64,7 @@ config FB_OMAP_MANUAL_UPDATE
64 depends on FB_OMAP && FB_OMAP_LCDC_EXTERNAL 64 depends on FB_OMAP && FB_OMAP_LCDC_EXTERNAL
65 help 65 help
66 Say Y here, if your user-space applications are capable of 66 Say Y here, if your user-space applications are capable of
67 notifying the frame buffer driver when a change has occured in 67 notifying the frame buffer driver when a change has occurred in
68 the frame buffer content and thus a reload of the image data to 68 the frame buffer content and thus a reload of the image data to
69 the external frame buffer is required. If unsure, say N. 69 the external frame buffer is required. If unsure, say N.
70 70
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 0d44f070ef36..a981def8099a 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -587,7 +587,7 @@ static void get_edid_timing_data(u8 *edid)
587 struct hdmi_cm cm; 587 struct hdmi_cm cm;
588 struct omap_video_timings edid_timings; 588 struct omap_video_timings edid_timings;
589 589
590 /* seach block 0, there are 4 DTDs arranged in priority order */ 590 /* search block 0, there are 4 DTDs arranged in priority order */
591 for (count = 0; count < EDID_SIZE_BLOCK0_TIMING_DESCRIPTOR; count++) { 591 for (count = 0; count < EDID_SIZE_BLOCK0_TIMING_DESCRIPTOR; count++) {
592 current_descriptor_addrs = 592 current_descriptor_addrs =
593 EDID_DESCRIPTOR_BLOCK0_ADDRESS + 593 EDID_DESCRIPTOR_BLOCK0_ADDRESS +
diff --git a/drivers/video/pxa3xx-gcu.c b/drivers/video/pxa3xx-gcu.c
index cf4beb9dc9bb..0283c7021090 100644
--- a/drivers/video/pxa3xx-gcu.c
+++ b/drivers/video/pxa3xx-gcu.c
@@ -25,7 +25,7 @@
25 25
26/* 26/*
27 * WARNING: This controller is attached to System Bus 2 of the PXA which 27 * WARNING: This controller is attached to System Bus 2 of the PXA which
28 * needs its arbiter to be enabled explictly (CKENB & 1<<9). 28 * needs its arbiter to be enabled explicitly (CKENB & 1<<9).
29 * There is currently no way to do this from Linux, so you need to teach 29 * There is currently no way to do this from Linux, so you need to teach
30 * your bootloader for now. 30 * your bootloader for now.
31 */ 31 */
diff --git a/drivers/video/savage/savagefb.h b/drivers/video/savage/savagefb.h
index e4c3f214eb8e..4e9490c19d7d 100644
--- a/drivers/video/savage/savagefb.h
+++ b/drivers/video/savage/savagefb.h
@@ -153,7 +153,7 @@ struct savage_reg {
153 unsigned char CRTC[25]; /* Crtc Controller */ 153 unsigned char CRTC[25]; /* Crtc Controller */
154 unsigned char Sequencer[5]; /* Video Sequencer */ 154 unsigned char Sequencer[5]; /* Video Sequencer */
155 unsigned char Graphics[9]; /* Video Graphics */ 155 unsigned char Graphics[9]; /* Video Graphics */
156 unsigned char Attribute[21]; /* Video Atribute */ 156 unsigned char Attribute[21]; /* Video Attribute */
157 157
158 unsigned int mode, refresh; 158 unsigned int mode, refresh;
159 unsigned char SR08, SR0E, SR0F; 159 unsigned char SR08, SR0E, SR0F;
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index 487911e2926c..a2dc1a7ec758 100644
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -385,7 +385,7 @@ SavageSetup2DEngine(struct savagefb_par *par)
385 BCI_SEND(GlobalBitmapDescriptor); 385 BCI_SEND(GlobalBitmapDescriptor);
386 386
387 /* 387 /*
388 * I don't know why, sending this twice fixes the intial black screen, 388 * I don't know why, sending this twice fixes the initial black screen,
389 * prevents X from crashing at least in Toshiba laptops with SavageIX. 389 * prevents X from crashing at least in Toshiba laptops with SavageIX.
390 * --Tony 390 * --Tony
391 */ 391 */
@@ -2211,7 +2211,7 @@ static int __devinit savagefb_probe(struct pci_dev* dev,
2211 goto failed_mmio; 2211 goto failed_mmio;
2212 2212
2213 video_len = savage_init_hw(par); 2213 video_len = savage_init_hw(par);
2214 /* FIXME: cant be negative */ 2214 /* FIXME: can't be negative */
2215 if (video_len < 0) { 2215 if (video_len < 0) {
2216 err = video_len; 2216 err = video_len;
2217 goto failed_mmio; 2217 goto failed_mmio;
diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c
index 46d1a64fe80d..56ef6b3a9851 100644
--- a/drivers/video/sm501fb.c
+++ b/drivers/video/sm501fb.c
@@ -265,7 +265,7 @@ static unsigned long sm501fb_ps_to_hz(unsigned long psvalue)
265 return (unsigned long)numerator; 265 return (unsigned long)numerator;
266} 266}
267 267
268/* sm501fb_hz_to_ps is identical to the oposite transform */ 268/* sm501fb_hz_to_ps is identical to the opposite transform */
269 269
270#define sm501fb_hz_to_ps(x) sm501fb_ps_to_hz(x) 270#define sm501fb_hz_to_ps(x) sm501fb_ps_to_hz(x)
271 271
@@ -1719,7 +1719,7 @@ static int sm501fb_init_fb(struct fb_info *fb,
1719 (head == HEAD_CRT) ? &sm501fb_ops_crt : &sm501fb_ops_pnl, 1719 (head == HEAD_CRT) ? &sm501fb_ops_crt : &sm501fb_ops_pnl,
1720 sizeof(struct fb_ops)); 1720 sizeof(struct fb_ops));
1721 1721
1722 /* update ops dependant on what we've been passed */ 1722 /* update ops dependent on what we've been passed */
1723 1723
1724 if ((pd->flags & SM501FB_FLAG_USE_HWCURSOR) == 0) 1724 if ((pd->flags & SM501FB_FLAG_USE_HWCURSOR) == 0)
1725 par->ops.fb_cursor = NULL; 1725 par->ops.fb_cursor = NULL;
diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c
index 2ab704118c44..2301c275d63a 100644
--- a/drivers/video/sstfb.c
+++ b/drivers/video/sstfb.c
@@ -221,7 +221,7 @@ static int __sst_wait_idle(u8 __iomem *vbase)
221 while(1) { 221 while(1) {
222 if (__sst_read(vbase, STATUS) & STATUS_FBI_BUSY) { 222 if (__sst_read(vbase, STATUS) & STATUS_FBI_BUSY) {
223 f_dddprintk("status: busy\n"); 223 f_dddprintk("status: busy\n");
224/* FIXME basicaly, this is a busy wait. maybe not that good. oh well; 224/* FIXME basically, this is a busy wait. maybe not that good. oh well;
225 * this is a small loop after all. 225 * this is a small loop after all.
226 * Or maybe we should use mdelay() or udelay() here instead ? */ 226 * Or maybe we should use mdelay() or udelay() here instead ? */
227 count = 0; 227 count = 0;
@@ -501,7 +501,7 @@ static int sstfb_set_par(struct fb_info *info)
501 } 501 }
502 502
503 if (IS_VOODOO2(par)) { 503 if (IS_VOODOO2(par)) {
504 /* voodoo2 has 32 pixel wide tiles , BUT stange things 504 /* voodoo2 has 32 pixel wide tiles , BUT strange things
505 happen with odd number of tiles */ 505 happen with odd number of tiles */
506 par->tiles_in_X = (info->var.xres + 63 ) / 64 * 2; 506 par->tiles_in_X = (info->var.xres + 63 ) / 64 * 2;
507 } else { 507 } else {
@@ -920,11 +920,11 @@ static int __devinit sst_detect_ti(struct fb_info *info)
920 * we get the 1st byte (M value) of preset f1,f7 and fB 920 * we get the 1st byte (M value) of preset f1,f7 and fB
921 * why those 3 ? mmmh... for now, i'll do it the glide way... 921 * why those 3 ? mmmh... for now, i'll do it the glide way...
922 * and ask questions later. anyway, it seems that all the freq registers are 922 * and ask questions later. anyway, it seems that all the freq registers are
923 * realy at their default state (cf specs) so i ask again, why those 3 regs ? 923 * really at their default state (cf specs) so i ask again, why those 3 regs ?
924 * mmmmh.. it seems that's much more ugly than i thought. we use f0 and fA for 924 * mmmmh.. it seems that's much more ugly than i thought. we use f0 and fA for
925 * pll programming, so in fact, we *hope* that the f1, f7 & fB won't be 925 * pll programming, so in fact, we *hope* that the f1, f7 & fB won't be
926 * touched... 926 * touched...
927 * is it realy safe ? how can i reset this ramdac ? geee... 927 * is it really safe ? how can i reset this ramdac ? geee...
928 */ 928 */
929static int __devinit sst_detect_ics(struct fb_info *info) 929static int __devinit sst_detect_ics(struct fb_info *info)
930{ 930{
diff --git a/drivers/video/sticore.h b/drivers/video/sticore.h
index 7fe5be4bc70e..addf7b615ef8 100644
--- a/drivers/video/sticore.h
+++ b/drivers/video/sticore.h
@@ -79,7 +79,7 @@ struct sti_glob_cfg_ext {
79 u8 curr_mon; /* current monitor configured */ 79 u8 curr_mon; /* current monitor configured */
80 u8 friendly_boot; /* in friendly boot mode */ 80 u8 friendly_boot; /* in friendly boot mode */
81 s16 power; /* power calculation (in Watts) */ 81 s16 power; /* power calculation (in Watts) */
82 s32 freq_ref; /* frequency refrence */ 82 s32 freq_ref; /* frequency reference */
83 u32 sti_mem_addr; /* pointer to global sti memory (size=sti_mem_request) */ 83 u32 sti_mem_addr; /* pointer to global sti memory (size=sti_mem_request) */
84 u32 future_ptr; /* pointer to future data */ 84 u32 future_ptr; /* pointer to future data */
85}; 85};
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c
index 3ee5e63cfa4f..a99b994c9b6b 100644
--- a/drivers/video/tdfxfb.c
+++ b/drivers/video/tdfxfb.c
@@ -877,12 +877,12 @@ static void tdfxfb_fillrect(struct fb_info *info,
877 else 877 else
878 tdfx_rop = TDFX_ROP_XOR; 878 tdfx_rop = TDFX_ROP_XOR;
879 879
880 /* asume always rect->height < 4096 */ 880 /* assume always rect->height < 4096 */
881 if (dy + rect->height > 4095) { 881 if (dy + rect->height > 4095) {
882 dstbase = stride * dy; 882 dstbase = stride * dy;
883 dy = 0; 883 dy = 0;
884 } 884 }
885 /* asume always rect->width < 4096 */ 885 /* assume always rect->width < 4096 */
886 if (dx + rect->width > 4095) { 886 if (dx + rect->width > 4095) {
887 dstbase += dx * bpp >> 3; 887 dstbase += dx * bpp >> 3;
888 dx = 0; 888 dx = 0;
@@ -915,22 +915,22 @@ static void tdfxfb_copyarea(struct fb_info *info,
915 u32 dstbase = 0; 915 u32 dstbase = 0;
916 u32 srcbase = 0; 916 u32 srcbase = 0;
917 917
918 /* asume always area->height < 4096 */ 918 /* assume always area->height < 4096 */
919 if (sy + area->height > 4095) { 919 if (sy + area->height > 4095) {
920 srcbase = stride * sy; 920 srcbase = stride * sy;
921 sy = 0; 921 sy = 0;
922 } 922 }
923 /* asume always area->width < 4096 */ 923 /* assume always area->width < 4096 */
924 if (sx + area->width > 4095) { 924 if (sx + area->width > 4095) {
925 srcbase += sx * bpp >> 3; 925 srcbase += sx * bpp >> 3;
926 sx = 0; 926 sx = 0;
927 } 927 }
928 /* asume always area->height < 4096 */ 928 /* assume always area->height < 4096 */
929 if (dy + area->height > 4095) { 929 if (dy + area->height > 4095) {
930 dstbase = stride * dy; 930 dstbase = stride * dy;
931 dy = 0; 931 dy = 0;
932 } 932 }
933 /* asume always area->width < 4096 */ 933 /* assume always area->width < 4096 */
934 if (dx + area->width > 4095) { 934 if (dx + area->width > 4095) {
935 dstbase += dx * bpp >> 3; 935 dstbase += dx * bpp >> 3;
936 dx = 0; 936 dx = 0;
@@ -1003,12 +1003,12 @@ static void tdfxfb_imageblit(struct fb_info *info, const struct fb_image *image)
1003#else 1003#else
1004 srcfmt = 0x400000; 1004 srcfmt = 0x400000;
1005#endif 1005#endif
1006 /* asume always image->height < 4096 */ 1006 /* assume always image->height < 4096 */
1007 if (dy + image->height > 4095) { 1007 if (dy + image->height > 4095) {
1008 dstbase = stride * dy; 1008 dstbase = stride * dy;
1009 dy = 0; 1009 dy = 0;
1010 } 1010 }
1011 /* asume always image->width < 4096 */ 1011 /* assume always image->width < 4096 */
1012 if (dx + image->width > 4095) { 1012 if (dx + image->width > 4095) {
1013 dstbase += dx * bpp >> 3; 1013 dstbase += dx * bpp >> 3;
1014 dx = 0; 1014 dx = 0;
@@ -1124,7 +1124,7 @@ static int tdfxfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
1124 * lower half (least significant 64 bits) of a 128 bit word 1124 * lower half (least significant 64 bits) of a 128 bit word
1125 * and pattern 1 the upper half. If you examine the data of 1125 * and pattern 1 the upper half. If you examine the data of
1126 * the cursor image the graphics card uses then from the 1126 * the cursor image the graphics card uses then from the
1127 * begining you see line one of pattern 0, line one of 1127 * beginning you see line one of pattern 0, line one of
1128 * pattern 1, line two of pattern 0, line two of pattern 1, 1128 * pattern 1, line two of pattern 0, line two of pattern 1,
1129 * etc etc. The linear stride for the cursor is always 16 bytes 1129 * etc etc. The linear stride for the cursor is always 16 bytes
1130 * (128 bits) which is the maximum cursor width times two for 1130 * (128 bits) which is the maximum cursor width times two for
diff --git a/drivers/video/tmiofb.c b/drivers/video/tmiofb.c
index 9710bf8caeae..0c341d739604 100644
--- a/drivers/video/tmiofb.c
+++ b/drivers/video/tmiofb.c
@@ -359,7 +359,7 @@ tmiofb_acc_wait(struct fb_info *info, unsigned int ccs)
359{ 359{
360 struct tmiofb_par *par = info->par; 360 struct tmiofb_par *par = info->par;
361 /* 361 /*
362 * This code can be called whith interrupts disabled. 362 * This code can be called with interrupts disabled.
363 * So instead of relaying on irq to trigger the event, 363 * So instead of relaying on irq to trigger the event,
364 * poll the state till the necessary command is executed. 364 * poll the state till the necessary command is executed.
365 */ 365 */
diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
index 2c8364e9b632..68041d9dc260 100644
--- a/drivers/video/udlfb.c
+++ b/drivers/video/udlfb.c
@@ -769,7 +769,7 @@ static int dlfb_ops_ioctl(struct fb_info *info, unsigned int cmd,
769 769
770 /* 770 /*
771 * If we have a damage-aware client, turn fb_defio "off" 771 * If we have a damage-aware client, turn fb_defio "off"
772 * To avoid perf imact of unecessary page fault handling. 772 * To avoid perf imact of unnecessary page fault handling.
773 * Done by resetting the delay for this fb_info to a very 773 * Done by resetting the delay for this fb_info to a very
774 * long period. Pages will become writable and stay that way. 774 * long period. Pages will become writable and stay that way.
775 * Reset to normal value when all clients have closed this fb. 775 * Reset to normal value when all clients have closed this fb.
diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
index 28ccab44a391..53b2c5aae067 100644
--- a/drivers/video/vga16fb.c
+++ b/drivers/video/vga16fb.c
@@ -152,7 +152,7 @@ static inline int setop(int op)
152} 152}
153 153
154/* Set the Enable Set/Reset Register and return its old value. 154/* Set the Enable Set/Reset Register and return its old value.
155 The code here always uses value 0xf for thsi register. */ 155 The code here always uses value 0xf for this register. */
156static inline int setsr(int sr) 156static inline int setsr(int sr)
157{ 157{
158 int oldsr; 158 int oldsr;
diff --git a/drivers/video/via/via_utility.c b/drivers/video/via/via_utility.c
index d05ccb62b55f..35458a5eadc8 100644
--- a/drivers/video/via/via_utility.c
+++ b/drivers/video/via/via_utility.c
@@ -174,7 +174,7 @@ void viafb_set_gamma_table(int bpp, unsigned int *gamma_table)
174 } 174 }
175 175
176 /* If adjust Gamma value in SAMM, fill IGA1, 176 /* If adjust Gamma value in SAMM, fill IGA1,
177 IGA2 Gamma table simultanous. */ 177 IGA2 Gamma table simultaneous. */
178 /* Switch to IGA2 Gamma Table */ 178 /* Switch to IGA2 Gamma Table */
179 if ((active_device_amount > 1) && 179 if ((active_device_amount > 1) &&
180 !((viaparinfo->chip_info->gfx_chip_name == 180 !((viaparinfo->chip_info->gfx_chip_name ==
diff --git a/drivers/video/via/via_utility.h b/drivers/video/via/via_utility.h
index 1670ba82143f..f23be1708c14 100644
--- a/drivers/video/via/via_utility.h
+++ b/drivers/video/via/via_utility.h
@@ -21,7 +21,7 @@
21#ifndef __VIAUTILITY_H__ 21#ifndef __VIAUTILITY_H__
22#define __VIAUTILITY_H__ 22#define __VIAUTILITY_H__
23 23
24/* These functions are used to get infomation about device's state */ 24/* These functions are used to get information about device's state */
25void viafb_get_device_support_state(u32 *support_state); 25void viafb_get_device_support_state(u32 *support_state);
26void viafb_get_device_connect_state(u32 *connect_state); 26void viafb_get_device_connect_state(u32 *connect_state);
27bool viafb_lcd_get_support_expand_state(u32 xres, u32 yres); 27bool viafb_lcd_get_support_expand_state(u32 xres, u32 yres);
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index f555b891cc72..b64818953aa7 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -2019,7 +2019,7 @@ int __init viafb_init(void)
2019 return -EINVAL; 2019 return -EINVAL;
2020 2020
2021 printk(KERN_INFO 2021 printk(KERN_INFO
2022 "VIA Graphics Intergration Chipset framebuffer %d.%d initializing\n", 2022 "VIA Graphics Integration Chipset framebuffer %d.%d initializing\n",
2023 VERSION_MAJOR, VERSION_MINOR); 2023 VERSION_MAJOR, VERSION_MINOR);
2024 return 0; 2024 return 0;
2025} 2025}
diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c
index d8b12c32e3ef..c8be8af0cc6d 100644
--- a/drivers/video/w100fb.c
+++ b/drivers/video/w100fb.c
@@ -1306,7 +1306,7 @@ static void w100_init_lcd(struct w100fb_par *par)
1306 union graphic_v_disp_u graphic_v_disp; 1306 union graphic_v_disp_u graphic_v_disp;
1307 union crtc_total_u crtc_total; 1307 union crtc_total_u crtc_total;
1308 1308
1309 /* w3200 doesnt like undefined bits being set so zero register values first */ 1309 /* w3200 doesn't like undefined bits being set so zero register values first */
1310 1310
1311 active_h_disp.val = 0; 1311 active_h_disp.val = 0;
1312 active_h_disp.f.active_h_start=mode->left_margin; 1312 active_h_disp.f.active_h_start=mode->left_margin;
diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c
index 38e96ab90945..5ef385bfed18 100644
--- a/drivers/w1/masters/omap_hdq.c
+++ b/drivers/w1/masters/omap_hdq.c
@@ -545,7 +545,7 @@ static void omap_w1_write_byte(void *_hdq, u8 byte)
545 return; 545 return;
546 } 546 }
547 547
548 /* Second write, data transfered. Release the module */ 548 /* Second write, data transferred. Release the module */
549 if (hdq_data->init_trans > 1) { 549 if (hdq_data->init_trans > 1) {
550 omap_hdq_put(hdq_data); 550 omap_hdq_put(hdq_data);
551 ret = mutex_lock_interruptible(&hdq_data->hdq_mutex); 551 ret = mutex_lock_interruptible(&hdq_data->hdq_mutex);
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index b69d71482554..1b0f98bc51b5 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -933,7 +933,7 @@ config PNX833X_WDT
933 depends on SOC_PNX8335 933 depends on SOC_PNX8335
934 help 934 help
935 Hardware driver for the PNX833x's watchdog. This is a 935 Hardware driver for the PNX833x's watchdog. This is a
936 watchdog timer that will reboot the machine after a programable 936 watchdog timer that will reboot the machine after a programmable
937 timer has expired and no process has written to /dev/watchdog during 937 timer has expired and no process has written to /dev/watchdog during
938 that time. 938 that time.
939 939
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index d520bf9c3355..3f8608b922a7 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -4,7 +4,7 @@
4 4
5# Only one watchdog can succeed. We probe the ISA/PCI/USB based 5# Only one watchdog can succeed. We probe the ISA/PCI/USB based
6# watchdog-cards first, then the architecture specific watchdog 6# watchdog-cards first, then the architecture specific watchdog
7# drivers and then the architecture independant "softdog" driver. 7# drivers and then the architecture independent "softdog" driver.
8# This means that if your ISA/PCI/USB card isn't detected that 8# This means that if your ISA/PCI/USB card isn't detected that
9# you can fall back to an architecture specific driver and if 9# you can fall back to an architecture specific driver and if
10# that also fails then you can fall back to the software watchdog 10# that also fails then you can fall back to the software watchdog
@@ -153,7 +153,7 @@ obj-$(CONFIG_WATCHDOG_CP1XXX) += cpwd.o
153# Xen 153# Xen
154obj-$(CONFIG_XEN_WDT) += xen_wdt.o 154obj-$(CONFIG_XEN_WDT) += xen_wdt.o
155 155
156# Architecture Independant 156# Architecture Independent
157obj-$(CONFIG_WM831X_WATCHDOG) += wm831x_wdt.o 157obj-$(CONFIG_WM831X_WATCHDOG) += wm831x_wdt.o
158obj-$(CONFIG_WM8350_WATCHDOG) += wm8350_wdt.o 158obj-$(CONFIG_WM8350_WATCHDOG) += wm8350_wdt.o
159obj-$(CONFIG_MAX63XX_WATCHDOG) += max63xx_wdt.o 159obj-$(CONFIG_MAX63XX_WATCHDOG) += max63xx_wdt.o
diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c
index 2ffce4d75443..b6a2b58cbe64 100644
--- a/drivers/watchdog/acquirewdt.c
+++ b/drivers/watchdog/acquirewdt.c
@@ -26,7 +26,7 @@
26 * Theory of Operation: 26 * Theory of Operation:
27 * The Watch-Dog Timer is provided to ensure that standalone 27 * The Watch-Dog Timer is provided to ensure that standalone
28 * Systems can always recover from catastrophic conditions that 28 * Systems can always recover from catastrophic conditions that
29 * caused the CPU to crash. This condition may have occured by 29 * caused the CPU to crash. This condition may have occurred by
30 * external EMI or a software bug. When the CPU stops working 30 * external EMI or a software bug. When the CPU stops working
31 * correctly, hardware on the board will either perform a hardware 31 * correctly, hardware on the board will either perform a hardware
32 * reset (cold boot) or a non-maskable interrupt (NMI) to bring the 32 * reset (cold boot) or a non-maskable interrupt (NMI) to bring the
diff --git a/drivers/watchdog/pc87413_wdt.c b/drivers/watchdog/pc87413_wdt.c
index 139d773300c6..b7c139051575 100644
--- a/drivers/watchdog/pc87413_wdt.c
+++ b/drivers/watchdog/pc87413_wdt.c
@@ -49,7 +49,7 @@
49#define WDT_DATA_IO_PORT (WDT_INDEX_IO_PORT+1) 49#define WDT_DATA_IO_PORT (WDT_INDEX_IO_PORT+1)
50#define SWC_LDN 0x04 50#define SWC_LDN 0x04
51#define SIOCFG2 0x22 /* Serial IO register */ 51#define SIOCFG2 0x22 /* Serial IO register */
52#define WDCTL 0x10 /* Watchdog-Timer-Controll-Register */ 52#define WDCTL 0x10 /* Watchdog-Timer-Control-Register */
53#define WDTO 0x11 /* Watchdog timeout register */ 53#define WDTO 0x11 /* Watchdog timeout register */
54#define WDCFG 0x12 /* Watchdog config register */ 54#define WDCFG 0x12 /* Watchdog config register */
55 55
diff --git a/drivers/watchdog/sbc7240_wdt.c b/drivers/watchdog/sbc7240_wdt.c
index 67ddeb1c830a..ff11504c376e 100644
--- a/drivers/watchdog/sbc7240_wdt.c
+++ b/drivers/watchdog/sbc7240_wdt.c
@@ -273,7 +273,7 @@ static int __init sbc7240_wdt_init(void)
273 273
274 /* The IO port 0x043 used to disable the watchdog 274 /* The IO port 0x043 used to disable the watchdog
275 * is already claimed by the system timer, so we 275 * is already claimed by the system timer, so we
276 * cant request_region() it ...*/ 276 * can't request_region() it ...*/
277 277
278 if (timeout < 1 || timeout > SBC7240_MAX_TIMEOUT) { 278 if (timeout < 1 || timeout > SBC7240_MAX_TIMEOUT) {
279 timeout = SBC7240_TIMEOUT; 279 timeout = SBC7240_TIMEOUT;
diff --git a/drivers/watchdog/sch311x_wdt.c b/drivers/watchdog/sch311x_wdt.c
index b61ab1c54293..c7cf4b01f58d 100644
--- a/drivers/watchdog/sch311x_wdt.c
+++ b/drivers/watchdog/sch311x_wdt.c
@@ -201,7 +201,7 @@ static void sch311x_wdt_get_status(int *status)
201 spin_lock(&sch311x_wdt_data.io_lock); 201 spin_lock(&sch311x_wdt_data.io_lock);
202 202
203 /* -- Watchdog timer control -- 203 /* -- Watchdog timer control --
204 * Bit 0 Status Bit: 0 = Timer counting, 1 = Timeout occured 204 * Bit 0 Status Bit: 0 = Timer counting, 1 = Timeout occurred
205 * Bit 1 Reserved 205 * Bit 1 Reserved
206 * Bit 2 Force Timeout: 1 = Forces WD timeout event (self-cleaning) 206 * Bit 2 Force Timeout: 1 = Forces WD timeout event (self-cleaning)
207 * Bit 3 P20 Force Timeout enabled: 207 * Bit 3 P20 Force Timeout enabled:
diff --git a/drivers/watchdog/shwdt.c b/drivers/watchdog/shwdt.c
index 4e3e7eb5919c..db84f2322d1a 100644
--- a/drivers/watchdog/shwdt.c
+++ b/drivers/watchdog/shwdt.c
@@ -50,7 +50,7 @@
50 * necssary. 50 * necssary.
51 * 51 *
52 * As a result of this timing problem, the only modes that are particularly 52 * As a result of this timing problem, the only modes that are particularly
53 * feasible are the 4096 and the 2048 divisors, which yeild 5.25 and 2.62ms 53 * feasible are the 4096 and the 2048 divisors, which yield 5.25 and 2.62ms
54 * overflow periods respectively. 54 * overflow periods respectively.
55 * 55 *
56 * Also, since we can't really expect userspace to be responsive enough 56 * Also, since we can't really expect userspace to be responsive enough
diff --git a/drivers/watchdog/smsc37b787_wdt.c b/drivers/watchdog/smsc37b787_wdt.c
index df88cfa05f35..e97b0499bd0d 100644
--- a/drivers/watchdog/smsc37b787_wdt.c
+++ b/drivers/watchdog/smsc37b787_wdt.c
@@ -191,7 +191,7 @@ static inline void wdt_timer_conf(unsigned char conf)
191static inline void wdt_timer_ctrl(unsigned char reg) 191static inline void wdt_timer_ctrl(unsigned char reg)
192{ 192{
193 /* -- Watchdog timer control -- 193 /* -- Watchdog timer control --
194 * Bit 0 Status Bit: 0 = Timer counting, 1 = Timeout occured 194 * Bit 0 Status Bit: 0 = Timer counting, 1 = Timeout occurred
195 * Bit 1 Power LED Toggle: 0 = Disable Toggle, 1 = Toggle at 1 Hz 195 * Bit 1 Power LED Toggle: 0 = Disable Toggle, 1 = Toggle at 1 Hz
196 * Bit 2 Force Timeout: 1 = Forces WD timeout event (self-cleaning) 196 * Bit 2 Force Timeout: 1 = Forces WD timeout event (self-cleaning)
197 * Bit 3 P20 Force Timeout enabled: 197 * Bit 3 P20 Force Timeout enabled:
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index 0a0efe713bc8..0d80e08b6439 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -90,7 +90,7 @@ static void wdt_setload(unsigned int timeout)
90 /* 90 /*
91 * sp805 runs counter with given value twice, after the end of first 91 * sp805 runs counter with given value twice, after the end of first
92 * counter it gives an interrupt and then starts counter again. If 92 * counter it gives an interrupt and then starts counter again. If
93 * interrupt already occured then it resets the system. This is why 93 * interrupt already occurred then it resets the system. This is why
94 * load is half of what should be required. 94 * load is half of what should be required.
95 */ 95 */
96 load = div_u64(rate, 2) * timeout - 1; 96 load = div_u64(rate, 2) * timeout - 1;
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 036343ba204e..42d6c930cc87 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -5,7 +5,7 @@
5 * domain gets 1024 event channels, but NR_IRQ is not that large, we 5 * domain gets 1024 event channels, but NR_IRQ is not that large, we
6 * must dynamically map irqs<->event channels. The event channels 6 * must dynamically map irqs<->event channels. The event channels
7 * interface with the rest of the kernel by defining a xen interrupt 7 * interface with the rest of the kernel by defining a xen interrupt
8 * chip. When an event is recieved, it is mapped to an irq and sent 8 * chip. When an event is received, it is mapped to an irq and sent
9 * through the normal interrupt processing path. 9 * through the normal interrupt processing path.
10 * 10 *
11 * There are four kinds of events which can be mapped to an event 11 * There are four kinds of events which can be mapped to an event
@@ -416,7 +416,7 @@ static int __must_check xen_allocate_irq_dynamic(void)
416#ifdef CONFIG_X86_IO_APIC 416#ifdef CONFIG_X86_IO_APIC
417 /* 417 /*
418 * For an HVM guest or domain 0 which see "real" (emulated or 418 * For an HVM guest or domain 0 which see "real" (emulated or
419 * actual repectively) GSIs we allocate dynamic IRQs 419 * actual respectively) GSIs we allocate dynamic IRQs
420 * e.g. those corresponding to event channels or MSIs 420 * e.g. those corresponding to event channels or MSIs
421 * etc. from the range above those "real" GSIs to avoid 421 * etc. from the range above those "real" GSIs to avoid
422 * collisions. 422 * collisions.