aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS6
-rw-r--r--Documentation/ABI/testing/sysfs-bus-css2
-rw-r--r--Documentation/ABI/testing/sysfs-class-led2
-rw-r--r--Documentation/DocBook/dvb/dvbproperty.xml2
-rw-r--r--Documentation/DocBook/dvb/frontend.xml2
-rw-r--r--Documentation/DocBook/kernel-locking.tmpl2
-rw-r--r--Documentation/DocBook/libata.tmpl10
-rw-r--r--Documentation/DocBook/mtdnand.tmpl12
-rw-r--r--Documentation/DocBook/regulator.tmpl4
-rw-r--r--Documentation/DocBook/uio-howto.tmpl2
-rw-r--r--Documentation/DocBook/usb.tmpl2
-rw-r--r--Documentation/DocBook/v4l/common.xml2
-rw-r--r--Documentation/DocBook/v4l/controls.xml2
-rw-r--r--Documentation/DocBook/v4l/dev-subdev.xml2
-rw-r--r--Documentation/DocBook/v4l/libv4l.xml2
-rw-r--r--Documentation/DocBook/v4l/remote_controllers.xml2
-rw-r--r--Documentation/DocBook/writing-an-alsa-driver.tmpl2
-rw-r--r--Documentation/PCI/MSI-HOWTO.txt4
-rw-r--r--Documentation/SecurityBugs2
-rw-r--r--Documentation/SubmittingDrivers2
-rw-r--r--Documentation/SubmittingPatches2
-rw-r--r--Documentation/arm/IXP4xx4
-rw-r--r--Documentation/arm/Samsung-S3C24XX/Suspend.txt2
-rw-r--r--Documentation/arm/Samsung/GPIO.txt2
-rw-r--r--Documentation/block/biodoc.txt4
-rw-r--r--Documentation/cpu-hotplug.txt2
-rw-r--r--Documentation/dell_rbu.txt2
-rw-r--r--Documentation/device-mapper/dm-service-time.txt2
-rw-r--r--Documentation/devicetree/bindings/fb/sm501fb.txt4
-rw-r--r--Documentation/devicetree/bindings/mtd/fsl-upm-nand.txt2
-rw-r--r--Documentation/devicetree/bindings/net/can/sja1000.txt2
-rw-r--r--Documentation/devicetree/bindings/powerpc/fsl/mpic.txt2
-rw-r--r--Documentation/dvb/README.dvb-usb2
-rw-r--r--Documentation/dvb/ci.txt2
-rw-r--r--Documentation/dvb/faq.txt2
-rw-r--r--Documentation/edac.txt2
-rw-r--r--Documentation/eisa.txt2
-rw-r--r--Documentation/fb/viafb.txt4
-rw-r--r--Documentation/filesystems/autofs4-mount-control.txt2
-rw-r--r--Documentation/filesystems/caching/netfs-api.txt18
-rw-r--r--Documentation/filesystems/configfs/configfs.txt2
-rw-r--r--Documentation/filesystems/ext4.txt4
-rw-r--r--Documentation/filesystems/gfs2-uevents.txt2
-rw-r--r--Documentation/filesystems/gfs2.txt2
-rw-r--r--Documentation/filesystems/ntfs.txt2
-rw-r--r--Documentation/filesystems/ocfs2.txt2
-rw-r--r--Documentation/filesystems/path-lookup.txt4
-rw-r--r--Documentation/filesystems/pohmelfs/network_protocol.txt2
-rw-r--r--Documentation/filesystems/proc.txt6
-rw-r--r--Documentation/filesystems/squashfs.txt2
-rw-r--r--Documentation/filesystems/sysfs.txt2
-rw-r--r--Documentation/filesystems/vfs.txt2
-rw-r--r--Documentation/filesystems/xfs-delayed-logging-design.txt8
-rw-r--r--Documentation/hwmon/abituguru2
-rw-r--r--Documentation/hwmon/abituguru-datasheet8
-rw-r--r--Documentation/hwmon/abituguru32
-rw-r--r--Documentation/hwmon/pmbus6
-rw-r--r--Documentation/hwmon/sysfs-interface2
-rw-r--r--Documentation/hwmon/w83781d2
-rw-r--r--Documentation/hwmon/w83791d2
-rw-r--r--Documentation/i2c/busses/i2c-parport-light2
-rw-r--r--Documentation/i2c/busses/i2c-sis96x2
-rw-r--r--Documentation/i2c/busses/i2c-taos-evm2
-rw-r--r--Documentation/i2o/README2
-rw-r--r--Documentation/ia64/aliasing-test.c2
-rw-r--r--Documentation/input/joystick-parport.txt2
-rw-r--r--Documentation/input/rotary-encoder.txt2
-rw-r--r--Documentation/input/walkera0701.txt2
-rw-r--r--Documentation/irqflags-tracing.txt2
-rw-r--r--Documentation/isdn/INTERFACE.CAPI2
-rw-r--r--Documentation/kbuild/kbuild.txt8
-rw-r--r--Documentation/kernel-parameters.txt2
-rw-r--r--Documentation/kvm/mmu.txt2
-rw-r--r--Documentation/kvm/ppc-pv.txt2
-rw-r--r--Documentation/kvm/timekeeping.txt2
-rw-r--r--Documentation/media-framework.txt4
-rw-r--r--Documentation/mips/AU1xxx_IDE.README4
-rw-r--r--Documentation/misc-devices/ics932s4012
-rw-r--r--Documentation/networking/3c359.txt2
-rw-r--r--Documentation/networking/README.ipw22002
-rw-r--r--Documentation/networking/bonding.txt2
-rw-r--r--Documentation/networking/caif/Linux-CAIF.txt2
-rw-r--r--Documentation/networking/caif/spi_porting.txt2
-rw-r--r--Documentation/networking/can.txt2
-rw-r--r--Documentation/networking/ieee802154.txt2
-rw-r--r--Documentation/networking/olympic.txt2
-rw-r--r--Documentation/networking/packet_mmap.txt2
-rw-r--r--Documentation/networking/s2io.txt4
-rw-r--r--Documentation/networking/tc-actions-env-rules.txt4
-rw-r--r--Documentation/power/devices.txt2
-rw-r--r--Documentation/power/notifiers.txt4
-rw-r--r--Documentation/power/opp.txt2
-rw-r--r--Documentation/power/swsusp.txt4
-rw-r--r--Documentation/power/userland-swsusp.txt6
-rw-r--r--Documentation/powerpc/hvcs.txt2
-rw-r--r--Documentation/scsi/ChangeLog.lpfc18
-rw-r--r--Documentation/scsi/ChangeLog.megaraid2
-rw-r--r--Documentation/scsi/ChangeLog.ncr53c8xx2
-rw-r--r--Documentation/scsi/ChangeLog.sym53c8xx2
-rw-r--r--Documentation/scsi/aha152x.txt2
-rw-r--r--Documentation/scsi/aic79xx.txt12
-rw-r--r--Documentation/scsi/ibmmca.txt4
-rw-r--r--Documentation/scsi/scsi-changer.txt2
-rw-r--r--Documentation/scsi/scsi_eh.txt2
-rw-r--r--Documentation/scsi/scsi_fc_transport.txt2
-rw-r--r--Documentation/serial/moxa-smartio2
-rw-r--r--Documentation/serial/n_gsm.txt2
-rw-r--r--Documentation/sound/alsa/ALSA-Configuration.txt4
-rw-r--r--Documentation/sound/oss/README.OSS2
-rw-r--r--Documentation/spi/pxa2xx2
-rw-r--r--Documentation/spi/spi-lm70llp2
-rw-r--r--Documentation/telephony/ixj.txt2
-rw-r--r--Documentation/trace/ring-buffer-design.txt2
-rw-r--r--Documentation/video4linux/README.pvrusb22
-rw-r--r--Documentation/video4linux/bttv/README2
-rw-r--r--Documentation/video4linux/bttv/README.freeze2
-rw-r--r--Documentation/video4linux/bttv/Sound-FAQ2
-rw-r--r--Documentation/video4linux/pxa_camera.txt8
-rw-r--r--Documentation/video4linux/v4l2-framework.txt2
-rw-r--r--Documentation/vm/active_mm.txt2
-rw-r--r--Documentation/vm/hugetlbpage.txt2
-rw-r--r--Documentation/vm/overcommit-accounting2
-rw-r--r--Documentation/w1/slaves/w1_ds24236
-rw-r--r--Documentation/w1/w1.netlink2
-rw-r--r--Documentation/watchdog/hpwdt.txt2
-rw-r--r--arch/alpha/include/asm/elf.h2
-rw-r--r--arch/alpha/kernel/core_lca.c4
-rw-r--r--arch/alpha/kernel/err_marvel.c2
-rw-r--r--arch/alpha/lib/ev67-strrchr.S2
-rw-r--r--arch/alpha/lib/fls.c2
-rw-r--r--arch/alpha/lib/strrchr.S2
-rw-r--r--arch/alpha/oprofile/op_model_ev67.c2
-rw-r--r--arch/arm/Kconfig2
-rw-r--r--arch/arm/Kconfig-nommu2
-rw-r--r--arch/arm/common/pl330.c4
-rw-r--r--arch/arm/include/asm/fpstate.h2
-rw-r--r--arch/arm/include/asm/glue-cache.h2
-rw-r--r--arch/arm/include/asm/glue.h4
-rw-r--r--arch/arm/include/asm/hardware/pl080.h2
-rw-r--r--arch/arm/include/asm/system.h2
-rw-r--r--arch/arm/include/asm/ucontext.h2
-rw-r--r--arch/arm/kernel/swp_emulate.c2
-rw-r--r--arch/arm/mach-at91/board-carmeva.c2
-rw-r--r--arch/arm/mach-at91/include/mach/at91_mci.h2
-rw-r--r--arch/arm/mach-at91/include/mach/gpio.h2
-rw-r--r--arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c6
-rw-r--r--arch/arm/mach-bcmring/dma.c4
-rw-r--r--arch/arm/mach-bcmring/include/csp/dmacHw.h6
-rw-r--r--arch/arm/mach-bcmring/include/mach/csp/chipcHw_def.h2
-rw-r--r--arch/arm/mach-bcmring/include/mach/csp/chipcHw_inline.h2
-rw-r--r--arch/arm/mach-bcmring/include/mach/csp/intcHw_reg.h4
-rw-r--r--arch/arm/mach-bcmring/include/mach/reg_umi.h2
-rw-r--r--arch/arm/mach-davinci/board-neuros-osd2.c2
-rw-r--r--arch/arm/mach-davinci/cpufreq.c2
-rw-r--r--arch/arm/mach-davinci/da850.c2
-rw-r--r--arch/arm/mach-davinci/dm355.c2
-rw-r--r--arch/arm/mach-davinci/dm644x.c2
-rw-r--r--arch/arm/mach-davinci/include/mach/cputype.h2
-rw-r--r--arch/arm/mach-ep93xx/gpio.c2
-rw-r--r--arch/arm/mach-exynos4/include/mach/gpio.h2
-rw-r--r--arch/arm/mach-exynos4/mct.c2
-rw-r--r--arch/arm/mach-exynos4/setup-sdhci-gpio.c4
-rw-r--r--arch/arm/mach-exynos4/setup-sdhci.c2
-rw-r--r--arch/arm/mach-iop13xx/pci.c4
-rw-r--r--arch/arm/mach-kirkwood/tsx1x-common.c2
-rw-r--r--arch/arm/mach-lpc32xx/pm.c2
-rw-r--r--arch/arm/mach-mmp/time.c2
-rw-r--r--arch/arm/mach-msm/acpuclock-arm11.c2
-rw-r--r--arch/arm/mach-msm/scm.c2
-rw-r--r--arch/arm/mach-omap1/ams-delta-fiq-handler.S2
-rw-r--r--arch/arm/mach-omap1/board-sx1.c2
-rw-r--r--arch/arm/mach-omap1/devices.c2
-rw-r--r--arch/arm/mach-omap1/include/mach/ams-delta-fiq.h2
-rw-r--r--arch/arm/mach-omap2/board-igep0020.c2
-rw-r--r--arch/arm/mach-omap2/board-igep0030.c2
-rw-r--r--arch/arm/mach-omap2/clockdomain.c2
-rw-r--r--arch/arm/mach-omap2/clockdomain.h2
-rw-r--r--arch/arm/mach-omap2/cpuidle34xx.c4
-rw-r--r--arch/arm/mach-omap2/devices.c6
-rw-r--r--arch/arm/mach-omap2/dma.c2
-rw-r--r--arch/arm/mach-omap2/gpio.c2
-rw-r--r--arch/arm/mach-omap2/hsmmc.c2
-rw-r--r--arch/arm/mach-omap2/mcbsp.c2
-rw-r--r--arch/arm/mach-omap2/mux.c2
-rw-r--r--arch/arm/mach-omap2/mux2430.h2
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_2430_data.c2
-rw-r--r--arch/arm/mach-omap2/omap_phy_internal.c4
-rw-r--r--arch/arm/mach-omap2/omap_twl.c2
-rw-r--r--arch/arm/mach-omap2/powerdomain.c2
-rw-r--r--arch/arm/mach-omap2/powerdomain.h2
-rw-r--r--arch/arm/mach-omap2/powerdomains3xxx_data.c2
-rw-r--r--arch/arm/mach-omap2/smartreflex.c2
-rw-r--r--arch/arm/mach-omap2/voltage.c4
-rw-r--r--arch/arm/mach-orion5x/addr-map.c2
-rw-r--r--arch/arm/mach-orion5x/net2big-setup.c2
-rw-r--r--arch/arm/mach-orion5x/ts209-setup.c2
-rw-r--r--arch/arm/mach-orion5x/ts409-setup.c2
-rw-r--r--arch/arm/mach-pxa/include/mach/pxa3xx-regs.h2
-rw-r--r--arch/arm/mach-pxa/include/mach/zeus.h2
-rw-r--r--arch/arm/mach-pxa/mioa701.c2
-rw-r--r--arch/arm/mach-s3c2410/include/mach/dma.h2
-rw-r--r--arch/arm/mach-s3c2410/include/mach/regs-mem.h2
-rw-r--r--arch/arm/mach-s3c2410/mach-n30.c2
-rw-r--r--arch/arm/mach-s3c2440/mach-mini2440.c2
-rw-r--r--arch/arm/mach-s3c64xx/dma.c2
-rw-r--r--arch/arm/mach-s5pc100/include/mach/regs-fb.h2
-rw-r--r--arch/arm/mach-s5pc100/setup-sdhci.c2
-rw-r--r--arch/arm/mach-s5pv210/include/mach/gpio.h2
-rw-r--r--arch/arm/mach-s5pv210/setup-sdhci-gpio.c4
-rw-r--r--arch/arm/mach-s5pv210/setup-sdhci.c2
-rw-r--r--arch/arm/mach-sa1100/Makefile2
-rw-r--r--arch/arm/mach-sa1100/cpu-sa1100.c2
-rw-r--r--arch/arm/mach-sa1100/include/mach/SA-1100.h2
-rw-r--r--arch/arm/mach-sa1100/jornada720_ssp.c4
-rw-r--r--arch/arm/mach-tegra/dma.c4
-rw-r--r--arch/arm/mach-tegra/include/mach/dma.h4
-rw-r--r--arch/arm/mach-u300/clock.c6
-rw-r--r--arch/arm/mach-ux500/board-mop500.c2
-rw-r--r--arch/arm/mach-ux500/include/mach/db8500-regs.h10
-rw-r--r--arch/arm/mm/cache-v4wb.S2
-rw-r--r--arch/arm/mm/cache-v4wt.S2
-rw-r--r--arch/arm/mm/cache-v7.S2
-rw-r--r--arch/arm/mm/proc-arm1020.S2
-rw-r--r--arch/arm/mm/proc-arm1020e.S2
-rw-r--r--arch/arm/mm/proc-arm1022.S2
-rw-r--r--arch/arm/mm/proc-arm1026.S2
-rw-r--r--arch/arm/mm/proc-arm720.S2
-rw-r--r--arch/arm/mm/proc-arm920.S2
-rw-r--r--arch/arm/mm/proc-arm922.S2
-rw-r--r--arch/arm/mm/proc-arm925.S2
-rw-r--r--arch/arm/mm/proc-macros.S2
-rw-r--r--arch/arm/mm/proc-v6.S4
-rw-r--r--arch/arm/mm/proc-v7.S2
-rw-r--r--arch/arm/plat-mxc/cpufreq.c2
-rw-r--r--arch/arm/plat-mxc/include/mach/entry-macro.S4
-rw-r--r--arch/arm/plat-mxc/include/mach/mxc_nand.h2
-rw-r--r--arch/arm/plat-omap/devices.c2
-rw-r--r--arch/arm/plat-omap/dma.c4
-rw-r--r--arch/arm/plat-omap/include/plat/gpio.h2
-rw-r--r--arch/arm/plat-omap/include/plat/gpmc.h2
-rw-r--r--arch/arm/plat-omap/mcbsp.c2
-rw-r--r--arch/arm/plat-pxa/include/plat/mfp.h2
-rw-r--r--arch/arm/plat-s3c24xx/Makefile2
-rw-r--r--arch/arm/plat-s3c24xx/cpu-freq.c2
-rw-r--r--arch/arm/plat-s3c24xx/dma.c2
-rw-r--r--arch/arm/plat-s5p/irq-gpioint.c2
-rw-r--r--arch/arm/plat-samsung/include/plat/clock.h2
-rw-r--r--arch/arm/plat-samsung/include/plat/gpio-cfg-helpers.h2
-rw-r--r--arch/arm/plat-samsung/include/plat/gpio-cfg.h6
-rw-r--r--arch/arm/plat-samsung/include/plat/gpio-core.h2
-rw-r--r--arch/arm/plat-samsung/include/plat/sdhci.h4
-rw-r--r--arch/arm/plat-samsung/s3c-pl330.c2
-rw-r--r--arch/arm/plat-spear/include/plat/clock.h2
-rw-r--r--arch/blackfin/Kconfig.debug2
-rw-r--r--arch/blackfin/include/asm/traps.h2
-rw-r--r--arch/blackfin/kernel/kgdb.c2
-rw-r--r--arch/blackfin/kernel/traps.c2
-rw-r--r--arch/blackfin/lib/ins.S2
-rw-r--r--arch/blackfin/lib/memmove.S2
-rw-r--r--arch/blackfin/mach-bf537/boards/stamp.c2
-rw-r--r--arch/blackfin/mach-common/entry.S4
-rw-r--r--arch/blackfin/mach-common/head.S2
-rw-r--r--arch/cris/arch-v10/README.mm2
-rw-r--r--arch/cris/arch-v10/drivers/sync_serial.c2
-rw-r--r--arch/cris/arch-v32/drivers/axisflashmap.c2
-rw-r--r--arch/cris/arch-v32/drivers/mach-a3/nandflash.c2
-rw-r--r--arch/cris/arch-v32/drivers/mach-fs/nandflash.c2
-rw-r--r--arch/cris/arch-v32/drivers/sync_serial.c2
-rw-r--r--arch/cris/arch-v32/kernel/entry.S2
-rw-r--r--arch/cris/arch-v32/kernel/irq.c2
-rw-r--r--arch/cris/arch-v32/kernel/kgdb.c2
-rw-r--r--arch/cris/arch-v32/kernel/process.c2
-rw-r--r--arch/cris/arch-v32/kernel/signal.c2
-rw-r--r--arch/cris/arch-v32/mach-a3/arbiter.c4
-rw-r--r--arch/cris/arch-v32/mach-fs/arbiter.c2
-rw-r--r--arch/cris/boot/rescue/head_v10.S2
-rw-r--r--arch/cris/include/arch-v32/arch/hwregs/Makefile2
-rw-r--r--arch/cris/include/arch-v32/arch/hwregs/iop/Makefile2
-rw-r--r--arch/cris/include/asm/pgtable.h2
-rw-r--r--arch/cris/kernel/traps.c2
-rw-r--r--arch/frv/include/asm/pci.h2
-rw-r--r--arch/frv/include/asm/spr-regs.h2
-rw-r--r--arch/frv/include/asm/virtconvert.h2
-rw-r--r--arch/frv/kernel/entry-table.S4
-rw-r--r--arch/ia64/Kconfig4
-rw-r--r--arch/ia64/include/asm/pal.h2
-rw-r--r--arch/ia64/include/asm/perfmon_default_smpl.h4
-rw-r--r--arch/ia64/include/asm/sn/bte.h2
-rw-r--r--arch/ia64/include/asm/sn/shub_mmr.h2
-rw-r--r--arch/ia64/include/asm/sn/shubio.h4
-rw-r--r--arch/ia64/kernel/cyclone.c2
-rw-r--r--arch/ia64/kernel/perfmon_default_smpl.c2
-rw-r--r--arch/ia64/kernel/smpboot.c2
-rw-r--r--arch/ia64/kernel/topology.c2
-rw-r--r--arch/ia64/kvm/process.c2
-rw-r--r--arch/ia64/lib/do_csum.S2
-rw-r--r--arch/ia64/sn/kernel/irq.c4
-rw-r--r--arch/ia64/sn/pci/pcibr/pcibr_dma.c2
-rw-r--r--arch/m32r/include/asm/m32104ut/m32104ut_pld.h2
-rw-r--r--arch/m32r/include/asm/m32700ut/m32700ut_pld.h2
-rw-r--r--arch/m32r/include/asm/opsput/opsput_pld.h2
-rw-r--r--arch/m32r/include/asm/pgtable-2level.h2
-rw-r--r--arch/m32r/mm/fault.c4
-rw-r--r--arch/m68k/atari/atakeyb.c2
-rw-r--r--arch/m68k/fpsp040/bindec.S2
-rw-r--r--arch/m68k/ifpsp060/src/fpsp.S10
-rw-r--r--arch/m68k/ifpsp060/src/pfpsp.S8
-rw-r--r--arch/m68k/include/asm/atariints.h2
-rw-r--r--arch/m68k/include/asm/bootstd.h2
-rw-r--r--arch/m68k/include/asm/commproc.h4
-rw-r--r--arch/m68k/include/asm/delay_no.h2
-rw-r--r--arch/m68k/include/asm/gpio.h2
-rw-r--r--arch/m68k/include/asm/m520xsim.h2
-rw-r--r--arch/m68k/include/asm/m523xsim.h2
-rw-r--r--arch/m68k/include/asm/m527xsim.h2
-rw-r--r--arch/m68k/include/asm/m5307sim.h2
-rw-r--r--arch/m68k/include/asm/m5407sim.h2
-rw-r--r--arch/m68k/include/asm/m68360_quicc.h2
-rw-r--r--arch/m68k/include/asm/mac_oss.h2
-rw-r--r--arch/m68k/include/asm/mac_via.h2
-rw-r--r--arch/m68k/include/asm/macintosh.h2
-rw-r--r--arch/m68k/include/asm/mcftimer.h2
-rw-r--r--arch/m68k/kernel/head.S12
-rw-r--r--arch/m68k/kernel/vmlinux.lds_no.S2
-rw-r--r--arch/m68k/platform/523x/config.c2
-rw-r--r--arch/m68k/platform/5272/intc.c2
-rw-r--r--arch/m68k/platform/527x/config.c2
-rw-r--r--arch/m68k/platform/528x/config.c2
-rw-r--r--arch/m68k/platform/coldfire/cache.c2
-rw-r--r--arch/m68k/platform/coldfire/entry.S2
-rw-r--r--arch/m68k/platform/coldfire/head.S2
-rw-r--r--arch/m68k/platform/coldfire/intc.c2
-rw-r--r--arch/m68k/platform/coldfire/sltimers.c2
-rw-r--r--arch/m68k/q40/README2
-rw-r--r--arch/microblaze/Makefile2
-rw-r--r--arch/microblaze/include/asm/io.h2
-rw-r--r--arch/microblaze/include/asm/pci-bridge.h2
-rw-r--r--arch/microblaze/include/asm/pci.h2
-rw-r--r--arch/microblaze/kernel/cpu/cache.c2
-rw-r--r--arch/microblaze/lib/memcpy.c8
-rw-r--r--arch/microblaze/lib/memmove.c6
-rw-r--r--arch/microblaze/lib/memset.c2
-rw-r--r--arch/microblaze/pci/indirect_pci.c2
-rw-r--r--arch/microblaze/platform/generic/Kconfig.auto2
-rw-r--r--arch/mips/Kconfig2
-rw-r--r--arch/mips/Makefile4
-rw-r--r--arch/mips/alchemy/common/clocks.c2
-rw-r--r--arch/mips/cavium-octeon/executive/octeon-model.c2
-rw-r--r--arch/mips/cavium-octeon/octeon-platform.c2
-rw-r--r--arch/mips/cavium-octeon/setup.c2
-rw-r--r--arch/mips/fw/arc/promlib.c2
-rw-r--r--arch/mips/include/asm/dec/prom.h2
-rw-r--r--arch/mips/include/asm/floppy.h2
-rw-r--r--arch/mips/include/asm/hw_irq.h2
-rw-r--r--arch/mips/include/asm/io.h2
-rw-r--r--arch/mips/include/asm/irqflags.h2
-rw-r--r--arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h2
-rw-r--r--arch/mips/include/asm/mach-ip32/mc146818rtc.h2
-rw-r--r--arch/mips/include/asm/mach-loongson/cs5536/cs5536.h2
-rw-r--r--arch/mips/include/asm/mach-pb1x00/pb1000.h2
-rw-r--r--arch/mips/include/asm/mach-pb1x00/pb1200.h2
-rw-r--r--arch/mips/include/asm/mach-pb1x00/pb1550.h2
-rw-r--r--arch/mips/include/asm/mach-powertv/dma-coherence.h2
-rw-r--r--arch/mips/include/asm/mipsregs.h4
-rw-r--r--arch/mips/include/asm/octeon/cvmx-bootinfo.h2
-rw-r--r--arch/mips/include/asm/octeon/cvmx-bootmem.h2
-rw-r--r--arch/mips/include/asm/octeon/cvmx-l2c.h2
-rw-r--r--arch/mips/include/asm/octeon/cvmx.h2
-rw-r--r--arch/mips/include/asm/paccess.h2
-rw-r--r--arch/mips/include/asm/pci/bridge.h2
-rw-r--r--arch/mips/include/asm/pmc-sierra/msp71xx/msp_regops.h2
-rw-r--r--arch/mips/include/asm/processor.h2
-rw-r--r--arch/mips/include/asm/sgi/ioc.h2
-rw-r--r--arch/mips/include/asm/sibyte/sb1250_mac.h4
-rw-r--r--arch/mips/include/asm/siginfo.h2
-rw-r--r--arch/mips/include/asm/sn/klconfig.h4
-rw-r--r--arch/mips/include/asm/sn/sn0/hubio.h2
-rw-r--r--arch/mips/include/asm/stackframe.h2
-rw-r--r--arch/mips/include/asm/war.h2
-rw-r--r--arch/mips/jz4740/board-qi_lb60.c4
-rw-r--r--arch/mips/kernel/cpu-bugs64.c2
-rw-r--r--arch/mips/kernel/perf_event_mipsxx.c2
-rw-r--r--arch/mips/kernel/process.c2
-rw-r--r--arch/mips/kernel/smp-mt.c2
-rw-r--r--arch/mips/kernel/time.c2
-rw-r--r--arch/mips/kernel/vpe.c2
-rw-r--r--arch/mips/lib/strnlen_user.S2
-rw-r--r--arch/mips/math-emu/dp_fsp.c2
-rw-r--r--arch/mips/math-emu/dp_mul.c2
-rw-r--r--arch/mips/math-emu/dsemul.c2
-rw-r--r--arch/mips/math-emu/sp_mul.c2
-rw-r--r--arch/mips/mm/cex-sb1.S2
-rw-r--r--arch/mips/mm/tlbex.c2
-rw-r--r--arch/mips/mti-malta/malta-smtc.c2
-rw-r--r--arch/mips/pci/ops-pmcmsp.c4
-rw-r--r--arch/mips/pci/pci-bcm1480.c2
-rw-r--r--arch/mips/pci/pci-octeon.c4
-rw-r--r--arch/mips/pci/pci.c2
-rw-r--r--arch/mips/pmc-sierra/msp71xx/msp_setup.c2
-rw-r--r--arch/mips/pnx833x/common/platform.c2
-rw-r--r--arch/mips/sgi-ip27/Kconfig2
-rw-r--r--arch/mips/sgi-ip27/TODO2
-rw-r--r--arch/mips/sgi-ip27/ip27-init.c2
-rw-r--r--arch/mips/sgi-ip27/ip27-irq.c2
-rw-r--r--arch/mn10300/include/asm/cpu-regs.h2
-rw-r--r--arch/parisc/include/asm/eisa_eeprom.h2
-rw-r--r--arch/parisc/kernel/entry.S10
-rw-r--r--arch/parisc/kernel/head.S2
-rw-r--r--arch/parisc/kernel/inventory.c2
-rw-r--r--arch/parisc/kernel/signal.c2
-rw-r--r--arch/parisc/kernel/syscall.S2
-rw-r--r--arch/parisc/kernel/syscall_table.S2
-rw-r--r--arch/parisc/math-emu/dfadd.c2
-rw-r--r--arch/parisc/math-emu/dfsub.c2
-rw-r--r--arch/parisc/math-emu/fmpyfadd.c8
-rw-r--r--arch/parisc/math-emu/sfadd.c2
-rw-r--r--arch/parisc/math-emu/sfsub.c2
-rw-r--r--arch/powerpc/include/asm/bitops.h4
-rw-r--r--arch/powerpc/include/asm/compat.h2
-rw-r--r--arch/powerpc/include/asm/cpm.h2
-rw-r--r--arch/powerpc/include/asm/cpm1.h2
-rw-r--r--arch/powerpc/include/asm/hvcall.h2
-rw-r--r--arch/powerpc/include/asm/kprobes.h2
-rw-r--r--arch/powerpc/include/asm/lppaca.h2
-rw-r--r--arch/powerpc/include/asm/page_64.h2
-rw-r--r--arch/powerpc/include/asm/pasemi_dma.h2
-rw-r--r--arch/powerpc/include/asm/pci-bridge.h2
-rw-r--r--arch/powerpc/include/asm/pmac_feature.h4
-rw-r--r--arch/powerpc/include/asm/pte-common.h4
-rw-r--r--arch/powerpc/include/asm/reg_booke.h2
-rw-r--r--arch/powerpc/include/asm/spu_priv1.h2
-rw-r--r--arch/powerpc/include/asm/uninorth.h2
-rw-r--r--arch/powerpc/include/asm/vdso_datapage.h2
-rw-r--r--arch/powerpc/kernel/btext.c2
-rw-r--r--arch/powerpc/kernel/exceptions-64e.S2
-rw-r--r--arch/powerpc/kernel/exceptions-64s.S2
-rw-r--r--arch/powerpc/kernel/head_40x.S2
-rw-r--r--arch/powerpc/kernel/head_44x.S2
-rw-r--r--arch/powerpc/kernel/head_64.S2
-rw-r--r--arch/powerpc/kernel/head_fsl_booke.S2
-rw-r--r--arch/powerpc/kernel/l2cr_6xx.S2
-rw-r--r--arch/powerpc/kernel/lparcfg.c2
-rw-r--r--arch/powerpc/kernel/perf_event.c2
-rw-r--r--arch/powerpc/kernel/ppc_save_regs.S2
-rw-r--r--arch/powerpc/kernel/prom.c4
-rw-r--r--arch/powerpc/kernel/ptrace.c2
-rw-r--r--arch/powerpc/kernel/rtasd.c2
-rw-r--r--arch/powerpc/kernel/swsusp_32.S2
-rw-r--r--arch/powerpc/kernel/traps.c2
-rw-r--r--arch/powerpc/kernel/udbg_16550.c2
-rw-r--r--arch/powerpc/kernel/vdso32/sigtramp.S2
-rw-r--r--arch/powerpc/kernel/vdso64/sigtramp.S2
-rw-r--r--arch/powerpc/mm/hash_low_64.S24
-rw-r--r--arch/powerpc/mm/hash_utils_64.c2
-rw-r--r--arch/powerpc/mm/mem.c2
-rw-r--r--arch/powerpc/mm/numa.c10
-rw-r--r--arch/powerpc/mm/tlb_low_64e.S4
-rw-r--r--arch/powerpc/oprofile/op_model_cell.c6
-rw-r--r--arch/powerpc/oprofile/op_model_power4.c2
-rw-r--r--arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c6
-rw-r--r--arch/powerpc/platforms/52xx/mpc52xx_pic.c2
-rw-r--r--arch/powerpc/platforms/cell/spufs/lscsa_alloc.c2
-rw-r--r--arch/powerpc/platforms/cell/spufs/sched.c2
-rw-r--r--arch/powerpc/platforms/cell/spufs/spu_restore.c2
-rw-r--r--arch/powerpc/platforms/iseries/mf.c2
-rw-r--r--arch/powerpc/platforms/iseries/viopath.c8
-rw-r--r--arch/powerpc/platforms/pasemi/dma_lib.c4
-rw-r--r--arch/powerpc/platforms/powermac/Makefile2
-rw-r--r--arch/powerpc/platforms/powermac/low_i2c.c2
-rw-r--r--arch/powerpc/platforms/powermac/pci.c2
-rw-r--r--arch/powerpc/platforms/pseries/dlpar.c2
-rw-r--r--arch/powerpc/platforms/pseries/eeh.c2
-rw-r--r--arch/powerpc/platforms/pseries/hotplug-cpu.c2
-rw-r--r--arch/powerpc/platforms/pseries/iommu.c6
-rw-r--r--arch/powerpc/platforms/pseries/xics.c2
-rw-r--r--arch/powerpc/sysdev/axonram.c2
-rw-r--r--arch/powerpc/sysdev/bestcomm/bestcomm.h2
-rw-r--r--arch/powerpc/sysdev/bestcomm/bestcomm_priv.h2
-rw-r--r--arch/powerpc/sysdev/cpm1.c2
-rw-r--r--arch/powerpc/sysdev/indirect_pci.c2
-rw-r--r--arch/powerpc/sysdev/ppc4xx_pci.h2
-rw-r--r--arch/s390/include/asm/atomic.h2
-rw-r--r--arch/s390/include/asm/cio.h2
-rw-r--r--arch/s390/kernel/reipl64.S2
-rw-r--r--arch/s390/kernel/setup.c2
-rw-r--r--arch/s390/kernel/time.c6
-rw-r--r--arch/s390/kernel/vtime.c2
-rw-r--r--arch/s390/kvm/kvm-s390.c2
-rw-r--r--arch/s390/kvm/priv.c2
-rw-r--r--arch/s390/mm/fault.c2
-rw-r--r--arch/score/Makefile2
-rw-r--r--arch/sh/Kconfig.debug2
-rw-r--r--arch/sh/boards/mach-dreamcast/irq.c2
-rw-r--r--arch/sh/boards/mach-ecovec24/setup.c2
-rw-r--r--arch/sh/drivers/pci/pci-sh7751.h2
-rw-r--r--arch/sh/drivers/pci/pci.c2
-rw-r--r--arch/sh/include/asm/page.h2
-rw-r--r--arch/sh/include/asm/pgtable_32.h2
-rw-r--r--arch/sh/include/asm/unaligned-sh4a.h2
-rw-r--r--arch/sh/include/mach-common/mach/highlander.h4
-rw-r--r--arch/sh/include/mach-common/mach/r2d.h6
-rw-r--r--arch/sh/kernel/cpu/clock-cpg.c2
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7786.c2
-rw-r--r--arch/sh/kernel/irq.c2
-rw-r--r--arch/sh/kernel/setup.c2
-rw-r--r--arch/sh/lib64/copy_user_memcpy.S2
-rw-r--r--arch/sh/lib64/memcpy.S2
-rw-r--r--arch/sparc/include/asm/hypervisor.h20
-rw-r--r--arch/sparc/include/asm/ns87303.h2
-rw-r--r--arch/sparc/include/asm/pcr.h2
-rw-r--r--arch/sparc/include/asm/ptrace.h2
-rw-r--r--arch/sparc/kernel/entry.S4
-rw-r--r--arch/sparc/kernel/head_64.S2
-rw-r--r--arch/sparc/kernel/init_task.c2
-rw-r--r--arch/sparc/kernel/of_device_64.c2
-rw-r--r--arch/sparc/kernel/perf_event.c2
-rw-r--r--arch/sparc/math-emu/Makefile2
-rw-r--r--arch/tile/Kconfig2
-rw-r--r--arch/tile/include/hv/drv_xgbe_intf.h2
-rw-r--r--arch/tile/include/hv/hypervisor.h4
-rw-r--r--arch/tile/kernel/pci.c4
-rw-r--r--arch/tile/mm/fault.c2
-rw-r--r--arch/tile/mm/hugetlbpage.c2
-rw-r--r--arch/um/Kconfig.net2
-rw-r--r--arch/unicore32/include/mach/regs-umal.h4
-rw-r--r--arch/unicore32/kernel/head.S2
-rw-r--r--arch/xtensa/include/asm/dma.h2
-rw-r--r--arch/xtensa/kernel/entry.S2
-rw-r--r--block/blk-cgroup.c4
-rw-r--r--block/blk-core.c2
-rw-r--r--block/blk-throttle.c2
-rw-r--r--block/blk.h2
-rw-r--r--block/cfq-iosched.c2
-rw-r--r--block/genhd.c2
-rw-r--r--crypto/ansi_cprng.c2
-rw-r--r--crypto/async_tx/async_xor.c2
-rw-r--r--crypto/gf128mul.c2
-rw-r--r--crypto/vmac.c2
-rw-r--r--crypto/xts.c2
-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/hid-core.c4
-rw-r--r--drivers/hid/hid-debug.c2
-rw-r--r--drivers/hid/hid-magicmouse.c2
-rw-r--r--drivers/hid/hid-picolcd.c4
-rw-r--r--drivers/hid/hid-roccat-kone.h2
-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/scan.c2
-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/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.c4
-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_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_mgmt.c2
-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_util.c2
-rw-r--r--drivers/staging/hv/rndis_filter.c2
-rw-r--r--drivers/staging/hv/tools/hv_kvp_daemon.c2
-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.h2
-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/memrar_handler.c2
-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/olpc_dcon_xo_1.c2
-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/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/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/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_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.c10
-rw-r--r--drivers/staging/sep/sep_driver_config.h4
-rw-r--r--drivers/staging/slicoss/README2
-rw-r--r--drivers/staging/sm7xx/smtcfb.c4
-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/vhci_hcd.c2
-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/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/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/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
-rw-r--r--fs/adfs/map.c2
-rw-r--r--fs/afs/cache.c12
-rw-r--r--fs/afs/cell.c2
-rw-r--r--fs/attr.c2
-rw-r--r--fs/autofs4/root.c2
-rw-r--r--fs/befs/ChangeLog10
-rw-r--r--fs/befs/befs_fs_types.h2
-rw-r--r--fs/befs/btree.c2
-rw-r--r--fs/befs/linuxvfs.c2
-rw-r--r--fs/binfmt_flat.c2
-rw-r--r--fs/bio.c2
-rw-r--r--fs/block_dev.c2
-rw-r--r--fs/btrfs/extent_map.c2
-rw-r--r--fs/btrfs/inode.c2
-rw-r--r--fs/btrfs/relocation.c2
-rw-r--r--fs/cachefiles/interface.c2
-rw-r--r--fs/ceph/addr.c2
-rw-r--r--fs/ceph/caps.c2
-rw-r--r--fs/ceph/snap.c2
-rw-r--r--fs/cifs/AUTHORS2
-rw-r--r--fs/cifs/cifs_dfs_ref.c2
-rw-r--r--fs/cifs/cifssmb.c2
-rw-r--r--fs/cifs/connect.c4
-rw-r--r--fs/cifs/dir.c2
-rw-r--r--fs/configfs/dir.c2
-rw-r--r--fs/dlm/lock.c2
-rw-r--r--fs/dlm/lowcomms.c2
-rw-r--r--fs/dlm/recover.c2
-rw-r--r--fs/ecryptfs/main.c4
-rw-r--r--fs/eventpoll.c8
-rw-r--r--fs/exofs/common.h4
-rw-r--r--fs/ext2/balloc.c6
-rw-r--r--fs/ext2/inode.c8
-rw-r--r--fs/ext2/super.c2
-rw-r--r--fs/ext2/xattr.c2
-rw-r--r--fs/ext3/balloc.c10
-rw-r--r--fs/ext3/inode.c6
-rw-r--r--fs/ext3/resize.c2
-rw-r--r--fs/ext3/super.c2
-rw-r--r--fs/ext4/balloc.c2
-rw-r--r--fs/ext4/extents.c10
-rw-r--r--fs/ext4/fsync.c2
-rw-r--r--fs/ext4/inode.c20
-rw-r--r--fs/ext4/mballoc.c2
-rw-r--r--fs/ext4/migrate.c2
-rw-r--r--fs/ext4/super.c4
-rw-r--r--fs/freevxfs/vxfs_fshead.c2
-rw-r--r--fs/freevxfs/vxfs_lookup.c2
-rw-r--r--fs/freevxfs/vxfs_olt.h2
-rw-r--r--fs/fs-writeback.c2
-rw-r--r--fs/fuse/file.c2
-rw-r--r--fs/gfs2/bmap.c2
-rw-r--r--fs/gfs2/glock.c2
-rw-r--r--fs/gfs2/super.c2
-rw-r--r--fs/jbd/commit.c2
-rw-r--r--fs/jbd/journal.c4
-rw-r--r--fs/jbd/revoke.c2
-rw-r--r--fs/jbd/transaction.c2
-rw-r--r--fs/jbd2/commit.c2
-rw-r--r--fs/jbd2/journal.c4
-rw-r--r--fs/jbd2/revoke.c2
-rw-r--r--fs/jbd2/transaction.c2
-rw-r--r--fs/jffs2/TODO2
-rw-r--r--fs/jffs2/readinode.c2
-rw-r--r--fs/jffs2/summary.c4
-rw-r--r--fs/jffs2/wbuf.c2
-rw-r--r--fs/jfs/jfs_dmap.c4
-rw-r--r--fs/jfs/jfs_extent.c6
-rw-r--r--fs/jfs/jfs_imap.c14
-rw-r--r--fs/jfs/jfs_logmgr.h2
-rw-r--r--fs/jfs/jfs_metapage.h2
-rw-r--r--fs/jfs/jfs_txnmgr.c2
-rw-r--r--fs/jfs/resize.c4
-rw-r--r--fs/jfs/super.c2
-rw-r--r--fs/logfs/dev_mtd.c2
-rw-r--r--fs/logfs/dir.c2
-rw-r--r--fs/logfs/readwrite.c2
-rw-r--r--fs/mbcache.c2
-rw-r--r--fs/namei.c2
-rw-r--r--fs/ncpfs/inode.c2
-rw-r--r--fs/nfs/callback_xdr.c2
-rw-r--r--fs/nfs/file.c2
-rw-r--r--fs/nfs/nfs4filelayout.h2
-rw-r--r--fs/nfs_common/nfsacl.c2
-rw-r--r--fs/nfsd/nfs3xdr.c2
-rw-r--r--fs/nfsd/nfs4state.c4
-rw-r--r--fs/nfsd/nfsxdr.c2
-rw-r--r--fs/notify/fanotify/fanotify_user.c2
-rw-r--r--fs/notify/inotify/inotify_fsnotify.c2
-rw-r--r--fs/notify/mark.c2
-rw-r--r--fs/ntfs/attrib.c4
-rw-r--r--fs/ntfs/compress.c2
-rw-r--r--fs/ntfs/inode.c4
-rw-r--r--fs/ntfs/layout.h12
-rw-r--r--fs/ntfs/logfile.c2
-rw-r--r--fs/ntfs/logfile.h2
-rw-r--r--fs/ntfs/mft.c8
-rw-r--r--fs/ntfs/runlist.c2
-rw-r--r--fs/ntfs/super.c14
-rw-r--r--fs/ocfs2/alloc.c2
-rw-r--r--fs/ocfs2/aops.h2
-rw-r--r--fs/ocfs2/cluster/heartbeat.c2
-rw-r--r--fs/ocfs2/cluster/quorum.c4
-rw-r--r--fs/ocfs2/cluster/tcp.c2
-rw-r--r--fs/ocfs2/dlm/dlmmaster.c4
-rw-r--r--fs/ocfs2/inode.c4
-rw-r--r--fs/ocfs2/journal.c2
-rw-r--r--fs/ocfs2/journal.h2
-rw-r--r--fs/ocfs2/namei.c2
-rw-r--r--fs/ocfs2/ocfs2_fs.h4
-rw-r--r--fs/ocfs2/quota_global.c2
-rw-r--r--fs/ocfs2/reservations.h2
-rw-r--r--fs/ocfs2/stackglue.h2
-rw-r--r--fs/ocfs2/suballoc.c4
-rw-r--r--fs/ocfs2/super.c2
-rw-r--r--fs/ocfs2/xattr.c4
-rw-r--r--fs/partitions/check.c4
-rw-r--r--fs/proc/base.c2
-rw-r--r--fs/pstore/Kconfig2
-rw-r--r--fs/quota/dquot.c2
-rw-r--r--fs/reiserfs/journal.c4
-rw-r--r--fs/reiserfs/lock.c2
-rw-r--r--fs/reiserfs/super.c4
-rw-r--r--fs/reiserfs/xattr.c2
-rw-r--r--fs/squashfs/cache.c4
-rw-r--r--fs/ubifs/budget.c2
-rw-r--r--fs/ufs/inode.c2
-rw-r--r--fs/ufs/super.c6
-rw-r--r--fs/xfs/linux-2.6/xfs_aops.c2
-rw-r--r--fs/xfs/linux-2.6/xfs_buf.c4
-rw-r--r--fs/xfs/linux-2.6/xfs_file.c2
-rw-r--r--fs/xfs/linux-2.6/xfs_iops.c2
-rw-r--r--fs/xfs/linux-2.6/xfs_sync.c2
-rw-r--r--fs/xfs/quota/xfs_dquot.c2
-rw-r--r--fs/xfs/quota/xfs_qm_bhv.c2
-rw-r--r--fs/xfs/quota/xfs_qm_syscalls.c4
-rw-r--r--fs/xfs/xfs_buf_item.c2
-rw-r--r--fs/xfs/xfs_inode.c2
-rw-r--r--fs/xfs/xfs_inode.h4
-rw-r--r--fs/xfs/xfs_log_priv.h2
-rw-r--r--fs/xfs/xfs_log_recover.c4
-rw-r--r--fs/xfs/xfs_trans_inode.c2
-rw-r--r--fs/xfs/xfs_vnodeops.c4
-rw-r--r--include/acpi/actbl.h2
-rw-r--r--include/asm-generic/siginfo.h2
-rw-r--r--include/asm-generic/vmlinux.lds.h2
-rw-r--r--include/drm/drmP.h4
-rw-r--r--include/drm/drm_crtc.h4
-rw-r--r--include/drm/drm_mm.h2
-rw-r--r--include/drm/drm_mode.h2
-rw-r--r--include/drm/mga_drm.h2
-rw-r--r--include/drm/radeon_drm.h2
-rw-r--r--include/drm/savage_drm.h2
-rw-r--r--include/drm/ttm/ttm_bo_api.h8
-rw-r--r--include/drm/ttm/ttm_bo_driver.h6
-rw-r--r--include/drm/vmwgfx_drm.h2
-rw-r--r--include/linux/amba/clcd.h2
-rw-r--r--include/linux/amba/mmci.h6
-rw-r--r--include/linux/can/error.h2
-rw-r--r--include/linux/can/netlink.h2
-rw-r--r--include/linux/cdk.h2
-rw-r--r--include/linux/cfag12864b.h2
-rw-r--r--include/linux/cgroup.h2
-rw-r--r--include/linux/cm4000_cs.h2
-rw-r--r--include/linux/configfs.h2
-rw-r--r--include/linux/cper.h2
-rw-r--r--include/linux/decompress/mm.h2
-rw-r--r--include/linux/dmaengine.h2
-rw-r--r--include/linux/drbd.h4
-rw-r--r--include/linux/drbd_limits.h6
-rw-r--r--include/linux/ethtool.h2
-rw-r--r--include/linux/eventpoll.h2
-rw-r--r--include/linux/exportfs.h2
-rw-r--r--include/linux/fb.h8
-rw-r--r--include/linux/firewire-cdev.h2
-rw-r--r--include/linux/fs.h4
-rw-r--r--include/linux/fscache-cache.h2
-rw-r--r--include/linux/fscache.h6
-rw-r--r--include/linux/hid.h2
-rw-r--r--include/linux/hp_sdc.h2
-rw-r--r--include/linux/i2o.h2
-rw-r--r--include/linux/interrupt.h4
-rw-r--r--include/linux/ipmi.h4
-rw-r--r--include/linux/isdn/hdlc.h2
-rw-r--r--include/linux/ixjuser.h2
-rw-r--r--include/linux/jiffies.h2
-rw-r--r--include/linux/ktime.h4
-rw-r--r--include/linux/led-lm3530.h2
-rw-r--r--include/linux/libata.h2
-rw-r--r--include/linux/lru_cache.h2
-rw-r--r--include/linux/mfd/wm8350/pmic.h2
-rw-r--r--include/linux/mm.h2
-rw-r--r--include/linux/mmc/dw_mmc.h4
-rw-r--r--include/linux/mroute6.h2
-rw-r--r--include/linux/mtd/cfi.h2
-rw-r--r--include/linux/mtd/nand.h6
-rw-r--r--include/linux/mtd/xip.h2
-rw-r--r--include/linux/netfilter/nf_conntrack_proto_gre.h2
-rw-r--r--include/linux/netfilter_bridge/ebtables.h2
-rw-r--r--include/linux/nfs4.h2
-rw-r--r--include/linux/nfsd/export.h2
-rw-r--r--include/linux/nfsd/nfsfh.h2
-rw-r--r--include/linux/nl80211.h10
-rw-r--r--include/linux/notifier.h2
-rw-r--r--include/linux/omap3isp.h2
-rw-r--r--include/linux/page_cgroup.h2
-rw-r--r--include/linux/pci_regs.h4
-rw-r--r--include/linux/perf_event.h2
-rw-r--r--include/linux/pid.h2
-rw-r--r--include/linux/pkt_sched.h2
-rw-r--r--include/linux/poll.h2
-rw-r--r--include/linux/prefetch.h2
-rw-r--r--include/linux/pxa2xx_ssp.h2
-rw-r--r--include/linux/raid/md_p.h2
-rw-r--r--include/linux/reiserfs_fs.h2
-rw-r--r--include/linux/sched.h2
-rw-r--r--include/linux/skbuff.h2
-rw-r--r--include/linux/smc91x.h2
-rw-r--r--include/linux/socket.h2
-rw-r--r--include/linux/soundcard.h2
-rw-r--r--include/linux/spi/spidev.h2
-rw-r--r--include/linux/spinlock.h2
-rw-r--r--include/linux/stmmac.h2
-rw-r--r--include/linux/stop_machine.h2
-rw-r--r--include/linux/sunrpc/cache.h4
-rw-r--r--include/linux/sunrpc/svcauth_gss.h2
-rw-r--r--include/linux/sysdev.h6
-rw-r--r--include/linux/timerqueue.h2
-rw-r--r--include/linux/tracehook.h4
-rw-r--r--include/linux/ucb1400.h2
-rw-r--r--include/linux/usb.h4
-rw-r--r--include/linux/usb/composite.h2
-rw-r--r--include/linux/usb/ehci_def.h2
-rw-r--r--include/linux/usb/functionfs.h4
-rw-r--r--include/linux/usb/gadget.h4
-rw-r--r--include/linux/usb/midi.h2
-rw-r--r--include/linux/usb/wusb.h2
-rw-r--r--include/linux/uwb.h6
-rw-r--r--include/linux/uwb/umc.h2
-rw-r--r--include/linux/vgaarb.h4
-rw-r--r--include/linux/wimax.h2
-rw-r--r--include/linux/xilinxfb.h2
-rw-r--r--include/media/davinci/dm355_ccdc.h2
-rw-r--r--include/media/davinci/isif.h2
-rw-r--r--include/media/lirc.h2
-rw-r--r--include/net/9p/9p.h8
-rw-r--r--include/net/9p/client.h2
-rw-r--r--include/net/9p/transport.h2
-rw-r--r--include/net/caif/cfcnfg.h2
-rw-r--r--include/net/gen_stats.h2
-rw-r--r--include/net/ip_vs.h2
-rw-r--r--include/net/irda/irlap.h2
-rw-r--r--include/net/irda/wrapper.h2
-rw-r--r--include/net/iucv/iucv.h2
-rw-r--r--include/net/iw_handler.h4
-rw-r--r--include/net/mac80211.h2
-rw-r--r--include/net/pkt_sched.h2
-rw-r--r--include/net/sock.h2
-rw-r--r--include/net/transp_v6.h2
-rw-r--r--include/net/wimax.h2
-rw-r--r--include/net/wpan-phy.h2
-rw-r--r--include/rxrpc/packet.h2
-rw-r--r--include/scsi/fc/fc_fcp.h2
-rw-r--r--include/scsi/iscsi_if.h2
-rw-r--r--include/scsi/libfc.h8
-rw-r--r--include/scsi/libiscsi_tcp.h2
-rw-r--r--include/scsi/osd_initiator.h2
-rw-r--r--include/scsi/scsi_host.h2
-rw-r--r--include/scsi/scsi_transport_fc.h6
-rw-r--r--include/sound/ac97_codec.h2
-rw-r--r--include/sound/control.h2
-rw-r--r--include/sound/cs46xx_dsp_spos.h2
-rw-r--r--include/sound/hdspm.h2
-rw-r--r--include/sound/soc-dapm.h2
-rw-r--r--include/target/target_core_base.h6
-rw-r--r--include/target/target_core_fabric_ops.h2
-rw-r--r--include/video/kyro.h2
-rw-r--r--include/video/neomagic.h2
-rw-r--r--include/video/newport.h2
-rw-r--r--include/video/sisfb.h2
-rw-r--r--include/video/sstfb.h6
-rw-r--r--include/xen/interface/elfnote.h2
-rw-r--r--init/do_mounts.c2
-rw-r--r--ipc/msg.c4
-rw-r--r--ipc/sem.c2
-rw-r--r--ipc/shm.c2
-rw-r--r--kernel/audit_tree.c2
-rw-r--r--kernel/auditsc.c2
-rw-r--r--kernel/cgroup.c2
-rw-r--r--kernel/cpu.c2
-rw-r--r--kernel/debug/debug_core.c2
-rw-r--r--kernel/debug/kdb/kdb_main.c6
-rw-r--r--kernel/debug/kdb/kdb_support.c2
-rw-r--r--kernel/exit.c2
-rw-r--r--kernel/irq/chip.c2
-rw-r--r--kernel/irq/migration.c2
-rw-r--r--kernel/kexec.c6
-rw-r--r--kernel/kthread.c2
-rw-r--r--kernel/latencytop.c2
-rw-r--r--kernel/lockdep.c4
-rw-r--r--kernel/module.c6
-rw-r--r--kernel/mutex.c2
-rw-r--r--kernel/padata.c8
-rw-r--r--kernel/params.c2
-rw-r--r--kernel/posix-cpu-timers.c2
-rw-r--r--kernel/posix-timers.c2
-rw-r--r--kernel/power/main.c2
-rw-r--r--kernel/sched.c6
-rw-r--r--kernel/sched_autogroup.c2
-rw-r--r--kernel/sched_fair.c2
-rw-r--r--kernel/sched_rt.c4
-rw-r--r--kernel/signal.c2
-rw-r--r--kernel/softirq.c2
-rw-r--r--kernel/time/jiffies.c2
-rw-r--r--kernel/time/timer_stats.c2
-rw-r--r--kernel/trace/ftrace.c4
-rw-r--r--kernel/trace/ring_buffer.c4
-rw-r--r--kernel/trace/trace.c2
-rw-r--r--kernel/trace/trace_clock.c2
-rw-r--r--kernel/trace/trace_entries.h2
-rw-r--r--kernel/trace/trace_functions_graph.c2
-rw-r--r--kernel/trace/trace_irqsoff.c2
-rw-r--r--kernel/trace/trace_kprobe.c2
-rw-r--r--kernel/user-return-notifier.c2
-rw-r--r--kernel/wait.c2
-rw-r--r--kernel/workqueue.c2
-rw-r--r--lib/bitmap.c2
-rw-r--r--lib/btree.c4
-rw-r--r--lib/decompress_unxz.c2
-rw-r--r--lib/parser.c2
-rw-r--r--lib/timerqueue.c2
-rw-r--r--mm/backing-dev.c2
-rw-r--r--mm/hugetlb.c10
-rw-r--r--mm/hwpoison-inject.c2
-rw-r--r--mm/internal.h2
-rw-r--r--mm/kmemleak.c6
-rw-r--r--mm/ksm.c2
-rw-r--r--mm/memcontrol.c8
-rw-r--r--mm/memory-failure.c6
-rw-r--r--mm/memory_hotplug.c2
-rw-r--r--mm/migrate.c2
-rw-r--r--mm/nobootmem.c2
-rw-r--r--mm/page_alloc.c4
-rw-r--r--mm/page_cgroup.c2
-rw-r--r--mm/percpu.c10
-rw-r--r--mm/slab.c4
-rw-r--r--mm/slub.c8
-rw-r--r--mm/sparse.c2
-rw-r--r--mm/util.c2
-rw-r--r--mm/vmscan.c4
-rw-r--r--net/8021q/vlanproc.c2
-rw-r--r--net/9p/client.c2
-rw-r--r--net/9p/trans_common.c4
-rw-r--r--net/9p/util.c2
-rw-r--r--net/atm/br2684.c2
-rw-r--r--net/atm/lec.h2
-rw-r--r--net/batman-adv/soft-interface.c2
-rw-r--r--net/bluetooth/hci_core.c2
-rw-r--r--net/bluetooth/l2cap_sock.c2
-rw-r--r--net/bridge/br_fdb.c2
-rw-r--r--net/bridge/br_ioctl.c2
-rw-r--r--net/caif/caif_socket.c2
-rw-r--r--net/can/bcm.c2
-rw-r--r--net/ceph/osd_client.c2
-rw-r--r--net/core/dev.c12
-rw-r--r--net/core/filter.c2
-rw-r--r--net/core/link_watch.c2
-rw-r--r--net/core/rtnetlink.c4
-rw-r--r--net/core/skbuff.c2
-rw-r--r--net/core/sock.c10
-rw-r--r--net/dccp/output.c2
-rw-r--r--net/dsa/mv88e6131.c2
-rw-r--r--net/ipv4/cipso_ipv4.c8
-rw-r--r--net/ipv4/fib_trie.c2
-rw-r--r--net/ipv4/icmp.c2
-rw-r--r--net/ipv4/ip_output.c2
-rw-r--r--net/ipv4/ipconfig.c2
-rw-r--r--net/ipv4/netfilter/arp_tables.c4
-rw-r--r--net/ipv4/netfilter/ip_tables.c2
-rw-r--r--net/ipv4/netfilter/nf_nat_core.c4
-rw-r--r--net/ipv4/raw.c2
-rw-r--r--net/ipv4/route.c4
-rw-r--r--net/ipv4/tcp_lp.c2
-rw-r--r--net/ipv4/tcp_output.c2
-rw-r--r--net/ipv4/tcp_yeah.c2
-rw-r--r--net/ipv4/udp.c2
-rw-r--r--net/ipv6/addrconf.c4
-rw-r--r--net/ipv6/af_inet6.c2
-rw-r--r--net/ipv6/ip6_output.c2
-rw-r--r--net/ipv6/netfilter/ip6_tables.c2
-rw-r--r--net/ipv6/netfilter/nf_defrag_ipv6_hooks.c2
-rw-r--r--net/irda/irlap.c2
-rw-r--r--net/irda/irlap_event.c8
-rw-r--r--net/irda/irlap_frame.c2
-rw-r--r--net/irda/irlmp_event.c2
-rw-r--r--net/irda/irnet/irnet.h2
-rw-r--r--net/irda/irqueue.c2
-rw-r--r--net/irda/irttp.c2
-rw-r--r--net/irda/qos.c8
-rw-r--r--net/irda/timer.c2
-rw-r--r--net/iucv/af_iucv.c2
-rw-r--r--net/iucv/iucv.c4
-rw-r--r--net/mac80211/ieee80211_i.h2
-rw-r--r--net/mac80211/mesh_pathtbl.c2
-rw-r--r--net/mac80211/rc80211_minstrel_ht.c2
-rw-r--r--net/mac80211/rc80211_pid.h2
-rw-r--r--net/mac80211/rx.c2
-rw-r--r--net/mac80211/sta_info.c4
-rw-r--r--net/mac80211/sta_info.h2
-rw-r--r--net/netfilter/ipset/ip_set_core.c2
-rw-r--r--net/netfilter/ipvs/ip_vs_conn.c4
-rw-r--r--net/netfilter/ipvs/ip_vs_lblc.c2
-rw-r--r--net/netfilter/ipvs/ip_vs_lblcr.c2
-rw-r--r--net/netfilter/ipvs/ip_vs_proto_sctp.c8
-rw-r--r--net/netfilter/nf_conntrack_core.c4
-rw-r--r--net/netfilter/nf_conntrack_proto_dccp.c2
-rw-r--r--net/netfilter/nf_conntrack_proto_sctp.c6
-rw-r--r--net/netfilter/nf_conntrack_sip.c2
-rw-r--r--net/netfilter/nf_queue.c2
-rw-r--r--net/netlabel/netlabel_domainhash.c10
-rw-r--r--net/netlabel/netlabel_mgmt.c2
-rw-r--r--net/rds/ib_send.c2
-rw-r--r--net/rds/iw_cm.c2
-rw-r--r--net/rds/iw_rdma.c2
-rw-r--r--net/rds/iw_send.c2
-rw-r--r--net/rds/send.c2
-rw-r--r--net/rose/rose_route.c2
-rw-r--r--net/sched/act_api.c2
-rw-r--r--net/sched/act_pedit.c2
-rw-r--r--net/sched/em_meta.c2
-rw-r--r--net/sched/sch_htb.c2
-rw-r--r--net/sched/sch_netem.c6
-rw-r--r--net/sctp/associola.c2
-rw-r--r--net/sctp/auth.c6
-rw-r--r--net/sctp/input.c2
-rw-r--r--net/sctp/output.c2
-rw-r--r--net/sctp/outqueue.c6
-rw-r--r--net/sctp/sm_sideeffect.c2
-rw-r--r--net/sctp/sm_statefuns.c20
-rw-r--r--net/sctp/socket.c2
-rw-r--r--net/sctp/ulpevent.c2
-rw-r--r--net/sctp/ulpqueue.c2
-rw-r--r--net/socket.c2
-rw-r--r--net/sunrpc/auth_gss/svcauth_gss.c2
-rw-r--r--net/sunrpc/xprtsock.c4
-rw-r--r--net/tipc/link.c2
-rw-r--r--net/tipc/name_distr.c2
-rw-r--r--net/unix/af_unix.c2
-rw-r--r--net/wanrouter/wanproc.c2
-rw-r--r--net/wireless/reg.c4
-rw-r--r--net/x25/x25_facilities.c2
-rw-r--r--net/x25/x25_forward.c4
-rw-r--r--net/xfrm/xfrm_user.c6
-rw-r--r--samples/Kconfig2
-rw-r--r--samples/hw_breakpoint/data_breakpoint.c2
-rw-r--r--scripts/Makefile.modpost4
-rwxr-xr-xscripts/checkpatch.pl6
-rw-r--r--scripts/dtc/libfdt/libfdt.h2
-rw-r--r--scripts/dtc/livetree.c2
-rw-r--r--scripts/gen_initramfs_list.sh2
-rwxr-xr-xscripts/kernel-doc2
-rw-r--r--scripts/package/buildtar2
-rw-r--r--scripts/rt-tester/rt-tester.py2
-rw-r--r--security/apparmor/match.c2
-rw-r--r--security/apparmor/policy_unpack.c2
-rw-r--r--security/selinux/netlabel.c2
-rw-r--r--security/selinux/ss/services.c4
-rw-r--r--security/smack/smack_access.c2
-rw-r--r--security/smack/smack_lsm.c6
-rw-r--r--security/smack/smackfs.c6
-rw-r--r--security/tomoyo/load_policy.c2
-rw-r--r--sound/aoa/codecs/tas.c2
-rw-r--r--sound/core/pcm_memory.c6
-rw-r--r--sound/core/pcm_native.c2
-rw-r--r--sound/core/seq/seq_dummy.c2
-rw-r--r--sound/core/vmaster.c2
-rw-r--r--sound/drivers/pcm-indirect2.c4
-rw-r--r--sound/drivers/vx/vx_pcm.c2
-rw-r--r--sound/isa/sb/emu8000.c2
-rw-r--r--sound/isa/wavefront/wavefront_midi.c2
-rw-r--r--sound/isa/wss/wss_lib.c2
-rw-r--r--sound/oss/ac97_codec.c6
-rw-r--r--sound/oss/audio.c4
-rw-r--r--sound/oss/dmasound/dmasound_core.c2
-rw-r--r--sound/oss/midibuf.c2
-rw-r--r--sound/oss/sb_card.c2
-rw-r--r--sound/oss/sb_ess.c2
-rw-r--r--sound/oss/swarm_cs4297a.c2
-rw-r--r--sound/oss/vidc.c2
-rw-r--r--sound/pci/ad1889.c2
-rw-r--r--sound/pci/asihpi/asihpi.c2
-rw-r--r--sound/pci/asihpi/hpi.h2
-rw-r--r--sound/pci/asihpi/hpi6000.c2
-rw-r--r--sound/pci/asihpi/hpi6205.c2
-rw-r--r--sound/pci/asihpi/hpi_internal.h2
-rw-r--r--sound/pci/asihpi/hpimsgx.c2
-rw-r--r--sound/pci/au88x0/au88x0.h2
-rw-r--r--sound/pci/au88x0/au88x0_a3d.c4
-rw-r--r--sound/pci/au88x0/au88x0_pcm.c2
-rw-r--r--sound/pci/azt3328.c2
-rw-r--r--sound/pci/ca0106/ca0106.h6
-rw-r--r--sound/pci/ca0106/ca0106_main.c2
-rw-r--r--sound/pci/ca0106/ca0106_mixer.c2
-rw-r--r--sound/pci/ca0106/ca0106_proc.c2
-rw-r--r--sound/pci/cmipci.c8
-rw-r--r--sound/pci/ctxfi/ctatc.c2
-rw-r--r--sound/pci/ctxfi/cthw20k1.c2
-rw-r--r--sound/pci/emu10k1/memory.c2
-rw-r--r--sound/pci/emu10k1/p16v.c2
-rw-r--r--sound/pci/emu10k1/p16v.h4
-rw-r--r--sound/pci/hda/hda_codec.c4
-rw-r--r--sound/pci/hda/patch_realtek.c4
-rw-r--r--sound/pci/hda/patch_sigmatel.c2
-rw-r--r--sound/pci/ice1712/aureon.c4
-rw-r--r--sound/pci/ice1712/ice1712.c4
-rw-r--r--sound/pci/ice1712/pontis.c2
-rw-r--r--sound/pci/ice1712/prodigy_hifi.c4
-rw-r--r--sound/pci/intel8x0.c2
-rw-r--r--sound/pci/intel8x0m.c2
-rw-r--r--sound/pci/mixart/mixart_core.c4
-rw-r--r--sound/pci/pcxhr/pcxhr_core.c12
-rw-r--r--sound/pci/rme96.c2
-rw-r--r--sound/pci/rme9652/hdspm.c4
-rw-r--r--sound/pci/sis7019.c6
-rw-r--r--sound/ppc/snd_ps3.c2
-rw-r--r--sound/ppc/snd_ps3_reg.h14
-rw-r--r--sound/soc/atmel/atmel_ssc_dai.c2
-rw-r--r--sound/soc/codecs/alc5623.c2
-rw-r--r--sound/soc/codecs/lm4857.c2
-rw-r--r--sound/soc/codecs/tlv320aic26.h4
-rw-r--r--sound/soc/codecs/tlv320aic3x.c2
-rw-r--r--sound/soc/codecs/tlv320dac33.c2
-rw-r--r--sound/soc/codecs/twl4030.c6
-rw-r--r--sound/soc/codecs/wm8580.c2
-rw-r--r--sound/soc/codecs/wm8753.c2
-rw-r--r--sound/soc/codecs/wm8904.c2
-rw-r--r--sound/soc/codecs/wm8955.c2
-rw-r--r--sound/soc/codecs/wm8962.c2
-rw-r--r--sound/soc/codecs/wm8991.c2
-rw-r--r--sound/soc/codecs/wm8993.c2
-rw-r--r--sound/soc/codecs/wm8994.c6
-rw-r--r--sound/soc/codecs/wm9081.c4
-rw-r--r--sound/soc/imx/imx-ssi.c2
-rw-r--r--sound/soc/kirkwood/kirkwood-dma.c4
-rw-r--r--sound/soc/mid-x86/sst_platform.c4
-rw-r--r--sound/soc/omap/ams-delta.c6
-rw-r--r--sound/soc/samsung/neo1973_wm8753.c4
-rw-r--r--sound/usb/6fire/firmware.c4
-rw-r--r--sound/usb/mixer.c2
-rw-r--r--sound/usb/quirks.c2
-rw-r--r--sound/usb/usx2y/usx2yhwdeppcm.c4
-rw-r--r--tools/perf/util/string.c2
-rw-r--r--tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c2
-rw-r--r--virt/kvm/eventfd.c2
2463 files changed, 4249 insertions, 4249 deletions
diff --git a/CREDITS b/CREDITS
index 1d39a6d0a510..dca6abcead6b 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1677,7 +1677,7 @@ W: http://www.codemonkey.org.uk
1677D: Assorted VIA x86 support. 1677D: Assorted VIA x86 support.
1678D: 2.5 AGPGART overhaul. 1678D: 2.5 AGPGART overhaul.
1679D: CPUFREQ maintenance. 1679D: CPUFREQ maintenance.
1680D: Fedora kernel maintainence. 1680D: Fedora kernel maintenance.
1681D: Misc/Other. 1681D: Misc/Other.
1682S: 314 Littleton Rd, Westford, MA 01886, USA 1682S: 314 Littleton Rd, Westford, MA 01886, USA
1683 1683
@@ -3211,7 +3211,7 @@ N: James Simmons
3211E: jsimmons@infradead.org 3211E: jsimmons@infradead.org
3212E: jsimmons@users.sf.net 3212E: jsimmons@users.sf.net
3213D: Frame buffer device maintainer 3213D: Frame buffer device maintainer
3214D: input layer developement 3214D: input layer development
3215D: tty/console layer 3215D: tty/console layer
3216D: various mipsel devices 3216D: various mipsel devices
3217S: 115 Carmel Avenue 3217S: 115 Carmel Avenue
@@ -3290,7 +3290,7 @@ S: USA
3290N: Manfred Spraul 3290N: Manfred Spraul
3291E: manfred@colorfullife.com 3291E: manfred@colorfullife.com
3292W: http://www.colorfullife.com/~manfred 3292W: http://www.colorfullife.com/~manfred
3293D: Lots of tiny hacks. Larger improvments to SysV IPC msg, 3293D: Lots of tiny hacks. Larger improvements to SysV IPC msg,
3294D: slab, pipe, select. 3294D: slab, pipe, select.
3295S: 71701 Schwieberdingen 3295S: 71701 Schwieberdingen
3296S: Germany 3296S: Germany
diff --git a/Documentation/ABI/testing/sysfs-bus-css b/Documentation/ABI/testing/sysfs-bus-css
index b585ec258a08..2979c40c10e9 100644
--- a/Documentation/ABI/testing/sysfs-bus-css
+++ b/Documentation/ABI/testing/sysfs-bus-css
@@ -29,7 +29,7 @@ Contact: Cornelia Huck <cornelia.huck@de.ibm.com>
29 linux-s390@vger.kernel.org 29 linux-s390@vger.kernel.org
30Description: Contains the PIM/PAM/POM values, as reported by the 30Description: Contains the PIM/PAM/POM values, as reported by the
31 channel subsystem when last queried by the common I/O 31 channel subsystem when last queried by the common I/O
32 layer (this implies that this attribute is not neccessarily 32 layer (this implies that this attribute is not necessarily
33 in sync with the values current in the channel subsystem). 33 in sync with the values current in the channel subsystem).
34 Note: This is an I/O-subchannel specific attribute. 34 Note: This is an I/O-subchannel specific attribute.
35Users: s390-tools, HAL 35Users: s390-tools, HAL
diff --git a/Documentation/ABI/testing/sysfs-class-led b/Documentation/ABI/testing/sysfs-class-led
index edff6630c805..3646ec85d513 100644
--- a/Documentation/ABI/testing/sysfs-class-led
+++ b/Documentation/ABI/testing/sysfs-class-led
@@ -33,5 +33,5 @@ Contact: Richard Purdie <rpurdie@rpsys.net>
33Description: 33Description:
34 Invert the LED on/off state. This parameter is specific to 34 Invert the LED on/off state. This parameter is specific to
35 gpio and backlight triggers. In case of the backlight trigger, 35 gpio and backlight triggers. In case of the backlight trigger,
36 it is usefull when driving a LED which is intended to indicate 36 it is useful when driving a LED which is intended to indicate
37 a device in a standby like state. 37 a device in a standby like state.
diff --git a/Documentation/DocBook/dvb/dvbproperty.xml b/Documentation/DocBook/dvb/dvbproperty.xml
index 5f57c7ccd4ba..97f397e2fb3a 100644
--- a/Documentation/DocBook/dvb/dvbproperty.xml
+++ b/Documentation/DocBook/dvb/dvbproperty.xml
@@ -40,7 +40,7 @@
40 40
41 <para>Central frequency of the channel.</para> 41 <para>Central frequency of the channel.</para>
42 42
43 <para>For ISDB-T the channels are usally transmitted with an offset of 143kHz. E.g. a 43 <para>For ISDB-T the channels are usually transmitted with an offset of 143kHz. E.g. a
44 valid frequncy could be 474143 kHz. The stepping is bound to the bandwidth of 44 valid frequncy could be 474143 kHz. The stepping is bound to the bandwidth of
45 the channel which is 6MHz.</para> 45 the channel which is 6MHz.</para>
46 46
diff --git a/Documentation/DocBook/dvb/frontend.xml b/Documentation/DocBook/dvb/frontend.xml
index 78d756de5906..60c6976fb311 100644
--- a/Documentation/DocBook/dvb/frontend.xml
+++ b/Documentation/DocBook/dvb/frontend.xml
@@ -139,7 +139,7 @@ consistently to the DiSEqC commands as described in the DiSEqC spec.</para>
139<section id="frontend_sec_tone"> 139<section id="frontend_sec_tone">
140<title>SEC continuous tone</title> 140<title>SEC continuous tone</title>
141 141
142<para>The continous 22KHz tone is usually used with non-DiSEqC capable LNBs to switch the 142<para>The continuous 22KHz tone is usually used with non-DiSEqC capable LNBs to switch the
143high/low band of a dual-band LNB. When using DiSEqC epuipment this voltage has to 143high/low band of a dual-band LNB. When using DiSEqC epuipment this voltage has to
144be switched consistently to the DiSEqC commands as described in the DiSEqC 144be switched consistently to the DiSEqC commands as described in the DiSEqC
145spec.</para> 145spec.</para>
diff --git a/Documentation/DocBook/kernel-locking.tmpl b/Documentation/DocBook/kernel-locking.tmpl
index f66f4df18690..67e7ab41c0a6 100644
--- a/Documentation/DocBook/kernel-locking.tmpl
+++ b/Documentation/DocBook/kernel-locking.tmpl
@@ -1763,7 +1763,7 @@ as it would be on UP.
1763There is a furthur optimization possible here: remember our original 1763There is a furthur optimization possible here: remember our original
1764cache code, where there were no reference counts and the caller simply 1764cache code, where there were no reference counts and the caller simply
1765held the lock whenever using the object? This is still possible: if 1765held the lock whenever using the object? This is still possible: if
1766you hold the lock, noone can delete the object, so you don't need to 1766you hold the lock, no one can delete the object, so you don't need to
1767get and put the reference count. 1767get and put the reference count.
1768</para> 1768</para>
1769 1769
diff --git a/Documentation/DocBook/libata.tmpl b/Documentation/DocBook/libata.tmpl
index 8c5411cfeaf0..cdd1bb9aac0d 100644
--- a/Documentation/DocBook/libata.tmpl
+++ b/Documentation/DocBook/libata.tmpl
@@ -1032,7 +1032,7 @@ and other resources, etc.
1032 <listitem> 1032 <listitem>
1033 <para> 1033 <para>
1034 This is indicated by ICRC bit in the ERROR register and 1034 This is indicated by ICRC bit in the ERROR register and
1035 means that corruption occurred during data transfer. Upto 1035 means that corruption occurred during data transfer. Up to
1036 ATA/ATAPI-7, the standard specifies that this bit is only 1036 ATA/ATAPI-7, the standard specifies that this bit is only
1037 applicable to UDMA transfers but ATA/ATAPI-8 draft revision 1037 applicable to UDMA transfers but ATA/ATAPI-8 draft revision
1038 1f says that the bit may be applicable to multiword DMA and 1038 1f says that the bit may be applicable to multiword DMA and
@@ -1045,10 +1045,10 @@ and other resources, etc.
1045 <term>ABRT error during data transfer or on completion</term> 1045 <term>ABRT error during data transfer or on completion</term>
1046 <listitem> 1046 <listitem>
1047 <para> 1047 <para>
1048 Upto ATA/ATAPI-7, the standard specifies that ABRT could be 1048 Up to ATA/ATAPI-7, the standard specifies that ABRT could be
1049 set on ICRC errors and on cases where a device is not able 1049 set on ICRC errors and on cases where a device is not able
1050 to complete a command. Combined with the fact that MWDMA 1050 to complete a command. Combined with the fact that MWDMA
1051 and PIO transfer errors aren't allowed to use ICRC bit upto 1051 and PIO transfer errors aren't allowed to use ICRC bit up to
1052 ATA/ATAPI-7, it seems to imply that ABRT bit alone could 1052 ATA/ATAPI-7, it seems to imply that ABRT bit alone could
1053 indicate tranfer errors. 1053 indicate tranfer errors.
1054 </para> 1054 </para>
@@ -1122,7 +1122,7 @@ and other resources, etc.
1122 <para> 1122 <para>
1123 Depending on commands, not all STATUS/ERROR bits are 1123 Depending on commands, not all STATUS/ERROR bits are
1124 applicable. These non-applicable bits are marked with 1124 applicable. These non-applicable bits are marked with
1125 &quot;na&quot; in the output descriptions but upto ATA/ATAPI-7 1125 &quot;na&quot; in the output descriptions but up to ATA/ATAPI-7
1126 no definition of &quot;na&quot; can be found. However, 1126 no definition of &quot;na&quot; can be found. However,
1127 ATA/ATAPI-8 draft revision 1f describes &quot;N/A&quot; as 1127 ATA/ATAPI-8 draft revision 1f describes &quot;N/A&quot; as
1128 follows. 1128 follows.
@@ -1507,7 +1507,7 @@ and other resources, etc.
1507 1507
1508 <listitem> 1508 <listitem>
1509 <para> 1509 <para>
1510 CHS set up with INITIALIZE DEVICE PARAMETERS (seldomly used) 1510 CHS set up with INITIALIZE DEVICE PARAMETERS (seldom used)
1511 </para> 1511 </para>
1512 </listitem> 1512 </listitem>
1513 1513
diff --git a/Documentation/DocBook/mtdnand.tmpl b/Documentation/DocBook/mtdnand.tmpl
index 620eb3f6a90a..6f242d5dee9a 100644
--- a/Documentation/DocBook/mtdnand.tmpl
+++ b/Documentation/DocBook/mtdnand.tmpl
@@ -485,7 +485,7 @@ static void board_select_chip (struct mtd_info *mtd, int chip)
485 Reed-Solomon library. 485 Reed-Solomon library.
486 </para> 486 </para>
487 <para> 487 <para>
488 The ECC bytes must be placed immidiately after the data 488 The ECC bytes must be placed immediately after the data
489 bytes in order to make the syndrome generator work. This 489 bytes in order to make the syndrome generator work. This
490 is contrary to the usual layout used by software ECC. The 490 is contrary to the usual layout used by software ECC. The
491 separation of data and out of band area is not longer 491 separation of data and out of band area is not longer
@@ -629,7 +629,7 @@ static void board_select_chip (struct mtd_info *mtd, int chip)
629 holds the bad block table. Store a pointer to the pattern 629 holds the bad block table. Store a pointer to the pattern
630 in the pattern field. Further the length of the pattern has to be 630 in the pattern field. Further the length of the pattern has to be
631 stored in len and the offset in the spare area must be given 631 stored in len and the offset in the spare area must be given
632 in the offs member of the nand_bbt_descr stucture. For mirrored 632 in the offs member of the nand_bbt_descr structure. For mirrored
633 bad block tables different patterns are mandatory.</para></listitem> 633 bad block tables different patterns are mandatory.</para></listitem>
634 <listitem><para>Table creation</para> 634 <listitem><para>Table creation</para>
635 <para>Set the option NAND_BBT_CREATE to enable the table creation 635 <para>Set the option NAND_BBT_CREATE to enable the table creation
@@ -648,7 +648,7 @@ static void board_select_chip (struct mtd_info *mtd, int chip)
648 <listitem><para>Table version control</para> 648 <listitem><para>Table version control</para>
649 <para>Set the option NAND_BBT_VERSION to enable the table version control. 649 <para>Set the option NAND_BBT_VERSION to enable the table version control.
650 It's highly recommended to enable this for mirrored tables with write 650 It's highly recommended to enable this for mirrored tables with write
651 support. It makes sure that the risk of loosing the bad block 651 support. It makes sure that the risk of losing the bad block
652 table information is reduced to the loss of the information about the 652 table information is reduced to the loss of the information about the
653 one worn out block which should be marked bad. The version is stored in 653 one worn out block which should be marked bad. The version is stored in
654 4 consecutive bytes in the spare area of the device. The position of 654 4 consecutive bytes in the spare area of the device. The position of
@@ -1060,19 +1060,19 @@ data in this page</entry>
1060<row> 1060<row>
1061<entry>0x3D</entry> 1061<entry>0x3D</entry>
1062<entry>ECC byte 21</entry> 1062<entry>ECC byte 21</entry>
1063<entry>Error correction code byte 0 of the eigth 256 Bytes of data 1063<entry>Error correction code byte 0 of the eighth 256 Bytes of data
1064in this page</entry> 1064in this page</entry>
1065</row> 1065</row>
1066<row> 1066<row>
1067<entry>0x3E</entry> 1067<entry>0x3E</entry>
1068<entry>ECC byte 22</entry> 1068<entry>ECC byte 22</entry>
1069<entry>Error correction code byte 1 of the eigth 256 Bytes of data 1069<entry>Error correction code byte 1 of the eighth 256 Bytes of data
1070in this page</entry> 1070in this page</entry>
1071</row> 1071</row>
1072<row> 1072<row>
1073<entry>0x3F</entry> 1073<entry>0x3F</entry>
1074<entry>ECC byte 23</entry> 1074<entry>ECC byte 23</entry>
1075<entry>Error correction code byte 2 of the eigth 256 Bytes of data 1075<entry>Error correction code byte 2 of the eighth 256 Bytes of data
1076in this page</entry> 1076in this page</entry>
1077</row> 1077</row>
1078</tbody></tgroup></informaltable> 1078</tbody></tgroup></informaltable>
diff --git a/Documentation/DocBook/regulator.tmpl b/Documentation/DocBook/regulator.tmpl
index 53f4f8d3b810..346e552fa2cc 100644
--- a/Documentation/DocBook/regulator.tmpl
+++ b/Documentation/DocBook/regulator.tmpl
@@ -267,8 +267,8 @@
267 <sect1 id="machine-constraint"> 267 <sect1 id="machine-constraint">
268 <title>Constraints</title> 268 <title>Constraints</title>
269 <para> 269 <para>
270 As well as definining the connections the machine interface 270 As well as defining the connections the machine interface
271 also provides constraints definining the operations that 271 also provides constraints defining the operations that
272 clients are allowed to perform and the parameters that may be 272 clients are allowed to perform and the parameters that may be
273 set. This is required since generally regulator devices will 273 set. This is required since generally regulator devices will
274 offer more flexibility than it is safe to use on a given 274 offer more flexibility than it is safe to use on a given
diff --git a/Documentation/DocBook/uio-howto.tmpl b/Documentation/DocBook/uio-howto.tmpl
index b4665b9c40b0..7c4b514d62b1 100644
--- a/Documentation/DocBook/uio-howto.tmpl
+++ b/Documentation/DocBook/uio-howto.tmpl
@@ -797,7 +797,7 @@ framework to set up sysfs files for this region. Simply leave it alone.
797 perform some initialization. After that, your hardware 797 perform some initialization. After that, your hardware
798 starts working and will generate an interrupt as soon 798 starts working and will generate an interrupt as soon
799 as it's finished, has some data available, or needs your 799 as it's finished, has some data available, or needs your
800 attention because an error occured. 800 attention because an error occurred.
801 </para> 801 </para>
802 <para> 802 <para>
803 <filename>/dev/uioX</filename> is a read-only file. A 803 <filename>/dev/uioX</filename> is a read-only file. A
diff --git a/Documentation/DocBook/usb.tmpl b/Documentation/DocBook/usb.tmpl
index af293606fbe3..8d57c1888dca 100644
--- a/Documentation/DocBook/usb.tmpl
+++ b/Documentation/DocBook/usb.tmpl
@@ -690,7 +690,7 @@ usbdev_ioctl (int fd, int ifno, unsigned request, void *param)
690 </para><para> 690 </para><para>
691 This request lets kernel drivers talk to user mode code 691 This request lets kernel drivers talk to user mode code
692 through filesystem operations even when they don't create 692 through filesystem operations even when they don't create
693 a charactor or block special device. 693 a character or block special device.
694 It's also been used to do things like ask devices what 694 It's also been used to do things like ask devices what
695 device special file should be used. 695 device special file should be used.
696 Two pre-defined ioctls are used 696 Two pre-defined ioctls are used
diff --git a/Documentation/DocBook/v4l/common.xml b/Documentation/DocBook/v4l/common.xml
index dbab79c215c1..9028721438dc 100644
--- a/Documentation/DocBook/v4l/common.xml
+++ b/Documentation/DocBook/v4l/common.xml
@@ -100,7 +100,7 @@ linux-kernel@vger.kernel.org, 2002-11-20. --></para>
100 100
101 <para>By convention system administrators create various 101 <para>By convention system administrators create various
102character device special files with these major and minor numbers in 102character device special files with these major and minor numbers in
103the <filename>/dev</filename> directory. The names recomended for the 103the <filename>/dev</filename> directory. The names recommended for the
104different V4L2 device types are listed in <xref linkend="devices" />. 104different V4L2 device types are listed in <xref linkend="devices" />.
105</para> 105</para>
106 106
diff --git a/Documentation/DocBook/v4l/controls.xml b/Documentation/DocBook/v4l/controls.xml
index 2fae3e87ce73..a920ee80f640 100644
--- a/Documentation/DocBook/v4l/controls.xml
+++ b/Documentation/DocBook/v4l/controls.xml
@@ -1243,7 +1243,7 @@ values are:</entry>
1243 </row><row><entry spanname="descr">Mutes the audio when 1243 </row><row><entry spanname="descr">Mutes the audio when
1244capturing. This is not done by muting audio hardware, which can still 1244capturing. This is not done by muting audio hardware, which can still
1245produce a slight hiss, but in the encoder itself, guaranteeing a fixed 1245produce a slight hiss, but in the encoder itself, guaranteeing a fixed
1246and reproducable audio bitstream. 0 = unmuted, 1 = muted.</entry> 1246and reproducible audio bitstream. 0 = unmuted, 1 = muted.</entry>
1247 </row> 1247 </row>
1248 <row><entry></entry></row> 1248 <row><entry></entry></row>
1249 <row id="v4l2-mpeg-video-encoding"> 1249 <row id="v4l2-mpeg-video-encoding">
diff --git a/Documentation/DocBook/v4l/dev-subdev.xml b/Documentation/DocBook/v4l/dev-subdev.xml
index 21caff6d159b..05c8fefcbcbe 100644
--- a/Documentation/DocBook/v4l/dev-subdev.xml
+++ b/Documentation/DocBook/v4l/dev-subdev.xml
@@ -90,7 +90,7 @@
90 processing hardware.</para> 90 processing hardware.</para>
91 91
92 <figure id="pipeline-scaling"> 92 <figure id="pipeline-scaling">
93 <title>Image Format Negotation on Pipelines</title> 93 <title>Image Format Negotiation on Pipelines</title>
94 <mediaobject> 94 <mediaobject>
95 <imageobject> 95 <imageobject>
96 <imagedata fileref="pipeline.pdf" format="PS" /> 96 <imagedata fileref="pipeline.pdf" format="PS" />
diff --git a/Documentation/DocBook/v4l/libv4l.xml b/Documentation/DocBook/v4l/libv4l.xml
index c14fc3db2a81..3cb10ec51929 100644
--- a/Documentation/DocBook/v4l/libv4l.xml
+++ b/Documentation/DocBook/v4l/libv4l.xml
@@ -140,7 +140,7 @@ and is not locked sets the cid to the scaled value.
140 <para>int v4l2_get_control(int fd, int cid) - 140 <para>int v4l2_get_control(int fd, int cid) -
141This function returns a value of 0 - 65535, scaled to from the actual range 141This function returns a value of 0 - 65535, scaled to from the actual range
142of the given v4l control id. when the cid does not exist, could not be 142of the given v4l control id. when the cid does not exist, could not be
143accessed for some reason, or some error occured 0 is returned. 143accessed for some reason, or some error occurred 0 is returned.
144</para></listitem> 144</para></listitem>
145</itemizedlist> 145</itemizedlist>
146 </section> 146 </section>
diff --git a/Documentation/DocBook/v4l/remote_controllers.xml b/Documentation/DocBook/v4l/remote_controllers.xml
index 3c3b667b28e7..160e464d44b7 100644
--- a/Documentation/DocBook/v4l/remote_controllers.xml
+++ b/Documentation/DocBook/v4l/remote_controllers.xml
@@ -133,7 +133,7 @@ different IR's. Due to that, V4L2 API now specifies a standard for mapping Media
133<row><entry><constant>KEY_LEFT</constant></entry><entry>Left key</entry><entry>LEFT</entry></row> 133<row><entry><constant>KEY_LEFT</constant></entry><entry>Left key</entry><entry>LEFT</entry></row>
134<row><entry><constant>KEY_RIGHT</constant></entry><entry>Right key</entry><entry>RIGHT</entry></row> 134<row><entry><constant>KEY_RIGHT</constant></entry><entry>Right key</entry><entry>RIGHT</entry></row>
135 135
136<row><entry><emphasis role="bold">Miscelaneous keys</emphasis></entry></row> 136<row><entry><emphasis role="bold">Miscellaneous keys</emphasis></entry></row>
137 137
138<row><entry><constant>KEY_DOT</constant></entry><entry>Return a dot</entry><entry>.</entry></row> 138<row><entry><constant>KEY_DOT</constant></entry><entry>Return a dot</entry><entry>.</entry></row>
139<row><entry><constant>KEY_FN</constant></entry><entry>Select a function</entry><entry>FUNCTION</entry></row> 139<row><entry><constant>KEY_FN</constant></entry><entry>Select a function</entry><entry>FUNCTION</entry></row>
diff --git a/Documentation/DocBook/writing-an-alsa-driver.tmpl b/Documentation/DocBook/writing-an-alsa-driver.tmpl
index 0ba149de2608..58ced2346e67 100644
--- a/Documentation/DocBook/writing-an-alsa-driver.tmpl
+++ b/Documentation/DocBook/writing-an-alsa-driver.tmpl
@@ -4784,7 +4784,7 @@ struct _snd_pcm_runtime {
4784 FM registers can be directly accessed through the direct-FM API, 4784 FM registers can be directly accessed through the direct-FM API,
4785 defined in <filename>&lt;sound/asound_fm.h&gt;</filename>. In 4785 defined in <filename>&lt;sound/asound_fm.h&gt;</filename>. In
4786 ALSA native mode, FM registers are accessed through 4786 ALSA native mode, FM registers are accessed through
4787 the Hardware-Dependant Device direct-FM extension API, whereas in 4787 the Hardware-Dependent Device direct-FM extension API, whereas in
4788 OSS compatible mode, FM registers can be accessed with the OSS 4788 OSS compatible mode, FM registers can be accessed with the OSS
4789 direct-FM compatible API in <filename>/dev/dmfmX</filename> device. 4789 direct-FM compatible API in <filename>/dev/dmfmX</filename> device.
4790 </para> 4790 </para>
diff --git a/Documentation/PCI/MSI-HOWTO.txt b/Documentation/PCI/MSI-HOWTO.txt
index dcf7acc720e1..3f5e0b09bed5 100644
--- a/Documentation/PCI/MSI-HOWTO.txt
+++ b/Documentation/PCI/MSI-HOWTO.txt
@@ -253,8 +253,8 @@ In constrast, MSI is restricted to a maximum of 32 interrupts (and
253must be a power of two). In addition, the MSI interrupt vectors must 253must be a power of two). In addition, the MSI interrupt vectors must
254be allocated consecutively, so the system may not be able to allocate 254be allocated consecutively, so the system may not be able to allocate
255as many vectors for MSI as it could for MSI-X. On some platforms, MSI 255as many vectors for MSI as it could for MSI-X. On some platforms, MSI
256interrupts must all be targetted at the same set of CPUs whereas MSI-X 256interrupts must all be targeted at the same set of CPUs whereas MSI-X
257interrupts can all be targetted at different CPUs. 257interrupts can all be targeted at different CPUs.
258 258
2594.5.2 Spinlocks 2594.5.2 Spinlocks
260 260
diff --git a/Documentation/SecurityBugs b/Documentation/SecurityBugs
index 26c3b3635d9f..a660d494c8ed 100644
--- a/Documentation/SecurityBugs
+++ b/Documentation/SecurityBugs
@@ -28,7 +28,7 @@ expect these delays to be short, measurable in days, not weeks or months.
28A disclosure date is negotiated by the security team working with the 28A disclosure date is negotiated by the security team working with the
29bug submitter as well as vendors. However, the kernel security team 29bug submitter as well as vendors. However, the kernel security team
30holds the final say when setting a disclosure date. The timeframe for 30holds the final say when setting a disclosure date. The timeframe for
31disclosure is from immediate (esp. if it's already publically known) 31disclosure is from immediate (esp. if it's already publicly known)
32to a few weeks. As a basic default policy, we expect report date to 32to a few weeks. As a basic default policy, we expect report date to
33disclosure date to be on the order of 7 days. 33disclosure date to be on the order of 7 days.
34 34
diff --git a/Documentation/SubmittingDrivers b/Documentation/SubmittingDrivers
index 38d2aab59cac..319baa8b60dd 100644
--- a/Documentation/SubmittingDrivers
+++ b/Documentation/SubmittingDrivers
@@ -101,7 +101,7 @@ PM support: Since Linux is used on many portable and desktop systems, your
101 complete overview of the power management issues related to 101 complete overview of the power management issues related to
102 drivers see Documentation/power/devices.txt . 102 drivers see Documentation/power/devices.txt .
103 103
104Control: In general if there is active maintainance of a driver by 104Control: In general if there is active maintenance of a driver by
105 the author then patches will be redirected to them unless 105 the author then patches will be redirected to them unless
106 they are totally obvious and without need of checking. 106 they are totally obvious and without need of checking.
107 If you want to be the contact and update point for the 107 If you want to be the contact and update point for the
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index 689e2371095c..e439cd0d3375 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -729,7 +729,7 @@ Linus Torvalds's mail on the canonical patch format:
729 <http://lkml.org/lkml/2005/4/7/183> 729 <http://lkml.org/lkml/2005/4/7/183>
730 730
731Andi Kleen, "On submitting kernel patches" 731Andi Kleen, "On submitting kernel patches"
732 Some strategies to get difficult or controversal changes in. 732 Some strategies to get difficult or controversial changes in.
733 http://halobates.de/on-submitting-patches.pdf 733 http://halobates.de/on-submitting-patches.pdf
734 734
735-- 735--
diff --git a/Documentation/arm/IXP4xx b/Documentation/arm/IXP4xx
index 133c5fa6c7a1..7b9351f2f555 100644
--- a/Documentation/arm/IXP4xx
+++ b/Documentation/arm/IXP4xx
@@ -36,7 +36,7 @@ Linux currently supports the following features on the IXP4xx chips:
36- Timers (watchdog, OS) 36- Timers (watchdog, OS)
37 37
38The following components of the chips are not supported by Linux and 38The following components of the chips are not supported by Linux and
39require the use of Intel's propietary CSR softare: 39require the use of Intel's proprietary CSR softare:
40 40
41- USB device interface 41- USB device interface
42- Network interfaces (HSS, Utopia, NPEs, etc) 42- Network interfaces (HSS, Utopia, NPEs, etc)
@@ -47,7 +47,7 @@ software from:
47 47
48 http://developer.intel.com/design/network/products/npfamily/ixp425.htm 48 http://developer.intel.com/design/network/products/npfamily/ixp425.htm
49 49
50DO NOT POST QUESTIONS TO THE LINUX MAILING LISTS REGARDING THE PROPIETARY 50DO NOT POST QUESTIONS TO THE LINUX MAILING LISTS REGARDING THE PROPRIETARY
51SOFTWARE. 51SOFTWARE.
52 52
53There are several websites that provide directions/pointers on using 53There are several websites that provide directions/pointers on using
diff --git a/Documentation/arm/Samsung-S3C24XX/Suspend.txt b/Documentation/arm/Samsung-S3C24XX/Suspend.txt
index 7edd0e2e6c5b..1ca63b3e5635 100644
--- a/Documentation/arm/Samsung-S3C24XX/Suspend.txt
+++ b/Documentation/arm/Samsung-S3C24XX/Suspend.txt
@@ -116,7 +116,7 @@ Configuration
116 Allows the entire memory to be checksummed before and after the 116 Allows the entire memory to be checksummed before and after the
117 suspend to see if there has been any corruption of the contents. 117 suspend to see if there has been any corruption of the contents.
118 118
119 Note, the time to calculate the CRC is dependant on the CPU speed 119 Note, the time to calculate the CRC is dependent on the CPU speed
120 and the size of memory. For an 64Mbyte RAM area on an 200MHz 120 and the size of memory. For an 64Mbyte RAM area on an 200MHz
121 S3C2410, this can take approximately 4 seconds to complete. 121 S3C2410, this can take approximately 4 seconds to complete.
122 122
diff --git a/Documentation/arm/Samsung/GPIO.txt b/Documentation/arm/Samsung/GPIO.txt
index 05850c62abeb..513f2562c1a3 100644
--- a/Documentation/arm/Samsung/GPIO.txt
+++ b/Documentation/arm/Samsung/GPIO.txt
@@ -5,7 +5,7 @@ Introduction
5------------ 5------------
6 6
7This outlines the Samsung GPIO implementation and the architecture 7This outlines the Samsung GPIO implementation and the architecture
8specfic calls provided alongisde the drivers/gpio core. 8specific calls provided alongisde the drivers/gpio core.
9 9
10 10
11S3C24XX (Legacy) 11S3C24XX (Legacy)
diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt
index 2a7b38c832c7..c6d84cfd2f56 100644
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
@@ -497,7 +497,7 @@ The scatter gather list is in the form of an array of <page, offset, len>
497entries with their corresponding dma address mappings filled in at the 497entries with their corresponding dma address mappings filled in at the
498appropriate time. As an optimization, contiguous physical pages can be 498appropriate time. As an optimization, contiguous physical pages can be
499covered by a single entry where <page> refers to the first page and <len> 499covered by a single entry where <page> refers to the first page and <len>
500covers the range of pages (upto 16 contiguous pages could be covered this 500covers the range of pages (up to 16 contiguous pages could be covered this
501way). There is a helper routine (blk_rq_map_sg) which drivers can use to build 501way). There is a helper routine (blk_rq_map_sg) which drivers can use to build
502the sg list. 502the sg list.
503 503
@@ -565,7 +565,7 @@ struct request {
565 . 565 .
566 int tag; /* command tag associated with request */ 566 int tag; /* command tag associated with request */
567 void *special; /* same as before */ 567 void *special; /* same as before */
568 char *buffer; /* valid only for low memory buffers upto 568 char *buffer; /* valid only for low memory buffers up to
569 current_nr_sectors */ 569 current_nr_sectors */
570 . 570 .
571 . 571 .
diff --git a/Documentation/cpu-hotplug.txt b/Documentation/cpu-hotplug.txt
index 45d5a217484f..a20bfd415e41 100644
--- a/Documentation/cpu-hotplug.txt
+++ b/Documentation/cpu-hotplug.txt
@@ -196,7 +196,7 @@ the state as 0 when a cpu if offline and 1 when its online.
196 #To display the current cpu state. 196 #To display the current cpu state.
197 #cat /sys/devices/system/cpu/cpuX/online 197 #cat /sys/devices/system/cpu/cpuX/online
198 198
199Q: Why cant i remove CPU0 on some systems? 199Q: Why can't i remove CPU0 on some systems?
200A: Some architectures may have some special dependency on a certain CPU. 200A: Some architectures may have some special dependency on a certain CPU.
201 201
202For e.g in IA64 platforms we have ability to sent platform interrupts to the 202For e.g in IA64 platforms we have ability to sent platform interrupts to the
diff --git a/Documentation/dell_rbu.txt b/Documentation/dell_rbu.txt
index 15174985ad08..d262e22bddec 100644
--- a/Documentation/dell_rbu.txt
+++ b/Documentation/dell_rbu.txt
@@ -62,7 +62,7 @@ image file and then arrange all these packets back to back in to one single
62file. 62file.
63This file is then copied to /sys/class/firmware/dell_rbu/data. 63This file is then copied to /sys/class/firmware/dell_rbu/data.
64Once this file gets to the driver, the driver extracts packet_size data from 64Once this file gets to the driver, the driver extracts packet_size data from
65the file and spreads it accross the physical memory in contiguous packet_sized 65the file and spreads it across the physical memory in contiguous packet_sized
66space. 66space.
67This method makes sure that all the packets get to the driver in a single operation. 67This method makes sure that all the packets get to the driver in a single operation.
68 68
diff --git a/Documentation/device-mapper/dm-service-time.txt b/Documentation/device-mapper/dm-service-time.txt
index 7d00668e97bb..fb1d4a0cf122 100644
--- a/Documentation/device-mapper/dm-service-time.txt
+++ b/Documentation/device-mapper/dm-service-time.txt
@@ -37,7 +37,7 @@ Algorithm
37========= 37=========
38 38
39dm-service-time adds the I/O size to 'in-flight-size' when the I/O is 39dm-service-time adds the I/O size to 'in-flight-size' when the I/O is
40dispatched and substracts when completed. 40dispatched and subtracts when completed.
41Basically, dm-service-time selects a path having minimum service time 41Basically, dm-service-time selects a path having minimum service time
42which is calculated by: 42which is calculated by:
43 43
diff --git a/Documentation/devicetree/bindings/fb/sm501fb.txt b/Documentation/devicetree/bindings/fb/sm501fb.txt
index 7d319fba9b5b..9d9f0098092b 100644
--- a/Documentation/devicetree/bindings/fb/sm501fb.txt
+++ b/Documentation/devicetree/bindings/fb/sm501fb.txt
@@ -18,9 +18,9 @@ Optional properties:
18- edid : verbatim EDID data block describing attached display. 18- edid : verbatim EDID data block describing attached display.
19 Data from the detailed timing descriptor will be used to 19 Data from the detailed timing descriptor will be used to
20 program the display controller. 20 program the display controller.
21- little-endian: availiable on big endian systems, to 21- little-endian: available on big endian systems, to
22 set different foreign endian. 22 set different foreign endian.
23- big-endian: availiable on little endian systems, to 23- big-endian: available on little endian systems, to
24 set different foreign endian. 24 set different foreign endian.
25 25
26Example for MPC5200: 26Example for MPC5200:
diff --git a/Documentation/devicetree/bindings/mtd/fsl-upm-nand.txt b/Documentation/devicetree/bindings/mtd/fsl-upm-nand.txt
index a48b2cadc7f0..00f1f546b32e 100644
--- a/Documentation/devicetree/bindings/mtd/fsl-upm-nand.txt
+++ b/Documentation/devicetree/bindings/mtd/fsl-upm-nand.txt
@@ -15,7 +15,7 @@ Optional properties:
15- gpios : may specify optional GPIOs connected to the Ready-Not-Busy pins 15- gpios : may specify optional GPIOs connected to the Ready-Not-Busy pins
16 (R/B#). For multi-chip devices, "n" GPIO definitions are required 16 (R/B#). For multi-chip devices, "n" GPIO definitions are required
17 according to the number of chips. 17 according to the number of chips.
18- chip-delay : chip dependent delay for transfering data from array to 18- chip-delay : chip dependent delay for transferring data from array to
19 read registers (tR). Required if property "gpios" is not used 19 read registers (tR). Required if property "gpios" is not used
20 (R/B# pins not connected). 20 (R/B# pins not connected).
21 21
diff --git a/Documentation/devicetree/bindings/net/can/sja1000.txt b/Documentation/devicetree/bindings/net/can/sja1000.txt
index d6d209ded937..c2dbcec0ee31 100644
--- a/Documentation/devicetree/bindings/net/can/sja1000.txt
+++ b/Documentation/devicetree/bindings/net/can/sja1000.txt
@@ -39,7 +39,7 @@ Optional properties:
39 39
40- nxp,no-comparator-bypass : Allows to disable the CAN input comperator. 40- nxp,no-comparator-bypass : Allows to disable the CAN input comperator.
41 41
42For futher information, please have a look to the SJA1000 data sheet. 42For further information, please have a look to the SJA1000 data sheet.
43 43
44Examples: 44Examples:
45 45
diff --git a/Documentation/devicetree/bindings/powerpc/fsl/mpic.txt b/Documentation/devicetree/bindings/powerpc/fsl/mpic.txt
index 8aa10f45ebe6..4f6145859aab 100644
--- a/Documentation/devicetree/bindings/powerpc/fsl/mpic.txt
+++ b/Documentation/devicetree/bindings/powerpc/fsl/mpic.txt
@@ -199,7 +199,7 @@ EXAMPLE 4
199 199
200EXAMPLE 5 200EXAMPLE 5
201 /* 201 /*
202 * Definition of an error interrupt (interupt type 1). 202 * Definition of an error interrupt (interrupt type 1).
203 * SoC interrupt number is 16 and the specific error 203 * SoC interrupt number is 16 and the specific error
204 * interrupt bit in the error interrupt summary register 204 * interrupt bit in the error interrupt summary register
205 * is 23. 205 * is 23.
diff --git a/Documentation/dvb/README.dvb-usb b/Documentation/dvb/README.dvb-usb
index c8238e44ed6b..c4d963a67d6f 100644
--- a/Documentation/dvb/README.dvb-usb
+++ b/Documentation/dvb/README.dvb-usb
@@ -138,7 +138,7 @@ Hotplug is able to load the driver, when it is needed (because you plugged
138in the device). 138in the device).
139 139
140If you want to enable debug output, you have to load the driver manually and 140If you want to enable debug output, you have to load the driver manually and
141from withing the dvb-kernel cvs repository. 141from within the dvb-kernel cvs repository.
142 142
143first have a look, which debug level are available: 143first have a look, which debug level are available:
144 144
diff --git a/Documentation/dvb/ci.txt b/Documentation/dvb/ci.txt
index 4a0c2b56e690..6c3bda50f7dc 100644
--- a/Documentation/dvb/ci.txt
+++ b/Documentation/dvb/ci.txt
@@ -47,7 +47,7 @@ so on.
47 47
48* CI modules that are supported 48* CI modules that are supported
49~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 49~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
50The CI module support is largely dependant upon the firmware on the cards 50The CI module support is largely dependent upon the firmware on the cards
51Some cards do support almost all of the available CI modules. There is 51Some cards do support almost all of the available CI modules. There is
52nothing much that can be done in order to make additional CI modules 52nothing much that can be done in order to make additional CI modules
53working with these cards. 53working with these cards.
diff --git a/Documentation/dvb/faq.txt b/Documentation/dvb/faq.txt
index 121832e5d899..97b1373f2428 100644
--- a/Documentation/dvb/faq.txt
+++ b/Documentation/dvb/faq.txt
@@ -106,7 +106,7 @@ Some very frequently asked questions about linuxtv-dvb
1065. The dvb_net device doesn't give me any packets at all 1065. The dvb_net device doesn't give me any packets at all
107 107
108 Run tcpdump on the dvb0_0 interface. This sets the interface 108 Run tcpdump on the dvb0_0 interface. This sets the interface
109 into promiscous mode so it accepts any packets from the PID 109 into promiscuous mode so it accepts any packets from the PID
110 you have configured with the dvbnet utility. Check if there 110 you have configured with the dvbnet utility. Check if there
111 are any packets with the IP addr and MAC addr you have 111 are any packets with the IP addr and MAC addr you have
112 configured with ifconfig. 112 configured with ifconfig.
diff --git a/Documentation/edac.txt b/Documentation/edac.txt
index ccc07c28967e..249822cde82b 100644
--- a/Documentation/edac.txt
+++ b/Documentation/edac.txt
@@ -741,7 +741,7 @@ were done at i7core_edac driver. This chapter will cover those differences
741 As EDAC API maps the minimum unity is csrows, the driver sequencially 741 As EDAC API maps the minimum unity is csrows, the driver sequencially
742 maps channel/dimm into different csrows. 742 maps channel/dimm into different csrows.
743 743
744 For example, suposing the following layout: 744 For example, supposing the following layout:
745 Ch0 phy rd0, wr0 (0x063f4031): 2 ranks, UDIMMs 745 Ch0 phy rd0, wr0 (0x063f4031): 2 ranks, UDIMMs
746 dimm 0 1024 Mb offset: 0, bank: 8, rank: 1, row: 0x4000, col: 0x400 746 dimm 0 1024 Mb offset: 0, bank: 8, rank: 1, row: 0x4000, col: 0x400
747 dimm 1 1024 Mb offset: 4, bank: 8, rank: 1, row: 0x4000, col: 0x400 747 dimm 1 1024 Mb offset: 4, bank: 8, rank: 1, row: 0x4000, col: 0x400
diff --git a/Documentation/eisa.txt b/Documentation/eisa.txt
index f297fc1202ae..38cf0c7b559f 100644
--- a/Documentation/eisa.txt
+++ b/Documentation/eisa.txt
@@ -84,7 +84,7 @@ struct eisa_driver {
84 84
85id_table : an array of NULL terminated EISA id strings, 85id_table : an array of NULL terminated EISA id strings,
86 followed by an empty string. Each string can 86 followed by an empty string. Each string can
87 optionally be paired with a driver-dependant value 87 optionally be paired with a driver-dependent value
88 (driver_data). 88 (driver_data).
89 89
90driver : a generic driver, such as described in 90driver : a generic driver, such as described in
diff --git a/Documentation/fb/viafb.txt b/Documentation/fb/viafb.txt
index 1a2e8aa3fbb1..444e34b52ae1 100644
--- a/Documentation/fb/viafb.txt
+++ b/Documentation/fb/viafb.txt
@@ -204,7 +204,7 @@ Notes:
204 204
205 supported_output_devices 205 supported_output_devices
206 206
207 This read-only file contains a full ',' seperated list containing all 207 This read-only file contains a full ',' separated list containing all
208 output devices that could be available on your platform. It is likely 208 output devices that could be available on your platform. It is likely
209 that not all of those have a connector on your hardware but it should 209 that not all of those have a connector on your hardware but it should
210 provide a good starting point to figure out which of those names match 210 provide a good starting point to figure out which of those names match
@@ -225,7 +225,7 @@ Notes:
225 This can happen for example if only one (the other) iga is used. 225 This can happen for example if only one (the other) iga is used.
226 Writing to these files allows adjusting the output devices during 226 Writing to these files allows adjusting the output devices during
227 runtime. One can add new devices, remove existing ones or switch 227 runtime. One can add new devices, remove existing ones or switch
228 between igas. Essentially you can write a ',' seperated list of device 228 between igas. Essentially you can write a ',' separated list of device
229 names (or a single one) in the same format as the output to those 229 names (or a single one) in the same format as the output to those
230 files. You can add a '+' or '-' as a prefix allowing simple addition 230 files. You can add a '+' or '-' as a prefix allowing simple addition
231 and removal of devices. So a prefix '+' adds the devices from your list 231 and removal of devices. So a prefix '+' adds the devices from your list
diff --git a/Documentation/filesystems/autofs4-mount-control.txt b/Documentation/filesystems/autofs4-mount-control.txt
index 51986bf08a4d..4c95935cbcf4 100644
--- a/Documentation/filesystems/autofs4-mount-control.txt
+++ b/Documentation/filesystems/autofs4-mount-control.txt
@@ -309,7 +309,7 @@ ioctlfd field set to the descriptor obtained from the open call.
309AUTOFS_DEV_IOCTL_TIMEOUT_CMD 309AUTOFS_DEV_IOCTL_TIMEOUT_CMD
310---------------------------- 310----------------------------
311 311
312Set the expire timeout for mounts withing an autofs mount point. 312Set the expire timeout for mounts within an autofs mount point.
313 313
314The call requires an initialized struct autofs_dev_ioctl with the 314The call requires an initialized struct autofs_dev_ioctl with the
315ioctlfd field set to the descriptor obtained from the open call. 315ioctlfd field set to the descriptor obtained from the open call.
diff --git a/Documentation/filesystems/caching/netfs-api.txt b/Documentation/filesystems/caching/netfs-api.txt
index 1902c57b72ef..a167ab876c35 100644
--- a/Documentation/filesystems/caching/netfs-api.txt
+++ b/Documentation/filesystems/caching/netfs-api.txt
@@ -95,7 +95,7 @@ restraints as possible on how an index is structured and where it is placed in
95the tree. The netfs can even mix indices and data files at the same level, but 95the tree. The netfs can even mix indices and data files at the same level, but
96it's not recommended. 96it's not recommended.
97 97
98Each index entry consists of a key of indeterminate length plus some auxilliary 98Each index entry consists of a key of indeterminate length plus some auxiliary
99data, also of indeterminate length. 99data, also of indeterminate length.
100 100
101There are some limits on indices: 101There are some limits on indices:
@@ -203,23 +203,23 @@ This has the following fields:
203 203
204 If the function is absent, a file size of 0 is assumed. 204 If the function is absent, a file size of 0 is assumed.
205 205
206 (6) A function to retrieve auxilliary data from the netfs [optional]. 206 (6) A function to retrieve auxiliary data from the netfs [optional].
207 207
208 This function will be called with the netfs data that was passed to the 208 This function will be called with the netfs data that was passed to the
209 cookie acquisition function and the maximum length of auxilliary data that 209 cookie acquisition function and the maximum length of auxiliary data that
210 it may provide. It should write the auxilliary data into the given buffer 210 it may provide. It should write the auxiliary data into the given buffer
211 and return the quantity it wrote. 211 and return the quantity it wrote.
212 212
213 If this function is absent, the auxilliary data length will be set to 0. 213 If this function is absent, the auxiliary data length will be set to 0.
214 214
215 The length of the auxilliary data buffer may be dependent on the key 215 The length of the auxiliary data buffer may be dependent on the key
216 length. A netfs mustn't rely on being able to provide more than 400 bytes 216 length. A netfs mustn't rely on being able to provide more than 400 bytes
217 for both. 217 for both.
218 218
219 (7) A function to check the auxilliary data [optional]. 219 (7) A function to check the auxiliary data [optional].
220 220
221 This function will be called to check that a match found in the cache for 221 This function will be called to check that a match found in the cache for
222 this object is valid. For instance with AFS it could check the auxilliary 222 this object is valid. For instance with AFS it could check the auxiliary
223 data against the data version number returned by the server to determine 223 data against the data version number returned by the server to determine
224 whether the index entry in a cache is still valid. 224 whether the index entry in a cache is still valid.
225 225
@@ -232,7 +232,7 @@ This has the following fields:
232 (*) FSCACHE_CHECKAUX_NEEDS_UPDATE - the entry requires update 232 (*) FSCACHE_CHECKAUX_NEEDS_UPDATE - the entry requires update
233 (*) FSCACHE_CHECKAUX_OBSOLETE - the entry should be deleted 233 (*) FSCACHE_CHECKAUX_OBSOLETE - the entry should be deleted
234 234
235 This function can also be used to extract data from the auxilliary data in 235 This function can also be used to extract data from the auxiliary data in
236 the cache and copy it into the netfs's structures. 236 the cache and copy it into the netfs's structures.
237 237
238 (8) A pair of functions to manage contexts for the completion callback 238 (8) A pair of functions to manage contexts for the completion callback
diff --git a/Documentation/filesystems/configfs/configfs.txt b/Documentation/filesystems/configfs/configfs.txt
index fabcb0e00f25..dd57bb6bb390 100644
--- a/Documentation/filesystems/configfs/configfs.txt
+++ b/Documentation/filesystems/configfs/configfs.txt
@@ -409,7 +409,7 @@ As a consequence of this, default_groups cannot be removed directly via
409rmdir(2). They also are not considered when rmdir(2) on the parent 409rmdir(2). They also are not considered when rmdir(2) on the parent
410group is checking for children. 410group is checking for children.
411 411
412[Dependant Subsystems] 412[Dependent Subsystems]
413 413
414Sometimes other drivers depend on particular configfs items. For 414Sometimes other drivers depend on particular configfs items. For
415example, ocfs2 mounts depend on a heartbeat region item. If that 415example, ocfs2 mounts depend on a heartbeat region item. If that
diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt
index 6b050464a90d..c79ec58fd7f6 100644
--- a/Documentation/filesystems/ext4.txt
+++ b/Documentation/filesystems/ext4.txt
@@ -97,7 +97,7 @@ Note: More extensive information for getting started with ext4 can be
97* Inode allocation using large virtual block groups via flex_bg 97* Inode allocation using large virtual block groups via flex_bg
98* delayed allocation 98* delayed allocation
99* large block (up to pagesize) support 99* large block (up to pagesize) support
100* efficent new ordered mode in JBD2 and ext4(avoid using buffer head to force 100* efficient new ordered mode in JBD2 and ext4(avoid using buffer head to force
101 the ordering) 101 the ordering)
102 102
103[1] Filesystems with a block size of 1k may see a limit imposed by the 103[1] Filesystems with a block size of 1k may see a limit imposed by the
@@ -106,7 +106,7 @@ directory hash tree having a maximum depth of two.
1062.2 Candidate features for future inclusion 1062.2 Candidate features for future inclusion
107 107
108* Online defrag (patches available but not well tested) 108* Online defrag (patches available but not well tested)
109* reduced mke2fs time via lazy itable initialization in conjuction with 109* reduced mke2fs time via lazy itable initialization in conjunction with
110 the uninit_bg feature (capability to do this is available in e2fsprogs 110 the uninit_bg feature (capability to do this is available in e2fsprogs
111 but a kernel thread to do lazy zeroing of unused inode table blocks 111 but a kernel thread to do lazy zeroing of unused inode table blocks
112 after filesystem is first mounted is required for safety) 112 after filesystem is first mounted is required for safety)
diff --git a/Documentation/filesystems/gfs2-uevents.txt b/Documentation/filesystems/gfs2-uevents.txt
index fd966dc9979a..d81889669293 100644
--- a/Documentation/filesystems/gfs2-uevents.txt
+++ b/Documentation/filesystems/gfs2-uevents.txt
@@ -62,7 +62,7 @@ be fixed.
62 62
63The REMOVE uevent is generated at the end of an unsuccessful mount 63The REMOVE uevent is generated at the end of an unsuccessful mount
64or at the end of a umount of the filesystem. All REMOVE uevents will 64or at the end of a umount of the filesystem. All REMOVE uevents will
65have been preceeded by at least an ADD uevent for the same fileystem, 65have been preceded by at least an ADD uevent for the same fileystem,
66and unlike the other uevents is generated automatically by the kernel's 66and unlike the other uevents is generated automatically by the kernel's
67kobject subsystem. 67kobject subsystem.
68 68
diff --git a/Documentation/filesystems/gfs2.txt b/Documentation/filesystems/gfs2.txt
index 0b59c0200912..4cda926628aa 100644
--- a/Documentation/filesystems/gfs2.txt
+++ b/Documentation/filesystems/gfs2.txt
@@ -11,7 +11,7 @@ their I/O so file system consistency is maintained. One of the nifty
11features of GFS is perfect consistency -- changes made to the file system 11features of GFS is perfect consistency -- changes made to the file system
12on one machine show up immediately on all other machines in the cluster. 12on one machine show up immediately on all other machines in the cluster.
13 13
14GFS uses interchangable inter-node locking mechanisms, the currently 14GFS uses interchangeable inter-node locking mechanisms, the currently
15supported mechanisms are: 15supported mechanisms are:
16 16
17 lock_nolock -- allows gfs to be used as a local file system 17 lock_nolock -- allows gfs to be used as a local file system
diff --git a/Documentation/filesystems/ntfs.txt b/Documentation/filesystems/ntfs.txt
index 933bc66ccff1..791af8dac065 100644
--- a/Documentation/filesystems/ntfs.txt
+++ b/Documentation/filesystems/ntfs.txt
@@ -350,7 +350,7 @@ Note the "Should sync?" parameter "nosync" means that the two mirrors are
350already in sync which will be the case on a clean shutdown of Windows. If the 350already in sync which will be the case on a clean shutdown of Windows. If the
351mirrors are not clean, you can specify the "sync" option instead of "nosync" 351mirrors are not clean, you can specify the "sync" option instead of "nosync"
352and the Device-Mapper driver will then copy the entirety of the "Source Device" 352and the Device-Mapper driver will then copy the entirety of the "Source Device"
353to the "Target Device" or if you specified multipled target devices to all of 353to the "Target Device" or if you specified multiple target devices to all of
354them. 354them.
355 355
356Once you have your table, save it in a file somewhere (e.g. /etc/ntfsvolume1), 356Once you have your table, save it in a file somewhere (e.g. /etc/ntfsvolume1),
diff --git a/Documentation/filesystems/ocfs2.txt b/Documentation/filesystems/ocfs2.txt
index 5393e6611691..9ed920a8cd79 100644
--- a/Documentation/filesystems/ocfs2.txt
+++ b/Documentation/filesystems/ocfs2.txt
@@ -80,7 +80,7 @@ user_xattr (*) Enables Extended User Attributes.
80nouser_xattr Disables Extended User Attributes. 80nouser_xattr Disables Extended User Attributes.
81acl Enables POSIX Access Control Lists support. 81acl Enables POSIX Access Control Lists support.
82noacl (*) Disables POSIX Access Control Lists support. 82noacl (*) Disables POSIX Access Control Lists support.
83resv_level=2 (*) Set how agressive allocation reservations will be. 83resv_level=2 (*) Set how aggressive allocation reservations will be.
84 Valid values are between 0 (reservations off) to 8 84 Valid values are between 0 (reservations off) to 8
85 (maximum space for reservations). 85 (maximum space for reservations).
86dir_resv_level= (*) By default, directory reservations will scale with file 86dir_resv_level= (*) By default, directory reservations will scale with file
diff --git a/Documentation/filesystems/path-lookup.txt b/Documentation/filesystems/path-lookup.txt
index eb59c8b44be9..3571667c7105 100644
--- a/Documentation/filesystems/path-lookup.txt
+++ b/Documentation/filesystems/path-lookup.txt
@@ -42,7 +42,7 @@ Path walking overview
42A name string specifies a start (root directory, cwd, fd-relative) and a 42A name string specifies a start (root directory, cwd, fd-relative) and a
43sequence of elements (directory entry names), which together refer to a path in 43sequence of elements (directory entry names), which together refer to a path in
44the namespace. A path is represented as a (dentry, vfsmount) tuple. The name 44the namespace. A path is represented as a (dentry, vfsmount) tuple. The name
45elements are sub-strings, seperated by '/'. 45elements are sub-strings, separated by '/'.
46 46
47Name lookups will want to find a particular path that a name string refers to 47Name lookups will want to find a particular path that a name string refers to
48(usually the final element, or parent of final element). This is done by taking 48(usually the final element, or parent of final element). This is done by taking
@@ -354,7 +354,7 @@ vfstest 24185492 4945 708725(2.9%) 1076136(4.4%) 0 2651
354 354
355What this shows is that failed rcu-walk lookups, ie. ones that are restarted 355What this shows is that failed rcu-walk lookups, ie. ones that are restarted
356entirely with ref-walk, are quite rare. Even the "vfstest" case which 356entirely with ref-walk, are quite rare. Even the "vfstest" case which
357specifically has concurrent renames/mkdir/rmdir/ creat/unlink/etc to excercise 357specifically has concurrent renames/mkdir/rmdir/ creat/unlink/etc to exercise
358such races is not showing a huge amount of restarts. 358such races is not showing a huge amount of restarts.
359 359
360Dropping from rcu-walk to ref-walk mean that we have encountered a dentry where 360Dropping from rcu-walk to ref-walk mean that we have encountered a dentry where
diff --git a/Documentation/filesystems/pohmelfs/network_protocol.txt b/Documentation/filesystems/pohmelfs/network_protocol.txt
index 40ea6c295afb..65e03dd44823 100644
--- a/Documentation/filesystems/pohmelfs/network_protocol.txt
+++ b/Documentation/filesystems/pohmelfs/network_protocol.txt
@@ -20,7 +20,7 @@ Commands can be embedded into transaction command (which in turn has own command
20so one can extend protocol as needed without breaking backward compatibility as long 20so one can extend protocol as needed without breaking backward compatibility as long
21as old commands are supported. All string lengths include tail 0 byte. 21as old commands are supported. All string lengths include tail 0 byte.
22 22
23All commans are transfered over the network in big-endian. CPU endianess is used at the end peers. 23All commands are transferred over the network in big-endian. CPU endianess is used at the end peers.
24 24
25@cmd - command number, which specifies command to be processed. Following 25@cmd - command number, which specifies command to be processed. Following
26 commands are used currently: 26 commands are used currently:
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index 23cae6548d3a..b0b814d75ca1 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -543,7 +543,7 @@ just those considered 'most important'. The new vectors are:
543 their statistics are used by kernel developers and interested users to 543 their statistics are used by kernel developers and interested users to
544 determine the occurrence of interrupts of the given type. 544 determine the occurrence of interrupts of the given type.
545 545
546The above IRQ vectors are displayed only when relevent. For example, 546The above IRQ vectors are displayed only when relevant. For example,
547the threshold vector does not exist on x86_64 platforms. Others are 547the threshold vector does not exist on x86_64 platforms. Others are
548suppressed when the system is a uniprocessor. As of this writing, only 548suppressed when the system is a uniprocessor. As of this writing, only
549i386 and x86_64 platforms support the new IRQ vector displays. 549i386 and x86_64 platforms support the new IRQ vector displays.
@@ -1202,7 +1202,7 @@ The columns are:
1202 W = can do write operations 1202 W = can do write operations
1203 U = can do unblank 1203 U = can do unblank
1204 flags E = it is enabled 1204 flags E = it is enabled
1205 C = it is prefered console 1205 C = it is preferred console
1206 B = it is primary boot console 1206 B = it is primary boot console
1207 p = it is used for printk buffer 1207 p = it is used for printk buffer
1208 b = it is not a TTY but a Braille device 1208 b = it is not a TTY but a Braille device
@@ -1331,7 +1331,7 @@ NOTICE: /proc/<pid>/oom_adj is deprecated and will be removed, please see
1331Documentation/feature-removal-schedule.txt. 1331Documentation/feature-removal-schedule.txt.
1332 1332
1333Caveat: when a parent task is selected, the oom killer will sacrifice any first 1333Caveat: when a parent task is selected, the oom killer will sacrifice any first
1334generation children with seperate address spaces instead, if possible. This 1334generation children with separate address spaces instead, if possible. This
1335avoids servers and important system daemons from being killed and loses the 1335avoids servers and important system daemons from being killed and loses the
1336minimal amount of work. 1336minimal amount of work.
1337 1337
diff --git a/Documentation/filesystems/squashfs.txt b/Documentation/filesystems/squashfs.txt
index 2d78f1911844..d4d41465a0b1 100644
--- a/Documentation/filesystems/squashfs.txt
+++ b/Documentation/filesystems/squashfs.txt
@@ -219,7 +219,7 @@ or if it is stored out of line (in which case the value field stores a
219reference to where the actual value is stored). This allows large values 219reference to where the actual value is stored). This allows large values
220to be stored out of line improving scanning and lookup performance and it 220to be stored out of line improving scanning and lookup performance and it
221also allows values to be de-duplicated, the value being stored once, and 221also allows values to be de-duplicated, the value being stored once, and
222all other occurences holding an out of line reference to that value. 222all other occurrences holding an out of line reference to that value.
223 223
224The xattr lists are packed into compressed 8K metadata blocks. 224The xattr lists are packed into compressed 8K metadata blocks.
225To reduce overhead in inodes, rather than storing the on-disk 225To reduce overhead in inodes, rather than storing the on-disk
diff --git a/Documentation/filesystems/sysfs.txt b/Documentation/filesystems/sysfs.txt
index f806e50aaa63..597f728e7b4e 100644
--- a/Documentation/filesystems/sysfs.txt
+++ b/Documentation/filesystems/sysfs.txt
@@ -62,7 +62,7 @@ values of the same type.
62 62
63Mixing types, expressing multiple lines of data, and doing fancy 63Mixing types, expressing multiple lines of data, and doing fancy
64formatting of data is heavily frowned upon. Doing these things may get 64formatting of data is heavily frowned upon. Doing these things may get
65you publically humiliated and your code rewritten without notice. 65you publicly humiliated and your code rewritten without notice.
66 66
67 67
68An attribute definition is simply: 68An attribute definition is simply:
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index 80815ed654cb..21a7dc467bba 100644
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -97,7 +97,7 @@ functions:
97The passed struct file_system_type describes your filesystem. When a 97The passed struct file_system_type describes your filesystem. When a
98request is made to mount a filesystem onto a directory in your namespace, 98request is made to mount a filesystem onto a directory in your namespace,
99the VFS will call the appropriate mount() method for the specific 99the VFS will call the appropriate mount() method for the specific
100filesystem. New vfsmount refering to the tree returned by ->mount() 100filesystem. New vfsmount referring to the tree returned by ->mount()
101will be attached to the mountpoint, so that when pathname resolution 101will be attached to the mountpoint, so that when pathname resolution
102reaches the mountpoint it will jump into the root of that vfsmount. 102reaches the mountpoint it will jump into the root of that vfsmount.
103 103
diff --git a/Documentation/filesystems/xfs-delayed-logging-design.txt b/Documentation/filesystems/xfs-delayed-logging-design.txt
index 5282e3e51413..2ce36439c09f 100644
--- a/Documentation/filesystems/xfs-delayed-logging-design.txt
+++ b/Documentation/filesystems/xfs-delayed-logging-design.txt
@@ -42,7 +42,7 @@ the aggregation of all the previous changes currently held only in the log.
42This relogging technique also allows objects to be moved forward in the log so 42This relogging technique also allows objects to be moved forward in the log so
43that an object being relogged does not prevent the tail of the log from ever 43that an object being relogged does not prevent the tail of the log from ever
44moving forward. This can be seen in the table above by the changing 44moving forward. This can be seen in the table above by the changing
45(increasing) LSN of each subsquent transaction - the LSN is effectively a 45(increasing) LSN of each subsequent transaction - the LSN is effectively a
46direct encoding of the location in the log of the transaction. 46direct encoding of the location in the log of the transaction.
47 47
48This relogging is also used to implement long-running, multiple-commit 48This relogging is also used to implement long-running, multiple-commit
@@ -338,7 +338,7 @@ the same time another transaction modifies the item and inserts the log item
338into the new CIL, then checkpoint transaction commit code cannot use log items 338into the new CIL, then checkpoint transaction commit code cannot use log items
339to store the list of log vectors that need to be written into the transaction. 339to store the list of log vectors that need to be written into the transaction.
340Hence log vectors need to be able to be chained together to allow them to be 340Hence log vectors need to be able to be chained together to allow them to be
341detatched from the log items. That is, when the CIL is flushed the memory 341detached from the log items. That is, when the CIL is flushed the memory
342buffer and log vector attached to each log item needs to be attached to the 342buffer and log vector attached to each log item needs to be attached to the
343checkpoint context so that the log item can be released. In diagrammatic form, 343checkpoint context so that the log item can be released. In diagrammatic form,
344the CIL would look like this before the flush: 344the CIL would look like this before the flush:
@@ -577,7 +577,7 @@ only becomes unpinned when all the transactions complete and there are no
577pending transactions. Thus the pinning and unpinning of a log item is symmetric 577pending transactions. Thus the pinning and unpinning of a log item is symmetric
578as there is a 1:1 relationship with transaction commit and log item completion. 578as there is a 1:1 relationship with transaction commit and log item completion.
579 579
580For delayed logging, however, we have an assymetric transaction commit to 580For delayed logging, however, we have an asymmetric transaction commit to
581completion relationship. Every time an object is relogged in the CIL it goes 581completion relationship. Every time an object is relogged in the CIL it goes
582through the commit process without a corresponding completion being registered. 582through the commit process without a corresponding completion being registered.
583That is, we now have a many-to-one relationship between transaction commit and 583That is, we now have a many-to-one relationship between transaction commit and
@@ -780,7 +780,7 @@ With delayed logging, there are new steps inserted into the life cycle:
780From this, it can be seen that the only life cycle differences between the two 780From this, it can be seen that the only life cycle differences between the two
781logging methods are in the middle of the life cycle - they still have the same 781logging methods are in the middle of the life cycle - they still have the same
782beginning and end and execution constraints. The only differences are in the 782beginning and end and execution constraints. The only differences are in the
783commiting of the log items to the log itself and the completion processing. 783committing of the log items to the log itself and the completion processing.
784Hence delayed logging should not introduce any constraints on log item 784Hence delayed logging should not introduce any constraints on log item
785behaviour, allocation or freeing that don't already exist. 785behaviour, allocation or freeing that don't already exist.
786 786
diff --git a/Documentation/hwmon/abituguru b/Documentation/hwmon/abituguru
index 5eb3b9d5f0d5..915f32063a26 100644
--- a/Documentation/hwmon/abituguru
+++ b/Documentation/hwmon/abituguru
@@ -78,7 +78,7 @@ motherboards (most modern Abit motherboards).
78 78
79The first and second revision of the uGuru chip in reality is a Winbond 79The first and second revision of the uGuru chip in reality is a Winbond
80W83L950D in disguise (despite Abit claiming it is "a new microprocessor 80W83L950D in disguise (despite Abit claiming it is "a new microprocessor
81designed by the ABIT Engineers"). Unfortunatly this doesn't help since the 81designed by the ABIT Engineers"). Unfortunately this doesn't help since the
82W83L950D is a generic microcontroller with a custom Abit application running 82W83L950D is a generic microcontroller with a custom Abit application running
83on it. 83on it.
84 84
diff --git a/Documentation/hwmon/abituguru-datasheet b/Documentation/hwmon/abituguru-datasheet
index d9251efdcec7..8d2be8a0b1e3 100644
--- a/Documentation/hwmon/abituguru-datasheet
+++ b/Documentation/hwmon/abituguru-datasheet
@@ -5,9 +5,9 @@ First of all, what I know about uGuru is no fact based on any help, hints or
5datasheet from Abit. The data I have got on uGuru have I assembled through 5datasheet from Abit. The data I have got on uGuru have I assembled through
6my weak knowledge in "backwards engineering". 6my weak knowledge in "backwards engineering".
7And just for the record, you may have noticed uGuru isn't a chip developed by 7And just for the record, you may have noticed uGuru isn't a chip developed by
8Abit, as they claim it to be. It's realy just an microprocessor (uC) created by 8Abit, as they claim it to be. It's really just an microprocessor (uC) created by
9Winbond (W83L950D). And no, reading the manual for this specific uC or 9Winbond (W83L950D). And no, reading the manual for this specific uC or
10mailing Windbond for help won't give any usefull data about uGuru, as it is 10mailing Windbond for help won't give any useful data about uGuru, as it is
11the program inside the uC that is responding to calls. 11the program inside the uC that is responding to calls.
12 12
13Olle Sandberg <ollebull@gmail.com>, 2005-05-25 13Olle Sandberg <ollebull@gmail.com>, 2005-05-25
@@ -41,7 +41,7 @@ later on attached again data-port will hold 0x08, more about this later.
41 41
42After wider testing of the Linux kernel driver some variants of the uGuru have 42After wider testing of the Linux kernel driver some variants of the uGuru have
43turned up which will hold 0x00 instead of 0xAC at the CMD port, thus we also 43turned up which will hold 0x00 instead of 0xAC at the CMD port, thus we also
44have to test CMD for two different values. On these uGuru's DATA will initally 44have to test CMD for two different values. On these uGuru's DATA will initially
45hold 0x09 and will only hold 0x08 after reading CMD first, so CMD must be read 45hold 0x09 and will only hold 0x08 after reading CMD first, so CMD must be read
46first! 46first!
47 47
@@ -308,5 +308,5 @@ the voltage / clock programming out, I tried reading and only reading banks
308resulted in a _permanent_ reprogramming of the voltages, luckily I had the 308resulted in a _permanent_ reprogramming of the voltages, luckily I had the
309sensors part configured so that it would shutdown my system on any out of spec 309sensors part configured so that it would shutdown my system on any out of spec
310voltages which proprably safed my computer (after a reboot I managed to 310voltages which proprably safed my computer (after a reboot I managed to
311immediatly enter the bios and reload the defaults). This probably means that 311immediately enter the bios and reload the defaults). This probably means that
312the read/write cycle for the non sensor part is different from the sensor part. 312the read/write cycle for the non sensor part is different from the sensor part.
diff --git a/Documentation/hwmon/abituguru3 b/Documentation/hwmon/abituguru3
index fa598aac22fa..a6ccfe4bb6aa 100644
--- a/Documentation/hwmon/abituguru3
+++ b/Documentation/hwmon/abituguru3
@@ -47,7 +47,7 @@ This driver supports the hardware monitoring features of the third revision of
47the Abit uGuru chip, found on recent Abit uGuru featuring motherboards. 47the Abit uGuru chip, found on recent Abit uGuru featuring motherboards.
48 48
49The 3rd revision of the uGuru chip in reality is a Winbond W83L951G. 49The 3rd revision of the uGuru chip in reality is a Winbond W83L951G.
50Unfortunatly this doesn't help since the W83L951G is a generic microcontroller 50Unfortunately this doesn't help since the W83L951G is a generic microcontroller
51with a custom Abit application running on it. 51with a custom Abit application running on it.
52 52
53Despite Abit not releasing any information regarding the uGuru revision 3, 53Despite Abit not releasing any information regarding the uGuru revision 3,
diff --git a/Documentation/hwmon/pmbus b/Documentation/hwmon/pmbus
index f2d42e8bdf48..dc4933e96344 100644
--- a/Documentation/hwmon/pmbus
+++ b/Documentation/hwmon/pmbus
@@ -150,11 +150,11 @@ The following attributes are supported. Limits are read-write; all other
150attributes are read-only. 150attributes are read-only.
151 151
152inX_input Measured voltage. From READ_VIN or READ_VOUT register. 152inX_input Measured voltage. From READ_VIN or READ_VOUT register.
153inX_min Minumum Voltage. 153inX_min Minimum Voltage.
154 From VIN_UV_WARN_LIMIT or VOUT_UV_WARN_LIMIT register. 154 From VIN_UV_WARN_LIMIT or VOUT_UV_WARN_LIMIT register.
155inX_max Maximum voltage. 155inX_max Maximum voltage.
156 From VIN_OV_WARN_LIMIT or VOUT_OV_WARN_LIMIT register. 156 From VIN_OV_WARN_LIMIT or VOUT_OV_WARN_LIMIT register.
157inX_lcrit Critical minumum Voltage. 157inX_lcrit Critical minimum Voltage.
158 From VIN_UV_FAULT_LIMIT or VOUT_UV_FAULT_LIMIT register. 158 From VIN_UV_FAULT_LIMIT or VOUT_UV_FAULT_LIMIT register.
159inX_crit Critical maximum voltage. 159inX_crit Critical maximum voltage.
160 From VIN_OV_FAULT_LIMIT or VOUT_OV_FAULT_LIMIT register. 160 From VIN_OV_FAULT_LIMIT or VOUT_OV_FAULT_LIMIT register.
@@ -169,7 +169,7 @@ inX_label "vin", "vcap", or "voutY"
169currX_input Measured current. From READ_IIN or READ_IOUT register. 169currX_input Measured current. From READ_IIN or READ_IOUT register.
170currX_max Maximum current. 170currX_max Maximum current.
171 From IIN_OC_WARN_LIMIT or IOUT_OC_WARN_LIMIT register. 171 From IIN_OC_WARN_LIMIT or IOUT_OC_WARN_LIMIT register.
172currX_lcrit Critical minumum output current. 172currX_lcrit Critical minimum output current.
173 From IOUT_UC_FAULT_LIMIT register. 173 From IOUT_UC_FAULT_LIMIT register.
174currX_crit Critical maximum current. 174currX_crit Critical maximum current.
175 From IIN_OC_FAULT_LIMIT or IOUT_OC_FAULT_LIMIT register. 175 From IIN_OC_FAULT_LIMIT or IOUT_OC_FAULT_LIMIT register.
diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface
index 83a698773ade..8f63c244f1aa 100644
--- a/Documentation/hwmon/sysfs-interface
+++ b/Documentation/hwmon/sysfs-interface
@@ -579,7 +579,7 @@ channel should not be trusted.
579fan[1-*]_fault 579fan[1-*]_fault
580temp[1-*]_fault 580temp[1-*]_fault
581 Input fault condition 581 Input fault condition
582 0: no fault occured 582 0: no fault occurred
583 1: fault condition 583 1: fault condition
584 RO 584 RO
585 585
diff --git a/Documentation/hwmon/w83781d b/Documentation/hwmon/w83781d
index ecbc1e4574b4..129b0a3b555b 100644
--- a/Documentation/hwmon/w83781d
+++ b/Documentation/hwmon/w83781d
@@ -403,7 +403,7 @@ found out the following values do work as a form of coarse pwm:
403 403
4040x80 - seems to turn fans off after some time(1-2 minutes)... might be 4040x80 - seems to turn fans off after some time(1-2 minutes)... might be
405some form of auto-fan-control based on temp? hmm (Qfan? this mobo is an 405some form of auto-fan-control based on temp? hmm (Qfan? this mobo is an
406old ASUS, it isn't marketed as Qfan. Maybe some beta pre-attemp at Qfan 406old ASUS, it isn't marketed as Qfan. Maybe some beta pre-attempt at Qfan
407that was dropped at the BIOS) 407that was dropped at the BIOS)
4080x81 - off 4080x81 - off
4090x82 - slightly "on-ner" than off, but my fans do not get to move. I can 4090x82 - slightly "on-ner" than off, but my fans do not get to move. I can
diff --git a/Documentation/hwmon/w83791d b/Documentation/hwmon/w83791d
index 5663e491655c..90387c3540f7 100644
--- a/Documentation/hwmon/w83791d
+++ b/Documentation/hwmon/w83791d
@@ -93,7 +93,7 @@ The sysfs interface to the beep bitmask has migrated from the original legacy
93method of a single sysfs beep_mask file to a newer method using multiple 93method of a single sysfs beep_mask file to a newer method using multiple
94*_beep files as described in .../Documentation/hwmon/sysfs-interface. 94*_beep files as described in .../Documentation/hwmon/sysfs-interface.
95 95
96A similar change has occured for the bitmap corresponding to the alarms. The 96A similar change has occurred for the bitmap corresponding to the alarms. The
97original legacy method used a single sysfs alarms file containing a bitmap 97original legacy method used a single sysfs alarms file containing a bitmap
98of triggered alarms. The newer method uses multiple sysfs *_alarm files 98of triggered alarms. The newer method uses multiple sysfs *_alarm files
99(again following the pattern described in sysfs-interface). 99(again following the pattern described in sysfs-interface).
diff --git a/Documentation/i2c/busses/i2c-parport-light b/Documentation/i2c/busses/i2c-parport-light
index bdc9cbb2e0f2..c22ee063e1e5 100644
--- a/Documentation/i2c/busses/i2c-parport-light
+++ b/Documentation/i2c/busses/i2c-parport-light
@@ -4,7 +4,7 @@ Author: Jean Delvare <khali@linux-fr.org>
4 4
5This driver is a light version of i2c-parport. It doesn't depend 5This driver is a light version of i2c-parport. It doesn't depend
6on the parport driver, and uses direct I/O access instead. This might be 6on the parport driver, and uses direct I/O access instead. This might be
7prefered on embedded systems where wasting memory for the clean but heavy 7preferred on embedded systems where wasting memory for the clean but heavy
8parport handling is not an option. The drawback is a reduced portability 8parport handling is not an option. The drawback is a reduced portability
9and the impossibility to daisy-chain other parallel port devices. 9and the impossibility to daisy-chain other parallel port devices.
10 10
diff --git a/Documentation/i2c/busses/i2c-sis96x b/Documentation/i2c/busses/i2c-sis96x
index 70e6a0cc1e15..0b979f3252a4 100644
--- a/Documentation/i2c/busses/i2c-sis96x
+++ b/Documentation/i2c/busses/i2c-sis96x
@@ -35,7 +35,7 @@ or perhaps this...
35 35
36(kernel versions later than 2.4.18 may fill in the "Unknown"s) 36(kernel versions later than 2.4.18 may fill in the "Unknown"s)
37 37
38If you cant see it please look on quirk_sis_96x_smbus 38If you can't see it please look on quirk_sis_96x_smbus
39(drivers/pci/quirks.c) (also if southbridge detection fails) 39(drivers/pci/quirks.c) (also if southbridge detection fails)
40 40
41I suspect that this driver could be made to work for the following SiS 41I suspect that this driver could be made to work for the following SiS
diff --git a/Documentation/i2c/busses/i2c-taos-evm b/Documentation/i2c/busses/i2c-taos-evm
index 9146e33be6dd..63f62bcbf592 100644
--- a/Documentation/i2c/busses/i2c-taos-evm
+++ b/Documentation/i2c/busses/i2c-taos-evm
@@ -13,7 +13,7 @@ Currently supported devices are:
13 13
14* TAOS TSL2550 EVM 14* TAOS TSL2550 EVM
15 15
16For addtional information on TAOS products, please see 16For additional information on TAOS products, please see
17 http://www.taosinc.com/ 17 http://www.taosinc.com/
18 18
19 19
diff --git a/Documentation/i2o/README b/Documentation/i2o/README
index 0ebf58c73f54..ee91e2626ff0 100644
--- a/Documentation/i2o/README
+++ b/Documentation/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/Documentation/ia64/aliasing-test.c b/Documentation/ia64/aliasing-test.c
index 3dfb76ca6931..5caa2af33207 100644
--- a/Documentation/ia64/aliasing-test.c
+++ b/Documentation/ia64/aliasing-test.c
@@ -177,7 +177,7 @@ static int scan_rom(char *path, char *file)
177 177
178 /* 178 /*
179 * It's OK if the ROM is unreadable. Maybe there 179 * It's OK if the ROM is unreadable. Maybe there
180 * is no ROM, or some other error ocurred. The 180 * is no ROM, or some other error occurred. The
181 * important thing is that no MCA happened. 181 * important thing is that no MCA happened.
182 */ 182 */
183 if (rc > 0) 183 if (rc > 0)
diff --git a/Documentation/input/joystick-parport.txt b/Documentation/input/joystick-parport.txt
index 1c856f32ff2c..56870c70a796 100644
--- a/Documentation/input/joystick-parport.txt
+++ b/Documentation/input/joystick-parport.txt
@@ -272,7 +272,7 @@ if you want to use gamecon.c.
272 272
273 Also, the connection is a bit more complex. You'll need a bunch of diodes, 273 Also, the connection is a bit more complex. You'll need a bunch of diodes,
274and one pullup resistor. First, you connect the Directions and the button 274and one pullup resistor. First, you connect the Directions and the button
275the same as for db9, however with the diodes inbetween. 275the same as for db9, however with the diodes between.
276 276
277 Diodes 277 Diodes
278(pin 2) -----|<|----> Up 278(pin 2) -----|<|----> Up
diff --git a/Documentation/input/rotary-encoder.txt b/Documentation/input/rotary-encoder.txt
index 8b4129de1d2d..943e8f6f2b15 100644
--- a/Documentation/input/rotary-encoder.txt
+++ b/Documentation/input/rotary-encoder.txt
@@ -46,7 +46,7 @@ c) Falling edge on channel A, channel B in high state
46 46
47d) Falling edge on channel B, channel A in low state 47d) Falling edge on channel B, channel A in low state
48 Parking position. If the encoder enters this state, a full transition 48 Parking position. If the encoder enters this state, a full transition
49 should have happend, unless it flipped back on half the way. The 49 should have happened, unless it flipped back on half the way. The
50 'armed' state tells us about that. 50 'armed' state tells us about that.
51 51
522. Platform requirements 522. Platform requirements
diff --git a/Documentation/input/walkera0701.txt b/Documentation/input/walkera0701.txt
index 8f4289efc5c4..561385d38482 100644
--- a/Documentation/input/walkera0701.txt
+++ b/Documentation/input/walkera0701.txt
@@ -77,7 +77,7 @@ pulse length:
77 77
7824 bin+oct values + 1 bin value = 24*4+1 bits = 97 bits 7824 bin+oct values + 1 bin value = 24*4+1 bits = 97 bits
79 79
80(Warning, pulses on ACK ar inverted by transistor, irq is rised up on sync 80(Warning, pulses on ACK are inverted by transistor, irq is raised up on sync
81to bin change or octal value to bin change). 81to bin change or octal value to bin change).
82 82
83Binary data representations: 83Binary data representations:
diff --git a/Documentation/irqflags-tracing.txt b/Documentation/irqflags-tracing.txt
index 6a444877ee0b..67aa71e73035 100644
--- a/Documentation/irqflags-tracing.txt
+++ b/Documentation/irqflags-tracing.txt
@@ -53,5 +53,5 @@ implementation in an architecture: lockdep will detect that and will
53turn itself off. I.e. the lock validator will still be reliable. There 53turn itself off. I.e. the lock validator will still be reliable. There
54should be no crashes due to irq-tracing bugs. (except if the assembly 54should be no crashes due to irq-tracing bugs. (except if the assembly
55changes break other code by modifying conditions or registers that 55changes break other code by modifying conditions or registers that
56shouldnt be) 56shouldn't be)
57 57
diff --git a/Documentation/isdn/INTERFACE.CAPI b/Documentation/isdn/INTERFACE.CAPI
index 309eb5ed942b..1688b5a1fd77 100644
--- a/Documentation/isdn/INTERFACE.CAPI
+++ b/Documentation/isdn/INTERFACE.CAPI
@@ -240,7 +240,7 @@ Functions capi_cmsg2message() and capi_message2cmsg() are provided to convert
240messages between their transport encoding described in the CAPI 2.0 standard 240messages between their transport encoding described in the CAPI 2.0 standard
241and their _cmsg structure representation. Note that capi_cmsg2message() does 241and their _cmsg structure representation. Note that capi_cmsg2message() does
242not know or check the size of its destination buffer. The caller must make 242not know or check the size of its destination buffer. The caller must make
243sure it is big enough to accomodate the resulting CAPI message. 243sure it is big enough to accommodate the resulting CAPI message.
244 244
245 245
2465. Lower Layer Interface Functions 2465. Lower Layer Interface Functions
diff --git a/Documentation/kbuild/kbuild.txt b/Documentation/kbuild/kbuild.txt
index f1431d099fce..7c2a89ba674c 100644
--- a/Documentation/kbuild/kbuild.txt
+++ b/Documentation/kbuild/kbuild.txt
@@ -26,11 +26,11 @@ Additional options to the assembler (for built-in and modules).
26 26
27AFLAGS_MODULE 27AFLAGS_MODULE
28-------------------------------------------------- 28--------------------------------------------------
29Addtional module specific options to use for $(AS). 29Additional module specific options to use for $(AS).
30 30
31AFLAGS_KERNEL 31AFLAGS_KERNEL
32-------------------------------------------------- 32--------------------------------------------------
33Addtional options for $(AS) when used for assembler 33Additional options for $(AS) when used for assembler
34code for code that is compiled as built-in. 34code for code that is compiled as built-in.
35 35
36KCFLAGS 36KCFLAGS
@@ -39,12 +39,12 @@ Additional options to the C compiler (for built-in and modules).
39 39
40CFLAGS_KERNEL 40CFLAGS_KERNEL
41-------------------------------------------------- 41--------------------------------------------------
42Addtional options for $(CC) when used to compile 42Additional options for $(CC) when used to compile
43code that is compiled as built-in. 43code that is compiled as built-in.
44 44
45CFLAGS_MODULE 45CFLAGS_MODULE
46-------------------------------------------------- 46--------------------------------------------------
47Addtional module specific options to use for $(CC). 47Additional module specific options to use for $(CC).
48 48
49LDFLAGS_MODULE 49LDFLAGS_MODULE
50-------------------------------------------------- 50--------------------------------------------------
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index d2b515000e40..cc85a9278190 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -699,7 +699,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
699 ekgdboc= [X86,KGDB] Allow early kernel console debugging 699 ekgdboc= [X86,KGDB] Allow early kernel console debugging
700 ekgdboc=kbd 700 ekgdboc=kbd
701 701
702 This is desgined to be used in conjunction with 702 This is designed to be used in conjunction with
703 the boot argument: earlyprintk=vga 703 the boot argument: earlyprintk=vga
704 704
705 edd= [EDD] 705 edd= [EDD]
diff --git a/Documentation/kvm/mmu.txt b/Documentation/kvm/mmu.txt
index 142cc5136650..f46aa58389ca 100644
--- a/Documentation/kvm/mmu.txt
+++ b/Documentation/kvm/mmu.txt
@@ -23,7 +23,7 @@ The mmu code attempts to satisfy the following requirements:
23 and framebuffer-based displays 23 and framebuffer-based displays
24- footprint: keep the amount of pinned kernel memory low (most memory 24- footprint: keep the amount of pinned kernel memory low (most memory
25 should be shrinkable) 25 should be shrinkable)
26- reliablity: avoid multipage or GFP_ATOMIC allocations 26- reliability: avoid multipage or GFP_ATOMIC allocations
27 27
28Acronyms 28Acronyms
29======== 29========
diff --git a/Documentation/kvm/ppc-pv.txt b/Documentation/kvm/ppc-pv.txt
index a7f2244b3be9..3ab969c59046 100644
--- a/Documentation/kvm/ppc-pv.txt
+++ b/Documentation/kvm/ppc-pv.txt
@@ -136,7 +136,7 @@ Patched instructions
136==================== 136====================
137 137
138The "ld" and "std" instructions are transormed to "lwz" and "stw" instructions 138The "ld" and "std" instructions are transormed to "lwz" and "stw" instructions
139respectively on 32 bit systems with an added offset of 4 to accomodate for big 139respectively on 32 bit systems with an added offset of 4 to accommodate for big
140endianness. 140endianness.
141 141
142The following is a list of mapping the Linux kernel performs when running as 142The following is a list of mapping the Linux kernel performs when running as
diff --git a/Documentation/kvm/timekeeping.txt b/Documentation/kvm/timekeeping.txt
index 0c5033a58c9e..df8946377cb6 100644
--- a/Documentation/kvm/timekeeping.txt
+++ b/Documentation/kvm/timekeeping.txt
@@ -81,7 +81,7 @@ Mode 0: Single Timeout. This is a one-shot software timeout that counts down
81 when the gate is high (always true for timers 0 and 1). When the count 81 when the gate is high (always true for timers 0 and 1). When the count
82 reaches zero, the output goes high. 82 reaches zero, the output goes high.
83 83
84Mode 1: Triggered One-shot. The output is intially set high. When the gate 84Mode 1: Triggered One-shot. The output is initially set high. When the gate
85 line is set high, a countdown is initiated (which does not stop if the gate is 85 line is set high, a countdown is initiated (which does not stop if the gate is
86 lowered), during which the output is set low. When the count reaches zero, 86 lowered), during which the output is set low. When the count reaches zero,
87 the output goes high. 87 the output goes high.
diff --git a/Documentation/media-framework.txt b/Documentation/media-framework.txt
index fd48add02cb0..76a2087db205 100644
--- a/Documentation/media-framework.txt
+++ b/Documentation/media-framework.txt
@@ -194,7 +194,7 @@ each pad.
194 194
195Links are represented by a struct media_link instance, defined in 195Links are represented by a struct media_link instance, defined in
196include/media/media-entity.h. Each entity stores all links originating at or 196include/media/media-entity.h. Each entity stores all links originating at or
197targetting any of its pads in a links array. A given link is thus stored 197targeting any of its pads in a links array. A given link is thus stored
198twice, once in the source entity and once in the target entity. The array is 198twice, once in the source entity and once in the target entity. The array is
199pre-allocated and grows dynamically as needed. 199pre-allocated and grows dynamically as needed.
200 200
@@ -348,6 +348,6 @@ a streaming entity. Links that can be modified while streaming must be marked
348with the MEDIA_LNK_FL_DYNAMIC flag. 348with the MEDIA_LNK_FL_DYNAMIC flag.
349 349
350If other operations need to be disallowed on streaming entities (such as 350If other operations need to be disallowed on streaming entities (such as
351changing entities configuration parameters) drivers can explictly check the 351changing entities configuration parameters) drivers can explicitly check the
352media_entity stream_count field to find out if an entity is streaming. This 352media_entity stream_count field to find out if an entity is streaming. This
353operation must be done with the media_device graph_mutex held. 353operation must be done with the media_device graph_mutex held.
diff --git a/Documentation/mips/AU1xxx_IDE.README b/Documentation/mips/AU1xxx_IDE.README
index 8ace35ebdcd5..cc887ecfd6eb 100644
--- a/Documentation/mips/AU1xxx_IDE.README
+++ b/Documentation/mips/AU1xxx_IDE.README
@@ -39,13 +39,13 @@ Note: for more information, please refer "AMD Alchemy Au1200/Au1550 IDE
39 Interface and Linux Device Driver" Application Note. 39 Interface and Linux Device Driver" Application Note.
40 40
41 41
42FILES, CONFIGS AND COMPATABILITY 42FILES, CONFIGS AND COMPATIBILITY
43-------------------------------- 43--------------------------------
44 44
45Two files are introduced: 45Two files are introduced:
46 46
47 a) 'arch/mips/include/asm/mach-au1x00/au1xxx_ide.h' 47 a) 'arch/mips/include/asm/mach-au1x00/au1xxx_ide.h'
48 containes : struct _auide_hwif 48 contains : struct _auide_hwif
49 timing parameters for PIO mode 0/1/2/3/4 49 timing parameters for PIO mode 0/1/2/3/4
50 timing parameters for MWDMA 0/1/2 50 timing parameters for MWDMA 0/1/2
51 51
diff --git a/Documentation/misc-devices/ics932s401 b/Documentation/misc-devices/ics932s401
index 07a739f406d8..bdac67ff6e3f 100644
--- a/Documentation/misc-devices/ics932s401
+++ b/Documentation/misc-devices/ics932s401
@@ -5,7 +5,7 @@ Supported chips:
5 * IDT ICS932S401 5 * IDT ICS932S401
6 Prefix: 'ics932s401' 6 Prefix: 'ics932s401'
7 Addresses scanned: I2C 0x69 7 Addresses scanned: I2C 0x69
8 Datasheet: Publically available at the IDT website 8 Datasheet: Publicly available at the IDT website
9 9
10Author: Darrick J. Wong 10Author: Darrick J. Wong
11 11
diff --git a/Documentation/networking/3c359.txt b/Documentation/networking/3c359.txt
index 4af8071a6d18..dadfe8147ab8 100644
--- a/Documentation/networking/3c359.txt
+++ b/Documentation/networking/3c359.txt
@@ -45,7 +45,7 @@ debugging messages on, that must be done by modified the source code.
45 45
46Variable MTU size: 46Variable MTU size:
47 47
48The driver can handle a MTU size upto either 4500 or 18000 depending upon 48The driver can handle a MTU size up to either 4500 or 18000 depending upon
49ring speed. The driver also changes the size of the receive buffers as part 49ring speed. The driver also changes the size of the receive buffers as part
50of the mtu re-sizing, so if you set mtu = 18000, you will need to be able 50of the mtu re-sizing, so if you set mtu = 18000, you will need to be able
51to allocate 16 * (sk_buff with 18000 buffer size) call it 18500 bytes per ring 51to allocate 16 * (sk_buff with 18000 buffer size) call it 18500 bytes per ring
diff --git a/Documentation/networking/README.ipw2200 b/Documentation/networking/README.ipw2200
index 616a8e540b0b..b7658bed4906 100644
--- a/Documentation/networking/README.ipw2200
+++ b/Documentation/networking/README.ipw2200
@@ -256,7 +256,7 @@ You can set the debug level via:
256 256
257Where $VALUE would be a number in the case of this sysfs entry. The 257Where $VALUE would be a number in the case of this sysfs entry. The
258input to sysfs files does not have to be a number. For example, the 258input to sysfs files does not have to be a number. For example, the
259firmware loader used by hotplug utilizes sysfs entries for transfering 259firmware loader used by hotplug utilizes sysfs entries for transferring
260the firmware image from user space into the driver. 260the firmware image from user space into the driver.
261 261
262The Intel(R) PRO/Wireless 2915ABG Driver for Linux exposes sysfs entries 262The Intel(R) PRO/Wireless 2915ABG Driver for Linux exposes sysfs entries
diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt
index b36e741e94db..e27202bb8d75 100644
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
@@ -368,7 +368,7 @@ fail_over_mac
368 gratuitous ARP is lost, communication may be 368 gratuitous ARP is lost, communication may be
369 disrupted. 369 disrupted.
370 370
371 When this policy is used in conjuction with the mii 371 When this policy is used in conjunction with the mii
372 monitor, devices which assert link up prior to being 372 monitor, devices which assert link up prior to being
373 able to actually transmit and receive are particularly 373 able to actually transmit and receive are particularly
374 susceptible to loss of the gratuitous ARP, and an 374 susceptible to loss of the gratuitous ARP, and an
diff --git a/Documentation/networking/caif/Linux-CAIF.txt b/Documentation/networking/caif/Linux-CAIF.txt
index 7fe7a9a33a4f..e52fd62bef3a 100644
--- a/Documentation/networking/caif/Linux-CAIF.txt
+++ b/Documentation/networking/caif/Linux-CAIF.txt
@@ -136,7 +136,7 @@ The CAIF Protocol implementation contains:
136 - CFMUX CAIF Mux layer. Handles multiplexing between multiple 136 - CFMUX CAIF Mux layer. Handles multiplexing between multiple
137 physical bearers and multiple channels such as VEI, Datagram, etc. 137 physical bearers and multiple channels such as VEI, Datagram, etc.
138 The MUX keeps track of the existing CAIF Channels and 138 The MUX keeps track of the existing CAIF Channels and
139 Physical Instances and selects the apropriate instance based 139 Physical Instances and selects the appropriate instance based
140 on Channel-Id and Physical-ID. 140 on Channel-Id and Physical-ID.
141 141
142 - CFFRML CAIF Framing layer. Handles Framing i.e. Frame length 142 - CFFRML CAIF Framing layer. Handles Framing i.e. Frame length
diff --git a/Documentation/networking/caif/spi_porting.txt b/Documentation/networking/caif/spi_porting.txt
index 0cb8cb9098f4..9efd0687dc4c 100644
--- a/Documentation/networking/caif/spi_porting.txt
+++ b/Documentation/networking/caif/spi_porting.txt
@@ -150,7 +150,7 @@ static int sspi_init_xfer(struct cfspi_xfer *xfer, struct cfspi_dev *dev)
150void sspi_sig_xfer(bool xfer, struct cfspi_dev *dev) 150void sspi_sig_xfer(bool xfer, struct cfspi_dev *dev)
151{ 151{
152 /* If xfer is true then you should assert the SPI_INT to indicate to 152 /* If xfer is true then you should assert the SPI_INT to indicate to
153 * the master that you are ready to recieve the data from the master 153 * the master that you are ready to receive the data from the master
154 * SPI. If xfer is false then you should de-assert SPI_INT to indicate 154 * SPI. If xfer is false then you should de-assert SPI_INT to indicate
155 * that the transfer is done. 155 * that the transfer is done.
156 */ 156 */
diff --git a/Documentation/networking/can.txt b/Documentation/networking/can.txt
index 5b04b67ddca2..56ca3b75376e 100644
--- a/Documentation/networking/can.txt
+++ b/Documentation/networking/can.txt
@@ -240,7 +240,7 @@ solution for a couple of reasons:
240 the user application using the common CAN filter mechanisms. Inside 240 the user application using the common CAN filter mechanisms. Inside
241 this filter definition the (interested) type of errors may be 241 this filter definition the (interested) type of errors may be
242 selected. The reception of error frames is disabled by default. 242 selected. The reception of error frames is disabled by default.
243 The format of the CAN error frame is briefly decribed in the Linux 243 The format of the CAN error frame is briefly described in the Linux
244 header file "include/linux/can/error.h". 244 header file "include/linux/can/error.h".
245 245
2464. How to use Socket CAN 2464. How to use Socket CAN
diff --git a/Documentation/networking/ieee802154.txt b/Documentation/networking/ieee802154.txt
index 23c995e64032..f41ea2405220 100644
--- a/Documentation/networking/ieee802154.txt
+++ b/Documentation/networking/ieee802154.txt
@@ -9,7 +9,7 @@ The Linux-ZigBee project goal is to provide complete implementation
9of IEEE 802.15.4 / ZigBee / 6LoWPAN protocols. IEEE 802.15.4 is a stack 9of IEEE 802.15.4 / ZigBee / 6LoWPAN protocols. IEEE 802.15.4 is a stack
10of protocols for organizing Low-Rate Wireless Personal Area Networks. 10of protocols for organizing Low-Rate Wireless Personal Area Networks.
11 11
12Currently only IEEE 802.15.4 layer is implemented. We have choosen 12Currently only IEEE 802.15.4 layer is implemented. We have chosen
13to use plain Berkeley socket API, the generic Linux networking stack 13to use plain Berkeley socket API, the generic Linux networking stack
14to transfer IEEE 802.15.4 messages and a special protocol over genetlink 14to transfer IEEE 802.15.4 messages and a special protocol over genetlink
15for configuration/management 15for configuration/management
diff --git a/Documentation/networking/olympic.txt b/Documentation/networking/olympic.txt
index c65a94010ea8..b95b5bf96751 100644
--- a/Documentation/networking/olympic.txt
+++ b/Documentation/networking/olympic.txt
@@ -65,7 +65,7 @@ together.
65 65
66Variable MTU size: 66Variable MTU size:
67 67
68The driver can handle a MTU size upto either 4500 or 18000 depending upon 68The driver can handle a MTU size up to either 4500 or 18000 depending upon
69ring speed. The driver also changes the size of the receive buffers as part 69ring speed. The driver also changes the size of the receive buffers as part
70of the mtu re-sizing, so if you set mtu = 18000, you will need to be able 70of the mtu re-sizing, so if you set mtu = 18000, you will need to be able
71to allocate 16 * (sk_buff with 18000 buffer size) call it 18500 bytes per ring 71to allocate 16 * (sk_buff with 18000 buffer size) call it 18500 bytes per ring
diff --git a/Documentation/networking/packet_mmap.txt b/Documentation/networking/packet_mmap.txt
index 073894d1c093..4acea6603720 100644
--- a/Documentation/networking/packet_mmap.txt
+++ b/Documentation/networking/packet_mmap.txt
@@ -223,7 +223,7 @@ we will get the following buffer structure:
223 223
224A frame can be of any size with the only condition it can fit in a block. A block 224A frame can be of any size with the only condition it can fit in a block. A block
225can only hold an integer number of frames, or in other words, a frame cannot 225can only hold an integer number of frames, or in other words, a frame cannot
226be spawned accross two blocks, so there are some details you have to take into 226be spawned across two blocks, so there are some details you have to take into
227account when choosing the frame_size. See "Mapping and use of the circular 227account when choosing the frame_size. See "Mapping and use of the circular
228buffer (ring)". 228buffer (ring)".
229 229
diff --git a/Documentation/networking/s2io.txt b/Documentation/networking/s2io.txt
index 9d4e0f4df5a8..4be0c039edbc 100644
--- a/Documentation/networking/s2io.txt
+++ b/Documentation/networking/s2io.txt
@@ -37,7 +37,7 @@ To associate an interface with a physical adapter use "ethtool -p <ethX>".
37The corresponding adapter's LED will blink multiple times. 37The corresponding adapter's LED will blink multiple times.
38 38
393. Features supported: 393. Features supported:
40a. Jumbo frames. Xframe I/II supports MTU upto 9600 bytes, 40a. Jumbo frames. Xframe I/II supports MTU up to 9600 bytes,
41modifiable using ifconfig command. 41modifiable using ifconfig command.
42 42
43b. Offloads. Supports checksum offload(TCP/UDP/IP) on transmit 43b. Offloads. Supports checksum offload(TCP/UDP/IP) on transmit
@@ -49,7 +49,7 @@ significant performance improvement on certain platforms(SGI Altix,
49IBM xSeries). 49IBM xSeries).
50 50
51d. MSI/MSI-X. Can be enabled on platforms which support this feature 51d. MSI/MSI-X. Can be enabled on platforms which support this feature
52(IA64, Xeon) resulting in noticeable performance improvement(upto 7% 52(IA64, Xeon) resulting in noticeable performance improvement(up to 7%
53on certain platforms). 53on certain platforms).
54 54
55e. Statistics. Comprehensive MAC-level and software statistics displayed 55e. Statistics. Comprehensive MAC-level and software statistics displayed
diff --git a/Documentation/networking/tc-actions-env-rules.txt b/Documentation/networking/tc-actions-env-rules.txt
index dcadf6f88e34..70d6cf608251 100644
--- a/Documentation/networking/tc-actions-env-rules.txt
+++ b/Documentation/networking/tc-actions-env-rules.txt
@@ -1,5 +1,5 @@
1 1
2The "enviromental" rules for authors of any new tc actions are: 2The "environmental" rules for authors of any new tc actions are:
3 3
41) If you stealeth or borroweth any packet thou shalt be branching 41) If you stealeth or borroweth any packet thou shalt be branching
5from the righteous path and thou shalt cloneth. 5from the righteous path and thou shalt cloneth.
@@ -20,7 +20,7 @@ this way any action downstream can stomp on the packet.
203) Dropping packets you don't own is a no-no. You simply return 203) Dropping packets you don't own is a no-no. You simply return
21TC_ACT_SHOT to the caller and they will drop it. 21TC_ACT_SHOT to the caller and they will drop it.
22 22
23The "enviromental" rules for callers of actions (qdiscs etc) are: 23The "environmental" rules for callers of actions (qdiscs etc) are:
24 24
25*) Thou art responsible for freeing anything returned as being 25*) Thou art responsible for freeing anything returned as being
26TC_ACT_SHOT/STOLEN/QUEUED. If none of TC_ACT_SHOT/STOLEN/QUEUED is 26TC_ACT_SHOT/STOLEN/QUEUED. If none of TC_ACT_SHOT/STOLEN/QUEUED is
diff --git a/Documentation/power/devices.txt b/Documentation/power/devices.txt
index f023ba6bba62..1971bcf48a60 100644
--- a/Documentation/power/devices.txt
+++ b/Documentation/power/devices.txt
@@ -367,7 +367,7 @@ Drivers need to be able to handle hardware which has been reset since the
367suspend methods were called, for example by complete reinitialization. 367suspend methods were called, for example by complete reinitialization.
368This may be the hardest part, and the one most protected by NDA'd documents 368This may be the hardest part, and the one most protected by NDA'd documents
369and chip errata. It's simplest if the hardware state hasn't changed since 369and chip errata. It's simplest if the hardware state hasn't changed since
370the suspend was carried out, but that can't be guaranteed (in fact, it ususally 370the suspend was carried out, but that can't be guaranteed (in fact, it usually
371is not the case). 371is not the case).
372 372
373Drivers must also be prepared to notice that the device has been removed 373Drivers must also be prepared to notice that the device has been removed
diff --git a/Documentation/power/notifiers.txt b/Documentation/power/notifiers.txt
index ae1b7ec07684..cf980709122a 100644
--- a/Documentation/power/notifiers.txt
+++ b/Documentation/power/notifiers.txt
@@ -24,7 +24,7 @@ PM_HIBERNATION_PREPARE The system is going to hibernate or suspend, tasks will
24 be frozen immediately. 24 be frozen immediately.
25 25
26PM_POST_HIBERNATION The system memory state has been restored from a 26PM_POST_HIBERNATION The system memory state has been restored from a
27 hibernation image or an error occured during the 27 hibernation image or an error occurred during the
28 hibernation. Device drivers' .resume() callbacks have 28 hibernation. Device drivers' .resume() callbacks have
29 been executed and tasks have been thawed. 29 been executed and tasks have been thawed.
30 30
@@ -38,7 +38,7 @@ PM_POST_RESTORE An error occurred during the hibernation restore.
38 38
39PM_SUSPEND_PREPARE The system is preparing for a suspend. 39PM_SUSPEND_PREPARE The system is preparing for a suspend.
40 40
41PM_POST_SUSPEND The system has just resumed or an error occured during 41PM_POST_SUSPEND The system has just resumed or an error occurred during
42 the suspend. Device drivers' .resume() callbacks have 42 the suspend. Device drivers' .resume() callbacks have
43 been executed and tasks have been thawed. 43 been executed and tasks have been thawed.
44 44
diff --git a/Documentation/power/opp.txt b/Documentation/power/opp.txt
index cd445582d1f8..5ae70a12c1e2 100644
--- a/Documentation/power/opp.txt
+++ b/Documentation/power/opp.txt
@@ -178,7 +178,7 @@ opp_find_freq_ceil - Search for an available OPP which is *at least* the
178 if (!IS_ERR(opp)) 178 if (!IS_ERR(opp))
179 soc_switch_to_freq_voltage(freq); 179 soc_switch_to_freq_voltage(freq);
180 else 180 else
181 /* do something when we cant satisfy the req */ 181 /* do something when we can't satisfy the req */
182 /* do other stuff */ 182 /* do other stuff */
183 } 183 }
184 184
diff --git a/Documentation/power/swsusp.txt b/Documentation/power/swsusp.txt
index ea718891a665..ac190cf1963e 100644
--- a/Documentation/power/swsusp.txt
+++ b/Documentation/power/swsusp.txt
@@ -192,7 +192,7 @@ Q: There don't seem to be any generally useful behavioral
192distinctions between SUSPEND and FREEZE. 192distinctions between SUSPEND and FREEZE.
193 193
194A: Doing SUSPEND when you are asked to do FREEZE is always correct, 194A: Doing SUSPEND when you are asked to do FREEZE is always correct,
195but it may be unneccessarily slow. If you want your driver to stay simple, 195but it may be unnecessarily slow. If you want your driver to stay simple,
196slowness may not matter to you. It can always be fixed later. 196slowness may not matter to you. It can always be fixed later.
197 197
198For devices like disk it does matter, you do not want to spindown for 198For devices like disk it does matter, you do not want to spindown for
@@ -237,7 +237,7 @@ disk. Whole sequence goes like
237 237
238 running system, user asks for suspend-to-disk 238 running system, user asks for suspend-to-disk
239 239
240 user processes are stopped (in common case there are none, but with resume-from-initrd, noone knows) 240 user processes are stopped (in common case there are none, but with resume-from-initrd, no one knows)
241 241
242 read image from disk 242 read image from disk
243 243
diff --git a/Documentation/power/userland-swsusp.txt b/Documentation/power/userland-swsusp.txt
index 81680f9f5909..1101bee4e822 100644
--- a/Documentation/power/userland-swsusp.txt
+++ b/Documentation/power/userland-swsusp.txt
@@ -98,7 +98,7 @@ SNAPSHOT_S2RAM - suspend to RAM; using this call causes the kernel to
98The device's read() operation can be used to transfer the snapshot image from 98The device's read() operation can be used to transfer the snapshot image from
99the kernel. It has the following limitations: 99the kernel. It has the following limitations:
100- you cannot read() more than one virtual memory page at a time 100- you cannot read() more than one virtual memory page at a time
101- read()s accross page boundaries are impossible (ie. if ypu read() 1/2 of 101- read()s across page boundaries are impossible (ie. if ypu read() 1/2 of
102 a page in the previous call, you will only be able to read() 102 a page in the previous call, you will only be able to read()
103 _at_ _most_ 1/2 of the page in the next call) 103 _at_ _most_ 1/2 of the page in the next call)
104 104
@@ -137,7 +137,7 @@ mechanism and the userland utilities using the interface SHOULD use additional
137means, such as checksums, to ensure the integrity of the snapshot image. 137means, such as checksums, to ensure the integrity of the snapshot image.
138 138
139The suspending and resuming utilities MUST lock themselves in memory, 139The suspending and resuming utilities MUST lock themselves in memory,
140preferrably using mlockall(), before calling SNAPSHOT_FREEZE. 140preferably using mlockall(), before calling SNAPSHOT_FREEZE.
141 141
142The suspending utility MUST check the value stored by SNAPSHOT_CREATE_IMAGE 142The suspending utility MUST check the value stored by SNAPSHOT_CREATE_IMAGE
143in the memory location pointed to by the last argument of ioctl() and proceed 143in the memory location pointed to by the last argument of ioctl() and proceed
@@ -147,7 +147,7 @@ in accordance with it:
147 (a) The suspending utility MUST NOT close the snapshot device 147 (a) The suspending utility MUST NOT close the snapshot device
148 _unless_ the whole suspend procedure is to be cancelled, in 148 _unless_ the whole suspend procedure is to be cancelled, in
149 which case, if the snapshot image has already been saved, the 149 which case, if the snapshot image has already been saved, the
150 suspending utility SHOULD destroy it, preferrably by zapping 150 suspending utility SHOULD destroy it, preferably by zapping
151 its header. If the suspend is not to be cancelled, the 151 its header. If the suspend is not to be cancelled, the
152 system MUST be powered off or rebooted after the snapshot 152 system MUST be powered off or rebooted after the snapshot
153 image has been saved. 153 image has been saved.
diff --git a/Documentation/powerpc/hvcs.txt b/Documentation/powerpc/hvcs.txt
index 6d8be3468d7d..a730ca5a07f8 100644
--- a/Documentation/powerpc/hvcs.txt
+++ b/Documentation/powerpc/hvcs.txt
@@ -528,7 +528,7 @@ this driver assignment of hotplug added vty-servers may be in a different
528order than how they would be exposed on module load. Rebooting or 528order than how they would be exposed on module load. Rebooting or
529reloading the module after dynamic addition may result in the /dev/hvcs* 529reloading the module after dynamic addition may result in the /dev/hvcs*
530and vty-server coupling changing if a vty-server adapter was added in a 530and vty-server coupling changing if a vty-server adapter was added in a
531slot inbetween two other vty-server adapters. Refer to the section above 531slot between two other vty-server adapters. Refer to the section above
532on how to determine which vty-server goes with which /dev/hvcs* node. 532on how to determine which vty-server goes with which /dev/hvcs* node.
533Hint; look at the sysfs "index" attribute for the vty-server. 533Hint; look at the sysfs "index" attribute for the vty-server.
534 534
diff --git a/Documentation/scsi/ChangeLog.lpfc b/Documentation/scsi/ChangeLog.lpfc
index 5e83769c6aa9..c56ec99d7b2f 100644
--- a/Documentation/scsi/ChangeLog.lpfc
+++ b/Documentation/scsi/ChangeLog.lpfc
@@ -352,7 +352,7 @@ Changes from 20041229 to 20050110
352 lpfc_scsiport.c 352 lpfc_scsiport.c
353 * In remote port changes: no longer nulling target->pnode when 353 * In remote port changes: no longer nulling target->pnode when
354 removing from mapped list. Pnode get nulled when the node is 354 removing from mapped list. Pnode get nulled when the node is
355 freed (after nodev tmo). This bug was causing i/o recieved in 355 freed (after nodev tmo). This bug was causing i/o received in
356 the small window while the device was blocked to be errored w/ 356 the small window while the device was blocked to be errored w/
357 did_no_connect. With the fix, it returns host_busy 357 did_no_connect. With the fix, it returns host_busy
358 (per the pre-remote port changes). 358 (per the pre-remote port changes).
@@ -530,7 +530,7 @@ Changes from 20041018 to 20041123
530 coherent mappings. Note: There are more consistent mappings 530 coherent mappings. Note: There are more consistent mappings
531 that are using pci_dma_sync calls. Probably these should be 531 that are using pci_dma_sync calls. Probably these should be
532 removed as well. 532 removed as well.
533 * Modified lpfc_free_scsi_buf to accomodate all three scsi_buf 533 * Modified lpfc_free_scsi_buf to accommodate all three scsi_buf
534 free types to alleviate miscellaneous panics with cable pull 534 free types to alleviate miscellaneous panics with cable pull
535 testing. 535 testing.
536 * Set hotplug to default 0 and lpfc_target_remove to not remove 536 * Set hotplug to default 0 and lpfc_target_remove to not remove
@@ -583,7 +583,7 @@ Changes from 20041018 to 20041123
583 included more than once. 583 included more than once.
584 * Replaced "set_current_state(TASK_UNINTERRUPTIBLE); 584 * Replaced "set_current_state(TASK_UNINTERRUPTIBLE);
585 schedule_timeout(timeout)" with "msleep(timeout)". 585 schedule_timeout(timeout)" with "msleep(timeout)".
586 * Fixnode was loosing starget when rediscovered. We saw messages 586 * Fixnode was losing starget when rediscovered. We saw messages
587 like: lpfc 0000:04:02.0: 0:0263 Cannot block scsi target as a 587 like: lpfc 0000:04:02.0: 0:0263 Cannot block scsi target as a
588 result. Moved starget field into struct lpfc_target which is 588 result. Moved starget field into struct lpfc_target which is
589 referenced from the node. 589 referenced from the node.
@@ -604,7 +604,7 @@ Changes from 20041018 to 20041123
604 * Make 3 functions static: lpfc_get_hba_sym_node_name, 604 * Make 3 functions static: lpfc_get_hba_sym_node_name,
605 lpfc_intr_prep and lpfc_setup_slim_access. Move lpfc_intr_prep 605 lpfc_intr_prep and lpfc_setup_slim_access. Move lpfc_intr_prep
606 and lpfc_setup_slim_access so they're defined before being used. 606 and lpfc_setup_slim_access so they're defined before being used.
607 * Remove an unecessary list_del() in lpfc_hbadisc.c. 607 * Remove an unnecessary list_del() in lpfc_hbadisc.c.
608 * Set nlp_state before calling lpfc_nlp_list() since this will 608 * Set nlp_state before calling lpfc_nlp_list() since this will
609 potentially call fc_target_unblock which may cause a race in 609 potentially call fc_target_unblock which may cause a race in
610 queuecommand by releasing host_lock. 610 queuecommand by releasing host_lock.
@@ -753,7 +753,7 @@ Changes from 20040908 to 20040920
753 * Changed version number to 8.0.12 753 * Changed version number to 8.0.12
754 * Removed used #defines: DEFAULT_PCI_LATENCY_CLOCKS and 754 * Removed used #defines: DEFAULT_PCI_LATENCY_CLOCKS and
755 PCI_LATENCY_VALUE from lpfc_hw.h. 755 PCI_LATENCY_VALUE from lpfc_hw.h.
756 * Changes to accomodate rnid. 756 * Changes to accommodate rnid.
757 * Fix RSCN handling so RSCN NS queries only effect NPorts found in 757 * Fix RSCN handling so RSCN NS queries only effect NPorts found in
758 RSCN data. 758 RSCN data.
759 * If we rcv a plogi on a NPort queued up for discovery, clear the 759 * If we rcv a plogi on a NPort queued up for discovery, clear the
@@ -813,7 +813,7 @@ Changes from 20040908 to 20040920
813 counter instead, brd_no isn't reused anymore. Also some tiny 813 counter instead, brd_no isn't reused anymore. Also some tiny
814 whitespace cleanups in surrounding code. 814 whitespace cleanups in surrounding code.
815 * Reorder functions in lpfc_els.c to remove need for prototypes. 815 * Reorder functions in lpfc_els.c to remove need for prototypes.
816 * Removed unsed prototypes from lpfc_crtn.h - 816 * Removed unused prototypes from lpfc_crtn.h -
817 lpfc_ip_timeout_handler, lpfc_read_pci and lpfc_revoke. 817 lpfc_ip_timeout_handler, lpfc_read_pci and lpfc_revoke.
818 * Removed some unused prototypes from lpfc_crtn.h - 818 * Removed some unused prototypes from lpfc_crtn.h -
819 lpfc_scsi_hba_reset, lpfc_scsi_issue_inqsn, 819 lpfc_scsi_hba_reset, lpfc_scsi_issue_inqsn,
@@ -863,7 +863,7 @@ Changes from 20040823 to 20040908
863 * Minimal support for SCSI flat space addressing/volume set 863 * Minimal support for SCSI flat space addressing/volume set
864 addressing. Use 16 bits of LUN address so that flat 864 addressing. Use 16 bits of LUN address so that flat
865 addressing/VSA will work. 865 addressing/VSA will work.
866 * Changed 2 occurences of if( 1 != f(x)) to if(f(x) != 1) 866 * Changed 2 occurrences of if( 1 != f(x)) to if(f(x) != 1)
867 * Drop include of lpfc_cfgparm.h. 867 * Drop include of lpfc_cfgparm.h.
868 * Reduce stack usage of lpfc_fdmi_cmd in lpfc_ct.c. 868 * Reduce stack usage of lpfc_fdmi_cmd in lpfc_ct.c.
869 * Add minimum range checking property to /sys write/store 869 * Add minimum range checking property to /sys write/store
@@ -1449,7 +1449,7 @@ Changes from 20040402 to 20040409
1449 * Removed lpfc_els_chk_latt from the lpfc_config_post function. 1449 * Removed lpfc_els_chk_latt from the lpfc_config_post function.
1450 lpfc_els_chk_latt will enable the link event interrupts when 1450 lpfc_els_chk_latt will enable the link event interrupts when
1451 flogi is pending which causes two discovery state machines 1451 flogi is pending which causes two discovery state machines
1452 running parallely. 1452 running parallelly.
1453 * Add pci_disable_device to unload path. 1453 * Add pci_disable_device to unload path.
1454 * Move lpfc_sleep_event from lpfc_fcp.c to lpfc_util_ioctl.c 1454 * Move lpfc_sleep_event from lpfc_fcp.c to lpfc_util_ioctl.c
1455 * Call dma_map_single() & pci_map_single() directly instead of via 1455 * Call dma_map_single() & pci_map_single() directly instead of via
@@ -1590,7 +1590,7 @@ Changes from 20040326 to 20040402
1590 ELX_WRITE_HS ELX_WRITE_HA ELX_WRITE_CA ELX_READ_HC 1590 ELX_WRITE_HS ELX_WRITE_HA ELX_WRITE_CA ELX_READ_HC
1591 ELX_READ_HS ELX_READ_HA ELX_READ_CA ELX_READ_MB ELX_RESET 1591 ELX_READ_HS ELX_READ_HA ELX_READ_CA ELX_READ_MB ELX_RESET
1592 ELX_READ_HBA ELX_INSTANCE ELX_LIP. Also introduced 1592 ELX_READ_HBA ELX_INSTANCE ELX_LIP. Also introduced
1593 attribute "set" to be used in conjuction with the above 1593 attribute "set" to be used in conjunction with the above
1594 attributes. 1594 attributes.
1595 * Removed DLINK, enque and deque declarations now that clock 1595 * Removed DLINK, enque and deque declarations now that clock
1596 doesn't use them anymore 1596 doesn't use them anymore
diff --git a/Documentation/scsi/ChangeLog.megaraid b/Documentation/scsi/ChangeLog.megaraid
index 5e07d320817d..d2052fdbedd2 100644
--- a/Documentation/scsi/ChangeLog.megaraid
+++ b/Documentation/scsi/ChangeLog.megaraid
@@ -168,7 +168,7 @@ Older Version : 2.20.4.6 (scsi module), 2.20.2.6 (cmm module)
168 168
1691. Sorted out PCI IDs to remove megaraid support overlaps. 1691. Sorted out PCI IDs to remove megaraid support overlaps.
170 Based on the patch from Daniel, sorted out PCI IDs along with 170 Based on the patch from Daniel, sorted out PCI IDs along with
171 charactor node name change from 'megadev' to 'megadev_legacy' to avoid 171 character node name change from 'megadev' to 'megadev_legacy' to avoid
172 conflict. 172 conflict.
173 --- 173 ---
174 Hopefully we'll be getting the build restriction zapped much sooner, 174 Hopefully we'll be getting the build restriction zapped much sooner,
diff --git a/Documentation/scsi/ChangeLog.ncr53c8xx b/Documentation/scsi/ChangeLog.ncr53c8xx
index 8b278c10edfd..9288e3d8974a 100644
--- a/Documentation/scsi/ChangeLog.ncr53c8xx
+++ b/Documentation/scsi/ChangeLog.ncr53c8xx
@@ -200,7 +200,7 @@ Sun Feb 14:00 1999 Gerard Roudier (groudier@club-internet.fr)
200 By default the driver uses both IRQF_SHARED and IRQF_DISABLED. 200 By default the driver uses both IRQF_SHARED and IRQF_DISABLED.
201 Option 'ncr53c8xx=irqm:0x20' may be used when an IRQ is shared by 201 Option 'ncr53c8xx=irqm:0x20' may be used when an IRQ is shared by
202 a 53C8XX adapter and a network board. 202 a 53C8XX adapter and a network board.
203 - Tiny mispelling fixed (ABORT instead of ABRT). Was fortunately 203 - Tiny misspelling fixed (ABORT instead of ABRT). Was fortunately
204 harmless. 204 harmless.
205 - Negotiate SYNC data transfers with CCS devices. 205 - Negotiate SYNC data transfers with CCS devices.
206 206
diff --git a/Documentation/scsi/ChangeLog.sym53c8xx b/Documentation/scsi/ChangeLog.sym53c8xx
index 02ffbc1e8a84..c1933707d0bc 100644
--- a/Documentation/scsi/ChangeLog.sym53c8xx
+++ b/Documentation/scsi/ChangeLog.sym53c8xx
@@ -457,7 +457,7 @@ Fri Jan 1 20:00 1999 Gerard Roudier (groudier@club-internet.fr)
457Sat Dec 19 21:00 1998 Gerard Roudier (groudier@club-internet.fr) 457Sat Dec 19 21:00 1998 Gerard Roudier (groudier@club-internet.fr)
458 * version sym53c8xx-1.0 458 * version sym53c8xx-1.0
459 - Define some new IO registers for the 896 (istat1, mbox0, mbox1) 459 - Define some new IO registers for the 896 (istat1, mbox0, mbox1)
460 - Revamp slighly the Symbios NVRAM lay-out based on the excerpt of 460 - Revamp slightly the Symbios NVRAM lay-out based on the excerpt of
461 the header file I received from Symbios. 461 the header file I received from Symbios.
462 - Check the PCI bus number for the boot order (Using a fast 462 - Check the PCI bus number for the boot order (Using a fast
463 PCI controller behing a PCI-PCI bridge seems sub-optimal). 463 PCI controller behing a PCI-PCI bridge seems sub-optimal).
diff --git a/Documentation/scsi/aha152x.txt b/Documentation/scsi/aha152x.txt
index 29ce6d87e451..94848734ac66 100644
--- a/Documentation/scsi/aha152x.txt
+++ b/Documentation/scsi/aha152x.txt
@@ -124,7 +124,7 @@ in the partition table and therefore every operating system has to know
124the right geometry to be able to interpret it. 124the right geometry to be able to interpret it.
125 125
126Moreover there are certain limitations to the C/H/S addressing scheme, 126Moreover there are certain limitations to the C/H/S addressing scheme,
127namely the address space is limited to upto 255 heads, upto 63 sectors 127namely the address space is limited to up to 255 heads, up to 63 sectors
128and a maximum of 1023 cylinders. 128and a maximum of 1023 cylinders.
129 129
130The AHA-1522 BIOS calculates the geometry by fixing the number of heads 130The AHA-1522 BIOS calculates the geometry by fixing the number of heads
diff --git a/Documentation/scsi/aic79xx.txt b/Documentation/scsi/aic79xx.txt
index 16e054c9c70b..64ac7093c872 100644
--- a/Documentation/scsi/aic79xx.txt
+++ b/Documentation/scsi/aic79xx.txt
@@ -267,7 +267,7 @@ The following information is available in this file:
267 Option: tag_info:{{value[,value...]}[,{value[,value...]}...]} 267 Option: tag_info:{{value[,value...]}[,{value[,value...]}...]}
268 Definition: Set the per-target tagged queue depth on a 268 Definition: Set the per-target tagged queue depth on a
269 per controller basis. Both controllers and targets 269 per controller basis. Both controllers and targets
270 may be ommitted indicating that they should retain 270 may be omitted indicating that they should retain
271 the default tag depth. 271 the default tag depth.
272 Examples: tag_info:{{16,32,32,64,8,8,,32,32,32,32,32,32,32,32,32} 272 Examples: tag_info:{{16,32,32,64,8,8,,32,32,32,32,32,32,32,32,32}
273 On Controller 0 273 On Controller 0
@@ -291,7 +291,7 @@ The following information is available in this file:
291 The rd_strm_bitmask is a 16 bit hex value in which 291 The rd_strm_bitmask is a 16 bit hex value in which
292 each bit represents a target. Setting the target's 292 each bit represents a target. Setting the target's
293 bit to '1' enables read streaming for that 293 bit to '1' enables read streaming for that
294 target. Controllers may be ommitted indicating that 294 target. Controllers may be omitted indicating that
295 they should retain the default read streaming setting. 295 they should retain the default read streaming setting.
296 Example: rd_strm:{0x0041} 296 Example: rd_strm:{0x0041}
297 On Controller 0 297 On Controller 0
@@ -313,7 +313,7 @@ The following information is available in this file:
313 ----------------------------------------------------------------- 313 -----------------------------------------------------------------
314 Option: dv: {value[,value...]} 314 Option: dv: {value[,value...]}
315 Definition: Set Domain Validation Policy on a per-controller basis. 315 Definition: Set Domain Validation Policy on a per-controller basis.
316 Controllers may be ommitted indicating that 316 Controllers may be omitted indicating that
317 they should retain the default read streaming setting. 317 they should retain the default read streaming setting.
318 Example: dv:{-1,0,,1,1,0} 318 Example: dv:{-1,0,,1,1,0}
319 On Controller 0 leave DV at its default setting. 319 On Controller 0 leave DV at its default setting.
@@ -340,7 +340,7 @@ The following information is available in this file:
340 Option: precomp: {value[,value...]} 340 Option: precomp: {value[,value...]}
341 Definition: Set IO Cell precompensation value on a per-controller 341 Definition: Set IO Cell precompensation value on a per-controller
342 basis. 342 basis.
343 Controllers may be ommitted indicating that 343 Controllers may be omitted indicating that
344 they should retain the default precompensation setting. 344 they should retain the default precompensation setting.
345 Example: precomp:{0x1} 345 Example: precomp:{0x1}
346 On Controller 0 set precompensation to 1. 346 On Controller 0 set precompensation to 1.
@@ -353,7 +353,7 @@ The following information is available in this file:
353 ----------------------------------------------------------------- 353 -----------------------------------------------------------------
354 Option: slewrate: {value[,value...]} 354 Option: slewrate: {value[,value...]}
355 Definition: Set IO Cell slew rate on a per-controller basis. 355 Definition: Set IO Cell slew rate on a per-controller basis.
356 Controllers may be ommitted indicating that 356 Controllers may be omitted indicating that
357 they should retain the default slew rate setting. 357 they should retain the default slew rate setting.
358 Example: slewrate:{0x1} 358 Example: slewrate:{0x1}
359 On Controller 0 set slew rate to 1. 359 On Controller 0 set slew rate to 1.
@@ -366,7 +366,7 @@ The following information is available in this file:
366 ----------------------------------------------------------------- 366 -----------------------------------------------------------------
367 Option: amplitude: {value[,value...]} 367 Option: amplitude: {value[,value...]}
368 Definition: Set IO Cell signal amplitude on a per-controller basis. 368 Definition: Set IO Cell signal amplitude on a per-controller basis.
369 Controllers may be ommitted indicating that 369 Controllers may be omitted indicating that
370 they should retain the default read streaming setting. 370 they should retain the default read streaming setting.
371 Example: amplitude:{0x1} 371 Example: amplitude:{0x1}
372 On Controller 0 set amplitude to 1. 372 On Controller 0 set amplitude to 1.
diff --git a/Documentation/scsi/ibmmca.txt b/Documentation/scsi/ibmmca.txt
index 45d61ad8c6f7..ac41a9fcac77 100644
--- a/Documentation/scsi/ibmmca.txt
+++ b/Documentation/scsi/ibmmca.txt
@@ -303,7 +303,7 @@
303 (scb) and calls a local function issue_cmd(), which writes a scb 303 (scb) and calls a local function issue_cmd(), which writes a scb
304 command into subsystem I/O ports. Once the scb command is carried out, 304 command into subsystem I/O ports. Once the scb command is carried out,
305 the interrupt_handler() is invoked. If a device is determined to be 305 the interrupt_handler() is invoked. If a device is determined to be
306 existant and it has not assigned any ldn, it gets one dynamically. 306 existent and it has not assigned any ldn, it gets one dynamically.
307 For this, the whole stuff is done in ibmmca_queuecommand(). 307 For this, the whole stuff is done in ibmmca_queuecommand().
308 308
309 2.6 Abort & Reset Commands 309 2.6 Abort & Reset Commands
@@ -741,7 +741,7 @@
741 some error appeared, else it is undefined. Now, this is fixed. Before 741 some error appeared, else it is undefined. Now, this is fixed. Before
742 any SCB command gets queued, the tsb.dev_status is set to 0, so the 742 any SCB command gets queued, the tsb.dev_status is set to 0, so the
743 cmd->result won't screw up Linux higher level drivers. 743 cmd->result won't screw up Linux higher level drivers.
744 2) The reset-function has slightly improved. This is still planed for 744 2) The reset-function has slightly improved. This is still planned for
745 abort. During the abort and the reset function, no interrupts are 745 abort. During the abort and the reset function, no interrupts are
746 allowed. This is however quite hard to cope with, so the INT-status 746 allowed. This is however quite hard to cope with, so the INT-status
747 register is read. When the interrupt gets queued, one can find its 747 register is read. When the interrupt gets queued, one can find its
diff --git a/Documentation/scsi/scsi-changer.txt b/Documentation/scsi/scsi-changer.txt
index 032399b16a53..ade046ea7c17 100644
--- a/Documentation/scsi/scsi-changer.txt
+++ b/Documentation/scsi/scsi-changer.txt
@@ -102,7 +102,7 @@ Trouble?
102 102
103If you insmod the driver with "insmod debug=1", it will be verbose and 103If you insmod the driver with "insmod debug=1", it will be verbose and
104prints a lot of stuff to the syslog. Compiling the kernel with 104prints a lot of stuff to the syslog. Compiling the kernel with
105CONFIG_SCSI_CONSTANTS=y improves the quality of the error messages alot 105CONFIG_SCSI_CONSTANTS=y improves the quality of the error messages a lot
106because the kernel will translate the error codes into human-readable 106because the kernel will translate the error codes into human-readable
107strings then. 107strings then.
108 108
diff --git a/Documentation/scsi/scsi_eh.txt b/Documentation/scsi/scsi_eh.txt
index 7acbebb17fa6..6ff16b620d84 100644
--- a/Documentation/scsi/scsi_eh.txt
+++ b/Documentation/scsi/scsi_eh.txt
@@ -290,7 +290,7 @@ scmd->allowed.
290 SCSI transports/LLDDs automatically acquire sense data on 290 SCSI transports/LLDDs automatically acquire sense data on
291 command failures (autosense). Autosense is recommended for 291 command failures (autosense). Autosense is recommended for
292 performance reasons and as sense information could get out of 292 performance reasons and as sense information could get out of
293 sync inbetween occurrence of CHECK CONDITION and this action. 293 sync between occurrence of CHECK CONDITION and this action.
294 294
295 Note that if autosense is not supported, scmd->sense_buffer 295 Note that if autosense is not supported, scmd->sense_buffer
296 contains invalid sense data when error-completing the scmd 296 contains invalid sense data when error-completing the scmd
diff --git a/Documentation/scsi/scsi_fc_transport.txt b/Documentation/scsi/scsi_fc_transport.txt
index e00192de4d1c..f79282fc48d7 100644
--- a/Documentation/scsi/scsi_fc_transport.txt
+++ b/Documentation/scsi/scsi_fc_transport.txt
@@ -291,7 +291,7 @@ Transport <-> LLDD Interfaces :
291Vport support by LLDD: 291Vport support by LLDD:
292 292
293 The LLDD indicates support for vports by supplying a vport_create() 293 The LLDD indicates support for vports by supplying a vport_create()
294 function in the transport template. The presense of this function will 294 function in the transport template. The presence of this function will
295 cause the creation of the new attributes on the fc_host. As part of 295 cause the creation of the new attributes on the fc_host. As part of
296 the physical port completing its initialization relative to the 296 the physical port completing its initialization relative to the
297 transport, it should set the max_npiv_vports attribute to indicate the 297 transport, it should set the max_npiv_vports attribute to indicate the
diff --git a/Documentation/serial/moxa-smartio b/Documentation/serial/moxa-smartio
index d10443918684..5d2a33be0bd8 100644
--- a/Documentation/serial/moxa-smartio
+++ b/Documentation/serial/moxa-smartio
@@ -473,7 +473,7 @@ Content
473 spd_normal Use 38.4kb when the application requests 38.4kb. 473 spd_normal Use 38.4kb when the application requests 38.4kb.
474 spd_cust Use the custom divisor to set the speed when the 474 spd_cust Use the custom divisor to set the speed when the
475 application requests 38.4kb. 475 application requests 38.4kb.
476 divisor This option set the custom divison. 476 divisor This option set the custom division.
477 baud_base This option set the base baud rate. 477 baud_base This option set the base baud rate.
478 478
479----------------------------------------------------------------------------- 479-----------------------------------------------------------------------------
diff --git a/Documentation/serial/n_gsm.txt b/Documentation/serial/n_gsm.txt
index 397f41a1f153..a5d91126a8f7 100644
--- a/Documentation/serial/n_gsm.txt
+++ b/Documentation/serial/n_gsm.txt
@@ -34,7 +34,7 @@ Major parts of the initialization program :
34 /* configure the serial port : speed, flow control ... */ 34 /* configure the serial port : speed, flow control ... */
35 35
36 /* send the AT commands to switch the modem to CMUX mode 36 /* send the AT commands to switch the modem to CMUX mode
37 and check that it's succesful (should return OK) */ 37 and check that it's successful (should return OK) */
38 write(fd, "AT+CMUX=0\r", 10); 38 write(fd, "AT+CMUX=0\r", 10);
39 39
40 /* experience showed that some modems need some time before 40 /* experience showed that some modems need some time before
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 181ba5b87cef..9822afb6313c 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -322,7 +322,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
322 "port" needs to match the BASE ADDRESS jumper on the card (0x220 or 0x240) 322 "port" needs to match the BASE ADDRESS jumper on the card (0x220 or 0x240)
323 or the value stored in the card's EEPROM for cards that have an EEPROM and 323 or the value stored in the card's EEPROM for cards that have an EEPROM and
324 their "CONFIG MODE" jumper set to "EEPROM SETTING". The other values can 324 their "CONFIG MODE" jumper set to "EEPROM SETTING". The other values can
325 be choosen freely from the options enumerated above. 325 be chosen freely from the options enumerated above.
326 326
327 If dma2 is specified and different from dma1, the card will operate in 327 If dma2 is specified and different from dma1, the card will operate in
328 full-duplex mode. When dma1=3, only dma2=0 is valid and the only way to 328 full-duplex mode. When dma1=3, only dma2=0 is valid and the only way to
@@ -356,7 +356,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
356 "port" needs to match the BASE ADDRESS jumper on the card (0x220 or 0x240) 356 "port" needs to match the BASE ADDRESS jumper on the card (0x220 or 0x240)
357 or the value stored in the card's EEPROM for cards that have an EEPROM and 357 or the value stored in the card's EEPROM for cards that have an EEPROM and
358 their "CONFIG MODE" jumper set to "EEPROM SETTING". The other values can 358 their "CONFIG MODE" jumper set to "EEPROM SETTING". The other values can
359 be choosen freely from the options enumerated above. 359 be chosen freely from the options enumerated above.
360 360
361 If dma2 is specified and different from dma1, the card will operate in 361 If dma2 is specified and different from dma1, the card will operate in
362 full-duplex mode. When dma1=3, only dma2=0 is valid and the only way to 362 full-duplex mode. When dma1=3, only dma2=0 is valid and the only way to
diff --git a/Documentation/sound/oss/README.OSS b/Documentation/sound/oss/README.OSS
index c615debbf08d..4be259428a1c 100644
--- a/Documentation/sound/oss/README.OSS
+++ b/Documentation/sound/oss/README.OSS
@@ -1352,7 +1352,7 @@ OSS-mixer.
1352The PCM20 contains a radio tuner, which is also controlled by 1352The PCM20 contains a radio tuner, which is also controlled by
1353ACI. This radio tuner is supported by the ACI driver together with the 1353ACI. This radio tuner is supported by the ACI driver together with the
1354miropcm20.o module. Also the 7-band equalizer is integrated 1354miropcm20.o module. Also the 7-band equalizer is integrated
1355(limited by the OSS-design). Developement has started and maybe 1355(limited by the OSS-design). Development has started and maybe
1356finished for the RDS decoder on this card, too. You will be able to 1356finished for the RDS decoder on this card, too. You will be able to
1357read RadioText, the Programme Service name, Programme TYpe and 1357read RadioText, the Programme Service name, Programme TYpe and
1358others. Even the v4l radio module benefits from it with a refined 1358others. Even the v4l radio module benefits from it with a refined
diff --git a/Documentation/spi/pxa2xx b/Documentation/spi/pxa2xx
index 68a4fe3818a1..493dada57372 100644
--- a/Documentation/spi/pxa2xx
+++ b/Documentation/spi/pxa2xx
@@ -143,7 +143,7 @@ configured to use SSPFRM instead.
143NOTE: the SPI driver cannot control the chip select if SSPFRM is used, so the 143NOTE: the SPI driver cannot control the chip select if SSPFRM is used, so the
144chipselect is dropped after each spi_transfer. Most devices need chip select 144chipselect is dropped after each spi_transfer. Most devices need chip select
145asserted around the complete message. Use SSPFRM as a GPIO (through cs_control) 145asserted around the complete message. Use SSPFRM as a GPIO (through cs_control)
146to accomodate these chips. 146to accommodate these chips.
147 147
148 148
149NSSP SLAVE SAMPLE 149NSSP SLAVE SAMPLE
diff --git a/Documentation/spi/spi-lm70llp b/Documentation/spi/spi-lm70llp
index 34a9cfd746bd..463f6d01fa15 100644
--- a/Documentation/spi/spi-lm70llp
+++ b/Documentation/spi/spi-lm70llp
@@ -46,7 +46,7 @@ The hardware interfacing on the LM70 LLP eval board is as follows:
46 46
47Note that since the LM70 uses a "3-wire" variant of SPI, the SI/SO pin 47Note that since the LM70 uses a "3-wire" variant of SPI, the SI/SO pin
48is connected to both pin D7 (as Master Out) and Select (as Master In) 48is connected to both pin D7 (as Master Out) and Select (as Master In)
49using an arrangment that lets either the parport or the LM70 pull the 49using an arrangement that lets either the parport or the LM70 pull the
50pin low. This can't be shared with true SPI devices, but other 3-wire 50pin low. This can't be shared with true SPI devices, but other 3-wire
51devices might share the same SI/SO pin. 51devices might share the same SI/SO pin.
52 52
diff --git a/Documentation/telephony/ixj.txt b/Documentation/telephony/ixj.txt
index 4fb314d51702..db94fb6c5678 100644
--- a/Documentation/telephony/ixj.txt
+++ b/Documentation/telephony/ixj.txt
@@ -51,7 +51,7 @@ be removed to protect the rights of others.
51Specifically, very old Internet PhoneJACK cards have non-standard 51Specifically, very old Internet PhoneJACK cards have non-standard
52G.723.1 codecs (due to the early nature of the DSPs in those days). 52G.723.1 codecs (due to the early nature of the DSPs in those days).
53The auto-conversion code to bring those cards into compliance with 53The auto-conversion code to bring those cards into compliance with
54todays standards is available as a binary only module to those people 54today's standards is available as a binary only module to those people
55needing it. If you bought your card after 1997 or so, you are OK - 55needing it. If you bought your card after 1997 or so, you are OK -
56it's only the very old cards that are affected. 56it's only the very old cards that are affected.
57 57
diff --git a/Documentation/trace/ring-buffer-design.txt b/Documentation/trace/ring-buffer-design.txt
index d299ff31df57..7d350b496585 100644
--- a/Documentation/trace/ring-buffer-design.txt
+++ b/Documentation/trace/ring-buffer-design.txt
@@ -237,7 +237,7 @@ with the previous write.
237 |written | 237 |written |
238 +---------+ 238 +---------+
239 |written | 239 |written |
240 +---------+ <--- next positon for write (current commit) 240 +---------+ <--- next position for write (current commit)
241 | empty | 241 | empty |
242 +---------+ 242 +---------+
243 243
diff --git a/Documentation/video4linux/README.pvrusb2 b/Documentation/video4linux/README.pvrusb2
index a747200fe67c..2137b589276b 100644
--- a/Documentation/video4linux/README.pvrusb2
+++ b/Documentation/video4linux/README.pvrusb2
@@ -172,7 +172,7 @@ Source file list / functional overview:
172 to provide a streaming API usable by a read() system call style of 172 to provide a streaming API usable by a read() system call style of
173 I/O. Right now this is the only layer on top of pvrusb2-io.[ch], 173 I/O. Right now this is the only layer on top of pvrusb2-io.[ch],
174 however the underlying architecture here was intended to allow for 174 however the underlying architecture here was intended to allow for
175 other styles of I/O to be implemented with additonal modules, like 175 other styles of I/O to be implemented with additional modules, like
176 mmap()'ed buffers or something even more exotic. 176 mmap()'ed buffers or something even more exotic.
177 177
178 pvrusb2-main.c - This is the top level of the driver. Module level 178 pvrusb2-main.c - This is the top level of the driver. Module level
diff --git a/Documentation/video4linux/bttv/README b/Documentation/video4linux/bttv/README
index 3a367cdb664e..7cbf4fb6cf31 100644
--- a/Documentation/video4linux/bttv/README
+++ b/Documentation/video4linux/bttv/README
@@ -70,7 +70,7 @@ If you have trouble with some specific TV card, try to ask there
70instead of mailing me directly. The chance that someone with the 70instead of mailing me directly. The chance that someone with the
71same card listens there is much higher... 71same card listens there is much higher...
72 72
73For problems with sound: There are alot of different systems used 73For problems with sound: There are a lot of different systems used
74for TV sound all over the world. And there are also different chips 74for TV sound all over the world. And there are also different chips
75which decode the audio signal. Reports about sound problems ("stereo 75which decode the audio signal. Reports about sound problems ("stereo
76does'nt work") are pretty useless unless you include some details 76does'nt work") are pretty useless unless you include some details
diff --git a/Documentation/video4linux/bttv/README.freeze b/Documentation/video4linux/bttv/README.freeze
index 4259dccc8287..5eddfa076cfb 100644
--- a/Documentation/video4linux/bttv/README.freeze
+++ b/Documentation/video4linux/bttv/README.freeze
@@ -33,7 +33,7 @@ state is stuck.
33 33
34I've seen reports that bttv 0.7.x crashes whereas 0.8.x works rock solid 34I've seen reports that bttv 0.7.x crashes whereas 0.8.x works rock solid
35for some people. Thus probably a small buglet left somewhere in bttv 35for some people. Thus probably a small buglet left somewhere in bttv
360.7.x. I have no idea where exactly, it works stable for me and alot of 360.7.x. I have no idea where exactly, it works stable for me and a lot of
37other people. But in case you have problems with the 0.7.x versions you 37other people. But in case you have problems with the 0.7.x versions you
38can give 0.8.x a try ... 38can give 0.8.x a try ...
39 39
diff --git a/Documentation/video4linux/bttv/Sound-FAQ b/Documentation/video4linux/bttv/Sound-FAQ
index bc5e41d5d77a..395f6c6fdd98 100644
--- a/Documentation/video4linux/bttv/Sound-FAQ
+++ b/Documentation/video4linux/bttv/Sound-FAQ
@@ -2,7 +2,7 @@
2bttv and sound mini howto 2bttv and sound mini howto
3========================= 3=========================
4 4
5There are alot of different bt848/849/878/879 based boards available. 5There are a lot of different bt848/849/878/879 based boards available.
6Making video work often is not a big deal, because this is handled 6Making video work often is not a big deal, because this is handled
7completely by the bt8xx chip, which is common on all boards. But 7completely by the bt8xx chip, which is common on all boards. But
8sound is handled in slightly different ways on each board. 8sound is handled in slightly different ways on each board.
diff --git a/Documentation/video4linux/pxa_camera.txt b/Documentation/video4linux/pxa_camera.txt
index 4f6d0ca01956..51ed1578b0e8 100644
--- a/Documentation/video4linux/pxa_camera.txt
+++ b/Documentation/video4linux/pxa_camera.txt
@@ -84,12 +84,12 @@ DMA usage
84 transfer is not started. On "End Of Frame" interrupt, the irq handler 84 transfer is not started. On "End Of Frame" interrupt, the irq handler
85 starts the DMA chain. 85 starts the DMA chain.
86 - capture of one videobuffer 86 - capture of one videobuffer
87 The DMA chain starts transfering data into videobuffer RAM pages. 87 The DMA chain starts transferring data into videobuffer RAM pages.
88 When all pages are transfered, the DMA irq is raised on "ENDINTR" status 88 When all pages are transferred, the DMA irq is raised on "ENDINTR" status
89 - finishing one videobuffer 89 - finishing one videobuffer
90 The DMA irq handler marks the videobuffer as "done", and removes it from 90 The DMA irq handler marks the videobuffer as "done", and removes it from
91 the active running queue 91 the active running queue
92 Meanwhile, the next videobuffer (if there is one), is transfered by DMA 92 Meanwhile, the next videobuffer (if there is one), is transferred by DMA
93 - finishing the last videobuffer 93 - finishing the last videobuffer
94 On the DMA irq of the last videobuffer, the QCI is stopped. 94 On the DMA irq of the last videobuffer, the QCI is stopped.
95 95
@@ -101,7 +101,7 @@ DMA usage
101 101
102 This structure is pointed by dma->sg_cpu. 102 This structure is pointed by dma->sg_cpu.
103 The descriptors are used as follows : 103 The descriptors are used as follows :
104 - desc-sg[i]: i-th descriptor, transfering the i-th sg 104 - desc-sg[i]: i-th descriptor, transferring the i-th sg
105 element to the video buffer scatter gather 105 element to the video buffer scatter gather
106 - finisher: has ddadr=DADDR_STOP, dcmd=ENDIRQEN 106 - finisher: has ddadr=DADDR_STOP, dcmd=ENDIRQEN
107 - linker: has ddadr= desc-sg[0] of next video buffer, dcmd=0 107 - linker: has ddadr= desc-sg[0] of next video buffer, dcmd=0
diff --git a/Documentation/video4linux/v4l2-framework.txt b/Documentation/video4linux/v4l2-framework.txt
index 3b15608ee070..cf21f7aae976 100644
--- a/Documentation/video4linux/v4l2-framework.txt
+++ b/Documentation/video4linux/v4l2-framework.txt
@@ -343,7 +343,7 @@ ignored. If you want to check for errors use this:
343 err = v4l2_device_call_until_err(v4l2_dev, 0, core, g_chip_ident, &chip); 343 err = v4l2_device_call_until_err(v4l2_dev, 0, core, g_chip_ident, &chip);
344 344
345Any error except -ENOIOCTLCMD will exit the loop with that error. If no 345Any error except -ENOIOCTLCMD will exit the loop with that error. If no
346errors (except -ENOIOCTLCMD) occured, then 0 is returned. 346errors (except -ENOIOCTLCMD) occurred, then 0 is returned.
347 347
348The second argument to both calls is a group ID. If 0, then all subdevs are 348The second argument to both calls is a group ID. If 0, then all subdevs are
349called. If non-zero, then only those whose group ID match that value will 349called. If non-zero, then only those whose group ID match that value will
diff --git a/Documentation/vm/active_mm.txt b/Documentation/vm/active_mm.txt
index 4ee1f643d897..dbf45817405f 100644
--- a/Documentation/vm/active_mm.txt
+++ b/Documentation/vm/active_mm.txt
@@ -74,7 +74,7 @@ we have a user context", and is generally done by the page fault handler
74and things like that). 74and things like that).
75 75
76Anyway, I put a pre-patch-2.3.13-1 on ftp.kernel.org just a moment ago, 76Anyway, I put a pre-patch-2.3.13-1 on ftp.kernel.org just a moment ago,
77because it slightly changes the interfaces to accomodate the alpha (who 77because it slightly changes the interfaces to accommodate the alpha (who
78would have thought it, but the alpha actually ends up having one of the 78would have thought it, but the alpha actually ends up having one of the
79ugliest context switch codes - unlike the other architectures where the MM 79ugliest context switch codes - unlike the other architectures where the MM
80and register state is separate, the alpha PALcode joins the two, and you 80and register state is separate, the alpha PALcode joins the two, and you
diff --git a/Documentation/vm/hugetlbpage.txt b/Documentation/vm/hugetlbpage.txt
index 457634c1e03e..f8551b3879f8 100644
--- a/Documentation/vm/hugetlbpage.txt
+++ b/Documentation/vm/hugetlbpage.txt
@@ -72,7 +72,7 @@ number of huge pages requested. This is the most reliable method of
72allocating huge pages as memory has not yet become fragmented. 72allocating huge pages as memory has not yet become fragmented.
73 73
74Some platforms support multiple huge page sizes. To allocate huge pages 74Some platforms support multiple huge page sizes. To allocate huge pages
75of a specific size, one must preceed the huge pages boot command parameters 75of a specific size, one must precede the huge pages boot command parameters
76with a huge page size selection parameter "hugepagesz=<size>". <size> must 76with a huge page size selection parameter "hugepagesz=<size>". <size> must
77be specified in bytes with optional scale suffix [kKmMgG]. The default huge 77be specified in bytes with optional scale suffix [kKmMgG]. The default huge
78page size may be selected with the "default_hugepagesz=<size>" boot parameter. 78page size may be selected with the "default_hugepagesz=<size>" boot parameter.
diff --git a/Documentation/vm/overcommit-accounting b/Documentation/vm/overcommit-accounting
index 21c7b1f8f32b..706d7ed9d8d2 100644
--- a/Documentation/vm/overcommit-accounting
+++ b/Documentation/vm/overcommit-accounting
@@ -4,7 +4,7 @@ The Linux kernel supports the following overcommit handling modes
4 address space are refused. Used for a typical system. It 4 address space are refused. Used for a typical system. It
5 ensures a seriously wild allocation fails while allowing 5 ensures a seriously wild allocation fails while allowing
6 overcommit to reduce swap usage. root is allowed to 6 overcommit to reduce swap usage. root is allowed to
7 allocate slighly more memory in this mode. This is the 7 allocate slightly more memory in this mode. This is the
8 default. 8 default.
9 9
101 - Always overcommit. Appropriate for some scientific 101 - Always overcommit. Appropriate for some scientific
diff --git a/Documentation/w1/slaves/w1_ds2423 b/Documentation/w1/slaves/w1_ds2423
index 90a65d23cf59..3f98b505a0ee 100644
--- a/Documentation/w1/slaves/w1_ds2423
+++ b/Documentation/w1/slaves/w1_ds2423
@@ -21,8 +21,8 @@ value and associated ram buffer is outpputed to own line.
21 21
22Each lines will contain the values of 42 bytes read from the counter and 22Each lines will contain the values of 42 bytes read from the counter and
23memory page along the crc=YES or NO for indicating whether the read operation 23memory page along the crc=YES or NO for indicating whether the read operation
24was successfull and CRC matched. 24was successful and CRC matched.
25If the operation was successfull, there is also in the end of each line 25If the operation was successful, there is also in the end of each line
26a counter value expressed as an integer after c= 26a counter value expressed as an integer after c=
27 27
28Meaning of 42 bytes represented is following: 28Meaning of 42 bytes represented is following:
@@ -34,7 +34,7 @@ Meaning of 42 bytes represented is following:
34 - crc=YES/NO indicating whether read was ok and crc matched 34 - crc=YES/NO indicating whether read was ok and crc matched
35 - c=<int> current counter value 35 - c=<int> current counter value
36 36
37example from the successfull read: 37example from the successful read:
3800 02 00 00 00 00 00 00 00 6d 38 00 ff ff 00 00 fe ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff crc=YES c=2 3800 02 00 00 00 00 00 00 00 6d 38 00 ff ff 00 00 fe ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff crc=YES c=2
3900 02 00 00 00 00 00 00 00 e0 1f 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff crc=YES c=2 3900 02 00 00 00 00 00 00 00 e0 1f 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff crc=YES c=2
4000 29 c6 5d 18 00 00 00 00 04 37 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff crc=YES c=408798761 4000 29 c6 5d 18 00 00 00 00 04 37 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff crc=YES c=408798761
diff --git a/Documentation/w1/w1.netlink b/Documentation/w1/w1.netlink
index 804445f745ed..f59a31965d50 100644
--- a/Documentation/w1/w1.netlink
+++ b/Documentation/w1/w1.netlink
@@ -81,7 +81,7 @@ which will contain list of all registered master ids in the following
81format: 81format:
82 82
83 cn_msg (CN_W1_IDX.CN_W1_VAL as id, len is equal to sizeof(struct 83 cn_msg (CN_W1_IDX.CN_W1_VAL as id, len is equal to sizeof(struct
84 w1_netlink_msg) plus number of masters multipled by 4) 84 w1_netlink_msg) plus number of masters multiplied by 4)
85 w1_netlink_msg (type: W1_LIST_MASTERS, len is equal to 85 w1_netlink_msg (type: W1_LIST_MASTERS, len is equal to
86 number of masters multiplied by 4 (u32 size)) 86 number of masters multiplied by 4 (u32 size))
87 id0 ... idN 87 id0 ... idN
diff --git a/Documentation/watchdog/hpwdt.txt b/Documentation/watchdog/hpwdt.txt
index 9c24d5ffbb06..9488078900e0 100644
--- a/Documentation/watchdog/hpwdt.txt
+++ b/Documentation/watchdog/hpwdt.txt
@@ -8,7 +8,7 @@ Last reviewed: 06/02/2009
8 The HP iLO2 NMI Watchdog driver is a kernel module that provides basic 8 The HP iLO2 NMI Watchdog driver is a kernel module that provides basic
9 watchdog functionality and the added benefit of NMI sourcing. Both the 9 watchdog functionality and the added benefit of NMI sourcing. Both the
10 watchdog functionality and the NMI sourcing capability need to be enabled 10 watchdog functionality and the NMI sourcing capability need to be enabled
11 by the user. Remember that the two modes are not dependant on one another. 11 by the user. Remember that the two modes are not dependent on one another.
12 A user can have the NMI sourcing without the watchdog timer and vice-versa. 12 A user can have the NMI sourcing without the watchdog timer and vice-versa.
13 13
14 Watchdog functionality is enabled like any other common watchdog driver. That 14 Watchdog functionality is enabled like any other common watchdog driver. That
diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
index 9baae8afe8a3..da5449e22175 100644
--- a/arch/alpha/include/asm/elf.h
+++ b/arch/alpha/include/asm/elf.h
@@ -101,7 +101,7 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
101 101
102#define ELF_PLAT_INIT(_r, load_addr) _r->r0 = 0 102#define ELF_PLAT_INIT(_r, load_addr) _r->r0 = 0
103 103
104/* The registers are layed out in pt_regs for PAL and syscall 104/* The registers are laid out in pt_regs for PAL and syscall
105 convenience. Re-order them for the linear elf_gregset_t. */ 105 convenience. Re-order them for the linear elf_gregset_t. */
106 106
107struct pt_regs; 107struct pt_regs;
diff --git a/arch/alpha/kernel/core_lca.c b/arch/alpha/kernel/core_lca.c
index 4843f6ec9f3a..cb2801cfd3df 100644
--- a/arch/alpha/kernel/core_lca.c
+++ b/arch/alpha/kernel/core_lca.c
@@ -133,7 +133,7 @@ conf_read(unsigned long addr)
133 133
134 local_irq_save(flags); 134 local_irq_save(flags);
135 135
136 /* Reset status register to avoid loosing errors. */ 136 /* Reset status register to avoid losing errors. */
137 stat0 = *(vulp)LCA_IOC_STAT0; 137 stat0 = *(vulp)LCA_IOC_STAT0;
138 *(vulp)LCA_IOC_STAT0 = stat0; 138 *(vulp)LCA_IOC_STAT0 = stat0;
139 mb(); 139 mb();
@@ -170,7 +170,7 @@ conf_write(unsigned long addr, unsigned int value)
170 170
171 local_irq_save(flags); /* avoid getting hit by machine check */ 171 local_irq_save(flags); /* avoid getting hit by machine check */
172 172
173 /* Reset status register to avoid loosing errors. */ 173 /* Reset status register to avoid losing errors. */
174 stat0 = *(vulp)LCA_IOC_STAT0; 174 stat0 = *(vulp)LCA_IOC_STAT0;
175 *(vulp)LCA_IOC_STAT0 = stat0; 175 *(vulp)LCA_IOC_STAT0 = stat0;
176 mb(); 176 mb();
diff --git a/arch/alpha/kernel/err_marvel.c b/arch/alpha/kernel/err_marvel.c
index 648ae88aeb8a..ae54ad91e18f 100644
--- a/arch/alpha/kernel/err_marvel.c
+++ b/arch/alpha/kernel/err_marvel.c
@@ -1027,7 +1027,7 @@ marvel_process_logout_frame(struct ev7_lf_subpackets *lf_subpackets, int print)
1027 * normal operation, dismiss them. 1027 * normal operation, dismiss them.
1028 * 1028 *
1029 * Dismiss if: 1029 * Dismiss if:
1030 * C_STAT = 0x14 (Error Reponse) 1030 * C_STAT = 0x14 (Error Response)
1031 * C_STS<3> = 0 (C_ADDR valid) 1031 * C_STS<3> = 0 (C_ADDR valid)
1032 * C_ADDR<42> = 1 (I/O) 1032 * C_ADDR<42> = 1 (I/O)
1033 * C_ADDR<31:22> = 111110xxb (PCI Config space) 1033 * C_ADDR<31:22> = 111110xxb (PCI Config space)
diff --git a/arch/alpha/lib/ev67-strrchr.S b/arch/alpha/lib/ev67-strrchr.S
index 3fd8bf414c7b..dd0d8c6b9f59 100644
--- a/arch/alpha/lib/ev67-strrchr.S
+++ b/arch/alpha/lib/ev67-strrchr.S
@@ -82,7 +82,7 @@ $loop:
82$eos: 82$eos:
83 negq t1, t4 # E : isolate first null byte match 83 negq t1, t4 # E : isolate first null byte match
84 and t1, t4, t4 # E : 84 and t1, t4, t4 # E :
85 subq t4, 1, t5 # E : build a mask of the bytes upto... 85 subq t4, 1, t5 # E : build a mask of the bytes up to...
86 or t4, t5, t4 # E : ... and including the null 86 or t4, t5, t4 # E : ... and including the null
87 87
88 and t3, t4, t3 # E : mask out char matches after null 88 and t3, t4, t3 # E : mask out char matches after null
diff --git a/arch/alpha/lib/fls.c b/arch/alpha/lib/fls.c
index 32afaa3fa686..ddd048c0d825 100644
--- a/arch/alpha/lib/fls.c
+++ b/arch/alpha/lib/fls.c
@@ -6,7 +6,7 @@
6#include <linux/bitops.h> 6#include <linux/bitops.h>
7 7
8/* This is fls(x)-1, except zero is held to zero. This allows most 8/* This is fls(x)-1, except zero is held to zero. This allows most
9 efficent input into extbl, plus it allows easy handling of fls(0)=0. */ 9 efficient input into extbl, plus it allows easy handling of fls(0)=0. */
10 10
11const unsigned char __flsm1_tab[256] = 11const unsigned char __flsm1_tab[256] =
12{ 12{
diff --git a/arch/alpha/lib/strrchr.S b/arch/alpha/lib/strrchr.S
index 82cfd0ac907b..1970dc07cfd1 100644
--- a/arch/alpha/lib/strrchr.S
+++ b/arch/alpha/lib/strrchr.S
@@ -54,7 +54,7 @@ $loop:
54$eos: 54$eos:
55 negq t1, t4 # e0 : isolate first null byte match 55 negq t1, t4 # e0 : isolate first null byte match
56 and t1, t4, t4 # e1 : 56 and t1, t4, t4 # e1 :
57 subq t4, 1, t5 # e0 : build a mask of the bytes upto... 57 subq t4, 1, t5 # e0 : build a mask of the bytes up to...
58 or t4, t5, t4 # e1 : ... and including the null 58 or t4, t5, t4 # e1 : ... and including the null
59 59
60 and t3, t4, t3 # e0 : mask out char matches after null 60 and t3, t4, t3 # e0 : mask out char matches after null
diff --git a/arch/alpha/oprofile/op_model_ev67.c b/arch/alpha/oprofile/op_model_ev67.c
index 70302086283c..5b9d178e0228 100644
--- a/arch/alpha/oprofile/op_model_ev67.c
+++ b/arch/alpha/oprofile/op_model_ev67.c
@@ -192,7 +192,7 @@ ev67_handle_interrupt(unsigned long which, struct pt_regs *regs,
192 case TRAP_INVALID1: 192 case TRAP_INVALID1:
193 case TRAP_INVALID2: 193 case TRAP_INVALID2:
194 case TRAP_INVALID3: 194 case TRAP_INVALID3:
195 /* Pipeline redirection ocurred. PMPC points 195 /* Pipeline redirection occurred. PMPC points
196 to PALcode. Recognize ITB miss by PALcode 196 to PALcode. Recognize ITB miss by PALcode
197 offset address, and get actual PC from 197 offset address, and get actual PC from
198 EXC_ADDR. */ 198 EXC_ADDR. */
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5b9f78b570e8..fdc9d4dbf85b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -694,7 +694,7 @@ config ARCH_S3C2410
694 the Samsung SMDK2410 development board (and derivatives). 694 the Samsung SMDK2410 development board (and derivatives).
695 695
696 Note, the S3C2416 and the S3C2450 are so close that they even share 696 Note, the S3C2416 and the S3C2450 are so close that they even share
697 the same SoC ID code. This means that there is no seperate machine 697 the same SoC ID code. This means that there is no separate machine
698 directory (no arch/arm/mach-s3c2450) as the S3C2416 was first. 698 directory (no arch/arm/mach-s3c2450) as the S3C2416 was first.
699 699
700config ARCH_S3C64XX 700config ARCH_S3C64XX
diff --git a/arch/arm/Kconfig-nommu b/arch/arm/Kconfig-nommu
index 901e6dff8437..2cef8e13f9f8 100644
--- a/arch/arm/Kconfig-nommu
+++ b/arch/arm/Kconfig-nommu
@@ -34,7 +34,7 @@ config PROCESSOR_ID
34 used instead of the auto-probing which utilizes the register. 34 used instead of the auto-probing which utilizes the register.
35 35
36config REMAP_VECTORS_TO_RAM 36config REMAP_VECTORS_TO_RAM
37 bool 'Install vectors to the begining of RAM' if DRAM_BASE 37 bool 'Install vectors to the beginning of RAM' if DRAM_BASE
38 depends on DRAM_BASE 38 depends on DRAM_BASE
39 help 39 help
40 The kernel needs to change the hardware exception vectors. 40 The kernel needs to change the hardware exception vectors.
diff --git a/arch/arm/common/pl330.c b/arch/arm/common/pl330.c
index 8f0f86db3602..97912fa48782 100644
--- a/arch/arm/common/pl330.c
+++ b/arch/arm/common/pl330.c
@@ -1045,7 +1045,7 @@ static inline int _loop(unsigned dry_run, u8 buf[],
1045 unsigned lcnt0, lcnt1, ljmp0, ljmp1; 1045 unsigned lcnt0, lcnt1, ljmp0, ljmp1;
1046 struct _arg_LPEND lpend; 1046 struct _arg_LPEND lpend;
1047 1047
1048 /* Max iterations possibile in DMALP is 256 */ 1048 /* Max iterations possible in DMALP is 256 */
1049 if (*bursts >= 256*256) { 1049 if (*bursts >= 256*256) {
1050 lcnt1 = 256; 1050 lcnt1 = 256;
1051 lcnt0 = 256; 1051 lcnt0 = 256;
@@ -1446,7 +1446,7 @@ int pl330_update(const struct pl330_info *pi)
1446 } 1446 }
1447 1447
1448 for (ev = 0; ev < pi->pcfg.num_events; ev++) { 1448 for (ev = 0; ev < pi->pcfg.num_events; ev++) {
1449 if (val & (1 << ev)) { /* Event occured */ 1449 if (val & (1 << ev)) { /* Event occurred */
1450 struct pl330_thread *thrd; 1450 struct pl330_thread *thrd;
1451 u32 inten = readl(regs + INTEN); 1451 u32 inten = readl(regs + INTEN);
1452 int active; 1452 int active;
diff --git a/arch/arm/include/asm/fpstate.h b/arch/arm/include/asm/fpstate.h
index ee5e03efc1bb..3ad4c10d0d84 100644
--- a/arch/arm/include/asm/fpstate.h
+++ b/arch/arm/include/asm/fpstate.h
@@ -18,7 +18,7 @@
18 * VFP storage area has: 18 * VFP storage area has:
19 * - FPEXC, FPSCR, FPINST and FPINST2. 19 * - FPEXC, FPSCR, FPINST and FPINST2.
20 * - 16 or 32 double precision data registers 20 * - 16 or 32 double precision data registers
21 * - an implementation-dependant word of state for FLDMX/FSTMX (pre-ARMv6) 21 * - an implementation-dependent word of state for FLDMX/FSTMX (pre-ARMv6)
22 * 22 *
23 * FPEXC will always be non-zero once the VFP has been used in this process. 23 * FPEXC will always be non-zero once the VFP has been used in this process.
24 */ 24 */
diff --git a/arch/arm/include/asm/glue-cache.h b/arch/arm/include/asm/glue-cache.h
index c7afbc552c7f..7e30874377e6 100644
--- a/arch/arm/include/asm/glue-cache.h
+++ b/arch/arm/include/asm/glue-cache.h
@@ -126,7 +126,7 @@
126#endif 126#endif
127 127
128#if !defined(_CACHE) && !defined(MULTI_CACHE) 128#if !defined(_CACHE) && !defined(MULTI_CACHE)
129#error Unknown cache maintainence model 129#error Unknown cache maintenance model
130#endif 130#endif
131 131
132#ifndef MULTI_CACHE 132#ifndef MULTI_CACHE
diff --git a/arch/arm/include/asm/glue.h b/arch/arm/include/asm/glue.h
index 0ec35d1698aa..fbf71d75ec83 100644
--- a/arch/arm/include/asm/glue.h
+++ b/arch/arm/include/asm/glue.h
@@ -10,8 +10,8 @@
10 * 10 *
11 * This file provides the glue to stick the processor-specific bits 11 * This file provides the glue to stick the processor-specific bits
12 * into the kernel in an efficient manner. The idea is to use branches 12 * into the kernel in an efficient manner. The idea is to use branches
13 * when we're only targetting one class of TLB, or indirect calls 13 * when we're only targeting one class of TLB, or indirect calls
14 * when we're targetting multiple classes of TLBs. 14 * when we're targeting multiple classes of TLBs.
15 */ 15 */
16#ifdef __KERNEL__ 16#ifdef __KERNEL__
17 17
diff --git a/arch/arm/include/asm/hardware/pl080.h b/arch/arm/include/asm/hardware/pl080.h
index f35b86e68dd5..e4a04e4e5627 100644
--- a/arch/arm/include/asm/hardware/pl080.h
+++ b/arch/arm/include/asm/hardware/pl080.h
@@ -16,7 +16,7 @@
16 * make it not entierly compatible with the PL080 specification from 16 * make it not entierly compatible with the PL080 specification from
17 * ARM. When in doubt, check the Samsung documentation first. 17 * ARM. When in doubt, check the Samsung documentation first.
18 * 18 *
19 * The Samsung defines are PL080S, and add an extra controll register, 19 * The Samsung defines are PL080S, and add an extra control register,
20 * the ability to move more than 2^11 counts of data and some extra 20 * the ability to move more than 2^11 counts of data and some extra
21 * OneNAND features. 21 * OneNAND features.
22*/ 22*/
diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h
index 9a87823642d0..885be097769d 100644
--- a/arch/arm/include/asm/system.h
+++ b/arch/arm/include/asm/system.h
@@ -249,7 +249,7 @@ do { \
249 * cache totally. This means that the cache becomes inconsistent, and, 249 * cache totally. This means that the cache becomes inconsistent, and,
250 * since we use normal loads/stores as well, this is really bad. 250 * since we use normal loads/stores as well, this is really bad.
251 * Typically, this causes oopsen in filp_close, but could have other, 251 * Typically, this causes oopsen in filp_close, but could have other,
252 * more disasterous effects. There are two work-arounds: 252 * more disastrous effects. There are two work-arounds:
253 * 1. Disable interrupts and emulate the atomic swap 253 * 1. Disable interrupts and emulate the atomic swap
254 * 2. Clean the cache, perform atomic swap, flush the cache 254 * 2. Clean the cache, perform atomic swap, flush the cache
255 * 255 *
diff --git a/arch/arm/include/asm/ucontext.h b/arch/arm/include/asm/ucontext.h
index 47f023aa8495..14749aec94bf 100644
--- a/arch/arm/include/asm/ucontext.h
+++ b/arch/arm/include/asm/ucontext.h
@@ -47,7 +47,7 @@ struct crunch_sigframe {
47#endif 47#endif
48 48
49#ifdef CONFIG_IWMMXT 49#ifdef CONFIG_IWMMXT
50/* iwmmxt_area is 0x98 bytes long, preceeded by 8 bytes of signature */ 50/* iwmmxt_area is 0x98 bytes long, preceded by 8 bytes of signature */
51#define IWMMXT_MAGIC 0x12ef842a 51#define IWMMXT_MAGIC 0x12ef842a
52#define IWMMXT_STORAGE_SIZE (IWMMXT_SIZE + 8) 52#define IWMMXT_STORAGE_SIZE (IWMMXT_SIZE + 8)
53 53
diff --git a/arch/arm/kernel/swp_emulate.c b/arch/arm/kernel/swp_emulate.c
index 7a5760922914..40ee7e5045e4 100644
--- a/arch/arm/kernel/swp_emulate.c
+++ b/arch/arm/kernel/swp_emulate.c
@@ -158,7 +158,7 @@ static int emulate_swpX(unsigned int address, unsigned int *data,
158 158
159 if (res == 0) { 159 if (res == 0) {
160 /* 160 /*
161 * Barrier also required between aquiring a lock for a 161 * Barrier also required between acquiring a lock for a
162 * protected resource and accessing the resource. Inserted for 162 * protected resource and accessing the resource. Inserted for
163 * same reason as above. 163 * same reason as above.
164 */ 164 */
diff --git a/arch/arm/mach-at91/board-carmeva.c b/arch/arm/mach-at91/board-carmeva.c
index 2e74a19874d1..295e1e77fa60 100644
--- a/arch/arm/mach-at91/board-carmeva.c
+++ b/arch/arm/mach-at91/board-carmeva.c
@@ -76,7 +76,7 @@ static struct at91_udc_data __initdata carmeva_udc_data = {
76 .pullup_pin = AT91_PIN_PD9, 76 .pullup_pin = AT91_PIN_PD9,
77}; 77};
78 78
79/* FIXME: user dependant */ 79/* FIXME: user dependent */
80// static struct at91_cf_data __initdata carmeva_cf_data = { 80// static struct at91_cf_data __initdata carmeva_cf_data = {
81// .det_pin = AT91_PIN_PB0, 81// .det_pin = AT91_PIN_PB0,
82// .rst_pin = AT91_PIN_PC5, 82// .rst_pin = AT91_PIN_PC5,
diff --git a/arch/arm/mach-at91/include/mach/at91_mci.h b/arch/arm/mach-at91/include/mach/at91_mci.h
index 27ac6f550fe3..02182c16a022 100644
--- a/arch/arm/mach-at91/include/mach/at91_mci.h
+++ b/arch/arm/mach-at91/include/mach/at91_mci.h
@@ -102,7 +102,7 @@
102#define AT91_MCI_RDIRE (1 << 17) /* Response Direction Error */ 102#define AT91_MCI_RDIRE (1 << 17) /* Response Direction Error */
103#define AT91_MCI_RCRCE (1 << 18) /* Response CRC Error */ 103#define AT91_MCI_RCRCE (1 << 18) /* Response CRC Error */
104#define AT91_MCI_RENDE (1 << 19) /* Response End Bit Error */ 104#define AT91_MCI_RENDE (1 << 19) /* Response End Bit Error */
105#define AT91_MCI_RTOE (1 << 20) /* Reponse Time-out Error */ 105#define AT91_MCI_RTOE (1 << 20) /* Response Time-out Error */
106#define AT91_MCI_DCRCE (1 << 21) /* Data CRC Error */ 106#define AT91_MCI_DCRCE (1 << 21) /* Data CRC Error */
107#define AT91_MCI_DTOE (1 << 22) /* Data Time-out Error */ 107#define AT91_MCI_DTOE (1 << 22) /* Data Time-out Error */
108#define AT91_MCI_OVRE (1 << 30) /* Overrun */ 108#define AT91_MCI_OVRE (1 << 30) /* Overrun */
diff --git a/arch/arm/mach-at91/include/mach/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h
index ddeb64536756..056dc6674b6b 100644
--- a/arch/arm/mach-at91/include/mach/gpio.h
+++ b/arch/arm/mach-at91/include/mach/gpio.h
@@ -208,7 +208,7 @@ extern void at91_gpio_resume(void);
208 208
209/*-------------------------------------------------------------------------*/ 209/*-------------------------------------------------------------------------*/
210 210
211/* wrappers for "new style" GPIO calls. the old AT91-specfic ones should 211/* wrappers for "new style" GPIO calls. the old AT91-specific ones should
212 * eventually be removed (along with this errno.h inclusion), and the 212 * eventually be removed (along with this errno.h inclusion), and the
213 * gpio request/free calls should probably be implemented. 213 * gpio request/free calls should probably be implemented.
214 */ 214 */
diff --git a/arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c b/arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c
index 77f84b40dda9..a1f328357aa4 100644
--- a/arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c
+++ b/arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c
@@ -551,7 +551,7 @@ int dmacHw_calculateDescriptorCount(dmacHw_CONFIG_t *pConfig, /* [ IN ] Config
551 551
552/****************************************************************************/ 552/****************************************************************************/
553/** 553/**
554* @brief Check the existance of pending descriptor 554* @brief Check the existence of pending descriptor
555* 555*
556* This function confirmes if there is any pending descriptor in the chain 556* This function confirmes if there is any pending descriptor in the chain
557* to program the channel 557* to program the channel
@@ -775,7 +775,7 @@ int dmacHw_setVariableDataDescriptor(dmacHw_HANDLE_t handle, /* [ IN ] DMA Cha
775/** 775/**
776* @brief Read data DMAed to memory 776* @brief Read data DMAed to memory
777* 777*
778* This function will read data that has been DMAed to memory while transfering from: 778* This function will read data that has been DMAed to memory while transferring from:
779* - Memory to memory 779* - Memory to memory
780* - Peripheral to memory 780* - Peripheral to memory
781* 781*
@@ -941,7 +941,7 @@ int dmacHw_setControlDescriptor(dmacHw_CONFIG_t *pConfig, /* [ IN ] Configurat
941/** 941/**
942* @brief Sets channel specific user data 942* @brief Sets channel specific user data
943* 943*
944* This function associates user data to a specif DMA channel 944* This function associates user data to a specific DMA channel
945* 945*
946*/ 946*/
947/****************************************************************************/ 947/****************************************************************************/
diff --git a/arch/arm/mach-bcmring/dma.c b/arch/arm/mach-bcmring/dma.c
index 8d1baf3f4683..d87ad30dda35 100644
--- a/arch/arm/mach-bcmring/dma.c
+++ b/arch/arm/mach-bcmring/dma.c
@@ -629,7 +629,7 @@ EXPORT_SYMBOL(dma_get_device_descriptor_ring);
629* Configures a DMA channel. 629* Configures a DMA channel.
630* 630*
631* @return 631* @return
632* >= 0 - Initialization was successfull. 632* >= 0 - Initialization was successful.
633* 633*
634* -EBUSY - Device is currently being used. 634* -EBUSY - Device is currently being used.
635* -ENODEV - Device handed in is invalid. 635* -ENODEV - Device handed in is invalid.
@@ -673,7 +673,7 @@ static int ConfigChannel(DMA_Handle_t handle)
673/** 673/**
674* Initializes all of the data structures associated with the DMA. 674* Initializes all of the data structures associated with the DMA.
675* @return 675* @return
676* >= 0 - Initialization was successfull. 676* >= 0 - Initialization was successful.
677* 677*
678* -EBUSY - Device is currently being used. 678* -EBUSY - Device is currently being used.
679* -ENODEV - Device handed in is invalid. 679* -ENODEV - Device handed in is invalid.
diff --git a/arch/arm/mach-bcmring/include/csp/dmacHw.h b/arch/arm/mach-bcmring/include/csp/dmacHw.h
index 6c8da2b9fc1f..e6a1dc484ca7 100644
--- a/arch/arm/mach-bcmring/include/csp/dmacHw.h
+++ b/arch/arm/mach-bcmring/include/csp/dmacHw.h
@@ -362,7 +362,7 @@ int dmacHw_setControlDescriptor(dmacHw_CONFIG_t *pConfig, /* [ IN ] Configurati
362/** 362/**
363* @brief Read data DMA transferred to memory 363* @brief Read data DMA transferred to memory
364* 364*
365* This function will read data that has been DMAed to memory while transfering from: 365* This function will read data that has been DMAed to memory while transferring from:
366* - Memory to memory 366* - Memory to memory
367* - Peripheral to memory 367* - Peripheral to memory
368* 368*
@@ -446,7 +446,7 @@ void dmacHw_stopTransfer(dmacHw_HANDLE_t handle /* [ IN ] DMA Channel handle *
446 446
447/****************************************************************************/ 447/****************************************************************************/
448/** 448/**
449* @brief Check the existance of pending descriptor 449* @brief Check the existence of pending descriptor
450* 450*
451* This function confirmes if there is any pending descriptor in the chain 451* This function confirmes if there is any pending descriptor in the chain
452* to program the channel 452* to program the channel
@@ -542,7 +542,7 @@ dmacHw_HANDLE_t dmacHw_getInterruptSource(void);
542/** 542/**
543* @brief Sets channel specific user data 543* @brief Sets channel specific user data
544* 544*
545* This function associates user data to a specif DMA channel 545* This function associates user data to a specific DMA channel
546* 546*
547*/ 547*/
548/****************************************************************************/ 548/****************************************************************************/
diff --git a/arch/arm/mach-bcmring/include/mach/csp/chipcHw_def.h b/arch/arm/mach-bcmring/include/mach/csp/chipcHw_def.h
index 70eaea866cfe..161973385faf 100644
--- a/arch/arm/mach-bcmring/include/mach/csp/chipcHw_def.h
+++ b/arch/arm/mach-bcmring/include/mach/csp/chipcHw_def.h
@@ -180,7 +180,7 @@ typedef enum {
180 180
181#define chipcHw_XTAL_FREQ_Hz 25000000 /* Reference clock frequency in Hz */ 181#define chipcHw_XTAL_FREQ_Hz 25000000 /* Reference clock frequency in Hz */
182 182
183/* Programable pin defines */ 183/* Programmable pin defines */
184#define chipcHw_PIN_GPIO(n) ((((n) >= 0) && ((n) < (chipcHw_GPIO_COUNT))) ? (n) : 0xFFFFFFFF) 184#define chipcHw_PIN_GPIO(n) ((((n) >= 0) && ((n) < (chipcHw_GPIO_COUNT))) ? (n) : 0xFFFFFFFF)
185 /* GPIO pin 0 - 60 */ 185 /* GPIO pin 0 - 60 */
186#define chipcHw_PIN_UARTTXD (chipcHw_GPIO_COUNT + 0) /* UART Transmit */ 186#define chipcHw_PIN_UARTTXD (chipcHw_GPIO_COUNT + 0) /* UART Transmit */
diff --git a/arch/arm/mach-bcmring/include/mach/csp/chipcHw_inline.h b/arch/arm/mach-bcmring/include/mach/csp/chipcHw_inline.h
index c78833acb37a..03238c299001 100644
--- a/arch/arm/mach-bcmring/include/mach/csp/chipcHw_inline.h
+++ b/arch/arm/mach-bcmring/include/mach/csp/chipcHw_inline.h
@@ -832,7 +832,7 @@ static inline void chipcHw_setUsbDevice(void)
832 832
833/****************************************************************************/ 833/****************************************************************************/
834/** 834/**
835* @brief Lower layer funtion to enable/disable a clock of a certain device 835* @brief Lower layer function to enable/disable a clock of a certain device
836* 836*
837* This function enables/disables a core clock 837* This function enables/disables a core clock
838* 838*
diff --git a/arch/arm/mach-bcmring/include/mach/csp/intcHw_reg.h b/arch/arm/mach-bcmring/include/mach/csp/intcHw_reg.h
index e01fc4607c91..0aeb6a6fe7f8 100644
--- a/arch/arm/mach-bcmring/include/mach/csp/intcHw_reg.h
+++ b/arch/arm/mach-bcmring/include/mach/csp/intcHw_reg.h
@@ -109,9 +109,9 @@
109#define INTCHW_INTC0_DMA0C0 (1<<INTCHW_INTC0_DMA0C0_BITNUM) 109#define INTCHW_INTC0_DMA0C0 (1<<INTCHW_INTC0_DMA0C0_BITNUM)
110 110
111/* INTC1 - interrupt controller 1 */ 111/* INTC1 - interrupt controller 1 */
112#define INTCHW_INTC1_DDRVPMP_BITNUM 27 /* DDR and VPM PLL clock phase relationship interupt (Not for A0) */ 112#define INTCHW_INTC1_DDRVPMP_BITNUM 27 /* DDR and VPM PLL clock phase relationship interrupt (Not for A0) */
113#define INTCHW_INTC1_DDRVPMT_BITNUM 26 /* DDR and VPM HW phase align timeout interrupt (Not for A0) */ 113#define INTCHW_INTC1_DDRVPMT_BITNUM 26 /* DDR and VPM HW phase align timeout interrupt (Not for A0) */
114#define INTCHW_INTC1_DDRP_BITNUM 26 /* DDR and PLL clock phase relationship interupt (For A0 only)) */ 114#define INTCHW_INTC1_DDRP_BITNUM 26 /* DDR and PLL clock phase relationship interrupt (For A0 only)) */
115#define INTCHW_INTC1_RTC2_BITNUM 25 /* Real time clock tamper interrupt */ 115#define INTCHW_INTC1_RTC2_BITNUM 25 /* Real time clock tamper interrupt */
116#define INTCHW_INTC1_VDEC_BITNUM 24 /* Hantro Video Decoder interrupt */ 116#define INTCHW_INTC1_VDEC_BITNUM 24 /* Hantro Video Decoder interrupt */
117/* Bits 13-23 are non-secure versions of the corresponding secure bits in SINTC bits 0-10. */ 117/* Bits 13-23 are non-secure versions of the corresponding secure bits in SINTC bits 0-10. */
diff --git a/arch/arm/mach-bcmring/include/mach/reg_umi.h b/arch/arm/mach-bcmring/include/mach/reg_umi.h
index 06a355481ea6..0992842caa77 100644
--- a/arch/arm/mach-bcmring/include/mach/reg_umi.h
+++ b/arch/arm/mach-bcmring/include/mach/reg_umi.h
@@ -88,7 +88,7 @@
88/* REG_UMI_FLASH0/1/2_TCR, REG_UMI_SRAM0/1_TCR bits */ 88/* REG_UMI_FLASH0/1/2_TCR, REG_UMI_SRAM0/1_TCR bits */
89/* Enable wait pin during burst write or read */ 89/* Enable wait pin during burst write or read */
90#define REG_UMI_TCR_WAITEN 0x80000000 90#define REG_UMI_TCR_WAITEN 0x80000000
91/* Enable mem ctrlr to work iwth ext mem of lower freq than AHB clk */ 91/* Enable mem ctrlr to work with ext mem of lower freq than AHB clk */
92#define REG_UMI_TCR_LOWFREQ 0x40000000 92#define REG_UMI_TCR_LOWFREQ 0x40000000
93/* 1=synch write, 0=async write */ 93/* 1=synch write, 0=async write */
94#define REG_UMI_TCR_MEMTYPE_SYNCWRITE 0x20000000 94#define REG_UMI_TCR_MEMTYPE_SYNCWRITE 0x20000000
diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c
index 6c389ff1020e..3e7be2de96de 100644
--- a/arch/arm/mach-davinci/board-neuros-osd2.c
+++ b/arch/arm/mach-davinci/board-neuros-osd2.c
@@ -11,7 +11,7 @@
11 * DM644X-EVM board. It has: 11 * DM644X-EVM board. It has:
12 * DM6446M02 module with 256MB NAND, 256MB RAM, TLV320AIC32 AIC, 12 * DM6446M02 module with 256MB NAND, 256MB RAM, TLV320AIC32 AIC,
13 * USB, Ethernet, SD/MMC, UART, THS8200, TVP7000 for video. 13 * USB, Ethernet, SD/MMC, UART, THS8200, TVP7000 for video.
14 * Additionaly realtime clock, IR remote control receiver, 14 * Additionally realtime clock, IR remote control receiver,
15 * IR Blaster based on MSP430 (firmware although is different 15 * IR Blaster based on MSP430 (firmware although is different
16 * from used in DM644X-EVM), internal ATA-6 3.5†HDD drive 16 * from used in DM644X-EVM), internal ATA-6 3.5†HDD drive
17 * with PATA interface, two muxed red-green leds. 17 * with PATA interface, two muxed red-green leds.
diff --git a/arch/arm/mach-davinci/cpufreq.c b/arch/arm/mach-davinci/cpufreq.c
index 4a68c2b1ec11..0a95be1512bb 100644
--- a/arch/arm/mach-davinci/cpufreq.c
+++ b/arch/arm/mach-davinci/cpufreq.c
@@ -167,7 +167,7 @@ static int davinci_cpu_init(struct cpufreq_policy *policy)
167 /* 167 /*
168 * Time measurement across the target() function yields ~1500-1800us 168 * Time measurement across the target() function yields ~1500-1800us
169 * time taken with no drivers on notification list. 169 * time taken with no drivers on notification list.
170 * Setting the latency to 2000 us to accomodate addition of drivers 170 * Setting the latency to 2000 us to accommodate addition of drivers
171 * to pre/post change notification list. 171 * to pre/post change notification list.
172 */ 172 */
173 policy->cpuinfo.transition_latency = 2000 * 1000; 173 policy->cpuinfo.transition_latency = 2000 * 1000;
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 68fe4c289d77..b95b9196deed 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -1123,7 +1123,7 @@ void __init da850_init(void)
1123 * This helps keeping the peripherals on this domain insulated 1123 * This helps keeping the peripherals on this domain insulated
1124 * from CPU frequency changes caused by DVFS. The firmware sets 1124 * from CPU frequency changes caused by DVFS. The firmware sets
1125 * both PLL0 and PLL1 to the same frequency so, there should not 1125 * both PLL0 and PLL1 to the same frequency so, there should not
1126 * be any noticible change even in non-DVFS use cases. 1126 * be any noticeable change even in non-DVFS use cases.
1127 */ 1127 */
1128 da850_set_async3_src(1); 1128 da850_set_async3_src(1);
1129 1129
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 76364d1345df..f68012239641 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -314,7 +314,7 @@ static struct clk timer2_clk = {
314 .name = "timer2", 314 .name = "timer2",
315 .parent = &pll1_aux_clk, 315 .parent = &pll1_aux_clk,
316 .lpsc = DAVINCI_LPSC_TIMER2, 316 .lpsc = DAVINCI_LPSC_TIMER2,
317 .usecount = 1, /* REVISIT: why cant' this be disabled? */ 317 .usecount = 1, /* REVISIT: why can't' this be disabled? */
318}; 318};
319 319
320static struct clk timer3_clk = { 320static struct clk timer3_clk = {
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 9a2376b3137c..5f8a65424184 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -274,7 +274,7 @@ static struct clk timer2_clk = {
274 .name = "timer2", 274 .name = "timer2",
275 .parent = &pll1_aux_clk, 275 .parent = &pll1_aux_clk,
276 .lpsc = DAVINCI_LPSC_TIMER2, 276 .lpsc = DAVINCI_LPSC_TIMER2,
277 .usecount = 1, /* REVISIT: why cant' this be disabled? */ 277 .usecount = 1, /* REVISIT: why can't' this be disabled? */
278}; 278};
279 279
280static struct clk_lookup dm644x_clks[] = { 280static struct clk_lookup dm644x_clks[] = {
diff --git a/arch/arm/mach-davinci/include/mach/cputype.h b/arch/arm/mach-davinci/include/mach/cputype.h
index cea6b8972043..957fb87e832e 100644
--- a/arch/arm/mach-davinci/include/mach/cputype.h
+++ b/arch/arm/mach-davinci/include/mach/cputype.h
@@ -4,7 +4,7 @@
4 * Author: Kevin Hilman, Deep Root Systems, LLC 4 * Author: Kevin Hilman, Deep Root Systems, LLC
5 * 5 *
6 * Defines the cpu_is_*() macros for runtime detection of DaVinci 6 * Defines the cpu_is_*() macros for runtime detection of DaVinci
7 * device type. In addtion, if support for a given device is not 7 * device type. In addition, if support for a given device is not
8 * compiled in to the kernel, the macros return 0 so that 8 * compiled in to the kernel, the macros return 0 so that
9 * resulting code can be optimized out. 9 * resulting code can be optimized out.
10 * 10 *
diff --git a/arch/arm/mach-ep93xx/gpio.c b/arch/arm/mach-ep93xx/gpio.c
index 180b8a9d0d21..a5a9ff70b198 100644
--- a/arch/arm/mach-ep93xx/gpio.c
+++ b/arch/arm/mach-ep93xx/gpio.c
@@ -101,7 +101,7 @@ static void ep93xx_gpio_ab_irq_handler(unsigned int irq, struct irq_desc *desc)
101static void ep93xx_gpio_f_irq_handler(unsigned int irq, struct irq_desc *desc) 101static void ep93xx_gpio_f_irq_handler(unsigned int irq, struct irq_desc *desc)
102{ 102{
103 /* 103 /*
104 * map discontiguous hw irq range to continous sw irq range: 104 * map discontiguous hw irq range to continuous sw irq range:
105 * 105 *
106 * IRQ_EP93XX_GPIO{0..7}MUX -> gpio_to_irq(EP93XX_GPIO_LINE_F({0..7}) 106 * IRQ_EP93XX_GPIO{0..7}MUX -> gpio_to_irq(EP93XX_GPIO_LINE_F({0..7})
107 */ 107 */
diff --git a/arch/arm/mach-exynos4/include/mach/gpio.h b/arch/arm/mach-exynos4/include/mach/gpio.h
index 939728b38d48..be9266b10fdb 100644
--- a/arch/arm/mach-exynos4/include/mach/gpio.h
+++ b/arch/arm/mach-exynos4/include/mach/gpio.h
@@ -18,7 +18,7 @@
18#define gpio_cansleep __gpio_cansleep 18#define gpio_cansleep __gpio_cansleep
19#define gpio_to_irq __gpio_to_irq 19#define gpio_to_irq __gpio_to_irq
20 20
21/* Practically, GPIO banks upto GPZ are the configurable gpio banks */ 21/* Practically, GPIO banks up to GPZ are the configurable gpio banks */
22 22
23/* GPIO bank sizes */ 23/* GPIO bank sizes */
24#define EXYNOS4_GPIO_A0_NR (8) 24#define EXYNOS4_GPIO_A0_NR (8)
diff --git a/arch/arm/mach-exynos4/mct.c b/arch/arm/mach-exynos4/mct.c
index af82a8fbb68b..14ac10b7ec02 100644
--- a/arch/arm/mach-exynos4/mct.c
+++ b/arch/arm/mach-exynos4/mct.c
@@ -276,7 +276,7 @@ static void exynos4_mct_tick_start(unsigned long cycles,
276 /* update interrupt count buffer */ 276 /* update interrupt count buffer */
277 exynos4_mct_write(tmp, mevt->base + MCT_L_ICNTB_OFFSET); 277 exynos4_mct_write(tmp, mevt->base + MCT_L_ICNTB_OFFSET);
278 278
279 /* enable MCT tick interupt */ 279 /* enable MCT tick interrupt */
280 exynos4_mct_write(0x1, mevt->base + MCT_L_INT_ENB_OFFSET); 280 exynos4_mct_write(0x1, mevt->base + MCT_L_INT_ENB_OFFSET);
281 281
282 tmp = __raw_readl(mevt->base + MCT_L_TCON_OFFSET); 282 tmp = __raw_readl(mevt->base + MCT_L_TCON_OFFSET);
diff --git a/arch/arm/mach-exynos4/setup-sdhci-gpio.c b/arch/arm/mach-exynos4/setup-sdhci-gpio.c
index 1b3d3a2de95c..e8d08bf8965a 100644
--- a/arch/arm/mach-exynos4/setup-sdhci-gpio.c
+++ b/arch/arm/mach-exynos4/setup-sdhci-gpio.c
@@ -38,14 +38,14 @@ void exynos4_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
38 switch (width) { 38 switch (width) {
39 case 8: 39 case 8:
40 for (gpio = EXYNOS4_GPK1(3); gpio <= EXYNOS4_GPK1(6); gpio++) { 40 for (gpio = EXYNOS4_GPK1(3); gpio <= EXYNOS4_GPK1(6); gpio++) {
41 /* Data pin GPK1[3:6] to special-funtion 3 */ 41 /* Data pin GPK1[3:6] to special-function 3 */
42 s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(3)); 42 s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(3));
43 s3c_gpio_setpull(gpio, S3C_GPIO_PULL_UP); 43 s3c_gpio_setpull(gpio, S3C_GPIO_PULL_UP);
44 s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4); 44 s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4);
45 } 45 }
46 case 4: 46 case 4:
47 for (gpio = EXYNOS4_GPK0(3); gpio <= EXYNOS4_GPK0(6); gpio++) { 47 for (gpio = EXYNOS4_GPK0(3); gpio <= EXYNOS4_GPK0(6); gpio++) {
48 /* Data pin GPK0[3:6] to special-funtion 2 */ 48 /* Data pin GPK0[3:6] to special-function 2 */
49 s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2)); 49 s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2));
50 s3c_gpio_setpull(gpio, S3C_GPIO_PULL_UP); 50 s3c_gpio_setpull(gpio, S3C_GPIO_PULL_UP);
51 s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4); 51 s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4);
diff --git a/arch/arm/mach-exynos4/setup-sdhci.c b/arch/arm/mach-exynos4/setup-sdhci.c
index 85f9433d4836..1e83f8cf236d 100644
--- a/arch/arm/mach-exynos4/setup-sdhci.c
+++ b/arch/arm/mach-exynos4/setup-sdhci.c
@@ -35,7 +35,7 @@ void exynos4_setup_sdhci_cfg_card(struct platform_device *dev, void __iomem *r,
35{ 35{
36 u32 ctrl2, ctrl3; 36 u32 ctrl2, ctrl3;
37 37
38 /* don't need to alter anything acording to card-type */ 38 /* don't need to alter anything according to card-type */
39 39
40 ctrl2 = readl(r + S3C_SDHCI_CONTROL2); 40 ctrl2 = readl(r + S3C_SDHCI_CONTROL2);
41 41
diff --git a/arch/arm/mach-iop13xx/pci.c b/arch/arm/mach-iop13xx/pci.c
index 773ea0c95b9f..ba3dae352a2d 100644
--- a/arch/arm/mach-iop13xx/pci.c
+++ b/arch/arm/mach-iop13xx/pci.c
@@ -225,7 +225,7 @@ static u32 iop13xx_atue_cfg_address(struct pci_bus *bus, int devfn, int where)
225/* This routine checks the status of the last configuration cycle. If an error 225/* This routine checks the status of the last configuration cycle. If an error
226 * was detected it returns >0, else it returns a 0. The errors being checked 226 * was detected it returns >0, else it returns a 0. The errors being checked
227 * are parity, master abort, target abort (master and target). These types of 227 * are parity, master abort, target abort (master and target). These types of
228 * errors occure during a config cycle where there is no device, like during 228 * errors occur during a config cycle where there is no device, like during
229 * the discovery stage. 229 * the discovery stage.
230 */ 230 */
231static int iop13xx_atux_pci_status(int clear) 231static int iop13xx_atux_pci_status(int clear)
@@ -332,7 +332,7 @@ static struct pci_ops iop13xx_atux_ops = {
332/* This routine checks the status of the last configuration cycle. If an error 332/* This routine checks the status of the last configuration cycle. If an error
333 * was detected it returns >0, else it returns a 0. The errors being checked 333 * was detected it returns >0, else it returns a 0. The errors being checked
334 * are parity, master abort, target abort (master and target). These types of 334 * are parity, master abort, target abort (master and target). These types of
335 * errors occure during a config cycle where there is no device, like during 335 * errors occur during a config cycle where there is no device, like during
336 * the discovery stage. 336 * the discovery stage.
337 */ 337 */
338static int iop13xx_atue_pci_status(int clear) 338static int iop13xx_atue_pci_status(int clear)
diff --git a/arch/arm/mach-kirkwood/tsx1x-common.c b/arch/arm/mach-kirkwood/tsx1x-common.c
index f781164e623f..24294b2bc469 100644
--- a/arch/arm/mach-kirkwood/tsx1x-common.c
+++ b/arch/arm/mach-kirkwood/tsx1x-common.c
@@ -15,7 +15,7 @@
15 15
16/**************************************************************************** 16/****************************************************************************
17 * 16 MiB NOR flash. The struct mtd_partition is not in the same order as the 17 * 16 MiB NOR flash. The struct mtd_partition is not in the same order as the
18 * partitions on the device because we want to keep compatability with 18 * partitions on the device because we want to keep compatibility with
19 * the QNAP firmware. 19 * the QNAP firmware.
20 * Layout as used by QNAP: 20 * Layout as used by QNAP:
21 * 0x00000000-0x00080000 : "U-Boot" 21 * 0x00000000-0x00080000 : "U-Boot"
diff --git a/arch/arm/mach-lpc32xx/pm.c b/arch/arm/mach-lpc32xx/pm.c
index e76d41bb7056..b9c80597b7bf 100644
--- a/arch/arm/mach-lpc32xx/pm.c
+++ b/arch/arm/mach-lpc32xx/pm.c
@@ -41,7 +41,7 @@
41 * DRAM clocking and refresh are slightly different for systems with DDR 41 * DRAM clocking and refresh are slightly different for systems with DDR
42 * DRAM or regular SDRAM devices. If SDRAM is used in the system, the 42 * DRAM or regular SDRAM devices. If SDRAM is used in the system, the
43 * SDRAM will still be accessible in direct-run mode. In DDR based systems, 43 * SDRAM will still be accessible in direct-run mode. In DDR based systems,
44 * a transistion to direct-run mode will stop all DDR accesses (no clocks). 44 * a transition to direct-run mode will stop all DDR accesses (no clocks).
45 * Because of this, the code to switch power modes and the code to enter 45 * Because of this, the code to switch power modes and the code to enter
46 * and exit DRAM self-refresh modes must not be executed in DRAM. A small 46 * and exit DRAM self-refresh modes must not be executed in DRAM. A small
47 * section of IRAM is used instead for this. 47 * section of IRAM is used instead for this.
diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c
index aeb9ae23e6ce..99833b9485cf 100644
--- a/arch/arm/mach-mmp/time.c
+++ b/arch/arm/mach-mmp/time.c
@@ -9,7 +9,7 @@
9 * 2008-04-11: Jason Chagas <Jason.chagas@marvell.com> 9 * 2008-04-11: Jason Chagas <Jason.chagas@marvell.com>
10 * 2008-10-08: Bin Yang <bin.yang@marvell.com> 10 * 2008-10-08: Bin Yang <bin.yang@marvell.com>
11 * 11 *
12 * The timers module actually includes three timers, each timer with upto 12 * The timers module actually includes three timers, each timer with up to
13 * three match comparators. Timer #0 is used here in free-running mode as 13 * three match comparators. Timer #0 is used here in free-running mode as
14 * the clock source, and match comparator #1 used as clock event device. 14 * the clock source, and match comparator #1 used as clock event device.
15 * 15 *
diff --git a/arch/arm/mach-msm/acpuclock-arm11.c b/arch/arm/mach-msm/acpuclock-arm11.c
index 7ffbd987eb5d..805d4ee53f7e 100644
--- a/arch/arm/mach-msm/acpuclock-arm11.c
+++ b/arch/arm/mach-msm/acpuclock-arm11.c
@@ -343,7 +343,7 @@ int acpuclk_set_rate(unsigned long rate, int for_power_collapse)
343 } 343 }
344 } 344 }
345 345
346 /* Set wait states for CPU inbetween frequency changes */ 346 /* Set wait states for CPU between frequency changes */
347 reg_clkctl = readl(A11S_CLK_CNTL_ADDR); 347 reg_clkctl = readl(A11S_CLK_CNTL_ADDR);
348 reg_clkctl |= (100 << 16); /* set WT_ST_CNT */ 348 reg_clkctl |= (100 << 16); /* set WT_ST_CNT */
349 writel(reg_clkctl, A11S_CLK_CNTL_ADDR); 349 writel(reg_clkctl, A11S_CLK_CNTL_ADDR);
diff --git a/arch/arm/mach-msm/scm.c b/arch/arm/mach-msm/scm.c
index cfa808dd4897..232f97a04504 100644
--- a/arch/arm/mach-msm/scm.c
+++ b/arch/arm/mach-msm/scm.c
@@ -46,7 +46,7 @@ static DEFINE_MUTEX(scm_lock);
46 * @id: command to be executed 46 * @id: command to be executed
47 * @buf: buffer returned from scm_get_command_buffer() 47 * @buf: buffer returned from scm_get_command_buffer()
48 * 48 *
49 * An SCM command is layed out in memory as follows: 49 * An SCM command is laid out in memory as follows:
50 * 50 *
51 * ------------------- <--- struct scm_command 51 * ------------------- <--- struct scm_command
52 * | command header | 52 * | command header |
diff --git a/arch/arm/mach-omap1/ams-delta-fiq-handler.S b/arch/arm/mach-omap1/ams-delta-fiq-handler.S
index 927d5a181760..c1c5fb6a5b4c 100644
--- a/arch/arm/mach-omap1/ams-delta-fiq-handler.S
+++ b/arch/arm/mach-omap1/ams-delta-fiq-handler.S
@@ -79,7 +79,7 @@
79 79
80 80
81/* 81/*
82 * Register useage 82 * Register usage
83 * r8 - temporary 83 * r8 - temporary
84 * r9 - the driver buffer 84 * r9 - the driver buffer
85 * r10 - temporary 85 * r10 - temporary
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c
index d41fe2d0616a..0ad781db4e66 100644
--- a/arch/arm/mach-omap1/board-sx1.c
+++ b/arch/arm/mach-omap1/board-sx1.c
@@ -399,7 +399,7 @@ static void __init omap_sx1_init(void)
399 sx1_mmc_init(); 399 sx1_mmc_init();
400 400
401 /* turn on USB power */ 401 /* turn on USB power */
402 /* sx1_setusbpower(1); cant do it here because i2c is not ready */ 402 /* sx1_setusbpower(1); can't do it here because i2c is not ready */
403 gpio_request(1, "A_IRDA_OFF"); 403 gpio_request(1, "A_IRDA_OFF");
404 gpio_request(11, "A_SWITCH"); 404 gpio_request(11, "A_SWITCH");
405 gpio_request(15, "A_USB_ON"); 405 gpio_request(15, "A_USB_ON");
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index b0f4c231595f..36f26c3fa25e 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -281,7 +281,7 @@ static inline void omap_init_audio(void) {}
281 * Claiming GPIOs, and setting their direction and initial values, is the 281 * Claiming GPIOs, and setting their direction and initial values, is the
282 * responsibility of the device drivers. So is responding to probe(). 282 * responsibility of the device drivers. So is responding to probe().
283 * 283 *
284 * Board-specific knowlege like creating devices or pin setup is to be 284 * Board-specific knowledge like creating devices or pin setup is to be
285 * kept out of drivers as much as possible. In particular, pin setup 285 * kept out of drivers as much as possible. In particular, pin setup
286 * may be handled by the boot loader, and drivers should expect it will 286 * may be handled by the boot loader, and drivers should expect it will
287 * normally have been done by the time they're probed. 287 * normally have been done by the time they're probed.
diff --git a/arch/arm/mach-omap1/include/mach/ams-delta-fiq.h b/arch/arm/mach-omap1/include/mach/ams-delta-fiq.h
index 7a2df29400ca..23eed0035ed8 100644
--- a/arch/arm/mach-omap1/include/mach/ams-delta-fiq.h
+++ b/arch/arm/mach-omap1/include/mach/ams-delta-fiq.h
@@ -31,7 +31,7 @@
31#endif 31#endif
32 32
33/* 33/*
34 * These are the offsets from the begining of the fiq_buffer. They are put here 34 * These are the offsets from the beginning of the fiq_buffer. They are put here
35 * since the buffer and header need to be accessed by drivers servicing devices 35 * since the buffer and header need to be accessed by drivers servicing devices
36 * which generate GPIO interrupts - e.g. keyboard, modem, hook switch. 36 * which generate GPIO interrupts - e.g. keyboard, modem, hook switch.
37 */ 37 */
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 5f8a2fd06337..34cf982b9679 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -696,7 +696,7 @@ static void __init igep2_init(void)
696 igep2_init_smsc911x(); 696 igep2_init_smsc911x();
697 697
698 /* 698 /*
699 * WLAN-BT combo module from MuRata wich has a Marvell WLAN 699 * WLAN-BT combo module from MuRata which has a Marvell WLAN
700 * (88W8686) + CSR Bluetooth chipset. Uses SDIO interface. 700 * (88W8686) + CSR Bluetooth chipset. Uses SDIO interface.
701 */ 701 */
702 igep2_wlan_bt_init(); 702 igep2_wlan_bt_init();
diff --git a/arch/arm/mach-omap2/board-igep0030.c b/arch/arm/mach-omap2/board-igep0030.c
index b10db0e6ee62..2cf86c3cb1a3 100644
--- a/arch/arm/mach-omap2/board-igep0030.c
+++ b/arch/arm/mach-omap2/board-igep0030.c
@@ -440,7 +440,7 @@ static void __init igep3_init(void)
440 igep3_leds_init(); 440 igep3_leds_init();
441 441
442 /* 442 /*
443 * WLAN-BT combo module from MuRata wich has a Marvell WLAN 443 * WLAN-BT combo module from MuRata which has a Marvell WLAN
444 * (88W8686) + CSR Bluetooth chipset. Uses SDIO interface. 444 * (88W8686) + CSR Bluetooth chipset. Uses SDIO interface.
445 */ 445 */
446 igep3_wifi_bt_init(); 446 igep3_wifi_bt_init();
diff --git a/arch/arm/mach-omap2/clockdomain.c b/arch/arm/mach-omap2/clockdomain.c
index ab878545bd9b..6cb6c03293df 100644
--- a/arch/arm/mach-omap2/clockdomain.c
+++ b/arch/arm/mach-omap2/clockdomain.c
@@ -258,7 +258,7 @@ static void _resolve_clkdm_deps(struct clockdomain *clkdm,
258 * clkdm_init - set up the clockdomain layer 258 * clkdm_init - set up the clockdomain layer
259 * @clkdms: optional pointer to an array of clockdomains to register 259 * @clkdms: optional pointer to an array of clockdomains to register
260 * @init_autodeps: optional pointer to an array of autodeps to register 260 * @init_autodeps: optional pointer to an array of autodeps to register
261 * @custom_funcs: func pointers for arch specfic implementations 261 * @custom_funcs: func pointers for arch specific implementations
262 * 262 *
263 * Set up internal state. If a pointer to an array of clockdomains 263 * Set up internal state. If a pointer to an array of clockdomains
264 * @clkdms was supplied, loop through the list of clockdomains, 264 * @clkdms was supplied, loop through the list of clockdomains,
diff --git a/arch/arm/mach-omap2/clockdomain.h b/arch/arm/mach-omap2/clockdomain.h
index 85b3dce65640..5823584d9cd7 100644
--- a/arch/arm/mach-omap2/clockdomain.h
+++ b/arch/arm/mach-omap2/clockdomain.h
@@ -125,7 +125,7 @@ struct clockdomain {
125}; 125};
126 126
127/** 127/**
128 * struct clkdm_ops - Arch specfic function implementations 128 * struct clkdm_ops - Arch specific function implementations
129 * @clkdm_add_wkdep: Add a wakeup dependency between clk domains 129 * @clkdm_add_wkdep: Add a wakeup dependency between clk domains
130 * @clkdm_del_wkdep: Delete a wakeup dependency between clk domains 130 * @clkdm_del_wkdep: Delete a wakeup dependency between clk domains
131 * @clkdm_read_wkdep: Read wakeup dependency state between clk domains 131 * @clkdm_read_wkdep: Read wakeup dependency state between clk domains
diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c
index a44c52303405..1c240eff3918 100644
--- a/arch/arm/mach-omap2/cpuidle34xx.c
+++ b/arch/arm/mach-omap2/cpuidle34xx.c
@@ -297,8 +297,8 @@ DEFINE_PER_CPU(struct cpuidle_device, omap3_idle_dev);
297 297
298/** 298/**
299 * omap3_cpuidle_update_states() - Update the cpuidle states 299 * omap3_cpuidle_update_states() - Update the cpuidle states
300 * @mpu_deepest_state: Enable states upto and including this for mpu domain 300 * @mpu_deepest_state: Enable states up to and including this for mpu domain
301 * @core_deepest_state: Enable states upto and including this for core domain 301 * @core_deepest_state: Enable states up to and including this for core domain
302 * 302 *
303 * This goes through the list of states available and enables and disables the 303 * This goes through the list of states available and enables and disables the
304 * validity of C states based on deepest state that can be achieved for the 304 * validity of C states based on deepest state that can be achieved for the
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 84d1b735fe80..7b8558564591 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -253,7 +253,7 @@ int __init omap4_keyboard_init(struct omap4_keypad_platform_data
253 ARRAY_SIZE(omap_keyboard_latency), 0); 253 ARRAY_SIZE(omap_keyboard_latency), 0);
254 254
255 if (IS_ERR(od)) { 255 if (IS_ERR(od)) {
256 WARN(1, "Cant build omap_device for %s:%s.\n", 256 WARN(1, "Can't build omap_device for %s:%s.\n",
257 name, oh->name); 257 name, oh->name);
258 return PTR_ERR(od); 258 return PTR_ERR(od);
259 } 259 }
@@ -373,7 +373,7 @@ static int omap_mcspi_init(struct omap_hwmod *oh, void *unused)
373 od = omap_device_build(name, spi_num, oh, pdata, 373 od = omap_device_build(name, spi_num, oh, pdata,
374 sizeof(*pdata), omap_mcspi_latency, 374 sizeof(*pdata), omap_mcspi_latency,
375 ARRAY_SIZE(omap_mcspi_latency), 0); 375 ARRAY_SIZE(omap_mcspi_latency), 0);
376 WARN(IS_ERR(od), "Cant build omap_device for %s:%s\n", 376 WARN(IS_ERR(od), "Can't build omap_device for %s:%s\n",
377 name, oh->name); 377 name, oh->name);
378 kfree(pdata); 378 kfree(pdata);
379 return 0; 379 return 0;
@@ -725,7 +725,7 @@ static int __init omap_init_wdt(void)
725 od = omap_device_build(dev_name, id, oh, NULL, 0, 725 od = omap_device_build(dev_name, id, oh, NULL, 0,
726 omap_wdt_latency, 726 omap_wdt_latency,
727 ARRAY_SIZE(omap_wdt_latency), 0); 727 ARRAY_SIZE(omap_wdt_latency), 0);
728 WARN(IS_ERR(od), "Cant build omap_device for %s:%s.\n", 728 WARN(IS_ERR(od), "Can't build omap_device for %s:%s.\n",
729 dev_name, oh->name); 729 dev_name, oh->name);
730 return 0; 730 return 0;
731} 731}
diff --git a/arch/arm/mach-omap2/dma.c b/arch/arm/mach-omap2/dma.c
index 34922b2d2e3f..c9ff0e79703d 100644
--- a/arch/arm/mach-omap2/dma.c
+++ b/arch/arm/mach-omap2/dma.c
@@ -262,7 +262,7 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused)
262 omap2_dma_latency, ARRAY_SIZE(omap2_dma_latency), 0); 262 omap2_dma_latency, ARRAY_SIZE(omap2_dma_latency), 0);
263 kfree(p); 263 kfree(p);
264 if (IS_ERR(od)) { 264 if (IS_ERR(od)) {
265 pr_err("%s: Cant build omap_device for %s:%s.\n", 265 pr_err("%s: Can't build omap_device for %s:%s.\n",
266 __func__, name, oh->name); 266 __func__, name, oh->name);
267 return PTR_ERR(od); 267 return PTR_ERR(od);
268 } 268 }
diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c
index 413de18c1d2b..9529842ae054 100644
--- a/arch/arm/mach-omap2/gpio.c
+++ b/arch/arm/mach-omap2/gpio.c
@@ -82,7 +82,7 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
82 kfree(pdata); 82 kfree(pdata);
83 83
84 if (IS_ERR(od)) { 84 if (IS_ERR(od)) {
85 WARN(1, "Cant build omap_device for %s:%s.\n", 85 WARN(1, "Can't build omap_device for %s:%s.\n",
86 name, oh->name); 86 name, oh->name);
87 return PTR_ERR(od); 87 return PTR_ERR(od);
88 } 88 }
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
index 137e1a5f3d85..b2f30bed5a20 100644
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -465,7 +465,7 @@ void __init omap_init_hsmmc(struct omap2_hsmmc_info *hsmmcinfo, int ctrl_nr)
465 od = omap_device_build(name, ctrl_nr - 1, oh, mmc_data, 465 od = omap_device_build(name, ctrl_nr - 1, oh, mmc_data,
466 sizeof(struct omap_mmc_platform_data), ohl, ohl_cnt, false); 466 sizeof(struct omap_mmc_platform_data), ohl, ohl_cnt, false);
467 if (IS_ERR(od)) { 467 if (IS_ERR(od)) {
468 WARN(1, "Cant build omap_device for %s:%s.\n", name, oh->name); 468 WARN(1, "Can't build omap_device for %s:%s.\n", name, oh->name);
469 kfree(mmc_data->slots[0].name); 469 kfree(mmc_data->slots[0].name);
470 goto done; 470 goto done;
471 } 471 }
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index 565b9064a328..4a6ef6ab8458 100644
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@@ -149,7 +149,7 @@ static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused)
149 ARRAY_SIZE(omap2_mcbsp_latency), false); 149 ARRAY_SIZE(omap2_mcbsp_latency), false);
150 kfree(pdata); 150 kfree(pdata);
151 if (IS_ERR(od)) { 151 if (IS_ERR(od)) {
152 pr_err("%s: Cant build omap_device for %s:%s.\n", __func__, 152 pr_err("%s: Can't build omap_device for %s:%s.\n", __func__,
153 name, oh->name); 153 name, oh->name);
154 return PTR_ERR(od); 154 return PTR_ERR(od);
155 } 155 }
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index bb043cbb3886..a4ab1e364313 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -518,7 +518,7 @@ static int omap_mux_dbg_board_show(struct seq_file *s, void *unused)
518 seq_printf(s, "/* %s */\n", m->muxnames[mode]); 518 seq_printf(s, "/* %s */\n", m->muxnames[mode]);
519 519
520 /* 520 /*
521 * XXX: Might be revisited to support differences accross 521 * XXX: Might be revisited to support differences across
522 * same OMAP generation. 522 * same OMAP generation.
523 */ 523 */
524 seq_printf(s, "OMAP%d_MUX(%s, ", omap_gen, m0_def); 524 seq_printf(s, "OMAP%d_MUX(%s, ", omap_gen, m0_def);
diff --git a/arch/arm/mach-omap2/mux2430.h b/arch/arm/mach-omap2/mux2430.h
index adbea0d03e08..9fd93149ebd9 100644
--- a/arch/arm/mach-omap2/mux2430.h
+++ b/arch/arm/mach-omap2/mux2430.h
@@ -22,7 +22,7 @@
22 * absolute addresses. The name in the macro is the mode-0 name of 22 * absolute addresses. The name in the macro is the mode-0 name of
23 * the pin. NOTE: These registers are 8-bits wide. 23 * the pin. NOTE: These registers are 8-bits wide.
24 * 24 *
25 * Note that these defines use SDMMC instead of MMC for compability 25 * Note that these defines use SDMMC instead of MMC for compatibility
26 * with signal names used in 3630. 26 * with signal names used in 3630.
27 */ 27 */
28#define OMAP2430_CONTROL_PADCONF_GPMC_CLK_OFFSET 0x000 28#define OMAP2430_CONTROL_PADCONF_GPMC_CLK_OFFSET 0x000
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
index a860fb5024c2..e6e3810db77f 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
@@ -1559,7 +1559,7 @@ static struct omap_hwmod omap2430_i2c1_hwmod = {
1559 * I2CHS IP's do not follow the usual pattern. 1559 * I2CHS IP's do not follow the usual pattern.
1560 * prcm_reg_id alone cannot be used to program 1560 * prcm_reg_id alone cannot be used to program
1561 * the iclk and fclk. Needs to be handled using 1561 * the iclk and fclk. Needs to be handled using
1562 * additonal flags when clk handling is moved 1562 * additional flags when clk handling is moved
1563 * to hwmod framework. 1563 * to hwmod framework.
1564 */ 1564 */
1565 .module_offs = CORE_MOD, 1565 .module_offs = CORE_MOD,
diff --git a/arch/arm/mach-omap2/omap_phy_internal.c b/arch/arm/mach-omap2/omap_phy_internal.c
index e2e605fe9138..05f6abc96b0d 100644
--- a/arch/arm/mach-omap2/omap_phy_internal.c
+++ b/arch/arm/mach-omap2/omap_phy_internal.c
@@ -112,12 +112,12 @@ int omap4430_phy_power(struct device *dev, int ID, int on)
112 else 112 else
113 /* 113 /*
114 * Enable VBUS Valid, AValid and IDDIG 114 * Enable VBUS Valid, AValid and IDDIG
115 * high impedence 115 * high impedance
116 */ 116 */
117 __raw_writel(IDDIG | AVALID | VBUSVALID, 117 __raw_writel(IDDIG | AVALID | VBUSVALID,
118 ctrl_base + USBOTGHS_CONTROL); 118 ctrl_base + USBOTGHS_CONTROL);
119 } else { 119 } else {
120 /* Enable session END and IDIG to high impedence. */ 120 /* Enable session END and IDIG to high impedance. */
121 __raw_writel(SESSEND | IDDIG, ctrl_base + 121 __raw_writel(SESSEND | IDDIG, ctrl_base +
122 USBOTGHS_CONTROL); 122 USBOTGHS_CONTROL);
123 } 123 }
diff --git a/arch/arm/mach-omap2/omap_twl.c b/arch/arm/mach-omap2/omap_twl.c
index 0a8e74e3e811..07d6140baa9d 100644
--- a/arch/arm/mach-omap2/omap_twl.c
+++ b/arch/arm/mach-omap2/omap_twl.c
@@ -308,7 +308,7 @@ int __init omap3_twl_init(void)
308 * Strategy Software Scaling Mode (ENABLE_VMODE=0), for setting the voltages, 308 * Strategy Software Scaling Mode (ENABLE_VMODE=0), for setting the voltages,
309 * in those scenarios this bit is to be cleared (enable = false). 309 * in those scenarios this bit is to be cleared (enable = false).
310 * 310 *
311 * Returns 0 on sucess, error is returned if I2C read/write fails. 311 * Returns 0 on success, error is returned if I2C read/write fails.
312 */ 312 */
313int __init omap3_twl_set_sr_bit(bool enable) 313int __init omap3_twl_set_sr_bit(bool enable)
314{ 314{
diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c
index 49c6513e90d8..9af08473bf10 100644
--- a/arch/arm/mach-omap2/powerdomain.c
+++ b/arch/arm/mach-omap2/powerdomain.c
@@ -196,7 +196,7 @@ static int _pwrdm_post_transition_cb(struct powerdomain *pwrdm, void *unused)
196/** 196/**
197 * pwrdm_init - set up the powerdomain layer 197 * pwrdm_init - set up the powerdomain layer
198 * @pwrdm_list: array of struct powerdomain pointers to register 198 * @pwrdm_list: array of struct powerdomain pointers to register
199 * @custom_funcs: func pointers for arch specfic implementations 199 * @custom_funcs: func pointers for arch specific implementations
200 * 200 *
201 * Loop through the array of powerdomains @pwrdm_list, registering all 201 * Loop through the array of powerdomains @pwrdm_list, registering all
202 * that are available on the current CPU. If pwrdm_list is supplied 202 * that are available on the current CPU. If pwrdm_list is supplied
diff --git a/arch/arm/mach-omap2/powerdomain.h b/arch/arm/mach-omap2/powerdomain.h
index 027f40bd235d..d23d979b9c34 100644
--- a/arch/arm/mach-omap2/powerdomain.h
+++ b/arch/arm/mach-omap2/powerdomain.h
@@ -121,7 +121,7 @@ struct powerdomain {
121}; 121};
122 122
123/** 123/**
124 * struct pwrdm_ops - Arch specfic function implementations 124 * struct pwrdm_ops - Arch specific function implementations
125 * @pwrdm_set_next_pwrst: Set the target power state for a pd 125 * @pwrdm_set_next_pwrst: Set the target power state for a pd
126 * @pwrdm_read_next_pwrst: Read the target power state set for a pd 126 * @pwrdm_read_next_pwrst: Read the target power state set for a pd
127 * @pwrdm_read_pwrst: Read the current power state of a pd 127 * @pwrdm_read_pwrst: Read the current power state of a pd
diff --git a/arch/arm/mach-omap2/powerdomains3xxx_data.c b/arch/arm/mach-omap2/powerdomains3xxx_data.c
index 9c9c113788b9..469a920a74dc 100644
--- a/arch/arm/mach-omap2/powerdomains3xxx_data.c
+++ b/arch/arm/mach-omap2/powerdomains3xxx_data.c
@@ -72,7 +72,7 @@ static struct powerdomain mpu_3xxx_pwrdm = {
72 72
73/* 73/*
74 * The USBTLL Save-and-Restore mechanism is broken on 74 * The USBTLL Save-and-Restore mechanism is broken on
75 * 3430s upto ES3.0 and 3630ES1.0. Hence this feature 75 * 3430s up to ES3.0 and 3630ES1.0. Hence this feature
76 * needs to be disabled on these chips. 76 * needs to be disabled on these chips.
77 * Refer: 3430 errata ID i459 and 3630 errata ID i579 77 * Refer: 3430 errata ID i459 and 3630 errata ID i579
78 * 78 *
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
index 8f674c9442bf..13e24f913dd4 100644
--- a/arch/arm/mach-omap2/smartreflex.c
+++ b/arch/arm/mach-omap2/smartreflex.c
@@ -247,7 +247,7 @@ static void sr_stop_vddautocomp(struct omap_sr *sr)
247 * driver register and sr device intializtion API's. Only one call 247 * driver register and sr device intializtion API's. Only one call
248 * will ultimately succeed. 248 * will ultimately succeed.
249 * 249 *
250 * Currenly this function registers interrrupt handler for a particular SR 250 * Currently this function registers interrrupt handler for a particular SR
251 * if smartreflex class driver is already registered and has 251 * if smartreflex class driver is already registered and has
252 * requested for interrupts and the SR interrupt line in present. 252 * requested for interrupts and the SR interrupt line in present.
253 */ 253 */
diff --git a/arch/arm/mach-omap2/voltage.c b/arch/arm/mach-omap2/voltage.c
index c6facf7becf8..6fb520999b6e 100644
--- a/arch/arm/mach-omap2/voltage.c
+++ b/arch/arm/mach-omap2/voltage.c
@@ -851,7 +851,7 @@ int omap_voltage_scale_vdd(struct voltagedomain *voltdm,
851 * @voltdm: pointer to the VDD whose voltage is to be reset. 851 * @voltdm: pointer to the VDD whose voltage is to be reset.
852 * 852 *
853 * This API finds out the correct voltage the voltage domain is supposed 853 * This API finds out the correct voltage the voltage domain is supposed
854 * to be at and resets the voltage to that level. Should be used expecially 854 * to be at and resets the voltage to that level. Should be used especially
855 * while disabling any voltage compensation modules. 855 * while disabling any voltage compensation modules.
856 */ 856 */
857void omap_voltage_reset(struct voltagedomain *voltdm) 857void omap_voltage_reset(struct voltagedomain *voltdm)
@@ -912,7 +912,7 @@ void omap_voltage_get_volttable(struct voltagedomain *voltdm,
912 * This API searches only through the non-compensated voltages int the 912 * This API searches only through the non-compensated voltages int the
913 * voltage table. 913 * voltage table.
914 * Returns pointer to the voltage table entry corresponding to volt on 914 * Returns pointer to the voltage table entry corresponding to volt on
915 * sucess. Returns -ENODATA if no voltage table exisits for the passed voltage 915 * success. Returns -ENODATA if no voltage table exisits for the passed voltage
916 * domain or if there is no matching entry. 916 * domain or if there is no matching entry.
917 */ 917 */
918struct omap_volt_data *omap_voltage_get_voltdata(struct voltagedomain *voltdm, 918struct omap_volt_data *omap_voltage_get_voltdata(struct voltagedomain *voltdm,
diff --git a/arch/arm/mach-orion5x/addr-map.c b/arch/arm/mach-orion5x/addr-map.c
index 1a5d6a0e2602..5ceafdccc456 100644
--- a/arch/arm/mach-orion5x/addr-map.c
+++ b/arch/arm/mach-orion5x/addr-map.c
@@ -19,7 +19,7 @@
19#include "common.h" 19#include "common.h"
20 20
21/* 21/*
22 * The Orion has fully programable address map. There's a separate address 22 * The Orion has fully programmable address map. There's a separate address
23 * map for each of the device _master_ interfaces, e.g. CPU, PCI, PCIe, USB, 23 * map for each of the device _master_ interfaces, e.g. CPU, PCI, PCIe, USB,
24 * Gigabit Ethernet, DMA/XOR engines, etc. Each interface has its own 24 * Gigabit Ethernet, DMA/XOR engines, etc. Each interface has its own
25 * address decode windows that allow it to access any of the Orion resources. 25 * address decode windows that allow it to access any of the Orion resources.
diff --git a/arch/arm/mach-orion5x/net2big-setup.c b/arch/arm/mach-orion5x/net2big-setup.c
index 429ecafe9fdd..a5930f83958b 100644
--- a/arch/arm/mach-orion5x/net2big-setup.c
+++ b/arch/arm/mach-orion5x/net2big-setup.c
@@ -190,7 +190,7 @@ err_free_1:
190 * The power front LEDs (blue and red) and SATA red LEDs are controlled via a 190 * The power front LEDs (blue and red) and SATA red LEDs are controlled via a
191 * single GPIO line and are compatible with the leds-gpio driver. 191 * single GPIO line and are compatible with the leds-gpio driver.
192 * 192 *
193 * The SATA blue LEDs have some hardware blink capabilities which are detailled 193 * The SATA blue LEDs have some hardware blink capabilities which are detailed
194 * in the following array: 194 * in the following array:
195 * 195 *
196 * SATAx blue LED | SATAx activity | LED state 196 * SATAx blue LED | SATAx activity | LED state
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
index f0f43e13ac87..e6d64494d3de 100644
--- a/arch/arm/mach-orion5x/ts209-setup.c
+++ b/arch/arm/mach-orion5x/ts209-setup.c
@@ -36,7 +36,7 @@
36 36
37/**************************************************************************** 37/****************************************************************************
38 * 8MiB NOR flash. The struct mtd_partition is not in the same order as the 38 * 8MiB NOR flash. The struct mtd_partition is not in the same order as the
39 * partitions on the device because we want to keep compatability with 39 * partitions on the device because we want to keep compatibility with
40 * existing QNAP firmware. 40 * existing QNAP firmware.
41 * 41 *
42 * Layout as used by QNAP: 42 * Layout as used by QNAP:
diff --git a/arch/arm/mach-orion5x/ts409-setup.c b/arch/arm/mach-orion5x/ts409-setup.c
index 92f393f08fa4..9eac8192d923 100644
--- a/arch/arm/mach-orion5x/ts409-setup.c
+++ b/arch/arm/mach-orion5x/ts409-setup.c
@@ -56,7 +56,7 @@
56 56
57/**************************************************************************** 57/****************************************************************************
58 * 8MiB NOR flash. The struct mtd_partition is not in the same order as the 58 * 8MiB NOR flash. The struct mtd_partition is not in the same order as the
59 * partitions on the device because we want to keep compatability with 59 * partitions on the device because we want to keep compatibility with
60 * existing QNAP firmware. 60 * existing QNAP firmware.
61 * 61 *
62 * Layout as used by QNAP: 62 * Layout as used by QNAP:
diff --git a/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h b/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h
index e4fb4668c26e..207ecb49a61b 100644
--- a/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h
+++ b/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h
@@ -38,7 +38,7 @@
38#define PCMD(x) __REG(0x40F50110 + ((x) << 2)) 38#define PCMD(x) __REG(0x40F50110 + ((x) << 2))
39 39
40/* 40/*
41 * Slave Power Managment Unit 41 * Slave Power Management Unit
42 */ 42 */
43#define ASCR __REG(0x40f40000) /* Application Subsystem Power Status/Configuration */ 43#define ASCR __REG(0x40f40000) /* Application Subsystem Power Status/Configuration */
44#define ARSR __REG(0x40f40004) /* Application Subsystem Reset Status */ 44#define ARSR __REG(0x40f40004) /* Application Subsystem Reset Status */
diff --git a/arch/arm/mach-pxa/include/mach/zeus.h b/arch/arm/mach-pxa/include/mach/zeus.h
index faa408ab7ad7..0641f31a56b7 100644
--- a/arch/arm/mach-pxa/include/mach/zeus.h
+++ b/arch/arm/mach-pxa/include/mach/zeus.h
@@ -64,7 +64,7 @@
64 64
65/* 65/*
66 * CPLD registers: 66 * CPLD registers:
67 * Only 4 registers, but spreaded over a 32MB address space. 67 * Only 4 registers, but spread over a 32MB address space.
68 * Be gentle, and remap that over 32kB... 68 * Be gentle, and remap that over 32kB...
69 */ 69 */
70 70
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c
index dd13bb63259b..23925db8ff74 100644
--- a/arch/arm/mach-pxa/mioa701.c
+++ b/arch/arm/mach-pxa/mioa701.c
@@ -458,7 +458,7 @@ static struct platform_device strataflash = {
458/* 458/*
459 * Suspend/Resume bootstrap management 459 * Suspend/Resume bootstrap management
460 * 460 *
461 * MIO A701 reboot sequence is highly ROM dependant. From the one dissassembled, 461 * MIO A701 reboot sequence is highly ROM dependent. From the one dissassembled,
462 * this sequence is as follows : 462 * this sequence is as follows :
463 * - disables interrupts 463 * - disables interrupts
464 * - initialize SDRAM (self refresh RAM into active RAM) 464 * - initialize SDRAM (self refresh RAM into active RAM)
diff --git a/arch/arm/mach-s3c2410/include/mach/dma.h b/arch/arm/mach-s3c2410/include/mach/dma.h
index cf68136cc668..b2b2a5bb275e 100644
--- a/arch/arm/mach-s3c2410/include/mach/dma.h
+++ b/arch/arm/mach-s3c2410/include/mach/dma.h
@@ -19,7 +19,7 @@
19#define MAX_DMA_TRANSFER_SIZE 0x100000 /* Data Unit is half word */ 19#define MAX_DMA_TRANSFER_SIZE 0x100000 /* Data Unit is half word */
20 20
21/* We use `virtual` dma channels to hide the fact we have only a limited 21/* We use `virtual` dma channels to hide the fact we have only a limited
22 * number of DMA channels, and not of all of them (dependant on the device) 22 * number of DMA channels, and not of all of them (dependent on the device)
23 * can be attached to any DMA source. We therefore let the DMA core handle 23 * can be attached to any DMA source. We therefore let the DMA core handle
24 * the allocation of hardware channels to clients. 24 * the allocation of hardware channels to clients.
25*/ 25*/
diff --git a/arch/arm/mach-s3c2410/include/mach/regs-mem.h b/arch/arm/mach-s3c2410/include/mach/regs-mem.h
index 7f7c52947963..988a6863e54b 100644
--- a/arch/arm/mach-s3c2410/include/mach/regs-mem.h
+++ b/arch/arm/mach-s3c2410/include/mach/regs-mem.h
@@ -101,7 +101,7 @@
101#define S3C2410_BANKCON_PMC16 (0x03) 101#define S3C2410_BANKCON_PMC16 (0x03)
102 102
103/* bank configurations for banks 0..7, note banks 103/* bank configurations for banks 0..7, note banks
104 * 6 and 7 have differnt configurations depending on 104 * 6 and 7 have different configurations depending on
105 * the memory type bits */ 105 * the memory type bits */
106 106
107#define S3C2410_BANKCON_Tacp2 (0x0 << 2) 107#define S3C2410_BANKCON_Tacp2 (0x0 << 2)
diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c
index 66f44440d5d3..079dcaa602d3 100644
--- a/arch/arm/mach-s3c2410/mach-n30.c
+++ b/arch/arm/mach-s3c2410/mach-n30.c
@@ -252,7 +252,7 @@ static struct s3c24xx_led_platdata n30_blue_led_pdata = {
252 .def_trigger = "", 252 .def_trigger = "",
253}; 253};
254 254
255/* This is the blue LED on the device. Originaly used to indicate GPS activity 255/* This is the blue LED on the device. Originally used to indicate GPS activity
256 * by flashing. */ 256 * by flashing. */
257static struct s3c24xx_led_platdata n35_blue_led_pdata = { 257static struct s3c24xx_led_platdata n35_blue_led_pdata = {
258 .name = "blue_led", 258 .name = "blue_led",
diff --git a/arch/arm/mach-s3c2440/mach-mini2440.c b/arch/arm/mach-s3c2440/mach-mini2440.c
index dfedc9c9e005..dd3120df09fe 100644
--- a/arch/arm/mach-s3c2440/mach-mini2440.c
+++ b/arch/arm/mach-s3c2440/mach-mini2440.c
@@ -155,7 +155,7 @@ static struct s3c2410fb_display mini2440_lcd_cfg[] __initdata = {
155 * the same timings, however, anything smaller than 1024x768 155 * the same timings, however, anything smaller than 1024x768
156 * will only be displayed in the top left corner of a 1024x768 156 * will only be displayed in the top left corner of a 1024x768
157 * XGA output unless you add optional dip switches to the shield. 157 * XGA output unless you add optional dip switches to the shield.
158 * Therefore timings for other resolutions have been ommited here. 158 * Therefore timings for other resolutions have been omitted here.
159 */ 159 */
160 [2] = { 160 [2] = {
161 _LCD_DECLARE( 161 _LCD_DECLARE(
diff --git a/arch/arm/mach-s3c64xx/dma.c b/arch/arm/mach-s3c64xx/dma.c
index c35585cf8c4f..b197171e7d03 100644
--- a/arch/arm/mach-s3c64xx/dma.c
+++ b/arch/arm/mach-s3c64xx/dma.c
@@ -315,7 +315,7 @@ int s3c2410_dma_ctrl(unsigned int channel, enum s3c2410_chan_op op)
315 case S3C2410_DMAOP_FLUSH: 315 case S3C2410_DMAOP_FLUSH:
316 return s3c64xx_dma_flush(chan); 316 return s3c64xx_dma_flush(chan);
317 317
318 /* belive PAUSE/RESUME are no-ops */ 318 /* believe PAUSE/RESUME are no-ops */
319 case S3C2410_DMAOP_PAUSE: 319 case S3C2410_DMAOP_PAUSE:
320 case S3C2410_DMAOP_RESUME: 320 case S3C2410_DMAOP_RESUME:
321 case S3C2410_DMAOP_STARTED: 321 case S3C2410_DMAOP_STARTED:
diff --git a/arch/arm/mach-s5pc100/include/mach/regs-fb.h b/arch/arm/mach-s5pc100/include/mach/regs-fb.h
index 4be4cc9abf75..07aa4d6054fe 100644
--- a/arch/arm/mach-s5pc100/include/mach/regs-fb.h
+++ b/arch/arm/mach-s5pc100/include/mach/regs-fb.h
@@ -29,7 +29,7 @@
29#define WPALCON_H (0x19c) 29#define WPALCON_H (0x19c)
30#define WPALCON_L (0x1a0) 30#define WPALCON_L (0x1a0)
31 31
32/* Pallete contro for WPAL0 and WPAL1 is the same as in S3C64xx, but 32/* Palette control for WPAL0 and WPAL1 is the same as in S3C64xx, but
33 * different for WPAL2-4 33 * different for WPAL2-4
34 */ 34 */
35/* In WPALCON_L (aka WPALCON) */ 35/* In WPALCON_L (aka WPALCON) */
diff --git a/arch/arm/mach-s5pc100/setup-sdhci.c b/arch/arm/mach-s5pc100/setup-sdhci.c
index f16946e456e9..be25879bb2ee 100644
--- a/arch/arm/mach-s5pc100/setup-sdhci.c
+++ b/arch/arm/mach-s5pc100/setup-sdhci.c
@@ -40,7 +40,7 @@ void s5pc100_setup_sdhci0_cfg_card(struct platform_device *dev,
40{ 40{
41 u32 ctrl2, ctrl3; 41 u32 ctrl2, ctrl3;
42 42
43 /* don't need to alter anything acording to card-type */ 43 /* don't need to alter anything according to card-type */
44 44
45 writel(S3C64XX_SDHCI_CONTROL4_DRIVE_9mA, r + S3C64XX_SDHCI_CONTROL4); 45 writel(S3C64XX_SDHCI_CONTROL4_DRIVE_9mA, r + S3C64XX_SDHCI_CONTROL4);
46 46
diff --git a/arch/arm/mach-s5pv210/include/mach/gpio.h b/arch/arm/mach-s5pv210/include/mach/gpio.h
index 1f4b595534c2..a5a1e331f8ed 100644
--- a/arch/arm/mach-s5pv210/include/mach/gpio.h
+++ b/arch/arm/mach-s5pv210/include/mach/gpio.h
@@ -18,7 +18,7 @@
18#define gpio_cansleep __gpio_cansleep 18#define gpio_cansleep __gpio_cansleep
19#define gpio_to_irq __gpio_to_irq 19#define gpio_to_irq __gpio_to_irq
20 20
21/* Practically, GPIO banks upto MP03 are the configurable gpio banks */ 21/* Practically, GPIO banks up to MP03 are the configurable gpio banks */
22 22
23/* GPIO bank sizes */ 23/* GPIO bank sizes */
24#define S5PV210_GPIO_A0_NR (8) 24#define S5PV210_GPIO_A0_NR (8)
diff --git a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
index 746777d56df9..3e3ac05bb7b1 100644
--- a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
+++ b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
@@ -32,10 +32,10 @@ void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
32 32
33 switch (width) { 33 switch (width) {
34 case 8: 34 case 8:
35 /* GPG1[3:6] special-funtion 3 */ 35 /* GPG1[3:6] special-function 3 */
36 s3c_gpio_cfgrange_nopull(S5PV210_GPG1(3), 4, S3C_GPIO_SFN(3)); 36 s3c_gpio_cfgrange_nopull(S5PV210_GPG1(3), 4, S3C_GPIO_SFN(3));
37 case 4: 37 case 4:
38 /* GPG0[3:6] special-funtion 2 */ 38 /* GPG0[3:6] special-function 2 */
39 s3c_gpio_cfgrange_nopull(S5PV210_GPG0(3), 4, S3C_GPIO_SFN(2)); 39 s3c_gpio_cfgrange_nopull(S5PV210_GPG0(3), 4, S3C_GPIO_SFN(2));
40 default: 40 default:
41 break; 41 break;
diff --git a/arch/arm/mach-s5pv210/setup-sdhci.c b/arch/arm/mach-s5pv210/setup-sdhci.c
index c32e202731c1..a83b6c909f6b 100644
--- a/arch/arm/mach-s5pv210/setup-sdhci.c
+++ b/arch/arm/mach-s5pv210/setup-sdhci.c
@@ -38,7 +38,7 @@ void s5pv210_setup_sdhci_cfg_card(struct platform_device *dev,
38{ 38{
39 u32 ctrl2, ctrl3; 39 u32 ctrl2, ctrl3;
40 40
41 /* don't need to alter anything acording to card-type */ 41 /* don't need to alter anything according to card-type */
42 42
43 writel(S3C64XX_SDHCI_CONTROL4_DRIVE_9mA, r + S3C64XX_SDHCI_CONTROL4); 43 writel(S3C64XX_SDHCI_CONTROL4_DRIVE_9mA, r + S3C64XX_SDHCI_CONTROL4);
44 44
diff --git a/arch/arm/mach-sa1100/Makefile b/arch/arm/mach-sa1100/Makefile
index e697691eed28..41252d22e659 100644
--- a/arch/arm/mach-sa1100/Makefile
+++ b/arch/arm/mach-sa1100/Makefile
@@ -50,7 +50,7 @@ led-$(CONFIG_SA1100_SIMPAD) += leds-simpad.o
50# LEDs support 50# LEDs support
51obj-$(CONFIG_LEDS) += $(led-y) 51obj-$(CONFIG_LEDS) += $(led-y)
52 52
53# Miscelaneous functions 53# Miscellaneous functions
54obj-$(CONFIG_PM) += pm.o sleep.o 54obj-$(CONFIG_PM) += pm.o sleep.o
55obj-$(CONFIG_SA1100_SSP) += ssp.o 55obj-$(CONFIG_SA1100_SSP) += ssp.o
56 56
diff --git a/arch/arm/mach-sa1100/cpu-sa1100.c b/arch/arm/mach-sa1100/cpu-sa1100.c
index 07d4e8ba3719..aaa8acf76b7b 100644
--- a/arch/arm/mach-sa1100/cpu-sa1100.c
+++ b/arch/arm/mach-sa1100/cpu-sa1100.c
@@ -68,7 +68,7 @@
68 * clock change in ROM and jump to that code from the kernel. The main 68 * clock change in ROM and jump to that code from the kernel. The main
69 * disadvantage is that the ROM has to be modified, which is not 69 * disadvantage is that the ROM has to be modified, which is not
70 * possible on all SA-1100 platforms. Another disadvantage is that 70 * possible on all SA-1100 platforms. Another disadvantage is that
71 * jumping to ROM makes clock switching unecessary complicated. 71 * jumping to ROM makes clock switching unnecessary complicated.
72 * 72 *
73 * The idea behind this driver is that the memory configuration can be 73 * The idea behind this driver is that the memory configuration can be
74 * changed while running from DRAM (even with interrupts turned on!) 74 * changed while running from DRAM (even with interrupts turned on!)
diff --git a/arch/arm/mach-sa1100/include/mach/SA-1100.h b/arch/arm/mach-sa1100/include/mach/SA-1100.h
index 4f7ea012e1e5..bae8296f5dbf 100644
--- a/arch/arm/mach-sa1100/include/mach/SA-1100.h
+++ b/arch/arm/mach-sa1100/include/mach/SA-1100.h
@@ -1794,7 +1794,7 @@
1794 (DDAR_DevRd + DDAR_Brst4 + DDAR_16BitDev + \ 1794 (DDAR_DevRd + DDAR_Brst4 + DDAR_16BitDev + \
1795 DDAR_Ser4SSPRc + DDAR_DevAdd (__PREG(Ser4SSDR))) 1795 DDAR_Ser4SSPRc + DDAR_DevAdd (__PREG(Ser4SSDR)))
1796 1796
1797#define DCSR_RUN 0x00000001 /* DMA RUNing */ 1797#define DCSR_RUN 0x00000001 /* DMA running */
1798#define DCSR_IE 0x00000002 /* DMA Interrupt Enable */ 1798#define DCSR_IE 0x00000002 /* DMA Interrupt Enable */
1799#define DCSR_ERROR 0x00000004 /* DMA ERROR */ 1799#define DCSR_ERROR 0x00000004 /* DMA ERROR */
1800#define DCSR_DONEA 0x00000008 /* DONE DMA transfer buffer A */ 1800#define DCSR_DONEA 0x00000008 /* DONE DMA transfer buffer A */
diff --git a/arch/arm/mach-sa1100/jornada720_ssp.c b/arch/arm/mach-sa1100/jornada720_ssp.c
index 9d490c66891c..f50b00bd18a0 100644
--- a/arch/arm/mach-sa1100/jornada720_ssp.c
+++ b/arch/arm/mach-sa1100/jornada720_ssp.c
@@ -29,7 +29,7 @@ static unsigned long jornada_ssp_flags;
29/** 29/**
30 * jornada_ssp_reverse - reverses input byte 30 * jornada_ssp_reverse - reverses input byte
31 * 31 *
32 * we need to reverse all data we recieve from the mcu due to its physical location 32 * we need to reverse all data we receive from the mcu due to its physical location
33 * returns : 01110111 -> 11101110 33 * returns : 01110111 -> 11101110
34 */ 34 */
35u8 inline jornada_ssp_reverse(u8 byte) 35u8 inline jornada_ssp_reverse(u8 byte)
@@ -179,7 +179,7 @@ static int __devinit jornada_ssp_probe(struct platform_device *dev)
179 179
180static int jornada_ssp_remove(struct platform_device *dev) 180static int jornada_ssp_remove(struct platform_device *dev)
181{ 181{
182 /* Note that this doesnt actually remove the driver, since theres nothing to remove 182 /* Note that this doesn't actually remove the driver, since theres nothing to remove
183 * It just makes sure everything is turned off */ 183 * It just makes sure everything is turned off */
184 GPSR = GPIO_GPIO25; 184 GPSR = GPIO_GPIO25;
185 ssp_exit(); 185 ssp_exit();
diff --git a/arch/arm/mach-tegra/dma.c b/arch/arm/mach-tegra/dma.c
index e945ae28ee77..f4ef5eb317bd 100644
--- a/arch/arm/mach-tegra/dma.c
+++ b/arch/arm/mach-tegra/dma.c
@@ -223,7 +223,7 @@ int tegra_dma_dequeue_req(struct tegra_dma_channel *ch,
223 * - Change the source selector to invalid to stop the DMA from 223 * - Change the source selector to invalid to stop the DMA from
224 * FIFO to memory. 224 * FIFO to memory.
225 * - Read the status register to know the number of pending 225 * - Read the status register to know the number of pending
226 * bytes to be transfered. 226 * bytes to be transferred.
227 * - Finally stop or program the DMA to the next buffer in the 227 * - Finally stop or program the DMA to the next buffer in the
228 * list. 228 * list.
229 */ 229 */
@@ -244,7 +244,7 @@ int tegra_dma_dequeue_req(struct tegra_dma_channel *ch,
244 if (status & STA_BUSY) 244 if (status & STA_BUSY)
245 req->bytes_transferred -= to_transfer; 245 req->bytes_transferred -= to_transfer;
246 246
247 /* In continous transfer mode, DMA only tracks the count of the 247 /* In continuous transfer mode, DMA only tracks the count of the
248 * half DMA buffer. So, if the DMA already finished half the DMA 248 * half DMA buffer. So, if the DMA already finished half the DMA
249 * then add the half buffer to the completed count. 249 * then add the half buffer to the completed count.
250 * 250 *
diff --git a/arch/arm/mach-tegra/include/mach/dma.h b/arch/arm/mach-tegra/include/mach/dma.h
index 39011bd9a925..d0132e8031a1 100644
--- a/arch/arm/mach-tegra/include/mach/dma.h
+++ b/arch/arm/mach-tegra/include/mach/dma.h
@@ -92,11 +92,11 @@ struct tegra_dma_req {
92 /* This is a called from the DMA ISR context when the DMA is still in 92 /* This is a called from the DMA ISR context when the DMA is still in
93 * progress and is actively filling same buffer. 93 * progress and is actively filling same buffer.
94 * 94 *
95 * In case of continous mode receive, this threshold is 1/2 the buffer 95 * In case of continuous mode receive, this threshold is 1/2 the buffer
96 * size. In other cases, this will not even be called as there is no 96 * size. In other cases, this will not even be called as there is no
97 * hardware support for it. 97 * hardware support for it.
98 * 98 *
99 * In the case of continous mode receive, if there is next req already 99 * In the case of continuous mode receive, if there is next req already
100 * queued, DMA programs the HW to use that req when this req is 100 * queued, DMA programs the HW to use that req when this req is
101 * completed. If there is no "next req" queued, then DMA ISR doesn't do 101 * completed. If there is no "next req" queued, then DMA ISR doesn't do
102 * anything before calling this callback. 102 * anything before calling this callback.
diff --git a/arch/arm/mach-u300/clock.c b/arch/arm/mach-u300/clock.c
index fabcc49abe80..5535dd0a78c9 100644
--- a/arch/arm/mach-u300/clock.c
+++ b/arch/arm/mach-u300/clock.c
@@ -263,7 +263,7 @@ static void disable_i2s0_vcxo(void)
263 val = readw(U300_SYSCON_VBASE + U300_SYSCON_CCR); 263 val = readw(U300_SYSCON_VBASE + U300_SYSCON_CCR);
264 val &= ~U300_SYSCON_CCR_I2S0_USE_VCXO; 264 val &= ~U300_SYSCON_CCR_I2S0_USE_VCXO;
265 writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR); 265 writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
266 /* Deactivate VCXO if noone else is using VCXO */ 266 /* Deactivate VCXO if no one else is using VCXO */
267 if (!(val & U300_SYSCON_CCR_I2S1_USE_VCXO)) 267 if (!(val & U300_SYSCON_CCR_I2S1_USE_VCXO))
268 val &= ~U300_SYSCON_CCR_TURN_VCXO_ON; 268 val &= ~U300_SYSCON_CCR_TURN_VCXO_ON;
269 writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR); 269 writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
@@ -283,7 +283,7 @@ static void disable_i2s1_vcxo(void)
283 val = readw(U300_SYSCON_VBASE + U300_SYSCON_CCR); 283 val = readw(U300_SYSCON_VBASE + U300_SYSCON_CCR);
284 val &= ~U300_SYSCON_CCR_I2S1_USE_VCXO; 284 val &= ~U300_SYSCON_CCR_I2S1_USE_VCXO;
285 writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR); 285 writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
286 /* Deactivate VCXO if noone else is using VCXO */ 286 /* Deactivate VCXO if no one else is using VCXO */
287 if (!(val & U300_SYSCON_CCR_I2S0_USE_VCXO)) 287 if (!(val & U300_SYSCON_CCR_I2S0_USE_VCXO))
288 val &= ~U300_SYSCON_CCR_TURN_VCXO_ON; 288 val &= ~U300_SYSCON_CCR_TURN_VCXO_ON;
289 writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR); 289 writew(val, U300_SYSCON_VBASE + U300_SYSCON_CCR);
@@ -649,7 +649,7 @@ static unsigned long clk_round_rate_cpuclk(struct clk *clk, unsigned long rate)
649 */ 649 */
650long clk_round_rate(struct clk *clk, unsigned long rate) 650long clk_round_rate(struct clk *clk, unsigned long rate)
651{ 651{
652 /* TODO: get apropriate switches for EMIFCLK, AHBCLK and MCLK */ 652 /* TODO: get appropriate switches for EMIFCLK, AHBCLK and MCLK */
653 /* Else default to fixed value */ 653 /* Else default to fixed value */
654 654
655 if (clk->round_rate) { 655 if (clk->round_rate) {
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index dc8746d7826e..af913741e6ec 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -52,7 +52,7 @@ static struct ab8500_gpio_platform_data ab8500_gpio_pdata = {
52 * on value present in GpioSel1 to GpioSel6 and AlternatFunction 52 * on value present in GpioSel1 to GpioSel6 and AlternatFunction
53 * register. This is the array of 7 configuration settings. 53 * register. This is the array of 7 configuration settings.
54 * One has to compile time decide these settings. Below is the 54 * One has to compile time decide these settings. Below is the
55 * explaination of these setting 55 * explanation of these setting
56 * GpioSel1 = 0x00 => Pins GPIO1 to GPIO8 are not used as GPIO 56 * GpioSel1 = 0x00 => Pins GPIO1 to GPIO8 are not used as GPIO
57 * GpioSel2 = 0x1E => Pins GPIO10 to GPIO13 are configured as GPIO 57 * GpioSel2 = 0x1E => Pins GPIO10 to GPIO13 are configured as GPIO
58 * GpioSel3 = 0x80 => Pin GPIO24 is configured as GPIO 58 * GpioSel3 = 0x80 => Pin GPIO24 is configured as GPIO
diff --git a/arch/arm/mach-ux500/include/mach/db8500-regs.h b/arch/arm/mach-ux500/include/mach/db8500-regs.h
index 0fefb34c11e4..16647b255378 100644
--- a/arch/arm/mach-ux500/include/mach/db8500-regs.h
+++ b/arch/arm/mach-ux500/include/mach/db8500-regs.h
@@ -58,7 +58,7 @@
58#define U8500_GPIO2_BASE (U8500_PER2_BASE + 0xE000) 58#define U8500_GPIO2_BASE (U8500_PER2_BASE + 0xE000)
59#define U8500_GPIO3_BASE (U8500_PER5_BASE + 0x1E000) 59#define U8500_GPIO3_BASE (U8500_PER5_BASE + 0x1E000)
60 60
61/* per7 base addressess */ 61/* per7 base addresses */
62#define U8500_CR_BASE_ED (U8500_PER7_BASE_ED + 0x8000) 62#define U8500_CR_BASE_ED (U8500_PER7_BASE_ED + 0x8000)
63#define U8500_MTU0_BASE_ED (U8500_PER7_BASE_ED + 0xa000) 63#define U8500_MTU0_BASE_ED (U8500_PER7_BASE_ED + 0xa000)
64#define U8500_MTU1_BASE_ED (U8500_PER7_BASE_ED + 0xb000) 64#define U8500_MTU1_BASE_ED (U8500_PER7_BASE_ED + 0xb000)
@@ -68,7 +68,7 @@
68#define U8500_UART0_BASE (U8500_PER1_BASE + 0x0000) 68#define U8500_UART0_BASE (U8500_PER1_BASE + 0x0000)
69#define U8500_UART1_BASE (U8500_PER1_BASE + 0x1000) 69#define U8500_UART1_BASE (U8500_PER1_BASE + 0x1000)
70 70
71/* per6 base addressess */ 71/* per6 base addresses */
72#define U8500_RNG_BASE (U8500_PER6_BASE + 0x0000) 72#define U8500_RNG_BASE (U8500_PER6_BASE + 0x0000)
73#define U8500_PKA_BASE (U8500_PER6_BASE + 0x1000) 73#define U8500_PKA_BASE (U8500_PER6_BASE + 0x1000)
74#define U8500_PKAM_BASE (U8500_PER6_BASE + 0x2000) 74#define U8500_PKAM_BASE (U8500_PER6_BASE + 0x2000)
@@ -79,11 +79,11 @@
79#define U8500_CRYPTO1_BASE (U8500_PER6_BASE + 0xb000) 79#define U8500_CRYPTO1_BASE (U8500_PER6_BASE + 0xb000)
80#define U8500_CLKRST6_BASE (U8500_PER6_BASE + 0xf000) 80#define U8500_CLKRST6_BASE (U8500_PER6_BASE + 0xf000)
81 81
82/* per5 base addressess */ 82/* per5 base addresses */
83#define U8500_USBOTG_BASE (U8500_PER5_BASE + 0x00000) 83#define U8500_USBOTG_BASE (U8500_PER5_BASE + 0x00000)
84#define U8500_CLKRST5_BASE (U8500_PER5_BASE + 0x1f000) 84#define U8500_CLKRST5_BASE (U8500_PER5_BASE + 0x1f000)
85 85
86/* per4 base addressess */ 86/* per4 base addresses */
87#define U8500_BACKUPRAM0_BASE (U8500_PER4_BASE + 0x00000) 87#define U8500_BACKUPRAM0_BASE (U8500_PER4_BASE + 0x00000)
88#define U8500_BACKUPRAM1_BASE (U8500_PER4_BASE + 0x01000) 88#define U8500_BACKUPRAM1_BASE (U8500_PER4_BASE + 0x01000)
89#define U8500_RTT0_BASE (U8500_PER4_BASE + 0x02000) 89#define U8500_RTT0_BASE (U8500_PER4_BASE + 0x02000)
@@ -106,7 +106,7 @@
106#define U8500_SDI5_BASE (U8500_PER3_BASE + 0x8000) 106#define U8500_SDI5_BASE (U8500_PER3_BASE + 0x8000)
107#define U8500_CLKRST3_BASE (U8500_PER3_BASE + 0xf000) 107#define U8500_CLKRST3_BASE (U8500_PER3_BASE + 0xf000)
108 108
109/* per2 base addressess */ 109/* per2 base addresses */
110#define U8500_I2C3_BASE (U8500_PER2_BASE + 0x0000) 110#define U8500_I2C3_BASE (U8500_PER2_BASE + 0x0000)
111#define U8500_SPI2_BASE (U8500_PER2_BASE + 0x1000) 111#define U8500_SPI2_BASE (U8500_PER2_BASE + 0x1000)
112#define U8500_SPI1_BASE (U8500_PER2_BASE + 0x2000) 112#define U8500_SPI1_BASE (U8500_PER2_BASE + 0x2000)
diff --git a/arch/arm/mm/cache-v4wb.S b/arch/arm/mm/cache-v4wb.S
index d3644db467b7..f40c69656d8d 100644
--- a/arch/arm/mm/cache-v4wb.S
+++ b/arch/arm/mm/cache-v4wb.S
@@ -32,7 +32,7 @@
32/* 32/*
33 * This is the size at which it becomes more efficient to 33 * This is the size at which it becomes more efficient to
34 * clean the whole cache, rather than using the individual 34 * clean the whole cache, rather than using the individual
35 * cache line maintainence instructions. 35 * cache line maintenance instructions.
36 * 36 *
37 * Size Clean (ticks) Dirty (ticks) 37 * Size Clean (ticks) Dirty (ticks)
38 * 4096 21 20 21 53 55 54 38 * 4096 21 20 21 53 55 54
diff --git a/arch/arm/mm/cache-v4wt.S b/arch/arm/mm/cache-v4wt.S
index 49c2b66cf3dd..a7b276dbda11 100644
--- a/arch/arm/mm/cache-v4wt.S
+++ b/arch/arm/mm/cache-v4wt.S
@@ -34,7 +34,7 @@
34/* 34/*
35 * This is the size at which it becomes more efficient to 35 * This is the size at which it becomes more efficient to
36 * clean the whole cache, rather than using the individual 36 * clean the whole cache, rather than using the individual
37 * cache line maintainence instructions. 37 * cache line maintenance instructions.
38 * 38 *
39 * *** This needs benchmarking 39 * *** This needs benchmarking
40 */ 40 */
diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S
index 6136e68ce953..dc18d81ef8ce 100644
--- a/arch/arm/mm/cache-v7.S
+++ b/arch/arm/mm/cache-v7.S
@@ -96,7 +96,7 @@ ENDPROC(v7_flush_dcache_all)
96 * Flush the entire cache system. 96 * Flush the entire cache system.
97 * The data cache flush is now achieved using atomic clean / invalidates 97 * The data cache flush is now achieved using atomic clean / invalidates
98 * working outwards from L1 cache. This is done using Set/Way based cache 98 * working outwards from L1 cache. This is done using Set/Way based cache
99 * maintainance instructions. 99 * maintenance instructions.
100 * The instruction cache can still be invalidated back to the point of 100 * The instruction cache can still be invalidated back to the point of
101 * unification in a single instruction. 101 * unification in a single instruction.
102 * 102 *
diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S
index 226e3d8351c2..6c4e7fd6c8af 100644
--- a/arch/arm/mm/proc-arm1020.S
+++ b/arch/arm/mm/proc-arm1020.S
@@ -64,7 +64,7 @@
64/* 64/*
65 * This is the size at which it becomes more efficient to 65 * This is the size at which it becomes more efficient to
66 * clean the whole cache, rather than using the individual 66 * clean the whole cache, rather than using the individual
67 * cache line maintainence instructions. 67 * cache line maintenance instructions.
68 */ 68 */
69#define CACHE_DLIMIT 32768 69#define CACHE_DLIMIT 32768
70 70
diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S
index 86d9c2cf0bce..4ce947c19623 100644
--- a/arch/arm/mm/proc-arm1020e.S
+++ b/arch/arm/mm/proc-arm1020e.S
@@ -64,7 +64,7 @@
64/* 64/*
65 * This is the size at which it becomes more efficient to 65 * This is the size at which it becomes more efficient to
66 * clean the whole cache, rather than using the individual 66 * clean the whole cache, rather than using the individual
67 * cache line maintainence instructions. 67 * cache line maintenance instructions.
68 */ 68 */
69#define CACHE_DLIMIT 32768 69#define CACHE_DLIMIT 32768
70 70
diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S
index 83d3dd34f846..c8884c5413a2 100644
--- a/arch/arm/mm/proc-arm1022.S
+++ b/arch/arm/mm/proc-arm1022.S
@@ -53,7 +53,7 @@
53/* 53/*
54 * This is the size at which it becomes more efficient to 54 * This is the size at which it becomes more efficient to
55 * clean the whole cache, rather than using the individual 55 * clean the whole cache, rather than using the individual
56 * cache line maintainence instructions. 56 * cache line maintenance instructions.
57 */ 57 */
58#define CACHE_DLIMIT 32768 58#define CACHE_DLIMIT 32768
59 59
diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S
index 686043ee7281..413684660aad 100644
--- a/arch/arm/mm/proc-arm1026.S
+++ b/arch/arm/mm/proc-arm1026.S
@@ -53,7 +53,7 @@
53/* 53/*
54 * This is the size at which it becomes more efficient to 54 * This is the size at which it becomes more efficient to
55 * clean the whole cache, rather than using the individual 55 * clean the whole cache, rather than using the individual
56 * cache line maintainence instructions. 56 * cache line maintenance instructions.
57 */ 57 */
58#define CACHE_DLIMIT 32768 58#define CACHE_DLIMIT 32768
59 59
diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S
index 665266da143c..7a06e5964f59 100644
--- a/arch/arm/mm/proc-arm720.S
+++ b/arch/arm/mm/proc-arm720.S
@@ -63,7 +63,7 @@ ENTRY(cpu_arm720_proc_fin)
63/* 63/*
64 * Function: arm720_proc_do_idle(void) 64 * Function: arm720_proc_do_idle(void)
65 * Params : r0 = unused 65 * Params : r0 = unused
66 * Purpose : put the processer in proper idle mode 66 * Purpose : put the processor in proper idle mode
67 */ 67 */
68ENTRY(cpu_arm720_do_idle) 68ENTRY(cpu_arm720_do_idle)
69 mov pc, lr 69 mov pc, lr
diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S
index 219980ec8b6e..b46eb21f05c7 100644
--- a/arch/arm/mm/proc-arm920.S
+++ b/arch/arm/mm/proc-arm920.S
@@ -53,7 +53,7 @@
53/* 53/*
54 * This is the size at which it becomes more efficient to 54 * This is the size at which it becomes more efficient to
55 * clean the whole cache, rather than using the individual 55 * clean the whole cache, rather than using the individual
56 * cache line maintainence instructions. 56 * cache line maintenance instructions.
57 */ 57 */
58#define CACHE_DLIMIT 65536 58#define CACHE_DLIMIT 65536
59 59
diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S
index 36154b1e792a..95ba1fc56e4d 100644
--- a/arch/arm/mm/proc-arm922.S
+++ b/arch/arm/mm/proc-arm922.S
@@ -54,7 +54,7 @@
54/* 54/*
55 * This is the size at which it becomes more efficient to 55 * This is the size at which it becomes more efficient to
56 * clean the whole cache, rather than using the individual 56 * clean the whole cache, rather than using the individual
57 * cache line maintainence instructions. (I think this should 57 * cache line maintenance instructions. (I think this should
58 * be 32768). 58 * be 32768).
59 */ 59 */
60#define CACHE_DLIMIT 8192 60#define CACHE_DLIMIT 8192
diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S
index 89c5e0009c4c..541e4774eea1 100644
--- a/arch/arm/mm/proc-arm925.S
+++ b/arch/arm/mm/proc-arm925.S
@@ -77,7 +77,7 @@
77/* 77/*
78 * This is the size at which it becomes more efficient to 78 * This is the size at which it becomes more efficient to
79 * clean the whole cache, rather than using the individual 79 * clean the whole cache, rather than using the individual
80 * cache line maintainence instructions. 80 * cache line maintenance instructions.
81 */ 81 */
82#define CACHE_DLIMIT 8192 82#define CACHE_DLIMIT 8192
83 83
diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S
index e32fa499194c..34261f9486b9 100644
--- a/arch/arm/mm/proc-macros.S
+++ b/arch/arm/mm/proc-macros.S
@@ -85,7 +85,7 @@
85 85
86/* 86/*
87 * Sanity check the PTE configuration for the code below - which makes 87 * Sanity check the PTE configuration for the code below - which makes
88 * certain assumptions about how these bits are layed out. 88 * certain assumptions about how these bits are laid out.
89 */ 89 */
90#ifdef CONFIG_MMU 90#ifdef CONFIG_MMU
91#if L_PTE_SHARED != PTE_EXT_SHARED 91#if L_PTE_SHARED != PTE_EXT_SHARED
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index 832b6bdc192c..bfa0c9f611c5 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -132,7 +132,7 @@ ENTRY(cpu_v6_do_suspend)
132 mrc p15, 0, r6, c3, c0, 0 @ Domain ID 132 mrc p15, 0, r6, c3, c0, 0 @ Domain ID
133 mrc p15, 0, r7, c2, c0, 0 @ Translation table base 0 133 mrc p15, 0, r7, c2, c0, 0 @ Translation table base 0
134 mrc p15, 0, r8, c2, c0, 1 @ Translation table base 1 134 mrc p15, 0, r8, c2, c0, 1 @ Translation table base 1
135 mrc p15, 0, r9, c1, c0, 1 @ auxillary control register 135 mrc p15, 0, r9, c1, c0, 1 @ auxiliary control register
136 mrc p15, 0, r10, c1, c0, 2 @ co-processor access control 136 mrc p15, 0, r10, c1, c0, 2 @ co-processor access control
137 mrc p15, 0, r11, c1, c0, 0 @ control register 137 mrc p15, 0, r11, c1, c0, 0 @ control register
138 stmia r0, {r4 - r11} 138 stmia r0, {r4 - r11}
@@ -151,7 +151,7 @@ ENTRY(cpu_v6_do_resume)
151 mcr p15, 0, r6, c3, c0, 0 @ Domain ID 151 mcr p15, 0, r6, c3, c0, 0 @ Domain ID
152 mcr p15, 0, r7, c2, c0, 0 @ Translation table base 0 152 mcr p15, 0, r7, c2, c0, 0 @ Translation table base 0
153 mcr p15, 0, r8, c2, c0, 1 @ Translation table base 1 153 mcr p15, 0, r8, c2, c0, 1 @ Translation table base 1
154 mcr p15, 0, r9, c1, c0, 1 @ auxillary control register 154 mcr p15, 0, r9, c1, c0, 1 @ auxiliary control register
155 mcr p15, 0, r10, c1, c0, 2 @ co-processor access control 155 mcr p15, 0, r10, c1, c0, 2 @ co-processor access control
156 mcr p15, 0, ip, c2, c0, 2 @ TTB control register 156 mcr p15, 0, ip, c2, c0, 2 @ TTB control register
157 mcr p15, 0, ip, c7, c5, 4 @ ISB 157 mcr p15, 0, ip, c7, c5, 4 @ ISB
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index 262fa88a7439..c35618e42f6f 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -237,7 +237,7 @@ ENTRY(cpu_v7_do_resume)
237 mcr p15, 0, r7, c2, c0, 0 @ TTB 0 237 mcr p15, 0, r7, c2, c0, 0 @ TTB 0
238 mcr p15, 0, r8, c2, c0, 1 @ TTB 1 238 mcr p15, 0, r8, c2, c0, 1 @ TTB 1
239 mcr p15, 0, ip, c2, c0, 2 @ TTB control register 239 mcr p15, 0, ip, c2, c0, 2 @ TTB control register
240 mcr p15, 0, r10, c1, c0, 1 @ Auxillary control register 240 mcr p15, 0, r10, c1, c0, 1 @ Auxiliary control register
241 mcr p15, 0, r11, c1, c0, 2 @ Co-processor access control 241 mcr p15, 0, r11, c1, c0, 2 @ Co-processor access control
242 ldr r4, =PRRR @ PRRR 242 ldr r4, =PRRR @ PRRR
243 ldr r5, =NMRR @ NMRR 243 ldr r5, =NMRR @ NMRR
diff --git a/arch/arm/plat-mxc/cpufreq.c b/arch/arm/plat-mxc/cpufreq.c
index ce81481becf1..4268a2bdf145 100644
--- a/arch/arm/plat-mxc/cpufreq.c
+++ b/arch/arm/plat-mxc/cpufreq.c
@@ -13,7 +13,7 @@
13 13
14/* 14/*
15 * A driver for the Freescale Semiconductor i.MXC CPUfreq module. 15 * A driver for the Freescale Semiconductor i.MXC CPUfreq module.
16 * The CPUFREQ driver is for controling CPU frequency. It allows you to change 16 * The CPUFREQ driver is for controlling CPU frequency. It allows you to change
17 * the CPU clock speed on the fly. 17 * the CPU clock speed on the fly.
18 */ 18 */
19 19
diff --git a/arch/arm/plat-mxc/include/mach/entry-macro.S b/arch/arm/plat-mxc/include/mach/entry-macro.S
index bd9bb9799141..2e49e71b1b98 100644
--- a/arch/arm/plat-mxc/include/mach/entry-macro.S
+++ b/arch/arm/plat-mxc/include/mach/entry-macro.S
@@ -33,9 +33,9 @@
33 .macro arch_ret_to_user, tmp1, tmp2 33 .macro arch_ret_to_user, tmp1, tmp2
34 .endm 34 .endm
35 35
36 @ this macro checks which interrupt occured 36 @ this macro checks which interrupt occurred
37 @ and returns its number in irqnr 37 @ and returns its number in irqnr
38 @ and returns if an interrupt occured in irqstat 38 @ and returns if an interrupt occurred in irqstat
39 .macro get_irqnr_and_base, irqnr, irqstat, base, tmp 39 .macro get_irqnr_and_base, irqnr, irqstat, base, tmp
40#ifndef CONFIG_MXC_TZIC 40#ifndef CONFIG_MXC_TZIC
41 @ Load offset & priority of the highest priority 41 @ Load offset & priority of the highest priority
diff --git a/arch/arm/plat-mxc/include/mach/mxc_nand.h b/arch/arm/plat-mxc/include/mach/mxc_nand.h
index 04c0d060d814..6bb96ef1600b 100644
--- a/arch/arm/plat-mxc/include/mach/mxc_nand.h
+++ b/arch/arm/plat-mxc/include/mach/mxc_nand.h
@@ -24,7 +24,7 @@
24 24
25struct mxc_nand_platform_data { 25struct mxc_nand_platform_data {
26 unsigned int width; /* data bus width in bytes */ 26 unsigned int width; /* data bus width in bytes */
27 unsigned int hw_ecc:1; /* 0 if supress hardware ECC */ 27 unsigned int hw_ecc:1; /* 0 if suppress hardware ECC */
28 unsigned int flash_bbt:1; /* set to 1 to use a flash based bbt */ 28 unsigned int flash_bbt:1; /* set to 1 to use a flash based bbt */
29 struct mtd_partition *parts; /* partition table */ 29 struct mtd_partition *parts; /* partition table */
30 int nr_parts; /* size of parts */ 30 int nr_parts; /* size of parts */
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index 7d9f815cedec..ea28f98d5d6a 100644
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -280,7 +280,7 @@ EXPORT_SYMBOL(omap_dsp_get_mempool_base);
280 * Claiming GPIOs, and setting their direction and initial values, is the 280 * Claiming GPIOs, and setting their direction and initial values, is the
281 * responsibility of the device drivers. So is responding to probe(). 281 * responsibility of the device drivers. So is responding to probe().
282 * 282 *
283 * Board-specific knowlege like creating devices or pin setup is to be 283 * Board-specific knowledge like creating devices or pin setup is to be
284 * kept out of drivers as much as possible. In particular, pin setup 284 * kept out of drivers as much as possible. In particular, pin setup
285 * may be handled by the boot loader, and drivers should expect it will 285 * may be handled by the boot loader, and drivers should expect it will
286 * normally have been done by the time they're probed. 286 * normally have been done by the time they're probed.
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 2ec3b5d9f214..c22217c2ee5f 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -1019,7 +1019,7 @@ EXPORT_SYMBOL(omap_set_dma_callback);
1019 * If the channel is running the caller must disable interrupts prior calling 1019 * If the channel is running the caller must disable interrupts prior calling
1020 * this function and process the returned value before re-enabling interrupt to 1020 * this function and process the returned value before re-enabling interrupt to
1021 * prevent races with the interrupt handler. Note that in continuous mode there 1021 * prevent races with the interrupt handler. Note that in continuous mode there
1022 * is a chance for CSSA_L register overflow inbetween the two reads resulting 1022 * is a chance for CSSA_L register overflow between the two reads resulting
1023 * in incorrect return value. 1023 * in incorrect return value.
1024 */ 1024 */
1025dma_addr_t omap_get_dma_src_pos(int lch) 1025dma_addr_t omap_get_dma_src_pos(int lch)
@@ -1046,7 +1046,7 @@ EXPORT_SYMBOL(omap_get_dma_src_pos);
1046 * If the channel is running the caller must disable interrupts prior calling 1046 * If the channel is running the caller must disable interrupts prior calling
1047 * this function and process the returned value before re-enabling interrupt to 1047 * this function and process the returned value before re-enabling interrupt to
1048 * prevent races with the interrupt handler. Note that in continuous mode there 1048 * prevent races with the interrupt handler. Note that in continuous mode there
1049 * is a chance for CDSA_L register overflow inbetween the two reads resulting 1049 * is a chance for CDSA_L register overflow between the two reads resulting
1050 * in incorrect return value. 1050 * in incorrect return value.
1051 */ 1051 */
1052dma_addr_t omap_get_dma_dst_pos(int lch) 1052dma_addr_t omap_get_dma_dst_pos(int lch)
diff --git a/arch/arm/plat-omap/include/plat/gpio.h b/arch/arm/plat-omap/include/plat/gpio.h
index d6f9fa0f62af..cac2e8ac6968 100644
--- a/arch/arm/plat-omap/include/plat/gpio.h
+++ b/arch/arm/plat-omap/include/plat/gpio.h
@@ -93,7 +93,7 @@ extern void omap_gpio_restore_context(void);
93/* Wrappers for "new style" GPIO calls, using the new infrastructure 93/* Wrappers for "new style" GPIO calls, using the new infrastructure
94 * which lets us plug in FPGA, I2C, and other implementations. 94 * which lets us plug in FPGA, I2C, and other implementations.
95 * * 95 * *
96 * The original OMAP-specfic calls should eventually be removed. 96 * The original OMAP-specific calls should eventually be removed.
97 */ 97 */
98 98
99#include <linux/errno.h> 99#include <linux/errno.h>
diff --git a/arch/arm/plat-omap/include/plat/gpmc.h b/arch/arm/plat-omap/include/plat/gpmc.h
index 12b316165037..1527929b445a 100644
--- a/arch/arm/plat-omap/include/plat/gpmc.h
+++ b/arch/arm/plat-omap/include/plat/gpmc.h
@@ -90,7 +90,7 @@ enum omap_ecc {
90 /* 1-bit ecc: stored at end of spare area */ 90 /* 1-bit ecc: stored at end of spare area */
91 OMAP_ECC_HAMMING_CODE_DEFAULT = 0, /* Default, s/w method */ 91 OMAP_ECC_HAMMING_CODE_DEFAULT = 0, /* Default, s/w method */
92 OMAP_ECC_HAMMING_CODE_HW, /* gpmc to detect the error */ 92 OMAP_ECC_HAMMING_CODE_HW, /* gpmc to detect the error */
93 /* 1-bit ecc: stored at begining of spare area as romcode */ 93 /* 1-bit ecc: stored at beginning of spare area as romcode */
94 OMAP_ECC_HAMMING_CODE_HW_ROMCODE, /* gpmc method & romcode layout */ 94 OMAP_ECC_HAMMING_CODE_HW_ROMCODE, /* gpmc method & romcode layout */
95}; 95};
96 96
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c
index d598d9fd65ac..5587acf0eb2c 100644
--- a/arch/arm/plat-omap/mcbsp.c
+++ b/arch/arm/plat-omap/mcbsp.c
@@ -1103,7 +1103,7 @@ int omap_mcbsp_pollread(unsigned int id, u16 *buf)
1103 /* resend */ 1103 /* resend */
1104 return -1; 1104 return -1;
1105 } else { 1105 } else {
1106 /* wait for recieve confirmation */ 1106 /* wait for receive confirmation */
1107 int attemps = 0; 1107 int attemps = 0;
1108 while (!(MCBSP_READ(mcbsp, SPCR1) & RRDY)) { 1108 while (!(MCBSP_READ(mcbsp, SPCR1) & RRDY)) {
1109 if (attemps++ > 1000) { 1109 if (attemps++ > 1000) {
diff --git a/arch/arm/plat-pxa/include/plat/mfp.h b/arch/arm/plat-pxa/include/plat/mfp.h
index 75f656471240..89e68e07b0a8 100644
--- a/arch/arm/plat-pxa/include/plat/mfp.h
+++ b/arch/arm/plat-pxa/include/plat/mfp.h
@@ -434,7 +434,7 @@ typedef unsigned long mfp_cfg_t;
434 * 434 *
435 * mfp_init_addr() - accepts a table of "mfp_addr_map" structure, which 435 * mfp_init_addr() - accepts a table of "mfp_addr_map" structure, which
436 * represents a range of MFP pins from "start" to "end", with the offset 436 * represents a range of MFP pins from "start" to "end", with the offset
437 * begining at "offset", to define a single pin, let "end" = -1. 437 * beginning at "offset", to define a single pin, let "end" = -1.
438 * 438 *
439 * use 439 * use
440 * 440 *
diff --git a/arch/arm/plat-s3c24xx/Makefile b/arch/arm/plat-s3c24xx/Makefile
index c2064c308719..0291bd6e236e 100644
--- a/arch/arm/plat-s3c24xx/Makefile
+++ b/arch/arm/plat-s3c24xx/Makefile
@@ -23,7 +23,7 @@ obj-$(CONFIG_S3C24XX_DCLK) += clock-dclk.o
23obj-$(CONFIG_CPU_FREQ_S3C24XX) += cpu-freq.o 23obj-$(CONFIG_CPU_FREQ_S3C24XX) += cpu-freq.o
24obj-$(CONFIG_CPU_FREQ_S3C24XX_DEBUGFS) += cpu-freq-debugfs.o 24obj-$(CONFIG_CPU_FREQ_S3C24XX_DEBUGFS) += cpu-freq-debugfs.o
25 25
26# Architecture dependant builds 26# Architecture dependent builds
27 27
28obj-$(CONFIG_PM_SIMTEC) += pm-simtec.o 28obj-$(CONFIG_PM_SIMTEC) += pm-simtec.o
29obj-$(CONFIG_PM) += pm.o 29obj-$(CONFIG_PM) += pm.o
diff --git a/arch/arm/plat-s3c24xx/cpu-freq.c b/arch/arm/plat-s3c24xx/cpu-freq.c
index eea75ff81d15..b3d3d0278997 100644
--- a/arch/arm/plat-s3c24xx/cpu-freq.c
+++ b/arch/arm/plat-s3c24xx/cpu-freq.c
@@ -455,7 +455,7 @@ static int s3c_cpufreq_resume(struct cpufreq_policy *policy)
455 455
456 /* whilst we will be called later on, we try and re-set the 456 /* whilst we will be called later on, we try and re-set the
457 * cpu frequencies as soon as possible so that we do not end 457 * cpu frequencies as soon as possible so that we do not end
458 * up resuming devices and then immediatley having to re-set 458 * up resuming devices and then immediately having to re-set
459 * a number of settings once these devices have restarted. 459 * a number of settings once these devices have restarted.
460 * 460 *
461 * as a note, it is expected devices are not used until they 461 * as a note, it is expected devices are not used until they
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
index 6ad274e7593d..27ea852e3370 100644
--- a/arch/arm/plat-s3c24xx/dma.c
+++ b/arch/arm/plat-s3c24xx/dma.c
@@ -557,7 +557,7 @@ s3c2410_dma_lastxfer(struct s3c2410_dma_chan *chan)
557 break; 557 break;
558 558
559 case S3C2410_DMALOAD_1LOADED_1RUNNING: 559 case S3C2410_DMALOAD_1LOADED_1RUNNING:
560 /* I belive in this case we do not have anything to do 560 /* I believe in this case we do not have anything to do
561 * until the next buffer comes along, and we turn off the 561 * until the next buffer comes along, and we turn off the
562 * reload */ 562 * reload */
563 return; 563 return;
diff --git a/arch/arm/plat-s5p/irq-gpioint.c b/arch/arm/plat-s5p/irq-gpioint.c
index 46dd078147d8..cd6d67c8382a 100644
--- a/arch/arm/plat-s5p/irq-gpioint.c
+++ b/arch/arm/plat-s5p/irq-gpioint.c
@@ -208,7 +208,7 @@ static __init int s5p_gpioint_add(struct s3c_gpio_chip *chip)
208 } 208 }
209 209
210 /* 210 /*
211 * chained GPIO irq has been sucessfully registered, allocate new gpio 211 * chained GPIO irq has been successfully registered, allocate new gpio
212 * int group and assign irq nubmers 212 * int group and assign irq nubmers
213 */ 213 */
214 214
diff --git a/arch/arm/plat-samsung/include/plat/clock.h b/arch/arm/plat-samsung/include/plat/clock.h
index 9a82b8874918..983c578b8276 100644
--- a/arch/arm/plat-samsung/include/plat/clock.h
+++ b/arch/arm/plat-samsung/include/plat/clock.h
@@ -21,7 +21,7 @@ struct clk;
21 * @set_parent: set the clock's parent, see clk_set_parent(). 21 * @set_parent: set the clock's parent, see clk_set_parent().
22 * 22 *
23 * Group the common clock implementations together so that we 23 * Group the common clock implementations together so that we
24 * don't have to keep setting the same fiels again. We leave 24 * don't have to keep setting the same fields again. We leave
25 * enable in struct clk. 25 * enable in struct clk.
26 * 26 *
27 * Adding an extra layer of indirection into the process should 27 * Adding an extra layer of indirection into the process should
diff --git a/arch/arm/plat-samsung/include/plat/gpio-cfg-helpers.h b/arch/arm/plat-samsung/include/plat/gpio-cfg-helpers.h
index 5603db0b79bc..3ad8386599c3 100644
--- a/arch/arm/plat-samsung/include/plat/gpio-cfg-helpers.h
+++ b/arch/arm/plat-samsung/include/plat/gpio-cfg-helpers.h
@@ -114,7 +114,7 @@ extern unsigned s3c_gpio_getcfg_s3c24xx_a(struct s3c_gpio_chip *chip,
114 * of control per GPIO, generally in the form of: 114 * of control per GPIO, generally in the form of:
115 * 0000 = Input 115 * 0000 = Input
116 * 0001 = Output 116 * 0001 = Output
117 * others = Special functions (dependant on bank) 117 * others = Special functions (dependent on bank)
118 * 118 *
119 * Note, since the code to deal with the case where there are two control 119 * Note, since the code to deal with the case where there are two control
120 * registers instead of one, we do not have a separate set of functions for 120 * registers instead of one, we do not have a separate set of functions for
diff --git a/arch/arm/plat-samsung/include/plat/gpio-cfg.h b/arch/arm/plat-samsung/include/plat/gpio-cfg.h
index 5e04fa6eda74..1762dcb4cb9e 100644
--- a/arch/arm/plat-samsung/include/plat/gpio-cfg.h
+++ b/arch/arm/plat-samsung/include/plat/gpio-cfg.h
@@ -125,7 +125,7 @@ extern int s3c_gpio_cfgpin_range(unsigned int start, unsigned int nr,
125 * 125 *
126 * These values control the state of the weak pull-{up,down} resistors 126 * These values control the state of the weak pull-{up,down} resistors
127 * available on most pins on the S3C series. Not all chips support both 127 * available on most pins on the S3C series. Not all chips support both
128 * up or down settings, and it may be dependant on the chip that is being 128 * up or down settings, and it may be dependent on the chip that is being
129 * used to whether the particular mode is available. 129 * used to whether the particular mode is available.
130 */ 130 */
131#define S3C_GPIO_PULL_NONE ((__force s3c_gpio_pull_t)0x00) 131#define S3C_GPIO_PULL_NONE ((__force s3c_gpio_pull_t)0x00)
@@ -138,7 +138,7 @@ extern int s3c_gpio_cfgpin_range(unsigned int start, unsigned int nr,
138 * @pull: The configuration for the pull resistor. 138 * @pull: The configuration for the pull resistor.
139 * 139 *
140 * This function sets the state of the pull-{up,down} resistor for the 140 * This function sets the state of the pull-{up,down} resistor for the
141 * specified pin. It will return 0 if successfull, or a negative error 141 * specified pin. It will return 0 if successful, or a negative error
142 * code if the pin cannot support the requested pull setting. 142 * code if the pin cannot support the requested pull setting.
143 * 143 *
144 * @pull is one of S3C_GPIO_PULL_NONE, S3C_GPIO_PULL_DOWN or S3C_GPIO_PULL_UP. 144 * @pull is one of S3C_GPIO_PULL_NONE, S3C_GPIO_PULL_DOWN or S3C_GPIO_PULL_UP.
@@ -202,7 +202,7 @@ extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned int pin);
202 * @drvstr: The new value of the driver strength 202 * @drvstr: The new value of the driver strength
203 * 203 *
204 * This function sets the driver strength value for the specified pin. 204 * This function sets the driver strength value for the specified pin.
205 * It will return 0 if successfull, or a negative error code if the pin 205 * It will return 0 if successful, or a negative error code if the pin
206 * cannot support the requested setting. 206 * cannot support the requested setting.
207*/ 207*/
208extern int s5p_gpio_set_drvstr(unsigned int pin, s5p_gpio_drvstr_t drvstr); 208extern int s5p_gpio_set_drvstr(unsigned int pin, s5p_gpio_drvstr_t drvstr);
diff --git a/arch/arm/plat-samsung/include/plat/gpio-core.h b/arch/arm/plat-samsung/include/plat/gpio-core.h
index dac35d0a711d..8cad4cf19c3c 100644
--- a/arch/arm/plat-samsung/include/plat/gpio-core.h
+++ b/arch/arm/plat-samsung/include/plat/gpio-core.h
@@ -108,7 +108,7 @@ extern void s3c_gpiolib_add(struct s3c_gpio_chip *chip);
108 * of control per GPIO, generally in the form of: 108 * of control per GPIO, generally in the form of:
109 * 0000 = Input 109 * 0000 = Input
110 * 0001 = Output 110 * 0001 = Output
111 * others = Special functions (dependant on bank) 111 * others = Special functions (dependent on bank)
112 * 112 *
113 * Note, since the code to deal with the case where there are two control 113 * Note, since the code to deal with the case where there are two control
114 * registers instead of one, we do not have a separate set of function 114 * registers instead of one, we do not have a separate set of function
diff --git a/arch/arm/plat-samsung/include/plat/sdhci.h b/arch/arm/plat-samsung/include/plat/sdhci.h
index b0bdf16549d5..058e09654fe8 100644
--- a/arch/arm/plat-samsung/include/plat/sdhci.h
+++ b/arch/arm/plat-samsung/include/plat/sdhci.h
@@ -57,7 +57,7 @@ enum clk_types {
57 * @cfg_gpio: Configure the GPIO for a specific card bit-width 57 * @cfg_gpio: Configure the GPIO for a specific card bit-width
58 * @cfg_card: Configure the interface for a specific card and speed. This 58 * @cfg_card: Configure the interface for a specific card and speed. This
59 * is necessary the controllers and/or GPIO blocks require the 59 * is necessary the controllers and/or GPIO blocks require the
60 * changing of driver-strength and other controls dependant on 60 * changing of driver-strength and other controls dependent on
61 * the card and speed of operation. 61 * the card and speed of operation.
62 * 62 *
63 * Initialisation data specific to either the machine or the platform 63 * Initialisation data specific to either the machine or the platform
@@ -108,7 +108,7 @@ extern struct s3c_sdhci_platdata s3c_hsmmc1_def_platdata;
108extern struct s3c_sdhci_platdata s3c_hsmmc2_def_platdata; 108extern struct s3c_sdhci_platdata s3c_hsmmc2_def_platdata;
109extern struct s3c_sdhci_platdata s3c_hsmmc3_def_platdata; 109extern struct s3c_sdhci_platdata s3c_hsmmc3_def_platdata;
110 110
111/* Helper function availablity */ 111/* Helper function availability */
112 112
113extern void s3c2416_setup_sdhci0_cfg_gpio(struct platform_device *, int w); 113extern void s3c2416_setup_sdhci0_cfg_gpio(struct platform_device *, int w);
114extern void s3c2416_setup_sdhci1_cfg_gpio(struct platform_device *, int w); 114extern void s3c2416_setup_sdhci1_cfg_gpio(struct platform_device *, int w);
diff --git a/arch/arm/plat-samsung/s3c-pl330.c b/arch/arm/plat-samsung/s3c-pl330.c
index b4ff8d74ac40..f85638c6f5ae 100644
--- a/arch/arm/plat-samsung/s3c-pl330.c
+++ b/arch/arm/plat-samsung/s3c-pl330.c
@@ -68,7 +68,7 @@ struct s3c_pl330_xfer {
68 * @req: Two requests to communicate with the PL330 engine. 68 * @req: Two requests to communicate with the PL330 engine.
69 * @callback_fn: Callback function to the client. 69 * @callback_fn: Callback function to the client.
70 * @rqcfg: Channel configuration for the xfers. 70 * @rqcfg: Channel configuration for the xfers.
71 * @xfer_head: Pointer to the xfer to be next excecuted. 71 * @xfer_head: Pointer to the xfer to be next executed.
72 * @dmac: Pointer to the DMAC that manages this channel, NULL if the 72 * @dmac: Pointer to the DMAC that manages this channel, NULL if the
73 * channel is available to be acquired. 73 * channel is available to be acquired.
74 * @client: Client of this channel. NULL if the 74 * @client: Client of this channel. NULL if the
diff --git a/arch/arm/plat-spear/include/plat/clock.h b/arch/arm/plat-spear/include/plat/clock.h
index 2ae6606930a6..fcc0d0ad4a1f 100644
--- a/arch/arm/plat-spear/include/plat/clock.h
+++ b/arch/arm/plat-spear/include/plat/clock.h
@@ -89,7 +89,7 @@ struct rate_config {
89 * @sibling: node for list of clocks having same parents 89 * @sibling: node for list of clocks having same parents
90 * @private_data: clock specific private data 90 * @private_data: clock specific private data
91 * @node: list to maintain clocks linearly 91 * @node: list to maintain clocks linearly
92 * @cl: clocklook up assoicated with this clock 92 * @cl: clocklook up associated with this clock
93 * @dent: object for debugfs 93 * @dent: object for debugfs
94 */ 94 */
95struct clk { 95struct clk {
diff --git a/arch/blackfin/Kconfig.debug b/arch/blackfin/Kconfig.debug
index acb83799a215..2641731f24cd 100644
--- a/arch/blackfin/Kconfig.debug
+++ b/arch/blackfin/Kconfig.debug
@@ -59,7 +59,7 @@ config EXACT_HWERR
59 be reported multiple cycles after the error happens. This delay 59 be reported multiple cycles after the error happens. This delay
60 can cause the wrong application, or even the kernel to receive a 60 can cause the wrong application, or even the kernel to receive a
61 signal to be killed. If you are getting HW errors in your system, 61 signal to be killed. If you are getting HW errors in your system,
62 try turning this on to ensure they are at least comming from the 62 try turning this on to ensure they are at least coming from the
63 proper thread. 63 proper thread.
64 64
65 On production systems, it is safe (and a small optimization) to say N. 65 On production systems, it is safe (and a small optimization) to say N.
diff --git a/arch/blackfin/include/asm/traps.h b/arch/blackfin/include/asm/traps.h
index 9fe0da612c09..70c4e511cae6 100644
--- a/arch/blackfin/include/asm/traps.h
+++ b/arch/blackfin/include/asm/traps.h
@@ -57,7 +57,7 @@
57#define HWC_x3(level) \ 57#define HWC_x3(level) \
58 "External Memory Addressing Error\n" 58 "External Memory Addressing Error\n"
59#define EXC_0x04(level) \ 59#define EXC_0x04(level) \
60 "Unimplmented exception occured\n" \ 60 "Unimplmented exception occurred\n" \
61 level " - Maybe you forgot to install a custom exception handler?\n" 61 level " - Maybe you forgot to install a custom exception handler?\n"
62#define HWC_x12(level) \ 62#define HWC_x12(level) \
63 "Performance Monitor Overflow\n" 63 "Performance Monitor Overflow\n"
diff --git a/arch/blackfin/kernel/kgdb.c b/arch/blackfin/kernel/kgdb.c
index b8cfe34989e4..9b80b152435e 100644
--- a/arch/blackfin/kernel/kgdb.c
+++ b/arch/blackfin/kernel/kgdb.c
@@ -181,7 +181,7 @@ static int bfin_set_hw_break(unsigned long addr, int len, enum kgdb_bptype type)
181 return -ENOSPC; 181 return -ENOSPC;
182 } 182 }
183 183
184 /* Becasue hardware data watchpoint impelemented in current 184 /* Because hardware data watchpoint impelemented in current
185 * Blackfin can not trigger an exception event as the hardware 185 * Blackfin can not trigger an exception event as the hardware
186 * instrction watchpoint does, we ignaore all data watch point here. 186 * instrction watchpoint does, we ignaore all data watch point here.
187 * They can be turned on easily after future blackfin design 187 * They can be turned on easily after future blackfin design
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index 59c1df75e4de..655f25d139a7 100644
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -98,7 +98,7 @@ asmlinkage notrace void trap_c(struct pt_regs *fp)
98 /* send the appropriate signal to the user program */ 98 /* send the appropriate signal to the user program */
99 switch (trapnr) { 99 switch (trapnr) {
100 100
101 /* This table works in conjuction with the one in ./mach-common/entry.S 101 /* This table works in conjunction with the one in ./mach-common/entry.S
102 * Some exceptions are handled there (in assembly, in exception space) 102 * Some exceptions are handled there (in assembly, in exception space)
103 * Some are handled here, (in C, in interrupt space) 103 * Some are handled here, (in C, in interrupt space)
104 * Some, like CPLB, are handled in both, where the normal path is 104 * Some, like CPLB, are handled in both, where the normal path is
diff --git a/arch/blackfin/lib/ins.S b/arch/blackfin/lib/ins.S
index 3edbd8db6598..79caccea85ca 100644
--- a/arch/blackfin/lib/ins.S
+++ b/arch/blackfin/lib/ins.S
@@ -67,7 +67,7 @@
67 * - DMA version, which do not suffer from this issue. DMA versions have 67 * - DMA version, which do not suffer from this issue. DMA versions have
68 * different name (prefixed by dma_ ), and are located in 68 * different name (prefixed by dma_ ), and are located in
69 * ../kernel/bfin_dma_5xx.c 69 * ../kernel/bfin_dma_5xx.c
70 * Using the dma related functions are recommended for transfering large 70 * Using the dma related functions are recommended for transferring large
71 * buffers in/out of FIFOs. 71 * buffers in/out of FIFOs.
72 */ 72 */
73 73
diff --git a/arch/blackfin/lib/memmove.S b/arch/blackfin/lib/memmove.S
index 80c240acac60..4eca566237a4 100644
--- a/arch/blackfin/lib/memmove.S
+++ b/arch/blackfin/lib/memmove.S
@@ -60,7 +60,7 @@ ENTRY(_memmove)
60 [P0++] = R1; 60 [P0++] = R1;
61 61
62 CC = P2 == 0; /* any remaining bytes? */ 62 CC = P2 == 0; /* any remaining bytes? */
63 P3 = I0; /* Ammend P3 to updated ptr. */ 63 P3 = I0; /* Amend P3 to updated ptr. */
64 IF !CC JUMP .Lbytes; 64 IF !CC JUMP .Lbytes;
65 P3 = I1; 65 P3 = I1;
66 RTS; 66 RTS;
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 2c69785a7bbe..3fa335405b31 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -2530,7 +2530,7 @@ static struct resource bfin_pata_resources[] = {
2530static struct pata_platform_info bfin_pata_platform_data = { 2530static struct pata_platform_info bfin_pata_platform_data = {
2531 .ioport_shift = 0, 2531 .ioport_shift = 0,
2532}; 2532};
2533/* CompactFlash Storage Card Memory Mapped Adressing 2533/* CompactFlash Storage Card Memory Mapped Addressing
2534 * /REG = A11 = 1 2534 * /REG = A11 = 1
2535 */ 2535 */
2536static struct resource bfin_pata_resources[] = { 2536static struct resource bfin_pata_resources[] = {
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S
index 46ab45704c89..f96933f48a7f 100644
--- a/arch/blackfin/mach-common/entry.S
+++ b/arch/blackfin/mach-common/entry.S
@@ -268,7 +268,7 @@ ENTRY(_handle_bad_cplb)
268 /* To get here, we just tried and failed to change a CPLB 268 /* To get here, we just tried and failed to change a CPLB
269 * so, handle things in trap_c (C code), by lowering to 269 * so, handle things in trap_c (C code), by lowering to
270 * IRQ5, just like we normally do. Since this is not a 270 * IRQ5, just like we normally do. Since this is not a
271 * "normal" return path, we have a do alot of stuff to 271 * "normal" return path, we have a do a lot of stuff to
272 * the stack to get ready so, we can fall through - we 272 * the stack to get ready so, we can fall through - we
273 * need to make a CPLB exception look like a normal exception 273 * need to make a CPLB exception look like a normal exception
274 */ 274 */
@@ -817,7 +817,7 @@ _new_old_task:
817 rets = [sp++]; 817 rets = [sp++];
818 818
819 /* 819 /*
820 * When we come out of resume, r0 carries "old" task, becuase we are 820 * When we come out of resume, r0 carries "old" task, because we are
821 * in "new" task. 821 * in "new" task.
822 */ 822 */
823 rts; 823 rts;
diff --git a/arch/blackfin/mach-common/head.S b/arch/blackfin/mach-common/head.S
index 581e2b0a71ac..76de5724c1e3 100644
--- a/arch/blackfin/mach-common/head.S
+++ b/arch/blackfin/mach-common/head.S
@@ -174,7 +174,7 @@ ENTRY(__start)
174 sp.l = lo(KERNEL_CLOCK_STACK); 174 sp.l = lo(KERNEL_CLOCK_STACK);
175 sp.h = hi(KERNEL_CLOCK_STACK); 175 sp.h = hi(KERNEL_CLOCK_STACK);
176 call _init_clocks; 176 call _init_clocks;
177 sp = usp; /* usp hasnt been touched, so restore from there */ 177 sp = usp; /* usp hasn't been touched, so restore from there */
178#endif 178#endif
179 179
180 /* This section keeps the processor in supervisor mode 180 /* This section keeps the processor in supervisor mode
diff --git a/arch/cris/arch-v10/README.mm b/arch/cris/arch-v10/README.mm
index 517d1f027fe8..67731d75cb51 100644
--- a/arch/cris/arch-v10/README.mm
+++ b/arch/cris/arch-v10/README.mm
@@ -38,7 +38,7 @@ space. We also use it to keep the user-mode virtual mapping in the same
38map during kernel-mode, so that the kernel easily can access the corresponding 38map during kernel-mode, so that the kernel easily can access the corresponding
39user-mode process' data. 39user-mode process' data.
40 40
41As a comparision, the Linux/i386 2.0 puts the kernel and physical RAM at 41As a comparison, the Linux/i386 2.0 puts the kernel and physical RAM at
42address 0, overlapping with the user-mode virtual space, so that descriptor 42address 0, overlapping with the user-mode virtual space, so that descriptor
43registers are needed for each memory access to specify which MMU space to 43registers are needed for each memory access to specify which MMU space to
44map through. That changed in 2.2, putting the kernel/physical RAM at 44map through. That changed in 2.2, putting the kernel/physical RAM at
diff --git a/arch/cris/arch-v10/drivers/sync_serial.c b/arch/cris/arch-v10/drivers/sync_serial.c
index 399dc1ec8e6f..850265373611 100644
--- a/arch/cris/arch-v10/drivers/sync_serial.c
+++ b/arch/cris/arch-v10/drivers/sync_serial.c
@@ -31,7 +31,7 @@
31#include <asm/sync_serial.h> 31#include <asm/sync_serial.h>
32#include <arch/io_interface_mux.h> 32#include <arch/io_interface_mux.h>
33 33
34/* The receiver is a bit tricky beacuse of the continuous stream of data.*/ 34/* The receiver is a bit tricky because of the continuous stream of data.*/
35/* */ 35/* */
36/* Three DMA descriptors are linked together. Each DMA descriptor is */ 36/* Three DMA descriptors are linked together. Each DMA descriptor is */
37/* responsible for port->bufchunk of a common buffer. */ 37/* responsible for port->bufchunk of a common buffer. */
diff --git a/arch/cris/arch-v32/drivers/axisflashmap.c b/arch/cris/arch-v32/drivers/axisflashmap.c
index 3d751250271b..7b155f8203b8 100644
--- a/arch/cris/arch-v32/drivers/axisflashmap.c
+++ b/arch/cris/arch-v32/drivers/axisflashmap.c
@@ -215,7 +215,7 @@ static struct mtd_partition main_partition = {
215}; 215};
216#endif 216#endif
217 217
218/* Auxilliary partition if we find another flash */ 218/* Auxiliary partition if we find another flash */
219static struct mtd_partition aux_partition = { 219static struct mtd_partition aux_partition = {
220 .name = "aux", 220 .name = "aux",
221 .size = 0, 221 .size = 0,
diff --git a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
index 25d6f2b3a721..f58f2c1c5295 100644
--- a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
+++ b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
@@ -165,7 +165,7 @@ struct mtd_info *__init crisv32_nand_flash_probe(void)
165 /* Enable the following for a flash based bad block table */ 165 /* Enable the following for a flash based bad block table */
166 /* this->options = NAND_USE_FLASH_BBT; */ 166 /* this->options = NAND_USE_FLASH_BBT; */
167 167
168 /* Scan to find existance of the device */ 168 /* Scan to find existence of the device */
169 if (nand_scan(crisv32_mtd, 1)) { 169 if (nand_scan(crisv32_mtd, 1)) {
170 err = -ENXIO; 170 err = -ENXIO;
171 goto out_mtd; 171 goto out_mtd;
diff --git a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
index c5a0f54763cc..d5b0cc9f976b 100644
--- a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
+++ b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
@@ -156,7 +156,7 @@ struct mtd_info *__init crisv32_nand_flash_probe(void)
156 /* Enable the following for a flash based bad block table */ 156 /* Enable the following for a flash based bad block table */
157 /* this->options = NAND_USE_FLASH_BBT; */ 157 /* this->options = NAND_USE_FLASH_BBT; */
158 158
159 /* Scan to find existance of the device */ 159 /* Scan to find existence of the device */
160 if (nand_scan(crisv32_mtd, 1)) { 160 if (nand_scan(crisv32_mtd, 1)) {
161 err = -ENXIO; 161 err = -ENXIO;
162 goto out_ior; 162 goto out_ior;
diff --git a/arch/cris/arch-v32/drivers/sync_serial.c b/arch/cris/arch-v32/drivers/sync_serial.c
index c8637a9195ea..a6a180bc566f 100644
--- a/arch/cris/arch-v32/drivers/sync_serial.c
+++ b/arch/cris/arch-v32/drivers/sync_serial.c
@@ -33,7 +33,7 @@
33#include <asm/sync_serial.h> 33#include <asm/sync_serial.h>
34 34
35 35
36/* The receiver is a bit tricky beacuse of the continuous stream of data.*/ 36/* The receiver is a bit tricky because of the continuous stream of data.*/
37/* */ 37/* */
38/* Three DMA descriptors are linked together. Each DMA descriptor is */ 38/* Three DMA descriptors are linked together. Each DMA descriptor is */
39/* responsible for port->bufchunk of a common buffer. */ 39/* responsible for port->bufchunk of a common buffer. */
diff --git a/arch/cris/arch-v32/kernel/entry.S b/arch/cris/arch-v32/kernel/entry.S
index 0ecb50b8f0d9..3abf12c23e5f 100644
--- a/arch/cris/arch-v32/kernel/entry.S
+++ b/arch/cris/arch-v32/kernel/entry.S
@@ -182,7 +182,7 @@ _syscall_traced:
182 move.d $r0, [$sp] 182 move.d $r0, [$sp]
183 183
184 ;; The registers carrying parameters (R10-R13) are intact. The optional 184 ;; The registers carrying parameters (R10-R13) are intact. The optional
185 ;; fifth and sixth parameters is in MOF and SRP respectivly. Put them 185 ;; fifth and sixth parameters is in MOF and SRP respectively. Put them
186 ;; back on the stack. 186 ;; back on the stack.
187 subq 4, $sp 187 subq 4, $sp
188 move $srp, [$sp] 188 move $srp, [$sp]
diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c
index 8023176e19b2..68a1a5901ca5 100644
--- a/arch/cris/arch-v32/kernel/irq.c
+++ b/arch/cris/arch-v32/kernel/irq.c
@@ -374,7 +374,7 @@ crisv32_do_multiple(struct pt_regs* regs)
374 irq_enter(); 374 irq_enter();
375 375
376 for (i = 0; i < NBR_REGS; i++) { 376 for (i = 0; i < NBR_REGS; i++) {
377 /* Get which IRQs that happend. */ 377 /* Get which IRQs that happened. */
378 masked[i] = REG_RD_INT_VECT(intr_vect, irq_regs[cpu], 378 masked[i] = REG_RD_INT_VECT(intr_vect, irq_regs[cpu],
379 r_masked_vect, i); 379 r_masked_vect, i);
380 380
diff --git a/arch/cris/arch-v32/kernel/kgdb.c b/arch/cris/arch-v32/kernel/kgdb.c
index 6b653323d796..c0343c3ea7f8 100644
--- a/arch/cris/arch-v32/kernel/kgdb.c
+++ b/arch/cris/arch-v32/kernel/kgdb.c
@@ -925,7 +925,7 @@ stub_is_stopped(int sigval)
925 925
926 if (reg.eda >= bp_d_regs[bp * 2] && 926 if (reg.eda >= bp_d_regs[bp * 2] &&
927 reg.eda <= bp_d_regs[bp * 2 + 1]) { 927 reg.eda <= bp_d_regs[bp * 2 + 1]) {
928 /* EDA withing range for this BP; it must be the one 928 /* EDA within range for this BP; it must be the one
929 we're looking for. */ 929 we're looking for. */
930 stopped_data_address = reg.eda; 930 stopped_data_address = reg.eda;
931 break; 931 break;
diff --git a/arch/cris/arch-v32/kernel/process.c b/arch/cris/arch-v32/kernel/process.c
index 562f84718906..0570e8ce603d 100644
--- a/arch/cris/arch-v32/kernel/process.c
+++ b/arch/cris/arch-v32/kernel/process.c
@@ -149,7 +149,7 @@ copy_thread(unsigned long clone_flags, unsigned long usp,
149 childregs->r10 = 0; /* Child returns 0 after a fork/clone. */ 149 childregs->r10 = 0; /* Child returns 0 after a fork/clone. */
150 150
151 /* Set a new TLS ? 151 /* Set a new TLS ?
152 * The TLS is in $mof beacuse it is the 5th argument to sys_clone. 152 * The TLS is in $mof because it is the 5th argument to sys_clone.
153 */ 153 */
154 if (p->mm && (clone_flags & CLONE_SETTLS)) { 154 if (p->mm && (clone_flags & CLONE_SETTLS)) {
155 task_thread_info(p)->tls = regs->mof; 155 task_thread_info(p)->tls = regs->mof;
diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c
index b3a05ae56214..ce4ab1a5552c 100644
--- a/arch/cris/arch-v32/kernel/signal.c
+++ b/arch/cris/arch-v32/kernel/signal.c
@@ -610,7 +610,7 @@ ugdb_trap_user(struct thread_info *ti, int sig)
610 user_regs(ti)->spc = 0; 610 user_regs(ti)->spc = 0;
611 } 611 }
612 /* FIXME: Filter out false h/w breakpoint hits (i.e. EDA 612 /* FIXME: Filter out false h/w breakpoint hits (i.e. EDA
613 not withing any configured h/w breakpoint range). Synchronize with 613 not within any configured h/w breakpoint range). Synchronize with
614 what already exists for kernel debugging. */ 614 what already exists for kernel debugging. */
615 if (((user_regs(ti)->exs & 0xff00) >> 8) == BREAK_8_INTR_VECT) { 615 if (((user_regs(ti)->exs & 0xff00) >> 8) == BREAK_8_INTR_VECT) {
616 /* Break 8: subtract 2 from ERP unless in a delay slot. */ 616 /* Break 8: subtract 2 from ERP unless in a delay slot. */
diff --git a/arch/cris/arch-v32/mach-a3/arbiter.c b/arch/cris/arch-v32/mach-a3/arbiter.c
index 8b924db71c9a..15f5c9de2639 100644
--- a/arch/cris/arch-v32/mach-a3/arbiter.c
+++ b/arch/cris/arch-v32/mach-a3/arbiter.c
@@ -568,7 +568,7 @@ crisv32_foo_arbiter_irq(int irq, void *dev_id)
568 REG_WR(marb_foo_bp, watch->instance, rw_ack, ack); 568 REG_WR(marb_foo_bp, watch->instance, rw_ack, ack);
569 REG_WR(marb_foo, regi_marb_foo, rw_ack_intr, ack_intr); 569 REG_WR(marb_foo, regi_marb_foo, rw_ack_intr, ack_intr);
570 570
571 printk(KERN_DEBUG "IRQ occured at %X\n", (unsigned)get_irq_regs()); 571 printk(KERN_DEBUG "IRQ occurred at %X\n", (unsigned)get_irq_regs());
572 572
573 if (watch->cb) 573 if (watch->cb)
574 watch->cb(); 574 watch->cb();
@@ -624,7 +624,7 @@ crisv32_bar_arbiter_irq(int irq, void *dev_id)
624 REG_WR(marb_bar_bp, watch->instance, rw_ack, ack); 624 REG_WR(marb_bar_bp, watch->instance, rw_ack, ack);
625 REG_WR(marb_bar, regi_marb_bar, rw_ack_intr, ack_intr); 625 REG_WR(marb_bar, regi_marb_bar, rw_ack_intr, ack_intr);
626 626
627 printk(KERN_DEBUG "IRQ occured at %X\n", (unsigned)get_irq_regs()->erp); 627 printk(KERN_DEBUG "IRQ occurred at %X\n", (unsigned)get_irq_regs()->erp);
628 628
629 if (watch->cb) 629 if (watch->cb)
630 watch->cb(); 630 watch->cb();
diff --git a/arch/cris/arch-v32/mach-fs/arbiter.c b/arch/cris/arch-v32/mach-fs/arbiter.c
index 82ef293c4c81..3f8ebb5c1477 100644
--- a/arch/cris/arch-v32/mach-fs/arbiter.c
+++ b/arch/cris/arch-v32/mach-fs/arbiter.c
@@ -395,7 +395,7 @@ static irqreturn_t crisv32_arbiter_irq(int irq, void *dev_id)
395 REG_WR(marb_bp, watch->instance, rw_ack, ack); 395 REG_WR(marb_bp, watch->instance, rw_ack, ack);
396 REG_WR(marb, regi_marb, rw_ack_intr, ack_intr); 396 REG_WR(marb, regi_marb, rw_ack_intr, ack_intr);
397 397
398 printk(KERN_INFO "IRQ occured at %lX\n", get_irq_regs()->erp); 398 printk(KERN_INFO "IRQ occurred at %lX\n", get_irq_regs()->erp);
399 399
400 if (watch->cb) 400 if (watch->cb)
401 watch->cb(); 401 watch->cb();
diff --git a/arch/cris/boot/rescue/head_v10.S b/arch/cris/boot/rescue/head_v10.S
index 2fafe247a25b..af55df0994b3 100644
--- a/arch/cris/boot/rescue/head_v10.S
+++ b/arch/cris/boot/rescue/head_v10.S
@@ -7,7 +7,7 @@
7 * for each partition that this code should check. 7 * for each partition that this code should check.
8 * 8 *
9 * If any of the checksums fail, we assume the flash is so 9 * If any of the checksums fail, we assume the flash is so
10 * corrupt that we cant use it to boot into the ftp flash 10 * corrupt that we can't use it to boot into the ftp flash
11 * loader, and instead we initialize the serial port to 11 * loader, and instead we initialize the serial port to
12 * receive a flash-loader and new flash image. we dont include 12 * receive a flash-loader and new flash image. we dont include
13 * any flash code here, but just accept a certain amount of 13 * any flash code here, but just accept a certain amount of
diff --git a/arch/cris/include/arch-v32/arch/hwregs/Makefile b/arch/cris/include/arch-v32/arch/hwregs/Makefile
index f9a05d2aa061..b8b3f8d666e4 100644
--- a/arch/cris/include/arch-v32/arch/hwregs/Makefile
+++ b/arch/cris/include/arch-v32/arch/hwregs/Makefile
@@ -1,6 +1,6 @@
1# Makefile to generate or copy the latest register definitions 1# Makefile to generate or copy the latest register definitions
2# and related datastructures and helpermacros. 2# and related datastructures and helpermacros.
3# The offical place for these files is at: 3# The official place for these files is at:
4RELEASE ?= r1_alfa5 4RELEASE ?= r1_alfa5
5OFFICIAL_INCDIR = /n/asic/projects/guinness/releases/$(RELEASE)/design/top/sw/include/ 5OFFICIAL_INCDIR = /n/asic/projects/guinness/releases/$(RELEASE)/design/top/sw/include/
6 6
diff --git a/arch/cris/include/arch-v32/arch/hwregs/iop/Makefile b/arch/cris/include/arch-v32/arch/hwregs/iop/Makefile
index a90056a095e3..0747a22e3c07 100644
--- a/arch/cris/include/arch-v32/arch/hwregs/iop/Makefile
+++ b/arch/cris/include/arch-v32/arch/hwregs/iop/Makefile
@@ -1,7 +1,7 @@
1# $Id: Makefile,v 1.3 2004/01/07 20:34:55 johana Exp $ 1# $Id: Makefile,v 1.3 2004/01/07 20:34:55 johana Exp $
2# Makefile to generate or copy the latest register definitions 2# Makefile to generate or copy the latest register definitions
3# and related datastructures and helpermacros. 3# and related datastructures and helpermacros.
4# The offical place for these files is probably at: 4# The official place for these files is probably at:
5RELEASE ?= r1_alfa5 5RELEASE ?= r1_alfa5
6IOPOFFICIAL_INCDIR = /n/asic/projects/guinness/releases/$(RELEASE)/design/top/sw/include/ 6IOPOFFICIAL_INCDIR = /n/asic/projects/guinness/releases/$(RELEASE)/design/top/sw/include/
7 7
diff --git a/arch/cris/include/asm/pgtable.h b/arch/cris/include/asm/pgtable.h
index 9eaae217b21b..7df430138355 100644
--- a/arch/cris/include/asm/pgtable.h
+++ b/arch/cris/include/asm/pgtable.h
@@ -97,7 +97,7 @@ extern unsigned long empty_zero_page;
97#define pte_clear(mm,addr,xp) do { pte_val(*(xp)) = 0; } while (0) 97#define pte_clear(mm,addr,xp) do { pte_val(*(xp)) = 0; } while (0)
98 98
99#define pmd_none(x) (!pmd_val(x)) 99#define pmd_none(x) (!pmd_val(x))
100/* by removing the _PAGE_KERNEL bit from the comparision, the same pmd_bad 100/* by removing the _PAGE_KERNEL bit from the comparison, the same pmd_bad
101 * works for both _PAGE_TABLE and _KERNPG_TABLE pmd entries. 101 * works for both _PAGE_TABLE and _KERNPG_TABLE pmd entries.
102 */ 102 */
103#define pmd_bad(x) ((pmd_val(x) & (~PAGE_MASK & ~_PAGE_KERNEL)) != _PAGE_TABLE) 103#define pmd_bad(x) ((pmd_val(x) & (~PAGE_MASK & ~_PAGE_KERNEL)) != _PAGE_TABLE)
diff --git a/arch/cris/kernel/traps.c b/arch/cris/kernel/traps.c
index 541efbf09371..8da53f34c7a7 100644
--- a/arch/cris/kernel/traps.c
+++ b/arch/cris/kernel/traps.c
@@ -183,7 +183,7 @@ __initcall(oops_nmi_register);
183 183
184/* 184/*
185 * This gets called from entry.S when the watchdog has bitten. Show something 185 * This gets called from entry.S when the watchdog has bitten. Show something
186 * similiar to an Oops dump, and if the kernel is configured to be a nice 186 * similar to an Oops dump, and if the kernel is configured to be a nice
187 * doggy, then halt instead of reboot. 187 * doggy, then halt instead of reboot.
188 */ 188 */
189void 189void
diff --git a/arch/frv/include/asm/pci.h b/arch/frv/include/asm/pci.h
index 0d5997909850..ef03baf5d89d 100644
--- a/arch/frv/include/asm/pci.h
+++ b/arch/frv/include/asm/pci.h
@@ -54,7 +54,7 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
54#endif 54#endif
55 55
56/* 56/*
57 * These are pretty much arbitary with the CoMEM implementation. 57 * These are pretty much arbitrary with the CoMEM implementation.
58 * We have the whole address space to ourselves. 58 * We have the whole address space to ourselves.
59 */ 59 */
60#define PCIBIOS_MIN_IO 0x100 60#define PCIBIOS_MIN_IO 0x100
diff --git a/arch/frv/include/asm/spr-regs.h b/arch/frv/include/asm/spr-regs.h
index 01e6af5e99b8..d3883021f236 100644
--- a/arch/frv/include/asm/spr-regs.h
+++ b/arch/frv/include/asm/spr-regs.h
@@ -274,7 +274,7 @@
274#define MSR0_RD 0xc0000000 /* rounding mode */ 274#define MSR0_RD 0xc0000000 /* rounding mode */
275#define MSR0_RD_NEAREST 0x00000000 /* - nearest */ 275#define MSR0_RD_NEAREST 0x00000000 /* - nearest */
276#define MSR0_RD_ZERO 0x40000000 /* - zero */ 276#define MSR0_RD_ZERO 0x40000000 /* - zero */
277#define MSR0_RD_POS_INF 0x80000000 /* - postive infinity */ 277#define MSR0_RD_POS_INF 0x80000000 /* - positive infinity */
278#define MSR0_RD_NEG_INF 0xc0000000 /* - negative infinity */ 278#define MSR0_RD_NEG_INF 0xc0000000 /* - negative infinity */
279 279
280/* 280/*
diff --git a/arch/frv/include/asm/virtconvert.h b/arch/frv/include/asm/virtconvert.h
index 59788fa2a813..b26d70ab9111 100644
--- a/arch/frv/include/asm/virtconvert.h
+++ b/arch/frv/include/asm/virtconvert.h
@@ -1,4 +1,4 @@
1/* virtconvert.h: virtual/physical/page address convertion 1/* virtconvert.h: virtual/physical/page address conversion
2 * 2 *
3 * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. 3 * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
4 * Written by David Howells (dhowells@redhat.com) 4 * Written by David Howells (dhowells@redhat.com)
diff --git a/arch/frv/kernel/entry-table.S b/arch/frv/kernel/entry-table.S
index bf35f33e48c9..06c5ae191e59 100644
--- a/arch/frv/kernel/entry-table.S
+++ b/arch/frv/kernel/entry-table.S
@@ -86,7 +86,7 @@ __break_usertrap_fixup_table:
86 .globl __break_kerneltrap_fixup_table 86 .globl __break_kerneltrap_fixup_table
87__break_kerneltrap_fixup_table: 87__break_kerneltrap_fixup_table:
88 88
89 # handler declaration for a sofware or program interrupt 89 # handler declaration for a software or program interrupt
90.macro VECTOR_SOFTPROG tbr_tt, vec 90.macro VECTOR_SOFTPROG tbr_tt, vec
91 .section .trap.user 91 .section .trap.user
92 .org \tbr_tt 92 .org \tbr_tt
@@ -145,7 +145,7 @@ __break_kerneltrap_fixup_table:
145 .long \vec 145 .long \vec
146.endm 146.endm
147 147
148 # handler declaration for an MMU only sofware or program interrupt 148 # handler declaration for an MMU only software or program interrupt
149.macro VECTOR_SP_MMU tbr_tt, vec 149.macro VECTOR_SP_MMU tbr_tt, vec
150#ifdef CONFIG_MMU 150#ifdef CONFIG_MMU
151 VECTOR_SOFTPROG \tbr_tt, \vec 151 VECTOR_SOFTPROG \tbr_tt, \vec
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index c4ea0925cdbd..e5cc56ae6ce3 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -414,11 +414,11 @@ config PERMIT_BSP_REMOVE
414 support. 414 support.
415 415
416config FORCE_CPEI_RETARGET 416config FORCE_CPEI_RETARGET
417 bool "Force assumption that CPEI can be re-targetted" 417 bool "Force assumption that CPEI can be re-targeted"
418 depends on PERMIT_BSP_REMOVE 418 depends on PERMIT_BSP_REMOVE
419 default n 419 default n
420 ---help--- 420 ---help---
421 Say Y if you need to force the assumption that CPEI can be re-targetted to 421 Say Y if you need to force the assumption that CPEI can be re-targeted to
422 any cpu in the system. This hint is available via ACPI 3.0 specifications. 422 any cpu in the system. This hint is available via ACPI 3.0 specifications.
423 Tiger4 systems are capable of re-directing CPEI to any CPU other than BSP. 423 Tiger4 systems are capable of re-directing CPEI to any CPU other than BSP.
424 This option it useful to enable this feature on older BIOS's as well. 424 This option it useful to enable this feature on older BIOS's as well.
diff --git a/arch/ia64/include/asm/pal.h b/arch/ia64/include/asm/pal.h
index 6a292505b396..2e69284df8e7 100644
--- a/arch/ia64/include/asm/pal.h
+++ b/arch/ia64/include/asm/pal.h
@@ -1669,7 +1669,7 @@ typedef union pal_vp_info_u {
1669} pal_vp_info_u_t; 1669} pal_vp_info_u_t;
1670 1670
1671/* 1671/*
1672 * Returns infomation about virtual processor features 1672 * Returns information about virtual processor features
1673 */ 1673 */
1674static inline s64 1674static inline s64
1675ia64_pal_vp_info (u64 feature_set, u64 vp_buffer, u64 *vp_info, u64 *vmm_id) 1675ia64_pal_vp_info (u64 feature_set, u64 vp_buffer, u64 *vp_info, u64 *vmm_id)
diff --git a/arch/ia64/include/asm/perfmon_default_smpl.h b/arch/ia64/include/asm/perfmon_default_smpl.h
index 74724b24c2b7..a2d560c67230 100644
--- a/arch/ia64/include/asm/perfmon_default_smpl.h
+++ b/arch/ia64/include/asm/perfmon_default_smpl.h
@@ -67,8 +67,8 @@ typedef struct {
67 unsigned long ip; /* where did the overflow interrupt happened */ 67 unsigned long ip; /* where did the overflow interrupt happened */
68 unsigned long tstamp; /* ar.itc when entering perfmon intr. handler */ 68 unsigned long tstamp; /* ar.itc when entering perfmon intr. handler */
69 69
70 unsigned short cpu; /* cpu on which the overflow occured */ 70 unsigned short cpu; /* cpu on which the overflow occurred */
71 unsigned short set; /* event set active when overflow ocurred */ 71 unsigned short set; /* event set active when overflow occurred */
72 int tgid; /* thread group id (for NPTL, this is getpid()) */ 72 int tgid; /* thread group id (for NPTL, this is getpid()) */
73} pfm_default_smpl_entry_t; 73} pfm_default_smpl_entry_t;
74 74
diff --git a/arch/ia64/include/asm/sn/bte.h b/arch/ia64/include/asm/sn/bte.h
index 96798d2da7c2..cc6c4dbf53af 100644
--- a/arch/ia64/include/asm/sn/bte.h
+++ b/arch/ia64/include/asm/sn/bte.h
@@ -216,7 +216,7 @@ extern void bte_error_handler(unsigned long);
216 bte_copy(0, dest, len, ((mode) | BTE_ZERO_FILL), notification) 216 bte_copy(0, dest, len, ((mode) | BTE_ZERO_FILL), notification)
217 217
218/* 218/*
219 * The following is the prefered way of calling bte_unaligned_copy 219 * The following is the preferred way of calling bte_unaligned_copy
220 * If the copy is fully cache line aligned, then bte_copy is 220 * If the copy is fully cache line aligned, then bte_copy is
221 * used instead. Since bte_copy is inlined, this saves a call 221 * used instead. Since bte_copy is inlined, this saves a call
222 * stack. NOTE: bte_copy is called synchronously and does block 222 * stack. NOTE: bte_copy is called synchronously and does block
diff --git a/arch/ia64/include/asm/sn/shub_mmr.h b/arch/ia64/include/asm/sn/shub_mmr.h
index 7de1d1d4b71a..a84d870f4294 100644
--- a/arch/ia64/include/asm/sn/shub_mmr.h
+++ b/arch/ia64/include/asm/sn/shub_mmr.h
@@ -459,7 +459,7 @@
459/* ==================================================================== */ 459/* ==================================================================== */
460/* Some MMRs are functionally identical (or close enough) on both SHUB1 */ 460/* Some MMRs are functionally identical (or close enough) on both SHUB1 */
461/* and SHUB2 that it makes sense to define a geberic name for the MMR. */ 461/* and SHUB2 that it makes sense to define a geberic name for the MMR. */
462/* It is acceptible to use (for example) SH_IPI_INT to reference the */ 462/* It is acceptable to use (for example) SH_IPI_INT to reference the */
463/* the IPI MMR. The value of SH_IPI_INT is determined at runtime based */ 463/* the IPI MMR. The value of SH_IPI_INT is determined at runtime based */
464/* on the type of the SHUB. Do not use these #defines in performance */ 464/* on the type of the SHUB. Do not use these #defines in performance */
465/* critical code or loops - there is a small performance penalty. */ 465/* critical code or loops - there is a small performance penalty. */
diff --git a/arch/ia64/include/asm/sn/shubio.h b/arch/ia64/include/asm/sn/shubio.h
index 6052422a22b3..ecb8a49476b6 100644
--- a/arch/ia64/include/asm/sn/shubio.h
+++ b/arch/ia64/include/asm/sn/shubio.h
@@ -1383,7 +1383,7 @@ typedef union ii_ibcr_u {
1383 * response is capture in IXSM and IXSS, and IXSS[VALID] is set. The * 1383 * response is capture in IXSM and IXSS, and IXSS[VALID] is set. The *
1384 * errant header is thereby captured, and no further spurious read * 1384 * errant header is thereby captured, and no further spurious read *
1385 * respones are captured until IXSS[VALID] is cleared by setting the * 1385 * respones are captured until IXSS[VALID] is cleared by setting the *
1386 * appropriate bit in IECLR.Everytime a spurious read response is * 1386 * appropriate bit in IECLR. Every time a spurious read response is *
1387 * detected, the SPUR_RD bit of the PRB corresponding to the incoming * 1387 * detected, the SPUR_RD bit of the PRB corresponding to the incoming *
1388 * message's SIDN field is set. This always happens, regarless of * 1388 * message's SIDN field is set. This always happens, regarless of *
1389 * whether a header is captured. The programmer should check * 1389 * whether a header is captured. The programmer should check *
@@ -2738,7 +2738,7 @@ typedef union ii_ippr_u {
2738/************************************************************************ 2738/************************************************************************
2739 * * 2739 * *
2740 * The following defines which were not formed into structures are * 2740 * The following defines which were not formed into structures are *
2741 * probably indentical to another register, and the name of the * 2741 * probably identical to another register, and the name of the *
2742 * register is provided against each of these registers. This * 2742 * register is provided against each of these registers. This *
2743 * information needs to be checked carefully * 2743 * information needs to be checked carefully *
2744 * * 2744 * *
diff --git a/arch/ia64/kernel/cyclone.c b/arch/ia64/kernel/cyclone.c
index d52f1f78eff2..1b811c61bdc6 100644
--- a/arch/ia64/kernel/cyclone.c
+++ b/arch/ia64/kernel/cyclone.c
@@ -31,7 +31,7 @@ static struct clocksource clocksource_cyclone = {
31 .rating = 300, 31 .rating = 300,
32 .read = read_cyclone, 32 .read = read_cyclone,
33 .mask = (1LL << 40) - 1, 33 .mask = (1LL << 40) - 1,
34 .mult = 0, /*to be caluclated*/ 34 .mult = 0, /*to be calculated*/
35 .shift = 16, 35 .shift = 16,
36 .flags = CLOCK_SOURCE_IS_CONTINUOUS, 36 .flags = CLOCK_SOURCE_IS_CONTINUOUS,
37}; 37};
diff --git a/arch/ia64/kernel/perfmon_default_smpl.c b/arch/ia64/kernel/perfmon_default_smpl.c
index 5f637bbfcccd..30c644ea44c9 100644
--- a/arch/ia64/kernel/perfmon_default_smpl.c
+++ b/arch/ia64/kernel/perfmon_default_smpl.c
@@ -150,7 +150,7 @@ default_handler(struct task_struct *task, void *buf, pfm_ovfl_arg_t *arg, struct
150 * current = task running at the time of the overflow. 150 * current = task running at the time of the overflow.
151 * 151 *
152 * per-task mode: 152 * per-task mode:
153 * - this is ususally the task being monitored. 153 * - this is usually the task being monitored.
154 * Under certain conditions, it might be a different task 154 * Under certain conditions, it might be a different task
155 * 155 *
156 * system-wide: 156 * system-wide:
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 44f11ee411c0..14ec641003da 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -703,7 +703,7 @@ int migrate_platform_irqs(unsigned int cpu)
703 data->chip->irq_disable(data); 703 data->chip->irq_disable(data);
704 data->chip->irq_set_affinity(data, mask, false); 704 data->chip->irq_set_affinity(data, mask, false);
705 data->chip->irq_enable(data); 705 data->chip->irq_enable(data);
706 printk ("Re-targetting CPEI to cpu %d\n", new_cpei_cpu); 706 printk ("Re-targeting CPEI to cpu %d\n", new_cpei_cpu);
707 } 707 }
708 } 708 }
709 if (!data) { 709 if (!data) {
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index 0baa1bbb65fe..0e0e0cc9e392 100644
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -43,7 +43,7 @@ int __ref arch_register_cpu(int num)
43{ 43{
44#ifdef CONFIG_ACPI 44#ifdef CONFIG_ACPI
45 /* 45 /*
46 * If CPEI can be re-targetted or if this is not 46 * If CPEI can be re-targeted or if this is not
47 * CPEI target, then it is hotpluggable 47 * CPEI target, then it is hotpluggable
48 */ 48 */
49 if (can_cpei_retarget() || !is_cpu_cpei_target(num)) 49 if (can_cpei_retarget() || !is_cpu_cpei_target(num))
diff --git a/arch/ia64/kvm/process.c b/arch/ia64/kvm/process.c
index bb862fb224f2..b0398740b48d 100644
--- a/arch/ia64/kvm/process.c
+++ b/arch/ia64/kvm/process.c
@@ -987,7 +987,7 @@ static void vmm_sanity_check(struct kvm_vcpu *vcpu)
987 987
988static void kvm_do_resume_op(struct kvm_vcpu *vcpu) 988static void kvm_do_resume_op(struct kvm_vcpu *vcpu)
989{ 989{
990 vmm_sanity_check(vcpu); /*Guarantee vcpu runing on healthy vmm!*/ 990 vmm_sanity_check(vcpu); /*Guarantee vcpu running on healthy vmm!*/
991 991
992 if (test_and_clear_bit(KVM_REQ_RESUME, &vcpu->requests)) { 992 if (test_and_clear_bit(KVM_REQ_RESUME, &vcpu->requests)) {
993 vcpu_do_resume(vcpu); 993 vcpu_do_resume(vcpu);
diff --git a/arch/ia64/lib/do_csum.S b/arch/ia64/lib/do_csum.S
index 6bec2fc9f5b2..1a431a5cf86f 100644
--- a/arch/ia64/lib/do_csum.S
+++ b/arch/ia64/lib/do_csum.S
@@ -201,7 +201,7 @@ GLOBAL_ENTRY(do_csum)
201 ;; 201 ;;
202(p6) adds result1[0]=1,result1[0] 202(p6) adds result1[0]=1,result1[0]
203(p9) br.cond.sptk .do_csum_exit // if (count == 1) exit 203(p9) br.cond.sptk .do_csum_exit // if (count == 1) exit
204 // Fall through to caluculate the checksum, feeding result1[0] as 204 // Fall through to calculate the checksum, feeding result1[0] as
205 // the initial value in result1[0]. 205 // the initial value in result1[0].
206 // 206 //
207 // Calculate the checksum loading two 8-byte words per loop. 207 // Calculate the checksum loading two 8-byte words per loop.
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c
index 139c018dbbf9..81a1f4e6bcd8 100644
--- a/arch/ia64/sn/kernel/irq.c
+++ b/arch/ia64/sn/kernel/irq.c
@@ -227,7 +227,7 @@ void sn_set_err_irq_affinity(unsigned int irq)
227{ 227{
228 /* 228 /*
229 * On systems which support CPU disabling (SHub2), all error interrupts 229 * On systems which support CPU disabling (SHub2), all error interrupts
230 * are targetted at the boot CPU. 230 * are targeted at the boot CPU.
231 */ 231 */
232 if (is_shub2() && sn_prom_feature_available(PRF_CPU_DISABLE_SUPPORT)) 232 if (is_shub2() && sn_prom_feature_available(PRF_CPU_DISABLE_SUPPORT))
233 set_irq_affinity_info(irq, cpu_physical_id(0), 0); 233 set_irq_affinity_info(irq, cpu_physical_id(0), 0);
@@ -435,7 +435,7 @@ static void sn_check_intr(int irq, struct sn_irq_info *sn_irq_info)
435 /* 435 /*
436 * Bridge types attached to TIO (anything but PIC) do not need this WAR 436 * Bridge types attached to TIO (anything but PIC) do not need this WAR
437 * since they do not target Shub II interrupt registers. If that 437 * since they do not target Shub II interrupt registers. If that
438 * ever changes, this check needs to accomodate. 438 * ever changes, this check needs to accommodate.
439 */ 439 */
440 if (sn_irq_info->irq_bridge_type != PCIIO_ASIC_TYPE_PIC) 440 if (sn_irq_info->irq_bridge_type != PCIIO_ASIC_TYPE_PIC)
441 return; 441 return;
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_dma.c b/arch/ia64/sn/pci/pcibr/pcibr_dma.c
index c659ad5613a0..33def666a664 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_dma.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_dma.c
@@ -227,7 +227,7 @@ pcibr_dma_unmap(struct pci_dev *hwdev, dma_addr_t dma_handle, int direction)
227 * after doing the read. For PIC this routine then forces a fake interrupt 227 * after doing the read. For PIC this routine then forces a fake interrupt
228 * on another line, which is logically associated with the slot that the PIO 228 * on another line, which is logically associated with the slot that the PIO
229 * is addressed to. It then spins while watching the memory location that 229 * is addressed to. It then spins while watching the memory location that
230 * the interrupt is targetted to. When the interrupt response arrives, we 230 * the interrupt is targeted to. When the interrupt response arrives, we
231 * are sure that the DMA has landed in memory and it is safe for the driver 231 * are sure that the DMA has landed in memory and it is safe for the driver
232 * to proceed. For TIOCP use the Device(x) Write Request Buffer Flush 232 * to proceed. For TIOCP use the Device(x) Write Request Buffer Flush
233 * Bridge register since it ensures the data has entered the coherence domain, 233 * Bridge register since it ensures the data has entered the coherence domain,
diff --git a/arch/m32r/include/asm/m32104ut/m32104ut_pld.h b/arch/m32r/include/asm/m32104ut/m32104ut_pld.h
index 2dc89d68b6d9..1feae9709f24 100644
--- a/arch/m32r/include/asm/m32104ut/m32104ut_pld.h
+++ b/arch/m32r/include/asm/m32104ut/m32104ut_pld.h
@@ -4,7 +4,7 @@
4/* 4/*
5 * include/asm-m32r/m32104ut/m32104ut_pld.h 5 * include/asm-m32r/m32104ut/m32104ut_pld.h
6 * 6 *
7 * Definitions for Programable Logic Device(PLD) on M32104UT board. 7 * Definitions for Programmable Logic Device(PLD) on M32104UT board.
8 * Based on m32700ut_pld.h 8 * Based on m32700ut_pld.h
9 * 9 *
10 * Copyright (c) 2002 Takeo Takahashi 10 * Copyright (c) 2002 Takeo Takahashi
diff --git a/arch/m32r/include/asm/m32700ut/m32700ut_pld.h b/arch/m32r/include/asm/m32700ut/m32700ut_pld.h
index 57623beb44cb..35294670b187 100644
--- a/arch/m32r/include/asm/m32700ut/m32700ut_pld.h
+++ b/arch/m32r/include/asm/m32700ut/m32700ut_pld.h
@@ -4,7 +4,7 @@
4/* 4/*
5 * include/asm-m32r/m32700ut/m32700ut_pld.h 5 * include/asm-m32r/m32700ut/m32700ut_pld.h
6 * 6 *
7 * Definitions for Programable Logic Device(PLD) on M32700UT board. 7 * Definitions for Programmable Logic Device(PLD) on M32700UT board.
8 * 8 *
9 * Copyright (c) 2002 Takeo Takahashi 9 * Copyright (c) 2002 Takeo Takahashi
10 * 10 *
diff --git a/arch/m32r/include/asm/opsput/opsput_pld.h b/arch/m32r/include/asm/opsput/opsput_pld.h
index 3f11ea1aac2d..6901401fe9eb 100644
--- a/arch/m32r/include/asm/opsput/opsput_pld.h
+++ b/arch/m32r/include/asm/opsput/opsput_pld.h
@@ -4,7 +4,7 @@
4/* 4/*
5 * include/asm-m32r/opsput/opsput_pld.h 5 * include/asm-m32r/opsput/opsput_pld.h
6 * 6 *
7 * Definitions for Programable Logic Device(PLD) on OPSPUT board. 7 * Definitions for Programmable Logic Device(PLD) on OPSPUT board.
8 * 8 *
9 * Copyright (c) 2002 Takeo Takahashi 9 * Copyright (c) 2002 Takeo Takahashi
10 * 10 *
diff --git a/arch/m32r/include/asm/pgtable-2level.h b/arch/m32r/include/asm/pgtable-2level.h
index bca3475f9595..9cdaf7350ef6 100644
--- a/arch/m32r/include/asm/pgtable-2level.h
+++ b/arch/m32r/include/asm/pgtable-2level.h
@@ -44,7 +44,7 @@ static inline int pgd_present(pgd_t pgd) { return 1; }
44#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval) 44#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
45 45
46/* 46/*
47 * (pmds are folded into pgds so this doesnt get actually called, 47 * (pmds are folded into pgds so this doesn't get actually called,
48 * but the define is needed for a generic inline function.) 48 * but the define is needed for a generic inline function.)
49 */ 49 */
50#define set_pmd(pmdptr, pmdval) (*(pmdptr) = pmdval) 50#define set_pmd(pmdptr, pmdval) (*(pmdptr) = pmdval)
diff --git a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c
index b8ec002aef8e..2c9aeb453847 100644
--- a/arch/m32r/mm/fault.c
+++ b/arch/m32r/mm/fault.c
@@ -120,7 +120,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code,
120 120
121 /* When running in the kernel we expect faults to occur only to 121 /* When running in the kernel we expect faults to occur only to
122 * addresses in user space. All other faults represent errors in the 122 * addresses in user space. All other faults represent errors in the
123 * kernel and should generate an OOPS. Unfortunatly, in the case of an 123 * kernel and should generate an OOPS. Unfortunately, in the case of an
124 * erroneous fault occurring in a code path which already holds mmap_sem 124 * erroneous fault occurring in a code path which already holds mmap_sem
125 * we will deadlock attempting to validate the fault against the 125 * we will deadlock attempting to validate the fault against the
126 * address space. Luckily the kernel only validly references user 126 * address space. Luckily the kernel only validly references user
@@ -128,7 +128,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code,
128 * exceptions table. 128 * exceptions table.
129 * 129 *
130 * As the vast majority of faults will be valid we will only perform 130 * As the vast majority of faults will be valid we will only perform
131 * the source reference check when there is a possibilty of a deadlock. 131 * the source reference check when there is a possibility of a deadlock.
132 * Attempt to lock the address space, if we cannot we then validate the 132 * Attempt to lock the address space, if we cannot we then validate the
133 * source. If this is invalid we can skip the address space check, 133 * source. If this is invalid we can skip the address space check,
134 * thus avoiding the deadlock. 134 * thus avoiding the deadlock.
diff --git a/arch/m68k/atari/atakeyb.c b/arch/m68k/atari/atakeyb.c
index 5890897d28bf..b995513d527f 100644
--- a/arch/m68k/atari/atakeyb.c
+++ b/arch/m68k/atari/atakeyb.c
@@ -130,7 +130,7 @@ KEYBOARD_STATE kb_state;
130 * it's really hard to decide whether they're mouse or keyboard bytes. Since 130 * it's really hard to decide whether they're mouse or keyboard bytes. Since
131 * overruns usually occur when moving the Atari mouse rapidly, they're seen as 131 * overruns usually occur when moving the Atari mouse rapidly, they're seen as
132 * mouse bytes here. If this is wrong, only a make code of the keyboard gets 132 * mouse bytes here. If this is wrong, only a make code of the keyboard gets
133 * lost, which isn't too bad. Loosing a break code would be disastrous, 133 * lost, which isn't too bad. Losing a break code would be disastrous,
134 * because then the keyboard repeat strikes... 134 * because then the keyboard repeat strikes...
135 */ 135 */
136 136
diff --git a/arch/m68k/fpsp040/bindec.S b/arch/m68k/fpsp040/bindec.S
index 72f1159cb804..f2e795231046 100644
--- a/arch/m68k/fpsp040/bindec.S
+++ b/arch/m68k/fpsp040/bindec.S
@@ -609,7 +609,7 @@ do_fint:
609| A6. This test occurs only on the first pass. If the 609| A6. This test occurs only on the first pass. If the
610| result is exactly 10^LEN, decrement ILOG and divide 610| result is exactly 10^LEN, decrement ILOG and divide
611| the mantissa by 10. The calculation of 10^LEN cannot 611| the mantissa by 10. The calculation of 10^LEN cannot
612| be inexact, since all powers of ten upto 10^27 are exact 612| be inexact, since all powers of ten up to 10^27 are exact
613| in extended precision, so the use of a previous power-of-ten 613| in extended precision, so the use of a previous power-of-ten
614| table will introduce no error. 614| table will introduce no error.
615| 615|
diff --git a/arch/m68k/ifpsp060/src/fpsp.S b/arch/m68k/ifpsp060/src/fpsp.S
index 26e85e2b7a5e..78cb60f5bb4d 100644
--- a/arch/m68k/ifpsp060/src/fpsp.S
+++ b/arch/m68k/ifpsp060/src/fpsp.S
@@ -11813,7 +11813,7 @@ fmul_unfl_ena:
11813 bne.b fmul_unfl_ena_sd # no, sgl or dbl 11813 bne.b fmul_unfl_ena_sd # no, sgl or dbl
11814 11814
11815# if the rnd mode is anything but RZ, then we have to re-do the above 11815# if the rnd mode is anything but RZ, then we have to re-do the above
11816# multiplication becuase we used RZ for all. 11816# multiplication because we used RZ for all.
11817 fmov.l L_SCR3(%a6),%fpcr # set FPCR 11817 fmov.l L_SCR3(%a6),%fpcr # set FPCR
11818 11818
11819fmul_unfl_ena_cont: 11819fmul_unfl_ena_cont:
@@ -18095,7 +18095,7 @@ fscc_mem_op:
18095 18095
18096 rts 18096 rts
18097 18097
18098# addresing mode is post-increment. write the result byte. if the write 18098# addressing mode is post-increment. write the result byte. if the write
18099# fails then don't update the address register. if write passes then 18099# fails then don't update the address register. if write passes then
18100# call inc_areg() to update the address register. 18100# call inc_areg() to update the address register.
18101fscc_mem_inc: 18101fscc_mem_inc:
@@ -20876,7 +20876,7 @@ dst_get_dupper:
20876 swap %d0 # d0 now in upper word 20876 swap %d0 # d0 now in upper word
20877 lsl.l &0x4,%d0 # d0 in proper place for dbl prec exp 20877 lsl.l &0x4,%d0 # d0 in proper place for dbl prec exp
20878 tst.b FTEMP_EX(%a0) # test sign 20878 tst.b FTEMP_EX(%a0) # test sign
20879 bpl.b dst_get_dman # if postive, go process mantissa 20879 bpl.b dst_get_dman # if positive, go process mantissa
20880 bset &0x1f,%d0 # if negative, set sign 20880 bset &0x1f,%d0 # if negative, set sign
20881dst_get_dman: 20881dst_get_dman:
20882 mov.l FTEMP_HI(%a0),%d1 # get ms mantissa 20882 mov.l FTEMP_HI(%a0),%d1 # get ms mantissa
@@ -22943,7 +22943,7 @@ tbl_ovfl_result:
22943# FP_SRC(a6) = packed operand now as a binary FP number # 22943# FP_SRC(a6) = packed operand now as a binary FP number #
22944# # 22944# #
22945# ALGORITHM *********************************************************** # 22945# ALGORITHM *********************************************************** #
22946# Get the correct <ea> whihc is the value on the exception stack # 22946# Get the correct <ea> which is the value on the exception stack #
22947# frame w/ maybe a correction factor if the <ea> is -(an) or (an)+. # 22947# frame w/ maybe a correction factor if the <ea> is -(an) or (an)+. #
22948# Then, fetch the operand from memory. If the fetch fails, exit # 22948# Then, fetch the operand from memory. If the fetch fails, exit #
22949# through facc_in_x(). # 22949# through facc_in_x(). #
@@ -24096,7 +24096,7 @@ do_fint12:
24096# A6. This test occurs only on the first pass. If the 24096# A6. This test occurs only on the first pass. If the
24097# result is exactly 10^LEN, decrement ILOG and divide 24097# result is exactly 10^LEN, decrement ILOG and divide
24098# the mantissa by 10. The calculation of 10^LEN cannot 24098# the mantissa by 10. The calculation of 10^LEN cannot
24099# be inexact, since all powers of ten upto 10^27 are exact 24099# be inexact, since all powers of ten up to 10^27 are exact
24100# in extended precision, so the use of a previous power-of-ten 24100# in extended precision, so the use of a previous power-of-ten
24101# table will introduce no error. 24101# table will introduce no error.
24102# 24102#
diff --git a/arch/m68k/ifpsp060/src/pfpsp.S b/arch/m68k/ifpsp060/src/pfpsp.S
index e71ba0ab013c..4aedef973cf6 100644
--- a/arch/m68k/ifpsp060/src/pfpsp.S
+++ b/arch/m68k/ifpsp060/src/pfpsp.S
@@ -7777,7 +7777,7 @@ dst_get_dupper:
7777 swap %d0 # d0 now in upper word 7777 swap %d0 # d0 now in upper word
7778 lsl.l &0x4,%d0 # d0 in proper place for dbl prec exp 7778 lsl.l &0x4,%d0 # d0 in proper place for dbl prec exp
7779 tst.b FTEMP_EX(%a0) # test sign 7779 tst.b FTEMP_EX(%a0) # test sign
7780 bpl.b dst_get_dman # if postive, go process mantissa 7780 bpl.b dst_get_dman # if positive, go process mantissa
7781 bset &0x1f,%d0 # if negative, set sign 7781 bset &0x1f,%d0 # if negative, set sign
7782dst_get_dman: 7782dst_get_dman:
7783 mov.l FTEMP_HI(%a0),%d1 # get ms mantissa 7783 mov.l FTEMP_HI(%a0),%d1 # get ms mantissa
@@ -8244,7 +8244,7 @@ fmul_unfl_ena:
8244 bne.b fmul_unfl_ena_sd # no, sgl or dbl 8244 bne.b fmul_unfl_ena_sd # no, sgl or dbl
8245 8245
8246# if the rnd mode is anything but RZ, then we have to re-do the above 8246# if the rnd mode is anything but RZ, then we have to re-do the above
8247# multiplication becuase we used RZ for all. 8247# multiplication because we used RZ for all.
8248 fmov.l L_SCR3(%a6),%fpcr # set FPCR 8248 fmov.l L_SCR3(%a6),%fpcr # set FPCR
8249 8249
8250fmul_unfl_ena_cont: 8250fmul_unfl_ena_cont:
@@ -12903,7 +12903,7 @@ store_fpreg_7:
12903# FP_SRC(a6) = packed operand now as a binary FP number # 12903# FP_SRC(a6) = packed operand now as a binary FP number #
12904# # 12904# #
12905# ALGORITHM *********************************************************** # 12905# ALGORITHM *********************************************************** #
12906# Get the correct <ea> whihc is the value on the exception stack # 12906# Get the correct <ea> which is the value on the exception stack #
12907# frame w/ maybe a correction factor if the <ea> is -(an) or (an)+. # 12907# frame w/ maybe a correction factor if the <ea> is -(an) or (an)+. #
12908# Then, fetch the operand from memory. If the fetch fails, exit # 12908# Then, fetch the operand from memory. If the fetch fails, exit #
12909# through facc_in_x(). # 12909# through facc_in_x(). #
@@ -14056,7 +14056,7 @@ do_fint12:
14056# A6. This test occurs only on the first pass. If the 14056# A6. This test occurs only on the first pass. If the
14057# result is exactly 10^LEN, decrement ILOG and divide 14057# result is exactly 10^LEN, decrement ILOG and divide
14058# the mantissa by 10. The calculation of 10^LEN cannot 14058# the mantissa by 10. The calculation of 10^LEN cannot
14059# be inexact, since all powers of ten upto 10^27 are exact 14059# be inexact, since all powers of ten up to 10^27 are exact
14060# in extended precision, so the use of a previous power-of-ten 14060# in extended precision, so the use of a previous power-of-ten
14061# table will introduce no error. 14061# table will introduce no error.
14062# 14062#
diff --git a/arch/m68k/include/asm/atariints.h b/arch/m68k/include/asm/atariints.h
index f597892e43a0..656bbbf5a6ff 100644
--- a/arch/m68k/include/asm/atariints.h
+++ b/arch/m68k/include/asm/atariints.h
@@ -146,7 +146,7 @@ static inline void clear_mfp_bit( unsigned irq, int type )
146 146
147/* 147/*
148 * {en,dis}able_irq have the usual semantics of temporary blocking the 148 * {en,dis}able_irq have the usual semantics of temporary blocking the
149 * interrupt, but not loosing requests that happen between disabling and 149 * interrupt, but not losing requests that happen between disabling and
150 * enabling. This is done with the MFP mask registers. 150 * enabling. This is done with the MFP mask registers.
151 */ 151 */
152 152
diff --git a/arch/m68k/include/asm/bootstd.h b/arch/m68k/include/asm/bootstd.h
index bdc1a4ac4fe9..e518f5a575b7 100644
--- a/arch/m68k/include/asm/bootstd.h
+++ b/arch/m68k/include/asm/bootstd.h
@@ -31,7 +31,7 @@
31#define __BN_flash_write_range 20 31#define __BN_flash_write_range 20
32 32
33/* Calling conventions compatible to (uC)linux/68k 33/* Calling conventions compatible to (uC)linux/68k
34 * We use simmilar macros to call into the bootloader as for uClinux 34 * We use similar macros to call into the bootloader as for uClinux
35 */ 35 */
36 36
37#define __bsc_return(type, res) \ 37#define __bsc_return(type, res) \
diff --git a/arch/m68k/include/asm/commproc.h b/arch/m68k/include/asm/commproc.h
index edf5eb6c08d2..a73998528d26 100644
--- a/arch/m68k/include/asm/commproc.h
+++ b/arch/m68k/include/asm/commproc.h
@@ -88,7 +88,7 @@ typedef struct cpm_buf_desc {
88 88
89 89
90/* rx bd status/control bits */ 90/* rx bd status/control bits */
91#define BD_SC_EMPTY ((ushort)0x8000) /* Recieve is empty */ 91#define BD_SC_EMPTY ((ushort)0x8000) /* Receive is empty */
92#define BD_SC_WRAP ((ushort)0x2000) /* Last buffer descriptor in table */ 92#define BD_SC_WRAP ((ushort)0x2000) /* Last buffer descriptor in table */
93#define BD_SC_INTRPT ((ushort)0x1000) /* Interrupt on change */ 93#define BD_SC_INTRPT ((ushort)0x1000) /* Interrupt on change */
94#define BD_SC_LAST ((ushort)0x0800) /* Last buffer in frame OR control char */ 94#define BD_SC_LAST ((ushort)0x0800) /* Last buffer in frame OR control char */
@@ -96,7 +96,7 @@ typedef struct cpm_buf_desc {
96#define BD_SC_FIRST ((ushort)0x0400) /* 1st buffer in an HDLC frame */ 96#define BD_SC_FIRST ((ushort)0x0400) /* 1st buffer in an HDLC frame */
97#define BD_SC_ADDR ((ushort)0x0400) /* 1st byte is a multidrop address */ 97#define BD_SC_ADDR ((ushort)0x0400) /* 1st byte is a multidrop address */
98 98
99#define BD_SC_CM ((ushort)0x0200) /* Continous mode */ 99#define BD_SC_CM ((ushort)0x0200) /* Continuous mode */
100#define BD_SC_ID ((ushort)0x0100) /* Received too many idles */ 100#define BD_SC_ID ((ushort)0x0100) /* Received too many idles */
101 101
102#define BD_SC_AM ((ushort)0x0080) /* Multidrop address match */ 102#define BD_SC_AM ((ushort)0x0080) /* Multidrop address match */
diff --git a/arch/m68k/include/asm/delay_no.h b/arch/m68k/include/asm/delay_no.h
index 55cbd6294ab6..c3a0edc90f21 100644
--- a/arch/m68k/include/asm/delay_no.h
+++ b/arch/m68k/include/asm/delay_no.h
@@ -16,7 +16,7 @@ static inline void __delay(unsigned long loops)
16 * long word alignment which is the faster version. 16 * long word alignment which is the faster version.
17 * The 0x4a8e is of course a 'tstl %fp' instruction. This is better 17 * The 0x4a8e is of course a 'tstl %fp' instruction. This is better
18 * than using a NOP (0x4e71) instruction because it executes in one 18 * than using a NOP (0x4e71) instruction because it executes in one
19 * cycle not three and doesn't allow for an arbitary delay waiting 19 * cycle not three and doesn't allow for an arbitrary delay waiting
20 * for bus cycles to finish. Also fp/a6 isn't likely to cause a 20 * for bus cycles to finish. Also fp/a6 isn't likely to cause a
21 * stall waiting for the register to become valid if such is added 21 * stall waiting for the register to become valid if such is added
22 * to the coldfire at some stage. 22 * to the coldfire at some stage.
diff --git a/arch/m68k/include/asm/gpio.h b/arch/m68k/include/asm/gpio.h
index c64c7b74cf86..b2046839f4b2 100644
--- a/arch/m68k/include/asm/gpio.h
+++ b/arch/m68k/include/asm/gpio.h
@@ -31,7 +31,7 @@
31 * GPIOs in a single control area, others have some GPIOs implemented in 31 * GPIOs in a single control area, others have some GPIOs implemented in
32 * different modules. 32 * different modules.
33 * 33 *
34 * This implementation attempts accomodate the differences while presenting 34 * This implementation attempts accommodate the differences while presenting
35 * a generic interface that will optimize to as few instructions as possible. 35 * a generic interface that will optimize to as few instructions as possible.
36 */ 36 */
37#if defined(CONFIG_M5206) || defined(CONFIG_M5206e) || \ 37#if defined(CONFIG_M5206) || defined(CONFIG_M5206e) || \
diff --git a/arch/m68k/include/asm/m520xsim.h b/arch/m68k/include/asm/m520xsim.h
index 55d5a4c5fe0b..b6bf2c518bac 100644
--- a/arch/m68k/include/asm/m520xsim.h
+++ b/arch/m68k/include/asm/m520xsim.h
@@ -157,7 +157,7 @@
157#define MCFFEC_SIZE 0x800 /* Register set size */ 157#define MCFFEC_SIZE 0x800 /* Register set size */
158 158
159/* 159/*
160 * Reset Controll Unit. 160 * Reset Control Unit.
161 */ 161 */
162#define MCF_RCR 0xFC0A0000 162#define MCF_RCR 0xFC0A0000
163#define MCF_RSR 0xFC0A0001 163#define MCF_RSR 0xFC0A0001
diff --git a/arch/m68k/include/asm/m523xsim.h b/arch/m68k/include/asm/m523xsim.h
index 8996df62ede4..6235921eca4e 100644
--- a/arch/m68k/include/asm/m523xsim.h
+++ b/arch/m68k/include/asm/m523xsim.h
@@ -48,7 +48,7 @@
48#define MCFSIM_DMR1 (MCF_IPSBAR + 0x54) /* Address mask 1 */ 48#define MCFSIM_DMR1 (MCF_IPSBAR + 0x54) /* Address mask 1 */
49 49
50/* 50/*
51 * Reset Controll Unit (relative to IPSBAR). 51 * Reset Control Unit (relative to IPSBAR).
52 */ 52 */
53#define MCF_RCR 0x110000 53#define MCF_RCR 0x110000
54#define MCF_RSR 0x110001 54#define MCF_RSR 0x110001
diff --git a/arch/m68k/include/asm/m527xsim.h b/arch/m68k/include/asm/m527xsim.h
index 74855a66c050..758810ef91ec 100644
--- a/arch/m68k/include/asm/m527xsim.h
+++ b/arch/m68k/include/asm/m527xsim.h
@@ -283,7 +283,7 @@
283#endif 283#endif
284 284
285/* 285/*
286 * Reset Controll Unit (relative to IPSBAR). 286 * Reset Control Unit (relative to IPSBAR).
287 */ 287 */
288#define MCF_RCR 0x110000 288#define MCF_RCR 0x110000
289#define MCF_RSR 0x110001 289#define MCF_RSR 0x110001
diff --git a/arch/m68k/include/asm/m5307sim.h b/arch/m68k/include/asm/m5307sim.h
index 4c94c01f36c4..8f8609fcc9b8 100644
--- a/arch/m68k/include/asm/m5307sim.h
+++ b/arch/m68k/include/asm/m5307sim.h
@@ -29,7 +29,7 @@
29#define MCFSIM_SWSR 0x03 /* SW Watchdog service (r/w) */ 29#define MCFSIM_SWSR 0x03 /* SW Watchdog service (r/w) */
30#define MCFSIM_PAR 0x04 /* Pin Assignment reg (r/w) */ 30#define MCFSIM_PAR 0x04 /* Pin Assignment reg (r/w) */
31#define MCFSIM_IRQPAR 0x06 /* Interrupt Assignment reg (r/w) */ 31#define MCFSIM_IRQPAR 0x06 /* Interrupt Assignment reg (r/w) */
32#define MCFSIM_PLLCR 0x08 /* PLL Controll Reg*/ 32#define MCFSIM_PLLCR 0x08 /* PLL Control Reg*/
33#define MCFSIM_MPARK 0x0C /* BUS Master Control Reg*/ 33#define MCFSIM_MPARK 0x0C /* BUS Master Control Reg*/
34#define MCFSIM_IPR 0x40 /* Interrupt Pend reg (r/w) */ 34#define MCFSIM_IPR 0x40 /* Interrupt Pend reg (r/w) */
35#define MCFSIM_IMR 0x44 /* Interrupt Mask reg (r/w) */ 35#define MCFSIM_IMR 0x44 /* Interrupt Mask reg (r/w) */
diff --git a/arch/m68k/include/asm/m5407sim.h b/arch/m68k/include/asm/m5407sim.h
index 762c58c89050..51e00b00b8a6 100644
--- a/arch/m68k/include/asm/m5407sim.h
+++ b/arch/m68k/include/asm/m5407sim.h
@@ -29,7 +29,7 @@
29#define MCFSIM_SWSR 0x03 /* SW Watchdog service (r/w) */ 29#define MCFSIM_SWSR 0x03 /* SW Watchdog service (r/w) */
30#define MCFSIM_PAR 0x04 /* Pin Assignment reg (r/w) */ 30#define MCFSIM_PAR 0x04 /* Pin Assignment reg (r/w) */
31#define MCFSIM_IRQPAR 0x06 /* Interrupt Assignment reg (r/w) */ 31#define MCFSIM_IRQPAR 0x06 /* Interrupt Assignment reg (r/w) */
32#define MCFSIM_PLLCR 0x08 /* PLL Controll Reg*/ 32#define MCFSIM_PLLCR 0x08 /* PLL Control Reg*/
33#define MCFSIM_MPARK 0x0C /* BUS Master Control Reg*/ 33#define MCFSIM_MPARK 0x0C /* BUS Master Control Reg*/
34#define MCFSIM_IPR 0x40 /* Interrupt Pend reg (r/w) */ 34#define MCFSIM_IPR 0x40 /* Interrupt Pend reg (r/w) */
35#define MCFSIM_IMR 0x44 /* Interrupt Mask reg (r/w) */ 35#define MCFSIM_IMR 0x44 /* Interrupt Mask reg (r/w) */
diff --git a/arch/m68k/include/asm/m68360_quicc.h b/arch/m68k/include/asm/m68360_quicc.h
index 6d40f4d18e10..59414cc108d3 100644
--- a/arch/m68k/include/asm/m68360_quicc.h
+++ b/arch/m68k/include/asm/m68360_quicc.h
@@ -32,7 +32,7 @@ struct user_data {
32 /* BASE + 0x000: user data memory */ 32 /* BASE + 0x000: user data memory */
33 volatile unsigned char udata_bd_ucode[0x400]; /*user data bd's Ucode*/ 33 volatile unsigned char udata_bd_ucode[0x400]; /*user data bd's Ucode*/
34 volatile unsigned char udata_bd[0x200]; /*user data Ucode */ 34 volatile unsigned char udata_bd[0x200]; /*user data Ucode */
35 volatile unsigned char ucode_ext[0x100]; /*Ucode Extention ram */ 35 volatile unsigned char ucode_ext[0x100]; /*Ucode Extension ram */
36 volatile unsigned char RESERVED1[0x500]; /* Reserved area */ 36 volatile unsigned char RESERVED1[0x500]; /* Reserved area */
37}; 37};
38#else 38#else
diff --git a/arch/m68k/include/asm/mac_oss.h b/arch/m68k/include/asm/mac_oss.h
index 7221f7251934..3cf2b6ed685a 100644
--- a/arch/m68k/include/asm/mac_oss.h
+++ b/arch/m68k/include/asm/mac_oss.h
@@ -61,7 +61,7 @@
61/* 61/*
62 * OSS Interrupt levels for various sub-systems 62 * OSS Interrupt levels for various sub-systems
63 * 63 *
64 * This mapping is layed out with two things in mind: first, we try to keep 64 * This mapping is laid out with two things in mind: first, we try to keep
65 * things on their own levels to avoid having to do double-dispatches. Second, 65 * things on their own levels to avoid having to do double-dispatches. Second,
66 * the levels match as closely as possible the alternate IRQ mapping mode (aka 66 * the levels match as closely as possible the alternate IRQ mapping mode (aka
67 * "A/UX mode") available on some VIA machines. 67 * "A/UX mode") available on some VIA machines.
diff --git a/arch/m68k/include/asm/mac_via.h b/arch/m68k/include/asm/mac_via.h
index 39afb438b656..a59665e1d41b 100644
--- a/arch/m68k/include/asm/mac_via.h
+++ b/arch/m68k/include/asm/mac_via.h
@@ -204,7 +204,7 @@
204#define vT2CL 0x1000 /* [VIA only] Timer two counter low. */ 204#define vT2CL 0x1000 /* [VIA only] Timer two counter low. */
205#define vT2CH 0x1200 /* [VIA only] Timer two counter high. */ 205#define vT2CH 0x1200 /* [VIA only] Timer two counter high. */
206#define vSR 0x1400 /* [VIA only] Shift register. */ 206#define vSR 0x1400 /* [VIA only] Shift register. */
207#define vACR 0x1600 /* [VIA only] Auxilary control register. */ 207#define vACR 0x1600 /* [VIA only] Auxiliary control register. */
208#define vPCR 0x1800 /* [VIA only] Peripheral control register. */ 208#define vPCR 0x1800 /* [VIA only] Peripheral control register. */
209 /* CHRP sez never ever to *write* this. 209 /* CHRP sez never ever to *write* this.
210 * Mac family says never to *change* this. 210 * Mac family says never to *change* this.
diff --git a/arch/m68k/include/asm/macintosh.h b/arch/m68k/include/asm/macintosh.h
index 50db3591ca15..c2a1c5eac1a6 100644
--- a/arch/m68k/include/asm/macintosh.h
+++ b/arch/m68k/include/asm/macintosh.h
@@ -14,7 +14,7 @@ extern void mac_init_IRQ(void);
14extern int mac_irq_pending(unsigned int); 14extern int mac_irq_pending(unsigned int);
15 15
16/* 16/*
17 * Floppy driver magic hook - probably shouldnt be here 17 * Floppy driver magic hook - probably shouldn't be here
18 */ 18 */
19 19
20extern void via1_set_head(int); 20extern void via1_set_head(int);
diff --git a/arch/m68k/include/asm/mcftimer.h b/arch/m68k/include/asm/mcftimer.h
index 92b276fe8240..351c27237874 100644
--- a/arch/m68k/include/asm/mcftimer.h
+++ b/arch/m68k/include/asm/mcftimer.h
@@ -27,7 +27,7 @@
27 27
28/* 28/*
29 * Bit definitions for the Timer Mode Register (TMR). 29 * Bit definitions for the Timer Mode Register (TMR).
30 * Register bit flags are common accross ColdFires. 30 * Register bit flags are common across ColdFires.
31 */ 31 */
32#define MCFTIMER_TMR_PREMASK 0xff00 /* Prescalar mask */ 32#define MCFTIMER_TMR_PREMASK 0xff00 /* Prescalar mask */
33#define MCFTIMER_TMR_DISCE 0x0000 /* Disable capture */ 33#define MCFTIMER_TMR_DISCE 0x0000 /* Disable capture */
diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S
index ef54128baa0b..27622b3273c1 100644
--- a/arch/m68k/kernel/head.S
+++ b/arch/m68k/kernel/head.S
@@ -134,7 +134,7 @@
134 * Thanks to a small helping routine enabling the mmu got quite simple 134 * Thanks to a small helping routine enabling the mmu got quite simple
135 * and there is only one way left. mmu_engage makes a complete a new mapping 135 * and there is only one way left. mmu_engage makes a complete a new mapping
136 * that only includes the absolute necessary to be able to jump to the final 136 * that only includes the absolute necessary to be able to jump to the final
137 * postion and to restore the original mapping. 137 * position and to restore the original mapping.
138 * As this code doesn't need a transparent translation register anymore this 138 * As this code doesn't need a transparent translation register anymore this
139 * means all registers are free to be used by machines that needs them for 139 * means all registers are free to be used by machines that needs them for
140 * other purposes. 140 * other purposes.
@@ -969,7 +969,7 @@ L(mmu_init_amiga):
969 is_not_040_or_060(1f) 969 is_not_040_or_060(1f)
970 970
971 /* 971 /*
972 * 040: Map the 16Meg range physical 0x0 upto logical 0x8000.0000 972 * 040: Map the 16Meg range physical 0x0 up to logical 0x8000.0000
973 */ 973 */
974 mmu_map #0x80000000,#0,#0x01000000,#_PAGE_NOCACHE_S 974 mmu_map #0x80000000,#0,#0x01000000,#_PAGE_NOCACHE_S
975 /* 975 /*
@@ -982,7 +982,7 @@ L(mmu_init_amiga):
982 982
9831: 9831:
984 /* 984 /*
985 * 030: Map the 32Meg range physical 0x0 upto logical 0x8000.0000 985 * 030: Map the 32Meg range physical 0x0 up to logical 0x8000.0000
986 */ 986 */
987 mmu_map #0x80000000,#0,#0x02000000,#_PAGE_NOCACHE030 987 mmu_map #0x80000000,#0,#0x02000000,#_PAGE_NOCACHE030
988 mmu_map_tt #1,#0x40000000,#0x20000000,#_PAGE_NOCACHE030 988 mmu_map_tt #1,#0x40000000,#0x20000000,#_PAGE_NOCACHE030
@@ -1074,7 +1074,7 @@ L(notq40):
1074 is_040(1f) 1074 is_040(1f)
1075 1075
1076 /* 1076 /*
1077 * 030: Map the 32Meg range physical 0x0 upto logical 0xf000.0000 1077 * 030: Map the 32Meg range physical 0x0 up to logical 0xf000.0000
1078 */ 1078 */
1079 mmu_map #0xf0000000,#0,#0x02000000,#_PAGE_NOCACHE030 1079 mmu_map #0xf0000000,#0,#0x02000000,#_PAGE_NOCACHE030
1080 1080
@@ -1082,7 +1082,7 @@ L(notq40):
1082 1082
10831: 10831:
1084 /* 1084 /*
1085 * 040: Map the 16Meg range physical 0x0 upto logical 0xf000.0000 1085 * 040: Map the 16Meg range physical 0x0 up to logical 0xf000.0000
1086 */ 1086 */
1087 mmu_map #0xf0000000,#0,#0x01000000,#_PAGE_NOCACHE_S 1087 mmu_map #0xf0000000,#0,#0x01000000,#_PAGE_NOCACHE_S
1088 1088
@@ -3078,7 +3078,7 @@ func_start serial_putc,%d0/%d1/%a0/%a1
3078 /* 3078 /*
3079 * If the loader gave us a board type then we can use that to 3079 * If the loader gave us a board type then we can use that to
3080 * select an appropriate output routine; otherwise we just use 3080 * select an appropriate output routine; otherwise we just use
3081 * the Bug code. If we haev to use the Bug that means the Bug 3081 * the Bug code. If we have to use the Bug that means the Bug
3082 * workspace has to be valid, which means the Bug has to use 3082 * workspace has to be valid, which means the Bug has to use
3083 * the SRAM, which is non-standard. 3083 * the SRAM, which is non-standard.
3084 */ 3084 */
diff --git a/arch/m68k/kernel/vmlinux.lds_no.S b/arch/m68k/kernel/vmlinux.lds_no.S
index 47e15ebfd893..f4d715cdca0e 100644
--- a/arch/m68k/kernel/vmlinux.lds_no.S
+++ b/arch/m68k/kernel/vmlinux.lds_no.S
@@ -3,7 +3,7 @@
3 * 3 *
4 * (C) Copyright 2002-2006, Greg Ungerer <gerg@snapgear.com> 4 * (C) Copyright 2002-2006, Greg Ungerer <gerg@snapgear.com>
5 * 5 *
6 * This linker script is equiped to build either ROM loaded or RAM 6 * This linker script is equipped to build either ROM loaded or RAM
7 * run kernels. 7 * run kernels.
8 */ 8 */
9 9
diff --git a/arch/m68k/platform/523x/config.c b/arch/m68k/platform/523x/config.c
index 418a76feb1e3..71f4436ec809 100644
--- a/arch/m68k/platform/523x/config.c
+++ b/arch/m68k/platform/523x/config.c
@@ -3,7 +3,7 @@
3/* 3/*
4 * linux/arch/m68knommu/platform/523x/config.c 4 * linux/arch/m68knommu/platform/523x/config.c
5 * 5 *
6 * Sub-architcture dependant initialization code for the Freescale 6 * Sub-architcture dependent initialization code for the Freescale
7 * 523x CPUs. 7 * 523x CPUs.
8 * 8 *
9 * Copyright (C) 1999-2005, Greg Ungerer (gerg@snapgear.com) 9 * Copyright (C) 1999-2005, Greg Ungerer (gerg@snapgear.com)
diff --git a/arch/m68k/platform/5272/intc.c b/arch/m68k/platform/5272/intc.c
index 43e6e96f087f..7e715dfe2819 100644
--- a/arch/m68k/platform/5272/intc.c
+++ b/arch/m68k/platform/5272/intc.c
@@ -33,7 +33,7 @@
33 * 33 *
34 * Note that the external interrupts are edge triggered (unlike the 34 * Note that the external interrupts are edge triggered (unlike the
35 * internal interrupt sources which are level triggered). Which means 35 * internal interrupt sources which are level triggered). Which means
36 * they also need acknowledgeing via acknowledge bits. 36 * they also need acknowledging via acknowledge bits.
37 */ 37 */
38struct irqmap { 38struct irqmap {
39 unsigned char icr; 39 unsigned char icr;
diff --git a/arch/m68k/platform/527x/config.c b/arch/m68k/platform/527x/config.c
index fa359593b613..3ebc769cefda 100644
--- a/arch/m68k/platform/527x/config.c
+++ b/arch/m68k/platform/527x/config.c
@@ -3,7 +3,7 @@
3/* 3/*
4 * linux/arch/m68knommu/platform/527x/config.c 4 * linux/arch/m68knommu/platform/527x/config.c
5 * 5 *
6 * Sub-architcture dependant initialization code for the Freescale 6 * Sub-architcture dependent initialization code for the Freescale
7 * 5270/5271 CPUs. 7 * 5270/5271 CPUs.
8 * 8 *
9 * Copyright (C) 1999-2004, Greg Ungerer (gerg@snapgear.com) 9 * Copyright (C) 1999-2004, Greg Ungerer (gerg@snapgear.com)
diff --git a/arch/m68k/platform/528x/config.c b/arch/m68k/platform/528x/config.c
index ac39fc661219..7abe77a2f3e3 100644
--- a/arch/m68k/platform/528x/config.c
+++ b/arch/m68k/platform/528x/config.c
@@ -3,7 +3,7 @@
3/* 3/*
4 * linux/arch/m68knommu/platform/528x/config.c 4 * linux/arch/m68knommu/platform/528x/config.c
5 * 5 *
6 * Sub-architcture dependant initialization code for the Freescale 6 * Sub-architcture dependent initialization code for the Freescale
7 * 5280, 5281 and 5282 CPUs. 7 * 5280, 5281 and 5282 CPUs.
8 * 8 *
9 * Copyright (C) 1999-2003, Greg Ungerer (gerg@snapgear.com) 9 * Copyright (C) 1999-2003, Greg Ungerer (gerg@snapgear.com)
diff --git a/arch/m68k/platform/coldfire/cache.c b/arch/m68k/platform/coldfire/cache.c
index 235d3c4f4f0f..71beeaf0c5c4 100644
--- a/arch/m68k/platform/coldfire/cache.c
+++ b/arch/m68k/platform/coldfire/cache.c
@@ -1,7 +1,7 @@
1/***************************************************************************/ 1/***************************************************************************/
2 2
3/* 3/*
4 * cache.c -- general ColdFire Cache maintainence code 4 * cache.c -- general ColdFire Cache maintenance code
5 * 5 *
6 * Copyright (C) 2010, Greg Ungerer (gerg@snapgear.com) 6 * Copyright (C) 2010, Greg Ungerer (gerg@snapgear.com)
7 */ 7 */
diff --git a/arch/m68k/platform/coldfire/entry.S b/arch/m68k/platform/coldfire/entry.S
index 5837cf080b6d..eab63f09965b 100644
--- a/arch/m68k/platform/coldfire/entry.S
+++ b/arch/m68k/platform/coldfire/entry.S
@@ -163,7 +163,7 @@ Lsignal_return:
163 163
164/* 164/*
165 * This is the generic interrupt handler (for all hardware interrupt 165 * This is the generic interrupt handler (for all hardware interrupt
166 * sources). Calls upto high level code to do all the work. 166 * sources). Calls up to high level code to do all the work.
167 */ 167 */
168ENTRY(inthandler) 168ENTRY(inthandler)
169 SAVE_ALL 169 SAVE_ALL
diff --git a/arch/m68k/platform/coldfire/head.S b/arch/m68k/platform/coldfire/head.S
index 129bff4956b5..6ae91a499184 100644
--- a/arch/m68k/platform/coldfire/head.S
+++ b/arch/m68k/platform/coldfire/head.S
@@ -20,7 +20,7 @@
20 20
21/* 21/*
22 * If we don't have a fixed memory size, then lets build in code 22 * If we don't have a fixed memory size, then lets build in code
23 * to auto detect the DRAM size. Obviously this is the prefered 23 * to auto detect the DRAM size. Obviously this is the preferred
24 * method, and should work for most boards. It won't work for those 24 * method, and should work for most boards. It won't work for those
25 * that do not have their RAM starting at address 0, and it only 25 * that do not have their RAM starting at address 0, and it only
26 * works on SDRAM (not boards fitted with SRAM). 26 * works on SDRAM (not boards fitted with SRAM).
diff --git a/arch/m68k/platform/coldfire/intc.c b/arch/m68k/platform/coldfire/intc.c
index c28a6ed6cb23..0bbb414856eb 100644
--- a/arch/m68k/platform/coldfire/intc.c
+++ b/arch/m68k/platform/coldfire/intc.c
@@ -37,7 +37,7 @@ unsigned char mcf_irq2imr[NR_IRQS];
37/* 37/*
38 * In the early version 2 core ColdFire parts the IMR register was 16 bits 38 * In the early version 2 core ColdFire parts the IMR register was 16 bits
39 * in size. Version 3 (and later version 2) core parts have a 32 bit 39 * in size. Version 3 (and later version 2) core parts have a 32 bit
40 * sized IMR register. Provide some size independant methods to access the 40 * sized IMR register. Provide some size independent methods to access the
41 * IMR register. 41 * IMR register.
42 */ 42 */
43#ifdef MCFSIM_IMR_IS_16BITS 43#ifdef MCFSIM_IMR_IS_16BITS
diff --git a/arch/m68k/platform/coldfire/sltimers.c b/arch/m68k/platform/coldfire/sltimers.c
index 0a1b937c3e18..6a85daf9a7fd 100644
--- a/arch/m68k/platform/coldfire/sltimers.c
+++ b/arch/m68k/platform/coldfire/sltimers.c
@@ -106,7 +106,7 @@ static cycle_t mcfslt_read_clk(struct clocksource *cs)
106 cycles = mcfslt_cnt; 106 cycles = mcfslt_cnt;
107 local_irq_restore(flags); 107 local_irq_restore(flags);
108 108
109 /* substract because slice timers count down */ 109 /* subtract because slice timers count down */
110 return cycles - scnt; 110 return cycles - scnt;
111} 111}
112 112
diff --git a/arch/m68k/q40/README b/arch/m68k/q40/README
index f877b7249790..b26d5f55e91d 100644
--- a/arch/m68k/q40/README
+++ b/arch/m68k/q40/README
@@ -89,7 +89,7 @@ The main interrupt register IIRQ_REG will indicate whether an IRQ was internal
89or from some ISA devices, EIRQ_REG can distinguish up to 8 ISA IRQs. 89or from some ISA devices, EIRQ_REG can distinguish up to 8 ISA IRQs.
90 90
91The Q40 custom chip is programmable to provide 2 periodic timers: 91The Q40 custom chip is programmable to provide 2 periodic timers:
92 - 50 or 200 Hz - level 2, !!THIS CANT BE DISABLED!! 92 - 50 or 200 Hz - level 2, !!THIS CAN'T BE DISABLED!!
93 - 10 or 20 KHz - level 4, used for dma-sound 93 - 10 or 20 KHz - level 4, used for dma-sound
94 94
95Linux uses the 200 Hz interrupt for timer and beep by default. 95Linux uses the 200 Hz interrupt for timer and beep by default.
diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
index 6f432e6df9af..b23c40eb7a52 100644
--- a/arch/microblaze/Makefile
+++ b/arch/microblaze/Makefile
@@ -18,7 +18,7 @@ export CPU_VER CPU_MAJOR CPU_MINOR CPU_REV
18# rather than bools y/n 18# rather than bools y/n
19 19
20# Work out HW multipler support. This is tricky. 20# Work out HW multipler support. This is tricky.
21# 1. Spartan2 has no HW multiplers. 21# 1. Spartan2 has no HW multipliers.
22# 2. MicroBlaze v3.x always uses them, except in Spartan 2 22# 2. MicroBlaze v3.x always uses them, except in Spartan 2
23# 3. All other FPGa/CPU ver combos, we can trust the CONFIG_ settings 23# 3. All other FPGa/CPU ver combos, we can trust the CONFIG_ settings
24ifeq (,$(findstring spartan2,$(CONFIG_XILINX_MICROBLAZE0_FAMILY))) 24ifeq (,$(findstring spartan2,$(CONFIG_XILINX_MICROBLAZE0_FAMILY)))
diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h
index eae32220f447..8cdac14b55b0 100644
--- a/arch/microblaze/include/asm/io.h
+++ b/arch/microblaze/include/asm/io.h
@@ -70,7 +70,7 @@ static inline void __raw_writeq(unsigned long v, volatile void __iomem *addr)
70 70
71/* 71/*
72 * read (readb, readw, readl, readq) and write (writeb, writew, 72 * read (readb, readw, readl, readq) and write (writeb, writew,
73 * writel, writeq) accessors are for PCI and thus littel endian. 73 * writel, writeq) accessors are for PCI and thus little endian.
74 * Linux 2.4 for Microblaze had this wrong. 74 * Linux 2.4 for Microblaze had this wrong.
75 */ 75 */
76static inline unsigned char readb(const volatile void __iomem *addr) 76static inline unsigned char readb(const volatile void __iomem *addr)
diff --git a/arch/microblaze/include/asm/pci-bridge.h b/arch/microblaze/include/asm/pci-bridge.h
index 10717669e0c2..746df91e5796 100644
--- a/arch/microblaze/include/asm/pci-bridge.h
+++ b/arch/microblaze/include/asm/pci-bridge.h
@@ -76,7 +76,7 @@ struct pci_controller {
76 * Used for variants of PCI indirect handling and possible quirks: 76 * Used for variants of PCI indirect handling and possible quirks:
77 * SET_CFG_TYPE - used on 4xx or any PHB that does explicit type0/1 77 * SET_CFG_TYPE - used on 4xx or any PHB that does explicit type0/1
78 * EXT_REG - provides access to PCI-e extended registers 78 * EXT_REG - provides access to PCI-e extended registers
79 * SURPRESS_PRIMARY_BUS - we surpress the setting of PCI_PRIMARY_BUS 79 * SURPRESS_PRIMARY_BUS - we suppress the setting of PCI_PRIMARY_BUS
80 * on Freescale PCI-e controllers since they used the PCI_PRIMARY_BUS 80 * on Freescale PCI-e controllers since they used the PCI_PRIMARY_BUS
81 * to determine which bus number to match on when generating type0 81 * to determine which bus number to match on when generating type0
82 * config cycles 82 * config cycles
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h
index 2232ff942ba9..ba65cf472544 100644
--- a/arch/microblaze/include/asm/pci.h
+++ b/arch/microblaze/include/asm/pci.h
@@ -158,7 +158,7 @@ extern void pci_resource_to_user(const struct pci_dev *dev, int bar,
158extern void pcibios_setup_bus_devices(struct pci_bus *bus); 158extern void pcibios_setup_bus_devices(struct pci_bus *bus);
159extern void pcibios_setup_bus_self(struct pci_bus *bus); 159extern void pcibios_setup_bus_self(struct pci_bus *bus);
160 160
161/* This part of code was originaly in xilinx-pci.h */ 161/* This part of code was originally in xilinx-pci.h */
162#ifdef CONFIG_PCI_XILINX 162#ifdef CONFIG_PCI_XILINX
163extern void __init xilinx_pci_init(void); 163extern void __init xilinx_pci_init(void);
164#else 164#else
diff --git a/arch/microblaze/kernel/cpu/cache.c b/arch/microblaze/kernel/cpu/cache.c
index cf0afd90a2c0..4b7d8a3f4aef 100644
--- a/arch/microblaze/kernel/cpu/cache.c
+++ b/arch/microblaze/kernel/cpu/cache.c
@@ -129,7 +129,7 @@ do { \
129 * to use for simple wdc or wic. 129 * to use for simple wdc or wic.
130 * 130 *
131 * start address is cache aligned 131 * start address is cache aligned
132 * end address is not aligned, if end is aligned then I have to substract 132 * end address is not aligned, if end is aligned then I have to subtract
133 * cacheline length because I can't flush/invalidate the next cacheline. 133 * cacheline length because I can't flush/invalidate the next cacheline.
134 * If is not, I align it because I will flush/invalidate whole line. 134 * If is not, I align it because I will flush/invalidate whole line.
135 */ 135 */
diff --git a/arch/microblaze/lib/memcpy.c b/arch/microblaze/lib/memcpy.c
index cc495d7d99cc..52746e718dfa 100644
--- a/arch/microblaze/lib/memcpy.c
+++ b/arch/microblaze/lib/memcpy.c
@@ -63,8 +63,8 @@ void *memcpy(void *v_dst, const void *v_src, __kernel_size_t c)
63 if (likely(c >= 4)) { 63 if (likely(c >= 4)) {
64 unsigned value, buf_hold; 64 unsigned value, buf_hold;
65 65
66 /* Align the dstination to a word boundry. */ 66 /* Align the destination to a word boundary. */
67 /* This is done in an endian independant manner. */ 67 /* This is done in an endian independent manner. */
68 switch ((unsigned long)dst & 3) { 68 switch ((unsigned long)dst & 3) {
69 case 1: 69 case 1:
70 *dst++ = *src++; 70 *dst++ = *src++;
@@ -80,7 +80,7 @@ void *memcpy(void *v_dst, const void *v_src, __kernel_size_t c)
80 i_dst = (void *)dst; 80 i_dst = (void *)dst;
81 81
82 /* Choose a copy scheme based on the source */ 82 /* Choose a copy scheme based on the source */
83 /* alignment relative to dstination. */ 83 /* alignment relative to destination. */
84 switch ((unsigned long)src & 3) { 84 switch ((unsigned long)src & 3) {
85 case 0x0: /* Both byte offsets are aligned */ 85 case 0x0: /* Both byte offsets are aligned */
86 i_src = (const void *)src; 86 i_src = (const void *)src;
@@ -173,7 +173,7 @@ void *memcpy(void *v_dst, const void *v_src, __kernel_size_t c)
173 } 173 }
174 174
175 /* Finish off any remaining bytes */ 175 /* Finish off any remaining bytes */
176 /* simple fast copy, ... unless a cache boundry is crossed */ 176 /* simple fast copy, ... unless a cache boundary is crossed */
177 switch (c) { 177 switch (c) {
178 case 3: 178 case 3:
179 *dst++ = *src++; 179 *dst++ = *src++;
diff --git a/arch/microblaze/lib/memmove.c b/arch/microblaze/lib/memmove.c
index 810fd68775e3..2146c3752a80 100644
--- a/arch/microblaze/lib/memmove.c
+++ b/arch/microblaze/lib/memmove.c
@@ -83,8 +83,8 @@ void *memmove(void *v_dst, const void *v_src, __kernel_size_t c)
83 if (c >= 4) { 83 if (c >= 4) {
84 unsigned value, buf_hold; 84 unsigned value, buf_hold;
85 85
86 /* Align the destination to a word boundry. */ 86 /* Align the destination to a word boundary. */
87 /* This is done in an endian independant manner. */ 87 /* This is done in an endian independent manner. */
88 88
89 switch ((unsigned long)dst & 3) { 89 switch ((unsigned long)dst & 3) {
90 case 3: 90 case 3:
@@ -193,7 +193,7 @@ void *memmove(void *v_dst, const void *v_src, __kernel_size_t c)
193 dst = (void *)i_dst; 193 dst = (void *)i_dst;
194 } 194 }
195 195
196 /* simple fast copy, ... unless a cache boundry is crossed */ 196 /* simple fast copy, ... unless a cache boundary is crossed */
197 /* Finish off any remaining bytes */ 197 /* Finish off any remaining bytes */
198 switch (c) { 198 switch (c) {
199 case 4: 199 case 4:
diff --git a/arch/microblaze/lib/memset.c b/arch/microblaze/lib/memset.c
index 834565d1607e..ddf67939576d 100644
--- a/arch/microblaze/lib/memset.c
+++ b/arch/microblaze/lib/memset.c
@@ -64,7 +64,7 @@ void *memset(void *v_src, int c, __kernel_size_t n)
64 64
65 if (likely(n >= 4)) { 65 if (likely(n >= 4)) {
66 /* Align the destination to a word boundary */ 66 /* Align the destination to a word boundary */
67 /* This is done in an endian independant manner */ 67 /* This is done in an endian independent manner */
68 switch ((unsigned) src & 3) { 68 switch ((unsigned) src & 3) {
69 case 1: 69 case 1:
70 *src++ = c; 70 *src++ = c;
diff --git a/arch/microblaze/pci/indirect_pci.c b/arch/microblaze/pci/indirect_pci.c
index 25f18f017f21..4196eb6bd764 100644
--- a/arch/microblaze/pci/indirect_pci.c
+++ b/arch/microblaze/pci/indirect_pci.c
@@ -108,7 +108,7 @@ indirect_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
108 out_le32(hose->cfg_addr, (0x80000000 | (bus_no << 16) | 108 out_le32(hose->cfg_addr, (0x80000000 | (bus_no << 16) |
109 (devfn << 8) | reg | cfg_type)); 109 (devfn << 8) | reg | cfg_type));
110 110
111 /* surpress setting of PCI_PRIMARY_BUS */ 111 /* suppress setting of PCI_PRIMARY_BUS */
112 if (hose->indirect_type & INDIRECT_TYPE_SURPRESS_PRIMARY_BUS) 112 if (hose->indirect_type & INDIRECT_TYPE_SURPRESS_PRIMARY_BUS)
113 if ((offset == PCI_PRIMARY_BUS) && 113 if ((offset == PCI_PRIMARY_BUS) &&
114 (bus->number == hose->first_busno)) 114 (bus->number == hose->first_busno))
diff --git a/arch/microblaze/platform/generic/Kconfig.auto b/arch/microblaze/platform/generic/Kconfig.auto
index 5d86fc19029d..25a6f019e94d 100644
--- a/arch/microblaze/platform/generic/Kconfig.auto
+++ b/arch/microblaze/platform/generic/Kconfig.auto
@@ -29,7 +29,7 @@ config KERNEL_BASE_ADDR
29 BASE Address for kernel 29 BASE Address for kernel
30 30
31config XILINX_MICROBLAZE0_FAMILY 31config XILINX_MICROBLAZE0_FAMILY
32 string "Targetted FPGA family" 32 string "Targeted FPGA family"
33 default "virtex5" 33 default "virtex5"
34 34
35config XILINX_MICROBLAZE0_USE_MSR_INSTR 35config XILINX_MICROBLAZE0_USE_MSR_INSTR
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 83aa5fb8e8f1..8e256cc5dcd9 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1135,7 +1135,7 @@ config CPU_LOONGSON2E
1135 The Loongson 2E processor implements the MIPS III instruction set 1135 The Loongson 2E processor implements the MIPS III instruction set
1136 with many extensions. 1136 with many extensions.
1137 1137
1138 It has an internal FPGA northbridge, which is compatiable to 1138 It has an internal FPGA northbridge, which is compatible to
1139 bonito64. 1139 bonito64.
1140 1140
1141config CPU_LOONGSON2F 1141config CPU_LOONGSON2F
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index ac1d5b611a27..53e3514ba10e 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -101,7 +101,7 @@ cflags-y += -ffreestanding
101# carefully avoid to add it redundantly because gcc 3.3/3.4 complains 101# carefully avoid to add it redundantly because gcc 3.3/3.4 complains
102# when fed the toolchain default! 102# when fed the toolchain default!
103# 103#
104# Certain gcc versions upto gcc 4.1.1 (probably 4.2-subversion as of 104# Certain gcc versions up to gcc 4.1.1 (probably 4.2-subversion as of
105# 2006-10-10 don't properly change the predefined symbols if -EB / -EL 105# 2006-10-10 don't properly change the predefined symbols if -EB / -EL
106# are used, so we kludge that here. A bug has been filed at 106# are used, so we kludge that here. A bug has been filed at
107# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29413. 107# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29413.
@@ -314,5 +314,5 @@ define archhelp
314 echo ' vmlinuz.bin - Raw binary zboot image' 314 echo ' vmlinuz.bin - Raw binary zboot image'
315 echo ' vmlinuz.srec - SREC zboot image' 315 echo ' vmlinuz.srec - SREC zboot image'
316 echo 316 echo
317 echo ' These will be default as apropriate for a configured platform.' 317 echo ' These will be default as appropriate for a configured platform.'
318endef 318endef
diff --git a/arch/mips/alchemy/common/clocks.c b/arch/mips/alchemy/common/clocks.c
index af0fe41055af..f38298a8b98c 100644
--- a/arch/mips/alchemy/common/clocks.c
+++ b/arch/mips/alchemy/common/clocks.c
@@ -75,7 +75,7 @@ void set_au1x00_uart_baud_base(unsigned long new_baud_base)
75 * counter, if it exists. If we don't have an accurate processor 75 * counter, if it exists. If we don't have an accurate processor
76 * speed, all of the peripherals that derive their clocks based on 76 * speed, all of the peripherals that derive their clocks based on
77 * this advertised speed will introduce error and sometimes not work 77 * this advertised speed will introduce error and sometimes not work
78 * properly. This function is futher convoluted to still allow configurations 78 * properly. This function is further convoluted to still allow configurations
79 * to do that in case they have really, really old silicon with a 79 * to do that in case they have really, really old silicon with a
80 * write-only PLL register. -- Dan 80 * write-only PLL register. -- Dan
81 */ 81 */
diff --git a/arch/mips/cavium-octeon/executive/octeon-model.c b/arch/mips/cavium-octeon/executive/octeon-model.c
index 9afc3794ed1b..c8d35684504e 100644
--- a/arch/mips/cavium-octeon/executive/octeon-model.c
+++ b/arch/mips/cavium-octeon/executive/octeon-model.c
@@ -75,7 +75,7 @@ const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer)
75 75
76 num_cores = cvmx_octeon_num_cores(); 76 num_cores = cvmx_octeon_num_cores();
77 77
78 /* Make sure the non existant devices look disabled */ 78 /* Make sure the non existent devices look disabled */
79 switch ((chip_id >> 8) & 0xff) { 79 switch ((chip_id >> 8) & 0xff) {
80 case 6: /* CN50XX */ 80 case 6: /* CN50XX */
81 case 2: /* CN30XX */ 81 case 2: /* CN30XX */
diff --git a/arch/mips/cavium-octeon/octeon-platform.c b/arch/mips/cavium-octeon/octeon-platform.c
index cecaf62aef32..cd61d7281d91 100644
--- a/arch/mips/cavium-octeon/octeon-platform.c
+++ b/arch/mips/cavium-octeon/octeon-platform.c
@@ -75,7 +75,7 @@ static int __init octeon_cf_device_init(void)
75 * zero. 75 * zero.
76 */ 76 */
77 77
78 /* Asume that CS1 immediately follows. */ 78 /* Assume that CS1 immediately follows. */
79 mio_boot_reg_cfg.u64 = 79 mio_boot_reg_cfg.u64 =
80 cvmx_read_csr(CVMX_MIO_BOOT_REG_CFGX(i + 1)); 80 cvmx_read_csr(CVMX_MIO_BOOT_REG_CFGX(i + 1));
81 region_base = mio_boot_reg_cfg.s.base << 16; 81 region_base = mio_boot_reg_cfg.s.base << 16;
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index 8b139bf4a1b5..0707fae3f0ee 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -662,7 +662,7 @@ void __init plat_mem_setup(void)
662 * some memory vectors. When SPARSEMEM is in use, it doesn't 662 * some memory vectors. When SPARSEMEM is in use, it doesn't
663 * verify that the size is big enough for the final 663 * verify that the size is big enough for the final
664 * vectors. Making the smallest chuck 4MB seems to be enough 664 * vectors. Making the smallest chuck 4MB seems to be enough
665 * to consistantly work. 665 * to consistently work.
666 */ 666 */
667 mem_alloc_size = 4 << 20; 667 mem_alloc_size = 4 << 20;
668 if (mem_alloc_size > MAX_MEMORY) 668 if (mem_alloc_size > MAX_MEMORY)
diff --git a/arch/mips/fw/arc/promlib.c b/arch/mips/fw/arc/promlib.c
index c508c00dbb64..b7f9dd3c93c6 100644
--- a/arch/mips/fw/arc/promlib.c
+++ b/arch/mips/fw/arc/promlib.c
@@ -4,7 +4,7 @@
4 * for more details. 4 * for more details.
5 * 5 *
6 * Copyright (C) 1996 David S. Miller (dm@sgi.com) 6 * Copyright (C) 1996 David S. Miller (dm@sgi.com)
7 * Compability with board caches, Ulf Carlsson 7 * Compatibility with board caches, Ulf Carlsson
8 */ 8 */
9#include <linux/kernel.h> 9#include <linux/kernel.h>
10#include <asm/sgialib.h> 10#include <asm/sgialib.h>
diff --git a/arch/mips/include/asm/dec/prom.h b/arch/mips/include/asm/dec/prom.h
index b9c8203688d5..c0ead6313845 100644
--- a/arch/mips/include/asm/dec/prom.h
+++ b/arch/mips/include/asm/dec/prom.h
@@ -108,7 +108,7 @@ extern int (*__pmax_close)(int);
108 108
109/* 109/*
110 * On MIPS64 we have to call PROM functions via a helper 110 * On MIPS64 we have to call PROM functions via a helper
111 * dispatcher to accomodate ABI incompatibilities. 111 * dispatcher to accommodate ABI incompatibilities.
112 */ 112 */
113#define __DEC_PROM_O32(fun, arg) fun arg __asm__(#fun); \ 113#define __DEC_PROM_O32(fun, arg) fun arg __asm__(#fun); \
114 __asm__(#fun " = call_o32") 114 __asm__(#fun " = call_o32")
diff --git a/arch/mips/include/asm/floppy.h b/arch/mips/include/asm/floppy.h
index 992d232adc83..c5c7c0e6064c 100644
--- a/arch/mips/include/asm/floppy.h
+++ b/arch/mips/include/asm/floppy.h
@@ -24,7 +24,7 @@ static inline void fd_cacheflush(char * addr, long size)
24 * And on Mips's the CMOS info fails also ... 24 * And on Mips's the CMOS info fails also ...
25 * 25 *
26 * FIXME: This information should come from the ARC configuration tree 26 * FIXME: This information should come from the ARC configuration tree
27 * or whereever a particular machine has stored this ... 27 * or wherever a particular machine has stored this ...
28 */ 28 */
29#define FLOPPY0_TYPE fd_drive_type(0) 29#define FLOPPY0_TYPE fd_drive_type(0)
30#define FLOPPY1_TYPE fd_drive_type(1) 30#define FLOPPY1_TYPE fd_drive_type(1)
diff --git a/arch/mips/include/asm/hw_irq.h b/arch/mips/include/asm/hw_irq.h
index aca05a43a97b..77adda297ad9 100644
--- a/arch/mips/include/asm/hw_irq.h
+++ b/arch/mips/include/asm/hw_irq.h
@@ -13,7 +13,7 @@
13extern atomic_t irq_err_count; 13extern atomic_t irq_err_count;
14 14
15/* 15/*
16 * interrupt-retrigger: NOP for now. This may not be apropriate for all 16 * interrupt-retrigger: NOP for now. This may not be appropriate for all
17 * machines, we'll see ... 17 * machines, we'll see ...
18 */ 18 */
19 19
diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h
index 5b017f23e243..b04e4de5dd2e 100644
--- a/arch/mips/include/asm/io.h
+++ b/arch/mips/include/asm/io.h
@@ -242,7 +242,7 @@ static inline void __iomem * __ioremap_mode(phys_t offset, unsigned long size,
242 * This version of ioremap ensures that the memory is marked uncachable 242 * This version of ioremap ensures that the memory is marked uncachable
243 * on the CPU as well as honouring existing caching rules from things like 243 * on the CPU as well as honouring existing caching rules from things like
244 * the PCI bus. Note that there are other caches and buffers on many 244 * the PCI bus. Note that there are other caches and buffers on many
245 * busses. In paticular driver authors should read up on PCI writes 245 * busses. In particular driver authors should read up on PCI writes
246 * 246 *
247 * It's useful if some control registers are in such an area and 247 * It's useful if some control registers are in such an area and
248 * write combining or read caching is not desirable: 248 * write combining or read caching is not desirable:
diff --git a/arch/mips/include/asm/irqflags.h b/arch/mips/include/asm/irqflags.h
index 9ef3b0d17896..309cbcd6909c 100644
--- a/arch/mips/include/asm/irqflags.h
+++ b/arch/mips/include/asm/irqflags.h
@@ -174,7 +174,7 @@ __asm__(
174 "mtc0 \\flags, $2, 1 \n" 174 "mtc0 \\flags, $2, 1 \n"
175#elif defined(CONFIG_CPU_MIPSR2) && defined(CONFIG_IRQ_CPU) 175#elif defined(CONFIG_CPU_MIPSR2) && defined(CONFIG_IRQ_CPU)
176 /* 176 /*
177 * Slow, but doesn't suffer from a relativly unlikely race 177 * Slow, but doesn't suffer from a relatively unlikely race
178 * condition we're having since days 1. 178 * condition we're having since days 1.
179 */ 179 */
180 " beqz \\flags, 1f \n" 180 " beqz \\flags, 1f \n"
diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h b/arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h
index 5325084d5c48..32978d32561a 100644
--- a/arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h
@@ -4,7 +4,7 @@
4#define TAGVER_LEN 4 /* Length of Tag Version */ 4#define TAGVER_LEN 4 /* Length of Tag Version */
5#define TAGLAYOUT_LEN 4 /* Length of FlashLayoutVer */ 5#define TAGLAYOUT_LEN 4 /* Length of FlashLayoutVer */
6#define SIG1_LEN 20 /* Company Signature 1 Length */ 6#define SIG1_LEN 20 /* Company Signature 1 Length */
7#define SIG2_LEN 14 /* Company Signature 2 Lenght */ 7#define SIG2_LEN 14 /* Company Signature 2 Length */
8#define BOARDID_LEN 16 /* Length of BoardId */ 8#define BOARDID_LEN 16 /* Length of BoardId */
9#define ENDIANFLAG_LEN 2 /* Endian Flag Length */ 9#define ENDIANFLAG_LEN 2 /* Endian Flag Length */
10#define CHIPID_LEN 6 /* Chip Id Length */ 10#define CHIPID_LEN 6 /* Chip Id Length */
diff --git a/arch/mips/include/asm/mach-ip32/mc146818rtc.h b/arch/mips/include/asm/mach-ip32/mc146818rtc.h
index c28ba8d84076..6b6bab43d5c1 100644
--- a/arch/mips/include/asm/mach-ip32/mc146818rtc.h
+++ b/arch/mips/include/asm/mach-ip32/mc146818rtc.h
@@ -26,7 +26,7 @@ static inline void CMOS_WRITE(unsigned char data, unsigned long addr)
26} 26}
27 27
28/* 28/*
29 * FIXME: Do it right. For now just assume that noone lives in 20th century 29 * FIXME: Do it right. For now just assume that no one lives in 20th century
30 * and no O2 user in 22th century ;-) 30 * and no O2 user in 22th century ;-)
31 */ 31 */
32#define mc146818_decode_year(year) ((year) + 2000) 32#define mc146818_decode_year(year) ((year) + 2000)
diff --git a/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h b/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h
index 021f77ca59ec..2a8e2bb5d539 100644
--- a/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h
+++ b/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * The header file of cs5536 sourth bridge. 2 * The header file of cs5536 south bridge.
3 * 3 *
4 * Copyright (C) 2007 Lemote, Inc. 4 * Copyright (C) 2007 Lemote, Inc.
5 * Author : jlliu <liujl@lemote.com> 5 * Author : jlliu <liujl@lemote.com>
diff --git a/arch/mips/include/asm/mach-pb1x00/pb1000.h b/arch/mips/include/asm/mach-pb1x00/pb1000.h
index 6d1ff9060e44..65059255dc1e 100644
--- a/arch/mips/include/asm/mach-pb1x00/pb1000.h
+++ b/arch/mips/include/asm/mach-pb1x00/pb1000.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Alchemy Semi Pb1000 Referrence Board 2 * Alchemy Semi Pb1000 Reference Board
3 * 3 *
4 * Copyright 2001, 2008 MontaVista Software Inc. 4 * Copyright 2001, 2008 MontaVista Software Inc.
5 * Author: MontaVista Software, Inc. <source@mvista.com> 5 * Author: MontaVista Software, Inc. <source@mvista.com>
diff --git a/arch/mips/include/asm/mach-pb1x00/pb1200.h b/arch/mips/include/asm/mach-pb1x00/pb1200.h
index 962eb55dc880..fce4332ebb7f 100644
--- a/arch/mips/include/asm/mach-pb1x00/pb1200.h
+++ b/arch/mips/include/asm/mach-pb1x00/pb1200.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * AMD Alchemy Pb1200 Referrence Board 2 * AMD Alchemy Pb1200 Reference Board
3 * Board Registers defines. 3 * Board Registers defines.
4 * 4 *
5 * ######################################################################## 5 * ########################################################################
diff --git a/arch/mips/include/asm/mach-pb1x00/pb1550.h b/arch/mips/include/asm/mach-pb1x00/pb1550.h
index fc4d766641ce..f835c88e9593 100644
--- a/arch/mips/include/asm/mach-pb1x00/pb1550.h
+++ b/arch/mips/include/asm/mach-pb1x00/pb1550.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * AMD Alchemy Semi PB1550 Referrence Board 2 * AMD Alchemy Semi PB1550 Reference Board
3 * Board Registers defines. 3 * Board Registers defines.
4 * 4 *
5 * Copyright 2004 Embedded Edge LLC. 5 * Copyright 2004 Embedded Edge LLC.
diff --git a/arch/mips/include/asm/mach-powertv/dma-coherence.h b/arch/mips/include/asm/mach-powertv/dma-coherence.h
index f76029c2406e..a8e72cf12142 100644
--- a/arch/mips/include/asm/mach-powertv/dma-coherence.h
+++ b/arch/mips/include/asm/mach-powertv/dma-coherence.h
@@ -48,7 +48,7 @@ static inline unsigned long virt_to_phys_from_pte(void *addr)
48 /* check for a valid page */ 48 /* check for a valid page */
49 if (pte_present(pte)) { 49 if (pte_present(pte)) {
50 /* get the physical address the page is 50 /* get the physical address the page is
51 * refering to */ 51 * referring to */
52 phys_addr = (unsigned long) 52 phys_addr = (unsigned long)
53 page_to_phys(pte_page(pte)); 53 page_to_phys(pte_page(pte));
54 /* add the offset within the page */ 54 /* add the offset within the page */
diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h
index 4d9870975382..6a6f8a8f542d 100644
--- a/arch/mips/include/asm/mipsregs.h
+++ b/arch/mips/include/asm/mipsregs.h
@@ -922,7 +922,7 @@ do { \
922#define write_c0_config7(val) __write_32bit_c0_register($16, 7, val) 922#define write_c0_config7(val) __write_32bit_c0_register($16, 7, val)
923 923
924/* 924/*
925 * The WatchLo register. There may be upto 8 of them. 925 * The WatchLo register. There may be up to 8 of them.
926 */ 926 */
927#define read_c0_watchlo0() __read_ulong_c0_register($18, 0) 927#define read_c0_watchlo0() __read_ulong_c0_register($18, 0)
928#define read_c0_watchlo1() __read_ulong_c0_register($18, 1) 928#define read_c0_watchlo1() __read_ulong_c0_register($18, 1)
@@ -942,7 +942,7 @@ do { \
942#define write_c0_watchlo7(val) __write_ulong_c0_register($18, 7, val) 942#define write_c0_watchlo7(val) __write_ulong_c0_register($18, 7, val)
943 943
944/* 944/*
945 * The WatchHi register. There may be upto 8 of them. 945 * The WatchHi register. There may be up to 8 of them.
946 */ 946 */
947#define read_c0_watchhi0() __read_32bit_c0_register($19, 0) 947#define read_c0_watchhi0() __read_32bit_c0_register($19, 0)
948#define read_c0_watchhi1() __read_32bit_c0_register($19, 1) 948#define read_c0_watchhi1() __read_32bit_c0_register($19, 1)
diff --git a/arch/mips/include/asm/octeon/cvmx-bootinfo.h b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
index f3c23a43f845..4e4c3a8282d6 100644
--- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
+++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
@@ -200,7 +200,7 @@ enum cvmx_chip_types_enum {
200 CVMX_CHIP_TYPE_MAX, 200 CVMX_CHIP_TYPE_MAX,
201}; 201};
202 202
203/* Compatability alias for NAC38 name change, planned to be removed 203/* Compatibility alias for NAC38 name change, planned to be removed
204 * from SDK 1.7 */ 204 * from SDK 1.7 */
205#define CVMX_BOARD_TYPE_NAO38 CVMX_BOARD_TYPE_NAC38 205#define CVMX_BOARD_TYPE_NAO38 CVMX_BOARD_TYPE_NAC38
206 206
diff --git a/arch/mips/include/asm/octeon/cvmx-bootmem.h b/arch/mips/include/asm/octeon/cvmx-bootmem.h
index 8e708bdb43f7..877845b84b14 100644
--- a/arch/mips/include/asm/octeon/cvmx-bootmem.h
+++ b/arch/mips/include/asm/octeon/cvmx-bootmem.h
@@ -67,7 +67,7 @@ struct cvmx_bootmem_block_header {
67 67
68/* 68/*
69 * Structure for named memory blocks. Number of descriptors available 69 * Structure for named memory blocks. Number of descriptors available
70 * can be changed without affecting compatiblity, but name length 70 * can be changed without affecting compatibility, but name length
71 * changes require a bump in the bootmem descriptor version Note: This 71 * changes require a bump in the bootmem descriptor version Note: This
72 * structure must be naturally 64 bit aligned, as a single memory 72 * structure must be naturally 64 bit aligned, as a single memory
73 * image will be used by both 32 and 64 bit programs. 73 * image will be used by both 32 and 64 bit programs.
diff --git a/arch/mips/include/asm/octeon/cvmx-l2c.h b/arch/mips/include/asm/octeon/cvmx-l2c.h
index 0b32c5b118e2..2c8ff9e33ec3 100644
--- a/arch/mips/include/asm/octeon/cvmx-l2c.h
+++ b/arch/mips/include/asm/octeon/cvmx-l2c.h
@@ -157,7 +157,7 @@ enum cvmx_l2c_tad_event {
157 157
158/** 158/**
159 * Configure one of the four L2 Cache performance counters to capture event 159 * Configure one of the four L2 Cache performance counters to capture event
160 * occurences. 160 * occurrences.
161 * 161 *
162 * @counter: The counter to configure. Range 0..3. 162 * @counter: The counter to configure. Range 0..3.
163 * @event: The type of L2 Cache event occurrence to count. 163 * @event: The type of L2 Cache event occurrence to count.
diff --git a/arch/mips/include/asm/octeon/cvmx.h b/arch/mips/include/asm/octeon/cvmx.h
index 9d9381e2e3d8..7e1286706d46 100644
--- a/arch/mips/include/asm/octeon/cvmx.h
+++ b/arch/mips/include/asm/octeon/cvmx.h
@@ -151,7 +151,7 @@ enum cvmx_mips_space {
151#endif 151#endif
152 152
153/** 153/**
154 * Convert a memory pointer (void*) into a hardware compatable 154 * Convert a memory pointer (void*) into a hardware compatible
155 * memory address (uint64_t). Octeon hardware widgets don't 155 * memory address (uint64_t). Octeon hardware widgets don't
156 * understand logical addresses. 156 * understand logical addresses.
157 * 157 *
diff --git a/arch/mips/include/asm/paccess.h b/arch/mips/include/asm/paccess.h
index c2394f8b0fe1..9ce5a1e7e14c 100644
--- a/arch/mips/include/asm/paccess.h
+++ b/arch/mips/include/asm/paccess.h
@@ -7,7 +7,7 @@
7 * Copyright (C) 1999, 2000 Silicon Graphics, Inc. 7 * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
8 * 8 *
9 * Protected memory access. Used for everything that might take revenge 9 * Protected memory access. Used for everything that might take revenge
10 * by sending a DBE error like accessing possibly non-existant memory or 10 * by sending a DBE error like accessing possibly non-existent memory or
11 * devices. 11 * devices.
12 */ 12 */
13#ifndef _ASM_PACCESS_H 13#ifndef _ASM_PACCESS_H
diff --git a/arch/mips/include/asm/pci/bridge.h b/arch/mips/include/asm/pci/bridge.h
index f1f508e4f971..be44fb0266da 100644
--- a/arch/mips/include/asm/pci/bridge.h
+++ b/arch/mips/include/asm/pci/bridge.h
@@ -262,7 +262,7 @@ typedef volatile struct bridge_s {
262} bridge_t; 262} bridge_t;
263 263
264/* 264/*
265 * Field formats for Error Command Word and Auxillary Error Command Word 265 * Field formats for Error Command Word and Auxiliary Error Command Word
266 * of bridge. 266 * of bridge.
267 */ 267 */
268typedef struct bridge_err_cmdword_s { 268typedef struct bridge_err_cmdword_s {
diff --git a/arch/mips/include/asm/pmc-sierra/msp71xx/msp_regops.h b/arch/mips/include/asm/pmc-sierra/msp71xx/msp_regops.h
index 60a5a38dd5b2..7d41474e5488 100644
--- a/arch/mips/include/asm/pmc-sierra/msp71xx/msp_regops.h
+++ b/arch/mips/include/asm/pmc-sierra/msp71xx/msp_regops.h
@@ -205,7 +205,7 @@ static inline u32 blocking_read_reg32(volatile u32 *const addr)
205 * custom_read_reg32(address, tmp); <-- Reads the address and put the value 205 * custom_read_reg32(address, tmp); <-- Reads the address and put the value
206 * in the 'tmp' variable given 206 * in the 'tmp' variable given
207 * 207 *
208 * From here on out, you are (basicly) atomic, so don't do anything too 208 * From here on out, you are (basically) atomic, so don't do anything too
209 * fancy! 209 * fancy!
210 * Also, this code may loop if the end of this block fails to write 210 * Also, this code may loop if the end of this block fails to write
211 * everything back safely due do the other CPU, so do NOT do anything 211 * everything back safely due do the other CPU, so do NOT do anything
diff --git a/arch/mips/include/asm/processor.h b/arch/mips/include/asm/processor.h
index ead6928fa6b8..c104f1039a69 100644
--- a/arch/mips/include/asm/processor.h
+++ b/arch/mips/include/asm/processor.h
@@ -337,7 +337,7 @@ unsigned long get_wchan(struct task_struct *p);
337/* 337/*
338 * Return_address is a replacement for __builtin_return_address(count) 338 * Return_address is a replacement for __builtin_return_address(count)
339 * which on certain architectures cannot reasonably be implemented in GCC 339 * which on certain architectures cannot reasonably be implemented in GCC
340 * (MIPS, Alpha) or is unuseable with -fomit-frame-pointer (i386). 340 * (MIPS, Alpha) or is unusable with -fomit-frame-pointer (i386).
341 * Note that __builtin_return_address(x>=1) is forbidden because GCC 341 * Note that __builtin_return_address(x>=1) is forbidden because GCC
342 * aborts compilation on some CPUs. It's simply not possible to unwind 342 * aborts compilation on some CPUs. It's simply not possible to unwind
343 * some CPU's stackframes. 343 * some CPU's stackframes.
diff --git a/arch/mips/include/asm/sgi/ioc.h b/arch/mips/include/asm/sgi/ioc.h
index 57a971904cfe..380347b648e2 100644
--- a/arch/mips/include/asm/sgi/ioc.h
+++ b/arch/mips/include/asm/sgi/ioc.h
@@ -17,7 +17,7 @@
17#include <asm/sgi/pi1.h> 17#include <asm/sgi/pi1.h>
18 18
19/* 19/*
20 * All registers are 8-bit wide alligned on 32-bit boundary. Bad things 20 * All registers are 8-bit wide aligned on 32-bit boundary. Bad things
21 * happen if you try word access them. You have been warned. 21 * happen if you try word access them. You have been warned.
22 */ 22 */
23 23
diff --git a/arch/mips/include/asm/sibyte/sb1250_mac.h b/arch/mips/include/asm/sibyte/sb1250_mac.h
index 591b9061fd8e..77f787284235 100644
--- a/arch/mips/include/asm/sibyte/sb1250_mac.h
+++ b/arch/mips/include/asm/sibyte/sb1250_mac.h
@@ -520,7 +520,7 @@
520#define G_MAC_RX_EOP_COUNTER(x) _SB_GETVALUE(x, S_MAC_RX_EOP_COUNTER, M_MAC_RX_EOP_COUNTER) 520#define G_MAC_RX_EOP_COUNTER(x) _SB_GETVALUE(x, S_MAC_RX_EOP_COUNTER, M_MAC_RX_EOP_COUNTER)
521 521
522/* 522/*
523 * MAC Recieve Address Filter Exact Match Registers (Table 9-21) 523 * MAC Receive Address Filter Exact Match Registers (Table 9-21)
524 * Registers: MAC_ADDR0_0 through MAC_ADDR7_0 524 * Registers: MAC_ADDR0_0 through MAC_ADDR7_0
525 * Registers: MAC_ADDR0_1 through MAC_ADDR7_1 525 * Registers: MAC_ADDR0_1 through MAC_ADDR7_1
526 * Registers: MAC_ADDR0_2 through MAC_ADDR7_2 526 * Registers: MAC_ADDR0_2 through MAC_ADDR7_2
@@ -538,7 +538,7 @@
538/* No bitfields */ 538/* No bitfields */
539 539
540/* 540/*
541 * MAC Recieve Address Filter Hash Match Registers (Table 9-22) 541 * MAC Receive Address Filter Hash Match Registers (Table 9-22)
542 * Registers: MAC_HASH0_0 through MAC_HASH7_0 542 * Registers: MAC_HASH0_0 through MAC_HASH7_0
543 * Registers: MAC_HASH0_1 through MAC_HASH7_1 543 * Registers: MAC_HASH0_1 through MAC_HASH7_1
544 * Registers: MAC_HASH0_2 through MAC_HASH7_2 544 * Registers: MAC_HASH0_2 through MAC_HASH7_2
diff --git a/arch/mips/include/asm/siginfo.h b/arch/mips/include/asm/siginfo.h
index 1ca64b4d33d9..20ebeb875ee6 100644
--- a/arch/mips/include/asm/siginfo.h
+++ b/arch/mips/include/asm/siginfo.h
@@ -101,7 +101,7 @@ typedef struct siginfo {
101 101
102/* 102/*
103 * si_code values 103 * si_code values
104 * Again these have been choosen to be IRIX compatible. 104 * Again these have been chosen to be IRIX compatible.
105 */ 105 */
106#undef SI_ASYNCIO 106#undef SI_ASYNCIO
107#undef SI_TIMER 107#undef SI_TIMER
diff --git a/arch/mips/include/asm/sn/klconfig.h b/arch/mips/include/asm/sn/klconfig.h
index 09e590daca17..fe02900b930d 100644
--- a/arch/mips/include/asm/sn/klconfig.h
+++ b/arch/mips/include/asm/sn/klconfig.h
@@ -78,7 +78,7 @@ typedef s32 klconf_off_t;
78 */ 78 */
79#define MAX_SLOTS_PER_NODE (1 + 2 + 6 + 2) 79#define MAX_SLOTS_PER_NODE (1 + 2 + 6 + 2)
80 80
81/* XXX if each node is guranteed to have some memory */ 81/* XXX if each node is guaranteed to have some memory */
82 82
83#define MAX_PCI_DEVS 8 83#define MAX_PCI_DEVS 8
84 84
@@ -539,7 +539,7 @@ typedef struct klinfo_s { /* Generic info */
539#define KLSTRUCT_IOC3_TTY 24 539#define KLSTRUCT_IOC3_TTY 24
540 540
541/* Early Access IO proms are compatible 541/* Early Access IO proms are compatible
542 only with KLSTRUCT values upto 24. */ 542 only with KLSTRUCT values up to 24. */
543 543
544#define KLSTRUCT_FIBERCHANNEL 25 544#define KLSTRUCT_FIBERCHANNEL 25
545#define KLSTRUCT_MOD_SERIAL_NUM 26 545#define KLSTRUCT_MOD_SERIAL_NUM 26
diff --git a/arch/mips/include/asm/sn/sn0/hubio.h b/arch/mips/include/asm/sn/sn0/hubio.h
index 31c76c021bb6..46286d8302a7 100644
--- a/arch/mips/include/asm/sn/sn0/hubio.h
+++ b/arch/mips/include/asm/sn/sn0/hubio.h
@@ -622,7 +622,7 @@ typedef union h1_icrbb_u {
622 */ 622 */
623#define IIO_ICRB_PROC0 0 /* Source of request is Proc 0 */ 623#define IIO_ICRB_PROC0 0 /* Source of request is Proc 0 */
624#define IIO_ICRB_PROC1 1 /* Source of request is Proc 1 */ 624#define IIO_ICRB_PROC1 1 /* Source of request is Proc 1 */
625#define IIO_ICRB_GB_REQ 2 /* Source is Guranteed BW request */ 625#define IIO_ICRB_GB_REQ 2 /* Source is Guaranteed BW request */
626#define IIO_ICRB_IO_REQ 3 /* Source is Normal IO request */ 626#define IIO_ICRB_IO_REQ 3 /* Source is Normal IO request */
627 627
628/* 628/*
diff --git a/arch/mips/include/asm/stackframe.h b/arch/mips/include/asm/stackframe.h
index 58730c5ce4bf..b4ba2449444b 100644
--- a/arch/mips/include/asm/stackframe.h
+++ b/arch/mips/include/asm/stackframe.h
@@ -346,7 +346,7 @@
346 * we can't dispatch it directly without trashing 346 * we can't dispatch it directly without trashing
347 * some registers, so we'll try to detect this unlikely 347 * some registers, so we'll try to detect this unlikely
348 * case and program a software interrupt in the VPE, 348 * case and program a software interrupt in the VPE,
349 * as would be done for a cross-VPE IPI. To accomodate 349 * as would be done for a cross-VPE IPI. To accommodate
350 * the handling of that case, we're doing a DVPE instead 350 * the handling of that case, we're doing a DVPE instead
351 * of just a DMT here to protect against other threads. 351 * of just a DMT here to protect against other threads.
352 * This is a lot of cruft to cover a tiny window. 352 * This is a lot of cruft to cover a tiny window.
diff --git a/arch/mips/include/asm/war.h b/arch/mips/include/asm/war.h
index 22361d5e3bf0..fa133c1bc1f9 100644
--- a/arch/mips/include/asm/war.h
+++ b/arch/mips/include/asm/war.h
@@ -227,7 +227,7 @@
227#endif 227#endif
228 228
229/* 229/*
230 * On the R10000 upto version 2.6 (not sure about 2.7) there is a bug that 230 * On the R10000 up to version 2.6 (not sure about 2.7) there is a bug that
231 * may cause ll / sc and lld / scd sequences to execute non-atomically. 231 * may cause ll / sc and lld / scd sequences to execute non-atomically.
232 */ 232 */
233#ifndef R10000_LLSC_WAR 233#ifndef R10000_LLSC_WAR
diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c
index bc18daaa8f84..c3b04be3fb2b 100644
--- a/arch/mips/jz4740/board-qi_lb60.c
+++ b/arch/mips/jz4740/board-qi_lb60.c
@@ -65,7 +65,7 @@ static struct nand_ecclayout qi_lb60_ecclayout_1gb = {
65}; 65};
66 66
67/* Early prototypes of the QI LB60 had only 1GB of NAND. 67/* Early prototypes of the QI LB60 had only 1GB of NAND.
68 * In order to support these devices aswell the partition and ecc layout is 68 * In order to support these devices as well the partition and ecc layout is
69 * initialized depending on the NAND size */ 69 * initialized depending on the NAND size */
70static struct mtd_partition qi_lb60_partitions_1gb[] = { 70static struct mtd_partition qi_lb60_partitions_1gb[] = {
71 { 71 {
@@ -439,7 +439,7 @@ static struct platform_device *jz_platform_devices[] __initdata = {
439static void __init board_gpio_setup(void) 439static void __init board_gpio_setup(void)
440{ 440{
441 /* We only need to enable/disable pullup here for pins used in generic 441 /* We only need to enable/disable pullup here for pins used in generic
442 * drivers. Everything else is done by the drivers themselfs. */ 442 * drivers. Everything else is done by the drivers themselves. */
443 jz_gpio_disable_pullup(QI_LB60_GPIO_SD_VCC_EN_N); 443 jz_gpio_disable_pullup(QI_LB60_GPIO_SD_VCC_EN_N);
444 jz_gpio_disable_pullup(QI_LB60_GPIO_SD_CD); 444 jz_gpio_disable_pullup(QI_LB60_GPIO_SD_CD);
445} 445}
diff --git a/arch/mips/kernel/cpu-bugs64.c b/arch/mips/kernel/cpu-bugs64.c
index b8bb8ba60869..f305ca14351b 100644
--- a/arch/mips/kernel/cpu-bugs64.c
+++ b/arch/mips/kernel/cpu-bugs64.c
@@ -73,7 +73,7 @@ static inline void mult_sh_align_mod(long *v1, long *v2, long *w,
73 : "0" (5), "1" (8), "2" (5)); 73 : "0" (5), "1" (8), "2" (5));
74 align_mod(align, mod); 74 align_mod(align, mod);
75 /* 75 /*
76 * The trailing nop is needed to fullfill the two-instruction 76 * The trailing nop is needed to fulfill the two-instruction
77 * requirement between reading hi/lo and staring a mult/div. 77 * requirement between reading hi/lo and staring a mult/div.
78 * Leaving it out may cause gas insert a nop itself breaking 78 * Leaving it out may cause gas insert a nop itself breaking
79 * the desired alignment of the next chunk. 79 * the desired alignment of the next chunk.
diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c
index d9a7db78ed62..75266ff4cc33 100644
--- a/arch/mips/kernel/perf_event_mipsxx.c
+++ b/arch/mips/kernel/perf_event_mipsxx.c
@@ -721,7 +721,7 @@ static void mipsxx_pmu_start(void)
721 721
722/* 722/*
723 * MIPS performance counters can be per-TC. The control registers can 723 * MIPS performance counters can be per-TC. The control registers can
724 * not be directly accessed accross CPUs. Hence if we want to do global 724 * not be directly accessed across CPUs. Hence if we want to do global
725 * control, we need cross CPU calls. on_each_cpu() can help us, but we 725 * control, we need cross CPU calls. on_each_cpu() can help us, but we
726 * can not make sure this function is called with interrupts enabled. So 726 * can not make sure this function is called with interrupts enabled. So
727 * here we pause local counters and then grab a rwlock and leave the 727 * here we pause local counters and then grab a rwlock and leave the
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index ae167df73ddd..d2112d3cf115 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -410,7 +410,7 @@ unsigned long unwind_stack(struct task_struct *task, unsigned long *sp,
410 if (!kallsyms_lookup_size_offset(pc, &size, &ofs)) 410 if (!kallsyms_lookup_size_offset(pc, &size, &ofs))
411 return 0; 411 return 0;
412 /* 412 /*
413 * Return ra if an exception occured at the first instruction 413 * Return ra if an exception occurred at the first instruction
414 */ 414 */
415 if (unlikely(ofs == 0)) { 415 if (unlikely(ofs == 0)) {
416 pc = *ra; 416 pc = *ra;
diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c
index c0e81418ba21..1ec56e635d04 100644
--- a/arch/mips/kernel/smp-mt.c
+++ b/arch/mips/kernel/smp-mt.c
@@ -120,7 +120,7 @@ static void vsmp_send_ipi_single(int cpu, unsigned int action)
120 120
121 local_irq_save(flags); 121 local_irq_save(flags);
122 122
123 vpflags = dvpe(); /* cant access the other CPU's registers whilst MVPE enabled */ 123 vpflags = dvpe(); /* can't access the other CPU's registers whilst MVPE enabled */
124 124
125 switch (action) { 125 switch (action) {
126 case SMP_CALL_FUNCTION: 126 case SMP_CALL_FUNCTION:
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index fb7497405510..1083ad4e1017 100644
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -102,7 +102,7 @@ static __init int cpu_has_mfc0_count_bug(void)
102 case CPU_R4400SC: 102 case CPU_R4400SC:
103 case CPU_R4400MC: 103 case CPU_R4400MC:
104 /* 104 /*
105 * The published errata for the R4400 upto 3.0 say the CPU 105 * The published errata for the R4400 up to 3.0 say the CPU
106 * has the mfc0 from count bug. 106 * has the mfc0 from count bug.
107 */ 107 */
108 if ((current_cpu_data.processor_id & 0xff) <= 0x30) 108 if ((current_cpu_data.processor_id & 0xff) <= 0x30)
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index ab52b7cf3b6b..dbb6b408f001 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -19,7 +19,7 @@
19 * VPE support module 19 * VPE support module
20 * 20 *
21 * Provides support for loading a MIPS SP program on VPE1. 21 * Provides support for loading a MIPS SP program on VPE1.
22 * The SP enviroment is rather simple, no tlb's. It needs to be relocatable 22 * The SP environment is rather simple, no tlb's. It needs to be relocatable
23 * (or partially linked). You should initialise your stack in the startup 23 * (or partially linked). You should initialise your stack in the startup
24 * code. This loader looks for the symbol __start and sets up 24 * code. This loader looks for the symbol __start and sets up
25 * execution to resume from there. The MIPS SDE kit contains suitable examples. 25 * execution to resume from there. The MIPS SDE kit contains suitable examples.
diff --git a/arch/mips/lib/strnlen_user.S b/arch/mips/lib/strnlen_user.S
index c768e3000616..64457162f7e0 100644
--- a/arch/mips/lib/strnlen_user.S
+++ b/arch/mips/lib/strnlen_user.S
@@ -17,7 +17,7 @@
17 .previous 17 .previous
18 18
19/* 19/*
20 * Return the size of a string including the ending NUL character upto a 20 * Return the size of a string including the ending NUL character up to a
21 * maximum of a1 or 0 in case of error. 21 * maximum of a1 or 0 in case of error.
22 * 22 *
23 * Note: for performance reasons we deliberately accept that a user may 23 * Note: for performance reasons we deliberately accept that a user may
diff --git a/arch/mips/math-emu/dp_fsp.c b/arch/mips/math-emu/dp_fsp.c
index 1dfbd92ba9d0..daed6834dc15 100644
--- a/arch/mips/math-emu/dp_fsp.c
+++ b/arch/mips/math-emu/dp_fsp.c
@@ -62,7 +62,7 @@ ieee754dp ieee754dp_fsp(ieee754sp x)
62 break; 62 break;
63 } 63 }
64 64
65 /* CANT possibly overflow,underflow, or need rounding 65 /* CAN'T possibly overflow,underflow, or need rounding
66 */ 66 */
67 67
68 /* drop the hidden bit */ 68 /* drop the hidden bit */
diff --git a/arch/mips/math-emu/dp_mul.c b/arch/mips/math-emu/dp_mul.c
index aa566e785f5a..09175f461920 100644
--- a/arch/mips/math-emu/dp_mul.c
+++ b/arch/mips/math-emu/dp_mul.c
@@ -104,7 +104,7 @@ ieee754dp ieee754dp_mul(ieee754dp x, ieee754dp y)
104 case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_NORM): 104 case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_NORM):
105 break; 105 break;
106 } 106 }
107 /* rm = xm * ym, re = xe+ye basicly */ 107 /* rm = xm * ym, re = xe+ye basically */
108 assert(xm & DP_HIDDEN_BIT); 108 assert(xm & DP_HIDDEN_BIT);
109 assert(ym & DP_HIDDEN_BIT); 109 assert(ym & DP_HIDDEN_BIT);
110 { 110 {
diff --git a/arch/mips/math-emu/dsemul.c b/arch/mips/math-emu/dsemul.c
index 36d975ae08f8..3c4a8c5ba7f2 100644
--- a/arch/mips/math-emu/dsemul.c
+++ b/arch/mips/math-emu/dsemul.c
@@ -32,7 +32,7 @@
32 * not change cp0_epc due to the instruction 32 * not change cp0_epc due to the instruction
33 * 33 *
34 * According to the spec: 34 * According to the spec:
35 * 1) it shouldnt be a branch :-) 35 * 1) it shouldn't be a branch :-)
36 * 2) it can be a COP instruction :-( 36 * 2) it can be a COP instruction :-(
37 * 3) if we are tring to run a protected memory space we must take 37 * 3) if we are tring to run a protected memory space we must take
38 * special care on memory access instructions :-( 38 * special care on memory access instructions :-(
diff --git a/arch/mips/math-emu/sp_mul.c b/arch/mips/math-emu/sp_mul.c
index c06bb4022be5..2722a2570ea4 100644
--- a/arch/mips/math-emu/sp_mul.c
+++ b/arch/mips/math-emu/sp_mul.c
@@ -104,7 +104,7 @@ ieee754sp ieee754sp_mul(ieee754sp x, ieee754sp y)
104 case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_NORM): 104 case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_NORM):
105 break; 105 break;
106 } 106 }
107 /* rm = xm * ym, re = xe+ye basicly */ 107 /* rm = xm * ym, re = xe+ye basically */
108 assert(xm & SP_HIDDEN_BIT); 108 assert(xm & SP_HIDDEN_BIT);
109 assert(ym & SP_HIDDEN_BIT); 109 assert(ym & SP_HIDDEN_BIT);
110 110
diff --git a/arch/mips/mm/cex-sb1.S b/arch/mips/mm/cex-sb1.S
index 2d08268bb705..89c412bc4b64 100644
--- a/arch/mips/mm/cex-sb1.S
+++ b/arch/mips/mm/cex-sb1.S
@@ -79,7 +79,7 @@ LEAF(except_vec2_sb1)
79recovered_dcache: 79recovered_dcache:
80 /* 80 /*
81 * Unlock CacheErr-D (which in turn unlocks CacheErr-DPA). 81 * Unlock CacheErr-D (which in turn unlocks CacheErr-DPA).
82 * Ought to log the occurence of this recovered dcache error. 82 * Ought to log the occurrence of this recovered dcache error.
83 */ 83 */
84 b recovered 84 b recovered
85 mtc0 $0,C0_CERR_D 85 mtc0 $0,C0_CERR_D
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 04f9e17db9d0..5ef294fbb6e7 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -352,7 +352,7 @@ static void __cpuinit __maybe_unused build_tlb_probe_entry(u32 **p)
352 352
353/* 353/*
354 * Write random or indexed TLB entry, and care about the hazards from 354 * Write random or indexed TLB entry, and care about the hazards from
355 * the preceeding mtc0 and for the following eret. 355 * the preceding mtc0 and for the following eret.
356 */ 356 */
357enum tlb_write_entry { tlb_random, tlb_indexed }; 357enum tlb_write_entry { tlb_random, tlb_indexed };
358 358
diff --git a/arch/mips/mti-malta/malta-smtc.c b/arch/mips/mti-malta/malta-smtc.c
index e67891521ac1..49a38b09a488 100644
--- a/arch/mips/mti-malta/malta-smtc.c
+++ b/arch/mips/mti-malta/malta-smtc.c
@@ -130,7 +130,7 @@ int plat_set_irq_affinity(struct irq_data *d, const struct cpumask *affinity,
130 * cleared in the affinity mask, there will never be any 130 * cleared in the affinity mask, there will never be any
131 * interrupt forwarding. But as soon as a program or operator 131 * interrupt forwarding. But as soon as a program or operator
132 * sets affinity for one of the related IRQs, we need to make 132 * sets affinity for one of the related IRQs, we need to make
133 * sure that we don't ever try to forward across the VPE boundry, 133 * sure that we don't ever try to forward across the VPE boundary,
134 * at least not until we engineer a system where the interrupt 134 * at least not until we engineer a system where the interrupt
135 * _ack() or _end() function can somehow know that it corresponds 135 * _ack() or _end() function can somehow know that it corresponds
136 * to an interrupt taken on another VPE, and perform the appropriate 136 * to an interrupt taken on another VPE, and perform the appropriate
diff --git a/arch/mips/pci/ops-pmcmsp.c b/arch/mips/pci/ops-pmcmsp.c
index 68798f869c0f..8fbfbf2b931c 100644
--- a/arch/mips/pci/ops-pmcmsp.c
+++ b/arch/mips/pci/ops-pmcmsp.c
@@ -344,7 +344,7 @@ static irqreturn_t bpci_interrupt(int irq, void *dev_id)
344 * PCI_ACCESS_WRITE and PCI_ACCESS_READ. 344 * PCI_ACCESS_WRITE and PCI_ACCESS_READ.
345 * 345 *
346 * bus - pointer to the bus number of the device to 346 * bus - pointer to the bus number of the device to
347 * be targetted for the configuration cycle. 347 * be targeted for the configuration cycle.
348 * The only element of the pci_bus structure 348 * The only element of the pci_bus structure
349 * used is bus->number. This argument determines 349 * used is bus->number. This argument determines
350 * if the configuration access will be Type 0 or 350 * if the configuration access will be Type 0 or
@@ -354,7 +354,7 @@ static irqreturn_t bpci_interrupt(int irq, void *dev_id)
354 * 354 *
355 * devfn - this is an 8-bit field. The lower three bits 355 * devfn - this is an 8-bit field. The lower three bits
356 * specify the function number of the device to 356 * specify the function number of the device to
357 * be targetted for the configuration cycle, with 357 * be targeted for the configuration cycle, with
358 * all three-bit combinations being legal. The 358 * all three-bit combinations being legal. The
359 * upper five bits specify the device number, 359 * upper five bits specify the device number,
360 * with legal values being 10 to 31. 360 * with legal values being 10 to 31.
diff --git a/arch/mips/pci/pci-bcm1480.c b/arch/mips/pci/pci-bcm1480.c
index 6f5e24c6ae67..af8c31996965 100644
--- a/arch/mips/pci/pci-bcm1480.c
+++ b/arch/mips/pci/pci-bcm1480.c
@@ -210,7 +210,7 @@ static int __init bcm1480_pcibios_init(void)
210 PCIBIOS_MIN_IO = 0x00008000UL; 210 PCIBIOS_MIN_IO = 0x00008000UL;
211 PCIBIOS_MIN_MEM = 0x01000000UL; 211 PCIBIOS_MIN_MEM = 0x01000000UL;
212 212
213 /* Set I/O resource limits. - unlimited for now to accomodate HT */ 213 /* Set I/O resource limits. - unlimited for now to accommodate HT */
214 ioport_resource.end = 0xffffffffUL; 214 ioport_resource.end = 0xffffffffUL;
215 iomem_resource.end = 0xffffffffUL; 215 iomem_resource.end = 0xffffffffUL;
216 216
diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c
index 2d74fc9ae3ba..ed1c54284b8f 100644
--- a/arch/mips/pci/pci-octeon.c
+++ b/arch/mips/pci/pci-octeon.c
@@ -441,7 +441,7 @@ static void octeon_pci_initialize(void)
441 441
442 /* 442 /*
443 * TDOMC must be set to one in PCI mode. TDOMC should be set to 4 443 * TDOMC must be set to one in PCI mode. TDOMC should be set to 4
444 * in PCI-X mode to allow four oustanding splits. Otherwise, 444 * in PCI-X mode to allow four outstanding splits. Otherwise,
445 * should not change from its reset value. Don't write PCI_CFG19 445 * should not change from its reset value. Don't write PCI_CFG19
446 * in PCI mode (0x82000001 reset value), write it to 0x82000004 446 * in PCI mode (0x82000001 reset value), write it to 0x82000004
447 * after PCI-X mode is known. MRBCI,MDWE,MDRE -> must be zero. 447 * after PCI-X mode is known. MRBCI,MDWE,MDRE -> must be zero.
@@ -515,7 +515,7 @@ static void octeon_pci_initialize(void)
515#endif /* USE_OCTEON_INTERNAL_ARBITER */ 515#endif /* USE_OCTEON_INTERNAL_ARBITER */
516 516
517 /* 517 /*
518 * Preferrably written to 1 to set MLTD. [RDSATI,TRTAE, 518 * Preferably written to 1 to set MLTD. [RDSATI,TRTAE,
519 * TWTAE,TMAE,DPPMR -> must be zero. TILT -> must not be set to 519 * TWTAE,TMAE,DPPMR -> must be zero. TILT -> must not be set to
520 * 1..7. 520 * 1..7.
521 */ 521 */
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 38bc28005b4a..33bba7bff258 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -125,7 +125,7 @@ void __devinit register_pci_controller(struct pci_controller *hose)
125 hose_tail = &hose->next; 125 hose_tail = &hose->next;
126 126
127 /* 127 /*
128 * Do not panic here but later - this might hapen before console init. 128 * Do not panic here but later - this might happen before console init.
129 */ 129 */
130 if (!hose->io_map_base) { 130 if (!hose->io_map_base) {
131 printk(KERN_WARNING 131 printk(KERN_WARNING
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_setup.c b/arch/mips/pmc-sierra/msp71xx/msp_setup.c
index fb37a10e0309..2413ea67877e 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_setup.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_setup.c
@@ -239,7 +239,7 @@ void __init prom_init(void)
239#ifdef CONFIG_PMCTWILED 239#ifdef CONFIG_PMCTWILED
240 /* 240 /*
241 * Setup LED states before the subsys_initcall loads other 241 * Setup LED states before the subsys_initcall loads other
242 * dependant drivers/modules. 242 * dependent drivers/modules.
243 */ 243 */
244 pmctwiled_setup(); 244 pmctwiled_setup();
245#endif 245#endif
diff --git a/arch/mips/pnx833x/common/platform.c b/arch/mips/pnx833x/common/platform.c
index ce45df17fd09..87167dcc79fa 100644
--- a/arch/mips/pnx833x/common/platform.c
+++ b/arch/mips/pnx833x/common/platform.c
@@ -165,7 +165,7 @@ static struct i2c_pnx0105_dev pnx833x_i2c_dev[] = {
165 { 165 {
166 .base = PNX833X_I2C0_PORTS_START, 166 .base = PNX833X_I2C0_PORTS_START,
167 .irq = -1, /* should be PNX833X_PIC_I2C0_INT but polling is faster */ 167 .irq = -1, /* should be PNX833X_PIC_I2C0_INT but polling is faster */
168 .clock = 6, /* 0 == 400 kHz, 4 == 100 kHz(Maximum HDMI), 6 = 50kHz(Prefered HDCP) */ 168 .clock = 6, /* 0 == 400 kHz, 4 == 100 kHz(Maximum HDMI), 6 = 50kHz(Preferred HDCP) */
169 .bus_addr = 0, /* no slave support */ 169 .bus_addr = 0, /* no slave support */
170 }, 170 },
171 { 171 {
diff --git a/arch/mips/sgi-ip27/Kconfig b/arch/mips/sgi-ip27/Kconfig
index 5e960ae9735a..bc5e9769bb73 100644
--- a/arch/mips/sgi-ip27/Kconfig
+++ b/arch/mips/sgi-ip27/Kconfig
@@ -1,7 +1,7 @@
1#config SGI_SN0_XXL 1#config SGI_SN0_XXL
2# bool "IP27 XXL" 2# bool "IP27 XXL"
3# depends on SGI_IP27 3# depends on SGI_IP27
4# This options adds support for userspace processes upto 16TB size. 4# This options adds support for userspace processes up to 16TB size.
5# Normally the limit is just .5TB. 5# Normally the limit is just .5TB.
6 6
7choice 7choice
diff --git a/arch/mips/sgi-ip27/TODO b/arch/mips/sgi-ip27/TODO
index 19f1512c8f2e..160857ff1483 100644
--- a/arch/mips/sgi-ip27/TODO
+++ b/arch/mips/sgi-ip27/TODO
@@ -13,7 +13,7 @@ being invoked on all nodes in ip27-memory.c.
139. start_thread must turn off UX64 ... and define tlb_refill_debug. 139. start_thread must turn off UX64 ... and define tlb_refill_debug.
1410. Need a bad pmd table, bad pte table. __bad_pmd_table/__bad_pagetable 1410. Need a bad pmd table, bad pte table. __bad_pmd_table/__bad_pagetable
15does not agree with pgd_bad/pmd_bad. 15does not agree with pgd_bad/pmd_bad.
1611. All intrs (ip27_do_irq handlers) are targetted at cpu A on the node. 1611. All intrs (ip27_do_irq handlers) are targeted at cpu A on the node.
17This might need to change later. Only the timer intr is set up to be 17This might need to change later. Only the timer intr is set up to be
18received on both Cpu A and B. (ip27_do_irq()/bridge_startup()) 18received on both Cpu A and B. (ip27_do_irq()/bridge_startup())
1913. Cache flushing (specially the SMP version) has to be investigated. 1913. Cache flushing (specially the SMP version) has to be investigated.
diff --git a/arch/mips/sgi-ip27/ip27-init.c b/arch/mips/sgi-ip27/ip27-init.c
index 51d3a4f2d7e1..923c080f77bd 100644
--- a/arch/mips/sgi-ip27/ip27-init.c
+++ b/arch/mips/sgi-ip27/ip27-init.c
@@ -93,7 +93,7 @@ static void __cpuinit per_hub_init(cnodeid_t cnode)
93 93
94 /* 94 /*
95 * Some interrupts are reserved by hardware or by software convention. 95 * Some interrupts are reserved by hardware or by software convention.
96 * Mark these as reserved right away so they won't be used accidently 96 * Mark these as reserved right away so they won't be used accidentally
97 * later. 97 * later.
98 */ 98 */
99 for (i = 0; i <= BASE_PCI_IRQ; i++) { 99 for (i = 0; i <= BASE_PCI_IRQ; i++) {
diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c
index 11488719dd97..0a04603d577c 100644
--- a/arch/mips/sgi-ip27/ip27-irq.c
+++ b/arch/mips/sgi-ip27/ip27-irq.c
@@ -41,7 +41,7 @@
41 * Linux has a controller-independent x86 interrupt architecture. 41 * Linux has a controller-independent x86 interrupt architecture.
42 * every controller has a 'controller-template', that is used 42 * every controller has a 'controller-template', that is used
43 * by the main code to do the right thing. Each driver-visible 43 * by the main code to do the right thing. Each driver-visible
44 * interrupt source is transparently wired to the apropriate 44 * interrupt source is transparently wired to the appropriate
45 * controller. Thus drivers need not be aware of the 45 * controller. Thus drivers need not be aware of the
46 * interrupt-controller. 46 * interrupt-controller.
47 * 47 *
diff --git a/arch/mn10300/include/asm/cpu-regs.h b/arch/mn10300/include/asm/cpu-regs.h
index 90ed4a365c97..c54effae2202 100644
--- a/arch/mn10300/include/asm/cpu-regs.h
+++ b/arch/mn10300/include/asm/cpu-regs.h
@@ -49,7 +49,7 @@ asm(" .am33_2\n");
49#define EPSW_IM_6 0x00000600 /* interrupt mode 6 */ 49#define EPSW_IM_6 0x00000600 /* interrupt mode 6 */
50#define EPSW_IM_7 0x00000700 /* interrupt mode 7 */ 50#define EPSW_IM_7 0x00000700 /* interrupt mode 7 */
51#define EPSW_IE 0x00000800 /* interrupt enable */ 51#define EPSW_IE 0x00000800 /* interrupt enable */
52#define EPSW_S 0x00003000 /* software auxilliary bits */ 52#define EPSW_S 0x00003000 /* software auxiliary bits */
53#define EPSW_T 0x00008000 /* trace enable */ 53#define EPSW_T 0x00008000 /* trace enable */
54#define EPSW_nSL 0x00010000 /* not supervisor level */ 54#define EPSW_nSL 0x00010000 /* not supervisor level */
55#define EPSW_NMID 0x00020000 /* nonmaskable interrupt disable */ 55#define EPSW_NMID 0x00020000 /* nonmaskable interrupt disable */
diff --git a/arch/parisc/include/asm/eisa_eeprom.h b/arch/parisc/include/asm/eisa_eeprom.h
index 9c9da980402a..8ce8b85ca588 100644
--- a/arch/parisc/include/asm/eisa_eeprom.h
+++ b/arch/parisc/include/asm/eisa_eeprom.h
@@ -27,7 +27,7 @@ struct eeprom_header
27 u_int8_t ver_maj; 27 u_int8_t ver_maj;
28 u_int8_t ver_min; 28 u_int8_t ver_min;
29 u_int8_t num_slots; /* number of EISA slots in system */ 29 u_int8_t num_slots; /* number of EISA slots in system */
30 u_int16_t csum; /* checksum, I don't know how to calulate this */ 30 u_int16_t csum; /* checksum, I don't know how to calculate this */
31 u_int8_t pad[10]; 31 u_int8_t pad[10];
32} __attribute__ ((packed)); 32} __attribute__ ((packed));
33 33
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index e5477092a5d4..ead8d2a1034c 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -187,8 +187,8 @@
187 187
188 /* Register definitions for tlb miss handler macros */ 188 /* Register definitions for tlb miss handler macros */
189 189
190 va = r8 /* virtual address for which the trap occured */ 190 va = r8 /* virtual address for which the trap occurred */
191 spc = r24 /* space for which the trap occured */ 191 spc = r24 /* space for which the trap occurred */
192 192
193#ifndef CONFIG_64BIT 193#ifndef CONFIG_64BIT
194 194
@@ -882,7 +882,7 @@ ENTRY(syscall_exit_rfi)
882 * (we don't store them in the sigcontext), so set them 882 * (we don't store them in the sigcontext), so set them
883 * to "proper" values now (otherwise we'll wind up restoring 883 * to "proper" values now (otherwise we'll wind up restoring
884 * whatever was last stored in the task structure, which might 884 * whatever was last stored in the task structure, which might
885 * be inconsistent if an interrupt occured while on the gateway 885 * be inconsistent if an interrupt occurred while on the gateway
886 * page). Note that we may be "trashing" values the user put in 886 * page). Note that we may be "trashing" values the user put in
887 * them, but we don't support the user changing them. 887 * them, but we don't support the user changing them.
888 */ 888 */
@@ -1156,11 +1156,11 @@ ENDPROC(intr_save)
1156 */ 1156 */
1157 1157
1158 t0 = r1 /* temporary register 0 */ 1158 t0 = r1 /* temporary register 0 */
1159 va = r8 /* virtual address for which the trap occured */ 1159 va = r8 /* virtual address for which the trap occurred */
1160 t1 = r9 /* temporary register 1 */ 1160 t1 = r9 /* temporary register 1 */
1161 pte = r16 /* pte/phys page # */ 1161 pte = r16 /* pte/phys page # */
1162 prot = r17 /* prot bits */ 1162 prot = r17 /* prot bits */
1163 spc = r24 /* space for which the trap occured */ 1163 spc = r24 /* space for which the trap occurred */
1164 ptp = r25 /* page directory/page table pointer */ 1164 ptp = r25 /* page directory/page table pointer */
1165 1165
1166#ifdef CONFIG_64BIT 1166#ifdef CONFIG_64BIT
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S
index 4dbdf0ed6fa0..145c5e4caaa0 100644
--- a/arch/parisc/kernel/head.S
+++ b/arch/parisc/kernel/head.S
@@ -131,7 +131,7 @@ $pgt_fill_loop:
131 ldo THREAD_SZ_ALGN(%r6),%sp 131 ldo THREAD_SZ_ALGN(%r6),%sp
132 132
133#ifdef CONFIG_SMP 133#ifdef CONFIG_SMP
134 /* Set the smp rendevous address into page zero. 134 /* Set the smp rendezvous address into page zero.
135 ** It would be safer to do this in init_smp_config() but 135 ** It would be safer to do this in init_smp_config() but
136 ** it's just way easier to deal with here because 136 ** it's just way easier to deal with here because
137 ** of 64-bit function ptrs and the address is local to this file. 137 ** of 64-bit function ptrs and the address is local to this file.
diff --git a/arch/parisc/kernel/inventory.c b/arch/parisc/kernel/inventory.c
index d228d8237879..08324aac3544 100644
--- a/arch/parisc/kernel/inventory.c
+++ b/arch/parisc/kernel/inventory.c
@@ -93,7 +93,7 @@ void __init setup_pdc(void)
93 case 0x6: /* 705, 710 */ 93 case 0x6: /* 705, 710 */
94 case 0x7: /* 715, 725 */ 94 case 0x7: /* 715, 725 */
95 case 0x8: /* 745, 747, 742 */ 95 case 0x8: /* 745, 747, 742 */
96 case 0xA: /* 712 and similiar */ 96 case 0xA: /* 712 and similar */
97 case 0xC: /* 715/64, at least */ 97 case 0xC: /* 715/64, at least */
98 98
99 pdc_type = PDC_TYPE_SNAKE; 99 pdc_type = PDC_TYPE_SNAKE;
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c
index 609a331878e7..12c1ed33dc18 100644
--- a/arch/parisc/kernel/signal.c
+++ b/arch/parisc/kernel/signal.c
@@ -291,7 +291,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
291 DBG(1,"setup_rt_frame: frame->uc = 0x%p\n", &frame->uc); 291 DBG(1,"setup_rt_frame: frame->uc = 0x%p\n", &frame->uc);
292 DBG(1,"setup_rt_frame: frame->uc.uc_mcontext = 0x%p\n", &frame->uc.uc_mcontext); 292 DBG(1,"setup_rt_frame: frame->uc.uc_mcontext = 0x%p\n", &frame->uc.uc_mcontext);
293 err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, in_syscall); 293 err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, in_syscall);
294 /* FIXME: Should probably be converted aswell for the compat case */ 294 /* FIXME: Should probably be converted as well for the compat case */
295 err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)); 295 err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
296 } 296 }
297 297
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S
index 68e75ce838d6..82a52b2fb13f 100644
--- a/arch/parisc/kernel/syscall.S
+++ b/arch/parisc/kernel/syscall.S
@@ -605,7 +605,7 @@ cas_action:
605 copy %r0, %r21 605 copy %r0, %r21
606 606
6073: 6073:
608 /* Error occured on load or store */ 608 /* Error occurred on load or store */
609 /* Free lock */ 609 /* Free lock */
610 stw %r20, 0(%sr2,%r20) 610 stw %r20, 0(%sr2,%r20)
611#if ENABLE_LWS_DEBUG 611#if ENABLE_LWS_DEBUG
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
index 74867dfdabe5..4be85ee10b85 100644
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -34,7 +34,7 @@
34/* Use ENTRY_SAME for 32-bit syscalls which are the same on wide and 34/* Use ENTRY_SAME for 32-bit syscalls which are the same on wide and
35 * narrow palinux. Use ENTRY_DIFF for those where a 32-bit specific 35 * narrow palinux. Use ENTRY_DIFF for those where a 32-bit specific
36 * implementation is required on wide palinux. Use ENTRY_COMP where 36 * implementation is required on wide palinux. Use ENTRY_COMP where
37 * the compatability layer has a useful 32-bit implementation. 37 * the compatibility layer has a useful 32-bit implementation.
38 */ 38 */
39#define ENTRY_SAME(_name_) .dword sys_##_name_ 39#define ENTRY_SAME(_name_) .dword sys_##_name_
40#define ENTRY_DIFF(_name_) .dword sys32_##_name_ 40#define ENTRY_DIFF(_name_) .dword sys32_##_name_
diff --git a/arch/parisc/math-emu/dfadd.c b/arch/parisc/math-emu/dfadd.c
index e147d7d3b0f4..d37e2d2cb6fe 100644
--- a/arch/parisc/math-emu/dfadd.c
+++ b/arch/parisc/math-emu/dfadd.c
@@ -303,7 +303,7 @@ dbl_fadd(
303 if(Dbl_iszero_hidden(resultp1)) 303 if(Dbl_iszero_hidden(resultp1))
304 { 304 {
305 /* Handle normalization */ 305 /* Handle normalization */
306 /* A straight foward algorithm would now shift the result 306 /* A straight forward algorithm would now shift the result
307 * and extension left until the hidden bit becomes one. Not 307 * and extension left until the hidden bit becomes one. Not
308 * all of the extension bits need participate in the shift. 308 * all of the extension bits need participate in the shift.
309 * Only the two most significant bits (round and guard) are 309 * Only the two most significant bits (round and guard) are
diff --git a/arch/parisc/math-emu/dfsub.c b/arch/parisc/math-emu/dfsub.c
index 87ebc60d465b..2e8b5a79bff7 100644
--- a/arch/parisc/math-emu/dfsub.c
+++ b/arch/parisc/math-emu/dfsub.c
@@ -306,7 +306,7 @@ dbl_fsub(
306 if(Dbl_iszero_hidden(resultp1)) 306 if(Dbl_iszero_hidden(resultp1))
307 { 307 {
308 /* Handle normalization */ 308 /* Handle normalization */
309 /* A straight foward algorithm would now shift the result 309 /* A straight forward algorithm would now shift the result
310 * and extension left until the hidden bit becomes one. Not 310 * and extension left until the hidden bit becomes one. Not
311 * all of the extension bits need participate in the shift. 311 * all of the extension bits need participate in the shift.
312 * Only the two most significant bits (round and guard) are 312 * Only the two most significant bits (round and guard) are
diff --git a/arch/parisc/math-emu/fmpyfadd.c b/arch/parisc/math-emu/fmpyfadd.c
index 5dd7f93a89be..b067c45c872d 100644
--- a/arch/parisc/math-emu/fmpyfadd.c
+++ b/arch/parisc/math-emu/fmpyfadd.c
@@ -531,7 +531,7 @@ dbl_fmpyfadd(
531 sign_save = Dbl_signextendedsign(resultp1); 531 sign_save = Dbl_signextendedsign(resultp1);
532 if (Dbl_iszero_hidden(resultp1)) { 532 if (Dbl_iszero_hidden(resultp1)) {
533 /* Handle normalization */ 533 /* Handle normalization */
534 /* A straight foward algorithm would now shift the 534 /* A straightforward algorithm would now shift the
535 * result and extension left until the hidden bit 535 * result and extension left until the hidden bit
536 * becomes one. Not all of the extension bits need 536 * becomes one. Not all of the extension bits need
537 * participate in the shift. Only the two most 537 * participate in the shift. Only the two most
@@ -1191,7 +1191,7 @@ unsigned int *status;
1191 sign_save = Dbl_signextendedsign(resultp1); 1191 sign_save = Dbl_signextendedsign(resultp1);
1192 if (Dbl_iszero_hidden(resultp1)) { 1192 if (Dbl_iszero_hidden(resultp1)) {
1193 /* Handle normalization */ 1193 /* Handle normalization */
1194 /* A straight foward algorithm would now shift the 1194 /* A straightforward algorithm would now shift the
1195 * result and extension left until the hidden bit 1195 * result and extension left until the hidden bit
1196 * becomes one. Not all of the extension bits need 1196 * becomes one. Not all of the extension bits need
1197 * participate in the shift. Only the two most 1197 * participate in the shift. Only the two most
@@ -1841,7 +1841,7 @@ unsigned int *status;
1841 sign_save = Sgl_signextendedsign(resultp1); 1841 sign_save = Sgl_signextendedsign(resultp1);
1842 if (Sgl_iszero_hidden(resultp1)) { 1842 if (Sgl_iszero_hidden(resultp1)) {
1843 /* Handle normalization */ 1843 /* Handle normalization */
1844 /* A straight foward algorithm would now shift the 1844 /* A straightforward algorithm would now shift the
1845 * result and extension left until the hidden bit 1845 * result and extension left until the hidden bit
1846 * becomes one. Not all of the extension bits need 1846 * becomes one. Not all of the extension bits need
1847 * participate in the shift. Only the two most 1847 * participate in the shift. Only the two most
@@ -2483,7 +2483,7 @@ unsigned int *status;
2483 sign_save = Sgl_signextendedsign(resultp1); 2483 sign_save = Sgl_signextendedsign(resultp1);
2484 if (Sgl_iszero_hidden(resultp1)) { 2484 if (Sgl_iszero_hidden(resultp1)) {
2485 /* Handle normalization */ 2485 /* Handle normalization */
2486 /* A straight foward algorithm would now shift the 2486 /* A straightforward algorithm would now shift the
2487 * result and extension left until the hidden bit 2487 * result and extension left until the hidden bit
2488 * becomes one. Not all of the extension bits need 2488 * becomes one. Not all of the extension bits need
2489 * participate in the shift. Only the two most 2489 * participate in the shift. Only the two most
diff --git a/arch/parisc/math-emu/sfadd.c b/arch/parisc/math-emu/sfadd.c
index 008d721b5d22..f802cd6c7869 100644
--- a/arch/parisc/math-emu/sfadd.c
+++ b/arch/parisc/math-emu/sfadd.c
@@ -298,7 +298,7 @@ sgl_fadd(
298 if(Sgl_iszero_hidden(result)) 298 if(Sgl_iszero_hidden(result))
299 { 299 {
300 /* Handle normalization */ 300 /* Handle normalization */
301 /* A straight foward algorithm would now shift the result 301 /* A straightforward algorithm would now shift the result
302 * and extension left until the hidden bit becomes one. Not 302 * and extension left until the hidden bit becomes one. Not
303 * all of the extension bits need participate in the shift. 303 * all of the extension bits need participate in the shift.
304 * Only the two most significant bits (round and guard) are 304 * Only the two most significant bits (round and guard) are
diff --git a/arch/parisc/math-emu/sfsub.c b/arch/parisc/math-emu/sfsub.c
index 24eef61c8e3b..5f90d0f31a52 100644
--- a/arch/parisc/math-emu/sfsub.c
+++ b/arch/parisc/math-emu/sfsub.c
@@ -301,7 +301,7 @@ sgl_fsub(
301 if(Sgl_iszero_hidden(result)) 301 if(Sgl_iszero_hidden(result))
302 { 302 {
303 /* Handle normalization */ 303 /* Handle normalization */
304 /* A straight foward algorithm would now shift the result 304 /* A straightforward algorithm would now shift the result
305 * and extension left until the hidden bit becomes one. Not 305 * and extension left until the hidden bit becomes one. Not
306 * all of the extension bits need participate in the shift. 306 * all of the extension bits need participate in the shift.
307 * Only the two most significant bits (round and guard) are 307 * Only the two most significant bits (round and guard) are
diff --git a/arch/powerpc/include/asm/bitops.h b/arch/powerpc/include/asm/bitops.h
index 2e561876fc89..f18c6d9b9510 100644
--- a/arch/powerpc/include/asm/bitops.h
+++ b/arch/powerpc/include/asm/bitops.h
@@ -209,8 +209,8 @@ static __inline__ unsigned long ffz(unsigned long x)
209 return BITS_PER_LONG; 209 return BITS_PER_LONG;
210 210
211 /* 211 /*
212 * Calculate the bit position of the least signficant '1' bit in x 212 * Calculate the bit position of the least significant '1' bit in x
213 * (since x has been changed this will actually be the least signficant 213 * (since x has been changed this will actually be the least significant
214 * '0' bit in * the original x). Note: (x & -x) gives us a mask that 214 * '0' bit in * the original x). Note: (x & -x) gives us a mask that
215 * is the least significant * (RIGHT-most) 1-bit of the value in x. 215 * is the least significant * (RIGHT-most) 1-bit of the value in x.
216 */ 216 */
diff --git a/arch/powerpc/include/asm/compat.h b/arch/powerpc/include/asm/compat.h
index 2296112e247b..91010e8f8479 100644
--- a/arch/powerpc/include/asm/compat.h
+++ b/arch/powerpc/include/asm/compat.h
@@ -140,7 +140,7 @@ static inline void __user *arch_compat_alloc_user_space(long len)
140 unsigned long usp = regs->gpr[1]; 140 unsigned long usp = regs->gpr[1];
141 141
142 /* 142 /*
143 * We cant access below the stack pointer in the 32bit ABI and 143 * We can't access below the stack pointer in the 32bit ABI and
144 * can access 288 bytes in the 64bit ABI 144 * can access 288 bytes in the 64bit ABI
145 */ 145 */
146 if (!is_32bit_task()) 146 if (!is_32bit_task())
diff --git a/arch/powerpc/include/asm/cpm.h b/arch/powerpc/include/asm/cpm.h
index e50323fe941f..4398a6cdcf53 100644
--- a/arch/powerpc/include/asm/cpm.h
+++ b/arch/powerpc/include/asm/cpm.h
@@ -98,7 +98,7 @@ typedef struct cpm_buf_desc {
98#define BD_SC_INTRPT (0x1000) /* Interrupt on change */ 98#define BD_SC_INTRPT (0x1000) /* Interrupt on change */
99#define BD_SC_LAST (0x0800) /* Last buffer in frame */ 99#define BD_SC_LAST (0x0800) /* Last buffer in frame */
100#define BD_SC_TC (0x0400) /* Transmit CRC */ 100#define BD_SC_TC (0x0400) /* Transmit CRC */
101#define BD_SC_CM (0x0200) /* Continous mode */ 101#define BD_SC_CM (0x0200) /* Continuous mode */
102#define BD_SC_ID (0x0100) /* Rec'd too many idles */ 102#define BD_SC_ID (0x0100) /* Rec'd too many idles */
103#define BD_SC_P (0x0100) /* xmt preamble */ 103#define BD_SC_P (0x0100) /* xmt preamble */
104#define BD_SC_BR (0x0020) /* Break received */ 104#define BD_SC_BR (0x0020) /* Break received */
diff --git a/arch/powerpc/include/asm/cpm1.h b/arch/powerpc/include/asm/cpm1.h
index bd07650dca56..8ee4211ca0c6 100644
--- a/arch/powerpc/include/asm/cpm1.h
+++ b/arch/powerpc/include/asm/cpm1.h
@@ -4,7 +4,7 @@
4 * 4 *
5 * This file contains structures and information for the communication 5 * This file contains structures and information for the communication
6 * processor channels. Some CPM control and status is available 6 * processor channels. Some CPM control and status is available
7 * throught the MPC8xx internal memory map. See immap.h for details. 7 * through the MPC8xx internal memory map. See immap.h for details.
8 * This file only contains what I need for the moment, not the total 8 * This file only contains what I need for the moment, not the total
9 * CPM capabilities. I (or someone else) will add definitions as they 9 * CPM capabilities. I (or someone else) will add definitions as they
10 * are needed. -- Dan 10 * are needed. -- Dan
diff --git a/arch/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h
index ec089acfa56b..8edec710cc6d 100644
--- a/arch/powerpc/include/asm/hvcall.h
+++ b/arch/powerpc/include/asm/hvcall.h
@@ -122,7 +122,7 @@
122#define H_DABRX_KERNEL (1UL<<(63-62)) 122#define H_DABRX_KERNEL (1UL<<(63-62))
123#define H_DABRX_USER (1UL<<(63-63)) 123#define H_DABRX_USER (1UL<<(63-63))
124 124
125/* Each control block has to be on a 4K bondary */ 125/* Each control block has to be on a 4K boundary */
126#define H_CB_ALIGNMENT 4096 126#define H_CB_ALIGNMENT 4096
127 127
128/* pSeries hypervisor opcodes */ 128/* pSeries hypervisor opcodes */
diff --git a/arch/powerpc/include/asm/kprobes.h b/arch/powerpc/include/asm/kprobes.h
index d0e7701fa1f6..be0171afdc0f 100644
--- a/arch/powerpc/include/asm/kprobes.h
+++ b/arch/powerpc/include/asm/kprobes.h
@@ -50,7 +50,7 @@ typedef unsigned int kprobe_opcode_t;
50 * Handle cases where: 50 * Handle cases where:
51 * - User passes a <.symbol> or <module:.symbol> 51 * - User passes a <.symbol> or <module:.symbol>
52 * - User passes a <symbol> or <module:symbol> 52 * - User passes a <symbol> or <module:symbol>
53 * - User passes a non-existant symbol, kallsyms_lookup_name 53 * - User passes a non-existent symbol, kallsyms_lookup_name
54 * returns 0. Don't deref the NULL pointer in that case 54 * returns 0. Don't deref the NULL pointer in that case
55 */ 55 */
56#define kprobe_lookup_name(name, addr) \ 56#define kprobe_lookup_name(name, addr) \
diff --git a/arch/powerpc/include/asm/lppaca.h b/arch/powerpc/include/asm/lppaca.h
index 26b8c807f8f1..a077adc0b35e 100644
--- a/arch/powerpc/include/asm/lppaca.h
+++ b/arch/powerpc/include/asm/lppaca.h
@@ -105,7 +105,7 @@ struct lppaca {
105 // processing of external interrupts. Note that PLIC will store the 105 // processing of external interrupts. Note that PLIC will store the
106 // XIRR directly into the xXirrValue field so that another XIRR will 106 // XIRR directly into the xXirrValue field so that another XIRR will
107 // not be presented until this one clears. The layout of the low 107 // not be presented until this one clears. The layout of the low
108 // 4-bytes of this Dword is upto SLIC - PLIC just checks whether the 108 // 4-bytes of this Dword is up to SLIC - PLIC just checks whether the
109 // entire Dword is zero or not. A non-zero value in the low order 109 // entire Dword is zero or not. A non-zero value in the low order
110 // 2-bytes will result in SLIC being granted the highest thread 110 // 2-bytes will result in SLIC being granted the highest thread
111 // priority upon return. A 0 will return to SLIC as medium priority. 111 // priority upon return. A 0 will return to SLIC as medium priority.
diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
index 932f88dcf6fa..812b2cd80aed 100644
--- a/arch/powerpc/include/asm/page_64.h
+++ b/arch/powerpc/include/asm/page_64.h
@@ -169,7 +169,7 @@ do { \
169/* 169/*
170 * This is the default if a program doesn't have a PT_GNU_STACK 170 * This is the default if a program doesn't have a PT_GNU_STACK
171 * program header entry. The PPC64 ELF ABI has a non executable stack 171 * program header entry. The PPC64 ELF ABI has a non executable stack
172 * stack by default, so in the absense of a PT_GNU_STACK program header 172 * stack by default, so in the absence of a PT_GNU_STACK program header
173 * we turn execute permission off. 173 * we turn execute permission off.
174 */ 174 */
175#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \ 175#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
diff --git a/arch/powerpc/include/asm/pasemi_dma.h b/arch/powerpc/include/asm/pasemi_dma.h
index 19fd7933e2d9..eafa5a5f56de 100644
--- a/arch/powerpc/include/asm/pasemi_dma.h
+++ b/arch/powerpc/include/asm/pasemi_dma.h
@@ -522,7 +522,7 @@ extern void *pasemi_dma_alloc_buf(struct pasemi_dmachan *chan, int size,
522extern void pasemi_dma_free_buf(struct pasemi_dmachan *chan, int size, 522extern void pasemi_dma_free_buf(struct pasemi_dmachan *chan, int size,
523 dma_addr_t *handle); 523 dma_addr_t *handle);
524 524
525/* Routines to allocate flags (events) for channel syncronization */ 525/* Routines to allocate flags (events) for channel synchronization */
526extern int pasemi_dma_alloc_flag(void); 526extern int pasemi_dma_alloc_flag(void);
527extern void pasemi_dma_free_flag(int flag); 527extern void pasemi_dma_free_flag(int flag);
528extern void pasemi_dma_set_flag(int flag); 528extern void pasemi_dma_set_flag(int flag);
diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h
index 5e156e034fe2..b90dbf8e5cd9 100644
--- a/arch/powerpc/include/asm/pci-bridge.h
+++ b/arch/powerpc/include/asm/pci-bridge.h
@@ -106,7 +106,7 @@ struct pci_controller {
106 * Used for variants of PCI indirect handling and possible quirks: 106 * Used for variants of PCI indirect handling and possible quirks:
107 * SET_CFG_TYPE - used on 4xx or any PHB that does explicit type0/1 107 * SET_CFG_TYPE - used on 4xx or any PHB that does explicit type0/1
108 * EXT_REG - provides access to PCI-e extended registers 108 * EXT_REG - provides access to PCI-e extended registers
109 * SURPRESS_PRIMARY_BUS - we surpress the setting of PCI_PRIMARY_BUS 109 * SURPRESS_PRIMARY_BUS - we suppress the setting of PCI_PRIMARY_BUS
110 * on Freescale PCI-e controllers since they used the PCI_PRIMARY_BUS 110 * on Freescale PCI-e controllers since they used the PCI_PRIMARY_BUS
111 * to determine which bus number to match on when generating type0 111 * to determine which bus number to match on when generating type0
112 * config cycles 112 * config cycles
diff --git a/arch/powerpc/include/asm/pmac_feature.h b/arch/powerpc/include/asm/pmac_feature.h
index 00eedc5a4e61..10902c9375d0 100644
--- a/arch/powerpc/include/asm/pmac_feature.h
+++ b/arch/powerpc/include/asm/pmac_feature.h
@@ -53,8 +53,8 @@
53 53
54/* Here is the infamous serie of OHare based machines 54/* Here is the infamous serie of OHare based machines
55 */ 55 */
56#define PMAC_TYPE_COMET 0x20 /* Beleived to be PowerBook 2400 */ 56#define PMAC_TYPE_COMET 0x20 /* Believed to be PowerBook 2400 */
57#define PMAC_TYPE_HOOPER 0x21 /* Beleived to be PowerBook 3400 */ 57#define PMAC_TYPE_HOOPER 0x21 /* Believed to be PowerBook 3400 */
58#define PMAC_TYPE_KANGA 0x22 /* PowerBook 3500 (first G3) */ 58#define PMAC_TYPE_KANGA 0x22 /* PowerBook 3500 (first G3) */
59#define PMAC_TYPE_ALCHEMY 0x23 /* Alchemy motherboard base */ 59#define PMAC_TYPE_ALCHEMY 0x23 /* Alchemy motherboard base */
60#define PMAC_TYPE_GAZELLE 0x24 /* Spartacus, some 5xxx/6xxx */ 60#define PMAC_TYPE_GAZELLE 0x24 /* Spartacus, some 5xxx/6xxx */
diff --git a/arch/powerpc/include/asm/pte-common.h b/arch/powerpc/include/asm/pte-common.h
index 76bb195e4f24..811f04ac3660 100644
--- a/arch/powerpc/include/asm/pte-common.h
+++ b/arch/powerpc/include/asm/pte-common.h
@@ -86,7 +86,7 @@ extern unsigned long bad_call_to_PMD_PAGE_SIZE(void);
86#define PTE_RPN_MASK (~((1UL<<PTE_RPN_SHIFT)-1)) 86#define PTE_RPN_MASK (~((1UL<<PTE_RPN_SHIFT)-1))
87#endif 87#endif
88 88
89/* _PAGE_CHG_MASK masks of bits that are to be preserved accross 89/* _PAGE_CHG_MASK masks of bits that are to be preserved across
90 * pgprot changes 90 * pgprot changes
91 */ 91 */
92#define _PAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | _PAGE_DIRTY | \ 92#define _PAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | _PAGE_DIRTY | \
@@ -174,7 +174,7 @@ extern unsigned long bad_call_to_PMD_PAGE_SIZE(void);
174/* 174/*
175 * Don't just check for any non zero bits in __PAGE_USER, since for book3e 175 * Don't just check for any non zero bits in __PAGE_USER, since for book3e
176 * and PTE_64BIT, PAGE_KERNEL_X contains _PAGE_BAP_SR which is also in 176 * and PTE_64BIT, PAGE_KERNEL_X contains _PAGE_BAP_SR which is also in
177 * _PAGE_USER. Need to explictly match _PAGE_BAP_UR bit in that case too. 177 * _PAGE_USER. Need to explicitly match _PAGE_BAP_UR bit in that case too.
178 */ 178 */
179#define pte_user(val) ((val & _PAGE_USER) == _PAGE_USER) 179#define pte_user(val) ((val & _PAGE_USER) == _PAGE_USER)
180 180
diff --git a/arch/powerpc/include/asm/reg_booke.h b/arch/powerpc/include/asm/reg_booke.h
index 3b1a9b707362..b316794aa2b5 100644
--- a/arch/powerpc/include/asm/reg_booke.h
+++ b/arch/powerpc/include/asm/reg_booke.h
@@ -2,7 +2,7 @@
2 * Contains register definitions common to the Book E PowerPC 2 * Contains register definitions common to the Book E PowerPC
3 * specification. Notice that while the IBM-40x series of CPUs 3 * specification. Notice that while the IBM-40x series of CPUs
4 * are not true Book E PowerPCs, they borrowed a number of features 4 * are not true Book E PowerPCs, they borrowed a number of features
5 * before Book E was finalized, and are included here as well. Unfortunatly, 5 * before Book E was finalized, and are included here as well. Unfortunately,
6 * they sometimes used different locations than true Book E CPUs did. 6 * they sometimes used different locations than true Book E CPUs did.
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
diff --git a/arch/powerpc/include/asm/spu_priv1.h b/arch/powerpc/include/asm/spu_priv1.h
index 25020a34ce7f..d8f5c60f61c1 100644
--- a/arch/powerpc/include/asm/spu_priv1.h
+++ b/arch/powerpc/include/asm/spu_priv1.h
@@ -223,7 +223,7 @@ spu_disable_spu (struct spu_context *ctx)
223} 223}
224 224
225/* 225/*
226 * The declarations folowing are put here for convenience 226 * The declarations following are put here for convenience
227 * and only intended to be used by the platform setup code. 227 * and only intended to be used by the platform setup code.
228 */ 228 */
229 229
diff --git a/arch/powerpc/include/asm/uninorth.h b/arch/powerpc/include/asm/uninorth.h
index f737732c3861..ae9c899c8a6d 100644
--- a/arch/powerpc/include/asm/uninorth.h
+++ b/arch/powerpc/include/asm/uninorth.h
@@ -60,7 +60,7 @@
60 * 60 *
61 * Obviously, the GART is not cache coherent and so any change to it 61 * Obviously, the GART is not cache coherent and so any change to it
62 * must be flushed to memory (or maybe just make the GART space non 62 * must be flushed to memory (or maybe just make the GART space non
63 * cachable). AGP memory itself doens't seem to be cache coherent neither. 63 * cachable). AGP memory itself does't seem to be cache coherent neither.
64 * 64 *
65 * In order to invalidate the GART (which is probably necessary to inval 65 * In order to invalidate the GART (which is probably necessary to inval
66 * the bridge internal TLBs), the following sequence has to be written, 66 * the bridge internal TLBs), the following sequence has to be written,
diff --git a/arch/powerpc/include/asm/vdso_datapage.h b/arch/powerpc/include/asm/vdso_datapage.h
index 25e39220e89c..b73a8199f161 100644
--- a/arch/powerpc/include/asm/vdso_datapage.h
+++ b/arch/powerpc/include/asm/vdso_datapage.h
@@ -57,7 +57,7 @@ struct vdso_data {
57 } version; 57 } version;
58 58
59 /* Note about the platform flags: it now only contains the lpar 59 /* Note about the platform flags: it now only contains the lpar
60 * bit. The actual platform number is dead and burried 60 * bit. The actual platform number is dead and buried
61 */ 61 */
62 __u32 platform; /* Platform flags 0x18 */ 62 __u32 platform; /* Platform flags 0x18 */
63 __u32 processor; /* Processor type 0x1C */ 63 __u32 processor; /* Processor type 0x1C */
diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c
index 625942ae5585..60b3e377b1e4 100644
--- a/arch/powerpc/kernel/btext.c
+++ b/arch/powerpc/kernel/btext.c
@@ -99,7 +99,7 @@ void __init btext_prepare_BAT(void)
99 99
100/* This function can be used to enable the early boot text when doing 100/* This function can be used to enable the early boot text when doing
101 * OF booting or within bootx init. It must be followed by a btext_unmap() 101 * OF booting or within bootx init. It must be followed by a btext_unmap()
102 * call before the logical address becomes unuseable 102 * call before the logical address becomes unusable
103 */ 103 */
104void __init btext_setup_display(int width, int height, int depth, int pitch, 104void __init btext_setup_display(int width, int height, int depth, int pitch,
105 unsigned long address) 105 unsigned long address)
diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
index 5c43063d2506..9651acc3504a 100644
--- a/arch/powerpc/kernel/exceptions-64e.S
+++ b/arch/powerpc/kernel/exceptions-64e.S
@@ -379,7 +379,7 @@ interrupt_end_book3e:
379 mfspr r13,SPRN_SPRG_PACA /* get our PACA */ 379 mfspr r13,SPRN_SPRG_PACA /* get our PACA */
380 b system_call_common 380 b system_call_common
381 381
382/* Auxillary Processor Unavailable Interrupt */ 382/* Auxiliary Processor Unavailable Interrupt */
383 START_EXCEPTION(ap_unavailable); 383 START_EXCEPTION(ap_unavailable);
384 NORMAL_EXCEPTION_PROLOG(0xf20, PROLOG_ADDITION_NONE) 384 NORMAL_EXCEPTION_PROLOG(0xf20, PROLOG_ADDITION_NONE)
385 EXCEPTION_COMMON(0xf20, PACA_EXGEN, INTS_KEEP) 385 EXCEPTION_COMMON(0xf20, PACA_EXGEN, INTS_KEEP)
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index c532cb2c927a..aeb739e18769 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -5,7 +5,7 @@
5 * handling and other fixed offset specific things. 5 * handling and other fixed offset specific things.
6 * 6 *
7 * This file is meant to be #included from head_64.S due to 7 * This file is meant to be #included from head_64.S due to
8 * position dependant assembly. 8 * position dependent assembly.
9 * 9 *
10 * Most of this originates from head_64.S and thus has the same 10 * Most of this originates from head_64.S and thus has the same
11 * copyright history. 11 * copyright history.
diff --git a/arch/powerpc/kernel/head_40x.S b/arch/powerpc/kernel/head_40x.S
index 9dd21a8c4d52..a91626d87fc9 100644
--- a/arch/powerpc/kernel/head_40x.S
+++ b/arch/powerpc/kernel/head_40x.S
@@ -766,7 +766,7 @@ DataAccess:
766 * miss get to this point to load the TLB. 766 * miss get to this point to load the TLB.
767 * r10 - TLB_TAG value 767 * r10 - TLB_TAG value
768 * r11 - Linux PTE 768 * r11 - Linux PTE
769 * r12, r9 - avilable to use 769 * r12, r9 - available to use
770 * PID - loaded with proper value when we get here 770 * PID - loaded with proper value when we get here
771 * Upon exit, we reload everything and RFI. 771 * Upon exit, we reload everything and RFI.
772 * Actually, it will fit now, but oh well.....a common place 772 * Actually, it will fit now, but oh well.....a common place
diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S
index cbb3436b592d..5e12b741ba5f 100644
--- a/arch/powerpc/kernel/head_44x.S
+++ b/arch/powerpc/kernel/head_44x.S
@@ -178,7 +178,7 @@ interrupt_base:
178 NORMAL_EXCEPTION_PROLOG 178 NORMAL_EXCEPTION_PROLOG
179 EXC_XFER_EE_LITE(0x0c00, DoSyscall) 179 EXC_XFER_EE_LITE(0x0c00, DoSyscall)
180 180
181 /* Auxillary Processor Unavailable Interrupt */ 181 /* Auxiliary Processor Unavailable Interrupt */
182 EXCEPTION(0x2020, AuxillaryProcessorUnavailable, unknown_exception, EXC_XFER_EE) 182 EXCEPTION(0x2020, AuxillaryProcessorUnavailable, unknown_exception, EXC_XFER_EE)
183 183
184 /* Decrementer Interrupt */ 184 /* Decrementer Interrupt */
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 271140b38b6f..3a319f9c9d3e 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -40,7 +40,7 @@
40#include <asm/kvm_book3s_asm.h> 40#include <asm/kvm_book3s_asm.h>
41#include <asm/ptrace.h> 41#include <asm/ptrace.h>
42 42
43/* The physical memory is layed out such that the secondary processor 43/* The physical memory is laid out such that the secondary processor
44 * spin code sits at 0x0000...0x00ff. On server, the vectors follow 44 * spin code sits at 0x0000...0x00ff. On server, the vectors follow
45 * using the layout described in exceptions-64s.S 45 * using the layout described in exceptions-64s.S
46 */ 46 */
diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S
index 3e02710d9562..5ecf54cfa7d4 100644
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -326,7 +326,7 @@ interrupt_base:
326 NORMAL_EXCEPTION_PROLOG 326 NORMAL_EXCEPTION_PROLOG
327 EXC_XFER_EE_LITE(0x0c00, DoSyscall) 327 EXC_XFER_EE_LITE(0x0c00, DoSyscall)
328 328
329 /* Auxillary Processor Unavailable Interrupt */ 329 /* Auxiliary Processor Unavailable Interrupt */
330 EXCEPTION(0x2900, AuxillaryProcessorUnavailable, unknown_exception, EXC_XFER_EE) 330 EXCEPTION(0x2900, AuxillaryProcessorUnavailable, unknown_exception, EXC_XFER_EE)
331 331
332 /* Decrementer Interrupt */ 332 /* Decrementer Interrupt */
diff --git a/arch/powerpc/kernel/l2cr_6xx.S b/arch/powerpc/kernel/l2cr_6xx.S
index 2a2f3c3f6d80..97ec8557f974 100644
--- a/arch/powerpc/kernel/l2cr_6xx.S
+++ b/arch/powerpc/kernel/l2cr_6xx.S
@@ -151,7 +151,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
151 /**** Might be a good idea to set L2DO here - to prevent instructions 151 /**** Might be a good idea to set L2DO here - to prevent instructions
152 from getting into the cache. But since we invalidate 152 from getting into the cache. But since we invalidate
153 the next time we enable the cache it doesn't really matter. 153 the next time we enable the cache it doesn't really matter.
154 Don't do this unless you accomodate all processor variations. 154 Don't do this unless you accommodate all processor variations.
155 The bit moved on the 7450..... 155 The bit moved on the 7450.....
156 ****/ 156 ****/
157 157
diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c
index 16468362ad57..301db65f05a1 100644
--- a/arch/powerpc/kernel/lparcfg.c
+++ b/arch/powerpc/kernel/lparcfg.c
@@ -262,7 +262,7 @@ static void parse_ppp_data(struct seq_file *m)
262 seq_printf(m, "system_active_processors=%d\n", 262 seq_printf(m, "system_active_processors=%d\n",
263 ppp_data.active_system_procs); 263 ppp_data.active_system_procs);
264 264
265 /* pool related entries are apropriate for shared configs */ 265 /* pool related entries are appropriate for shared configs */
266 if (lppaca_of(0).shared_proc) { 266 if (lppaca_of(0).shared_proc) {
267 unsigned long pool_idle_time, pool_procs; 267 unsigned long pool_idle_time, pool_procs;
268 268
diff --git a/arch/powerpc/kernel/perf_event.c b/arch/powerpc/kernel/perf_event.c
index 97e0ae414940..c4063b7f49a0 100644
--- a/arch/powerpc/kernel/perf_event.c
+++ b/arch/powerpc/kernel/perf_event.c
@@ -759,7 +759,7 @@ static int power_pmu_add(struct perf_event *event, int ef_flags)
759 759
760 /* 760 /*
761 * If group events scheduling transaction was started, 761 * If group events scheduling transaction was started,
762 * skip the schedulability test here, it will be peformed 762 * skip the schedulability test here, it will be performed
763 * at commit time(->commit_txn) as a whole 763 * at commit time(->commit_txn) as a whole
764 */ 764 */
765 if (cpuhw->group_flag & PERF_EVENT_TXN) 765 if (cpuhw->group_flag & PERF_EVENT_TXN)
diff --git a/arch/powerpc/kernel/ppc_save_regs.S b/arch/powerpc/kernel/ppc_save_regs.S
index e83ba3f078e4..1b1787d52896 100644
--- a/arch/powerpc/kernel/ppc_save_regs.S
+++ b/arch/powerpc/kernel/ppc_save_regs.S
@@ -15,7 +15,7 @@
15 15
16/* 16/*
17 * Grab the register values as they are now. 17 * Grab the register values as they are now.
18 * This won't do a particularily good job because we really 18 * This won't do a particularly good job because we really
19 * want our caller's caller's registers, and our caller has 19 * want our caller's caller's registers, and our caller has
20 * already executed its prologue. 20 * already executed its prologue.
21 * ToDo: We could reach back into the caller's save area to do 21 * ToDo: We could reach back into the caller's save area to do
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 05b7139d6a27..e74fa12afc82 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -683,7 +683,7 @@ void __init early_init_devtree(void *params)
683#endif 683#endif
684 684
685#ifdef CONFIG_PHYP_DUMP 685#ifdef CONFIG_PHYP_DUMP
686 /* scan tree to see if dump occured during last boot */ 686 /* scan tree to see if dump occurred during last boot */
687 of_scan_flat_dt(early_init_dt_scan_phyp_dump, NULL); 687 of_scan_flat_dt(early_init_dt_scan_phyp_dump, NULL);
688#endif 688#endif
689 689
@@ -739,7 +739,7 @@ void __init early_init_devtree(void *params)
739 739
740 DBG("Scanning CPUs ...\n"); 740 DBG("Scanning CPUs ...\n");
741 741
742 /* Retreive CPU related informations from the flat tree 742 /* Retrieve CPU related informations from the flat tree
743 * (altivec support, boot CPU ID, ...) 743 * (altivec support, boot CPU ID, ...)
744 */ 744 */
745 of_scan_flat_dt(early_init_dt_scan_cpus, NULL); 745 of_scan_flat_dt(early_init_dt_scan_cpus, NULL);
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index 895b082f1e48..55613e33e263 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -463,7 +463,7 @@ static int vr_set(struct task_struct *target, const struct user_regset *regset,
463#ifdef CONFIG_VSX 463#ifdef CONFIG_VSX
464/* 464/*
465 * Currently to set and and get all the vsx state, you need to call 465 * Currently to set and and get all the vsx state, you need to call
466 * the fp and VMX calls aswell. This only get/sets the lower 32 466 * the fp and VMX calls as well. This only get/sets the lower 32
467 * 128bit VSX registers. 467 * 128bit VSX registers.
468 */ 468 */
469 469
diff --git a/arch/powerpc/kernel/rtasd.c b/arch/powerpc/kernel/rtasd.c
index 7980ec0e1e1a..67f6c3b51357 100644
--- a/arch/powerpc/kernel/rtasd.c
+++ b/arch/powerpc/kernel/rtasd.c
@@ -465,7 +465,7 @@ static void start_event_scan(void)
465 pr_debug("rtasd: will sleep for %d milliseconds\n", 465 pr_debug("rtasd: will sleep for %d milliseconds\n",
466 (30000 / rtas_event_scan_rate)); 466 (30000 / rtas_event_scan_rate));
467 467
468 /* Retreive errors from nvram if any */ 468 /* Retrieve errors from nvram if any */
469 retreive_nvram_error_log(); 469 retreive_nvram_error_log();
470 470
471 schedule_delayed_work_on(cpumask_first(cpu_online_mask), 471 schedule_delayed_work_on(cpumask_first(cpu_online_mask),
diff --git a/arch/powerpc/kernel/swsusp_32.S b/arch/powerpc/kernel/swsusp_32.S
index b0754e237438..ba4dee3d233f 100644
--- a/arch/powerpc/kernel/swsusp_32.S
+++ b/arch/powerpc/kernel/swsusp_32.S
@@ -143,7 +143,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
143 143
144 /* Disable MSR:DR to make sure we don't take a TLB or 144 /* Disable MSR:DR to make sure we don't take a TLB or
145 * hash miss during the copy, as our hash table will 145 * hash miss during the copy, as our hash table will
146 * for a while be unuseable. For .text, we assume we are 146 * for a while be unusable. For .text, we assume we are
147 * covered by a BAT. This works only for non-G5 at this 147 * covered by a BAT. This works only for non-G5 at this
148 * point. G5 will need a better approach, possibly using 148 * point. G5 will need a better approach, possibly using
149 * a small temporary hash table filled with large mappings, 149 * a small temporary hash table filled with large mappings,
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index bd74fac169be..5ddb801bc154 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -959,7 +959,7 @@ void __kprobes program_check_exception(struct pt_regs *regs)
959 * ESR_DST (!?) or 0. In the process of chasing this with the 959 * ESR_DST (!?) or 0. In the process of chasing this with the
960 * hardware people - not sure if it can happen on any illegal 960 * hardware people - not sure if it can happen on any illegal
961 * instruction or only on FP instructions, whether there is a 961 * instruction or only on FP instructions, whether there is a
962 * pattern to occurences etc. -dgibson 31/Mar/2003 */ 962 * pattern to occurrences etc. -dgibson 31/Mar/2003 */
963 switch (do_mathemu(regs)) { 963 switch (do_mathemu(regs)) {
964 case 0: 964 case 0:
965 emulate_single_step(regs); 965 emulate_single_step(regs);
diff --git a/arch/powerpc/kernel/udbg_16550.c b/arch/powerpc/kernel/udbg_16550.c
index b4b167b33643..baa33a7517bc 100644
--- a/arch/powerpc/kernel/udbg_16550.c
+++ b/arch/powerpc/kernel/udbg_16550.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * udbg for NS16550 compatable serial ports 2 * udbg for NS16550 compatible serial ports
3 * 3 *
4 * Copyright (C) 2001-2005 PPC 64 Team, IBM Corp 4 * Copyright (C) 2001-2005 PPC 64 Team, IBM Corp
5 * 5 *
diff --git a/arch/powerpc/kernel/vdso32/sigtramp.S b/arch/powerpc/kernel/vdso32/sigtramp.S
index 68d49dd71dcc..cf0c9c9c24f9 100644
--- a/arch/powerpc/kernel/vdso32/sigtramp.S
+++ b/arch/powerpc/kernel/vdso32/sigtramp.S
@@ -19,7 +19,7 @@
19 19
20/* The nop here is a hack. The dwarf2 unwind routines subtract 1 from 20/* The nop here is a hack. The dwarf2 unwind routines subtract 1 from
21 the return address to get an address in the middle of the presumed 21 the return address to get an address in the middle of the presumed
22 call instruction. Since we don't have a call here, we artifically 22 call instruction. Since we don't have a call here, we artificially
23 extend the range covered by the unwind info by adding a nop before 23 extend the range covered by the unwind info by adding a nop before
24 the real start. */ 24 the real start. */
25 nop 25 nop
diff --git a/arch/powerpc/kernel/vdso64/sigtramp.S b/arch/powerpc/kernel/vdso64/sigtramp.S
index 59eb59bb4082..45ea281e9a21 100644
--- a/arch/powerpc/kernel/vdso64/sigtramp.S
+++ b/arch/powerpc/kernel/vdso64/sigtramp.S
@@ -20,7 +20,7 @@
20 20
21/* The nop here is a hack. The dwarf2 unwind routines subtract 1 from 21/* The nop here is a hack. The dwarf2 unwind routines subtract 1 from
22 the return address to get an address in the middle of the presumed 22 the return address to get an address in the middle of the presumed
23 call instruction. Since we don't have a call here, we artifically 23 call instruction. Since we don't have a call here, we artificially
24 extend the range covered by the unwind info by padding before the 24 extend the range covered by the unwind info by padding before the
25 real start. */ 25 real start. */
26 nop 26 nop
diff --git a/arch/powerpc/mm/hash_low_64.S b/arch/powerpc/mm/hash_low_64.S
index 3079f6b44cf5..5b7dd4ea02b5 100644
--- a/arch/powerpc/mm/hash_low_64.S
+++ b/arch/powerpc/mm/hash_low_64.S
@@ -192,8 +192,8 @@ htab_insert_pte:
192 rldicr r3,r0,3,63-3 /* r3 = (hash & mask) << 3 */ 192 rldicr r3,r0,3,63-3 /* r3 = (hash & mask) << 3 */
193 193
194 /* Call ppc_md.hpte_insert */ 194 /* Call ppc_md.hpte_insert */
195 ld r6,STK_PARM(r4)(r1) /* Retreive new pp bits */ 195 ld r6,STK_PARM(r4)(r1) /* Retrieve new pp bits */
196 mr r4,r29 /* Retreive va */ 196 mr r4,r29 /* Retrieve va */
197 li r7,0 /* !bolted, !secondary */ 197 li r7,0 /* !bolted, !secondary */
198 li r8,MMU_PAGE_4K /* page size */ 198 li r8,MMU_PAGE_4K /* page size */
199 ld r9,STK_PARM(r9)(r1) /* segment size */ 199 ld r9,STK_PARM(r9)(r1) /* segment size */
@@ -215,8 +215,8 @@ _GLOBAL(htab_call_hpte_insert1)
215 rldicr r3,r0,3,63-3 /* r0 = (~hash & mask) << 3 */ 215 rldicr r3,r0,3,63-3 /* r0 = (~hash & mask) << 3 */
216 216
217 /* Call ppc_md.hpte_insert */ 217 /* Call ppc_md.hpte_insert */
218 ld r6,STK_PARM(r4)(r1) /* Retreive new pp bits */ 218 ld r6,STK_PARM(r4)(r1) /* Retrieve new pp bits */
219 mr r4,r29 /* Retreive va */ 219 mr r4,r29 /* Retrieve va */
220 li r7,HPTE_V_SECONDARY /* !bolted, secondary */ 220 li r7,HPTE_V_SECONDARY /* !bolted, secondary */
221 li r8,MMU_PAGE_4K /* page size */ 221 li r8,MMU_PAGE_4K /* page size */
222 ld r9,STK_PARM(r9)(r1) /* segment size */ 222 ld r9,STK_PARM(r9)(r1) /* segment size */
@@ -495,8 +495,8 @@ htab_special_pfn:
495 rldicr r3,r0,3,63-3 /* r0 = (hash & mask) << 3 */ 495 rldicr r3,r0,3,63-3 /* r0 = (hash & mask) << 3 */
496 496
497 /* Call ppc_md.hpte_insert */ 497 /* Call ppc_md.hpte_insert */
498 ld r6,STK_PARM(r4)(r1) /* Retreive new pp bits */ 498 ld r6,STK_PARM(r4)(r1) /* Retrieve new pp bits */
499 mr r4,r29 /* Retreive va */ 499 mr r4,r29 /* Retrieve va */
500 li r7,0 /* !bolted, !secondary */ 500 li r7,0 /* !bolted, !secondary */
501 li r8,MMU_PAGE_4K /* page size */ 501 li r8,MMU_PAGE_4K /* page size */
502 ld r9,STK_PARM(r9)(r1) /* segment size */ 502 ld r9,STK_PARM(r9)(r1) /* segment size */
@@ -522,8 +522,8 @@ _GLOBAL(htab_call_hpte_insert1)
522 rldicr r3,r0,3,63-3 /* r0 = (~hash & mask) << 3 */ 522 rldicr r3,r0,3,63-3 /* r0 = (~hash & mask) << 3 */
523 523
524 /* Call ppc_md.hpte_insert */ 524 /* Call ppc_md.hpte_insert */
525 ld r6,STK_PARM(r4)(r1) /* Retreive new pp bits */ 525 ld r6,STK_PARM(r4)(r1) /* Retrieve new pp bits */
526 mr r4,r29 /* Retreive va */ 526 mr r4,r29 /* Retrieve va */
527 li r7,HPTE_V_SECONDARY /* !bolted, secondary */ 527 li r7,HPTE_V_SECONDARY /* !bolted, secondary */
528 li r8,MMU_PAGE_4K /* page size */ 528 li r8,MMU_PAGE_4K /* page size */
529 ld r9,STK_PARM(r9)(r1) /* segment size */ 529 ld r9,STK_PARM(r9)(r1) /* segment size */
@@ -813,8 +813,8 @@ ht64_insert_pte:
813 rldicr r3,r0,3,63-3 /* r0 = (hash & mask) << 3 */ 813 rldicr r3,r0,3,63-3 /* r0 = (hash & mask) << 3 */
814 814
815 /* Call ppc_md.hpte_insert */ 815 /* Call ppc_md.hpte_insert */
816 ld r6,STK_PARM(r4)(r1) /* Retreive new pp bits */ 816 ld r6,STK_PARM(r4)(r1) /* Retrieve new pp bits */
817 mr r4,r29 /* Retreive va */ 817 mr r4,r29 /* Retrieve va */
818 li r7,0 /* !bolted, !secondary */ 818 li r7,0 /* !bolted, !secondary */
819 li r8,MMU_PAGE_64K 819 li r8,MMU_PAGE_64K
820 ld r9,STK_PARM(r9)(r1) /* segment size */ 820 ld r9,STK_PARM(r9)(r1) /* segment size */
@@ -836,8 +836,8 @@ _GLOBAL(ht64_call_hpte_insert1)
836 rldicr r3,r0,3,63-3 /* r0 = (~hash & mask) << 3 */ 836 rldicr r3,r0,3,63-3 /* r0 = (~hash & mask) << 3 */
837 837
838 /* Call ppc_md.hpte_insert */ 838 /* Call ppc_md.hpte_insert */
839 ld r6,STK_PARM(r4)(r1) /* Retreive new pp bits */ 839 ld r6,STK_PARM(r4)(r1) /* Retrieve new pp bits */
840 mr r4,r29 /* Retreive va */ 840 mr r4,r29 /* Retrieve va */
841 li r7,HPTE_V_SECONDARY /* !bolted, secondary */ 841 li r7,HPTE_V_SECONDARY /* !bolted, secondary */
842 li r8,MMU_PAGE_64K 842 li r8,MMU_PAGE_64K
843 ld r9,STK_PARM(r9)(r1) /* segment size */ 843 ld r9,STK_PARM(r9)(r1) /* segment size */
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index a5991facddce..58a022d0f463 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -753,7 +753,7 @@ void __cpuinit early_init_mmu_secondary(void)
753 mtspr(SPRN_SDR1, _SDR1); 753 mtspr(SPRN_SDR1, _SDR1);
754 754
755 /* Initialize STAB/SLB. We use a virtual address as it works 755 /* Initialize STAB/SLB. We use a virtual address as it works
756 * in real mode on pSeries and we want a virutal address on 756 * in real mode on pSeries and we want a virtual address on
757 * iSeries anyway 757 * iSeries anyway
758 */ 758 */
759 if (cpu_has_feature(CPU_FTR_SLB)) 759 if (cpu_has_feature(CPU_FTR_SLB))
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index a66499650909..57e545b84bf1 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -424,7 +424,7 @@ void clear_user_page(void *page, unsigned long vaddr, struct page *pg)
424 clear_page(page); 424 clear_page(page);
425 425
426 /* 426 /*
427 * We shouldnt have to do this, but some versions of glibc 427 * We shouldn't have to do this, but some versions of glibc
428 * require it (ld.so assumes zero filled pages are icache clean) 428 * require it (ld.so assumes zero filled pages are icache clean)
429 * - Anton 429 * - Anton
430 */ 430 */
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 0dc95c0aa3be..5ec1dad2a19d 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -440,11 +440,11 @@ static void read_drconf_cell(struct of_drconf_cell *drmem, const u32 **cellp)
440} 440}
441 441
442/* 442/*
443 * Retreive and validate the ibm,dynamic-memory property of the device tree. 443 * Retrieve and validate the ibm,dynamic-memory property of the device tree.
444 * 444 *
445 * The layout of the ibm,dynamic-memory property is a number N of memblock 445 * The layout of the ibm,dynamic-memory property is a number N of memblock
446 * list entries followed by N memblock list entries. Each memblock list entry 446 * list entries followed by N memblock list entries. Each memblock list entry
447 * contains information as layed out in the of_drconf_cell struct above. 447 * contains information as laid out in the of_drconf_cell struct above.
448 */ 448 */
449static int of_get_drconf_memory(struct device_node *memory, const u32 **dm) 449static int of_get_drconf_memory(struct device_node *memory, const u32 **dm)
450{ 450{
@@ -468,7 +468,7 @@ static int of_get_drconf_memory(struct device_node *memory, const u32 **dm)
468} 468}
469 469
470/* 470/*
471 * Retreive and validate the ibm,lmb-size property for drconf memory 471 * Retrieve and validate the ibm,lmb-size property for drconf memory
472 * from the device tree. 472 * from the device tree.
473 */ 473 */
474static u64 of_get_lmb_size(struct device_node *memory) 474static u64 of_get_lmb_size(struct device_node *memory)
@@ -490,7 +490,7 @@ struct assoc_arrays {
490}; 490};
491 491
492/* 492/*
493 * Retreive and validate the list of associativity arrays for drconf 493 * Retrieve and validate the list of associativity arrays for drconf
494 * memory from the ibm,associativity-lookup-arrays property of the 494 * memory from the ibm,associativity-lookup-arrays property of the
495 * device tree.. 495 * device tree..
496 * 496 *
@@ -604,7 +604,7 @@ static int __cpuinit cpu_numa_callback(struct notifier_block *nfb,
604 * Returns the size the region should have to enforce the memory limit. 604 * Returns the size the region should have to enforce the memory limit.
605 * This will either be the original value of size, a truncated value, 605 * This will either be the original value of size, a truncated value,
606 * or zero. If the returned value of size is 0 the region should be 606 * or zero. If the returned value of size is 0 the region should be
607 * discarded as it lies wholy above the memory limit. 607 * discarded as it lies wholly above the memory limit.
608 */ 608 */
609static unsigned long __init numa_enforce_memory_limit(unsigned long start, 609static unsigned long __init numa_enforce_memory_limit(unsigned long start,
610 unsigned long size) 610 unsigned long size)
diff --git a/arch/powerpc/mm/tlb_low_64e.S b/arch/powerpc/mm/tlb_low_64e.S
index 222815112e45..af0892209417 100644
--- a/arch/powerpc/mm/tlb_low_64e.S
+++ b/arch/powerpc/mm/tlb_low_64e.S
@@ -192,7 +192,7 @@ normal_tlb_miss:
192 or r10,r15,r14 192 or r10,r15,r14
193 193
194BEGIN_MMU_FTR_SECTION 194BEGIN_MMU_FTR_SECTION
195 /* Set the TLB reservation and seach for existing entry. Then load 195 /* Set the TLB reservation and search for existing entry. Then load
196 * the entry. 196 * the entry.
197 */ 197 */
198 PPC_TLBSRX_DOT(0,r16) 198 PPC_TLBSRX_DOT(0,r16)
@@ -425,7 +425,7 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_USE_TLBRSRV)
425 425
426virt_page_table_tlb_miss_fault: 426virt_page_table_tlb_miss_fault:
427 /* If we fault here, things are a little bit tricky. We need to call 427 /* If we fault here, things are a little bit tricky. We need to call
428 * either data or instruction store fault, and we need to retreive 428 * either data or instruction store fault, and we need to retrieve
429 * the original fault address and ESR (for data). 429 * the original fault address and ESR (for data).
430 * 430 *
431 * The thing is, we know that in normal circumstances, this is 431 * The thing is, we know that in normal circumstances, this is
diff --git a/arch/powerpc/oprofile/op_model_cell.c b/arch/powerpc/oprofile/op_model_cell.c
index c4d2b7167568..cb515cff745c 100644
--- a/arch/powerpc/oprofile/op_model_cell.c
+++ b/arch/powerpc/oprofile/op_model_cell.c
@@ -67,7 +67,7 @@
67 67
68#define MAX_SPU_COUNT 0xFFFFFF /* maximum 24 bit LFSR value */ 68#define MAX_SPU_COUNT 0xFFFFFF /* maximum 24 bit LFSR value */
69 69
70/* Minumum HW interval timer setting to send value to trace buffer is 10 cycle. 70/* Minimum HW interval timer setting to send value to trace buffer is 10 cycle.
71 * To configure counter to send value every N cycles set counter to 71 * To configure counter to send value every N cycles set counter to
72 * 2^32 - 1 - N. 72 * 2^32 - 1 - N.
73 */ 73 */
@@ -1470,7 +1470,7 @@ static int cell_global_start(struct op_counter_config *ctr)
1470 * trace buffer at the maximum rate possible. The trace buffer is configured 1470 * trace buffer at the maximum rate possible. The trace buffer is configured
1471 * to store the PCs, wrapping when it is full. The performance counter is 1471 * to store the PCs, wrapping when it is full. The performance counter is
1472 * initialized to the max hardware count minus the number of events, N, between 1472 * initialized to the max hardware count minus the number of events, N, between
1473 * samples. Once the N events have occured, a HW counter overflow occurs 1473 * samples. Once the N events have occurred, a HW counter overflow occurs
1474 * causing the generation of a HW counter interrupt which also stops the 1474 * causing the generation of a HW counter interrupt which also stops the
1475 * writing of the SPU PC values to the trace buffer. Hence the last PC 1475 * writing of the SPU PC values to the trace buffer. Hence the last PC
1476 * written to the trace buffer is the SPU PC that we want. Unfortunately, 1476 * written to the trace buffer is the SPU PC that we want. Unfortunately,
@@ -1656,7 +1656,7 @@ static void cell_handle_interrupt_ppu(struct pt_regs *regs,
1656 * The counters were frozen by the interrupt. 1656 * The counters were frozen by the interrupt.
1657 * Reenable the interrupt and restart the counters. 1657 * Reenable the interrupt and restart the counters.
1658 * If there was a race between the interrupt handler and 1658 * If there was a race between the interrupt handler and
1659 * the virtual counter routine. The virutal counter 1659 * the virtual counter routine. The virtual counter
1660 * routine may have cleared the interrupts. Hence must 1660 * routine may have cleared the interrupts. Hence must
1661 * use the virt_cntr_inter_mask to re-enable the interrupts. 1661 * use the virt_cntr_inter_mask to re-enable the interrupts.
1662 */ 1662 */
diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c
index 80774092db77..8ee51a252cf1 100644
--- a/arch/powerpc/oprofile/op_model_power4.c
+++ b/arch/powerpc/oprofile/op_model_power4.c
@@ -207,7 +207,7 @@ static unsigned long get_pc(struct pt_regs *regs)
207 unsigned long mmcra; 207 unsigned long mmcra;
208 unsigned long slot; 208 unsigned long slot;
209 209
210 /* Cant do much about it */ 210 /* Can't do much about it */
211 if (!cur_cpu_spec->oprofile_mmcra_sihv) 211 if (!cur_cpu_spec->oprofile_mmcra_sihv)
212 return pc; 212 return pc;
213 213
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
index 6385d883cb8d..9940ce8a2d4e 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
@@ -57,7 +57,7 @@ struct mpc52xx_lpbfifo {
57static struct mpc52xx_lpbfifo lpbfifo; 57static struct mpc52xx_lpbfifo lpbfifo;
58 58
59/** 59/**
60 * mpc52xx_lpbfifo_kick - Trigger the next block of data to be transfered 60 * mpc52xx_lpbfifo_kick - Trigger the next block of data to be transferred
61 */ 61 */
62static void mpc52xx_lpbfifo_kick(struct mpc52xx_lpbfifo_request *req) 62static void mpc52xx_lpbfifo_kick(struct mpc52xx_lpbfifo_request *req)
63{ 63{
@@ -179,7 +179,7 @@ static void mpc52xx_lpbfifo_kick(struct mpc52xx_lpbfifo_request *req)
179 * 179 *
180 * On transmit, the dma completion irq triggers before the fifo completion 180 * On transmit, the dma completion irq triggers before the fifo completion
181 * triggers. Handle the dma completion here instead of the LPB FIFO Bestcomm 181 * triggers. Handle the dma completion here instead of the LPB FIFO Bestcomm
182 * task completion irq becuase everyting is not really done until the LPB FIFO 182 * task completion irq because everything is not really done until the LPB FIFO
183 * completion irq triggers. 183 * completion irq triggers.
184 * 184 *
185 * In other words: 185 * In other words:
@@ -195,7 +195,7 @@ static void mpc52xx_lpbfifo_kick(struct mpc52xx_lpbfifo_request *req)
195 * Exit conditions: 195 * Exit conditions:
196 * 1) Transfer aborted 196 * 1) Transfer aborted
197 * 2) FIFO complete without DMA; more data to do 197 * 2) FIFO complete without DMA; more data to do
198 * 3) FIFO complete without DMA; all data transfered 198 * 3) FIFO complete without DMA; all data transferred
199 * 4) FIFO complete using DMA 199 * 4) FIFO complete using DMA
200 * 200 *
201 * Condition 1 can occur regardless of whether or not DMA is used. 201 * Condition 1 can occur regardless of whether or not DMA is used.
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
index 3ddea96273ca..1dd15400f6f0 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
@@ -512,7 +512,7 @@ void __init mpc52xx_init_irq(void)
512/** 512/**
513 * mpc52xx_get_irq - Get pending interrupt number hook function 513 * mpc52xx_get_irq - Get pending interrupt number hook function
514 * 514 *
515 * Called by the interupt handler to determine what IRQ handler needs to be 515 * Called by the interrupt handler to determine what IRQ handler needs to be
516 * executed. 516 * executed.
517 * 517 *
518 * Status of pending interrupts is determined by reading the encoded status 518 * Status of pending interrupts is determined by reading the encoded status
diff --git a/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c b/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c
index 3b894f585280..147069938cfe 100644
--- a/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c
+++ b/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c
@@ -90,7 +90,7 @@ int spu_alloc_lscsa(struct spu_state *csa)
90 */ 90 */
91 for (i = 0; i < SPU_LSCSA_NUM_BIG_PAGES; i++) { 91 for (i = 0; i < SPU_LSCSA_NUM_BIG_PAGES; i++) {
92 /* XXX This is likely to fail, we should use a special pool 92 /* XXX This is likely to fail, we should use a special pool
93 * similiar to what hugetlbfs does. 93 * similar to what hugetlbfs does.
94 */ 94 */
95 csa->lscsa_pages[i] = alloc_pages(GFP_KERNEL, 95 csa->lscsa_pages[i] = alloc_pages(GFP_KERNEL,
96 SPU_64K_PAGE_ORDER); 96 SPU_64K_PAGE_ORDER);
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index 0b0466284932..65203857b0ce 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -846,7 +846,7 @@ static struct spu_context *grab_runnable_context(int prio, int node)
846 struct list_head *rq = &spu_prio->runq[best]; 846 struct list_head *rq = &spu_prio->runq[best];
847 847
848 list_for_each_entry(ctx, rq, rq) { 848 list_for_each_entry(ctx, rq, rq) {
849 /* XXX(hch): check for affinity here aswell */ 849 /* XXX(hch): check for affinity here as well */
850 if (__node_allowed(ctx, node)) { 850 if (__node_allowed(ctx, node)) {
851 __spu_del_from_rq(ctx); 851 __spu_del_from_rq(ctx);
852 goto found; 852 goto found;
diff --git a/arch/powerpc/platforms/cell/spufs/spu_restore.c b/arch/powerpc/platforms/cell/spufs/spu_restore.c
index 21a9c952d88b..72c905f1ee7a 100644
--- a/arch/powerpc/platforms/cell/spufs/spu_restore.c
+++ b/arch/powerpc/platforms/cell/spufs/spu_restore.c
@@ -284,7 +284,7 @@ static inline void restore_complete(void)
284 exit_instrs[3] = BR_INSTR; 284 exit_instrs[3] = BR_INSTR;
285 break; 285 break;
286 default: 286 default:
287 /* SPU_Status[R]=1. No additonal instructions. */ 287 /* SPU_Status[R]=1. No additional instructions. */
288 break; 288 break;
289 } 289 }
290 spu_sync(); 290 spu_sync();
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c
index b5e026bdca21..62dabe3c2bfa 100644
--- a/arch/powerpc/platforms/iseries/mf.c
+++ b/arch/powerpc/platforms/iseries/mf.c
@@ -51,7 +51,7 @@
51static int mf_initialized; 51static int mf_initialized;
52 52
53/* 53/*
54 * This is the structure layout for the Machine Facilites LPAR event 54 * This is the structure layout for the Machine Facilities LPAR event
55 * flows. 55 * flows.
56 */ 56 */
57struct vsp_cmd_data { 57struct vsp_cmd_data {
diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c
index b5f05d943a90..2376069cdc14 100644
--- a/arch/powerpc/platforms/iseries/viopath.c
+++ b/arch/powerpc/platforms/iseries/viopath.c
@@ -396,7 +396,7 @@ static void vio_handleEvent(struct HvLpEvent *event)
396 viopathStatus[remoteLp].mTargetInst)) { 396 viopathStatus[remoteLp].mTargetInst)) {
397 printk(VIOPATH_KERN_WARN 397 printk(VIOPATH_KERN_WARN
398 "message from invalid partition. " 398 "message from invalid partition. "
399 "int msg rcvd, source inst (%d) doesnt match (%d)\n", 399 "int msg rcvd, source inst (%d) doesn't match (%d)\n",
400 viopathStatus[remoteLp].mTargetInst, 400 viopathStatus[remoteLp].mTargetInst,
401 event->xSourceInstanceId); 401 event->xSourceInstanceId);
402 return; 402 return;
@@ -407,7 +407,7 @@ static void vio_handleEvent(struct HvLpEvent *event)
407 viopathStatus[remoteLp].mSourceInst)) { 407 viopathStatus[remoteLp].mSourceInst)) {
408 printk(VIOPATH_KERN_WARN 408 printk(VIOPATH_KERN_WARN
409 "message from invalid partition. " 409 "message from invalid partition. "
410 "int msg rcvd, target inst (%d) doesnt match (%d)\n", 410 "int msg rcvd, target inst (%d) doesn't match (%d)\n",
411 viopathStatus[remoteLp].mSourceInst, 411 viopathStatus[remoteLp].mSourceInst,
412 event->xTargetInstanceId); 412 event->xTargetInstanceId);
413 return; 413 return;
@@ -418,7 +418,7 @@ static void vio_handleEvent(struct HvLpEvent *event)
418 viopathStatus[remoteLp].mSourceInst) { 418 viopathStatus[remoteLp].mSourceInst) {
419 printk(VIOPATH_KERN_WARN 419 printk(VIOPATH_KERN_WARN
420 "message from invalid partition. " 420 "message from invalid partition. "
421 "ack msg rcvd, source inst (%d) doesnt match (%d)\n", 421 "ack msg rcvd, source inst (%d) doesn't match (%d)\n",
422 viopathStatus[remoteLp].mSourceInst, 422 viopathStatus[remoteLp].mSourceInst,
423 event->xSourceInstanceId); 423 event->xSourceInstanceId);
424 return; 424 return;
@@ -428,7 +428,7 @@ static void vio_handleEvent(struct HvLpEvent *event)
428 viopathStatus[remoteLp].mTargetInst) { 428 viopathStatus[remoteLp].mTargetInst) {
429 printk(VIOPATH_KERN_WARN 429 printk(VIOPATH_KERN_WARN
430 "message from invalid partition. " 430 "message from invalid partition. "
431 "viopath: ack msg rcvd, target inst (%d) doesnt match (%d)\n", 431 "viopath: ack msg rcvd, target inst (%d) doesn't match (%d)\n",
432 viopathStatus[remoteLp].mTargetInst, 432 viopathStatus[remoteLp].mTargetInst,
433 event->xTargetInstanceId); 433 event->xTargetInstanceId);
434 return; 434 return;
diff --git a/arch/powerpc/platforms/pasemi/dma_lib.c b/arch/powerpc/platforms/pasemi/dma_lib.c
index 09695ae50f91..321a9b3a2d00 100644
--- a/arch/powerpc/platforms/pasemi/dma_lib.c
+++ b/arch/powerpc/platforms/pasemi/dma_lib.c
@@ -379,9 +379,9 @@ void pasemi_dma_free_buf(struct pasemi_dmachan *chan, int size,
379} 379}
380EXPORT_SYMBOL(pasemi_dma_free_buf); 380EXPORT_SYMBOL(pasemi_dma_free_buf);
381 381
382/* pasemi_dma_alloc_flag - Allocate a flag (event) for channel syncronization 382/* pasemi_dma_alloc_flag - Allocate a flag (event) for channel synchronization
383 * 383 *
384 * Allocates a flag for use with channel syncronization (event descriptors). 384 * Allocates a flag for use with channel synchronization (event descriptors).
385 * Returns allocated flag (0-63), < 0 on error. 385 * Returns allocated flag (0-63), < 0 on error.
386 */ 386 */
387int pasemi_dma_alloc_flag(void) 387int pasemi_dma_alloc_flag(void)
diff --git a/arch/powerpc/platforms/powermac/Makefile b/arch/powerpc/platforms/powermac/Makefile
index 50f169392551..ea47df66fee5 100644
--- a/arch/powerpc/platforms/powermac/Makefile
+++ b/arch/powerpc/platforms/powermac/Makefile
@@ -11,7 +11,7 @@ obj-y += pic.o setup.o time.o feature.o pci.o \
11obj-$(CONFIG_PMAC_BACKLIGHT) += backlight.o 11obj-$(CONFIG_PMAC_BACKLIGHT) += backlight.o
12obj-$(CONFIG_CPU_FREQ_PMAC) += cpufreq_32.o 12obj-$(CONFIG_CPU_FREQ_PMAC) += cpufreq_32.o
13obj-$(CONFIG_CPU_FREQ_PMAC64) += cpufreq_64.o 13obj-$(CONFIG_CPU_FREQ_PMAC64) += cpufreq_64.o
14# CONFIG_NVRAM is an arch. independant tristate symbol, for pmac32 we really 14# CONFIG_NVRAM is an arch. independent tristate symbol, for pmac32 we really
15# need this to be a bool. Cheat here and pretend CONFIG_NVRAM=m is really 15# need this to be a bool. Cheat here and pretend CONFIG_NVRAM=m is really
16# CONFIG_NVRAM=y 16# CONFIG_NVRAM=y
17obj-$(CONFIG_NVRAM:m=y) += nvram.o 17obj-$(CONFIG_NVRAM:m=y) += nvram.o
diff --git a/arch/powerpc/platforms/powermac/low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c
index 480567e5fa9a..e9c8a607268e 100644
--- a/arch/powerpc/platforms/powermac/low_i2c.c
+++ b/arch/powerpc/platforms/powermac/low_i2c.c
@@ -904,7 +904,7 @@ static void __init smu_i2c_probe(void)
904 printk(KERN_INFO "SMU i2c %s\n", controller->full_name); 904 printk(KERN_INFO "SMU i2c %s\n", controller->full_name);
905 905
906 /* Look for childs, note that they might not be of the right 906 /* Look for childs, note that they might not be of the right
907 * type as older device trees mix i2c busses and other thigns 907 * type as older device trees mix i2c busses and other things
908 * at the same level 908 * at the same level
909 */ 909 */
910 for (busnode = NULL; 910 for (busnode = NULL;
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index ab6898942700..f33e08d573ce 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -299,7 +299,7 @@ static void __init setup_chaos(struct pci_controller *hose,
299 * This function deals with some "special cases" devices. 299 * This function deals with some "special cases" devices.
300 * 300 *
301 * 0 -> No special case 301 * 0 -> No special case
302 * 1 -> Skip the device but act as if the access was successfull 302 * 1 -> Skip the device but act as if the access was successful
303 * (return 0xff's on reads, eventually, cache config space 303 * (return 0xff's on reads, eventually, cache config space
304 * accesses in a later version) 304 * accesses in a later version)
305 * -1 -> Hide the device (unsuccessful access) 305 * -1 -> Hide the device (unsuccessful access)
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index b74a9230edc9..57ceb92b2288 100644
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -74,7 +74,7 @@ static struct device_node *dlpar_parse_cc_node(struct cc_workarea *ccwa)
74 return NULL; 74 return NULL;
75 75
76 /* The configure connector reported name does not contain a 76 /* The configure connector reported name does not contain a
77 * preceeding '/', so we allocate a buffer large enough to 77 * preceding '/', so we allocate a buffer large enough to
78 * prepend this to the full_name. 78 * prepend this to the full_name.
79 */ 79 */
80 name = (char *)ccwa + ccwa->name_offset; 80 name = (char *)ccwa + ccwa->name_offset;
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 3cc4d102b1f1..89649173d3a3 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -65,7 +65,7 @@
65 * with EEH. 65 * with EEH.
66 * 66 *
67 * Ideally, a PCI device driver, when suspecting that an isolation 67 * Ideally, a PCI device driver, when suspecting that an isolation
68 * event has occured (e.g. by reading 0xff's), will then ask EEH 68 * event has occurred (e.g. by reading 0xff's), will then ask EEH
69 * whether this is the case, and then take appropriate steps to 69 * whether this is the case, and then take appropriate steps to
70 * reset the PCI slot, the PCI device, and then resume operations. 70 * reset the PCI slot, the PCI device, and then resume operations.
71 * However, until that day, the checking is done here, with the 71 * However, until that day, the checking is done here, with the
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index fd50ccd4bac1..ef8c45489e20 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -216,7 +216,7 @@ static void pseries_cpu_die(unsigned int cpu)
216 cpu, pcpu, cpu_status); 216 cpu, pcpu, cpu_status);
217 } 217 }
218 218
219 /* Isolation and deallocation are definatly done by 219 /* Isolation and deallocation are definitely done by
220 * drslot_chrp_cpu. If they were not they would be 220 * drslot_chrp_cpu. If they were not they would be
221 * done here. Change isolate state to Isolate and 221 * done here. Change isolate state to Isolate and
222 * change allocation-state to Unusable. 222 * change allocation-state to Unusable.
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 154c464cdca5..6d5412a18b26 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -272,7 +272,7 @@ static unsigned long tce_get_pSeriesLP(struct iommu_table *tbl, long tcenum)
272 return tce_ret; 272 return tce_ret;
273} 273}
274 274
275/* this is compatable with cells for the device tree property */ 275/* this is compatible with cells for the device tree property */
276struct dynamic_dma_window_prop { 276struct dynamic_dma_window_prop {
277 __be32 liobn; /* tce table number */ 277 __be32 liobn; /* tce table number */
278 __be64 dma_base; /* address hi,lo */ 278 __be64 dma_base; /* address hi,lo */
@@ -976,7 +976,7 @@ static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev)
976 pr_debug("pci_dma_dev_setup_pSeriesLP: %s\n", pci_name(dev)); 976 pr_debug("pci_dma_dev_setup_pSeriesLP: %s\n", pci_name(dev));
977 977
978 /* dev setup for LPAR is a little tricky, since the device tree might 978 /* dev setup for LPAR is a little tricky, since the device tree might
979 * contain the dma-window properties per-device and not neccesarily 979 * contain the dma-window properties per-device and not necessarily
980 * for the bus. So we need to search upwards in the tree until we 980 * for the bus. So we need to search upwards in the tree until we
981 * either hit a dma-window property, OR find a parent with a table 981 * either hit a dma-window property, OR find a parent with a table
982 * already allocated. 982 * already allocated.
@@ -1033,7 +1033,7 @@ static int dma_set_mask_pSeriesLP(struct device *dev, u64 dma_mask)
1033 1033
1034 /* 1034 /*
1035 * the device tree might contain the dma-window properties 1035 * the device tree might contain the dma-window properties
1036 * per-device and not neccesarily for the bus. So we need to 1036 * per-device and not necessarily for the bus. So we need to
1037 * search upwards in the tree until we either hit a dma-window 1037 * search upwards in the tree until we either hit a dma-window
1038 * property, OR find a parent with a table already allocated. 1038 * property, OR find a parent with a table already allocated.
1039 */ 1039 */
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index ec8fe22047b7..d6901334d66e 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -897,7 +897,7 @@ void xics_migrate_irqs_away(void)
897 int status; 897 int status;
898 unsigned long flags; 898 unsigned long flags;
899 899
900 /* We cant set affinity on ISA interrupts */ 900 /* We can't set affinity on ISA interrupts */
901 if (virq < NUM_ISA_INTERRUPTS) 901 if (virq < NUM_ISA_INTERRUPTS)
902 continue; 902 continue;
903 if (irq_map[virq].host != xics_host) 903 if (irq_map[virq].host != xics_host)
diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c
index 27402c7d309d..1636dd896707 100644
--- a/arch/powerpc/sysdev/axonram.c
+++ b/arch/powerpc/sysdev/axonram.c
@@ -95,7 +95,7 @@ axon_ram_irq_handler(int irq, void *dev)
95 95
96 BUG_ON(!bank); 96 BUG_ON(!bank);
97 97
98 dev_err(&device->dev, "Correctable memory error occured\n"); 98 dev_err(&device->dev, "Correctable memory error occurred\n");
99 bank->ecc_counter++; 99 bank->ecc_counter++;
100 return IRQ_HANDLED; 100 return IRQ_HANDLED;
101} 101}
diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm.h b/arch/powerpc/sysdev/bestcomm/bestcomm.h
index 23a95f80dfdb..a0e2e6b19b57 100644
--- a/arch/powerpc/sysdev/bestcomm/bestcomm.h
+++ b/arch/powerpc/sysdev/bestcomm/bestcomm.h
@@ -20,7 +20,7 @@
20 * struct bcom_bd - Structure describing a generic BestComm buffer descriptor 20 * struct bcom_bd - Structure describing a generic BestComm buffer descriptor
21 * @status: The current status of this buffer. Exact meaning depends on the 21 * @status: The current status of this buffer. Exact meaning depends on the
22 * task type 22 * task type
23 * @data: An array of u32 extra data. Size of array is task dependant. 23 * @data: An array of u32 extra data. Size of array is task dependent.
24 * 24 *
25 * Note: Don't dereference a bcom_bd pointer as an array. The size of the 25 * Note: Don't dereference a bcom_bd pointer as an array. The size of the
26 * bcom_bd is variable. Use bcom_get_bd() instead. 26 * bcom_bd is variable. Use bcom_get_bd() instead.
diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm_priv.h b/arch/powerpc/sysdev/bestcomm/bestcomm_priv.h
index eb0d1c883c31..3b52f3ffbdf8 100644
--- a/arch/powerpc/sysdev/bestcomm/bestcomm_priv.h
+++ b/arch/powerpc/sysdev/bestcomm/bestcomm_priv.h
@@ -97,7 +97,7 @@ struct bcom_task_header {
97 u8 reserved[8]; 97 u8 reserved[8];
98}; 98};
99 99
100/* Descriptors stucture & co */ 100/* Descriptors structure & co */
101#define BCOM_DESC_NOP 0x000001f8 101#define BCOM_DESC_NOP 0x000001f8
102#define BCOM_LCD_MASK 0x80000000 102#define BCOM_LCD_MASK 0x80000000
103#define BCOM_DRD_EXTENDED 0x40000000 103#define BCOM_DRD_EXTENDED 0x40000000
diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c
index 8b5aba263323..e0bc944eb23f 100644
--- a/arch/powerpc/sysdev/cpm1.c
+++ b/arch/powerpc/sysdev/cpm1.c
@@ -223,7 +223,7 @@ void __init cpm_reset(void)
223 223
224 /* Set SDMA Bus Request priority 5. 224 /* Set SDMA Bus Request priority 5.
225 * On 860T, this also enables FEC priority 6. I am not sure 225 * On 860T, this also enables FEC priority 6. I am not sure
226 * this is what we realy want for some applications, but the 226 * this is what we really want for some applications, but the
227 * manual recommends it. 227 * manual recommends it.
228 * Bit 25, FAM can also be set to use FEC aggressive mode (860T). 228 * Bit 25, FAM can also be set to use FEC aggressive mode (860T).
229 */ 229 */
diff --git a/arch/powerpc/sysdev/indirect_pci.c b/arch/powerpc/sysdev/indirect_pci.c
index 7ed809676642..82fdad885d20 100644
--- a/arch/powerpc/sysdev/indirect_pci.c
+++ b/arch/powerpc/sysdev/indirect_pci.c
@@ -117,7 +117,7 @@ indirect_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
117 out_le32(hose->cfg_addr, (0x80000000 | (bus_no << 16) | 117 out_le32(hose->cfg_addr, (0x80000000 | (bus_no << 16) |
118 (devfn << 8) | reg | cfg_type)); 118 (devfn << 8) | reg | cfg_type));
119 119
120 /* surpress setting of PCI_PRIMARY_BUS */ 120 /* suppress setting of PCI_PRIMARY_BUS */
121 if (hose->indirect_type & PPC_INDIRECT_TYPE_SURPRESS_PRIMARY_BUS) 121 if (hose->indirect_type & PPC_INDIRECT_TYPE_SURPRESS_PRIMARY_BUS)
122 if ((offset == PCI_PRIMARY_BUS) && 122 if ((offset == PCI_PRIMARY_BUS) &&
123 (bus->number == hose->first_busno)) 123 (bus->number == hose->first_busno))
diff --git a/arch/powerpc/sysdev/ppc4xx_pci.h b/arch/powerpc/sysdev/ppc4xx_pci.h
index 56d9e5deccbf..c39a134e8684 100644
--- a/arch/powerpc/sysdev/ppc4xx_pci.h
+++ b/arch/powerpc/sysdev/ppc4xx_pci.h
@@ -324,7 +324,7 @@
324#define PESDR0_460EX_IHS2 0x036D 324#define PESDR0_460EX_IHS2 0x036D
325 325
326/* 326/*
327 * 460SX addtional DCRs 327 * 460SX additional DCRs
328 */ 328 */
329#define PESDRn_460SX_RCEI 0x02 329#define PESDRn_460SX_RCEI 0x02
330 330
diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
index 5c5ba10384c2..d9db13810d15 100644
--- a/arch/s390/include/asm/atomic.h
+++ b/arch/s390/include/asm/atomic.h
@@ -9,7 +9,7 @@
9 * 9 *
10 * Atomic operations that C can't guarantee us. 10 * Atomic operations that C can't guarantee us.
11 * Useful for resource counting etc. 11 * Useful for resource counting etc.
12 * s390 uses 'Compare And Swap' for atomicity in SMP enviroment. 12 * s390 uses 'Compare And Swap' for atomicity in SMP environment.
13 * 13 *
14 */ 14 */
15 15
diff --git a/arch/s390/include/asm/cio.h b/arch/s390/include/asm/cio.h
index e34347d567a6..fc50a3342da3 100644
--- a/arch/s390/include/asm/cio.h
+++ b/arch/s390/include/asm/cio.h
@@ -183,7 +183,7 @@ struct esw3 {
183 * The irb that is handed to the device driver when an interrupt occurs. For 183 * The irb that is handed to the device driver when an interrupt occurs. For
184 * solicited interrupts, the common I/O layer already performs checks whether 184 * solicited interrupts, the common I/O layer already performs checks whether
185 * a field is valid; a field not being valid is always passed as %0. 185 * a field is valid; a field not being valid is always passed as %0.
186 * If a unit check occured, @ecw may contain sense data; this is retrieved 186 * If a unit check occurred, @ecw may contain sense data; this is retrieved
187 * by the common I/O layer itself if the device doesn't support concurrent 187 * by the common I/O layer itself if the device doesn't support concurrent
188 * sense (so that the device driver never needs to perform basic sene itself). 188 * sense (so that the device driver never needs to perform basic sene itself).
189 * For unsolicited interrupts, the irb is passed as-is (expect for sense data, 189 * For unsolicited interrupts, the irb is passed as-is (expect for sense data,
diff --git a/arch/s390/kernel/reipl64.S b/arch/s390/kernel/reipl64.S
index 5e73dee63baa..9eabbc90795d 100644
--- a/arch/s390/kernel/reipl64.S
+++ b/arch/s390/kernel/reipl64.S
@@ -78,7 +78,7 @@ do_reipl_asm: basr %r13,0
78 * in the ESA psw. 78 * in the ESA psw.
79 * Bit 31 of the addresses has to be 0 for the 79 * Bit 31 of the addresses has to be 0 for the
80 * 31bit lpswe instruction a fact they appear to have 80 * 31bit lpswe instruction a fact they appear to have
81 * ommited from the pop. 81 * omitted from the pop.
82 */ 82 */
83.Lnewpsw: .quad 0x0000000080000000 83.Lnewpsw: .quad 0x0000000080000000
84 .quad .Lpg1 84 .quad .Lpg1
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index ed183c2c6168..f5434d1ecb31 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -708,7 +708,7 @@ static void __init setup_hwcaps(void)
708 * and 1ULL<<0 as bit 63. Bits 0-31 contain the same information 708 * and 1ULL<<0 as bit 63. Bits 0-31 contain the same information
709 * as stored by stfl, bits 32-xxx contain additional facilities. 709 * as stored by stfl, bits 32-xxx contain additional facilities.
710 * How many facility words are stored depends on the number of 710 * How many facility words are stored depends on the number of
711 * doublewords passed to the instruction. The additional facilites 711 * doublewords passed to the instruction. The additional facilities
712 * are: 712 * are:
713 * Bit 42: decimal floating point facility is installed 713 * Bit 42: decimal floating point facility is installed
714 * Bit 44: perform floating point operation facility is installed 714 * Bit 44: perform floating point operation facility is installed
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index 9e7b039458da..87be655557aa 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -724,7 +724,7 @@ static void clock_sync_cpu(struct clock_sync_data *sync)
724} 724}
725 725
726/* 726/*
727 * Sync the TOD clock using the port refered to by aibp. This port 727 * Sync the TOD clock using the port referred to by aibp. This port
728 * has to be enabled and the other port has to be disabled. The 728 * has to be enabled and the other port has to be disabled. The
729 * last eacr update has to be more than 1.6 seconds in the past. 729 * last eacr update has to be more than 1.6 seconds in the past.
730 */ 730 */
@@ -1012,7 +1012,7 @@ static void etr_work_fn(struct work_struct *work)
1012 eacr = etr_handle_update(&aib, eacr); 1012 eacr = etr_handle_update(&aib, eacr);
1013 1013
1014 /* 1014 /*
1015 * Select ports to enable. The prefered synchronization mode is PPS. 1015 * Select ports to enable. The preferred synchronization mode is PPS.
1016 * If a port can be enabled depends on a number of things: 1016 * If a port can be enabled depends on a number of things:
1017 * 1) The port needs to be online and uptodate. A port is not 1017 * 1) The port needs to be online and uptodate. A port is not
1018 * disabled just because it is not uptodate, but it is only 1018 * disabled just because it is not uptodate, but it is only
@@ -1091,7 +1091,7 @@ static void etr_work_fn(struct work_struct *work)
1091 /* 1091 /*
1092 * Update eacr and try to synchronize the clock. If the update 1092 * Update eacr and try to synchronize the clock. If the update
1093 * of eacr caused a stepping port switch (or if we have to 1093 * of eacr caused a stepping port switch (or if we have to
1094 * assume that a stepping port switch has occured) or the 1094 * assume that a stepping port switch has occurred) or the
1095 * clock syncing failed, reset the sync check control bit 1095 * clock syncing failed, reset the sync check control bit
1096 * and set up a timer to try again after 0.5 seconds 1096 * and set up a timer to try again after 0.5 seconds
1097 */ 1097 */
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 1ccdf4d8aa85..5e8ead4b4aba 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -44,7 +44,7 @@ static inline void set_vtimer(__u64 expires)
44 __u64 timer; 44 __u64 timer;
45 45
46 asm volatile (" STPT %0\n" /* Store current cpu timer value */ 46 asm volatile (" STPT %0\n" /* Store current cpu timer value */
47 " SPT %1" /* Set new value immediatly afterwards */ 47 " SPT %1" /* Set new value immediately afterwards */
48 : "=m" (timer) : "m" (expires) ); 48 : "=m" (timer) : "m" (expires) );
49 S390_lowcore.system_timer += S390_lowcore.last_update_timer - timer; 49 S390_lowcore.system_timer += S390_lowcore.last_update_timer - timer;
50 S390_lowcore.last_update_timer = expires; 50 S390_lowcore.last_update_timer = expires;
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index bade533ba288..30ca85cce314 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -721,7 +721,7 @@ static int __init kvm_s390_init(void)
721 721
722 /* 722 /*
723 * guests can ask for up to 255+1 double words, we need a full page 723 * guests can ask for up to 255+1 double words, we need a full page
724 * to hold the maximum amount of facilites. On the other hand, we 724 * to hold the maximum amount of facilities. On the other hand, we
725 * only set facilities that are known to work in KVM. 725 * only set facilities that are known to work in KVM.
726 */ 726 */
727 facilities = (unsigned long long *) get_zeroed_page(GFP_KERNEL|GFP_DMA); 727 facilities = (unsigned long long *) get_zeroed_page(GFP_KERNEL|GFP_DMA);
diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
index 9194a4b52b22..73c47bd95db3 100644
--- a/arch/s390/kvm/priv.c
+++ b/arch/s390/kvm/priv.c
@@ -311,7 +311,7 @@ int kvm_s390_handle_b2(struct kvm_vcpu *vcpu)
311 311
312 /* 312 /*
313 * a lot of B2 instructions are priviledged. We first check for 313 * a lot of B2 instructions are priviledged. We first check for
314 * the priviledges ones, that we can handle in the kernel. If the 314 * the privileged ones, that we can handle in the kernel. If the
315 * kernel can handle this instruction, we check for the problem 315 * kernel can handle this instruction, we check for the problem
316 * state bit and (a) handle the instruction or (b) send a code 2 316 * state bit and (a) handle the instruction or (b) send a code 2
317 * program check. 317 * program check.
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 2c57806c0858..9217e332b118 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -392,7 +392,7 @@ void __kprobes do_protection_exception(struct pt_regs *regs, long pgm_int_code,
392{ 392{
393 int fault; 393 int fault;
394 394
395 /* Protection exception is supressing, decrement psw address. */ 395 /* Protection exception is suppressing, decrement psw address. */
396 regs->psw.addr -= (pgm_int_code >> 16); 396 regs->psw.addr -= (pgm_int_code >> 16);
397 /* 397 /*
398 * Check for low-address protection. This needs to be treated 398 * Check for low-address protection. This needs to be treated
diff --git a/arch/score/Makefile b/arch/score/Makefile
index d77dc639d8e3..974aefe86123 100644
--- a/arch/score/Makefile
+++ b/arch/score/Makefile
@@ -40,5 +40,5 @@ archclean:
40define archhelp 40define archhelp
41 echo ' vmlinux.bin - Raw binary boot image' 41 echo ' vmlinux.bin - Raw binary boot image'
42 echo 42 echo
43 echo ' These will be default as apropriate for a configured platform.' 43 echo ' These will be default as appropriate for a configured platform.'
44endef 44endef
diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug
index 12fec72fec5f..1553d56cf4e0 100644
--- a/arch/sh/Kconfig.debug
+++ b/arch/sh/Kconfig.debug
@@ -82,7 +82,7 @@ config SH_NO_BSS_INIT
82 help 82 help
83 If running in painfully slow environments, such as an RTL 83 If running in painfully slow environments, such as an RTL
84 simulation or from remote memory via SHdebug, where the memory 84 simulation or from remote memory via SHdebug, where the memory
85 can already be gauranteed to ber zeroed on boot, say Y. 85 can already be guaranteed to ber zeroed on boot, say Y.
86 86
87 For all other cases, say N. If this option seems perplexing, or 87 For all other cases, say N. If this option seems perplexing, or
88 you aren't sure, say N. 88 you aren't sure, say N.
diff --git a/arch/sh/boards/mach-dreamcast/irq.c b/arch/sh/boards/mach-dreamcast/irq.c
index 78cf2ab89d7a..f63d323f411f 100644
--- a/arch/sh/boards/mach-dreamcast/irq.c
+++ b/arch/sh/boards/mach-dreamcast/irq.c
@@ -51,7 +51,7 @@
51 */ 51 */
52#define LEVEL(event) (((event) - HW_EVENT_IRQ_BASE) / 32) 52#define LEVEL(event) (((event) - HW_EVENT_IRQ_BASE) / 32)
53 53
54/* Return the hardware event's bit positon within the EMR/ESR */ 54/* Return the hardware event's bit position within the EMR/ESR */
55#define EVENT_BIT(event) (((event) - HW_EVENT_IRQ_BASE) & 31) 55#define EVENT_BIT(event) (((event) - HW_EVENT_IRQ_BASE) & 31)
56 56
57/* 57/*
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index fd4ff25f23b2..30ae2e4283f0 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -936,7 +936,7 @@ static void __init sh_eth_init(struct sh_eth_plat_data *pd)
936 return; 936 return;
937 } 937 }
938 938
939 /* read MAC address frome EEPROM */ 939 /* read MAC address from EEPROM */
940 for (i = 0; i < sizeof(pd->mac_addr); i++) { 940 for (i = 0; i < sizeof(pd->mac_addr); i++) {
941 pd->mac_addr[i] = mac_read(a, 0x10 + i); 941 pd->mac_addr[i] = mac_read(a, 0x10 + i);
942 msleep(10); 942 msleep(10);
diff --git a/arch/sh/drivers/pci/pci-sh7751.h b/arch/sh/drivers/pci/pci-sh7751.h
index 4983a4d20355..5ede38c330d3 100644
--- a/arch/sh/drivers/pci/pci-sh7751.h
+++ b/arch/sh/drivers/pci/pci-sh7751.h
@@ -61,7 +61,7 @@
61 #define SH7751_PCICONF3_BIST7 0x80000000 /* Bist Supported */ 61 #define SH7751_PCICONF3_BIST7 0x80000000 /* Bist Supported */
62 #define SH7751_PCICONF3_BIST6 0x40000000 /* Bist Executing */ 62 #define SH7751_PCICONF3_BIST6 0x40000000 /* Bist Executing */
63 #define SH7751_PCICONF3_BIST3_0 0x0F000000 /* Bist Passed */ 63 #define SH7751_PCICONF3_BIST3_0 0x0F000000 /* Bist Passed */
64 #define SH7751_PCICONF3_HD7 0x00800000 /* Single Funtion device */ 64 #define SH7751_PCICONF3_HD7 0x00800000 /* Single Function device */
65 #define SH7751_PCICONF3_HD6_0 0x007F0000 /* Configuration Layout */ 65 #define SH7751_PCICONF3_HD6_0 0x007F0000 /* Configuration Layout */
66 #define SH7751_PCICONF3_LAT 0x0000FF00 /* Latency Timer */ 66 #define SH7751_PCICONF3_LAT 0x0000FF00 /* Latency Timer */
67 #define SH7751_PCICONF3_CLS 0x000000FF /* Cache Line Size */ 67 #define SH7751_PCICONF3_CLS 0x000000FF /* Cache Line Size */
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index a09c77dd09db..194231cb5a70 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -84,7 +84,7 @@ int __devinit register_pci_controller(struct pci_channel *hose)
84 hose_tail = &hose->next; 84 hose_tail = &hose->next;
85 85
86 /* 86 /*
87 * Do not panic here but later - this might hapen before console init. 87 * Do not panic here but later - this might happen before console init.
88 */ 88 */
89 if (!hose->io_map_base) { 89 if (!hose->io_map_base) {
90 printk(KERN_WARNING 90 printk(KERN_WARNING
diff --git a/arch/sh/include/asm/page.h b/arch/sh/include/asm/page.h
index c4e0b3d472b9..822d6084195b 100644
--- a/arch/sh/include/asm/page.h
+++ b/arch/sh/include/asm/page.h
@@ -186,7 +186,7 @@ typedef struct page *pgtable_t;
186/* 186/*
187 * While BYTES_PER_WORD == 4 on the current sh64 ABI, GCC will still 187 * While BYTES_PER_WORD == 4 on the current sh64 ABI, GCC will still
188 * happily generate {ld/st}.q pairs, requiring us to have 8-byte 188 * happily generate {ld/st}.q pairs, requiring us to have 8-byte
189 * alignment to avoid traps. The kmalloc alignment is gauranteed by 189 * alignment to avoid traps. The kmalloc alignment is guaranteed by
190 * virtue of L1_CACHE_BYTES, requiring this to only be special cased 190 * virtue of L1_CACHE_BYTES, requiring this to only be special cased
191 * for slab caches. 191 * for slab caches.
192 */ 192 */
diff --git a/arch/sh/include/asm/pgtable_32.h b/arch/sh/include/asm/pgtable_32.h
index b799fe71114c..0bce3d81569e 100644
--- a/arch/sh/include/asm/pgtable_32.h
+++ b/arch/sh/include/asm/pgtable_32.h
@@ -167,7 +167,7 @@ static inline unsigned long copy_ptea_attributes(unsigned long x)
167#endif 167#endif
168 168
169/* 169/*
170 * Mask of bits that are to be preserved accross pgprot changes. 170 * Mask of bits that are to be preserved across pgprot changes.
171 */ 171 */
172#define _PAGE_CHG_MASK \ 172#define _PAGE_CHG_MASK \
173 (PTE_MASK | _PAGE_ACCESSED | _PAGE_CACHABLE | \ 173 (PTE_MASK | _PAGE_ACCESSED | _PAGE_CACHABLE | \
diff --git a/arch/sh/include/asm/unaligned-sh4a.h b/arch/sh/include/asm/unaligned-sh4a.h
index c48a9c3420da..95adc500cabc 100644
--- a/arch/sh/include/asm/unaligned-sh4a.h
+++ b/arch/sh/include/asm/unaligned-sh4a.h
@@ -9,7 +9,7 @@
9 * struct. 9 * struct.
10 * 10 *
11 * The same note as with the movli.l/movco.l pair applies here, as long 11 * The same note as with the movli.l/movco.l pair applies here, as long
12 * as the load is gauranteed to be inlined, nothing else will hook in to 12 * as the load is guaranteed to be inlined, nothing else will hook in to
13 * r0 and we get the return value for free. 13 * r0 and we get the return value for free.
14 * 14 *
15 * NOTE: Due to the fact we require r0 encoding, care should be taken to 15 * NOTE: Due to the fact we require r0 encoding, care should be taken to
diff --git a/arch/sh/include/mach-common/mach/highlander.h b/arch/sh/include/mach-common/mach/highlander.h
index 5d9d4d5154be..6ce944e33e59 100644
--- a/arch/sh/include/mach-common/mach/highlander.h
+++ b/arch/sh/include/mach-common/mach/highlander.h
@@ -24,7 +24,7 @@
24#define PA_OBLED (PA_BCR+0x001c) /* On Board LED control */ 24#define PA_OBLED (PA_BCR+0x001c) /* On Board LED control */
25#define PA_OBSW (PA_BCR+0x001e) /* On Board Switch control */ 25#define PA_OBSW (PA_BCR+0x001e) /* On Board Switch control */
26#define PA_AUDIOSEL (PA_BCR+0x0020) /* Sound Interface Select control */ 26#define PA_AUDIOSEL (PA_BCR+0x0020) /* Sound Interface Select control */
27#define PA_EXTPLR (PA_BCR+0x001e) /* Extention Pin Polarity control */ 27#define PA_EXTPLR (PA_BCR+0x001e) /* Extension Pin Polarity control */
28#define PA_TPCTL (PA_BCR+0x0100) /* Touch Panel Access control */ 28#define PA_TPCTL (PA_BCR+0x0100) /* Touch Panel Access control */
29#define PA_TPDCKCTL (PA_BCR+0x0102) /* Touch Panel Access data control */ 29#define PA_TPDCKCTL (PA_BCR+0x0102) /* Touch Panel Access data control */
30#define PA_TPCTLCLR (PA_BCR+0x0104) /* Touch Panel Access control */ 30#define PA_TPCTLCLR (PA_BCR+0x0104) /* Touch Panel Access control */
@@ -89,7 +89,7 @@
89#define PA_OBLED (PA_BCR+0x0018) /* On Board LED control */ 89#define PA_OBLED (PA_BCR+0x0018) /* On Board LED control */
90#define PA_OBSW (PA_BCR+0x001a) /* On Board Switch control */ 90#define PA_OBSW (PA_BCR+0x001a) /* On Board Switch control */
91#define PA_AUDIOSEL (PA_BCR+0x001c) /* Sound Interface Select control */ 91#define PA_AUDIOSEL (PA_BCR+0x001c) /* Sound Interface Select control */
92#define PA_EXTPLR (PA_BCR+0x001e) /* Extention Pin Polarity control */ 92#define PA_EXTPLR (PA_BCR+0x001e) /* Extension Pin Polarity control */
93#define PA_TPCTL (PA_BCR+0x0100) /* Touch Panel Access control */ 93#define PA_TPCTL (PA_BCR+0x0100) /* Touch Panel Access control */
94#define PA_TPDCKCTL (PA_BCR+0x0102) /* Touch Panel Access data control */ 94#define PA_TPDCKCTL (PA_BCR+0x0102) /* Touch Panel Access data control */
95#define PA_TPCTLCLR (PA_BCR+0x0104) /* Touch Panel Access control */ 95#define PA_TPCTLCLR (PA_BCR+0x0104) /* Touch Panel Access control */
diff --git a/arch/sh/include/mach-common/mach/r2d.h b/arch/sh/include/mach-common/mach/r2d.h
index 0a800157b826..e04f75eaa153 100644
--- a/arch/sh/include/mach-common/mach/r2d.h
+++ b/arch/sh/include/mach-common/mach/r2d.h
@@ -18,18 +18,18 @@
18#define PA_DISPCTL 0xa4000008 /* Display Timing control */ 18#define PA_DISPCTL 0xa4000008 /* Display Timing control */
19#define PA_SDMPOW 0xa400000a /* SD Power control */ 19#define PA_SDMPOW 0xa400000a /* SD Power control */
20#define PA_RTCCE 0xa400000c /* RTC(9701) Enable control */ 20#define PA_RTCCE 0xa400000c /* RTC(9701) Enable control */
21#define PA_PCICD 0xa400000e /* PCI Extention detect control */ 21#define PA_PCICD 0xa400000e /* PCI Extension detect control */
22#define PA_VOYAGERRTS 0xa4000020 /* VOYAGER Reset control */ 22#define PA_VOYAGERRTS 0xa4000020 /* VOYAGER Reset control */
23 23
24#define PA_R2D1_AXRST 0xa4000022 /* AX_LAN Reset control */ 24#define PA_R2D1_AXRST 0xa4000022 /* AX_LAN Reset control */
25#define PA_R2D1_CFRST 0xa4000024 /* CF Reset control */ 25#define PA_R2D1_CFRST 0xa4000024 /* CF Reset control */
26#define PA_R2D1_ADMRTS 0xa4000026 /* SD Reset control */ 26#define PA_R2D1_ADMRTS 0xa4000026 /* SD Reset control */
27#define PA_R2D1_EXTRST 0xa4000028 /* Extention Reset control */ 27#define PA_R2D1_EXTRST 0xa4000028 /* Extension Reset control */
28#define PA_R2D1_CFCDINTCLR 0xa400002a /* CF Insert Interrupt clear */ 28#define PA_R2D1_CFCDINTCLR 0xa400002a /* CF Insert Interrupt clear */
29 29
30#define PA_R2DPLUS_CFRST 0xa4000022 /* CF Reset control */ 30#define PA_R2DPLUS_CFRST 0xa4000022 /* CF Reset control */
31#define PA_R2DPLUS_ADMRTS 0xa4000024 /* SD Reset control */ 31#define PA_R2DPLUS_ADMRTS 0xa4000024 /* SD Reset control */
32#define PA_R2DPLUS_EXTRST 0xa4000026 /* Extention Reset control */ 32#define PA_R2DPLUS_EXTRST 0xa4000026 /* Extension Reset control */
33#define PA_R2DPLUS_CFCDINTCLR 0xa4000028 /* CF Insert Interrupt clear */ 33#define PA_R2DPLUS_CFCDINTCLR 0xa4000028 /* CF Insert Interrupt clear */
34#define PA_R2DPLUS_KEYCTLCLR 0xa400002a /* Key Interrupt clear */ 34#define PA_R2DPLUS_KEYCTLCLR 0xa400002a /* Key Interrupt clear */
35 35
diff --git a/arch/sh/kernel/cpu/clock-cpg.c b/arch/sh/kernel/cpu/clock-cpg.c
index dd0e0f211359..8f63a264a842 100644
--- a/arch/sh/kernel/cpu/clock-cpg.c
+++ b/arch/sh/kernel/cpu/clock-cpg.c
@@ -67,7 +67,7 @@ int __init __deprecated cpg_clk_init(void)
67} 67}
68 68
69/* 69/*
70 * Placeholder for compatability, until the lazy CPUs do this 70 * Placeholder for compatibility, until the lazy CPUs do this
71 * on their own. 71 * on their own.
72 */ 72 */
73int __init __weak arch_clk_init(void) 73int __init __weak arch_clk_init(void)
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c
index 1656b8c91faf..beba32beb6d9 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c
@@ -648,7 +648,7 @@ static void __init sh7786_usb_setup(void)
648 * The following settings are necessary 648 * The following settings are necessary
649 * for using the USB modules. 649 * for using the USB modules.
650 * 650 *
651 * see "USB Inital Settings" for detail 651 * see "USB Initial Settings" for detail
652 */ 652 */
653 __raw_writel(USBINITVAL1, USBINITREG1); 653 __raw_writel(USBINITVAL1, USBINITREG1);
654 __raw_writel(USBINITVAL2, USBINITREG2); 654 __raw_writel(USBINITVAL2, USBINITREG2);
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
index 64ea0b165399..91971103b62b 100644
--- a/arch/sh/kernel/irq.c
+++ b/arch/sh/kernel/irq.c
@@ -183,7 +183,7 @@ asmlinkage void do_softirq(void)
183 ); 183 );
184 184
185 /* 185 /*
186 * Shouldnt happen, we returned above if in_interrupt(): 186 * Shouldn't happen, we returned above if in_interrupt():
187 */ 187 */
188 WARN_ON_ONCE(softirq_count()); 188 WARN_ON_ONCE(softirq_count());
189 } 189 }
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 4f267160c515..58bff45d1156 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -150,7 +150,7 @@ void __init check_for_initrd(void)
150 } 150 }
151 151
152 /* 152 /*
153 * If we got this far inspite of the boot loader's best efforts 153 * If we got this far in spite of the boot loader's best efforts
154 * to the contrary, assume we actually have a valid initrd and 154 * to the contrary, assume we actually have a valid initrd and
155 * fix up the root dev. 155 * fix up the root dev.
156 */ 156 */
diff --git a/arch/sh/lib64/copy_user_memcpy.S b/arch/sh/lib64/copy_user_memcpy.S
index 2a62816d2ddd..49aeabeba2c2 100644
--- a/arch/sh/lib64/copy_user_memcpy.S
+++ b/arch/sh/lib64/copy_user_memcpy.S
@@ -27,7 +27,7 @@
27! 2.: When there are two or three bytes in the last word of an 11-or-more 27! 2.: When there are two or three bytes in the last word of an 11-or-more
28! bytes memory chunk to b copied, the rest of the word can be read 28! bytes memory chunk to b copied, the rest of the word can be read
29! without side effects. 29! without side effects.
30! This could be easily changed by increasing the minumum size of 30! This could be easily changed by increasing the minimum size of
31! a fast memcpy and the amount subtracted from r7 before L_2l_loop be 2, 31! a fast memcpy and the amount subtracted from r7 before L_2l_loop be 2,
32! however, this would cost a few extra cyles on average. 32! however, this would cost a few extra cyles on average.
33! For SHmedia, the assumption is that any quadword can be read in its 33! For SHmedia, the assumption is that any quadword can be read in its
diff --git a/arch/sh/lib64/memcpy.S b/arch/sh/lib64/memcpy.S
index dd300c372ce1..5d682e0ee24f 100644
--- a/arch/sh/lib64/memcpy.S
+++ b/arch/sh/lib64/memcpy.S
@@ -29,7 +29,7 @@
29! 2.: When there are two or three bytes in the last word of an 11-or-more 29! 2.: When there are two or three bytes in the last word of an 11-or-more
30! bytes memory chunk to b copied, the rest of the word can be read 30! bytes memory chunk to b copied, the rest of the word can be read
31! without side effects. 31! without side effects.
32! This could be easily changed by increasing the minumum size of 32! This could be easily changed by increasing the minimum size of
33! a fast memcpy and the amount subtracted from r7 before L_2l_loop be 2, 33! a fast memcpy and the amount subtracted from r7 before L_2l_loop be 2,
34! however, this would cost a few extra cyles on average. 34! however, this would cost a few extra cyles on average.
35! For SHmedia, the assumption is that any quadword can be read in its 35! For SHmedia, the assumption is that any quadword can be read in its
diff --git a/arch/sparc/include/asm/hypervisor.h b/arch/sparc/include/asm/hypervisor.h
index bafe5a631b6d..75686409be24 100644
--- a/arch/sparc/include/asm/hypervisor.h
+++ b/arch/sparc/include/asm/hypervisor.h
@@ -654,7 +654,7 @@ extern unsigned long sun4v_mmu_tsb_ctx0(unsigned long num_descriptions,
654 * ARG3: mmu context 654 * ARG3: mmu context
655 * ARG4: flags (HV_MMU_{IMMU,DMMU}) 655 * ARG4: flags (HV_MMU_{IMMU,DMMU})
656 * RET0: status 656 * RET0: status
657 * ERRORS: EINVAL Invalid virutal address, context, or 657 * ERRORS: EINVAL Invalid virtual address, context, or
658 * flags value 658 * flags value
659 * ENOTSUPPORTED ARG0 or ARG1 is non-zero 659 * ENOTSUPPORTED ARG0 or ARG1 is non-zero
660 * 660 *
@@ -721,7 +721,7 @@ extern void sun4v_mmu_demap_all(void);
721 * ARG2: TTE 721 * ARG2: TTE
722 * ARG3: flags (HV_MMU_{IMMU,DMMU}) 722 * ARG3: flags (HV_MMU_{IMMU,DMMU})
723 * RET0: status 723 * RET0: status
724 * ERRORS: EINVAL Invalid virutal address or flags value 724 * ERRORS: EINVAL Invalid virtual address or flags value
725 * EBADPGSZ Invalid page size value 725 * EBADPGSZ Invalid page size value
726 * ENORADDR Invalid real address in TTE 726 * ENORADDR Invalid real address in TTE
727 * ETOOMANY Too many mappings (max of 8 reached) 727 * ETOOMANY Too many mappings (max of 8 reached)
@@ -800,7 +800,7 @@ extern unsigned long sun4v_mmu_map_perm_addr(unsigned long vaddr,
800 * ARG1: reserved, must be zero 800 * ARG1: reserved, must be zero
801 * ARG2: flags (HV_MMU_{IMMU,DMMU}) 801 * ARG2: flags (HV_MMU_{IMMU,DMMU})
802 * RET0: status 802 * RET0: status
803 * ERRORS: EINVAL Invalid virutal address or flags value 803 * ERRORS: EINVAL Invalid virtual address or flags value
804 * ENOMAP Specified mapping was not found 804 * ENOMAP Specified mapping was not found
805 * 805 *
806 * Demaps any permanent page mapping (established via 806 * Demaps any permanent page mapping (established via
@@ -1205,7 +1205,7 @@ struct hv_trap_trace_control {
1205 * structure contents. Attempts to do so will result in undefined 1205 * structure contents. Attempts to do so will result in undefined
1206 * behavior for the guest. 1206 * behavior for the guest.
1207 * 1207 *
1208 * Each trap trace buffer entry is layed out as follows: 1208 * Each trap trace buffer entry is laid out as follows:
1209 */ 1209 */
1210#ifndef __ASSEMBLY__ 1210#ifndef __ASSEMBLY__
1211struct hv_trap_trace_entry { 1211struct hv_trap_trace_entry {
@@ -1300,7 +1300,7 @@ struct hv_trap_trace_entry {
1300 * state in RET1. Future systems may define various flags for the 1300 * state in RET1. Future systems may define various flags for the
1301 * enable argument (ARG0), for the moment a guest should pass 1301 * enable argument (ARG0), for the moment a guest should pass
1302 * "(uint64_t) -1" to enable, and "(uint64_t) 0" to disable all 1302 * "(uint64_t) -1" to enable, and "(uint64_t) 0" to disable all
1303 * tracing - which will ensure future compatability. 1303 * tracing - which will ensure future compatibility.
1304 */ 1304 */
1305#define HV_FAST_TTRACE_ENABLE 0x92 1305#define HV_FAST_TTRACE_ENABLE 0x92
1306 1306
@@ -1880,7 +1880,7 @@ extern unsigned long sun4v_vintr_set_target(unsigned long dev_handle,
1880 * pci_device, at pci_config_offset from the beginning of the device's 1880 * pci_device, at pci_config_offset from the beginning of the device's
1881 * configuration space. If there was no error, RET1 is set to zero and 1881 * configuration space. If there was no error, RET1 is set to zero and
1882 * RET2 is set to the data read. Insignificant bits in RET2 are not 1882 * RET2 is set to the data read. Insignificant bits in RET2 are not
1883 * guarenteed to have any specific value and therefore must be ignored. 1883 * guaranteed to have any specific value and therefore must be ignored.
1884 * 1884 *
1885 * The data returned in RET2 is size based byte swapped. 1885 * The data returned in RET2 is size based byte swapped.
1886 * 1886 *
@@ -1941,9 +1941,9 @@ extern unsigned long sun4v_vintr_set_target(unsigned long dev_handle,
1941 * and return the actual data read in RET2. The data returned is size based 1941 * and return the actual data read in RET2. The data returned is size based
1942 * byte swapped. 1942 * byte swapped.
1943 * 1943 *
1944 * Non-significant bits in RET2 are not guarenteed to have any specific value 1944 * Non-significant bits in RET2 are not guaranteed to have any specific value
1945 * and therefore must be ignored. If RET1 is returned as non-zero, the data 1945 * and therefore must be ignored. If RET1 is returned as non-zero, the data
1946 * value is not guarenteed to have any specific value and should be ignored. 1946 * value is not guaranteed to have any specific value and should be ignored.
1947 * 1947 *
1948 * The caller must have permission to read from the given devhandle, real 1948 * The caller must have permission to read from the given devhandle, real
1949 * address, which must be an IO address. The argument real address must be a 1949 * address, which must be an IO address. The argument real address must be a
@@ -2456,9 +2456,9 @@ extern unsigned long sun4v_vintr_set_target(unsigned long dev_handle,
2456 * 2456 *
2457 * As receive queue configuration causes a reset of the queue's head and 2457 * As receive queue configuration causes a reset of the queue's head and
2458 * tail pointers there is no way for a gues to determine how many entries 2458 * tail pointers there is no way for a gues to determine how many entries
2459 * have been received between a preceeding ldc_get_rx_state() API call 2459 * have been received between a preceding ldc_get_rx_state() API call
2460 * and the completion of the configuration operation. It should be noted 2460 * and the completion of the configuration operation. It should be noted
2461 * that datagram delivery is not guarenteed via domain channels anyway, 2461 * that datagram delivery is not guaranteed via domain channels anyway,
2462 * and therefore any higher protocol should be resilient to datagram 2462 * and therefore any higher protocol should be resilient to datagram
2463 * loss if necessary. However, to overcome this specific race potential 2463 * loss if necessary. However, to overcome this specific race potential
2464 * it is recommended, for example, that a higher level protocol be employed 2464 * it is recommended, for example, that a higher level protocol be employed
diff --git a/arch/sparc/include/asm/ns87303.h b/arch/sparc/include/asm/ns87303.h
index 686defe6aaa0..af755483e17d 100644
--- a/arch/sparc/include/asm/ns87303.h
+++ b/arch/sparc/include/asm/ns87303.h
@@ -37,7 +37,7 @@
37/* Power and Test Register (PTR) bits */ 37/* Power and Test Register (PTR) bits */
38#define PTR_LPTB_IRQ7 0x08 38#define PTR_LPTB_IRQ7 0x08
39#define PTR_LEVEL_IRQ 0x80 /* When not ECP/EPP: Use level IRQ */ 39#define PTR_LEVEL_IRQ 0x80 /* When not ECP/EPP: Use level IRQ */
40#define PTR_LPT_REG_DIR 0x80 /* When ECP/EPP: LPT CTR controlls direction */ 40#define PTR_LPT_REG_DIR 0x80 /* When ECP/EPP: LPT CTR controls direction */
41 /* of the parallel port */ 41 /* of the parallel port */
42 42
43/* Function Control Register (FCR) bits */ 43/* Function Control Register (FCR) bits */
diff --git a/arch/sparc/include/asm/pcr.h b/arch/sparc/include/asm/pcr.h
index 843e4faf6a50..288d7beba051 100644
--- a/arch/sparc/include/asm/pcr.h
+++ b/arch/sparc/include/asm/pcr.h
@@ -31,7 +31,7 @@ extern unsigned int picl_shift;
31 31
32/* In order to commonize as much of the implementation as 32/* In order to commonize as much of the implementation as
33 * possible, we use PICH as our counter. Mostly this is 33 * possible, we use PICH as our counter. Mostly this is
34 * to accomodate Niagara-1 which can only count insn cycles 34 * to accommodate Niagara-1 which can only count insn cycles
35 * in PICH. 35 * in PICH.
36 */ 36 */
37static inline u64 picl_value(unsigned int nmi_hz) 37static inline u64 picl_value(unsigned int nmi_hz)
diff --git a/arch/sparc/include/asm/ptrace.h b/arch/sparc/include/asm/ptrace.h
index 30b0b797dc0c..c7ad3fe2b252 100644
--- a/arch/sparc/include/asm/ptrace.h
+++ b/arch/sparc/include/asm/ptrace.h
@@ -33,7 +33,7 @@ struct pt_regs {
33 * things like "in a system call" etc. for an arbitray 33 * things like "in a system call" etc. for an arbitray
34 * process. 34 * process.
35 * 35 *
36 * The PT_REGS_MAGIC is choosen such that it can be 36 * The PT_REGS_MAGIC is chosen such that it can be
37 * loaded completely using just a sethi instruction. 37 * loaded completely using just a sethi instruction.
38 */ 38 */
39 unsigned int magic; 39 unsigned int magic;
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index 906ee3e24cc9..6da784a5612b 100644
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -801,7 +801,7 @@ vac_linesize_patch_32: subcc %l7, 32, %l7
801 .globl vac_hwflush_patch1_on, vac_hwflush_patch2_on 801 .globl vac_hwflush_patch1_on, vac_hwflush_patch2_on
802 802
803/* 803/*
804 * Ugly, but we cant use hardware flushing on the sun4 and we'd require 804 * Ugly, but we can't use hardware flushing on the sun4 and we'd require
805 * two instructions (Anton) 805 * two instructions (Anton)
806 */ 806 */
807vac_hwflush_patch1_on: addcc %l7, -PAGE_SIZE, %l7 807vac_hwflush_patch1_on: addcc %l7, -PAGE_SIZE, %l7
@@ -851,7 +851,7 @@ sun4c_fault:
851 sethi %hi(~((1 << SUN4C_REAL_PGDIR_SHIFT) - 1)), %l4 851 sethi %hi(~((1 << SUN4C_REAL_PGDIR_SHIFT) - 1)), %l4
852 852
853 /* If the kernel references a bum kernel pointer, or a pte which 853 /* If the kernel references a bum kernel pointer, or a pte which
854 * points to a non existant page in ram, we will run this code 854 * points to a non existent page in ram, we will run this code
855 * _forever_ and lock up the machine!!!!! So we must check for 855 * _forever_ and lock up the machine!!!!! So we must check for
856 * this condition, the AC_SYNC_ERR bits are what we must examine. 856 * this condition, the AC_SYNC_ERR bits are what we must examine.
857 * Also a parity error would make this happen as well. So we just 857 * Also a parity error would make this happen as well. So we just
diff --git a/arch/sparc/kernel/head_64.S b/arch/sparc/kernel/head_64.S
index f8f21050448b..aa594c792d19 100644
--- a/arch/sparc/kernel/head_64.S
+++ b/arch/sparc/kernel/head_64.S
@@ -85,7 +85,7 @@ sparc_ramdisk_image64:
85sparc64_boot: 85sparc64_boot:
86 mov %o4, %l7 86 mov %o4, %l7
87 87
88 /* We need to remap the kernel. Use position independant 88 /* We need to remap the kernel. Use position independent
89 * code to remap us to KERNBASE. 89 * code to remap us to KERNBASE.
90 * 90 *
91 * SILO can invoke us with 32-bit address masking enabled, 91 * SILO can invoke us with 32-bit address masking enabled,
diff --git a/arch/sparc/kernel/init_task.c b/arch/sparc/kernel/init_task.c
index 5fe3d65581f7..35f141a9f506 100644
--- a/arch/sparc/kernel/init_task.c
+++ b/arch/sparc/kernel/init_task.c
@@ -15,7 +15,7 @@ EXPORT_SYMBOL(init_task);
15 15
16/* .text section in head.S is aligned at 8k boundary and this gets linked 16/* .text section in head.S is aligned at 8k boundary and this gets linked
17 * right after that so that the init_thread_union is aligned properly as well. 17 * right after that so that the init_thread_union is aligned properly as well.
18 * If this is not aligned on a 8k boundry, then you should change code 18 * If this is not aligned on a 8k boundary, then you should change code
19 * in etrap.S which assumes it. 19 * in etrap.S which assumes it.
20 */ 20 */
21union thread_union init_thread_union __init_task_data = 21union thread_union init_thread_union __init_task_data =
diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
index 63cd4e5d47c2..5c149689bb20 100644
--- a/arch/sparc/kernel/of_device_64.c
+++ b/arch/sparc/kernel/of_device_64.c
@@ -459,7 +459,7 @@ apply_interrupt_map(struct device_node *dp, struct device_node *pp,
459 * 459 *
460 * Handle this by deciding that, if we didn't get a 460 * Handle this by deciding that, if we didn't get a
461 * match in the parent's 'interrupt-map', and the 461 * match in the parent's 'interrupt-map', and the
462 * parent is an IRQ translater, then use the parent as 462 * parent is an IRQ translator, then use the parent as
463 * our IRQ controller. 463 * our IRQ controller.
464 */ 464 */
465 if (pp->irq_trans) 465 if (pp->irq_trans)
diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c
index 760578687e7c..ee8426ede7c7 100644
--- a/arch/sparc/kernel/perf_event.c
+++ b/arch/sparc/kernel/perf_event.c
@@ -1027,7 +1027,7 @@ static int sparc_pmu_add(struct perf_event *event, int ef_flags)
1027 1027
1028 /* 1028 /*
1029 * If group events scheduling transaction was started, 1029 * If group events scheduling transaction was started,
1030 * skip the schedulability test here, it will be peformed 1030 * skip the schedulability test here, it will be performed
1031 * at commit time(->commit_txn) as a whole 1031 * at commit time(->commit_txn) as a whole
1032 */ 1032 */
1033 if (cpuc->group_flag & PERF_EVENT_TXN) 1033 if (cpuc->group_flag & PERF_EVENT_TXN)
diff --git a/arch/sparc/math-emu/Makefile b/arch/sparc/math-emu/Makefile
index b9085ecbb27b..825dbee94d84 100644
--- a/arch/sparc/math-emu/Makefile
+++ b/arch/sparc/math-emu/Makefile
@@ -2,7 +2,7 @@
2# Makefile for the FPU instruction emulation. 2# Makefile for the FPU instruction emulation.
3# 3#
4 4
5# supress all warnings - as math.c produces a lot! 5# suppress all warnings - as math.c produces a lot!
6ccflags-y := -w 6ccflags-y := -w
7 7
8obj-y := math_$(BITS).o 8obj-y := math_$(BITS).o
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 6e2cdd5ae96b..e32b0c23c4c8 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -51,7 +51,7 @@ config GENERIC_TIME
51config GENERIC_CLOCKEVENTS 51config GENERIC_CLOCKEVENTS
52 def_bool y 52 def_bool y
53 53
54# FIXME: tilegx can implement a more efficent rwsem. 54# FIXME: tilegx can implement a more efficient rwsem.
55config RWSEM_GENERIC_SPINLOCK 55config RWSEM_GENERIC_SPINLOCK
56 def_bool y 56 def_bool y
57 57
diff --git a/arch/tile/include/hv/drv_xgbe_intf.h b/arch/tile/include/hv/drv_xgbe_intf.h
index 146e47d5334b..f13188ac281a 100644
--- a/arch/tile/include/hv/drv_xgbe_intf.h
+++ b/arch/tile/include/hv/drv_xgbe_intf.h
@@ -319,7 +319,7 @@ typedef union
319 * is an error code, or zero if no error. The val0 member is the 319 * is an error code, or zero if no error. The val0 member is the
320 * updated value of seqno; it has been incremented by 1 for each 320 * updated value of seqno; it has been incremented by 1 for each
321 * packet sent. That increment may be less than nentries if an 321 * packet sent. That increment may be less than nentries if an
322 * error occured, or if some of the entries in the vector contain 322 * error occurred, or if some of the entries in the vector contain
323 * handles equal to NETIO_PKT_HANDLE_NONE. The val1 member is the 323 * handles equal to NETIO_PKT_HANDLE_NONE. The val1 member is the
324 * updated value of nentries; it has been decremented by 1 for each 324 * updated value of nentries; it has been decremented by 1 for each
325 * vector entry processed. Again, that decrement may be less than 325 * vector entry processed. Again, that decrement may be less than
diff --git a/arch/tile/include/hv/hypervisor.h b/arch/tile/include/hv/hypervisor.h
index 1b8bf03d62a0..ee41bca4c8c4 100644
--- a/arch/tile/include/hv/hypervisor.h
+++ b/arch/tile/include/hv/hypervisor.h
@@ -1340,7 +1340,7 @@ typedef struct
1340 * this operation. If any permanent delivery errors were encountered, 1340 * this operation. If any permanent delivery errors were encountered,
1341 * the routine returns HV_ERECIP. In the event of permanent delivery 1341 * the routine returns HV_ERECIP. In the event of permanent delivery
1342 * errors, it may be the case that delivery was not attempted to all 1342 * errors, it may be the case that delivery was not attempted to all
1343 * recipients; if any messages were succesfully delivered, however, 1343 * recipients; if any messages were successfully delivered, however,
1344 * recipients' state values will be updated appropriately. 1344 * recipients' state values will be updated appropriately.
1345 * 1345 *
1346 * It is explicitly legal to specify a recipient structure whose state 1346 * It is explicitly legal to specify a recipient structure whose state
@@ -1359,7 +1359,7 @@ typedef struct
1359 * never call hv_receive_message, or could register a different state 1359 * never call hv_receive_message, or could register a different state
1360 * buffer, losing the message. 1360 * buffer, losing the message.
1361 * 1361 *
1362 * Specifiying the same recipient more than once in the recipient list 1362 * Specifying the same recipient more than once in the recipient list
1363 * is an error, which will not result in an error return but which may 1363 * is an error, which will not result in an error return but which may
1364 * or may not result in more than one message being delivered to the 1364 * or may not result in more than one message being delivered to the
1365 * recipient tile. 1365 * recipient tile.
diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c
index a1ee25be9ad9..ea38f0c9ec7c 100644
--- a/arch/tile/kernel/pci.c
+++ b/arch/tile/kernel/pci.c
@@ -36,7 +36,7 @@
36 * Initialization flow and process 36 * Initialization flow and process
37 * ------------------------------- 37 * -------------------------------
38 * 38 *
39 * This files containes the routines to search for PCI buses, 39 * This files contains the routines to search for PCI buses,
40 * enumerate the buses, and configure any attached devices. 40 * enumerate the buses, and configure any attached devices.
41 * 41 *
42 * There are two entry points here: 42 * There are two entry points here:
@@ -519,7 +519,7 @@ static int __devinit tile_cfg_read(struct pci_bus *bus,
519 519
520 520
521/* 521/*
522 * See tile_cfg_read() for relevent comments. 522 * See tile_cfg_read() for relevant comments.
523 * Note that "val" is the value to write, not a pointer to that value. 523 * Note that "val" is the value to write, not a pointer to that value.
524 */ 524 */
525static int __devinit tile_cfg_write(struct pci_bus *bus, 525static int __devinit tile_cfg_write(struct pci_bus *bus,
diff --git a/arch/tile/mm/fault.c b/arch/tile/mm/fault.c
index 758f597f488c..51f8663bf074 100644
--- a/arch/tile/mm/fault.c
+++ b/arch/tile/mm/fault.c
@@ -290,7 +290,7 @@ static int handle_page_fault(struct pt_regs *regs,
290 /* 290 /*
291 * Early on, we need to check for migrating PTE entries; 291 * Early on, we need to check for migrating PTE entries;
292 * see homecache.c. If we find a migrating PTE, we wait until 292 * see homecache.c. If we find a migrating PTE, we wait until
293 * the backing page claims to be done migrating, then we procede. 293 * the backing page claims to be done migrating, then we proceed.
294 * For kernel PTEs, we rewrite the PTE and return and retry. 294 * For kernel PTEs, we rewrite the PTE and return and retry.
295 * Otherwise, we treat the fault like a normal "no PTE" fault, 295 * Otherwise, we treat the fault like a normal "no PTE" fault,
296 * rather than trying to patch up the existing PTE. 296 * rather than trying to patch up the existing PTE.
diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
index 201a582c4137..42cfcba4e1ef 100644
--- a/arch/tile/mm/hugetlbpage.c
+++ b/arch/tile/mm/hugetlbpage.c
@@ -219,7 +219,7 @@ try_again:
219 if (mm->free_area_cache < len) 219 if (mm->free_area_cache < len)
220 goto fail; 220 goto fail;
221 221
222 /* either no address requested or cant fit in requested address hole */ 222 /* either no address requested or can't fit in requested address hole */
223 addr = (mm->free_area_cache - len) & huge_page_mask(h); 223 addr = (mm->free_area_cache - len) & huge_page_mask(h);
224 do { 224 do {
225 /* 225 /*
diff --git a/arch/um/Kconfig.net b/arch/um/Kconfig.net
index 9e9a4aaa703d..3160b1a5adb7 100644
--- a/arch/um/Kconfig.net
+++ b/arch/um/Kconfig.net
@@ -186,7 +186,7 @@ config UML_NET_SLIRP
186 other transports, SLiRP works without the need of root level 186 other transports, SLiRP works without the need of root level
187 privleges, setuid binaries, or SLIP devices on the host. This 187 privleges, setuid binaries, or SLIP devices on the host. This
188 also means not every type of connection is possible, but most 188 also means not every type of connection is possible, but most
189 situations can be accomodated with carefully crafted slirp 189 situations can be accommodated with carefully crafted slirp
190 commands that can be passed along as part of the network device's 190 commands that can be passed along as part of the network device's
191 setup string. The effect of this transport on the UML is similar 191 setup string. The effect of this transport on the UML is similar
192 that of a host behind a firewall that masquerades all network 192 that of a host behind a firewall that masquerades all network
diff --git a/arch/unicore32/include/mach/regs-umal.h b/arch/unicore32/include/mach/regs-umal.h
index 885bb62fee71..aa22df74e11d 100644
--- a/arch/unicore32/include/mach/regs-umal.h
+++ b/arch/unicore32/include/mach/regs-umal.h
@@ -52,7 +52,7 @@
52 */ 52 */
53#define UMAL_MIISTATUS (PKUNITY_UMAL_BASE + 0x0030) 53#define UMAL_MIISTATUS (PKUNITY_UMAL_BASE + 0x0030)
54/* 54/*
55 * MII Managment Indicator UMAL_MIIIDCT 55 * MII Management Indicator UMAL_MIIIDCT
56 */ 56 */
57#define UMAL_MIIIDCT (PKUNITY_UMAL_BASE + 0x0034) 57#define UMAL_MIIIDCT (PKUNITY_UMAL_BASE + 0x0034)
58/* 58/*
@@ -91,7 +91,7 @@
91#define UMAL_FIFORAM6 (PKUNITY_UMAL_BASE + 0x0078) 91#define UMAL_FIFORAM6 (PKUNITY_UMAL_BASE + 0x0078)
92#define UMAL_FIFORAM7 (PKUNITY_UMAL_BASE + 0x007c) 92#define UMAL_FIFORAM7 (PKUNITY_UMAL_BASE + 0x007c)
93 93
94/* MAHBE MODUEL OF UMAL */ 94/* MAHBE MODULE OF UMAL */
95/* UMAL's MAHBE module interfaces to the host system through 32-bit AHB Master 95/* UMAL's MAHBE module interfaces to the host system through 32-bit AHB Master
96 * and Slave ports.Registers within the M-AHBE provide Control and Status 96 * and Slave ports.Registers within the M-AHBE provide Control and Status
97 * information concerning these transfers. 97 * information concerning these transfers.
diff --git a/arch/unicore32/kernel/head.S b/arch/unicore32/kernel/head.S
index 92255f3ab6a7..8caf322e110d 100644
--- a/arch/unicore32/kernel/head.S
+++ b/arch/unicore32/kernel/head.S
@@ -164,7 +164,7 @@ ENTRY(stext)
164ENDPROC(stext) 164ENDPROC(stext)
165 165
166/* 166/*
167 * Enable the MMU. This completely changes the stucture of the visible 167 * Enable the MMU. This completely changes the structure of the visible
168 * memory space. You will not be able to trace execution through this. 168 * memory space. You will not be able to trace execution through this.
169 * 169 *
170 * r0 = cp#0 control register 170 * r0 = cp#0 control register
diff --git a/arch/xtensa/include/asm/dma.h b/arch/xtensa/include/asm/dma.h
index 137ca3945b07..bb099a373b5a 100644
--- a/arch/xtensa/include/asm/dma.h
+++ b/arch/xtensa/include/asm/dma.h
@@ -37,7 +37,7 @@
37 * the size of the statically mapped kernel segment 37 * the size of the statically mapped kernel segment
38 * (XCHAL_KSEG_{CACHED,BYPASS}_SIZE), ie. 128 MB. 38 * (XCHAL_KSEG_{CACHED,BYPASS}_SIZE), ie. 128 MB.
39 * 39 *
40 * NOTE: When the entire KSEG area is DMA capable, we substract 40 * NOTE: When the entire KSEG area is DMA capable, we subtract
41 * one from the max address so that the virt_to_phys() macro 41 * one from the max address so that the virt_to_phys() macro
42 * works correctly on the address (otherwise the address 42 * works correctly on the address (otherwise the address
43 * enters another area, and virt_to_phys() may not return 43 * enters another area, and virt_to_phys() may not return
diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S
index 5fd01f6aaf37..6223f3346b5c 100644
--- a/arch/xtensa/kernel/entry.S
+++ b/arch/xtensa/kernel/entry.S
@@ -1026,7 +1026,7 @@ ENTRY(fast_syscall_unrecoverable)
1026 * TRY adds an entry to the __ex_table fixup table for the immediately 1026 * TRY adds an entry to the __ex_table fixup table for the immediately
1027 * following instruction. 1027 * following instruction.
1028 * 1028 *
1029 * CATCH catches any exception that occurred at one of the preceeding TRY 1029 * CATCH catches any exception that occurred at one of the preceding TRY
1030 * statements and continues from there 1030 * statements and continues from there
1031 * 1031 *
1032 * Usage TRY l32i a0, a1, 0 1032 * Usage TRY l32i a0, a1, 0
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 2bef5705ce24..f0605ab2a761 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -868,7 +868,7 @@ static void blkio_update_policy_rule(struct blkio_policy_node *oldpn,
868} 868}
869 869
870/* 870/*
871 * Some rules/values in blkg have changed. Propogate those to respective 871 * Some rules/values in blkg have changed. Propagate those to respective
872 * policies. 872 * policies.
873 */ 873 */
874static void blkio_update_blkg_policy(struct blkio_cgroup *blkcg, 874static void blkio_update_blkg_policy(struct blkio_cgroup *blkcg,
@@ -903,7 +903,7 @@ static void blkio_update_blkg_policy(struct blkio_cgroup *blkcg,
903} 903}
904 904
905/* 905/*
906 * A policy node rule has been updated. Propogate this update to all the 906 * A policy node rule has been updated. Propagate this update to all the
907 * block groups which might be affected by this update. 907 * block groups which might be affected by this update.
908 */ 908 */
909static void blkio_update_policy_node_blkg(struct blkio_cgroup *blkcg, 909static void blkio_update_policy_node_blkg(struct blkio_cgroup *blkcg,
diff --git a/block/blk-core.c b/block/blk-core.c
index 725091d5496d..90f22cc30799 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1184,7 +1184,7 @@ static bool bio_attempt_front_merge(struct request_queue *q,
1184 1184
1185/* 1185/*
1186 * Attempts to merge with the plugged list in the current process. Returns 1186 * Attempts to merge with the plugged list in the current process. Returns
1187 * true if merge was succesful, otherwise false. 1187 * true if merge was successful, otherwise false.
1188 */ 1188 */
1189static bool attempt_plug_merge(struct task_struct *tsk, struct request_queue *q, 1189static bool attempt_plug_merge(struct task_struct *tsk, struct request_queue *q,
1190 struct bio *bio) 1190 struct bio *bio)
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 6c98cfeeedf0..0475a22a420d 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -916,7 +916,7 @@ static void throtl_update_blkio_group_common(struct throtl_data *td,
916/* 916/*
917 * For all update functions, key should be a valid pointer because these 917 * For all update functions, key should be a valid pointer because these
918 * update functions are called under blkcg_lock, that means, blkg is 918 * update functions are called under blkcg_lock, that means, blkg is
919 * valid and in turn key is valid. queue exit path can not race becuase 919 * valid and in turn key is valid. queue exit path can not race because
920 * of blkcg_lock 920 * of blkcg_lock
921 * 921 *
922 * Can not take queue lock in update functions as queue lock under blkcg_lock 922 * Can not take queue lock in update functions as queue lock under blkcg_lock
diff --git a/block/blk.h b/block/blk.h
index c8db371a921d..61263463e38e 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -32,7 +32,7 @@ enum rq_atomic_flags {
32 32
33/* 33/*
34 * EH timer and IO completion will both attempt to 'grab' the request, make 34 * EH timer and IO completion will both attempt to 'grab' the request, make
35 * sure that only one of them suceeds 35 * sure that only one of them succeeds
36 */ 36 */
37static inline int blk_mark_rq_complete(struct request *rq) 37static inline int blk_mark_rq_complete(struct request *rq)
38{ 38{
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 7785169f3c8f..3be881ec95ad 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -888,7 +888,7 @@ cfq_group_notify_queue_add(struct cfq_data *cfqd, struct cfq_group *cfqg)
888 /* 888 /*
889 * Currently put the group at the end. Later implement something 889 * Currently put the group at the end. Later implement something
890 * so that groups get lesser vtime based on their weights, so that 890 * so that groups get lesser vtime based on their weights, so that
891 * if group does not loose all if it was not continously backlogged. 891 * if group does not loose all if it was not continuously backlogged.
892 */ 892 */
893 n = rb_last(&st->rb); 893 n = rb_last(&st->rb);
894 if (n) { 894 if (n) {
diff --git a/block/genhd.c b/block/genhd.c
index c91a2dac6b6b..b364bd038a18 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -739,7 +739,7 @@ void __init printk_all_partitions(void)
739 739
740 /* 740 /*
741 * Don't show empty devices or things that have been 741 * Don't show empty devices or things that have been
742 * surpressed 742 * suppressed
743 */ 743 */
744 if (get_capacity(disk) == 0 || 744 if (get_capacity(disk) == 0 ||
745 (disk->flags & GENHD_FL_SUPPRESS_PARTITION_INFO)) 745 (disk->flags & GENHD_FL_SUPPRESS_PARTITION_INFO))
diff --git a/crypto/ansi_cprng.c b/crypto/ansi_cprng.c
index 2bc332142849..ffa0245e2abc 100644
--- a/crypto/ansi_cprng.c
+++ b/crypto/ansi_cprng.c
@@ -83,7 +83,7 @@ static void xor_vectors(unsigned char *in1, unsigned char *in2,
83} 83}
84/* 84/*
85 * Returns DEFAULT_BLK_SZ bytes of random data per call 85 * Returns DEFAULT_BLK_SZ bytes of random data per call
86 * returns 0 if generation succeded, <0 if something went wrong 86 * returns 0 if generation succeeded, <0 if something went wrong
87 */ 87 */
88static int _get_more_prng_bytes(struct prng_context *ctx, int cont_test) 88static int _get_more_prng_bytes(struct prng_context *ctx, int cont_test)
89{ 89{
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c
index 079ae8ca590b..bc28337fded2 100644
--- a/crypto/async_tx/async_xor.c
+++ b/crypto/async_tx/async_xor.c
@@ -94,7 +94,7 @@ do_async_xor(struct dma_chan *chan, struct page *dest, struct page **src_list,
94 if (unlikely(!tx)) 94 if (unlikely(!tx))
95 async_tx_quiesce(&submit->depend_tx); 95 async_tx_quiesce(&submit->depend_tx);
96 96
97 /* spin wait for the preceeding transactions to complete */ 97 /* spin wait for the preceding transactions to complete */
98 while (unlikely(!tx)) { 98 while (unlikely(!tx)) {
99 dma_async_issue_pending(chan); 99 dma_async_issue_pending(chan);
100 tx = dma->device_prep_dma_xor(chan, dma_dest, 100 tx = dma->device_prep_dma_xor(chan, dma_dest,
diff --git a/crypto/gf128mul.c b/crypto/gf128mul.c
index a90d260528d4..df35e4ccd07e 100644
--- a/crypto/gf128mul.c
+++ b/crypto/gf128mul.c
@@ -89,7 +89,7 @@
89} 89}
90 90
91/* Given the value i in 0..255 as the byte overflow when a field element 91/* Given the value i in 0..255 as the byte overflow when a field element
92 in GHASH is multipled by x^8, this function will return the values that 92 in GHASH is multiplied by x^8, this function will return the values that
93 are generated in the lo 16-bit word of the field value by applying the 93 are generated in the lo 16-bit word of the field value by applying the
94 modular polynomial. The values lo_byte and hi_byte are returned via the 94 modular polynomial. The values lo_byte and hi_byte are returned via the
95 macro xp_fun(lo_byte, hi_byte) so that the values can be assembled into 95 macro xp_fun(lo_byte, hi_byte) so that the values can be assembled into
diff --git a/crypto/vmac.c b/crypto/vmac.c
index 0999274a27ac..f35ff8a3926e 100644
--- a/crypto/vmac.c
+++ b/crypto/vmac.c
@@ -95,7 +95,7 @@ const u64 mpoly = UINT64_C(0x1fffffff1fffffff); /* Poly key mask */
95 95
96/* 96/*
97 * For highest performance the L1 NH and L2 polynomial hashes should be 97 * For highest performance the L1 NH and L2 polynomial hashes should be
98 * carefully implemented to take advantage of one's target architechture. 98 * carefully implemented to take advantage of one's target architecture.
99 * Here these two hash functions are defined multiple time; once for 99 * Here these two hash functions are defined multiple time; once for
100 * 64-bit architectures, once for 32-bit SSE2 architectures, and once 100 * 64-bit architectures, once for 32-bit SSE2 architectures, and once
101 * for the rest (32-bit) architectures. 101 * for the rest (32-bit) architectures.
diff --git a/crypto/xts.c b/crypto/xts.c
index 555ecaab1e54..851705446c82 100644
--- a/crypto/xts.c
+++ b/crypto/xts.c
@@ -45,7 +45,7 @@ static int setkey(struct crypto_tfm *parent, const u8 *key,
45 return -EINVAL; 45 return -EINVAL;
46 } 46 }
47 47
48 /* we need two cipher instances: one to compute the inital 'tweak' 48 /* we need two cipher instances: one to compute the initial 'tweak'
49 * by encrypting the IV (usually the 'plain' iv) and the other 49 * by encrypting the IV (usually the 'plain' iv) and the other
50 * one to encrypt and decrypt the data */ 50 * one to encrypt and decrypt the data */
51 51
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/hid-core.c b/drivers/hid/hid-core.c
index c597836d8618..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
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-magicmouse.c b/drivers/hid/hid-magicmouse.c
index 418c399d3ef7..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
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/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/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/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/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..717fced45801 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_main.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_main.c
@@ -8295,7 +8295,7 @@ wlc_txflowcontrol_prio_isset(struct wlc_info *wlc, struct wlc_txq_info *q,
8295 return (q->stopped & prio_mask) == prio_mask; 8295 return (q->stopped & prio_mask) == prio_mask;
8296} 8296}
8297 8297
8298/* propogate the flow control to all interfaces using the given tx queue */ 8298/* propagate the flow control to all interfaces using the given tx queue */
8299void wlc_txflowcontrol(struct wlc_info *wlc, struct wlc_txq_info *qi, 8299void wlc_txflowcontrol(struct wlc_info *wlc, struct wlc_txq_info *qi,
8300 bool on, int prio) 8300 bool on, int prio)
8301{ 8301{
@@ -8462,7 +8462,7 @@ static void wlc_txq_free(struct wlc_info *wlc, struct wlc_txq_info *qi)
8462} 8462}
8463 8463
8464/* 8464/*
8465 * Flag 'scan in progress' to withold dynamic phy calibration 8465 * Flag 'scan in progress' to withhold dynamic phy calibration
8466 */ 8466 */
8467void wlc_scan_start(struct wlc_info *wlc) 8467void wlc_scan_start(struct wlc_info *wlc)
8468{ 8468{
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_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_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/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_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/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..aa77a971aace 100644
--- a/drivers/staging/hv/tools/hv_kvp_daemon.c
+++ b/drivers/staging/hv/tools/hv_kvp_daemon.c
@@ -202,7 +202,7 @@ kvp_get_ip_address(int family, char *buffer, int length)
202 202
203 /* 203 /*
204 * We only support AF_INET and AF_INET6 204 * We only support AF_INET and AF_INET6
205 * and the list of addresses is seperated by a ";". 205 * and the list of addresses is separated by a ";".
206 */ 206 */
207 struct sockaddr_in6 *addr = 207 struct sockaddr_in6 *addr =
208 (struct sockaddr_in6 *) curp->ifa_addr; 208 (struct sockaddr_in6 *) curp->ifa_addr;
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..7a127029e099 100644
--- a/drivers/staging/iio/imu/adis16400.h
+++ b/drivers/staging/iio/imu/adis16400.h
@@ -131,7 +131,7 @@
131 * @indio_dev: industrial I/O device structure 131 * @indio_dev: industrial I/O device structure
132 * @trig: data ready trigger registered with iio 132 * @trig: data ready trigger registered with iio
133 * @tx: transmit buffer 133 * @tx: transmit buffer
134 * @rx: recieve buffer 134 * @rx: receive buffer
135 * @buf_lock: mutex to protect tx and rx 135 * @buf_lock: mutex to protect tx and rx
136 **/ 136 **/
137struct adis16400_state { 137struct adis16400_state {
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/memrar_handler.c b/drivers/staging/memrar/memrar_handler.c
index cfcaa8e5b8e6..1d9399d6f10f 100644
--- a/drivers/staging/memrar/memrar_handler.c
+++ b/drivers/staging/memrar/memrar_handler.c
@@ -690,7 +690,7 @@ static int memrar_mmap(struct file *filp, struct vm_area_struct *vma)
690 * @inode: inode to open 690 * @inode: inode to open
691 * @filp: file handle 691 * @filp: file handle
692 * 692 *
693 * As we support multiple arbitary opens there is no work to be done 693 * As we support multiple arbitrary opens there is no work to be done
694 * really. 694 * really.
695 */ 695 */
696 696
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/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/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/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/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/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_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..c2f2664b61ae 100644
--- a/drivers/staging/sep/sep_driver.c
+++ b/drivers/staging/sep/sep_driver.c
@@ -586,7 +586,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", 586 dev_dbg(&sep->pdev->dev, "poll: send_ct is %lx reply ct is %lx\n",
587 sep->send_ct, sep->reply_ct); 587 sep->send_ct, sep->reply_ct);
588 588
589 /* Check if error occured during poll */ 589 /* Check if error occurred during poll */
590 retval2 = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR3_REG_ADDR); 590 retval2 = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR3_REG_ADDR);
591 if (retval2 != 0x0) { 591 if (retval2 != 0x0) {
592 dev_warn(&sep->pdev->dev, "poll; poll error %x\n", retval2); 592 dev_warn(&sep->pdev->dev, "poll; poll error %x\n", retval2);
@@ -1106,7 +1106,7 @@ static int sep_lock_user_pages(struct sep_device *sep,
1106 lli_array[count].block_size); 1106 lli_array[count].block_size);
1107 } 1107 }
1108 1108
1109 /* Set output params acording to the in_out flag */ 1109 /* Set output params according to the in_out flag */
1110 if (in_out_flag == SEP_DRIVER_IN_FLAG) { 1110 if (in_out_flag == SEP_DRIVER_IN_FLAG) {
1111 *lli_array_ptr = lli_array; 1111 *lli_array_ptr = lli_array;
1112 sep->dma_res_arr[sep->nr_dcb_creat].in_num_pages = num_pages; 1112 sep->dma_res_arr[sep->nr_dcb_creat].in_num_pages = num_pages;
@@ -1577,7 +1577,7 @@ static int sep_prepare_input_dma_table(struct sep_device *sep,
1577 1577
1578 /* 1578 /*
1579 * If this is not the last table - 1579 * If this is not the last table -
1580 * then allign it to the block size 1580 * then align it to the block size
1581 */ 1581 */
1582 if (!last_table_flag) 1582 if (!last_table_flag)
1583 table_data_size = 1583 table_data_size =
@@ -1974,7 +1974,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", 1974 dev_dbg(&sep->pdev->dev, "SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP is %x\n",
1975 SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP); 1975 SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP);
1976 1976
1977 /* Call the fucntion that creates table from the lli arrays */ 1977 /* Call the function that creates table from the lli arrays */
1978 error = sep_construct_dma_tables_from_lli(sep, lli_in_array, 1978 error = sep_construct_dma_tables_from_lli(sep, lli_in_array,
1979 sep->dma_res_arr[sep->nr_dcb_creat].in_num_pages, 1979 sep->dma_res_arr[sep->nr_dcb_creat].in_num_pages,
1980 lli_out_array, 1980 lli_out_array,
@@ -2416,7 +2416,7 @@ end_function:
2416 * @cmd: command 2416 * @cmd: command
2417 * @arg: pointer to argument structure 2417 * @arg: pointer to argument structure
2418 * 2418 *
2419 * Implement the ioctl methods availble on the SEP device. 2419 * Implement the ioctl methods available on the SEP device.
2420 */ 2420 */
2421static long sep_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 2421static long sep_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
2422{ 2422{
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..78a16a768509 100644
--- a/drivers/staging/sm7xx/smtcfb.c
+++ b/drivers/staging/sm7xx/smtcfb.c
@@ -965,7 +965,7 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,
965 goto failed; 965 goto failed;
966 966
967 smtcfb_setmode(sfb); 967 smtcfb_setmode(sfb);
968 /* Primary display starting from 0 postion */ 968 /* Primary display starting from 0 position */
969 hw.BaseAddressInVRAM = 0; 969 hw.BaseAddressInVRAM = 0;
970 sfb->fb.par = &hw; 970 sfb->fb.par = &hw;
971 971
@@ -1055,7 +1055,7 @@ static int __maybe_unused smtcfb_suspend(struct pci_dev *pdev, pm_message_t msg)
1055 1055
1056 pdev->dev.power.power_state = msg; 1056 pdev->dev.power.power_state = msg;
1057 1057
1058 /* additionaly turn off all function blocks including internal PLLs */ 1058 /* additionally turn off all function blocks including internal PLLs */
1059 smtc_seqw(0x21, 0xff); 1059 smtc_seqw(0x21, 0xff);
1060 1060
1061 return 0; 1061 return 0;
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/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/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/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/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/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.
diff --git a/fs/adfs/map.c b/fs/adfs/map.c
index d1a5932bb0f1..6935f05202ac 100644
--- a/fs/adfs/map.c
+++ b/fs/adfs/map.c
@@ -51,7 +51,7 @@ static DEFINE_RWLOCK(adfs_map_lock);
51 51
52/* 52/*
53 * This is fun. We need to load up to 19 bits from the map at an 53 * This is fun. We need to load up to 19 bits from the map at an
54 * arbitary bit alignment. (We're limited to 19 bits by F+ version 2). 54 * arbitrary bit alignment. (We're limited to 19 bits by F+ version 2).
55 */ 55 */
56#define GET_FRAG_ID(_map,_start,_idmask) \ 56#define GET_FRAG_ID(_map,_start,_idmask) \
57 ({ \ 57 ({ \
diff --git a/fs/afs/cache.c b/fs/afs/cache.c
index 0fb315dd4d2a..577763c3d88b 100644
--- a/fs/afs/cache.c
+++ b/fs/afs/cache.c
@@ -98,7 +98,7 @@ static uint16_t afs_cell_cache_get_key(const void *cookie_netfs_data,
98} 98}
99 99
100/* 100/*
101 * provide new auxilliary cache data 101 * provide new auxiliary cache data
102 */ 102 */
103static uint16_t afs_cell_cache_get_aux(const void *cookie_netfs_data, 103static uint16_t afs_cell_cache_get_aux(const void *cookie_netfs_data,
104 void *buffer, uint16_t bufmax) 104 void *buffer, uint16_t bufmax)
@@ -117,7 +117,7 @@ static uint16_t afs_cell_cache_get_aux(const void *cookie_netfs_data,
117} 117}
118 118
119/* 119/*
120 * check that the auxilliary data indicates that the entry is still valid 120 * check that the auxiliary data indicates that the entry is still valid
121 */ 121 */
122static enum fscache_checkaux afs_cell_cache_check_aux(void *cookie_netfs_data, 122static enum fscache_checkaux afs_cell_cache_check_aux(void *cookie_netfs_data,
123 const void *buffer, 123 const void *buffer,
@@ -150,7 +150,7 @@ static uint16_t afs_vlocation_cache_get_key(const void *cookie_netfs_data,
150} 150}
151 151
152/* 152/*
153 * provide new auxilliary cache data 153 * provide new auxiliary cache data
154 */ 154 */
155static uint16_t afs_vlocation_cache_get_aux(const void *cookie_netfs_data, 155static uint16_t afs_vlocation_cache_get_aux(const void *cookie_netfs_data,
156 void *buffer, uint16_t bufmax) 156 void *buffer, uint16_t bufmax)
@@ -172,7 +172,7 @@ static uint16_t afs_vlocation_cache_get_aux(const void *cookie_netfs_data,
172} 172}
173 173
174/* 174/*
175 * check that the auxilliary data indicates that the entry is still valid 175 * check that the auxiliary data indicates that the entry is still valid
176 */ 176 */
177static 177static
178enum fscache_checkaux afs_vlocation_cache_check_aux(void *cookie_netfs_data, 178enum fscache_checkaux afs_vlocation_cache_check_aux(void *cookie_netfs_data,
@@ -283,7 +283,7 @@ static void afs_vnode_cache_get_attr(const void *cookie_netfs_data,
283} 283}
284 284
285/* 285/*
286 * provide new auxilliary cache data 286 * provide new auxiliary cache data
287 */ 287 */
288static uint16_t afs_vnode_cache_get_aux(const void *cookie_netfs_data, 288static uint16_t afs_vnode_cache_get_aux(const void *cookie_netfs_data,
289 void *buffer, uint16_t bufmax) 289 void *buffer, uint16_t bufmax)
@@ -309,7 +309,7 @@ static uint16_t afs_vnode_cache_get_aux(const void *cookie_netfs_data,
309} 309}
310 310
311/* 311/*
312 * check that the auxilliary data indicates that the entry is still valid 312 * check that the auxiliary data indicates that the entry is still valid
313 */ 313 */
314static enum fscache_checkaux afs_vnode_cache_check_aux(void *cookie_netfs_data, 314static enum fscache_checkaux afs_vnode_cache_check_aux(void *cookie_netfs_data,
315 const void *buffer, 315 const void *buffer,
diff --git a/fs/afs/cell.c b/fs/afs/cell.c
index 0d5eeadf6121..3c090b7555ea 100644
--- a/fs/afs/cell.c
+++ b/fs/afs/cell.c
@@ -293,7 +293,7 @@ struct afs_cell *afs_cell_lookup(const char *name, unsigned namesz,
293 if (!cell) { 293 if (!cell) {
294 /* this should not happen unless user tries to mount 294 /* this should not happen unless user tries to mount
295 * when root cell is not set. Return an impossibly 295 * when root cell is not set. Return an impossibly
296 * bizzare errno to alert the user. Things like 296 * bizarre errno to alert the user. Things like
297 * ENOENT might be "more appropriate" but they happen 297 * ENOENT might be "more appropriate" but they happen
298 * for other reasons. 298 * for other reasons.
299 */ 299 */
diff --git a/fs/attr.c b/fs/attr.c
index 1007ed616314..91dbe2a107f2 100644
--- a/fs/attr.c
+++ b/fs/attr.c
@@ -128,7 +128,7 @@ EXPORT_SYMBOL(inode_newsize_ok);
128 * setattr_copy must be called with i_mutex held. 128 * setattr_copy must be called with i_mutex held.
129 * 129 *
130 * setattr_copy updates the inode's metadata with that specified 130 * setattr_copy updates the inode's metadata with that specified
131 * in attr. Noticably missing is inode size update, which is more complex 131 * in attr. Noticeably missing is inode size update, which is more complex
132 * as it requires pagecache updates. 132 * as it requires pagecache updates.
133 * 133 *
134 * The inode is not marked as dirty after this operation. The rationale is 134 * The inode is not marked as dirty after this operation. The rationale is
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index 96804a17bbd0..f55ae23b137e 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -612,7 +612,7 @@ static int autofs4_dir_unlink(struct inode *dir, struct dentry *dentry)
612 * set the DMANAGED_AUTOMOUNT and DMANAGED_TRANSIT flags on the leaves 612 * set the DMANAGED_AUTOMOUNT and DMANAGED_TRANSIT flags on the leaves
613 * of the directory tree. There is no need to clear the automount flag 613 * of the directory tree. There is no need to clear the automount flag
614 * following a mount or restore it after an expire because these mounts 614 * following a mount or restore it after an expire because these mounts
615 * are always covered. However, it is neccessary to ensure that these 615 * are always covered. However, it is necessary to ensure that these
616 * flags are clear on non-empty directories to avoid unnecessary calls 616 * flags are clear on non-empty directories to avoid unnecessary calls
617 * during path walks. 617 * during path walks.
618 */ 618 */
diff --git a/fs/befs/ChangeLog b/fs/befs/ChangeLog
index ce8c787916be..75a461cfaca6 100644
--- a/fs/befs/ChangeLog
+++ b/fs/befs/ChangeLog
@@ -24,7 +24,7 @@ Version 0.9 (2002-03-14)
24 24
25Version 0.64 (2002-02-07) 25Version 0.64 (2002-02-07)
26========== 26==========
27* Did the string comparision really right this time (btree.c) [WD] 27* Did the string comparison really right this time (btree.c) [WD]
28 28
29* Fixed up some places where I assumed that a long int could hold 29* Fixed up some places where I assumed that a long int could hold
30 a pointer value. (btree.c) [WD] 30 a pointer value. (btree.c) [WD]
@@ -114,7 +114,7 @@ Version 0.6 (2001-12-15)
114 More flexible. Will soon be controllable at mount time 114 More flexible. Will soon be controllable at mount time
115 (see TODO). [WD] 115 (see TODO). [WD]
116 116
117* Rewrote datastream positon lookups. 117* Rewrote datastream position lookups.
118 (datastream.c) [WD] 118 (datastream.c) [WD]
119 119
120* Moved the TODO list to its own file. 120* Moved the TODO list to its own file.
@@ -150,7 +150,7 @@ Version 0.50 (2001-11-13)
150* Anton also told me that the blocksize is not allowed to be larger than 150* Anton also told me that the blocksize is not allowed to be larger than
151 the page size in linux, which is 4k i386. Oops. Added a test for 151 the page size in linux, which is 4k i386. Oops. Added a test for
152 (blocksize > PAGE_SIZE), and refuse to mount in that case. What this 152 (blocksize > PAGE_SIZE), and refuse to mount in that case. What this
153 practicaly means is that 8k blocksize volumes won't work without a major 153 practically means is that 8k blocksize volumes won't work without a major
154 restructuring of the driver (or an alpha or other 64bit hardware). [WD] 154 restructuring of the driver (or an alpha or other 64bit hardware). [WD]
155 155
156* Cleaned up the befs_count_blocks() function. Much smarter now. 156* Cleaned up the befs_count_blocks() function. Much smarter now.
@@ -183,7 +183,7 @@ Version 0.45 (2001-10-29)
183 structures into the generic pointer fields of the public structures 183 structures into the generic pointer fields of the public structures
184 with kmalloc(). put_super and put_inode free them. This allows us not 184 with kmalloc(). put_super and put_inode free them. This allows us not
185 to have to touch the definitions of the public structures in 185 to have to touch the definitions of the public structures in
186 include/linux/fs.h. Also, befs_inode_info is huge (becuase of the 186 include/linux/fs.h. Also, befs_inode_info is huge (because of the
187 symlink string). (super.c, inode.c, befs_fs.h) [WD] 187 symlink string). (super.c, inode.c, befs_fs.h) [WD]
188 188
189* Fixed a thinko that was corrupting file reads after the first block_run 189* Fixed a thinko that was corrupting file reads after the first block_run
@@ -404,7 +404,7 @@ Version 0.4 (2001-10-28)
404 404
405* Fixed compile errors on 2.4.1 kernel (WD) 405* Fixed compile errors on 2.4.1 kernel (WD)
406 Resolve rejected patches 406 Resolve rejected patches
407 Accomodate changed NLS interface (util.h) 407 Accommodate changed NLS interface (util.h)
408 Needed to include <linux/slab.h> in most files 408 Needed to include <linux/slab.h> in most files
409 Makefile changes 409 Makefile changes
410 fs/Config.in changes 410 fs/Config.in changes
diff --git a/fs/befs/befs_fs_types.h b/fs/befs/befs_fs_types.h
index 7893eaa1e58c..eb557d9dc8be 100644
--- a/fs/befs/befs_fs_types.h
+++ b/fs/befs/befs_fs_types.h
@@ -234,7 +234,7 @@ typedef struct {
234} PACKED befs_btree_super; 234} PACKED befs_btree_super;
235 235
236/* 236/*
237 * Header stucture of each btree node 237 * Header structure of each btree node
238 */ 238 */
239typedef struct { 239typedef struct {
240 fs64 left; 240 fs64 left;
diff --git a/fs/befs/btree.c b/fs/befs/btree.c
index 4202db7496cb..a66c9b1136e0 100644
--- a/fs/befs/btree.c
+++ b/fs/befs/btree.c
@@ -5,7 +5,7 @@
5 * 5 *
6 * Licensed under the GNU GPL. See the file COPYING for details. 6 * Licensed under the GNU GPL. See the file COPYING for details.
7 * 7 *
8 * 2002-02-05: Sergey S. Kostyliov added binary search withing 8 * 2002-02-05: Sergey S. Kostyliov added binary search within
9 * btree nodes. 9 * btree nodes.
10 * 10 *
11 * Many thanks to: 11 * Many thanks to:
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
index 06457ed8f3e7..54b8c28bebc8 100644
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@ -734,7 +734,7 @@ parse_options(char *options, befs_mount_options * opts)
734 734
735/* This function has the responsibiltiy of getting the 735/* This function has the responsibiltiy of getting the
736 * filesystem ready for unmounting. 736 * filesystem ready for unmounting.
737 * Basicly, we free everything that we allocated in 737 * Basically, we free everything that we allocated in
738 * befs_read_inode 738 * befs_read_inode
739 */ 739 */
740static void 740static void
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
index 811384bec8de..397d3057d336 100644
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
@@ -717,7 +717,7 @@ static int load_flat_file(struct linux_binprm * bprm,
717 * help simplify all this mumbo jumbo 717 * help simplify all this mumbo jumbo
718 * 718 *
719 * We've got two different sections of relocation entries. 719 * We've got two different sections of relocation entries.
720 * The first is the GOT which resides at the begining of the data segment 720 * The first is the GOT which resides at the beginning of the data segment
721 * and is terminated with a -1. This one can be relocated in place. 721 * and is terminated with a -1. This one can be relocated in place.
722 * The second is the extra relocation entries tacked after the image's 722 * The second is the extra relocation entries tacked after the image's
723 * data segment. These require a little more processing as the entry is 723 * data segment. These require a little more processing as the entry is
diff --git a/fs/bio.c b/fs/bio.c
index 4d6d4b6c2bf1..840a0d755248 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -1436,7 +1436,7 @@ EXPORT_SYMBOL(bio_flush_dcache_pages);
1436 * preferred way to end I/O on a bio, it takes care of clearing 1436 * preferred way to end I/O on a bio, it takes care of clearing
1437 * BIO_UPTODATE on error. @error is 0 on success, and and one of the 1437 * BIO_UPTODATE on error. @error is 0 on success, and and one of the
1438 * established -Exxxx (-EIO, for instance) error values in case 1438 * established -Exxxx (-EIO, for instance) error values in case
1439 * something went wrong. Noone should call bi_end_io() directly on a 1439 * something went wrong. No one should call bi_end_io() directly on a
1440 * bio unless they own it and thus know that it has an end_io 1440 * bio unless they own it and thus know that it has an end_io
1441 * function. 1441 * function.
1442 **/ 1442 **/
diff --git a/fs/block_dev.c b/fs/block_dev.c
index c1511c674f53..5147bdd3b8e1 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -653,7 +653,7 @@ void bd_forget(struct inode *inode)
653 * @whole: whole block device containing @bdev, may equal @bdev 653 * @whole: whole block device containing @bdev, may equal @bdev
654 * @holder: holder trying to claim @bdev 654 * @holder: holder trying to claim @bdev
655 * 655 *
656 * Test whther @bdev can be claimed by @holder. 656 * Test whether @bdev can be claimed by @holder.
657 * 657 *
658 * CONTEXT: 658 * CONTEXT:
659 * spin_lock(&bdev_lock). 659 * spin_lock(&bdev_lock).
diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c
index 2b6c12e983b3..a24a3f2fa13e 100644
--- a/fs/btrfs/extent_map.c
+++ b/fs/btrfs/extent_map.c
@@ -243,7 +243,7 @@ out:
243 * Insert @em into @tree or perform a simple forward/backward merge with 243 * Insert @em into @tree or perform a simple forward/backward merge with
244 * existing mappings. The extent_map struct passed in will be inserted 244 * existing mappings. The extent_map struct passed in will be inserted
245 * into the tree directly, with an additional reference taken, or a 245 * into the tree directly, with an additional reference taken, or a
246 * reference dropped if the merge attempt was successfull. 246 * reference dropped if the merge attempt was successful.
247 */ 247 */
248int add_extent_mapping(struct extent_map_tree *tree, 248int add_extent_mapping(struct extent_map_tree *tree,
249 struct extent_map *em) 249 struct extent_map *em)
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 65413394daef..5cc64ab9c485 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2321,7 +2321,7 @@ int btrfs_orphan_cleanup(struct btrfs_root *root)
2321 2321
2322 /* 2322 /*
2323 * if ret == 0 means we found what we were searching for, which 2323 * if ret == 0 means we found what we were searching for, which
2324 * is weird, but possible, so only screw with path if we didnt 2324 * is weird, but possible, so only screw with path if we didn't
2325 * find the key and see if we have stuff that matches 2325 * find the key and see if we have stuff that matches
2326 */ 2326 */
2327 if (ret > 0) { 2327 if (ret > 0) {
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 58250e09eb05..199a80134312 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -2346,7 +2346,7 @@ struct btrfs_root *select_one_root(struct btrfs_trans_handle *trans,
2346 root = next->root; 2346 root = next->root;
2347 BUG_ON(!root); 2347 BUG_ON(!root);
2348 2348
2349 /* no other choice for non-refernce counted tree */ 2349 /* no other choice for non-references counted tree */
2350 if (!root->ref_cows) 2350 if (!root->ref_cows)
2351 return root; 2351 return root;
2352 2352
diff --git a/fs/cachefiles/interface.c b/fs/cachefiles/interface.c
index 37fe101a4e0d..1064805e653b 100644
--- a/fs/cachefiles/interface.c
+++ b/fs/cachefiles/interface.c
@@ -197,7 +197,7 @@ struct fscache_object *cachefiles_grab_object(struct fscache_object *_object)
197} 197}
198 198
199/* 199/*
200 * update the auxilliary data for an object object on disk 200 * update the auxiliary data for an object object on disk
201 */ 201 */
202static void cachefiles_update_object(struct fscache_object *_object) 202static void cachefiles_update_object(struct fscache_object *_object)
203{ 203{
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index 37368ba2e67c..e159c529fd2b 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -24,7 +24,7 @@
24 * context needs to be associated with the osd write during writeback. 24 * context needs to be associated with the osd write during writeback.
25 * 25 *
26 * Similarly, struct ceph_inode_info maintains a set of counters to 26 * Similarly, struct ceph_inode_info maintains a set of counters to
27 * count dirty pages on the inode. In the absense of snapshots, 27 * count dirty pages on the inode. In the absence of snapshots,
28 * i_wrbuffer_ref == i_wrbuffer_ref_head == the dirty page count. 28 * i_wrbuffer_ref == i_wrbuffer_ref_head == the dirty page count.
29 * 29 *
30 * When a snapshot is taken (that is, when the client receives 30 * When a snapshot is taken (that is, when the client receives
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 6b61ded701e1..5323c330bbf3 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -765,7 +765,7 @@ int __ceph_caps_issued_mask(struct ceph_inode_info *ci, int mask, int touch)
765 if (touch) { 765 if (touch) {
766 struct rb_node *q; 766 struct rb_node *q;
767 767
768 /* touch this + preceeding caps */ 768 /* touch this + preceding caps */
769 __touch_cap(cap); 769 __touch_cap(cap);
770 for (q = rb_first(&ci->i_caps); q != p; 770 for (q = rb_first(&ci->i_caps); q != p;
771 q = rb_next(q)) { 771 q = rb_next(q)) {
diff --git a/fs/ceph/snap.c b/fs/ceph/snap.c
index 0aee66b92af3..e86ec1155f8f 100644
--- a/fs/ceph/snap.c
+++ b/fs/ceph/snap.c
@@ -342,7 +342,7 @@ static int build_snap_context(struct ceph_snap_realm *realm)
342 num = 0; 342 num = 0;
343 snapc->seq = realm->seq; 343 snapc->seq = realm->seq;
344 if (parent) { 344 if (parent) {
345 /* include any of parent's snaps occuring _after_ my 345 /* include any of parent's snaps occurring _after_ my
346 parent became my parent */ 346 parent became my parent */
347 for (i = 0; i < parent->cached_context->num_snaps; i++) 347 for (i = 0; i < parent->cached_context->num_snaps; i++)
348 if (parent->cached_context->snaps[i] >= 348 if (parent->cached_context->snaps[i] >=
diff --git a/fs/cifs/AUTHORS b/fs/cifs/AUTHORS
index 7f7fa3c302af..ea940b1db77b 100644
--- a/fs/cifs/AUTHORS
+++ b/fs/cifs/AUTHORS
@@ -35,7 +35,7 @@ Adrian Bunk (kcalloc cleanups)
35Miklos Szeredi 35Miklos Szeredi
36Kazeon team for various fixes especially for 2.4 version. 36Kazeon team for various fixes especially for 2.4 version.
37Asser Ferno (Change Notify support) 37Asser Ferno (Change Notify support)
38Shaggy (Dave Kleikamp) for inumerable small fs suggestions and some good cleanup 38Shaggy (Dave Kleikamp) for innumerable small fs suggestions and some good cleanup
39Gunter Kukkukk (testing and suggestions for support of old servers) 39Gunter Kukkukk (testing and suggestions for support of old servers)
40Igor Mammedov (DFS support) 40Igor Mammedov (DFS support)
41Jeff Layton (many, many fixes, as well as great work on the cifs Kerberos code) 41Jeff Layton (many, many fixes, as well as great work on the cifs Kerberos code)
diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c
index 0a265ad9e426..2b68ac57d97d 100644
--- a/fs/cifs/cifs_dfs_ref.c
+++ b/fs/cifs/cifs_dfs_ref.c
@@ -53,7 +53,7 @@ void cifs_dfs_release_automount_timer(void)
53 * 53 *
54 * Extracts sharename form full UNC. 54 * Extracts sharename form full UNC.
55 * i.e. strips from UNC trailing path that is not part of share 55 * i.e. strips from UNC trailing path that is not part of share
56 * name and fixup missing '\' in the begining of DFS node refferal 56 * name and fixup missing '\' in the beginning of DFS node refferal
57 * if necessary. 57 * if necessary.
58 * Returns pointer to share name on success or ERR_PTR on error. 58 * Returns pointer to share name on success or ERR_PTR on error.
59 * Caller is responsible for freeing returned string. 59 * Caller is responsible for freeing returned string.
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 904aa47e3515..2644a5d6cc67 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -5247,7 +5247,7 @@ cifs_fill_unix_set_info(FILE_UNIX_BASIC_INFO *data_offset,
5247 * Samba server ignores set of file size to zero due to bugs in some 5247 * Samba server ignores set of file size to zero due to bugs in some
5248 * older clients, but we should be precise - we use SetFileSize to 5248 * older clients, but we should be precise - we use SetFileSize to
5249 * set file size and do not want to truncate file size to zero 5249 * set file size and do not want to truncate file size to zero
5250 * accidently as happened on one Samba server beta by putting 5250 * accidentally as happened on one Samba server beta by putting
5251 * zero instead of -1 here 5251 * zero instead of -1 here
5252 */ 5252 */
5253 data_offset->EndOfFile = cpu_to_le64(NO_CHANGE_64); 5253 data_offset->EndOfFile = cpu_to_le64(NO_CHANGE_64);
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 8d6c17ab593d..6e2b2addfc78 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -1572,7 +1572,7 @@ match_security(struct TCP_Server_Info *server, struct smb_vol *vol)
1572 return false; 1572 return false;
1573 } 1573 }
1574 1574
1575 /* now check if signing mode is acceptible */ 1575 /* now check if signing mode is acceptable */
1576 if ((secFlags & CIFSSEC_MAY_SIGN) == 0 && 1576 if ((secFlags & CIFSSEC_MAY_SIGN) == 0 &&
1577 (server->secMode & SECMODE_SIGN_REQUIRED)) 1577 (server->secMode & SECMODE_SIGN_REQUIRED))
1578 return false; 1578 return false;
@@ -2933,7 +2933,7 @@ mount_fail_check:
2933 if (mount_data != mount_data_global) 2933 if (mount_data != mount_data_global)
2934 kfree(mount_data); 2934 kfree(mount_data);
2935 /* If find_unc succeeded then rc == 0 so we can not end */ 2935 /* If find_unc succeeded then rc == 0 so we can not end */
2936 /* up accidently freeing someone elses tcon struct */ 2936 /* up accidentally freeing someone elses tcon struct */
2937 if (tcon) 2937 if (tcon)
2938 cifs_put_tcon(tcon); 2938 cifs_put_tcon(tcon);
2939 else if (pSesInfo) 2939 else if (pSesInfo)
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index dd5f22918c33..9ea65cf36714 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -189,7 +189,7 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,
189 inode->i_sb, mode, oflags, &oplock, &fileHandle, xid); 189 inode->i_sb, mode, oflags, &oplock, &fileHandle, xid);
190 /* EIO could indicate that (posix open) operation is not 190 /* EIO could indicate that (posix open) operation is not
191 supported, despite what server claimed in capability 191 supported, despite what server claimed in capability
192 negotation. EREMOTE indicates DFS junction, which is not 192 negotiation. EREMOTE indicates DFS junction, which is not
193 handled in posix open */ 193 handled in posix open */
194 194
195 if (rc == 0) { 195 if (rc == 0) {
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index 90ff3cb10de3..3313dd19f543 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -990,7 +990,7 @@ static int configfs_dump(struct configfs_dirent *sd, int level)
990 * This describes these functions and their helpers. 990 * This describes these functions and their helpers.
991 * 991 *
992 * Allow another kernel system to depend on a config_item. If this 992 * Allow another kernel system to depend on a config_item. If this
993 * happens, the item cannot go away until the dependant can live without 993 * happens, the item cannot go away until the dependent can live without
994 * it. The idea is to give client modules as simple an interface as 994 * it. The idea is to give client modules as simple an interface as
995 * possible. When a system asks them to depend on an item, they just 995 * possible. When a system asks them to depend on an item, they just
996 * call configfs_depend_item(). If the item is live and the client 996 * call configfs_depend_item(). If the item is live and the client
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index 04b8c449303f..56d6bfcc1e48 100644
--- a/fs/dlm/lock.c
+++ b/fs/dlm/lock.c
@@ -519,7 +519,7 @@ static void toss_rsb(struct kref *kref)
519 } 519 }
520} 520}
521 521
522/* When all references to the rsb are gone it's transfered to 522/* When all references to the rsb are gone it's transferred to
523 the tossed list for later disposal. */ 523 the tossed list for later disposal. */
524 524
525static void put_rsb(struct dlm_rsb *r) 525static void put_rsb(struct dlm_rsb *r)
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index bffa1e73b9a9..5e2c71f05e46 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -810,7 +810,7 @@ static int tcp_accept_from_sock(struct connection *con)
810 810
811 /* 811 /*
812 * Add it to the active queue in case we got data 812 * Add it to the active queue in case we got data
813 * beween processing the accept adding the socket 813 * between processing the accept adding the socket
814 * to the read_sockets list 814 * to the read_sockets list
815 */ 815 */
816 if (!test_and_set_bit(CF_READ_PENDING, &addcon->flags)) 816 if (!test_and_set_bit(CF_READ_PENDING, &addcon->flags))
diff --git a/fs/dlm/recover.c b/fs/dlm/recover.c
index eda43f362616..14638235f7b2 100644
--- a/fs/dlm/recover.c
+++ b/fs/dlm/recover.c
@@ -304,7 +304,7 @@ static void set_master_lkbs(struct dlm_rsb *r)
304} 304}
305 305
306/* 306/*
307 * Propogate the new master nodeid to locks 307 * Propagate the new master nodeid to locks
308 * The NEW_MASTER flag tells dlm_recover_locks() which rsb's to consider. 308 * The NEW_MASTER flag tells dlm_recover_locks() which rsb's to consider.
309 * The NEW_MASTER2 flag tells recover_lvb() and set_locks_purged() which 309 * The NEW_MASTER2 flag tells recover_lvb() and set_locks_purged() which
310 * rsb's to consider. 310 * rsb's to consider.
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index c27c0ecf90bc..fdb2eb0ad09e 100644
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -276,7 +276,7 @@ static void ecryptfs_init_mount_crypt_stat(
276/** 276/**
277 * ecryptfs_parse_options 277 * ecryptfs_parse_options
278 * @sb: The ecryptfs super block 278 * @sb: The ecryptfs super block
279 * @options: The options pased to the kernel 279 * @options: The options passed to the kernel
280 * 280 *
281 * Parse mount options: 281 * Parse mount options:
282 * debug=N - ecryptfs_verbosity level for debug output 282 * debug=N - ecryptfs_verbosity level for debug output
@@ -840,7 +840,7 @@ static int __init ecryptfs_init(void)
840 } 840 }
841 rc = ecryptfs_init_messaging(); 841 rc = ecryptfs_init_messaging();
842 if (rc) { 842 if (rc) {
843 printk(KERN_ERR "Failure occured while attempting to " 843 printk(KERN_ERR "Failure occurred while attempting to "
844 "initialize the communications channel to " 844 "initialize the communications channel to "
845 "ecryptfsd\n"); 845 "ecryptfsd\n");
846 goto out_destroy_kthread; 846 goto out_destroy_kthread;
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index ed38801b57a7..f9cfd168fbe2 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -181,7 +181,7 @@ struct eventpoll {
181 181
182 /* 182 /*
183 * This is a single linked list that chains all the "struct epitem" that 183 * This is a single linked list that chains all the "struct epitem" that
184 * happened while transfering ready events to userspace w/out 184 * happened while transferring ready events to userspace w/out
185 * holding ->lock. 185 * holding ->lock.
186 */ 186 */
187 struct epitem *ovflist; 187 struct epitem *ovflist;
@@ -606,7 +606,7 @@ static void ep_free(struct eventpoll *ep)
606 * We do not need to hold "ep->mtx" here because the epoll file 606 * We do not need to hold "ep->mtx" here because the epoll file
607 * is on the way to be removed and no one has references to it 607 * is on the way to be removed and no one has references to it
608 * anymore. The only hit might come from eventpoll_release_file() but 608 * anymore. The only hit might come from eventpoll_release_file() but
609 * holding "epmutex" is sufficent here. 609 * holding "epmutex" is sufficient here.
610 */ 610 */
611 mutex_lock(&epmutex); 611 mutex_lock(&epmutex);
612 612
@@ -720,7 +720,7 @@ void eventpoll_release_file(struct file *file)
720 /* 720 /*
721 * We don't want to get "file->f_lock" because it is not 721 * We don't want to get "file->f_lock" because it is not
722 * necessary. It is not necessary because we're in the "struct file" 722 * necessary. It is not necessary because we're in the "struct file"
723 * cleanup path, and this means that noone is using this file anymore. 723 * cleanup path, and this means that no one is using this file anymore.
724 * So, for example, epoll_ctl() cannot hit here since if we reach this 724 * So, for example, epoll_ctl() cannot hit here since if we reach this
725 * point, the file counter already went to zero and fget() would fail. 725 * point, the file counter already went to zero and fget() would fail.
726 * The only hit might come from ep_free() but by holding the mutex 726 * The only hit might come from ep_free() but by holding the mutex
@@ -1112,7 +1112,7 @@ static int ep_send_events_proc(struct eventpoll *ep, struct list_head *head,
1112 * Trigger mode, we need to insert back inside 1112 * Trigger mode, we need to insert back inside
1113 * the ready list, so that the next call to 1113 * the ready list, so that the next call to
1114 * epoll_wait() will check again the events 1114 * epoll_wait() will check again the events
1115 * availability. At this point, noone can insert 1115 * availability. At this point, no one can insert
1116 * into ep->rdllist besides us. The epoll_ctl() 1116 * into ep->rdllist besides us. The epoll_ctl()
1117 * callers are locked out by 1117 * callers are locked out by
1118 * ep_scan_ready_list() holding "mtx" and the 1118 * ep_scan_ready_list() holding "mtx" and the
diff --git a/fs/exofs/common.h b/fs/exofs/common.h
index 5e74ad3d4009..3bbd46956d77 100644
--- a/fs/exofs/common.h
+++ b/fs/exofs/common.h
@@ -115,7 +115,7 @@ struct exofs_sb_stats {
115 * Describes the raid used in the FS. It is part of the device table. 115 * Describes the raid used in the FS. It is part of the device table.
116 * This here is taken from the pNFS-objects definition. In exofs we 116 * This here is taken from the pNFS-objects definition. In exofs we
117 * use one raid policy through-out the filesystem. (NOTE: the funny 117 * use one raid policy through-out the filesystem. (NOTE: the funny
118 * alignment at begining. We take care of it at exofs_device_table. 118 * alignment at beginning. We take care of it at exofs_device_table.
119 */ 119 */
120struct exofs_dt_data_map { 120struct exofs_dt_data_map {
121 __le32 cb_num_comps; 121 __le32 cb_num_comps;
@@ -136,7 +136,7 @@ struct exofs_dt_device_info {
136 u8 systemid[OSD_SYSTEMID_LEN]; 136 u8 systemid[OSD_SYSTEMID_LEN];
137 __le64 long_name_offset; /* If !0 then offset-in-file */ 137 __le64 long_name_offset; /* If !0 then offset-in-file */
138 __le32 osdname_len; /* */ 138 __le32 osdname_len; /* */
139 u8 osdname[44]; /* Embbeded, Ususally an asci uuid */ 139 u8 osdname[44]; /* Embbeded, Usually an asci uuid */
140} __packed; 140} __packed;
141 141
142/* 142/*
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index 0d06f4e75699..8f44cef1b3ef 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -850,7 +850,7 @@ static int find_next_reservable_window(
850 rsv_window_remove(sb, my_rsv); 850 rsv_window_remove(sb, my_rsv);
851 851
852 /* 852 /*
853 * Let's book the whole avaliable window for now. We will check the 853 * Let's book the whole available window for now. We will check the
854 * disk bitmap later and then, if there are free blocks then we adjust 854 * disk bitmap later and then, if there are free blocks then we adjust
855 * the window size if it's larger than requested. 855 * the window size if it's larger than requested.
856 * Otherwise, we will remove this node from the tree next time 856 * Otherwise, we will remove this node from the tree next time
@@ -1357,9 +1357,9 @@ retry_alloc:
1357 goto allocated; 1357 goto allocated;
1358 } 1358 }
1359 /* 1359 /*
1360 * We may end up a bogus ealier ENOSPC error due to 1360 * We may end up a bogus earlier ENOSPC error due to
1361 * filesystem is "full" of reservations, but 1361 * filesystem is "full" of reservations, but
1362 * there maybe indeed free blocks avaliable on disk 1362 * there maybe indeed free blocks available on disk
1363 * In this case, we just forget about the reservations 1363 * In this case, we just forget about the reservations
1364 * just do block allocation as without reservations. 1364 * just do block allocation as without reservations.
1365 */ 1365 */
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index c47f706878b5..788e09a07f7e 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -305,7 +305,7 @@ static ext2_fsblk_t ext2_find_near(struct inode *inode, Indirect *ind)
305 return ind->bh->b_blocknr; 305 return ind->bh->b_blocknr;
306 306
307 /* 307 /*
308 * It is going to be refered from inode itself? OK, just put it into 308 * It is going to be referred from inode itself? OK, just put it into
309 * the same cylinder group then. 309 * the same cylinder group then.
310 */ 310 */
311 bg_start = ext2_group_first_block_no(inode->i_sb, ei->i_block_group); 311 bg_start = ext2_group_first_block_no(inode->i_sb, ei->i_block_group);
@@ -913,7 +913,7 @@ static inline int all_zeroes(__le32 *p, __le32 *q)
913 * 913 *
914 * When we do truncate() we may have to clean the ends of several indirect 914 * When we do truncate() we may have to clean the ends of several indirect
915 * blocks but leave the blocks themselves alive. Block is partially 915 * blocks but leave the blocks themselves alive. Block is partially
916 * truncated if some data below the new i_size is refered from it (and 916 * truncated if some data below the new i_size is referred from it (and
917 * it is on the path to the first completely truncated data block, indeed). 917 * it is on the path to the first completely truncated data block, indeed).
918 * We have to free the top of that path along with everything to the right 918 * We have to free the top of that path along with everything to the right
919 * of the path. Since no allocation past the truncation point is possible 919 * of the path. Since no allocation past the truncation point is possible
@@ -990,7 +990,7 @@ no_top:
990 * @p: array of block numbers 990 * @p: array of block numbers
991 * @q: points immediately past the end of array 991 * @q: points immediately past the end of array
992 * 992 *
993 * We are freeing all blocks refered from that array (numbers are 993 * We are freeing all blocks referred from that array (numbers are
994 * stored as little-endian 32-bit) and updating @inode->i_blocks 994 * stored as little-endian 32-bit) and updating @inode->i_blocks
995 * appropriately. 995 * appropriately.
996 */ 996 */
@@ -1030,7 +1030,7 @@ static inline void ext2_free_data(struct inode *inode, __le32 *p, __le32 *q)
1030 * @q: pointer immediately past the end of array 1030 * @q: pointer immediately past the end of array
1031 * @depth: depth of the branches to free 1031 * @depth: depth of the branches to free
1032 * 1032 *
1033 * We are freeing all blocks refered from these branches (numbers are 1033 * We are freeing all blocks referred from these branches (numbers are
1034 * stored as little-endian 32-bit) and updating @inode->i_blocks 1034 * stored as little-endian 32-bit) and updating @inode->i_blocks
1035 * appropriately. 1035 * appropriately.
1036 */ 1036 */
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 7731695e65d9..0a78dae7e2cb 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -1382,7 +1382,7 @@ static struct dentry *ext2_mount(struct file_system_type *fs_type,
1382 1382
1383/* Read data from quotafile - avoid pagecache and such because we cannot afford 1383/* Read data from quotafile - avoid pagecache and such because we cannot afford
1384 * acquiring the locks... As quota files are never truncated and quota code 1384 * acquiring the locks... As quota files are never truncated and quota code
1385 * itself serializes the operations (and noone else should touch the files) 1385 * itself serializes the operations (and no one else should touch the files)
1386 * we don't have to be afraid of races */ 1386 * we don't have to be afraid of races */
1387static ssize_t ext2_quota_read(struct super_block *sb, int type, char *data, 1387static ssize_t ext2_quota_read(struct super_block *sb, int type, char *data,
1388 size_t len, loff_t off) 1388 size_t len, loff_t off)
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index c2e4dce984d2..529970617a21 100644
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -35,7 +35,7 @@
35 * +------------------+ 35 * +------------------+
36 * 36 *
37 * The block header is followed by multiple entry descriptors. These entry 37 * The block header is followed by multiple entry descriptors. These entry
38 * descriptors are variable in size, and alligned to EXT2_XATTR_PAD 38 * descriptors are variable in size, and aligned to EXT2_XATTR_PAD
39 * byte boundaries. The entry descriptors are sorted by attribute name, 39 * byte boundaries. The entry descriptors are sorted by attribute name,
40 * so that two extended attribute blocks can be compared efficiently. 40 * so that two extended attribute blocks can be compared efficiently.
41 * 41 *
diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
index 153242187fce..fe52297e31ad 100644
--- a/fs/ext3/balloc.c
+++ b/fs/ext3/balloc.c
@@ -590,7 +590,7 @@ do_more:
590 BUFFER_TRACE(debug_bh, "Deleted!"); 590 BUFFER_TRACE(debug_bh, "Deleted!");
591 if (!bh2jh(bitmap_bh)->b_committed_data) 591 if (!bh2jh(bitmap_bh)->b_committed_data)
592 BUFFER_TRACE(debug_bh, 592 BUFFER_TRACE(debug_bh,
593 "No commited data in bitmap"); 593 "No committed data in bitmap");
594 BUFFER_TRACE2(debug_bh, bitmap_bh, "bitmap"); 594 BUFFER_TRACE2(debug_bh, bitmap_bh, "bitmap");
595 __brelse(debug_bh); 595 __brelse(debug_bh);
596 } 596 }
@@ -1063,7 +1063,7 @@ static int find_next_reservable_window(
1063 rsv_window_remove(sb, my_rsv); 1063 rsv_window_remove(sb, my_rsv);
1064 1064
1065 /* 1065 /*
1066 * Let's book the whole avaliable window for now. We will check the 1066 * Let's book the whole available window for now. We will check the
1067 * disk bitmap later and then, if there are free blocks then we adjust 1067 * disk bitmap later and then, if there are free blocks then we adjust
1068 * the window size if it's larger than requested. 1068 * the window size if it's larger than requested.
1069 * Otherwise, we will remove this node from the tree next time 1069 * Otherwise, we will remove this node from the tree next time
@@ -1456,7 +1456,7 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi)
1456 * 1456 *
1457 * ext3_should_retry_alloc() is called when ENOSPC is returned, and if 1457 * ext3_should_retry_alloc() is called when ENOSPC is returned, and if
1458 * it is profitable to retry the operation, this function will wait 1458 * it is profitable to retry the operation, this function will wait
1459 * for the current or commiting transaction to complete, and then 1459 * for the current or committing transaction to complete, and then
1460 * return TRUE. 1460 * return TRUE.
1461 * 1461 *
1462 * if the total number of retries exceed three times, return FALSE. 1462 * if the total number of retries exceed three times, return FALSE.
@@ -1632,9 +1632,9 @@ retry_alloc:
1632 goto allocated; 1632 goto allocated;
1633 } 1633 }
1634 /* 1634 /*
1635 * We may end up a bogus ealier ENOSPC error due to 1635 * We may end up a bogus earlier ENOSPC error due to
1636 * filesystem is "full" of reservations, but 1636 * filesystem is "full" of reservations, but
1637 * there maybe indeed free blocks avaliable on disk 1637 * there maybe indeed free blocks available on disk
1638 * In this case, we just forget about the reservations 1638 * In this case, we just forget about the reservations
1639 * just do block allocation as without reservations. 1639 * just do block allocation as without reservations.
1640 */ 1640 */
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index fe2541d250e4..b5c2f3c97d71 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -2055,7 +2055,7 @@ static inline int all_zeroes(__le32 *p, __le32 *q)
2055 * 2055 *
2056 * When we do truncate() we may have to clean the ends of several 2056 * When we do truncate() we may have to clean the ends of several
2057 * indirect blocks but leave the blocks themselves alive. Block is 2057 * indirect blocks but leave the blocks themselves alive. Block is
2058 * partially truncated if some data below the new i_size is refered 2058 * partially truncated if some data below the new i_size is referred
2059 * from it (and it is on the path to the first completely truncated 2059 * from it (and it is on the path to the first completely truncated
2060 * data block, indeed). We have to free the top of that path along 2060 * data block, indeed). We have to free the top of that path along
2061 * with everything to the right of the path. Since no allocation 2061 * with everything to the right of the path. Since no allocation
@@ -2184,7 +2184,7 @@ static void ext3_clear_blocks(handle_t *handle, struct inode *inode,
2184 * @first: array of block numbers 2184 * @first: array of block numbers
2185 * @last: points immediately past the end of array 2185 * @last: points immediately past the end of array
2186 * 2186 *
2187 * We are freeing all blocks refered from that array (numbers are stored as 2187 * We are freeing all blocks referred from that array (numbers are stored as
2188 * little-endian 32-bit) and updating @inode->i_blocks appropriately. 2188 * little-endian 32-bit) and updating @inode->i_blocks appropriately.
2189 * 2189 *
2190 * We accumulate contiguous runs of blocks to free. Conveniently, if these 2190 * We accumulate contiguous runs of blocks to free. Conveniently, if these
@@ -2272,7 +2272,7 @@ static void ext3_free_data(handle_t *handle, struct inode *inode,
2272 * @last: pointer immediately past the end of array 2272 * @last: pointer immediately past the end of array
2273 * @depth: depth of the branches to free 2273 * @depth: depth of the branches to free
2274 * 2274 *
2275 * We are freeing all blocks refered from these branches (numbers are 2275 * We are freeing all blocks referred from these branches (numbers are
2276 * stored as little-endian 32-bit) and updating @inode->i_blocks 2276 * stored as little-endian 32-bit) and updating @inode->i_blocks
2277 * appropriately. 2277 * appropriately.
2278 */ 2278 */
diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c
index 108b142e11ed..7916e4ce166a 100644
--- a/fs/ext3/resize.c
+++ b/fs/ext3/resize.c
@@ -1009,7 +1009,7 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
1009 1009
1010 if (test_opt(sb, DEBUG)) 1010 if (test_opt(sb, DEBUG))
1011 printk(KERN_DEBUG "EXT3-fs: extending last group from "E3FSBLK 1011 printk(KERN_DEBUG "EXT3-fs: extending last group from "E3FSBLK
1012 " upto "E3FSBLK" blocks\n", 1012 " up to "E3FSBLK" blocks\n",
1013 o_blocks_count, n_blocks_count); 1013 o_blocks_count, n_blocks_count);
1014 1014
1015 if (n_blocks_count == 0 || n_blocks_count == o_blocks_count) 1015 if (n_blocks_count == 0 || n_blocks_count == o_blocks_count)
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 071689f86e18..3c6a9e0eadc1 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -2925,7 +2925,7 @@ static int ext3_quota_on(struct super_block *sb, int type, int format_id,
2925 2925
2926/* Read data from quotafile - avoid pagecache and such because we cannot afford 2926/* Read data from quotafile - avoid pagecache and such because we cannot afford
2927 * acquiring the locks... As quota files are never truncated and quota code 2927 * acquiring the locks... As quota files are never truncated and quota code
2928 * itself serializes the operations (and noone else should touch the files) 2928 * itself serializes the operations (and no one else should touch the files)
2929 * we don't have to be afraid of races */ 2929 * we don't have to be afraid of races */
2930static ssize_t ext3_quota_read(struct super_block *sb, int type, char *data, 2930static ssize_t ext3_quota_read(struct super_block *sb, int type, char *data,
2931 size_t len, loff_t off) 2931 size_t len, loff_t off)
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index 97b970e7dd13..1c67139ad4b4 100644
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -547,7 +547,7 @@ int ext4_claim_free_blocks(struct ext4_sb_info *sbi,
547 * 547 *
548 * ext4_should_retry_alloc() is called when ENOSPC is returned, and if 548 * ext4_should_retry_alloc() is called when ENOSPC is returned, and if
549 * it is profitable to retry the operation, this function will wait 549 * it is profitable to retry the operation, this function will wait
550 * for the current or commiting transaction to complete, and then 550 * for the current or committing transaction to complete, and then
551 * return TRUE. 551 * return TRUE.
552 * 552 *
553 * if the total number of retries exceed three times, return FALSE. 553 * if the total number of retries exceed three times, return FALSE.
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index dd2cb5076ff9..4890d6f3ad15 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -1729,7 +1729,7 @@ repeat:
1729 BUG_ON(npath->p_depth != path->p_depth); 1729 BUG_ON(npath->p_depth != path->p_depth);
1730 eh = npath[depth].p_hdr; 1730 eh = npath[depth].p_hdr;
1731 if (le16_to_cpu(eh->eh_entries) < le16_to_cpu(eh->eh_max)) { 1731 if (le16_to_cpu(eh->eh_entries) < le16_to_cpu(eh->eh_max)) {
1732 ext_debug("next leaf isnt full(%d)\n", 1732 ext_debug("next leaf isn't full(%d)\n",
1733 le16_to_cpu(eh->eh_entries)); 1733 le16_to_cpu(eh->eh_entries));
1734 path = npath; 1734 path = npath;
1735 goto repeat; 1735 goto repeat;
@@ -2533,7 +2533,7 @@ static int ext4_ext_zeroout(struct inode *inode, struct ext4_extent *ex)
2533/* 2533/*
2534 * This function is called by ext4_ext_map_blocks() if someone tries to write 2534 * This function is called by ext4_ext_map_blocks() if someone tries to write
2535 * to an uninitialized extent. It may result in splitting the uninitialized 2535 * to an uninitialized extent. It may result in splitting the uninitialized
2536 * extent into multiple extents (upto three - one initialized and two 2536 * extent into multiple extents (up to three - one initialized and two
2537 * uninitialized). 2537 * uninitialized).
2538 * There are three possibilities: 2538 * There are three possibilities:
2539 * a> There is no split required: Entire extent should be initialized 2539 * a> There is no split required: Entire extent should be initialized
@@ -3174,7 +3174,7 @@ ext4_ext_handle_uninitialized_extents(handle_t *handle, struct inode *inode,
3174 path, flags); 3174 path, flags);
3175 /* 3175 /*
3176 * Flag the inode(non aio case) or end_io struct (aio case) 3176 * Flag the inode(non aio case) or end_io struct (aio case)
3177 * that this IO needs to convertion to written when IO is 3177 * that this IO needs to conversion to written when IO is
3178 * completed 3178 * completed
3179 */ 3179 */
3180 if (io && !(io->flag & EXT4_IO_END_UNWRITTEN)) { 3180 if (io && !(io->flag & EXT4_IO_END_UNWRITTEN)) {
@@ -3460,10 +3460,10 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,
3460 ext4_ext_mark_uninitialized(&newex); 3460 ext4_ext_mark_uninitialized(&newex);
3461 /* 3461 /*
3462 * io_end structure was created for every IO write to an 3462 * io_end structure was created for every IO write to an
3463 * uninitialized extent. To avoid unecessary conversion, 3463 * uninitialized extent. To avoid unnecessary conversion,
3464 * here we flag the IO that really needs the conversion. 3464 * here we flag the IO that really needs the conversion.
3465 * For non asycn direct IO case, flag the inode state 3465 * For non asycn direct IO case, flag the inode state
3466 * that we need to perform convertion when IO is done. 3466 * that we need to perform conversion when IO is done.
3467 */ 3467 */
3468 if ((flags & EXT4_GET_BLOCKS_PRE_IO)) { 3468 if ((flags & EXT4_GET_BLOCKS_PRE_IO)) {
3469 if (io && !(io->flag & EXT4_IO_END_UNWRITTEN)) { 3469 if (io && !(io->flag & EXT4_IO_END_UNWRITTEN)) {
diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c
index 7f74019d6d77..4673bc05274f 100644
--- a/fs/ext4/fsync.c
+++ b/fs/ext4/fsync.c
@@ -101,7 +101,7 @@ extern int ext4_flush_completed_IO(struct inode *inode)
101 * to the work-to-be schedule is freed. 101 * to the work-to-be schedule is freed.
102 * 102 *
103 * Thus we need to keep the io structure still valid here after 103 * Thus we need to keep the io structure still valid here after
104 * convertion finished. The io structure has a flag to 104 * conversion finished. The io structure has a flag to
105 * avoid double converting from both fsync and background work 105 * avoid double converting from both fsync and background work
106 * queue work. 106 * queue work.
107 */ 107 */
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 1a86282b9024..ad8e303c0d29 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -2588,7 +2588,7 @@ static void ext4_end_io_buffer_write(struct buffer_head *bh, int uptodate);
2588 * because we should have holes filled from ext4_page_mkwrite(). We even don't 2588 * because we should have holes filled from ext4_page_mkwrite(). We even don't
2589 * need to file the inode to the transaction's list in ordered mode because if 2589 * need to file the inode to the transaction's list in ordered mode because if
2590 * we are writing back data added by write(), the inode is already there and if 2590 * we are writing back data added by write(), the inode is already there and if
2591 * we are writing back data modified via mmap(), noone guarantees in which 2591 * we are writing back data modified via mmap(), no one guarantees in which
2592 * transaction the data will hit the disk. In case we are journaling data, we 2592 * transaction the data will hit the disk. In case we are journaling data, we
2593 * cannot start transaction directly because transaction start ranks above page 2593 * cannot start transaction directly because transaction start ranks above page
2594 * lock so we have to do some magic. 2594 * lock so we have to do some magic.
@@ -2690,7 +2690,7 @@ static int ext4_writepage(struct page *page,
2690 2690
2691/* 2691/*
2692 * This is called via ext4_da_writepages() to 2692 * This is called via ext4_da_writepages() to
2693 * calulate the total number of credits to reserve to fit 2693 * calculate the total number of credits to reserve to fit
2694 * a single extent allocation into a single transaction, 2694 * a single extent allocation into a single transaction,
2695 * ext4_da_writpeages() will loop calling this before 2695 * ext4_da_writpeages() will loop calling this before
2696 * the block allocation. 2696 * the block allocation.
@@ -3304,7 +3304,7 @@ int ext4_alloc_da_blocks(struct inode *inode)
3304 * the pages by calling redirty_page_for_writepage() but that 3304 * the pages by calling redirty_page_for_writepage() but that
3305 * would be ugly in the extreme. So instead we would need to 3305 * would be ugly in the extreme. So instead we would need to
3306 * replicate parts of the code in the above functions, 3306 * replicate parts of the code in the above functions,
3307 * simplifying them becuase we wouldn't actually intend to 3307 * simplifying them because we wouldn't actually intend to
3308 * write out the pages, but rather only collect contiguous 3308 * write out the pages, but rather only collect contiguous
3309 * logical block extents, call the multi-block allocator, and 3309 * logical block extents, call the multi-block allocator, and
3310 * then update the buffer heads with the block allocations. 3310 * then update the buffer heads with the block allocations.
@@ -3694,7 +3694,7 @@ retry:
3694 * 3694 *
3695 * The unwrritten extents will be converted to written when DIO is completed. 3695 * The unwrritten extents will be converted to written when DIO is completed.
3696 * For async direct IO, since the IO may still pending when return, we 3696 * For async direct IO, since the IO may still pending when return, we
3697 * set up an end_io call back function, which will do the convertion 3697 * set up an end_io call back function, which will do the conversion
3698 * when async direct IO completed. 3698 * when async direct IO completed.
3699 * 3699 *
3700 * If the O_DIRECT write will extend the file then add this inode to the 3700 * If the O_DIRECT write will extend the file then add this inode to the
@@ -3717,7 +3717,7 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb,
3717 * We could direct write to holes and fallocate. 3717 * We could direct write to holes and fallocate.
3718 * 3718 *
3719 * Allocated blocks to fill the hole are marked as uninitialized 3719 * Allocated blocks to fill the hole are marked as uninitialized
3720 * to prevent paralel buffered read to expose the stale data 3720 * to prevent parallel buffered read to expose the stale data
3721 * before DIO complete the data IO. 3721 * before DIO complete the data IO.
3722 * 3722 *
3723 * As to previously fallocated extents, ext4 get_block 3723 * As to previously fallocated extents, ext4 get_block
@@ -3778,7 +3778,7 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb,
3778 int err; 3778 int err;
3779 /* 3779 /*
3780 * for non AIO case, since the IO is already 3780 * for non AIO case, since the IO is already
3781 * completed, we could do the convertion right here 3781 * completed, we could do the conversion right here
3782 */ 3782 */
3783 err = ext4_convert_unwritten_extents(inode, 3783 err = ext4_convert_unwritten_extents(inode,
3784 offset, ret); 3784 offset, ret);
@@ -4025,7 +4025,7 @@ static inline int all_zeroes(__le32 *p, __le32 *q)
4025 * 4025 *
4026 * When we do truncate() we may have to clean the ends of several 4026 * When we do truncate() we may have to clean the ends of several
4027 * indirect blocks but leave the blocks themselves alive. Block is 4027 * indirect blocks but leave the blocks themselves alive. Block is
4028 * partially truncated if some data below the new i_size is refered 4028 * partially truncated if some data below the new i_size is referred
4029 * from it (and it is on the path to the first completely truncated 4029 * from it (and it is on the path to the first completely truncated
4030 * data block, indeed). We have to free the top of that path along 4030 * data block, indeed). We have to free the top of that path along
4031 * with everything to the right of the path. Since no allocation 4031 * with everything to the right of the path. Since no allocation
@@ -4169,7 +4169,7 @@ out_err:
4169 * @first: array of block numbers 4169 * @first: array of block numbers
4170 * @last: points immediately past the end of array 4170 * @last: points immediately past the end of array
4171 * 4171 *
4172 * We are freeing all blocks refered from that array (numbers are stored as 4172 * We are freeing all blocks referred from that array (numbers are stored as
4173 * little-endian 32-bit) and updating @inode->i_blocks appropriately. 4173 * little-endian 32-bit) and updating @inode->i_blocks appropriately.
4174 * 4174 *
4175 * We accumulate contiguous runs of blocks to free. Conveniently, if these 4175 * We accumulate contiguous runs of blocks to free. Conveniently, if these
@@ -4261,7 +4261,7 @@ static void ext4_free_data(handle_t *handle, struct inode *inode,
4261 * @last: pointer immediately past the end of array 4261 * @last: pointer immediately past the end of array
4262 * @depth: depth of the branches to free 4262 * @depth: depth of the branches to free
4263 * 4263 *
4264 * We are freeing all blocks refered from these branches (numbers are 4264 * We are freeing all blocks referred from these branches (numbers are
4265 * stored as little-endian 32-bit) and updating @inode->i_blocks 4265 * stored as little-endian 32-bit) and updating @inode->i_blocks
4266 * appropriately. 4266 * appropriately.
4267 */ 4267 */
@@ -5478,7 +5478,7 @@ static int ext4_meta_trans_blocks(struct inode *inode, int nrblocks, int chunk)
5478} 5478}
5479 5479
5480/* 5480/*
5481 * Calulate the total number of credits to reserve to fit 5481 * Calculate the total number of credits to reserve to fit
5482 * the modification of a single pages into a single transaction, 5482 * the modification of a single pages into a single transaction,
5483 * which may include multiple chunks of block allocations. 5483 * which may include multiple chunks of block allocations.
5484 * 5484 *
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index a5837a837a8b..d8a16eecf1d5 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -92,7 +92,7 @@
92 * between CPUs. It is possible to get scheduled at this point. 92 * between CPUs. It is possible to get scheduled at this point.
93 * 93 *
94 * The locality group prealloc space is used looking at whether we have 94 * The locality group prealloc space is used looking at whether we have
95 * enough free space (pa_free) withing the prealloc space. 95 * enough free space (pa_free) within the prealloc space.
96 * 96 *
97 * If we can't allocate blocks via inode prealloc or/and locality group 97 * If we can't allocate blocks via inode prealloc or/and locality group
98 * prealloc then we look at the buddy cache. The buddy cache is represented 98 * prealloc then we look at the buddy cache. The buddy cache is represented
diff --git a/fs/ext4/migrate.c b/fs/ext4/migrate.c
index d1bafa57f483..92816b4e0f16 100644
--- a/fs/ext4/migrate.c
+++ b/fs/ext4/migrate.c
@@ -517,7 +517,7 @@ int ext4_ext_migrate(struct inode *inode)
517 * start with one credit accounted for 517 * start with one credit accounted for
518 * superblock modification. 518 * superblock modification.
519 * 519 *
520 * For the tmp_inode we already have commited the 520 * For the tmp_inode we already have committed the
521 * trascation that created the inode. Later as and 521 * trascation that created the inode. Later as and
522 * when we add extents we extent the journal 522 * when we add extents we extent the journal
523 */ 523 */
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 22546ad7f0ae..056474b7b8e0 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -617,7 +617,7 @@ __acquires(bitlock)
617 * filesystem will have already been marked read/only and the 617 * filesystem will have already been marked read/only and the
618 * journal has been aborted. We return 1 as a hint to callers 618 * journal has been aborted. We return 1 as a hint to callers
619 * who might what to use the return value from 619 * who might what to use the return value from
620 * ext4_grp_locked_error() to distinguish beween the 620 * ext4_grp_locked_error() to distinguish between the
621 * ERRORS_CONT and ERRORS_RO case, and perhaps return more 621 * ERRORS_CONT and ERRORS_RO case, and perhaps return more
622 * aggressively from the ext4 function in question, with a 622 * aggressively from the ext4 function in question, with a
623 * more appropriate error code. 623 * more appropriate error code.
@@ -4624,7 +4624,7 @@ static int ext4_quota_off(struct super_block *sb, int type)
4624 4624
4625/* Read data from quotafile - avoid pagecache and such because we cannot afford 4625/* Read data from quotafile - avoid pagecache and such because we cannot afford
4626 * acquiring the locks... As quota files are never truncated and quota code 4626 * acquiring the locks... As quota files are never truncated and quota code
4627 * itself serializes the operations (and noone else should touch the files) 4627 * itself serializes the operations (and no one else should touch the files)
4628 * we don't have to be afraid of races */ 4628 * we don't have to be afraid of races */
4629static ssize_t ext4_quota_read(struct super_block *sb, int type, char *data, 4629static ssize_t ext4_quota_read(struct super_block *sb, int type, char *data,
4630 size_t len, loff_t off) 4630 size_t len, loff_t off)
diff --git a/fs/freevxfs/vxfs_fshead.c b/fs/freevxfs/vxfs_fshead.c
index 78948b4b1894..c9a6a94e58e9 100644
--- a/fs/freevxfs/vxfs_fshead.c
+++ b/fs/freevxfs/vxfs_fshead.c
@@ -164,7 +164,7 @@ vxfs_read_fshead(struct super_block *sbp)
164 goto out_free_pfp; 164 goto out_free_pfp;
165 } 165 }
166 if (!VXFS_ISILT(VXFS_INO(infp->vsi_stilist))) { 166 if (!VXFS_ISILT(VXFS_INO(infp->vsi_stilist))) {
167 printk(KERN_ERR "vxfs: structual list inode is of wrong type (%x)\n", 167 printk(KERN_ERR "vxfs: structural list inode is of wrong type (%x)\n",
168 VXFS_INO(infp->vsi_stilist)->vii_mode & VXFS_TYPE_MASK); 168 VXFS_INO(infp->vsi_stilist)->vii_mode & VXFS_TYPE_MASK);
169 goto out_iput_stilist; 169 goto out_iput_stilist;
170 } 170 }
diff --git a/fs/freevxfs/vxfs_lookup.c b/fs/freevxfs/vxfs_lookup.c
index 6c5131d592f0..3360f1e678ad 100644
--- a/fs/freevxfs/vxfs_lookup.c
+++ b/fs/freevxfs/vxfs_lookup.c
@@ -162,7 +162,7 @@ vxfs_find_entry(struct inode *ip, struct dentry *dp, struct page **ppp)
162/** 162/**
163 * vxfs_inode_by_name - find inode number for dentry 163 * vxfs_inode_by_name - find inode number for dentry
164 * @dip: directory to search in 164 * @dip: directory to search in
165 * @dp: dentry we seach for 165 * @dp: dentry we search for
166 * 166 *
167 * Description: 167 * Description:
168 * vxfs_inode_by_name finds out the inode number of 168 * vxfs_inode_by_name finds out the inode number of
diff --git a/fs/freevxfs/vxfs_olt.h b/fs/freevxfs/vxfs_olt.h
index d8324296486f..b7b3af502615 100644
--- a/fs/freevxfs/vxfs_olt.h
+++ b/fs/freevxfs/vxfs_olt.h
@@ -60,7 +60,7 @@ enum {
60 * 60 *
61 * The Object Location Table header is placed at the beginning of each 61 * The Object Location Table header is placed at the beginning of each
62 * OLT extent. It is used to fing certain filesystem-wide metadata, e.g. 62 * OLT extent. It is used to fing certain filesystem-wide metadata, e.g.
63 * the inital inode list, the fileset header or the device configuration. 63 * the initial inode list, the fileset header or the device configuration.
64 */ 64 */
65struct vxfs_olt { 65struct vxfs_olt {
66 u_int32_t olt_magic; /* magic number */ 66 u_int32_t olt_magic; /* magic number */
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index b5ed541fb137..34591ee804b5 100644
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -144,7 +144,7 @@ __bdi_start_writeback(struct backing_dev_info *bdi, long nr_pages,
144 * 144 *
145 * Description: 145 * Description:
146 * This does WB_SYNC_NONE opportunistic writeback. The IO is only 146 * This does WB_SYNC_NONE opportunistic writeback. The IO is only
147 * started when this function returns, we make no guarentees on 147 * started when this function returns, we make no guarantees on
148 * completion. Caller need not hold sb s_umount semaphore. 148 * completion. Caller need not hold sb s_umount semaphore.
149 * 149 *
150 */ 150 */
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 6ea00734984e..82a66466a24c 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -523,7 +523,7 @@ static int fuse_readpage(struct file *file, struct page *page)
523 goto out; 523 goto out;
524 524
525 /* 525 /*
526 * Page writeback can extend beyond the liftime of the 526 * Page writeback can extend beyond the lifetime of the
527 * page-cache page, so make sure we read a properly synced 527 * page-cache page, so make sure we read a properly synced
528 * page. 528 * page.
529 */ 529 */
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index ef3dc4b9fae2..74add2ddcc3f 100644
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -1136,7 +1136,7 @@ void gfs2_trim_blocks(struct inode *inode)
1136 * earlier versions of GFS2 have a bug in the stuffed file reading 1136 * earlier versions of GFS2 have a bug in the stuffed file reading
1137 * code which will result in a buffer overrun if the size is larger 1137 * code which will result in a buffer overrun if the size is larger
1138 * than the max stuffed file size. In order to prevent this from 1138 * than the max stuffed file size. In order to prevent this from
1139 * occuring, such files are unstuffed, but in other cases we can 1139 * occurring, such files are unstuffed, but in other cases we can
1140 * just update the inode size directly. 1140 * just update the inode size directly.
1141 * 1141 *
1142 * Returns: 0 on success, or -ve on error 1142 * Returns: 0 on success, or -ve on error
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index e2431313491f..f07643e21bfa 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -1123,7 +1123,7 @@ void gfs2_glock_dq_uninit(struct gfs2_holder *gh)
1123 * @number: the lock number 1123 * @number: the lock number
1124 * @glops: the glock operations for the type of glock 1124 * @glops: the glock operations for the type of glock
1125 * @state: the state to acquire the glock in 1125 * @state: the state to acquire the glock in
1126 * @flags: modifier flags for the aquisition 1126 * @flags: modifier flags for the acquisition
1127 * @gh: the struct gfs2_holder 1127 * @gh: the struct gfs2_holder
1128 * 1128 *
1129 * Returns: errno 1129 * Returns: errno
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index ec73ed70bae1..a4e23d68a398 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -657,7 +657,7 @@ out:
657 * @sdp: the file system 657 * @sdp: the file system
658 * 658 *
659 * This function flushes data and meta data for all machines by 659 * This function flushes data and meta data for all machines by
660 * aquiring the transaction log exclusively. All journals are 660 * acquiring the transaction log exclusively. All journals are
661 * ensured to be in a clean state as well. 661 * ensured to be in a clean state as well.
662 * 662 *
663 * Returns: errno 663 * Returns: errno
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c
index da871ee084d3..69b180459463 100644
--- a/fs/jbd/commit.c
+++ b/fs/jbd/commit.c
@@ -362,7 +362,7 @@ void journal_commit_transaction(journal_t *journal)
362 * we do not require it to remember exactly which old buffers it 362 * we do not require it to remember exactly which old buffers it
363 * has reserved. This is consistent with the existing behaviour 363 * has reserved. This is consistent with the existing behaviour
364 * that multiple journal_get_write_access() calls to the same 364 * that multiple journal_get_write_access() calls to the same
365 * buffer are perfectly permissable. 365 * buffer are perfectly permissible.
366 */ 366 */
367 while (commit_transaction->t_reserved_list) { 367 while (commit_transaction->t_reserved_list) {
368 jh = commit_transaction->t_reserved_list; 368 jh = commit_transaction->t_reserved_list;
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index eb11601f2e00..b3713afaaa9e 100644
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -770,7 +770,7 @@ journal_t * journal_init_dev(struct block_device *bdev,
770 journal->j_wbufsize = n; 770 journal->j_wbufsize = n;
771 journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL); 771 journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL);
772 if (!journal->j_wbuf) { 772 if (!journal->j_wbuf) {
773 printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n", 773 printk(KERN_ERR "%s: Can't allocate bhs for commit thread\n",
774 __func__); 774 __func__);
775 goto out_err; 775 goto out_err;
776 } 776 }
@@ -831,7 +831,7 @@ journal_t * journal_init_inode (struct inode *inode)
831 journal->j_wbufsize = n; 831 journal->j_wbufsize = n;
832 journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL); 832 journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL);
833 if (!journal->j_wbuf) { 833 if (!journal->j_wbuf) {
834 printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n", 834 printk(KERN_ERR "%s: Can't allocate bhs for commit thread\n",
835 __func__); 835 __func__);
836 goto out_err; 836 goto out_err;
837 } 837 }
diff --git a/fs/jbd/revoke.c b/fs/jbd/revoke.c
index d29018307e2e..305a90763154 100644
--- a/fs/jbd/revoke.c
+++ b/fs/jbd/revoke.c
@@ -71,7 +71,7 @@
71 * switching hash tables under them. For operations on the lists of entries in 71 * switching hash tables under them. For operations on the lists of entries in
72 * the hash table j_revoke_lock is used. 72 * the hash table j_revoke_lock is used.
73 * 73 *
74 * Finally, also replay code uses the hash tables but at this moment noone else 74 * Finally, also replay code uses the hash tables but at this moment no one else
75 * can touch them (filesystem isn't mounted yet) and hence no locking is 75 * can touch them (filesystem isn't mounted yet) and hence no locking is
76 * needed. 76 * needed.
77 */ 77 */
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c
index 5b2e4c30a2a1..60d2319651b2 100644
--- a/fs/jbd/transaction.c
+++ b/fs/jbd/transaction.c
@@ -1392,7 +1392,7 @@ int journal_stop(handle_t *handle)
1392 * by 30x or more... 1392 * by 30x or more...
1393 * 1393 *
1394 * We try and optimize the sleep time against what the underlying disk 1394 * We try and optimize the sleep time against what the underlying disk
1395 * can do, instead of having a static sleep time. This is usefull for 1395 * can do, instead of having a static sleep time. This is useful for
1396 * the case where our storage is so fast that it is more optimal to go 1396 * the case where our storage is so fast that it is more optimal to go
1397 * ahead and force a flush and wait for the transaction to be committed 1397 * ahead and force a flush and wait for the transaction to be committed
1398 * than it is to wait for an arbitrary amount of time for new writers to 1398 * than it is to wait for an arbitrary amount of time for new writers to
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index fa36d7662b21..20af62f4304b 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -403,7 +403,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
403 * we do not require it to remember exactly which old buffers it 403 * we do not require it to remember exactly which old buffers it
404 * has reserved. This is consistent with the existing behaviour 404 * has reserved. This is consistent with the existing behaviour
405 * that multiple jbd2_journal_get_write_access() calls to the same 405 * that multiple jbd2_journal_get_write_access() calls to the same
406 * buffer are perfectly permissable. 406 * buffer are perfectly permissible.
407 */ 407 */
408 while (commit_transaction->t_reserved_list) { 408 while (commit_transaction->t_reserved_list) {
409 jh = commit_transaction->t_reserved_list; 409 jh = commit_transaction->t_reserved_list;
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 90407b8fece7..aba8ebaec25c 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -917,7 +917,7 @@ journal_t * jbd2_journal_init_dev(struct block_device *bdev,
917 journal->j_wbufsize = n; 917 journal->j_wbufsize = n;
918 journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL); 918 journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL);
919 if (!journal->j_wbuf) { 919 if (!journal->j_wbuf) {
920 printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n", 920 printk(KERN_ERR "%s: Can't allocate bhs for commit thread\n",
921 __func__); 921 __func__);
922 goto out_err; 922 goto out_err;
923 } 923 }
@@ -983,7 +983,7 @@ journal_t * jbd2_journal_init_inode (struct inode *inode)
983 journal->j_wbufsize = n; 983 journal->j_wbufsize = n;
984 journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL); 984 journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL);
985 if (!journal->j_wbuf) { 985 if (!journal->j_wbuf) {
986 printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n", 986 printk(KERN_ERR "%s: Can't allocate bhs for commit thread\n",
987 __func__); 987 __func__);
988 goto out_err; 988 goto out_err;
989 } 989 }
diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c
index 9ad321fd63fd..69fd93588118 100644
--- a/fs/jbd2/revoke.c
+++ b/fs/jbd2/revoke.c
@@ -71,7 +71,7 @@
71 * switching hash tables under them. For operations on the lists of entries in 71 * switching hash tables under them. For operations on the lists of entries in
72 * the hash table j_revoke_lock is used. 72 * the hash table j_revoke_lock is used.
73 * 73 *
74 * Finally, also replay code uses the hash tables but at this moment noone else 74 * Finally, also replay code uses the hash tables but at this moment no one else
75 * can touch them (filesystem isn't mounted yet) and hence no locking is 75 * can touch them (filesystem isn't mounted yet) and hence no locking is
76 * needed. 76 * needed.
77 */ 77 */
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
index 1d1191050f99..05fa77a23711 100644
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@ -1403,7 +1403,7 @@ int jbd2_journal_stop(handle_t *handle)
1403 1403
1404 /* 1404 /*
1405 * Once we drop t_updates, if it goes to zero the transaction 1405 * Once we drop t_updates, if it goes to zero the transaction
1406 * could start commiting on us and eventually disappear. So 1406 * could start committing on us and eventually disappear. So
1407 * once we do this, we must not dereference transaction 1407 * once we do this, we must not dereference transaction
1408 * pointer again. 1408 * pointer again.
1409 */ 1409 */
diff --git a/fs/jffs2/TODO b/fs/jffs2/TODO
index 5d3ea4070f01..ca28964abd4b 100644
--- a/fs/jffs2/TODO
+++ b/fs/jffs2/TODO
@@ -11,7 +11,7 @@
11 - checkpointing (do we need this? scan is quite fast) 11 - checkpointing (do we need this? scan is quite fast)
12 - make the scan code populate real inodes so read_inode just after 12 - make the scan code populate real inodes so read_inode just after
13 mount doesn't have to read the flash twice for large files. 13 mount doesn't have to read the flash twice for large files.
14 Make this a per-inode option, changable with chattr, so you can 14 Make this a per-inode option, changeable with chattr, so you can
15 decide which inodes should be in-core immediately after mount. 15 decide which inodes should be in-core immediately after mount.
16 - test, test, test 16 - test, test, test
17 17
diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c
index d32ee9412cb9..2ab1a0d91210 100644
--- a/fs/jffs2/readinode.c
+++ b/fs/jffs2/readinode.c
@@ -24,7 +24,7 @@
24 * 24 *
25 * Returns: 0 if the data CRC is correct; 25 * Returns: 0 if the data CRC is correct;
26 * 1 - if incorrect; 26 * 1 - if incorrect;
27 * error code if an error occured. 27 * error code if an error occurred.
28 */ 28 */
29static int check_node_data(struct jffs2_sb_info *c, struct jffs2_tmp_dnode_info *tn) 29static int check_node_data(struct jffs2_sb_info *c, struct jffs2_tmp_dnode_info *tn)
30{ 30{
diff --git a/fs/jffs2/summary.c b/fs/jffs2/summary.c
index 800171dca53b..e537fb0e0184 100644
--- a/fs/jffs2/summary.c
+++ b/fs/jffs2/summary.c
@@ -121,7 +121,7 @@ int jffs2_sum_add_inode_mem(struct jffs2_summary *s, struct jffs2_raw_inode *ri,
121 temp->nodetype = ri->nodetype; 121 temp->nodetype = ri->nodetype;
122 temp->inode = ri->ino; 122 temp->inode = ri->ino;
123 temp->version = ri->version; 123 temp->version = ri->version;
124 temp->offset = cpu_to_je32(ofs); /* relative offset from the begining of the jeb */ 124 temp->offset = cpu_to_je32(ofs); /* relative offset from the beginning of the jeb */
125 temp->totlen = ri->totlen; 125 temp->totlen = ri->totlen;
126 temp->next = NULL; 126 temp->next = NULL;
127 127
@@ -139,7 +139,7 @@ int jffs2_sum_add_dirent_mem(struct jffs2_summary *s, struct jffs2_raw_dirent *r
139 139
140 temp->nodetype = rd->nodetype; 140 temp->nodetype = rd->nodetype;
141 temp->totlen = rd->totlen; 141 temp->totlen = rd->totlen;
142 temp->offset = cpu_to_je32(ofs); /* relative from the begining of the jeb */ 142 temp->offset = cpu_to_je32(ofs); /* relative from the beginning of the jeb */
143 temp->pino = rd->pino; 143 temp->pino = rd->pino;
144 temp->version = rd->version; 144 temp->version = rd->version;
145 temp->ino = rd->ino; 145 temp->ino = rd->ino;
diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
index 07ee1546b2fa..4515bea0268f 100644
--- a/fs/jffs2/wbuf.c
+++ b/fs/jffs2/wbuf.c
@@ -1116,7 +1116,7 @@ int jffs2_write_nand_cleanmarker(struct jffs2_sb_info *c,
1116 1116
1117/* 1117/*
1118 * On NAND we try to mark this block bad. If the block was erased more 1118 * On NAND we try to mark this block bad. If the block was erased more
1119 * than MAX_ERASE_FAILURES we mark it finaly bad. 1119 * than MAX_ERASE_FAILURES we mark it finally bad.
1120 * Don't care about failures. This block remains on the erase-pending 1120 * Don't care about failures. This block remains on the erase-pending
1121 * or badblock list as long as nobody manipulates the flash with 1121 * or badblock list as long as nobody manipulates the flash with
1122 * a bootloader or something like that. 1122 * a bootloader or something like that.
diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c
index c92ea3b3ea5e..4496872cf4e7 100644
--- a/fs/jfs/jfs_dmap.c
+++ b/fs/jfs/jfs_dmap.c
@@ -1649,7 +1649,7 @@ static int dbFindCtl(struct bmap * bmp, int l2nb, int level, s64 * blkno)
1649 } 1649 }
1650 1650
1651 /* search the tree within the dmap control page for 1651 /* search the tree within the dmap control page for
1652 * sufficent free space. if sufficient free space is found, 1652 * sufficient free space. if sufficient free space is found,
1653 * dbFindLeaf() returns the index of the leaf at which 1653 * dbFindLeaf() returns the index of the leaf at which
1654 * free space was found. 1654 * free space was found.
1655 */ 1655 */
@@ -2744,7 +2744,7 @@ static int dbJoin(dmtree_t * tp, int leafno, int newval)
2744 /* check which (leafno or buddy) is the left buddy. 2744 /* check which (leafno or buddy) is the left buddy.
2745 * the left buddy gets to claim the blocks resulting 2745 * the left buddy gets to claim the blocks resulting
2746 * from the join while the right gets to claim none. 2746 * from the join while the right gets to claim none.
2747 * the left buddy is also eligable to participate in 2747 * the left buddy is also eligible to participate in
2748 * a join at the next higher level while the right 2748 * a join at the next higher level while the right
2749 * is not. 2749 * is not.
2750 * 2750 *
diff --git a/fs/jfs/jfs_extent.c b/fs/jfs/jfs_extent.c
index 5d3bbd10f8db..e5fe8506ed16 100644
--- a/fs/jfs/jfs_extent.c
+++ b/fs/jfs/jfs_extent.c
@@ -126,7 +126,7 @@ extAlloc(struct inode *ip, s64 xlen, s64 pno, xad_t * xp, bool abnr)
126 126
127 /* allocate the disk blocks for the extent. initially, extBalloc() 127 /* allocate the disk blocks for the extent. initially, extBalloc()
128 * will try to allocate disk blocks for the requested size (xlen). 128 * will try to allocate disk blocks for the requested size (xlen).
129 * if this fails (xlen contiguous free blocks not avaliable), it'll 129 * if this fails (xlen contiguous free blocks not available), it'll
130 * try to allocate a smaller number of blocks (producing a smaller 130 * try to allocate a smaller number of blocks (producing a smaller
131 * extent), with this smaller number of blocks consisting of the 131 * extent), with this smaller number of blocks consisting of the
132 * requested number of blocks rounded down to the next smaller 132 * requested number of blocks rounded down to the next smaller
@@ -481,7 +481,7 @@ int extFill(struct inode *ip, xad_t * xp)
481 * 481 *
482 * initially, we will try to allocate disk blocks for the 482 * initially, we will try to allocate disk blocks for the
483 * requested size (nblocks). if this fails (nblocks 483 * requested size (nblocks). if this fails (nblocks
484 * contiguous free blocks not avaliable), we'll try to allocate 484 * contiguous free blocks not available), we'll try to allocate
485 * a smaller number of blocks (producing a smaller extent), with 485 * a smaller number of blocks (producing a smaller extent), with
486 * this smaller number of blocks consisting of the requested 486 * this smaller number of blocks consisting of the requested
487 * number of blocks rounded down to the next smaller power of 2 487 * number of blocks rounded down to the next smaller power of 2
@@ -575,7 +575,7 @@ extBalloc(struct inode *ip, s64 hint, s64 * nblocks, s64 * blkno)
575 * to a new set of blocks. If moving the extent, we initially 575 * to a new set of blocks. If moving the extent, we initially
576 * will try to allocate disk blocks for the requested size 576 * will try to allocate disk blocks for the requested size
577 * (newnblks). if this fails (new contiguous free blocks not 577 * (newnblks). if this fails (new contiguous free blocks not
578 * avaliable), we'll try to allocate a smaller number of 578 * available), we'll try to allocate a smaller number of
579 * blocks (producing a smaller extent), with this smaller 579 * blocks (producing a smaller extent), with this smaller
580 * number of blocks consisting of the requested number of 580 * number of blocks consisting of the requested number of
581 * blocks rounded down to the next smaller power of 2 581 * blocks rounded down to the next smaller power of 2
diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
index 3a09423b6c22..ed53a4740168 100644
--- a/fs/jfs/jfs_imap.c
+++ b/fs/jfs/jfs_imap.c
@@ -1069,7 +1069,7 @@ int diFree(struct inode *ip)
1069 */ 1069 */
1070 if (iagp->nfreeexts == cpu_to_le32(EXTSPERIAG - 1)) { 1070 if (iagp->nfreeexts == cpu_to_le32(EXTSPERIAG - 1)) {
1071 /* in preparation for removing the iag from the 1071 /* in preparation for removing the iag from the
1072 * ag extent free list, read the iags preceeding 1072 * ag extent free list, read the iags preceding
1073 * and following the iag on the ag extent free 1073 * and following the iag on the ag extent free
1074 * list. 1074 * list.
1075 */ 1075 */
@@ -1095,7 +1095,7 @@ int diFree(struct inode *ip)
1095 int inofreefwd = le32_to_cpu(iagp->inofreefwd); 1095 int inofreefwd = le32_to_cpu(iagp->inofreefwd);
1096 1096
1097 /* in preparation for removing the iag from the 1097 /* in preparation for removing the iag from the
1098 * ag inode free list, read the iags preceeding 1098 * ag inode free list, read the iags preceding
1099 * and following the iag on the ag inode free 1099 * and following the iag on the ag inode free
1100 * list. before reading these iags, we must make 1100 * list. before reading these iags, we must make
1101 * sure that we already don't have them in hand 1101 * sure that we already don't have them in hand
@@ -1681,7 +1681,7 @@ diAllocAG(struct inomap * imap, int agno, bool dir, struct inode *ip)
1681 * try to allocate a new extent of free inodes. 1681 * try to allocate a new extent of free inodes.
1682 */ 1682 */
1683 if (addext) { 1683 if (addext) {
1684 /* if free space is not avaliable for this new extent, try 1684 /* if free space is not available for this new extent, try
1685 * below to allocate a free and existing (already backed) 1685 * below to allocate a free and existing (already backed)
1686 * inode from the ag. 1686 * inode from the ag.
1687 */ 1687 */
@@ -2036,7 +2036,7 @@ static int diAllocBit(struct inomap * imap, struct iag * iagp, int ino)
2036 2036
2037 /* check if this is the last free inode within the iag. 2037 /* check if this is the last free inode within the iag.
2038 * if so, it will have to be removed from the ag free 2038 * if so, it will have to be removed from the ag free
2039 * inode list, so get the iags preceeding and following 2039 * inode list, so get the iags preceding and following
2040 * it on the list. 2040 * it on the list.
2041 */ 2041 */
2042 if (iagp->nfreeinos == cpu_to_le32(1)) { 2042 if (iagp->nfreeinos == cpu_to_le32(1)) {
@@ -2208,7 +2208,7 @@ static int diNewExt(struct inomap * imap, struct iag * iagp, int extno)
2208 2208
2209 /* check if this is the last free extent within the 2209 /* check if this is the last free extent within the
2210 * iag. if so, the iag must be removed from the ag 2210 * iag. if so, the iag must be removed from the ag
2211 * free extent list, so get the iags preceeding and 2211 * free extent list, so get the iags preceding and
2212 * following the iag on this list. 2212 * following the iag on this list.
2213 */ 2213 */
2214 if (iagp->nfreeexts == cpu_to_le32(1)) { 2214 if (iagp->nfreeexts == cpu_to_le32(1)) {
@@ -2504,7 +2504,7 @@ diNewIAG(struct inomap * imap, int *iagnop, int agno, struct metapage ** mpp)
2504 } 2504 }
2505 2505
2506 2506
2507 /* get the next avaliable iag number */ 2507 /* get the next available iag number */
2508 iagno = imap->im_nextiag; 2508 iagno = imap->im_nextiag;
2509 2509
2510 /* make sure that we have not exceeded the maximum inode 2510 /* make sure that we have not exceeded the maximum inode
@@ -2615,7 +2615,7 @@ diNewIAG(struct inomap * imap, int *iagnop, int agno, struct metapage ** mpp)
2615 2615
2616 duplicateIXtree(sb, blkno, xlen, &xaddr); 2616 duplicateIXtree(sb, blkno, xlen, &xaddr);
2617 2617
2618 /* update the next avaliable iag number */ 2618 /* update the next available iag number */
2619 imap->im_nextiag += 1; 2619 imap->im_nextiag += 1;
2620 2620
2621 /* Add the iag to the iag free list so we don't lose the iag 2621 /* Add the iag to the iag free list so we don't lose the iag
diff --git a/fs/jfs/jfs_logmgr.h b/fs/jfs/jfs_logmgr.h
index 9236bc49ae7f..e38c21598850 100644
--- a/fs/jfs/jfs_logmgr.h
+++ b/fs/jfs/jfs_logmgr.h
@@ -288,7 +288,7 @@ struct lrd {
288 /* 288 /*
289 * SYNCPT: log sync point 289 * SYNCPT: log sync point
290 * 290 *
291 * replay log upto syncpt address specified; 291 * replay log up to syncpt address specified;
292 */ 292 */
293 struct { 293 struct {
294 __le32 sync; /* 4: syncpt address (0 = here) */ 294 __le32 sync; /* 4: syncpt address (0 = here) */
diff --git a/fs/jfs/jfs_metapage.h b/fs/jfs/jfs_metapage.h
index d94f8d9e87d7..a78beda85f68 100644
--- a/fs/jfs/jfs_metapage.h
+++ b/fs/jfs/jfs_metapage.h
@@ -75,7 +75,7 @@ extern void grab_metapage(struct metapage *);
75extern void force_metapage(struct metapage *); 75extern void force_metapage(struct metapage *);
76 76
77/* 77/*
78 * hold_metapage and put_metapage are used in conjuction. The page lock 78 * hold_metapage and put_metapage are used in conjunction. The page lock
79 * is not dropped between the two, so no other threads can get or release 79 * is not dropped between the two, so no other threads can get or release
80 * the metapage 80 * the metapage
81 */ 81 */
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index 9466957ec841..f6cc0c09ec63 100644
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -636,7 +636,7 @@ struct tlock *txLock(tid_t tid, struct inode *ip, struct metapage * mp,
636 * the inode of the page and available to all anonymous 636 * the inode of the page and available to all anonymous
637 * transactions until txCommit() time at which point 637 * transactions until txCommit() time at which point
638 * they are transferred to the transaction tlock list of 638 * they are transferred to the transaction tlock list of
639 * the commiting transaction of the inode) 639 * the committing transaction of the inode)
640 */ 640 */
641 if (xtid == 0) { 641 if (xtid == 0) {
642 tlck->tid = tid; 642 tlck->tid = tid;
diff --git a/fs/jfs/resize.c b/fs/jfs/resize.c
index 1aba0039f1c9..8ea5efb5a34e 100644
--- a/fs/jfs/resize.c
+++ b/fs/jfs/resize.c
@@ -57,7 +57,7 @@
57 * 2. compute new FSCKSize from new LVSize; 57 * 2. compute new FSCKSize from new LVSize;
58 * 3. set new FSSize as MIN(FSSize, LVSize-(LogSize+FSCKSize)) where 58 * 3. set new FSSize as MIN(FSSize, LVSize-(LogSize+FSCKSize)) where
59 * assert(new FSSize >= old FSSize), 59 * assert(new FSSize >= old FSSize),
60 * i.e., file system must not be shrinked; 60 * i.e., file system must not be shrunk;
61 */ 61 */
62int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize) 62int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize)
63{ 63{
@@ -182,7 +182,7 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize)
182 */ 182 */
183 newFSSize = newLVSize - newLogSize - newFSCKSize; 183 newFSSize = newLVSize - newLogSize - newFSCKSize;
184 184
185 /* file system cannot be shrinked */ 185 /* file system cannot be shrunk */
186 if (newFSSize < bmp->db_mapsize) { 186 if (newFSSize < bmp->db_mapsize) {
187 rc = -EINVAL; 187 rc = -EINVAL;
188 goto out; 188 goto out;
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index eeca48a031ab..06c8a67cbe76 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -644,7 +644,7 @@ static int jfs_show_options(struct seq_file *seq, struct vfsmount *vfs)
644 644
645/* Read data from quotafile - avoid pagecache and such because we cannot afford 645/* Read data from quotafile - avoid pagecache and such because we cannot afford
646 * acquiring the locks... As quota files are never truncated and quota code 646 * acquiring the locks... As quota files are never truncated and quota code
647 * itself serializes the operations (and noone else should touch the files) 647 * itself serializes the operations (and no one else should touch the files)
648 * we don't have to be afraid of races */ 648 * we don't have to be afraid of races */
649static ssize_t jfs_quota_read(struct super_block *sb, int type, char *data, 649static ssize_t jfs_quota_read(struct super_block *sb, int type, char *data,
650 size_t len, loff_t off) 650 size_t len, loff_t off)
diff --git a/fs/logfs/dev_mtd.c b/fs/logfs/dev_mtd.c
index 7466e9dcc8c5..339e17e9133d 100644
--- a/fs/logfs/dev_mtd.c
+++ b/fs/logfs/dev_mtd.c
@@ -60,7 +60,7 @@ static int mtd_write(struct super_block *sb, loff_t ofs, size_t len, void *buf)
60 * asynchronous properties. So just to prevent the first implementor of such 60 * asynchronous properties. So just to prevent the first implementor of such
61 * a thing from breaking logfs in 2350, we do the usual pointless dance to 61 * a thing from breaking logfs in 2350, we do the usual pointless dance to
62 * declare a completion variable and wait for completion before returning 62 * declare a completion variable and wait for completion before returning
63 * from mtd_erase(). What an excercise in futility! 63 * from mtd_erase(). What an exercise in futility!
64 */ 64 */
65static void logfs_erase_callback(struct erase_info *ei) 65static void logfs_erase_callback(struct erase_info *ei)
66{ 66{
diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c
index f9ddf0c388c8..9ed89d1663f8 100644
--- a/fs/logfs/dir.c
+++ b/fs/logfs/dir.c
@@ -92,7 +92,7 @@ static int beyond_eof(struct inode *inode, loff_t bix)
92 * so short names (len <= 9) don't even occupy the complete 32bit name 92 * so short names (len <= 9) don't even occupy the complete 32bit name
93 * space. A prime >256 ensures short names quickly spread the 32bit 93 * space. A prime >256 ensures short names quickly spread the 32bit
94 * name space. Add about 26 for the estimated amount of information 94 * name space. Add about 26 for the estimated amount of information
95 * of each character and pick a prime nearby, preferrably a bit-sparse 95 * of each character and pick a prime nearby, preferably a bit-sparse
96 * one. 96 * one.
97 */ 97 */
98static u32 hash_32(const char *s, int len, u32 seed) 98static u32 hash_32(const char *s, int len, u32 seed)
diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c
index ee99a9f5dfd3..9e22085231b3 100644
--- a/fs/logfs/readwrite.c
+++ b/fs/logfs/readwrite.c
@@ -1616,7 +1616,7 @@ int logfs_rewrite_block(struct inode *inode, u64 bix, u64 ofs,
1616 err = logfs_write_buf(inode, page, flags); 1616 err = logfs_write_buf(inode, page, flags);
1617 if (!err && shrink_level(gc_level) == 0) { 1617 if (!err && shrink_level(gc_level) == 0) {
1618 /* Rewrite cannot mark the inode dirty but has to 1618 /* Rewrite cannot mark the inode dirty but has to
1619 * write it immediatly. 1619 * write it immediately.
1620 * Q: Can't we just create an alias for the inode 1620 * Q: Can't we just create an alias for the inode
1621 * instead? And if not, why not? 1621 * instead? And if not, why not?
1622 */ 1622 */
diff --git a/fs/mbcache.c b/fs/mbcache.c
index a25444ab2baf..2f174be06555 100644
--- a/fs/mbcache.c
+++ b/fs/mbcache.c
@@ -542,7 +542,7 @@ __mb_cache_entry_find(struct list_head *l, struct list_head *head,
542 * mb_cache_entry_find_first() 542 * mb_cache_entry_find_first()
543 * 543 *
544 * Find the first cache entry on a given device with a certain key in 544 * Find the first cache entry on a given device with a certain key in
545 * an additional index. Additonal matches can be found with 545 * an additional index. Additional matches can be found with
546 * mb_cache_entry_find_next(). Returns NULL if no match was found. The 546 * mb_cache_entry_find_next(). Returns NULL if no match was found. The
547 * returned cache entry is locked for shared access ("multiple readers"). 547 * returned cache entry is locked for shared access ("multiple readers").
548 * 548 *
diff --git a/fs/namei.c b/fs/namei.c
index 3cb616d38d9c..e6cd6113872c 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -70,7 +70,7 @@
70 * name indicated by the symlink. The old code always complained that the 70 * name indicated by the symlink. The old code always complained that the
71 * name already exists, due to not following the symlink even if its target 71 * name already exists, due to not following the symlink even if its target
72 * is nonexistent. The new semantics affects also mknod() and link() when 72 * is nonexistent. The new semantics affects also mknod() and link() when
73 * the name is a symlink pointing to a non-existant name. 73 * the name is a symlink pointing to a non-existent name.
74 * 74 *
75 * I don't know which semantics is the right one, since I have no access 75 * I don't know which semantics is the right one, since I have no access
76 * to standards. But I found by trial that HP-UX 9.0 has the full "new" 76 * to standards. But I found by trial that HP-UX 9.0 has the full "new"
diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c
index 00a1d1c3d3a4..0250e4ce4893 100644
--- a/fs/ncpfs/inode.c
+++ b/fs/ncpfs/inode.c
@@ -596,7 +596,7 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
596/* server->priv.data = NULL; */ 596/* server->priv.data = NULL; */
597 597
598 server->m = data; 598 server->m = data;
599 /* Althought anything producing this is buggy, it happens 599 /* Although anything producing this is buggy, it happens
600 now because of PATH_MAX changes.. */ 600 now because of PATH_MAX changes.. */
601 if (server->m.time_out < 1) { 601 if (server->m.time_out < 1) {
602 server->m.time_out = 10; 602 server->m.time_out = 10;
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index 14e0f9371d14..00ecf62ce7c1 100644
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -241,7 +241,7 @@ static __be32 decode_layoutrecall_args(struct svc_rqst *rqstp,
241 241
242 args->cbl_layout_type = ntohl(*p++); 242 args->cbl_layout_type = ntohl(*p++);
243 /* Depite the spec's xdr, iomode really belongs in the FILE switch, 243 /* Depite the spec's xdr, iomode really belongs in the FILE switch,
244 * as it is unuseable and ignored with the other types. 244 * as it is unusable and ignored with the other types.
245 */ 245 */
246 iomode = ntohl(*p++); 246 iomode = ntohl(*p++);
247 args->cbl_layoutchanged = ntohl(*p++); 247 args->cbl_layoutchanged = ntohl(*p++);
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 3ac5bd695e5e..2f093ed16980 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -301,7 +301,7 @@ nfs_file_mmap(struct file * file, struct vm_area_struct * vma)
301 * disk, but it retrieves and clears ctx->error after synching, despite 301 * disk, but it retrieves and clears ctx->error after synching, despite
302 * the two being set at the same time in nfs_context_set_write_error(). 302 * the two being set at the same time in nfs_context_set_write_error().
303 * This is because the former is used to notify the _next_ call to 303 * This is because the former is used to notify the _next_ call to
304 * nfs_file_write() that a write error occured, and hence cause it to 304 * nfs_file_write() that a write error occurred, and hence cause it to
305 * fall back to doing a synchronous write. 305 * fall back to doing a synchronous write.
306 */ 306 */
307static int 307static int
diff --git a/fs/nfs/nfs4filelayout.h b/fs/nfs/nfs4filelayout.h
index 085a354e0f08..7c44579f5832 100644
--- a/fs/nfs/nfs4filelayout.h
+++ b/fs/nfs/nfs4filelayout.h
@@ -33,7 +33,7 @@
33#include "pnfs.h" 33#include "pnfs.h"
34 34
35/* 35/*
36 * Field testing shows we need to support upto 4096 stripe indices. 36 * Field testing shows we need to support up to 4096 stripe indices.
37 * We store each index as a u8 (u32 on the wire) to keep the memory footprint 37 * We store each index as a u8 (u32 on the wire) to keep the memory footprint
38 * reasonable. This in turn means we support a maximum of 256 38 * reasonable. This in turn means we support a maximum of 256
39 * RFC 5661 multipath_list4 structures. 39 * RFC 5661 multipath_list4 structures.
diff --git a/fs/nfs_common/nfsacl.c b/fs/nfs_common/nfsacl.c
index ec0f277be7f5..6940439bd609 100644
--- a/fs/nfs_common/nfsacl.c
+++ b/fs/nfs_common/nfsacl.c
@@ -173,7 +173,7 @@ xdr_nfsace_decode(struct xdr_array2_desc *desc, void *elem)
173 return -EINVAL; 173 return -EINVAL;
174 break; 174 break;
175 case ACL_MASK: 175 case ACL_MASK:
176 /* Solaris sometimes sets additonal bits in the mask */ 176 /* Solaris sometimes sets additional bits in the mask */
177 entry->e_perm &= S_IRWXO; 177 entry->e_perm &= S_IRWXO;
178 break; 178 break;
179 default: 179 default:
diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
index 7e84a852cdae..ad48faca20fc 100644
--- a/fs/nfsd/nfs3xdr.c
+++ b/fs/nfsd/nfs3xdr.c
@@ -702,7 +702,7 @@ nfs3svc_encode_readres(struct svc_rqst *rqstp, __be32 *p,
702 *p++ = htonl(resp->eof); 702 *p++ = htonl(resp->eof);
703 *p++ = htonl(resp->count); /* xdr opaque count */ 703 *p++ = htonl(resp->count); /* xdr opaque count */
704 xdr_ressize_check(rqstp, p); 704 xdr_ressize_check(rqstp, p);
705 /* now update rqstp->rq_res to reflect data aswell */ 705 /* now update rqstp->rq_res to reflect data as well */
706 rqstp->rq_res.page_len = resp->count; 706 rqstp->rq_res.page_len = resp->count;
707 if (resp->count & 3) { 707 if (resp->count & 3) {
708 /* need to pad the tail */ 708 /* need to pad the tail */
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index fbde6f79922e..4b36ec3eb8ea 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -3055,7 +3055,7 @@ check_special_stateids(svc_fh *current_fh, stateid_t *stateid, int flags)
3055 if (ONE_STATEID(stateid) && (flags & RD_STATE)) 3055 if (ONE_STATEID(stateid) && (flags & RD_STATE))
3056 return nfs_ok; 3056 return nfs_ok;
3057 else if (locks_in_grace()) { 3057 else if (locks_in_grace()) {
3058 /* Answer in remaining cases depends on existance of 3058 /* Answer in remaining cases depends on existence of
3059 * conflicting state; so we must wait out the grace period. */ 3059 * conflicting state; so we must wait out the grace period. */
3060 return nfserr_grace; 3060 return nfserr_grace;
3061 } else if (flags & WR_STATE) 3061 } else if (flags & WR_STATE)
@@ -3675,7 +3675,7 @@ find_lockstateowner_str(struct inode *inode, clientid_t *clid,
3675/* 3675/*
3676 * Alloc a lock owner structure. 3676 * Alloc a lock owner structure.
3677 * Called in nfsd4_lock - therefore, OPEN and OPEN_CONFIRM (if needed) has 3677 * Called in nfsd4_lock - therefore, OPEN and OPEN_CONFIRM (if needed) has
3678 * occured. 3678 * occurred.
3679 * 3679 *
3680 * strhashval = lock_ownerstr_hashval 3680 * strhashval = lock_ownerstr_hashval
3681 */ 3681 */
diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
index 4ce005dbf3e6..65ec595e2226 100644
--- a/fs/nfsd/nfsxdr.c
+++ b/fs/nfsd/nfsxdr.c
@@ -451,7 +451,7 @@ nfssvc_encode_readres(struct svc_rqst *rqstp, __be32 *p,
451 *p++ = htonl(resp->count); 451 *p++ = htonl(resp->count);
452 xdr_ressize_check(rqstp, p); 452 xdr_ressize_check(rqstp, p);
453 453
454 /* now update rqstp->rq_res to reflect data aswell */ 454 /* now update rqstp->rq_res to reflect data as well */
455 rqstp->rq_res.page_len = resp->count; 455 rqstp->rq_res.page_len = resp->count;
456 if (resp->count & 3) { 456 if (resp->count & 3) {
457 /* need to pad the tail */ 457 /* need to pad the tail */
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index 6b1305dc26c0..9fde1c00a296 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -164,7 +164,7 @@ static int process_access_response(struct fsnotify_group *group,
164 fd, response); 164 fd, response);
165 /* 165 /*
166 * make sure the response is valid, if invalid we do nothing and either 166 * make sure the response is valid, if invalid we do nothing and either
167 * userspace can send a valid responce or we will clean it up after the 167 * userspace can send a valid response or we will clean it up after the
168 * timeout 168 * timeout
169 */ 169 */
170 switch (response) { 170 switch (response) {
diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
index 0348d0c8f65e..e3cbd746f64a 100644
--- a/fs/notify/inotify/inotify_fsnotify.c
+++ b/fs/notify/inotify/inotify_fsnotify.c
@@ -194,7 +194,7 @@ static int idr_callback(int id, void *p, void *data)
194 194
195static void inotify_free_group_priv(struct fsnotify_group *group) 195static void inotify_free_group_priv(struct fsnotify_group *group)
196{ 196{
197 /* ideally the idr is empty and we won't hit the BUG in teh callback */ 197 /* ideally the idr is empty and we won't hit the BUG in the callback */
198 idr_for_each(&group->inotify_data.idr, idr_callback, group); 198 idr_for_each(&group->inotify_data.idr, idr_callback, group);
199 idr_remove_all(&group->inotify_data.idr); 199 idr_remove_all(&group->inotify_data.idr);
200 idr_destroy(&group->inotify_data.idr); 200 idr_destroy(&group->inotify_data.idr);
diff --git a/fs/notify/mark.c b/fs/notify/mark.c
index 50c00856f730..252ab1f6452b 100644
--- a/fs/notify/mark.c
+++ b/fs/notify/mark.c
@@ -24,7 +24,7 @@
24 * referencing this object. The object typically will live inside the kernel 24 * referencing this object. The object typically will live inside the kernel
25 * with a refcnt of 2, one for each list it is on (i_list, g_list). Any task 25 * with a refcnt of 2, one for each list it is on (i_list, g_list). Any task
26 * which can find this object holding the appropriete locks, can take a reference 26 * which can find this object holding the appropriete locks, can take a reference
27 * and the object itself is guarenteed to survive until the reference is dropped. 27 * and the object itself is guaranteed to survive until the reference is dropped.
28 * 28 *
29 * LOCKING: 29 * LOCKING:
30 * There are 3 spinlocks involved with fsnotify inode marks and they MUST 30 * There are 3 spinlocks involved with fsnotify inode marks and they MUST
diff --git a/fs/ntfs/attrib.c b/fs/ntfs/attrib.c
index f5094ee224c1..f14fde2b03d6 100644
--- a/fs/ntfs/attrib.c
+++ b/fs/ntfs/attrib.c
@@ -197,7 +197,7 @@ err_out:
197 } else if (ctx_needs_reset) { 197 } else if (ctx_needs_reset) {
198 /* 198 /*
199 * If there is no attribute list, restoring the search context 199 * If there is no attribute list, restoring the search context
200 * is acomplished simply by copying the saved context back over 200 * is accomplished simply by copying the saved context back over
201 * the caller supplied context. If there is an attribute list, 201 * the caller supplied context. If there is an attribute list,
202 * things are more complicated as we need to deal with mapping 202 * things are more complicated as we need to deal with mapping
203 * of mft records and resulting potential changes in pointers. 203 * of mft records and resulting potential changes in pointers.
@@ -1181,7 +1181,7 @@ not_found:
1181 * for, i.e. if one wants to add the attribute to the mft record this is the 1181 * for, i.e. if one wants to add the attribute to the mft record this is the
1182 * correct place to insert its attribute list entry into. 1182 * correct place to insert its attribute list entry into.
1183 * 1183 *
1184 * When -errno != -ENOENT, an error occured during the lookup. @ctx->attr is 1184 * When -errno != -ENOENT, an error occurred during the lookup. @ctx->attr is
1185 * then undefined and in particular you should not rely on it not changing. 1185 * then undefined and in particular you should not rely on it not changing.
1186 */ 1186 */
1187int ntfs_attr_lookup(const ATTR_TYPE type, const ntfschar *name, 1187int ntfs_attr_lookup(const ATTR_TYPE type, const ntfschar *name,
diff --git a/fs/ntfs/compress.c b/fs/ntfs/compress.c
index ef9ed854255c..ee4144ce5d7c 100644
--- a/fs/ntfs/compress.c
+++ b/fs/ntfs/compress.c
@@ -501,7 +501,7 @@ int ntfs_read_compressed_block(struct page *page)
501 VCN start_vcn = (((s64)index << PAGE_CACHE_SHIFT) & ~cb_size_mask) >> 501 VCN start_vcn = (((s64)index << PAGE_CACHE_SHIFT) & ~cb_size_mask) >>
502 vol->cluster_size_bits; 502 vol->cluster_size_bits;
503 /* 503 /*
504 * The first vcn after the last wanted vcn (minumum alignment is again 504 * The first vcn after the last wanted vcn (minimum alignment is again
505 * PAGE_CACHE_SIZE. 505 * PAGE_CACHE_SIZE.
506 */ 506 */
507 VCN end_vcn = ((((s64)(index + 1UL) << PAGE_CACHE_SHIFT) + cb_size - 1) 507 VCN end_vcn = ((((s64)(index + 1UL) << PAGE_CACHE_SHIFT) + cb_size - 1)
diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c
index 0b56c6b7ec01..c05d6dcf77a4 100644
--- a/fs/ntfs/inode.c
+++ b/fs/ntfs/inode.c
@@ -622,7 +622,7 @@ static int ntfs_read_locked_inode(struct inode *vi)
622 */ 622 */
623 /* Everyone gets all permissions. */ 623 /* Everyone gets all permissions. */
624 vi->i_mode |= S_IRWXUGO; 624 vi->i_mode |= S_IRWXUGO;
625 /* If read-only, noone gets write permissions. */ 625 /* If read-only, no one gets write permissions. */
626 if (IS_RDONLY(vi)) 626 if (IS_RDONLY(vi))
627 vi->i_mode &= ~S_IWUGO; 627 vi->i_mode &= ~S_IWUGO;
628 if (m->flags & MFT_RECORD_IS_DIRECTORY) { 628 if (m->flags & MFT_RECORD_IS_DIRECTORY) {
@@ -2529,7 +2529,7 @@ retry_truncate:
2529 * specifies that the behaviour is unspecified thus we do not 2529 * specifies that the behaviour is unspecified thus we do not
2530 * have to do anything. This means that in our implementation 2530 * have to do anything. This means that in our implementation
2531 * in the rare case that the file is mmap()ped and a write 2531 * in the rare case that the file is mmap()ped and a write
2532 * occured into the mmap()ped region just beyond the file size 2532 * occurred into the mmap()ped region just beyond the file size
2533 * and writepage has not yet been called to write out the page 2533 * and writepage has not yet been called to write out the page
2534 * (which would clear the area beyond the file size) and we now 2534 * (which would clear the area beyond the file size) and we now
2535 * extend the file size to incorporate this dirty region 2535 * extend the file size to incorporate this dirty region
diff --git a/fs/ntfs/layout.h b/fs/ntfs/layout.h
index 8b2549f672bf..faece7190866 100644
--- a/fs/ntfs/layout.h
+++ b/fs/ntfs/layout.h
@@ -286,7 +286,7 @@ typedef le16 MFT_RECORD_FLAGS;
286 * fragmented. Volume free space includes the empty part of the mft zone and 286 * fragmented. Volume free space includes the empty part of the mft zone and
287 * when the volume's free 88% are used up, the mft zone is shrunk by a factor 287 * when the volume's free 88% are used up, the mft zone is shrunk by a factor
288 * of 2, thus making more space available for more files/data. This process is 288 * of 2, thus making more space available for more files/data. This process is
289 * repeated everytime there is no more free space except for the mft zone until 289 * repeated every time there is no more free space except for the mft zone until
290 * there really is no more free space. 290 * there really is no more free space.
291 */ 291 */
292 292
@@ -1657,13 +1657,13 @@ typedef enum {
1657 * pointed to by the Owner field was provided by a defaulting mechanism 1657 * pointed to by the Owner field was provided by a defaulting mechanism
1658 * rather than explicitly provided by the original provider of the 1658 * rather than explicitly provided by the original provider of the
1659 * security descriptor. This may affect the treatment of the SID with 1659 * security descriptor. This may affect the treatment of the SID with
1660 * respect to inheritence of an owner. 1660 * respect to inheritance of an owner.
1661 * 1661 *
1662 * SE_GROUP_DEFAULTED - This boolean flag, when set, indicates that the SID in 1662 * SE_GROUP_DEFAULTED - This boolean flag, when set, indicates that the SID in
1663 * the Group field was provided by a defaulting mechanism rather than 1663 * the Group field was provided by a defaulting mechanism rather than
1664 * explicitly provided by the original provider of the security 1664 * explicitly provided by the original provider of the security
1665 * descriptor. This may affect the treatment of the SID with respect to 1665 * descriptor. This may affect the treatment of the SID with respect to
1666 * inheritence of a primary group. 1666 * inheritance of a primary group.
1667 * 1667 *
1668 * SE_DACL_PRESENT - This boolean flag, when set, indicates that the security 1668 * SE_DACL_PRESENT - This boolean flag, when set, indicates that the security
1669 * descriptor contains a discretionary ACL. If this flag is set and the 1669 * descriptor contains a discretionary ACL. If this flag is set and the
@@ -1674,7 +1674,7 @@ typedef enum {
1674 * pointed to by the Dacl field was provided by a defaulting mechanism 1674 * pointed to by the Dacl field was provided by a defaulting mechanism
1675 * rather than explicitly provided by the original provider of the 1675 * rather than explicitly provided by the original provider of the
1676 * security descriptor. This may affect the treatment of the ACL with 1676 * security descriptor. This may affect the treatment of the ACL with
1677 * respect to inheritence of an ACL. This flag is ignored if the 1677 * respect to inheritance of an ACL. This flag is ignored if the
1678 * DaclPresent flag is not set. 1678 * DaclPresent flag is not set.
1679 * 1679 *
1680 * SE_SACL_PRESENT - This boolean flag, when set, indicates that the security 1680 * SE_SACL_PRESENT - This boolean flag, when set, indicates that the security
@@ -1686,7 +1686,7 @@ typedef enum {
1686 * pointed to by the Sacl field was provided by a defaulting mechanism 1686 * pointed to by the Sacl field was provided by a defaulting mechanism
1687 * rather than explicitly provided by the original provider of the 1687 * rather than explicitly provided by the original provider of the
1688 * security descriptor. This may affect the treatment of the ACL with 1688 * security descriptor. This may affect the treatment of the ACL with
1689 * respect to inheritence of an ACL. This flag is ignored if the 1689 * respect to inheritance of an ACL. This flag is ignored if the
1690 * SaclPresent flag is not set. 1690 * SaclPresent flag is not set.
1691 * 1691 *
1692 * SE_SELF_RELATIVE - This boolean flag, when set, indicates that the security 1692 * SE_SELF_RELATIVE - This boolean flag, when set, indicates that the security
@@ -2283,7 +2283,7 @@ typedef struct {
2283 // the key_length is zero, then the vcn immediately 2283 // the key_length is zero, then the vcn immediately
2284 // follows the INDEX_ENTRY_HEADER. Regardless of 2284 // follows the INDEX_ENTRY_HEADER. Regardless of
2285 // key_length, the address of the 8-byte boundary 2285 // key_length, the address of the 8-byte boundary
2286 // alligned vcn of INDEX_ENTRY{_HEADER} *ie is given by 2286 // aligned vcn of INDEX_ENTRY{_HEADER} *ie is given by
2287 // (char*)ie + le16_to_cpu(ie*)->length) - sizeof(VCN), 2287 // (char*)ie + le16_to_cpu(ie*)->length) - sizeof(VCN),
2288 // where sizeof(VCN) can be hardcoded as 8 if wanted. */ 2288 // where sizeof(VCN) can be hardcoded as 8 if wanted. */
2289} __attribute__ ((__packed__)) INDEX_ENTRY; 2289} __attribute__ ((__packed__)) INDEX_ENTRY;
diff --git a/fs/ntfs/logfile.c b/fs/ntfs/logfile.c
index 4dadcdf3d451..c71de292c5ad 100644
--- a/fs/ntfs/logfile.c
+++ b/fs/ntfs/logfile.c
@@ -669,7 +669,7 @@ err_out:
669 * of cases where we think that a volume is dirty when in fact it is clean. 669 * of cases where we think that a volume is dirty when in fact it is clean.
670 * This should only affect volumes that have not been shutdown cleanly but did 670 * This should only affect volumes that have not been shutdown cleanly but did
671 * not have any pending, non-check-pointed i/o, i.e. they were completely idle 671 * not have any pending, non-check-pointed i/o, i.e. they were completely idle
672 * at least for the five seconds preceeding the unclean shutdown. 672 * at least for the five seconds preceding the unclean shutdown.
673 * 673 *
674 * This function assumes that the $LogFile journal has already been consistency 674 * This function assumes that the $LogFile journal has already been consistency
675 * checked by a call to ntfs_check_logfile() and in particular if the $LogFile 675 * checked by a call to ntfs_check_logfile() and in particular if the $LogFile
diff --git a/fs/ntfs/logfile.h b/fs/ntfs/logfile.h
index b5a6f08bd35c..aa2b6ac3f0a4 100644
--- a/fs/ntfs/logfile.h
+++ b/fs/ntfs/logfile.h
@@ -222,7 +222,7 @@ typedef struct {
222/* 24*/ sle64 file_size; /* Usable byte size of the log file. If the 222/* 24*/ sle64 file_size; /* Usable byte size of the log file. If the
223 restart_area_offset + the offset of the 223 restart_area_offset + the offset of the
224 file_size are > 510 then corruption has 224 file_size are > 510 then corruption has
225 occured. This is the very first check when 225 occurred. This is the very first check when
226 starting with the restart_area as if it 226 starting with the restart_area as if it
227 fails it means that some of the above values 227 fails it means that some of the above values
228 will be corrupted by the multi sector 228 will be corrupted by the multi sector
diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c
index 326e7475a22a..382857f9c7db 100644
--- a/fs/ntfs/mft.c
+++ b/fs/ntfs/mft.c
@@ -73,7 +73,7 @@ static inline MFT_RECORD *map_mft_record_page(ntfs_inode *ni)
73 if (index > end_index || (i_size & ~PAGE_CACHE_MASK) < ofs + 73 if (index > end_index || (i_size & ~PAGE_CACHE_MASK) < ofs +
74 vol->mft_record_size) { 74 vol->mft_record_size) {
75 page = ERR_PTR(-ENOENT); 75 page = ERR_PTR(-ENOENT);
76 ntfs_error(vol->sb, "Attemt to read mft record 0x%lx, " 76 ntfs_error(vol->sb, "Attempt to read mft record 0x%lx, "
77 "which is beyond the end of the mft. " 77 "which is beyond the end of the mft. "
78 "This is probably a bug in the ntfs " 78 "This is probably a bug in the ntfs "
79 "driver.", ni->mft_no); 79 "driver.", ni->mft_no);
@@ -1442,7 +1442,7 @@ static int ntfs_mft_bitmap_extend_allocation_nolock(ntfs_volume *vol)
1442 // Note: It will need to be a special mft record and if none of 1442 // Note: It will need to be a special mft record and if none of
1443 // those are available it gets rather complicated... 1443 // those are available it gets rather complicated...
1444 ntfs_error(vol->sb, "Not enough space in this mft record to " 1444 ntfs_error(vol->sb, "Not enough space in this mft record to "
1445 "accomodate extended mft bitmap attribute " 1445 "accommodate extended mft bitmap attribute "
1446 "extent. Cannot handle this yet."); 1446 "extent. Cannot handle this yet.");
1447 ret = -EOPNOTSUPP; 1447 ret = -EOPNOTSUPP;
1448 goto undo_alloc; 1448 goto undo_alloc;
@@ -1879,7 +1879,7 @@ static int ntfs_mft_data_extend_allocation_nolock(ntfs_volume *vol)
1879 // and we would then need to update all references to this mft 1879 // and we would then need to update all references to this mft
1880 // record appropriately. This is rather complicated... 1880 // record appropriately. This is rather complicated...
1881 ntfs_error(vol->sb, "Not enough space in this mft record to " 1881 ntfs_error(vol->sb, "Not enough space in this mft record to "
1882 "accomodate extended mft data attribute " 1882 "accommodate extended mft data attribute "
1883 "extent. Cannot handle this yet."); 1883 "extent. Cannot handle this yet.");
1884 ret = -EOPNOTSUPP; 1884 ret = -EOPNOTSUPP;
1885 goto undo_alloc; 1885 goto undo_alloc;
@@ -2357,7 +2357,7 @@ ntfs_inode *ntfs_mft_record_alloc(ntfs_volume *vol, const int mode,
2357 } 2357 }
2358#ifdef DEBUG 2358#ifdef DEBUG
2359 read_lock_irqsave(&mftbmp_ni->size_lock, flags); 2359 read_lock_irqsave(&mftbmp_ni->size_lock, flags);
2360 ntfs_debug("Status of mftbmp after initialized extention: " 2360 ntfs_debug("Status of mftbmp after initialized extension: "
2361 "allocated_size 0x%llx, data_size 0x%llx, " 2361 "allocated_size 0x%llx, data_size 0x%llx, "
2362 "initialized_size 0x%llx.", 2362 "initialized_size 0x%llx.",
2363 (long long)mftbmp_ni->allocated_size, 2363 (long long)mftbmp_ni->allocated_size,
diff --git a/fs/ntfs/runlist.c b/fs/ntfs/runlist.c
index 56a9a6d25a2a..eac7d6788a10 100644
--- a/fs/ntfs/runlist.c
+++ b/fs/ntfs/runlist.c
@@ -1243,7 +1243,7 @@ err_out:
1243 * write. 1243 * write.
1244 * 1244 *
1245 * This is used when building the mapping pairs array of a runlist to compress 1245 * This is used when building the mapping pairs array of a runlist to compress
1246 * a given logical cluster number (lcn) or a specific run length to the minumum 1246 * a given logical cluster number (lcn) or a specific run length to the minimum
1247 * size possible. 1247 * size possible.
1248 * 1248 *
1249 * Return the number of bytes written on success. On error, i.e. the 1249 * Return the number of bytes written on success. On error, i.e. the
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
index 29099a07b9fe..b52706da4645 100644
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
@@ -458,7 +458,7 @@ static int ntfs_remount(struct super_block *sb, int *flags, char *opt)
458 * the volume on boot and updates them. 458 * the volume on boot and updates them.
459 * 459 *
460 * When remounting read-only, mark the volume clean if no volume errors 460 * When remounting read-only, mark the volume clean if no volume errors
461 * have occured. 461 * have occurred.
462 */ 462 */
463 if ((sb->s_flags & MS_RDONLY) && !(*flags & MS_RDONLY)) { 463 if ((sb->s_flags & MS_RDONLY) && !(*flags & MS_RDONLY)) {
464 static const char *es = ". Cannot remount read-write."; 464 static const char *es = ". Cannot remount read-write.";
@@ -1269,7 +1269,7 @@ static int check_windows_hibernation_status(ntfs_volume *vol)
1269 "hibernated on the volume."); 1269 "hibernated on the volume.");
1270 return 0; 1270 return 0;
1271 } 1271 }
1272 /* A real error occured. */ 1272 /* A real error occurred. */
1273 ntfs_error(vol->sb, "Failed to find inode number for " 1273 ntfs_error(vol->sb, "Failed to find inode number for "
1274 "hiberfil.sys."); 1274 "hiberfil.sys.");
1275 return ret; 1275 return ret;
@@ -1370,7 +1370,7 @@ static bool load_and_init_quota(ntfs_volume *vol)
1370 NVolSetQuotaOutOfDate(vol); 1370 NVolSetQuotaOutOfDate(vol);
1371 return true; 1371 return true;
1372 } 1372 }
1373 /* A real error occured. */ 1373 /* A real error occurred. */
1374 ntfs_error(vol->sb, "Failed to find inode number for $Quota."); 1374 ntfs_error(vol->sb, "Failed to find inode number for $Quota.");
1375 return false; 1375 return false;
1376 } 1376 }
@@ -1454,7 +1454,7 @@ not_enabled:
1454 NVolSetUsnJrnlStamped(vol); 1454 NVolSetUsnJrnlStamped(vol);
1455 return true; 1455 return true;
1456 } 1456 }
1457 /* A real error occured. */ 1457 /* A real error occurred. */
1458 ntfs_error(vol->sb, "Failed to find inode number for " 1458 ntfs_error(vol->sb, "Failed to find inode number for "
1459 "$UsnJrnl."); 1459 "$UsnJrnl.");
1460 return false; 1460 return false;
@@ -2292,7 +2292,7 @@ static void ntfs_put_super(struct super_block *sb)
2292 ntfs_commit_inode(vol->mft_ino); 2292 ntfs_commit_inode(vol->mft_ino);
2293 2293
2294 /* 2294 /*
2295 * If a read-write mount and no volume errors have occured, mark the 2295 * If a read-write mount and no volume errors have occurred, mark the
2296 * volume clean. Also, re-commit all affected inodes. 2296 * volume clean. Also, re-commit all affected inodes.
2297 */ 2297 */
2298 if (!(sb->s_flags & MS_RDONLY)) { 2298 if (!(sb->s_flags & MS_RDONLY)) {
@@ -2496,7 +2496,7 @@ static s64 get_nr_free_clusters(ntfs_volume *vol)
2496 if (vol->nr_clusters & 63) 2496 if (vol->nr_clusters & 63)
2497 nr_free += 64 - (vol->nr_clusters & 63); 2497 nr_free += 64 - (vol->nr_clusters & 63);
2498 up_read(&vol->lcnbmp_lock); 2498 up_read(&vol->lcnbmp_lock);
2499 /* If errors occured we may well have gone below zero, fix this. */ 2499 /* If errors occurred we may well have gone below zero, fix this. */
2500 if (nr_free < 0) 2500 if (nr_free < 0)
2501 nr_free = 0; 2501 nr_free = 0;
2502 ntfs_debug("Exiting."); 2502 ntfs_debug("Exiting.");
@@ -2561,7 +2561,7 @@ static unsigned long __get_nr_free_mft_records(ntfs_volume *vol,
2561 } 2561 }
2562 ntfs_debug("Finished reading $MFT/$BITMAP, last index = 0x%lx.", 2562 ntfs_debug("Finished reading $MFT/$BITMAP, last index = 0x%lx.",
2563 index - 1); 2563 index - 1);
2564 /* If errors occured we may well have gone below zero, fix this. */ 2564 /* If errors occurred we may well have gone below zero, fix this. */
2565 if (nr_free < 0) 2565 if (nr_free < 0)
2566 nr_free = 0; 2566 nr_free = 0;
2567 ntfs_debug("Exiting."); 2567 ntfs_debug("Exiting.");
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index b27a0d86f8c5..48aa9c7401c7 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -4519,7 +4519,7 @@ set_tail_append:
4519} 4519}
4520 4520
4521/* 4521/*
4522 * Helper function called at the begining of an insert. 4522 * Helper function called at the beginning of an insert.
4523 * 4523 *
4524 * This computes a few things that are commonly used in the process of 4524 * This computes a few things that are commonly used in the process of
4525 * inserting into the btree: 4525 * inserting into the btree:
diff --git a/fs/ocfs2/aops.h b/fs/ocfs2/aops.h
index eceb456037c1..75cf3ad987a6 100644
--- a/fs/ocfs2/aops.h
+++ b/fs/ocfs2/aops.h
@@ -71,7 +71,7 @@ static inline void ocfs2_iocb_set_rw_locked(struct kiocb *iocb, int level)
71 71
72/* 72/*
73 * Using a named enum representing lock types in terms of #N bit stored in 73 * Using a named enum representing lock types in terms of #N bit stored in
74 * iocb->private, which is going to be used for communication bewteen 74 * iocb->private, which is going to be used for communication between
75 * ocfs2_dio_end_io() and ocfs2_file_aio_write/read(). 75 * ocfs2_dio_end_io() and ocfs2_file_aio_write/read().
76 */ 76 */
77enum ocfs2_iocb_lock_bits { 77enum ocfs2_iocb_lock_bits {
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index 2461eb3272ed..643720209a98 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -2275,7 +2275,7 @@ void o2hb_free_hb_set(struct config_group *group)
2275 kfree(hs); 2275 kfree(hs);
2276} 2276}
2277 2277
2278/* hb callback registration and issueing */ 2278/* hb callback registration and issuing */
2279 2279
2280static struct o2hb_callback *hbcall_from_type(enum o2hb_callback_type type) 2280static struct o2hb_callback *hbcall_from_type(enum o2hb_callback_type type)
2281{ 2281{
diff --git a/fs/ocfs2/cluster/quorum.c b/fs/ocfs2/cluster/quorum.c
index a87366750f23..8f9cea1597af 100644
--- a/fs/ocfs2/cluster/quorum.c
+++ b/fs/ocfs2/cluster/quorum.c
@@ -89,7 +89,7 @@ static void o2quo_fence_self(void)
89 }; 89 };
90} 90}
91 91
92/* Indicate that a timeout occured on a hearbeat region write. The 92/* Indicate that a timeout occurred on a hearbeat region write. The
93 * other nodes in the cluster may consider us dead at that time so we 93 * other nodes in the cluster may consider us dead at that time so we
94 * want to "fence" ourselves so that we don't scribble on the disk 94 * want to "fence" ourselves so that we don't scribble on the disk
95 * after they think they've recovered us. This can't solve all 95 * after they think they've recovered us. This can't solve all
@@ -261,7 +261,7 @@ void o2quo_hb_still_up(u8 node)
261 spin_unlock(&qs->qs_lock); 261 spin_unlock(&qs->qs_lock);
262} 262}
263 263
264/* This is analagous to hb_up. as a node's connection comes up we delay the 264/* This is analogous to hb_up. as a node's connection comes up we delay the
265 * quorum decision until we see it heartbeating. the hold will be droped in 265 * quorum decision until we see it heartbeating. the hold will be droped in
266 * hb_up or hb_down. it might be perpetuated by con_err until hb_down. if 266 * hb_up or hb_down. it might be perpetuated by con_err until hb_down. if
267 * it's already heartbeating we we might be dropping a hold that conn_up got. 267 * it's already heartbeating we we might be dropping a hold that conn_up got.
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
index ee04ff5ee603..db5ee4b4f47a 100644
--- a/fs/ocfs2/cluster/tcp.c
+++ b/fs/ocfs2/cluster/tcp.c
@@ -565,7 +565,7 @@ static void o2net_set_nn_state(struct o2net_node *nn,
565 * the work queue actually being up. */ 565 * the work queue actually being up. */
566 if (!valid && o2net_wq) { 566 if (!valid && o2net_wq) {
567 unsigned long delay; 567 unsigned long delay;
568 /* delay if we're withing a RECONNECT_DELAY of the 568 /* delay if we're within a RECONNECT_DELAY of the
569 * last attempt */ 569 * last attempt */
570 delay = (nn->nn_last_connect_attempt + 570 delay = (nn->nn_last_connect_attempt +
571 msecs_to_jiffies(o2net_reconnect_delay())) 571 msecs_to_jiffies(o2net_reconnect_delay()))
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 9d67610dfc74..fede57ed005f 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -808,7 +808,7 @@ lookup:
808 dlm_mle_detach_hb_events(dlm, mle); 808 dlm_mle_detach_hb_events(dlm, mle);
809 dlm_put_mle(mle); 809 dlm_put_mle(mle);
810 mle = NULL; 810 mle = NULL;
811 /* this is lame, but we cant wait on either 811 /* this is lame, but we can't wait on either
812 * the mle or lockres waitqueue here */ 812 * the mle or lockres waitqueue here */
813 if (mig) 813 if (mig)
814 msleep(100); 814 msleep(100);
@@ -843,7 +843,7 @@ lookup:
843 843
844 /* finally add the lockres to its hash bucket */ 844 /* finally add the lockres to its hash bucket */
845 __dlm_insert_lockres(dlm, res); 845 __dlm_insert_lockres(dlm, res);
846 /* since this lockres is new it doesnt not require the spinlock */ 846 /* since this lockres is new it doesn't not require the spinlock */
847 dlm_lockres_grab_inflight_ref_new(dlm, res); 847 dlm_lockres_grab_inflight_ref_new(dlm, res);
848 848
849 /* if this node does not become the master make sure to drop 849 /* if this node does not become the master make sure to drop
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 177d3a6c2a5f..b4c8bb6b8d28 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -835,7 +835,7 @@ static int ocfs2_inode_is_valid_to_delete(struct inode *inode)
835 835
836 /* If we have allowd wipe of this inode for another node, it 836 /* If we have allowd wipe of this inode for another node, it
837 * will be marked here so we can safely skip it. Recovery will 837 * will be marked here so we can safely skip it. Recovery will
838 * cleanup any inodes we might inadvertantly skip here. */ 838 * cleanup any inodes we might inadvertently skip here. */
839 if (oi->ip_flags & OCFS2_INODE_SKIP_DELETE) 839 if (oi->ip_flags & OCFS2_INODE_SKIP_DELETE)
840 goto bail_unlock; 840 goto bail_unlock;
841 841
@@ -917,7 +917,7 @@ static int ocfs2_query_inode_wipe(struct inode *inode,
917 * the inode open lock in ocfs2_read_locked_inode(). When we 917 * the inode open lock in ocfs2_read_locked_inode(). When we
918 * get to ->delete_inode(), each node tries to convert it's 918 * get to ->delete_inode(), each node tries to convert it's
919 * lock to an exclusive. Trylocks are serialized by the inode 919 * lock to an exclusive. Trylocks are serialized by the inode
920 * meta data lock. If the upconvert suceeds, we know the inode 920 * meta data lock. If the upconvert succeeds, we know the inode
921 * is no longer live and can be deleted. 921 * is no longer live and can be deleted.
922 * 922 *
923 * Though we call this with the meta data lock held, the 923 * Though we call this with the meta data lock held, the
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index dcc2d9327150..b141a44605ca 100644
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -1368,7 +1368,7 @@ skip_recovery:
1368 mlog_errno(status); 1368 mlog_errno(status);
1369 1369
1370 /* Now it is right time to recover quotas... We have to do this under 1370 /* Now it is right time to recover quotas... We have to do this under
1371 * superblock lock so that noone can start using the slot (and crash) 1371 * superblock lock so that no one can start using the slot (and crash)
1372 * before we recover it */ 1372 * before we recover it */
1373 for (i = 0; i < rm_quota_used; i++) { 1373 for (i = 0; i < rm_quota_used; i++) {
1374 qrec = ocfs2_begin_quota_recovery(osb, rm_quota[i]); 1374 qrec = ocfs2_begin_quota_recovery(osb, rm_quota[i]);
diff --git a/fs/ocfs2/journal.h b/fs/ocfs2/journal.h
index 6180da1e37e6..68cf2f6d3c6a 100644
--- a/fs/ocfs2/journal.h
+++ b/fs/ocfs2/journal.h
@@ -215,7 +215,7 @@ static inline void ocfs2_checkpoint_inode(struct inode *inode)
215 /* WARNING: This only kicks off a single 215 /* WARNING: This only kicks off a single
216 * checkpoint. If someone races you and adds more 216 * checkpoint. If someone races you and adds more
217 * metadata to the journal, you won't know, and will 217 * metadata to the journal, you won't know, and will
218 * wind up waiting *alot* longer than necessary. Right 218 * wind up waiting *a lot* longer than necessary. Right
219 * now we only use this in clear_inode so that's 219 * now we only use this in clear_inode so that's
220 * OK. */ 220 * OK. */
221 ocfs2_start_checkpoint(osb); 221 ocfs2_start_checkpoint(osb);
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index 28f2cc1080d8..e5d738cd9cc0 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -2128,7 +2128,7 @@ leave:
2128} 2128}
2129 2129
2130/** 2130/**
2131 * ocfs2_prep_new_orphaned_file() - Prepare the orphan dir to recieve a newly 2131 * ocfs2_prep_new_orphaned_file() - Prepare the orphan dir to receive a newly
2132 * allocated file. This is different from the typical 'add to orphan dir' 2132 * allocated file. This is different from the typical 'add to orphan dir'
2133 * operation in that the inode does not yet exist. This is a problem because 2133 * operation in that the inode does not yet exist. This is a problem because
2134 * the orphan dir stringifies the inode block number to come up with it's 2134 * the orphan dir stringifies the inode block number to come up with it's
diff --git a/fs/ocfs2/ocfs2_fs.h b/fs/ocfs2/ocfs2_fs.h
index bf2e7764920e..b68f87a83924 100644
--- a/fs/ocfs2/ocfs2_fs.h
+++ b/fs/ocfs2/ocfs2_fs.h
@@ -441,7 +441,7 @@ static unsigned char ocfs2_type_by_mode[S_IFMT >> S_SHIFT] = {
441struct ocfs2_block_check { 441struct ocfs2_block_check {
442/*00*/ __le32 bc_crc32e; /* 802.3 Ethernet II CRC32 */ 442/*00*/ __le32 bc_crc32e; /* 802.3 Ethernet II CRC32 */
443 __le16 bc_ecc; /* Single-error-correction parity vector. 443 __le16 bc_ecc; /* Single-error-correction parity vector.
444 This is a simple Hamming code dependant 444 This is a simple Hamming code dependent
445 on the blocksize. OCFS2's maximum 445 on the blocksize. OCFS2's maximum
446 blocksize, 4K, requires 16 parity bits, 446 blocksize, 4K, requires 16 parity bits,
447 so we fit in __le16. */ 447 so we fit in __le16. */
@@ -750,7 +750,7 @@ struct ocfs2_dinode {
750 after an unclean 750 after an unclean
751 shutdown */ 751 shutdown */
752 } journal1; 752 } journal1;
753 } id1; /* Inode type dependant 1 */ 753 } id1; /* Inode type dependent 1 */
754/*C0*/ union { 754/*C0*/ union {
755 struct ocfs2_super_block i_super; 755 struct ocfs2_super_block i_super;
756 struct ocfs2_local_alloc i_lab; 756 struct ocfs2_local_alloc i_lab;
diff --git a/fs/ocfs2/quota_global.c b/fs/ocfs2/quota_global.c
index 279aef68025b..92fcd575775a 100644
--- a/fs/ocfs2/quota_global.c
+++ b/fs/ocfs2/quota_global.c
@@ -556,7 +556,7 @@ int __ocfs2_sync_dquot(struct dquot *dquot, int freeing)
556 spin_unlock(&dq_data_lock); 556 spin_unlock(&dq_data_lock);
557 err = ocfs2_qinfo_lock(info, freeing); 557 err = ocfs2_qinfo_lock(info, freeing);
558 if (err < 0) { 558 if (err < 0) {
559 mlog(ML_ERROR, "Failed to lock quota info, loosing quota write" 559 mlog(ML_ERROR, "Failed to lock quota info, losing quota write"
560 " (type=%d, id=%u)\n", dquot->dq_type, 560 " (type=%d, id=%u)\n", dquot->dq_type,
561 (unsigned)dquot->dq_id); 561 (unsigned)dquot->dq_id);
562 goto out; 562 goto out;
diff --git a/fs/ocfs2/reservations.h b/fs/ocfs2/reservations.h
index 1e49cc29d06c..42c2b804f3fd 100644
--- a/fs/ocfs2/reservations.h
+++ b/fs/ocfs2/reservations.h
@@ -29,7 +29,7 @@
29struct ocfs2_alloc_reservation { 29struct ocfs2_alloc_reservation {
30 struct rb_node r_node; 30 struct rb_node r_node;
31 31
32 unsigned int r_start; /* Begining of current window */ 32 unsigned int r_start; /* Beginning of current window */
33 unsigned int r_len; /* Length of the window */ 33 unsigned int r_len; /* Length of the window */
34 34
35 unsigned int r_last_len; /* Length of most recent alloc */ 35 unsigned int r_last_len; /* Length of most recent alloc */
diff --git a/fs/ocfs2/stackglue.h b/fs/ocfs2/stackglue.h
index 8ce7398ae1d2..1ec56fdb8d0d 100644
--- a/fs/ocfs2/stackglue.h
+++ b/fs/ocfs2/stackglue.h
@@ -126,7 +126,7 @@ struct ocfs2_stack_operations {
126 * 126 *
127 * ->connect() must not return until it is guaranteed that 127 * ->connect() must not return until it is guaranteed that
128 * 128 *
129 * - Node down notifications for the filesystem will be recieved 129 * - Node down notifications for the filesystem will be received
130 * and passed to conn->cc_recovery_handler(). 130 * and passed to conn->cc_recovery_handler().
131 * - Locking requests for the filesystem will be processed. 131 * - Locking requests for the filesystem will be processed.
132 */ 132 */
diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
index ab6e2061074f..ba5d97e4a73e 100644
--- a/fs/ocfs2/suballoc.c
+++ b/fs/ocfs2/suballoc.c
@@ -1511,7 +1511,7 @@ static int ocfs2_cluster_group_search(struct inode *inode,
1511 max_bits = le16_to_cpu(gd->bg_bits); 1511 max_bits = le16_to_cpu(gd->bg_bits);
1512 1512
1513 /* Tail groups in cluster bitmaps which aren't cpg 1513 /* Tail groups in cluster bitmaps which aren't cpg
1514 * aligned are prone to partial extention by a failed 1514 * aligned are prone to partial extension by a failed
1515 * fs resize. If the file system resize never got to 1515 * fs resize. If the file system resize never got to
1516 * update the dinode cluster count, then we don't want 1516 * update the dinode cluster count, then we don't want
1517 * to trust any clusters past it, regardless of what 1517 * to trust any clusters past it, regardless of what
@@ -2459,7 +2459,7 @@ static int _ocfs2_free_suballoc_bits(handle_t *handle,
2459 /* The alloc_bh comes from ocfs2_free_dinode() or 2459 /* The alloc_bh comes from ocfs2_free_dinode() or
2460 * ocfs2_free_clusters(). The callers have all locked the 2460 * ocfs2_free_clusters(). The callers have all locked the
2461 * allocator and gotten alloc_bh from the lock call. This 2461 * allocator and gotten alloc_bh from the lock call. This
2462 * validates the dinode buffer. Any corruption that has happended 2462 * validates the dinode buffer. Any corruption that has happened
2463 * is a code bug. */ 2463 * is a code bug. */
2464 BUG_ON(!OCFS2_IS_VALID_DINODE(fe)); 2464 BUG_ON(!OCFS2_IS_VALID_DINODE(fe));
2465 BUG_ON((count + start_bit) > ocfs2_bits_per_group(cl)); 2465 BUG_ON((count + start_bit) > ocfs2_bits_per_group(cl));
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 69fa11b35aa4..5a521c748859 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -78,7 +78,7 @@ static struct kmem_cache *ocfs2_inode_cachep = NULL;
78struct kmem_cache *ocfs2_dquot_cachep; 78struct kmem_cache *ocfs2_dquot_cachep;
79struct kmem_cache *ocfs2_qf_chunk_cachep; 79struct kmem_cache *ocfs2_qf_chunk_cachep;
80 80
81/* OCFS2 needs to schedule several differnt types of work which 81/* OCFS2 needs to schedule several different types of work which
82 * require cluster locking, disk I/O, recovery waits, etc. Since these 82 * require cluster locking, disk I/O, recovery waits, etc. Since these
83 * types of work tend to be heavy we avoid using the kernel events 83 * types of work tend to be heavy we avoid using the kernel events
84 * workqueue and schedule on our own. */ 84 * workqueue and schedule on our own. */
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index 57a215dc2d9b..81ecf9c0bf0a 100644
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -3554,7 +3554,7 @@ int ocfs2_xattr_set(struct inode *inode,
3554 down_write(&OCFS2_I(inode)->ip_xattr_sem); 3554 down_write(&OCFS2_I(inode)->ip_xattr_sem);
3555 /* 3555 /*
3556 * Scan inode and external block to find the same name 3556 * Scan inode and external block to find the same name
3557 * extended attribute and collect search infomation. 3557 * extended attribute and collect search information.
3558 */ 3558 */
3559 ret = ocfs2_xattr_ibody_find(inode, name_index, name, &xis); 3559 ret = ocfs2_xattr_ibody_find(inode, name_index, name, &xis);
3560 if (ret) 3560 if (ret)
@@ -3578,7 +3578,7 @@ int ocfs2_xattr_set(struct inode *inode,
3578 goto cleanup; 3578 goto cleanup;
3579 } 3579 }
3580 3580
3581 /* Check whether the value is refcounted and do some prepartion. */ 3581 /* Check whether the value is refcounted and do some preparation. */
3582 if (OCFS2_I(inode)->ip_dyn_features & OCFS2_HAS_REFCOUNT_FL && 3582 if (OCFS2_I(inode)->ip_dyn_features & OCFS2_HAS_REFCOUNT_FL &&
3583 (!xis.not_found || !xbs.not_found)) { 3583 (!xis.not_found || !xbs.not_found)) {
3584 ret = ocfs2_prepare_refcount_xattr(inode, di, &xi, 3584 ret = ocfs2_prepare_refcount_xattr(inode, di, &xi,
diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index ac546975031f..d545e97d99c3 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -500,7 +500,7 @@ struct hd_struct *add_partition(struct gendisk *disk, int partno,
500 /* everything is up and running, commence */ 500 /* everything is up and running, commence */
501 rcu_assign_pointer(ptbl->part[partno], p); 501 rcu_assign_pointer(ptbl->part[partno], p);
502 502
503 /* suppress uevent if the disk supresses it */ 503 /* suppress uevent if the disk suppresses it */
504 if (!dev_get_uevent_suppress(ddev)) 504 if (!dev_get_uevent_suppress(ddev))
505 kobject_uevent(&pdev->kobj, KOBJ_ADD); 505 kobject_uevent(&pdev->kobj, KOBJ_ADD);
506 506
@@ -585,7 +585,7 @@ rescan:
585 /* 585 /*
586 * If any partition code tried to read beyond EOD, try 586 * If any partition code tried to read beyond EOD, try
587 * unlocking native capacity even if partition table is 587 * unlocking native capacity even if partition table is
588 * sucessfully read as we could be missing some partitions. 588 * successfully read as we could be missing some partitions.
589 */ 589 */
590 if (state->access_beyond_eod) { 590 if (state->access_beyond_eod) {
591 printk(KERN_WARNING 591 printk(KERN_WARNING
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 5a670c11aeac..dd6628d3ba42 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -220,7 +220,7 @@ static struct mm_struct *__check_mem_permission(struct task_struct *task)
220 } 220 }
221 221
222 /* 222 /*
223 * Noone else is allowed. 223 * No one else is allowed.
224 */ 224 */
225 mmput(mm); 225 mmput(mm);
226 return ERR_PTR(-EPERM); 226 return ERR_PTR(-EPERM);
diff --git a/fs/pstore/Kconfig b/fs/pstore/Kconfig
index 867d0ac026ce..8007ae7c0d8c 100644
--- a/fs/pstore/Kconfig
+++ b/fs/pstore/Kconfig
@@ -1,5 +1,5 @@
1config PSTORE 1config PSTORE
2 bool "Persistant store support" 2 bool "Persistent store support"
3 default n 3 default n
4 help 4 help
5 This option enables generic access to platform level 5 This option enables generic access to platform level
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index fcc8ae75d874..a925bf205497 100644
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -956,7 +956,7 @@ static inline int dqput_blocks(struct dquot *dquot)
956 956
957/* 957/*
958 * Remove references to dquots from inode and add dquot to list for freeing 958 * Remove references to dquots from inode and add dquot to list for freeing
959 * if we have the last referece to dquot 959 * if we have the last reference to dquot
960 * We can't race with anybody because we hold dqptr_sem for writing... 960 * We can't race with anybody because we hold dqptr_sem for writing...
961 */ 961 */
962static int remove_inode_dquot_ref(struct inode *inode, int type, 962static int remove_inode_dquot_ref(struct inode *inode, int type,
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index c77514bd5776..c5e82ece7c6c 100644
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -1,7 +1,7 @@
1/* 1/*
2** Write ahead logging implementation copyright Chris Mason 2000 2** Write ahead logging implementation copyright Chris Mason 2000
3** 3**
4** The background commits make this code very interelated, and 4** The background commits make this code very interrelated, and
5** overly complex. I need to rethink things a bit....The major players: 5** overly complex. I need to rethink things a bit....The major players:
6** 6**
7** journal_begin -- call with the number of blocks you expect to log. 7** journal_begin -- call with the number of blocks you expect to log.
@@ -2725,7 +2725,7 @@ int journal_init(struct super_block *sb, const char *j_dev_name,
2725 REISERFS_DISK_OFFSET_IN_BYTES / 2725 REISERFS_DISK_OFFSET_IN_BYTES /
2726 sb->s_blocksize + 2); 2726 sb->s_blocksize + 2);
2727 2727
2728 /* Sanity check to see is the standard journal fitting withing first bitmap 2728 /* Sanity check to see is the standard journal fitting within first bitmap
2729 (actual for small blocksizes) */ 2729 (actual for small blocksizes) */
2730 if (!SB_ONDISK_JOURNAL_DEVICE(sb) && 2730 if (!SB_ONDISK_JOURNAL_DEVICE(sb) &&
2731 (SB_JOURNAL_1st_RESERVED_BLOCK(sb) + 2731 (SB_JOURNAL_1st_RESERVED_BLOCK(sb) +
diff --git a/fs/reiserfs/lock.c b/fs/reiserfs/lock.c
index b87aa2c1afc1..7df1ce48203a 100644
--- a/fs/reiserfs/lock.c
+++ b/fs/reiserfs/lock.c
@@ -15,7 +15,7 @@
15 * for this mutex, no need for a system wide mutex facility. 15 * for this mutex, no need for a system wide mutex facility.
16 * 16 *
17 * Also this lock is often released before a call that could block because 17 * Also this lock is often released before a call that could block because
18 * reiserfs performances were partialy based on the release while schedule() 18 * reiserfs performances were partially based on the release while schedule()
19 * property of the Bkl. 19 * property of the Bkl.
20 */ 20 */
21void reiserfs_write_lock(struct super_block *s) 21void reiserfs_write_lock(struct super_block *s)
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 0aab04f46827..b216ff6be1c9 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -393,7 +393,7 @@ void add_save_link(struct reiserfs_transaction_handle *th,
393 /* body of "save" link */ 393 /* body of "save" link */
394 link = INODE_PKEY(inode)->k_dir_id; 394 link = INODE_PKEY(inode)->k_dir_id;
395 395
396 /* put "save" link inot tree, don't charge quota to anyone */ 396 /* put "save" link into tree, don't charge quota to anyone */
397 retval = 397 retval =
398 reiserfs_insert_item(th, &path, &key, &ih, NULL, (char *)&link); 398 reiserfs_insert_item(th, &path, &key, &ih, NULL, (char *)&link);
399 if (retval) { 399 if (retval) {
@@ -2104,7 +2104,7 @@ out:
2104 2104
2105/* Read data from quotafile - avoid pagecache and such because we cannot afford 2105/* Read data from quotafile - avoid pagecache and such because we cannot afford
2106 * acquiring the locks... As quota files are never truncated and quota code 2106 * acquiring the locks... As quota files are never truncated and quota code
2107 * itself serializes the operations (and noone else should touch the files) 2107 * itself serializes the operations (and no one else should touch the files)
2108 * we don't have to be afraid of races */ 2108 * we don't have to be afraid of races */
2109static ssize_t reiserfs_quota_read(struct super_block *sb, int type, char *data, 2109static ssize_t reiserfs_quota_read(struct super_block *sb, int type, char *data,
2110 size_t len, loff_t off) 2110 size_t len, loff_t off)
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
index 5c11ca82b782..47d2a4498b03 100644
--- a/fs/reiserfs/xattr.c
+++ b/fs/reiserfs/xattr.c
@@ -396,7 +396,7 @@ static struct page *reiserfs_get_page(struct inode *dir, size_t n)
396 struct address_space *mapping = dir->i_mapping; 396 struct address_space *mapping = dir->i_mapping;
397 struct page *page; 397 struct page *page;
398 /* We can deadlock if we try to free dentries, 398 /* We can deadlock if we try to free dentries,
399 and an unlink/rmdir has just occured - GFP_NOFS avoids this */ 399 and an unlink/rmdir has just occurred - GFP_NOFS avoids this */
400 mapping_set_gfp_mask(mapping, GFP_NOFS); 400 mapping_set_gfp_mask(mapping, GFP_NOFS);
401 page = read_mapping_page(mapping, n >> PAGE_CACHE_SHIFT, NULL); 401 page = read_mapping_page(mapping, n >> PAGE_CACHE_SHIFT, NULL);
402 if (!IS_ERR(page)) { 402 if (!IS_ERR(page)) {
diff --git a/fs/squashfs/cache.c b/fs/squashfs/cache.c
index 26b15ae34d6f..c37b520132ff 100644
--- a/fs/squashfs/cache.c
+++ b/fs/squashfs/cache.c
@@ -104,7 +104,7 @@ struct squashfs_cache_entry *squashfs_cache_get(struct super_block *sb,
104 entry = &cache->entry[i]; 104 entry = &cache->entry[i];
105 105
106 /* 106 /*
107 * Initialise choosen cache entry, and fill it in from 107 * Initialise chosen cache entry, and fill it in from
108 * disk. 108 * disk.
109 */ 109 */
110 cache->unused--; 110 cache->unused--;
@@ -286,7 +286,7 @@ cleanup:
286 286
287 287
288/* 288/*
289 * Copy upto length bytes from cache entry to buffer starting at offset bytes 289 * Copy up to length bytes from cache entry to buffer starting at offset bytes
290 * into the cache entry. If there's not length bytes then copy the number of 290 * into the cache entry. If there's not length bytes then copy the number of
291 * bytes available. In all cases return the number of bytes copied. 291 * bytes available. In all cases return the number of bytes copied.
292 */ 292 */
diff --git a/fs/ubifs/budget.c b/fs/ubifs/budget.c
index c8ff0d1ae5d3..8b3a7da531eb 100644
--- a/fs/ubifs/budget.c
+++ b/fs/ubifs/budget.c
@@ -147,7 +147,7 @@ static int make_free_space(struct ubifs_info *c)
147 if (liab2 < liab1) 147 if (liab2 < liab1)
148 return -EAGAIN; 148 return -EAGAIN;
149 149
150 dbg_budg("new liability %lld (not shrinked)", liab2); 150 dbg_budg("new liability %lld (not shrunk)", liab2);
151 151
152 /* Liability did not shrink again, try GC */ 152 /* Liability did not shrink again, try GC */
153 dbg_budg("Run GC"); 153 dbg_budg("Run GC");
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index 27a4babe7df0..e765743cf9f3 100644
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -78,7 +78,7 @@ static int ufs_block_to_path(struct inode *inode, sector_t i_block, sector_t off
78 78
79/* 79/*
80 * Returns the location of the fragment from 80 * Returns the location of the fragment from
81 * the begining of the filesystem. 81 * the beginning of the filesystem.
82 */ 82 */
83 83
84static u64 ufs_frag_map(struct inode *inode, sector_t frag, bool needs_lock) 84static u64 ufs_frag_map(struct inode *inode, sector_t frag, bool needs_lock)
diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index 7693d6293404..3915ade6f9a8 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -483,9 +483,9 @@ static int ufs_parse_options (char * options, unsigned * mount_options)
483} 483}
484 484
485/* 485/*
486 * Diffrent types of UFS hold fs_cstotal in different 486 * Different types of UFS hold fs_cstotal in different
487 * places, and use diffrent data structure for it. 487 * places, and use different data structure for it.
488 * To make things simplier we just copy fs_cstotal to ufs_sb_private_info 488 * To make things simpler we just copy fs_cstotal to ufs_sb_private_info
489 */ 489 */
490static void ufs_setup_cstotal(struct super_block *sb) 490static void ufs_setup_cstotal(struct super_block *sb)
491{ 491{
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c
index 52dbd14260ba..79ce38be15a1 100644
--- a/fs/xfs/linux-2.6/xfs_aops.c
+++ b/fs/xfs/linux-2.6/xfs_aops.c
@@ -1295,7 +1295,7 @@ xfs_get_blocks_direct(
1295 * If the private argument is non-NULL __xfs_get_blocks signals us that we 1295 * If the private argument is non-NULL __xfs_get_blocks signals us that we
1296 * need to issue a transaction to convert the range from unwritten to written 1296 * need to issue a transaction to convert the range from unwritten to written
1297 * extents. In case this is regular synchronous I/O we just call xfs_end_io 1297 * extents. In case this is regular synchronous I/O we just call xfs_end_io
1298 * to do this and we are done. But in case this was a successfull AIO 1298 * to do this and we are done. But in case this was a successful AIO
1299 * request this handler is called from interrupt context, from which we 1299 * request this handler is called from interrupt context, from which we
1300 * can't start transactions. In that case offload the I/O completion to 1300 * can't start transactions. In that case offload the I/O completion to
1301 * the workqueues we also use for buffered I/O completion. 1301 * the workqueues we also use for buffered I/O completion.
diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
index 596bb2c9de42..5ea402023ebd 100644
--- a/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
@@ -120,7 +120,7 @@ xfs_buf_lru_add(
120 * The unlocked check is safe here because it only occurs when there are not 120 * The unlocked check is safe here because it only occurs when there are not
121 * b_lru_ref counts left on the inode under the pag->pag_buf_lock. it is there 121 * b_lru_ref counts left on the inode under the pag->pag_buf_lock. it is there
122 * to optimise the shrinker removing the buffer from the LRU and calling 122 * to optimise the shrinker removing the buffer from the LRU and calling
123 * xfs_buf_free(). i.e. it removes an unneccessary round trip on the 123 * xfs_buf_free(). i.e. it removes an unnecessary round trip on the
124 * bt_lru_lock. 124 * bt_lru_lock.
125 */ 125 */
126STATIC void 126STATIC void
@@ -380,7 +380,7 @@ out_free_pages:
380} 380}
381 381
382/* 382/*
383 * Map buffer into kernel address-space if nessecary. 383 * Map buffer into kernel address-space if necessary.
384 */ 384 */
385STATIC int 385STATIC int
386_xfs_buf_map_pages( 386_xfs_buf_map_pages(
diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c
index 52aadfbed132..f4213ba1ff85 100644
--- a/fs/xfs/linux-2.6/xfs_file.c
+++ b/fs/xfs/linux-2.6/xfs_file.c
@@ -381,7 +381,7 @@ xfs_aio_write_isize_update(
381 381
382/* 382/*
383 * If this was a direct or synchronous I/O that failed (such as ENOSPC) then 383 * If this was a direct or synchronous I/O that failed (such as ENOSPC) then
384 * part of the I/O may have been written to disk before the error occured. In 384 * part of the I/O may have been written to disk before the error occurred. In
385 * this case the on-disk file size may have been adjusted beyond the in-memory 385 * this case the on-disk file size may have been adjusted beyond the in-memory
386 * file size and now needs to be truncated back. 386 * file size and now needs to be truncated back.
387 */ 387 */
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
index 9ff7fc603d2f..dd21784525a8 100644
--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@ -70,7 +70,7 @@ xfs_synchronize_times(
70 70
71/* 71/*
72 * If the linux inode is valid, mark it dirty. 72 * If the linux inode is valid, mark it dirty.
73 * Used when commiting a dirty inode into a transaction so that 73 * Used when committing a dirty inode into a transaction so that
74 * the inode will get written back by the linux code 74 * the inode will get written back by the linux code
75 */ 75 */
76void 76void
diff --git a/fs/xfs/linux-2.6/xfs_sync.c b/fs/xfs/linux-2.6/xfs_sync.c
index 594cd822d84d..9cf35a688f53 100644
--- a/fs/xfs/linux-2.6/xfs_sync.c
+++ b/fs/xfs/linux-2.6/xfs_sync.c
@@ -401,7 +401,7 @@ xfs_quiesce_fs(
401/* 401/*
402 * Second stage of a quiesce. The data is already synced, now we have to take 402 * Second stage of a quiesce. The data is already synced, now we have to take
403 * care of the metadata. New transactions are already blocked, so we need to 403 * care of the metadata. New transactions are already blocked, so we need to
404 * wait for any remaining transactions to drain out before proceding. 404 * wait for any remaining transactions to drain out before proceeding.
405 */ 405 */
406void 406void
407xfs_quiesce_attr( 407xfs_quiesce_attr(
diff --git a/fs/xfs/quota/xfs_dquot.c b/fs/xfs/quota/xfs_dquot.c
index 7e2416478503..6fa214603819 100644
--- a/fs/xfs/quota/xfs_dquot.c
+++ b/fs/xfs/quota/xfs_dquot.c
@@ -600,7 +600,7 @@ xfs_qm_dqread(
600 600
601 /* 601 /*
602 * Reservation counters are defined as reservation plus current usage 602 * Reservation counters are defined as reservation plus current usage
603 * to avoid having to add everytime. 603 * to avoid having to add every time.
604 */ 604 */
605 dqp->q_res_bcount = be64_to_cpu(ddqp->d_bcount); 605 dqp->q_res_bcount = be64_to_cpu(ddqp->d_bcount);
606 dqp->q_res_icount = be64_to_cpu(ddqp->d_icount); 606 dqp->q_res_icount = be64_to_cpu(ddqp->d_icount);
diff --git a/fs/xfs/quota/xfs_qm_bhv.c b/fs/xfs/quota/xfs_qm_bhv.c
index 774d7ec6df8e..a0a829addca9 100644
--- a/fs/xfs/quota/xfs_qm_bhv.c
+++ b/fs/xfs/quota/xfs_qm_bhv.c
@@ -134,7 +134,7 @@ xfs_qm_newmount(
134 */ 134 */
135 if (quotaondisk && !XFS_QM_NEED_QUOTACHECK(mp)) { 135 if (quotaondisk && !XFS_QM_NEED_QUOTACHECK(mp)) {
136 /* 136 /*
137 * If an error occured, qm_mount_quotas code 137 * If an error occurred, qm_mount_quotas code
138 * has already disabled quotas. So, just finish 138 * has already disabled quotas. So, just finish
139 * mounting, and get on with the boring life 139 * mounting, and get on with the boring life
140 * without disk quotas. 140 * without disk quotas.
diff --git a/fs/xfs/quota/xfs_qm_syscalls.c b/fs/xfs/quota/xfs_qm_syscalls.c
index c82f06778a27..0d62a07b7fd8 100644
--- a/fs/xfs/quota/xfs_qm_syscalls.c
+++ b/fs/xfs/quota/xfs_qm_syscalls.c
@@ -172,7 +172,7 @@ xfs_qm_scall_quotaoff(
172 /* 172 /*
173 * Next we make the changes in the quota flag in the mount struct. 173 * Next we make the changes in the quota flag in the mount struct.
174 * This isn't protected by a particular lock directly, because we 174 * This isn't protected by a particular lock directly, because we
175 * don't want to take a mrlock everytime we depend on quotas being on. 175 * don't want to take a mrlock every time we depend on quotas being on.
176 */ 176 */
177 mp->m_qflags &= ~(flags); 177 mp->m_qflags &= ~(flags);
178 178
@@ -354,7 +354,7 @@ xfs_qm_scall_quotaon(
354 return XFS_ERROR(EINVAL); 354 return XFS_ERROR(EINVAL);
355 } 355 }
356 /* 356 /*
357 * If everything's upto-date incore, then don't waste time. 357 * If everything's up to-date incore, then don't waste time.
358 */ 358 */
359 if ((mp->m_qflags & flags) == flags) 359 if ((mp->m_qflags & flags) == flags)
360 return XFS_ERROR(EEXIST); 360 return XFS_ERROR(EEXIST);
diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
index e5413d96f1af..7b7e005e3dcc 100644
--- a/fs/xfs/xfs_buf_item.c
+++ b/fs/xfs/xfs_buf_item.c
@@ -992,7 +992,7 @@ xfs_buf_iodone_callbacks(
992 lasttarg = XFS_BUF_TARGET(bp); 992 lasttarg = XFS_BUF_TARGET(bp);
993 993
994 /* 994 /*
995 * If the write was asynchronous then noone will be looking for the 995 * If the write was asynchronous then no one will be looking for the
996 * error. Clear the error state and write the buffer out again. 996 * error. Clear the error state and write the buffer out again.
997 * 997 *
998 * During sync or umount we'll write all pending buffers again 998 * During sync or umount we'll write all pending buffers again
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 742c8330994a..a37480a6e023 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -2789,7 +2789,7 @@ xfs_iflush(
2789 2789
2790 /* 2790 /*
2791 * We can't flush the inode until it is unpinned, so wait for it if we 2791 * We can't flush the inode until it is unpinned, so wait for it if we
2792 * are allowed to block. We know noone new can pin it, because we are 2792 * are allowed to block. We know no one new can pin it, because we are
2793 * holding the inode lock shared and you need to hold it exclusively to 2793 * holding the inode lock shared and you need to hold it exclusively to
2794 * pin the inode. 2794 * pin the inode.
2795 * 2795 *
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index f753200cef8d..ff4e2a30227d 100644
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -111,7 +111,7 @@ struct xfs_imap {
111 * Generally, we do not want to hold the i_rlock while holding the 111 * Generally, we do not want to hold the i_rlock while holding the
112 * i_ilock. Hierarchy is i_iolock followed by i_rlock. 112 * i_ilock. Hierarchy is i_iolock followed by i_rlock.
113 * 113 *
114 * xfs_iptr_t contains all the inode fields upto and including the 114 * xfs_iptr_t contains all the inode fields up to and including the
115 * i_mnext and i_mprev fields, it is used as a marker in the inode 115 * i_mnext and i_mprev fields, it is used as a marker in the inode
116 * chain off the mount structure by xfs_sync calls. 116 * chain off the mount structure by xfs_sync calls.
117 */ 117 */
@@ -336,7 +336,7 @@ xfs_iflags_test_and_clear(xfs_inode_t *ip, unsigned short flags)
336 336
337/* 337/*
338 * Project quota id helpers (previously projid was 16bit only 338 * Project quota id helpers (previously projid was 16bit only
339 * and using two 16bit values to hold new 32bit projid was choosen 339 * and using two 16bit values to hold new 32bit projid was chosen
340 * to retain compatibility with "old" filesystems). 340 * to retain compatibility with "old" filesystems).
341 */ 341 */
342static inline prid_t 342static inline prid_t
diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h
index 15dbf1f9c2be..ffae692c9832 100644
--- a/fs/xfs/xfs_log_priv.h
+++ b/fs/xfs/xfs_log_priv.h
@@ -570,7 +570,7 @@ int xlog_write(struct log *log, struct xfs_log_vec *log_vector,
570 * When we crack an atomic LSN, we sample it first so that the value will not 570 * When we crack an atomic LSN, we sample it first so that the value will not
571 * change while we are cracking it into the component values. This means we 571 * change while we are cracking it into the component values. This means we
572 * will always get consistent component values to work from. This should always 572 * will always get consistent component values to work from. This should always
573 * be used to smaple and crack LSNs taht are stored and updated in atomic 573 * be used to sample and crack LSNs that are stored and updated in atomic
574 * variables. 574 * variables.
575 */ 575 */
576static inline void 576static inline void
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 0c4a5618e7af..5cc464a17c93 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -101,7 +101,7 @@ xlog_get_bp(
101 /* 101 /*
102 * We do log I/O in units of log sectors (a power-of-2 102 * We do log I/O in units of log sectors (a power-of-2
103 * multiple of the basic block size), so we round up the 103 * multiple of the basic block size), so we round up the
104 * requested size to acommodate the basic blocks required 104 * requested size to accommodate the basic blocks required
105 * for complete log sectors. 105 * for complete log sectors.
106 * 106 *
107 * In addition, the buffer may be used for a non-sector- 107 * In addition, the buffer may be used for a non-sector-
@@ -112,7 +112,7 @@ xlog_get_bp(
112 * an issue. Nor will this be a problem if the log I/O is 112 * an issue. Nor will this be a problem if the log I/O is
113 * done in basic blocks (sector size 1). But otherwise we 113 * done in basic blocks (sector size 1). But otherwise we
114 * extend the buffer by one extra log sector to ensure 114 * extend the buffer by one extra log sector to ensure
115 * there's space to accomodate this possiblility. 115 * there's space to accommodate this possibility.
116 */ 116 */
117 if (nbblks > 1 && log->l_sectBBsize > 1) 117 if (nbblks > 1 && log->l_sectBBsize > 1)
118 nbblks += log->l_sectBBsize; 118 nbblks += log->l_sectBBsize;
diff --git a/fs/xfs/xfs_trans_inode.c b/fs/xfs/xfs_trans_inode.c
index 16084d8ea231..048b0c689d3e 100644
--- a/fs/xfs/xfs_trans_inode.c
+++ b/fs/xfs/xfs_trans_inode.c
@@ -81,7 +81,7 @@ xfs_trans_ijoin(
81 * 81 *
82 * 82 *
83 * Grabs a reference to the inode which will be dropped when the transaction 83 * Grabs a reference to the inode which will be dropped when the transaction
84 * is commited. The inode will also be unlocked at that point. The inode 84 * is committed. The inode will also be unlocked at that point. The inode
85 * must be locked, and it cannot be associated with any transaction. 85 * must be locked, and it cannot be associated with any transaction.
86 */ 86 */
87void 87void
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index c48b4217ec47..b7a5fe7c52c8 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -953,7 +953,7 @@ xfs_release(
953 * If we previously truncated this file and removed old data 953 * If we previously truncated this file and removed old data
954 * in the process, we want to initiate "early" writeout on 954 * in the process, we want to initiate "early" writeout on
955 * the last close. This is an attempt to combat the notorious 955 * the last close. This is an attempt to combat the notorious
956 * NULL files problem which is particularly noticable from a 956 * NULL files problem which is particularly noticeable from a
957 * truncate down, buffered (re-)write (delalloc), followed by 957 * truncate down, buffered (re-)write (delalloc), followed by
958 * a crash. What we are effectively doing here is 958 * a crash. What we are effectively doing here is
959 * significantly reducing the time window where we'd otherwise 959 * significantly reducing the time window where we'd otherwise
@@ -982,7 +982,7 @@ xfs_release(
982 * 982 *
983 * Further, check if the inode is being opened, written and 983 * Further, check if the inode is being opened, written and
984 * closed frequently and we have delayed allocation blocks 984 * closed frequently and we have delayed allocation blocks
985 * oustanding (e.g. streaming writes from the NFS server), 985 * outstanding (e.g. streaming writes from the NFS server),
986 * truncating the blocks past EOF will cause fragmentation to 986 * truncating the blocks past EOF will cause fragmentation to
987 * occur. 987 * occur.
988 * 988 *
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index d41c94885211..f1380287ed4d 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -290,7 +290,7 @@ struct acpi_table_fadt {
290#define ACPI_FADT_APIC_CLUSTER (1<<18) /* 18: [V4] All local APICs must use cluster model (ACPI 3.0) */ 290#define ACPI_FADT_APIC_CLUSTER (1<<18) /* 18: [V4] All local APICs must use cluster model (ACPI 3.0) */
291#define ACPI_FADT_APIC_PHYSICAL (1<<19) /* 19: [V4] All local x_aPICs must use physical dest mode (ACPI 3.0) */ 291#define ACPI_FADT_APIC_PHYSICAL (1<<19) /* 19: [V4] All local x_aPICs must use physical dest mode (ACPI 3.0) */
292 292
293/* Values for preferred_profile (Prefered Power Management Profiles) */ 293/* Values for preferred_profile (Preferred Power Management Profiles) */
294 294
295enum acpi_prefered_pm_profiles { 295enum acpi_prefered_pm_profiles {
296 PM_UNSPECIFIED = 0, 296 PM_UNSPECIFIED = 0,
diff --git a/include/asm-generic/siginfo.h b/include/asm-generic/siginfo.h
index 942d30b5aab1..0dd4e87f6fba 100644
--- a/include/asm-generic/siginfo.h
+++ b/include/asm-generic/siginfo.h
@@ -192,7 +192,7 @@ typedef struct siginfo {
192 * SIGBUS si_codes 192 * SIGBUS si_codes
193 */ 193 */
194#define BUS_ADRALN (__SI_FAULT|1) /* invalid address alignment */ 194#define BUS_ADRALN (__SI_FAULT|1) /* invalid address alignment */
195#define BUS_ADRERR (__SI_FAULT|2) /* non-existant physical address */ 195#define BUS_ADRERR (__SI_FAULT|2) /* non-existent physical address */
196#define BUS_OBJERR (__SI_FAULT|3) /* object specific hardware error */ 196#define BUS_OBJERR (__SI_FAULT|3) /* object specific hardware error */
197/* hardware memory error consumed on a machine check: action required */ 197/* hardware memory error consumed on a machine check: action required */
198#define BUS_MCEERR_AR (__SI_FAULT|4) 198#define BUS_MCEERR_AR (__SI_FAULT|4)
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 32c45e5fe0ab..bd297a20ab98 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -773,7 +773,7 @@
773 * the sections that has this restriction (or similar) 773 * the sections that has this restriction (or similar)
774 * is located before the ones requiring PAGE_SIZE alignment. 774 * is located before the ones requiring PAGE_SIZE alignment.
775 * NOSAVE_DATA starts and ends with a PAGE_SIZE alignment which 775 * NOSAVE_DATA starts and ends with a PAGE_SIZE alignment which
776 * matches the requirment of PAGE_ALIGNED_DATA. 776 * matches the requirement of PAGE_ALIGNED_DATA.
777 * 777 *
778 * use 0 as page_align if page_aligned data is not used */ 778 * use 0 as page_align if page_aligned data is not used */
779#define RW_DATA_SECTION(cacheline, pagealigned, inittask) \ 779#define RW_DATA_SECTION(cacheline, pagealigned, inittask) \
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index ad5770f2315c..202424d17ed7 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -95,7 +95,7 @@ struct drm_device;
95 * drm_core, drm_driver, drm_kms 95 * drm_core, drm_driver, drm_kms
96 * drm_core level can be used in the generic drm code. For example: 96 * drm_core level can be used in the generic drm code. For example:
97 * drm_ioctl, drm_mm, drm_memory 97 * drm_ioctl, drm_mm, drm_memory
98 * The macro definiton of DRM_DEBUG is used. 98 * The macro definition of DRM_DEBUG is used.
99 * DRM_DEBUG(fmt, args...) 99 * DRM_DEBUG(fmt, args...)
100 * The debug info by using the DRM_DEBUG can be obtained by adding 100 * The debug info by using the DRM_DEBUG can be obtained by adding
101 * the boot option of "drm.debug=1". 101 * the boot option of "drm.debug=1".
@@ -808,7 +808,7 @@ struct drm_driver {
808 * 808 *
809 * \return Flags, or'ed together as follows: 809 * \return Flags, or'ed together as follows:
810 * 810 *
811 * DRM_SCANOUTPOS_VALID = Query successfull. 811 * DRM_SCANOUTPOS_VALID = Query successful.
812 * DRM_SCANOUTPOS_INVBL = Inside vblank. 812 * DRM_SCANOUTPOS_INVBL = Inside vblank.
813 * DRM_SCANOUTPOS_ACCURATE = Returned position is accurate. A lack of 813 * DRM_SCANOUTPOS_ACCURATE = Returned position is accurate. A lack of
814 * this flag means that returned position may be offset by a constant 814 * this flag means that returned position may be offset by a constant
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index aaec09713bee..d94684b7ba34 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -65,7 +65,7 @@ enum drm_mode_status {
65 MODE_H_ILLEGAL, /* mode has illegal horizontal timings */ 65 MODE_H_ILLEGAL, /* mode has illegal horizontal timings */
66 MODE_V_ILLEGAL, /* mode has illegal horizontal timings */ 66 MODE_V_ILLEGAL, /* mode has illegal horizontal timings */
67 MODE_BAD_WIDTH, /* requires an unsupported linepitch */ 67 MODE_BAD_WIDTH, /* requires an unsupported linepitch */
68 MODE_NOMODE, /* no mode with a maching name */ 68 MODE_NOMODE, /* no mode with a matching name */
69 MODE_NO_INTERLACE, /* interlaced mode not supported */ 69 MODE_NO_INTERLACE, /* interlaced mode not supported */
70 MODE_NO_DBLESCAN, /* doublescan mode not supported */ 70 MODE_NO_DBLESCAN, /* doublescan mode not supported */
71 MODE_NO_VSCAN, /* multiscan mode not supported */ 71 MODE_NO_VSCAN, /* multiscan mode not supported */
@@ -321,7 +321,7 @@ struct drm_crtc_funcs {
321 321
322 /* 322 /*
323 * Flip to the given framebuffer. This implements the page 323 * Flip to the given framebuffer. This implements the page
324 * flip ioctl descibed in drm_mode.h, specifically, the 324 * flip ioctl described in drm_mode.h, specifically, the
325 * implementation must return immediately and block all 325 * implementation must return immediately and block all
326 * rendering to the current fb until the flip has completed. 326 * rendering to the current fb until the flip has completed.
327 * If userspace set the event flag in the ioctl, the event 327 * If userspace set the event flag in the ioctl, the event
diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h
index b1e7809e5e15..c2f93a8ae2e1 100644
--- a/include/drm/drm_mm.h
+++ b/include/drm/drm_mm.h
@@ -56,7 +56,7 @@ struct drm_mm_node {
56}; 56};
57 57
58struct drm_mm { 58struct drm_mm {
59 /* List of all memory nodes that immediatly preceed a free hole. */ 59 /* List of all memory nodes that immediately precede a free hole. */
60 struct list_head hole_stack; 60 struct list_head hole_stack;
61 /* head_node.node_list is the list of all memory nodes, ordered 61 /* head_node.node_list is the list of all memory nodes, ordered
62 * according to the (increasing) start address of the memory node. */ 62 * according to the (increasing) start address of the memory node. */
diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
index ae6b7a3dbec7..c4961ea50a49 100644
--- a/include/drm/drm_mode.h
+++ b/include/drm/drm_mode.h
@@ -277,7 +277,7 @@ struct drm_mode_mode_cmd {
277#define DRM_MODE_CURSOR_MOVE (1<<1) 277#define DRM_MODE_CURSOR_MOVE (1<<1)
278 278
279/* 279/*
280 * depending on the value in flags diffrent members are used. 280 * depending on the value in flags different members are used.
281 * 281 *
282 * CURSOR_BO uses 282 * CURSOR_BO uses
283 * crtc 283 * crtc
diff --git a/include/drm/mga_drm.h b/include/drm/mga_drm.h
index c16097f99be0..fca817009e13 100644
--- a/include/drm/mga_drm.h
+++ b/include/drm/mga_drm.h
@@ -107,7 +107,7 @@
107 */ 107 */
108#define MGA_NR_SAREA_CLIPRECTS 8 108#define MGA_NR_SAREA_CLIPRECTS 8
109 109
110/* 2 heaps (1 for card, 1 for agp), each divided into upto 128 110/* 2 heaps (1 for card, 1 for agp), each divided into up to 128
111 * regions, subject to a minimum region size of (1<<16) == 64k. 111 * regions, subject to a minimum region size of (1<<16) == 64k.
112 * 112 *
113 * Clients may subdivide regions internally, but when sharing between 113 * Clients may subdivide regions internally, but when sharing between
diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
index 3dec41cf8342..3bce1a4fc305 100644
--- a/include/drm/radeon_drm.h
+++ b/include/drm/radeon_drm.h
@@ -641,7 +641,7 @@ typedef struct drm_radeon_vertex2 {
641} drm_radeon_vertex2_t; 641} drm_radeon_vertex2_t;
642 642
643/* v1.3 - obsoletes drm_radeon_vertex2 643/* v1.3 - obsoletes drm_radeon_vertex2
644 * - allows arbitarily large cliprect list 644 * - allows arbitrarily large cliprect list
645 * - allows updating of tcl packet, vector and scalar state 645 * - allows updating of tcl packet, vector and scalar state
646 * - allows memory-efficient description of state updates 646 * - allows memory-efficient description of state updates
647 * - allows state to be emitted without a primitive 647 * - allows state to be emitted without a primitive
diff --git a/include/drm/savage_drm.h b/include/drm/savage_drm.h
index 4863cf6bf96f..818d49be2e6e 100644
--- a/include/drm/savage_drm.h
+++ b/include/drm/savage_drm.h
@@ -29,7 +29,7 @@
29#ifndef __SAVAGE_SAREA_DEFINES__ 29#ifndef __SAVAGE_SAREA_DEFINES__
30#define __SAVAGE_SAREA_DEFINES__ 30#define __SAVAGE_SAREA_DEFINES__
31 31
32/* 2 heaps (1 for card, 1 for agp), each divided into upto 128 32/* 2 heaps (1 for card, 1 for agp), each divided into up to 128
33 * regions, subject to a minimum region size of (1<<16) == 64k. 33 * regions, subject to a minimum region size of (1<<16) == 64k.
34 * 34 *
35 * Clients may subdivide regions internally, but when sharing between 35 * Clients may subdivide regions internally, but when sharing between
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
index a6bd117c9ff1..62a0e4c4ceee 100644
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
@@ -50,10 +50,10 @@ struct drm_mm_node;
50 * 50 *
51 * @fpfn: first valid page frame number to put the object 51 * @fpfn: first valid page frame number to put the object
52 * @lpfn: last valid page frame number to put the object 52 * @lpfn: last valid page frame number to put the object
53 * @num_placement: number of prefered placements 53 * @num_placement: number of preferred placements
54 * @placement: prefered placements 54 * @placement: preferred placements
55 * @num_busy_placement: number of prefered placements when need to evict buffer 55 * @num_busy_placement: number of preferred placements when need to evict buffer
56 * @busy_placement: prefered placements when need to evict buffer 56 * @busy_placement: preferred placements when need to evict buffer
57 * 57 *
58 * Structure indicating the placement you request for an object. 58 * Structure indicating the placement you request for an object.
59 */ 59 */
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
index 960b52181d4e..09af2d746d1c 100644
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@ -223,9 +223,9 @@ struct ttm_mem_type_manager_func {
223 * @mem::mm_node should be set to a non-null value, and 223 * @mem::mm_node should be set to a non-null value, and
224 * @mem::start should be set to a value identifying the beginning 224 * @mem::start should be set to a value identifying the beginning
225 * of the range allocated, and the function should return zero. 225 * of the range allocated, and the function should return zero.
226 * If the memory region accomodate the buffer object, @mem::mm_node 226 * If the memory region accommodate the buffer object, @mem::mm_node
227 * should be set to NULL, and the function should return 0. 227 * should be set to NULL, and the function should return 0.
228 * If a system error occured, preventing the request to be fulfilled, 228 * If a system error occurred, preventing the request to be fulfilled,
229 * the function should return a negative error code. 229 * the function should return a negative error code.
230 * 230 *
231 * Note that @mem::mm_node will only be dereferenced by 231 * Note that @mem::mm_node will only be dereferenced by
@@ -841,7 +841,7 @@ extern void ttm_mem_io_unlock(struct ttm_mem_type_manager *man);
841 * different order, either by will or as a result of a buffer being evicted 841 * different order, either by will or as a result of a buffer being evicted
842 * to make room for a buffer already reserved. (Buffers are reserved before 842 * to make room for a buffer already reserved. (Buffers are reserved before
843 * they are evicted). The following algorithm prevents such deadlocks from 843 * they are evicted). The following algorithm prevents such deadlocks from
844 * occuring: 844 * occurring:
845 * 1) Buffers are reserved with the lru spinlock held. Upon successful 845 * 1) Buffers are reserved with the lru spinlock held. Upon successful
846 * reservation they are removed from the lru list. This stops a reserved buffer 846 * reservation they are removed from the lru list. This stops a reserved buffer
847 * from being evicted. However the lru spinlock is released between the time 847 * from being evicted. However the lru spinlock is released between the time
diff --git a/include/drm/vmwgfx_drm.h b/include/drm/vmwgfx_drm.h
index 650e6bf6f69f..5c36432d9ce5 100644
--- a/include/drm/vmwgfx_drm.h
+++ b/include/drm/vmwgfx_drm.h
@@ -592,7 +592,7 @@ struct drm_vmw_stream_arg {
592/** 592/**
593 * DRM_VMW_UPDATE_LAYOUT - Update layout 593 * DRM_VMW_UPDATE_LAYOUT - Update layout
594 * 594 *
595 * Updates the prefered modes and connection status for connectors. The 595 * Updates the preferred modes and connection status for connectors. The
596 * command conisits of one drm_vmw_update_layout_arg pointing out a array 596 * command conisits of one drm_vmw_update_layout_arg pointing out a array
597 * of num_outputs drm_vmw_rect's. 597 * of num_outputs drm_vmw_rect's.
598 */ 598 */
diff --git a/include/linux/amba/clcd.h b/include/linux/amba/clcd.h
index 24d26efd1432..e82e3ee2c54a 100644
--- a/include/linux/amba/clcd.h
+++ b/include/linux/amba/clcd.h
@@ -136,7 +136,7 @@ struct clcd_board {
136 int (*check)(struct clcd_fb *fb, struct fb_var_screeninfo *var); 136 int (*check)(struct clcd_fb *fb, struct fb_var_screeninfo *var);
137 137
138 /* 138 /*
139 * Compulsary. Decode fb->fb.var into regs->*. In the case of 139 * Compulsory. Decode fb->fb.var into regs->*. In the case of
140 * fixed timing, set regs->* to the register values required. 140 * fixed timing, set regs->* to the register values required.
141 */ 141 */
142 void (*decode)(struct clcd_fb *fb, struct clcd_regs *regs); 142 void (*decode)(struct clcd_fb *fb, struct clcd_regs *regs);
diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h
index f60227088b7b..21114810c7c0 100644
--- a/include/linux/amba/mmci.h
+++ b/include/linux/amba/mmci.h
@@ -30,15 +30,15 @@ struct dma_chan;
30 * @cd_invert: true if the gpio_cd pin value is active low 30 * @cd_invert: true if the gpio_cd pin value is active low
31 * @capabilities: the capabilities of the block as implemented in 31 * @capabilities: the capabilities of the block as implemented in
32 * this platform, signify anything MMC_CAP_* from mmc/host.h 32 * this platform, signify anything MMC_CAP_* from mmc/host.h
33 * @dma_filter: function used to select an apropriate RX and TX 33 * @dma_filter: function used to select an appropriate RX and TX
34 * DMA channel to be used for DMA, if and only if you're deploying the 34 * DMA channel to be used for DMA, if and only if you're deploying the
35 * generic DMA engine 35 * generic DMA engine
36 * @dma_rx_param: parameter passed to the DMA allocation 36 * @dma_rx_param: parameter passed to the DMA allocation
37 * filter in order to select an apropriate RX channel. If 37 * filter in order to select an appropriate RX channel. If
38 * there is a bidirectional RX+TX channel, then just specify 38 * there is a bidirectional RX+TX channel, then just specify
39 * this and leave dma_tx_param set to NULL 39 * this and leave dma_tx_param set to NULL
40 * @dma_tx_param: parameter passed to the DMA allocation 40 * @dma_tx_param: parameter passed to the DMA allocation
41 * filter in order to select an apropriate TX channel. If this 41 * filter in order to select an appropriate TX channel. If this
42 * is NULL the driver will attempt to use the RX channel as a 42 * is NULL the driver will attempt to use the RX channel as a
43 * bidirectional channel 43 * bidirectional channel
44 */ 44 */
diff --git a/include/linux/can/error.h b/include/linux/can/error.h
index d4127fd9e681..5958074302a4 100644
--- a/include/linux/can/error.h
+++ b/include/linux/can/error.h
@@ -51,7 +51,7 @@
51#define CAN_ERR_PROT_BIT1 0x10 /* unable to send recessive bit */ 51#define CAN_ERR_PROT_BIT1 0x10 /* unable to send recessive bit */
52#define CAN_ERR_PROT_OVERLOAD 0x20 /* bus overload */ 52#define CAN_ERR_PROT_OVERLOAD 0x20 /* bus overload */
53#define CAN_ERR_PROT_ACTIVE 0x40 /* active error announcement */ 53#define CAN_ERR_PROT_ACTIVE 0x40 /* active error announcement */
54#define CAN_ERR_PROT_TX 0x80 /* error occured on transmission */ 54#define CAN_ERR_PROT_TX 0x80 /* error occurred on transmission */
55 55
56/* error in CAN protocol (location) / data[3] */ 56/* error in CAN protocol (location) / data[3] */
57#define CAN_ERR_PROT_LOC_UNSPEC 0x00 /* unspecified */ 57#define CAN_ERR_PROT_LOC_UNSPEC 0x00 /* unspecified */
diff --git a/include/linux/can/netlink.h b/include/linux/can/netlink.h
index 3250de935e1a..34542d374dd8 100644
--- a/include/linux/can/netlink.h
+++ b/include/linux/can/netlink.h
@@ -17,7 +17,7 @@
17/* 17/*
18 * CAN bit-timing parameters 18 * CAN bit-timing parameters
19 * 19 *
20 * For futher information, please read chapter "8 BIT TIMING 20 * For further information, please read chapter "8 BIT TIMING
21 * REQUIREMENTS" of the "Bosch CAN Specification version 2.0" 21 * REQUIREMENTS" of the "Bosch CAN Specification version 2.0"
22 * at http://www.semiconductors.bosch.de/pdf/can2spec.pdf. 22 * at http://www.semiconductors.bosch.de/pdf/can2spec.pdf.
23 */ 23 */
diff --git a/include/linux/cdk.h b/include/linux/cdk.h
index 0908daf7bf56..80093a8d4f64 100644
--- a/include/linux/cdk.h
+++ b/include/linux/cdk.h
@@ -149,7 +149,7 @@ typedef struct cdkhdr {
149/* 149/*
150 * Define the memory mapping structure. This structure is pointed to by 150 * Define the memory mapping structure. This structure is pointed to by
151 * the memp field in the stlcdkhdr struct. As many as these structures 151 * the memp field in the stlcdkhdr struct. As many as these structures
152 * as required are layed out in shared memory to define how the rest of 152 * as required are laid out in shared memory to define how the rest of
153 * shared memory is divided up. There will be one for each port. 153 * shared memory is divided up. There will be one for each port.
154 */ 154 */
155typedef struct cdkmem { 155typedef struct cdkmem {
diff --git a/include/linux/cfag12864b.h b/include/linux/cfag12864b.h
index 6f9f19d66591..b454dfce60d9 100644
--- a/include/linux/cfag12864b.h
+++ b/include/linux/cfag12864b.h
@@ -44,7 +44,7 @@ extern unsigned char * cfag12864b_buffer;
44/* 44/*
45 * Get the refresh rate of the LCD 45 * Get the refresh rate of the LCD
46 * 46 *
47 * Returns the refresh rate (hertzs). 47 * Returns the refresh rate (hertz).
48 */ 48 */
49extern unsigned int cfag12864b_getrate(void); 49extern unsigned int cfag12864b_getrate(void);
50 50
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index e654fa239916..5ac7ebc36dbb 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -240,7 +240,7 @@ struct cgroup {
240 /* For RCU-protected deletion */ 240 /* For RCU-protected deletion */
241 struct rcu_head rcu_head; 241 struct rcu_head rcu_head;
242 242
243 /* List of events which userspace want to recieve */ 243 /* List of events which userspace want to receive */
244 struct list_head event_list; 244 struct list_head event_list;
245 spinlock_t event_list_lock; 245 spinlock_t event_list_lock;
246}; 246};
diff --git a/include/linux/cm4000_cs.h b/include/linux/cm4000_cs.h
index 72bfefdbd767..3c4aac406175 100644
--- a/include/linux/cm4000_cs.h
+++ b/include/linux/cm4000_cs.h
@@ -20,7 +20,7 @@ typedef struct atreq {
20} atreq_t; 20} atreq_t;
21 21
22 22
23/* what is particularly stupid in the original driver is the arch-dependant 23/* what is particularly stupid in the original driver is the arch-dependent
24 * member sizes. This leads to CONFIG_COMPAT breakage, since 32bit userspace 24 * member sizes. This leads to CONFIG_COMPAT breakage, since 32bit userspace
25 * will lay out the structure members differently than the 64bit kernel. 25 * will lay out the structure members differently than the 64bit kernel.
26 * 26 *
diff --git a/include/linux/configfs.h b/include/linux/configfs.h
index ddb7a97c78c2..645778ad899b 100644
--- a/include/linux/configfs.h
+++ b/include/linux/configfs.h
@@ -218,7 +218,7 @@ static ssize_t _item##_attr_store(struct config_item *item, \
218 * group children. default_groups may coexist alongsize make_group() or 218 * group children. default_groups may coexist alongsize make_group() or
219 * make_item(), but if the group wishes to have only default_groups 219 * make_item(), but if the group wishes to have only default_groups
220 * children (disallowing mkdir(2)), it need not provide either function. 220 * children (disallowing mkdir(2)), it need not provide either function.
221 * If the group has commit(), it supports pending and commited (active) 221 * If the group has commit(), it supports pending and committed (active)
222 * items. 222 * items.
223 */ 223 */
224struct configfs_item_operations { 224struct configfs_item_operations {
diff --git a/include/linux/cper.h b/include/linux/cper.h
index 372a25839fd1..c23049496531 100644
--- a/include/linux/cper.h
+++ b/include/linux/cper.h
@@ -310,7 +310,7 @@ struct cper_sec_proc_ia {
310 __u8 cpuid[48]; 310 __u8 cpuid[48];
311}; 311};
312 312
313/* IA32/X64 Processor Error Infomation Structure */ 313/* IA32/X64 Processor Error Information Structure */
314struct cper_ia_err_info { 314struct cper_ia_err_info {
315 uuid_le err_type; 315 uuid_le err_type;
316 __u64 validation_bits; 316 __u64 validation_bits;
diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
index 4cb72b920c74..7925bf0ee836 100644
--- a/include/linux/decompress/mm.h
+++ b/include/linux/decompress/mm.h
@@ -16,7 +16,7 @@
16 16
17/* 17/*
18 * Some architectures want to ensure there is no local data in their 18 * Some architectures want to ensure there is no local data in their
19 * pre-boot environment, so that data can arbitarily relocated (via 19 * pre-boot environment, so that data can arbitrarily relocated (via
20 * GOT references). This is achieved by defining STATIC_RW_DATA to 20 * GOT references). This is achieved by defining STATIC_RW_DATA to
21 * be null. 21 * be null.
22 */ 22 */
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 9bebd7f16ef1..eee7addec282 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -434,7 +434,7 @@ struct dma_tx_state {
434 * zero or error code 434 * zero or error code
435 * @device_tx_status: poll for transaction completion, the optional 435 * @device_tx_status: poll for transaction completion, the optional
436 * txstate parameter can be supplied with a pointer to get a 436 * txstate parameter can be supplied with a pointer to get a
437 * struct with auxilary transfer status information, otherwise the call 437 * struct with auxiliary transfer status information, otherwise the call
438 * will just return a simple status code 438 * will just return a simple status code
439 * @device_issue_pending: push pending transactions to hardware 439 * @device_issue_pending: push pending transactions to hardware
440 */ 440 */
diff --git a/include/linux/drbd.h b/include/linux/drbd.h
index d18d673ebc78..cec467f5d676 100644
--- a/include/linux/drbd.h
+++ b/include/linux/drbd.h
@@ -36,7 +36,7 @@
36#include <sys/wait.h> 36#include <sys/wait.h>
37#include <limits.h> 37#include <limits.h>
38 38
39/* Altough the Linux source code makes a difference between 39/* Although the Linux source code makes a difference between
40 generic endianness and the bitfields' endianness, there is no 40 generic endianness and the bitfields' endianness, there is no
41 architecture as of Linux-2.6.24-rc4 where the bitfileds' endianness 41 architecture as of Linux-2.6.24-rc4 where the bitfileds' endianness
42 does not match the generic endianness. */ 42 does not match the generic endianness. */
@@ -184,7 +184,7 @@ enum drbd_conns {
184 /* These temporal states are all used on the way 184 /* These temporal states are all used on the way
185 * from >= C_CONNECTED to Unconnected. 185 * from >= C_CONNECTED to Unconnected.
186 * The 'disconnect reason' states 186 * The 'disconnect reason' states
187 * I do not allow to change beween them. */ 187 * I do not allow to change between them. */
188 C_TIMEOUT, 188 C_TIMEOUT,
189 C_BROKEN_PIPE, 189 C_BROKEN_PIPE,
190 C_NETWORK_FAILURE, 190 C_NETWORK_FAILURE,
diff --git a/include/linux/drbd_limits.h b/include/linux/drbd_limits.h
index bb264a5732de..246f576c981d 100644
--- a/include/linux/drbd_limits.h
+++ b/include/linux/drbd_limits.h
@@ -43,7 +43,7 @@
43 43
44/* net { */ 44/* net { */
45 /* timeout, unit centi seconds 45 /* timeout, unit centi seconds
46 * more than one minute timeout is not usefull */ 46 * more than one minute timeout is not useful */
47#define DRBD_TIMEOUT_MIN 1 47#define DRBD_TIMEOUT_MIN 1
48#define DRBD_TIMEOUT_MAX 600 48#define DRBD_TIMEOUT_MAX 600
49#define DRBD_TIMEOUT_DEF 60 /* 6 seconds */ 49#define DRBD_TIMEOUT_DEF 60 /* 6 seconds */
@@ -68,7 +68,7 @@
68#define DRBD_MAX_EPOCH_SIZE_MAX 20000 68#define DRBD_MAX_EPOCH_SIZE_MAX 20000
69#define DRBD_MAX_EPOCH_SIZE_DEF 2048 69#define DRBD_MAX_EPOCH_SIZE_DEF 2048
70 70
71 /* I don't think that a tcp send buffer of more than 10M is usefull */ 71 /* I don't think that a tcp send buffer of more than 10M is useful */
72#define DRBD_SNDBUF_SIZE_MIN 0 72#define DRBD_SNDBUF_SIZE_MIN 0
73#define DRBD_SNDBUF_SIZE_MAX (10<<20) 73#define DRBD_SNDBUF_SIZE_MAX (10<<20)
74#define DRBD_SNDBUF_SIZE_DEF 0 74#define DRBD_SNDBUF_SIZE_DEF 0
@@ -101,7 +101,7 @@
101#define DRBD_RATE_MAX (4 << 20) 101#define DRBD_RATE_MAX (4 << 20)
102#define DRBD_RATE_DEF 250 /* kb/second */ 102#define DRBD_RATE_DEF 250 /* kb/second */
103 103
104 /* less than 7 would hit performance unneccessarily. 104 /* less than 7 would hit performance unnecessarily.
105 * 3833 is the largest prime that still does fit 105 * 3833 is the largest prime that still does fit
106 * into 64 sectors of activity log */ 106 * into 64 sectors of activity log */
107#define DRBD_AL_EXTENTS_MIN 7 107#define DRBD_AL_EXTENTS_MIN 7
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index c8fcbdd2b0e7..dc80d8294247 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -614,7 +614,7 @@ struct ethtool_sfeatures {
614 * values of corresponding bits in features[].requested. Bits in .requested 614 * values of corresponding bits in features[].requested. Bits in .requested
615 * not set in .valid or not changeable are ignored. 615 * not set in .valid or not changeable are ignored.
616 * 616 *
617 * Returns %EINVAL when .valid contains undefined or never-changable bits 617 * Returns %EINVAL when .valid contains undefined or never-changeable bits
618 * or size is not equal to required number of features words (32-bit blocks). 618 * or size is not equal to required number of features words (32-bit blocks).
619 * Returns >= 0 if request was completed; bits set in the value mean: 619 * Returns >= 0 if request was completed; bits set in the value mean:
620 * %ETHTOOL_F_UNSUPPORTED - there were bits set in .valid that are not 620 * %ETHTOOL_F_UNSUPPORTED - there were bits set in .valid that are not
diff --git a/include/linux/eventpoll.h b/include/linux/eventpoll.h
index f6856a5a1d4b..f362733186a5 100644
--- a/include/linux/eventpoll.h
+++ b/include/linux/eventpoll.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * include/linux/eventpoll.h ( Efficent event polling implementation ) 2 * include/linux/eventpoll.h ( Efficient event polling implementation )
3 * Copyright (C) 2001,...,2006 Davide Libenzi 3 * Copyright (C) 2001,...,2006 Davide Libenzi
4 * 4 *
5 * This program is free software; you can redistribute it and/or modify 5 * This program is free software; you can redistribute it and/or modify
diff --git a/include/linux/exportfs.h b/include/linux/exportfs.h
index 33a42f24b275..3a4cef5322dc 100644
--- a/include/linux/exportfs.h
+++ b/include/linux/exportfs.h
@@ -120,7 +120,7 @@ struct fid {
120 * encode_fh: 120 * encode_fh:
121 * @encode_fh should store in the file handle fragment @fh (using at most 121 * @encode_fh should store in the file handle fragment @fh (using at most
122 * @max_len bytes) information that can be used by @decode_fh to recover the 122 * @max_len bytes) information that can be used by @decode_fh to recover the
123 * file refered to by the &struct dentry @de. If the @connectable flag is 123 * file referred to by the &struct dentry @de. If the @connectable flag is
124 * set, the encode_fh() should store sufficient information so that a good 124 * set, the encode_fh() should store sufficient information so that a good
125 * attempt can be made to find not only the file but also it's place in the 125 * attempt can be made to find not only the file but also it's place in the
126 * filesystem. This typically means storing a reference to de->d_parent in 126 * filesystem. This typically means storing a reference to de->d_parent in
diff --git a/include/linux/fb.h b/include/linux/fb.h
index b2a36391d2a1..df728c1c29ed 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -534,14 +534,14 @@ struct fb_cursor_user {
534#define FB_EVENT_GET_CONSOLE_MAP 0x07 534#define FB_EVENT_GET_CONSOLE_MAP 0x07
535/* CONSOLE-SPECIFIC: set console to framebuffer mapping */ 535/* CONSOLE-SPECIFIC: set console to framebuffer mapping */
536#define FB_EVENT_SET_CONSOLE_MAP 0x08 536#define FB_EVENT_SET_CONSOLE_MAP 0x08
537/* A hardware display blank change occured */ 537/* A hardware display blank change occurred */
538#define FB_EVENT_BLANK 0x09 538#define FB_EVENT_BLANK 0x09
539/* Private modelist is to be replaced */ 539/* Private modelist is to be replaced */
540#define FB_EVENT_NEW_MODELIST 0x0A 540#define FB_EVENT_NEW_MODELIST 0x0A
541/* The resolution of the passed in fb_info about to change and 541/* The resolution of the passed in fb_info about to change and
542 all vc's should be changed */ 542 all vc's should be changed */
543#define FB_EVENT_MODE_CHANGE_ALL 0x0B 543#define FB_EVENT_MODE_CHANGE_ALL 0x0B
544/* A software display blank change occured */ 544/* A software display blank change occurred */
545#define FB_EVENT_CONBLANK 0x0C 545#define FB_EVENT_CONBLANK 0x0C
546/* Get drawing requirements */ 546/* Get drawing requirements */
547#define FB_EVENT_GET_REQ 0x0D 547#define FB_EVENT_GET_REQ 0x0D
@@ -805,7 +805,7 @@ struct fb_tile_ops {
805/* A driver may set this flag to indicate that it does want a set_par to be 805/* A driver may set this flag to indicate that it does want a set_par to be
806 * called every time when fbcon_switch is executed. The advantage is that with 806 * called every time when fbcon_switch is executed. The advantage is that with
807 * this flag set you can really be sure that set_par is always called before 807 * this flag set you can really be sure that set_par is always called before
808 * any of the functions dependant on the correct hardware state or altering 808 * any of the functions dependent on the correct hardware state or altering
809 * that state, even if you are using some broken X releases. The disadvantage 809 * that state, even if you are using some broken X releases. The disadvantage
810 * is that it introduces unwanted delays to every console switch if set_par 810 * is that it introduces unwanted delays to every console switch if set_par
811 * is slow. It is a good idea to try this flag in the drivers initialization 811 * is slow. It is a good idea to try this flag in the drivers initialization
@@ -877,7 +877,7 @@ struct fb_info {
877 void *fbcon_par; /* fbcon use-only private area */ 877 void *fbcon_par; /* fbcon use-only private area */
878 /* From here on everything is device dependent */ 878 /* From here on everything is device dependent */
879 void *par; 879 void *par;
880 /* we need the PCI or similiar aperture base/size not 880 /* we need the PCI or similar aperture base/size not
881 smem_start/size as smem_start may just be an object 881 smem_start/size as smem_start may just be an object
882 allocated inside the aperture so may not actually overlap */ 882 allocated inside the aperture so may not actually overlap */
883 struct apertures_struct { 883 struct apertures_struct {
diff --git a/include/linux/firewire-cdev.h b/include/linux/firewire-cdev.h
index 59ea406be7f6..4ff09889c5c0 100644
--- a/include/linux/firewire-cdev.h
+++ b/include/linux/firewire-cdev.h
@@ -900,7 +900,7 @@ struct fw_cdev_get_cycle_timer2 {
900 900
901/** 901/**
902 * struct fw_cdev_allocate_iso_resource - (De)allocate a channel or bandwidth 902 * struct fw_cdev_allocate_iso_resource - (De)allocate a channel or bandwidth
903 * @closure: Passed back to userspace in correponding iso resource events 903 * @closure: Passed back to userspace in corresponding iso resource events
904 * @channels: Isochronous channels of which one is to be (de)allocated 904 * @channels: Isochronous channels of which one is to be (de)allocated
905 * @bandwidth: Isochronous bandwidth units to be (de)allocated 905 * @bandwidth: Isochronous bandwidth units to be (de)allocated
906 * @handle: Handle to the allocation, written by the kernel (only valid in 906 * @handle: Handle to the allocation, written by the kernel (only valid in
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 1b95af37e3b3..dbd860af0804 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -465,7 +465,7 @@ struct iattr {
465 struct timespec ia_ctime; 465 struct timespec ia_ctime;
466 466
467 /* 467 /*
468 * Not an attribute, but an auxilary info for filesystems wanting to 468 * Not an attribute, but an auxiliary info for filesystems wanting to
469 * implement an ftruncate() like method. NOTE: filesystem should 469 * implement an ftruncate() like method. NOTE: filesystem should
470 * check for (ia_valid & ATTR_FILE), and not for (ia_file != NULL). 470 * check for (ia_valid & ATTR_FILE), and not for (ia_file != NULL).
471 */ 471 */
@@ -649,7 +649,7 @@ struct address_space {
649} __attribute__((aligned(sizeof(long)))); 649} __attribute__((aligned(sizeof(long))));
650 /* 650 /*
651 * On most architectures that alignment is already the case; but 651 * On most architectures that alignment is already the case; but
652 * must be enforced here for CRIS, to let the least signficant bit 652 * must be enforced here for CRIS, to let the least significant bit
653 * of struct page's "mapping" pointer be used for PAGE_MAPPING_ANON. 653 * of struct page's "mapping" pointer be used for PAGE_MAPPING_ANON.
654 */ 654 */
655 655
diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
index b8581c09d19f..76427e688d15 100644
--- a/include/linux/fscache-cache.h
+++ b/include/linux/fscache-cache.h
@@ -236,7 +236,7 @@ struct fscache_cache_ops {
236 /* unpin an object in the cache */ 236 /* unpin an object in the cache */
237 void (*unpin_object)(struct fscache_object *object); 237 void (*unpin_object)(struct fscache_object *object);
238 238
239 /* store the updated auxilliary data on an object */ 239 /* store the updated auxiliary data on an object */
240 void (*update_object)(struct fscache_object *object); 240 void (*update_object)(struct fscache_object *object);
241 241
242 /* discard the resources pinned by an object and effect retirement if 242 /* discard the resources pinned by an object and effect retirement if
diff --git a/include/linux/fscache.h b/include/linux/fscache.h
index ec0dad5ab90f..7c4d72f5581f 100644
--- a/include/linux/fscache.h
+++ b/include/linux/fscache.h
@@ -102,9 +102,9 @@ struct fscache_cookie_def {
102 */ 102 */
103 void (*get_attr)(const void *cookie_netfs_data, uint64_t *size); 103 void (*get_attr)(const void *cookie_netfs_data, uint64_t *size);
104 104
105 /* get the auxilliary data from netfs data 105 /* get the auxiliary data from netfs data
106 * - this function can be absent if the index carries no state data 106 * - this function can be absent if the index carries no state data
107 * - should store the auxilliary data in the buffer 107 * - should store the auxiliary data in the buffer
108 * - should return the amount of amount stored 108 * - should return the amount of amount stored
109 * - not permitted to return an error 109 * - not permitted to return an error
110 * - the netfs data from the cookie being used as the source is 110 * - the netfs data from the cookie being used as the source is
@@ -117,7 +117,7 @@ struct fscache_cookie_def {
117 /* consult the netfs about the state of an object 117 /* consult the netfs about the state of an object
118 * - this function can be absent if the index carries no state data 118 * - this function can be absent if the index carries no state data
119 * - the netfs data from the cookie being used as the target is 119 * - the netfs data from the cookie being used as the target is
120 * presented, as is the auxilliary data 120 * presented, as is the auxiliary data
121 */ 121 */
122 enum fscache_checkaux (*check_aux)(void *cookie_netfs_data, 122 enum fscache_checkaux (*check_aux)(void *cookie_netfs_data,
123 const void *data, 123 const void *data,
diff --git a/include/linux/hid.h b/include/linux/hid.h
index bb29bb1dbd2f..42f7e2fb501f 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -799,7 +799,7 @@ static inline int __must_check hid_parse(struct hid_device *hdev)
799 * 799 *
800 * Call this in probe function *after* hid_parse. This will setup HW buffers 800 * Call this in probe function *after* hid_parse. This will setup HW buffers
801 * and start the device (if not deffered to device open). hid_hw_stop must be 801 * and start the device (if not deffered to device open). hid_hw_stop must be
802 * called if this was successfull. 802 * called if this was successful.
803 */ 803 */
804static inline int __must_check hid_hw_start(struct hid_device *hdev, 804static inline int __must_check hid_hw_start(struct hid_device *hdev,
805 unsigned int connect_mask) 805 unsigned int connect_mask)
diff --git a/include/linux/hp_sdc.h b/include/linux/hp_sdc.h
index 9db3d454887f..d392975d8887 100644
--- a/include/linux/hp_sdc.h
+++ b/include/linux/hp_sdc.h
@@ -101,7 +101,7 @@ int hp_sdc_dequeue_transaction(hp_sdc_transaction *this);
101#define HP_SDC_STATUS_REG 0x40 /* Data from an i8042 register */ 101#define HP_SDC_STATUS_REG 0x40 /* Data from an i8042 register */
102#define HP_SDC_STATUS_HILCMD 0x50 /* Command from HIL MLC */ 102#define HP_SDC_STATUS_HILCMD 0x50 /* Command from HIL MLC */
103#define HP_SDC_STATUS_HILDATA 0x60 /* Data from HIL MLC */ 103#define HP_SDC_STATUS_HILDATA 0x60 /* Data from HIL MLC */
104#define HP_SDC_STATUS_PUP 0x70 /* Sucessful power-up self test */ 104#define HP_SDC_STATUS_PUP 0x70 /* Successful power-up self test */
105#define HP_SDC_STATUS_KCOOKED 0x80 /* Key from cooked kbd */ 105#define HP_SDC_STATUS_KCOOKED 0x80 /* Key from cooked kbd */
106#define HP_SDC_STATUS_KRPG 0xc0 /* Key from Repeat Gen */ 106#define HP_SDC_STATUS_KRPG 0xc0 /* Key from Repeat Gen */
107#define HP_SDC_STATUS_KMOD_SUP 0x10 /* Shift key is up */ 107#define HP_SDC_STATUS_KMOD_SUP 0x10 /* Shift key is up */
diff --git a/include/linux/i2o.h b/include/linux/i2o.h
index 9e7a12d6385d..a6deef4f4f67 100644
--- a/include/linux/i2o.h
+++ b/include/linux/i2o.h
@@ -826,7 +826,7 @@ static inline struct i2o_message __iomem *i2o_msg_in_to_virt(struct
826 * @c: I2O controller 826 * @c: I2O controller
827 * 827 *
828 * This function tries to get a message frame. If no message frame is 828 * This function tries to get a message frame. If no message frame is
829 * available do not wait until one is availabe (see also i2o_msg_get_wait). 829 * available do not wait until one is available (see also i2o_msg_get_wait).
830 * The returned pointer to the message frame is not in I/O memory, it is 830 * The returned pointer to the message frame is not in I/O memory, it is
831 * allocated from a mempool. But because a MFA is allocated from the 831 * allocated from a mempool. But because a MFA is allocated from the
832 * controller too it is guaranteed that i2o_msg_post() will never fail. 832 * controller too it is guaranteed that i2o_msg_post() will never fail.
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 943c9b53695c..bea0ac750712 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -98,7 +98,7 @@ typedef irqreturn_t (*irq_handler_t)(int, void *);
98 * @next: pointer to the next irqaction for shared interrupts 98 * @next: pointer to the next irqaction for shared interrupts
99 * @irq: interrupt number 99 * @irq: interrupt number
100 * @dir: pointer to the proc/irq/NN/name entry 100 * @dir: pointer to the proc/irq/NN/name entry
101 * @thread_fn: interupt handler function for threaded interrupts 101 * @thread_fn: interrupt handler function for threaded interrupts
102 * @thread: thread pointer for threaded interrupts 102 * @thread: thread pointer for threaded interrupts
103 * @thread_flags: flags related to @thread 103 * @thread_flags: flags related to @thread
104 * @thread_mask: bitmask for keeping track of @thread activity 104 * @thread_mask: bitmask for keeping track of @thread activity
@@ -484,7 +484,7 @@ extern void __send_remote_softirq(struct call_single_data *cp, int cpu,
484 Properties: 484 Properties:
485 * If tasklet_schedule() is called, then tasklet is guaranteed 485 * If tasklet_schedule() is called, then tasklet is guaranteed
486 to be executed on some cpu at least once after this. 486 to be executed on some cpu at least once after this.
487 * If the tasklet is already scheduled, but its excecution is still not 487 * If the tasklet is already scheduled, but its execution is still not
488 started, it will be executed only once. 488 started, it will be executed only once.
489 * If this tasklet is already running on another CPU (or schedule is called 489 * If this tasklet is already running on another CPU (or schedule is called
490 from tasklet itself), it is rescheduled for later. 490 from tasklet itself), it is rescheduled for later.
diff --git a/include/linux/ipmi.h b/include/linux/ipmi.h
index 045f2f275cd0..ca85cf894e33 100644
--- a/include/linux/ipmi.h
+++ b/include/linux/ipmi.h
@@ -111,7 +111,7 @@ struct ipmi_ipmb_addr {
111 * A LAN Address. This is an address to/from a LAN interface bridged 111 * A LAN Address. This is an address to/from a LAN interface bridged
112 * by the BMC, not an address actually out on the LAN. 112 * by the BMC, not an address actually out on the LAN.
113 * 113 *
114 * A concious decision was made here to deviate slightly from the IPMI 114 * A conscious decision was made here to deviate slightly from the IPMI
115 * spec. We do not use rqSWID and rsSWID like it shows in the 115 * spec. We do not use rqSWID and rsSWID like it shows in the
116 * message. Instead, we use remote_SWID and local_SWID. This means 116 * message. Instead, we use remote_SWID and local_SWID. This means
117 * that any message (a request or response) from another device will 117 * that any message (a request or response) from another device will
@@ -259,7 +259,7 @@ struct ipmi_recv_msg {
259 void (*done)(struct ipmi_recv_msg *msg); 259 void (*done)(struct ipmi_recv_msg *msg);
260 260
261 /* Place-holder for the data, don't make any assumptions about 261 /* Place-holder for the data, don't make any assumptions about
262 the size or existance of this, since it may change. */ 262 the size or existence of this, since it may change. */
263 unsigned char msg_data[IPMI_MAX_MSG_LENGTH]; 263 unsigned char msg_data[IPMI_MAX_MSG_LENGTH];
264}; 264};
265 265
diff --git a/include/linux/isdn/hdlc.h b/include/linux/isdn/hdlc.h
index 4b3ecc40889a..96521370c782 100644
--- a/include/linux/isdn/hdlc.h
+++ b/include/linux/isdn/hdlc.h
@@ -2,7 +2,7 @@
2 * hdlc.h -- General purpose ISDN HDLC decoder. 2 * hdlc.h -- General purpose ISDN HDLC decoder.
3 * 3 *
4 * Implementation of a HDLC decoder/encoder in software. 4 * Implementation of a HDLC decoder/encoder in software.
5 * Neccessary because some ISDN devices don't have HDLC 5 * Necessary because some ISDN devices don't have HDLC
6 * controllers. 6 * controllers.
7 * 7 *
8 * Copyright (C) 8 * Copyright (C)
diff --git a/include/linux/ixjuser.h b/include/linux/ixjuser.h
index 88b45895746d..94ab5e942e53 100644
--- a/include/linux/ixjuser.h
+++ b/include/linux/ixjuser.h
@@ -50,7 +50,7 @@
50* IOCTL's used for the Quicknet Telephony Cards 50* IOCTL's used for the Quicknet Telephony Cards
51* 51*
52* If you use the IXJCTL_TESTRAM command, the card must be power cycled to 52* If you use the IXJCTL_TESTRAM command, the card must be power cycled to
53* reset the SRAM values before futher use. 53* reset the SRAM values before further use.
54* 54*
55******************************************************************************/ 55******************************************************************************/
56 56
diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
index 922aa313c9f9..f97672a36fa8 100644
--- a/include/linux/jiffies.h
+++ b/include/linux/jiffies.h
@@ -42,7 +42,7 @@
42/* LATCH is used in the interval timer and ftape setup. */ 42/* LATCH is used in the interval timer and ftape setup. */
43#define LATCH ((CLOCK_TICK_RATE + HZ/2) / HZ) /* For divider */ 43#define LATCH ((CLOCK_TICK_RATE + HZ/2) / HZ) /* For divider */
44 44
45/* Suppose we want to devide two numbers NOM and DEN: NOM/DEN, then we can 45/* Suppose we want to divide two numbers NOM and DEN: NOM/DEN, then we can
46 * improve accuracy by shifting LSH bits, hence calculating: 46 * improve accuracy by shifting LSH bits, hence calculating:
47 * (NOM << LSH) / DEN 47 * (NOM << LSH) / DEN
48 * This however means trouble for large NOM, because (NOM << LSH) may no 48 * This however means trouble for large NOM, because (NOM << LSH) may no
diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index e1ceaa9b36bb..603bec2913b0 100644
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@ -35,7 +35,7 @@
35 * 35 *
36 * On 32-bit CPUs an optimized representation of the timespec structure 36 * On 32-bit CPUs an optimized representation of the timespec structure
37 * is used to avoid expensive conversions from and to timespecs. The 37 * is used to avoid expensive conversions from and to timespecs. The
38 * endian-aware order of the tv struct members is choosen to allow 38 * endian-aware order of the tv struct members is chosen to allow
39 * mathematical operations on the tv64 member of the union too, which 39 * mathematical operations on the tv64 member of the union too, which
40 * for certain operations produces better code. 40 * for certain operations produces better code.
41 * 41 *
@@ -158,7 +158,7 @@ static inline ktime_t ktime_set(const long secs, const unsigned long nsecs)
158 * @lhs: minuend 158 * @lhs: minuend
159 * @rhs: subtrahend 159 * @rhs: subtrahend
160 * 160 *
161 * Returns the remainder of the substraction 161 * Returns the remainder of the subtraction
162 */ 162 */
163static inline ktime_t ktime_sub(const ktime_t lhs, const ktime_t rhs) 163static inline ktime_t ktime_sub(const ktime_t lhs, const ktime_t rhs)
164{ 164{
diff --git a/include/linux/led-lm3530.h b/include/linux/led-lm3530.h
index bb69d20da0dc..58592fa67d24 100644
--- a/include/linux/led-lm3530.h
+++ b/include/linux/led-lm3530.h
@@ -41,7 +41,7 @@
41#define LM3530_RAMP_TIME_8s (7) 41#define LM3530_RAMP_TIME_8s (7)
42 42
43/* ALS Resistor Select */ 43/* ALS Resistor Select */
44#define LM3530_ALS_IMPD_Z (0x00) /* ALS Impedence */ 44#define LM3530_ALS_IMPD_Z (0x00) /* ALS Impedance */
45#define LM3530_ALS_IMPD_13_53kOhm (0x01) 45#define LM3530_ALS_IMPD_13_53kOhm (0x01)
46#define LM3530_ALS_IMPD_9_01kOhm (0x02) 46#define LM3530_ALS_IMPD_9_01kOhm (0x02)
47#define LM3530_ALS_IMPD_5_41kOhm (0x03) 47#define LM3530_ALS_IMPD_5_41kOhm (0x03)
diff --git a/include/linux/libata.h b/include/linux/libata.h
index c71f46960f39..7f675aa81d87 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -364,7 +364,7 @@ enum {
364 ATA_EH_CMD_TIMEOUT_TABLE_SIZE = 6, 364 ATA_EH_CMD_TIMEOUT_TABLE_SIZE = 6,
365 365
366 /* Horkage types. May be set by libata or controller on drives 366 /* Horkage types. May be set by libata or controller on drives
367 (some horkage may be drive/controller pair dependant */ 367 (some horkage may be drive/controller pair dependent */
368 368
369 ATA_HORKAGE_DIAGNOSTIC = (1 << 0), /* Failed boot diag */ 369 ATA_HORKAGE_DIAGNOSTIC = (1 << 0), /* Failed boot diag */
370 ATA_HORKAGE_NODMA = (1 << 1), /* DMA problems */ 370 ATA_HORKAGE_NODMA = (1 << 1), /* DMA problems */
diff --git a/include/linux/lru_cache.h b/include/linux/lru_cache.h
index 78fbf24f357a..6a4fab7c6e09 100644
--- a/include/linux/lru_cache.h
+++ b/include/linux/lru_cache.h
@@ -148,7 +148,7 @@ write intent log information, three of which are mentioned here.
148 * 148 *
149 * DRBD currently (May 2009) only uses 61 elements on the resync lru_cache 149 * DRBD currently (May 2009) only uses 61 elements on the resync lru_cache
150 * (total memory usage 2 pages), and up to 3833 elements on the act_log 150 * (total memory usage 2 pages), and up to 3833 elements on the act_log
151 * lru_cache, totalling ~215 kB for 64bit architechture, ~53 pages. 151 * lru_cache, totalling ~215 kB for 64bit architecture, ~53 pages.
152 * 152 *
153 * We usually do not actually free these objects again, but only "recycle" 153 * We usually do not actually free these objects again, but only "recycle"
154 * them, as the change "index: -old_label, +LC_FREE" would need a transaction 154 * them, as the change "index: -old_label, +LC_FREE" would need a transaction
diff --git a/include/linux/mfd/wm8350/pmic.h b/include/linux/mfd/wm8350/pmic.h
index e786fe9841ef..579b50ca2e02 100644
--- a/include/linux/mfd/wm8350/pmic.h
+++ b/include/linux/mfd/wm8350/pmic.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * pmic.h -- Power Managment Driver for Wolfson WM8350 PMIC 2 * pmic.h -- Power Management Driver for Wolfson WM8350 PMIC
3 * 3 *
4 * Copyright 2007 Wolfson Microelectronics PLC 4 * Copyright 2007 Wolfson Microelectronics PLC
5 * 5 *
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 7606d7db96c9..692dbae6ffa7 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -608,7 +608,7 @@ static inline pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma)
608#endif 608#endif
609 609
610/* 610/*
611 * Define the bit shifts to access each section. For non-existant 611 * Define the bit shifts to access each section. For non-existent
612 * sections we define the shift as 0; that plus a 0 mask ensures 612 * sections we define the shift as 0; that plus a 0 mask ensures
613 * the compiler will optimise away reference to them. 613 * the compiler will optimise away reference to them.
614 */ 614 */
diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h
index c0207a770476..bdd7ceeb99e4 100644
--- a/include/linux/mmc/dw_mmc.h
+++ b/include/linux/mmc/dw_mmc.h
@@ -98,7 +98,7 @@ struct mmc_data;
98 * EVENT_DATA_COMPLETE is set in @pending_events, all data-related 98 * EVENT_DATA_COMPLETE is set in @pending_events, all data-related
99 * interrupts must be disabled and @data_status updated with a 99 * interrupts must be disabled and @data_status updated with a
100 * snapshot of SR. Similarly, before EVENT_CMD_COMPLETE is set, the 100 * snapshot of SR. Similarly, before EVENT_CMD_COMPLETE is set, the
101 * CMDRDY interupt must be disabled and @cmd_status updated with a 101 * CMDRDY interrupt must be disabled and @cmd_status updated with a
102 * snapshot of SR, and before EVENT_XFER_COMPLETE can be set, the 102 * snapshot of SR, and before EVENT_XFER_COMPLETE can be set, the
103 * bytes_xfered field of @data must be written. This is ensured by 103 * bytes_xfered field of @data must be written. This is ensured by
104 * using barriers. 104 * using barriers.
@@ -172,7 +172,7 @@ struct dw_mci_dma_ops {
172#define DW_MCI_QUIRK_IDMAC_DTO BIT(0) 172#define DW_MCI_QUIRK_IDMAC_DTO BIT(0)
173/* delay needed between retries on some 2.11a implementations */ 173/* delay needed between retries on some 2.11a implementations */
174#define DW_MCI_QUIRK_RETRY_DELAY BIT(1) 174#define DW_MCI_QUIRK_RETRY_DELAY BIT(1)
175/* High Speed Capable - Supports HS cards (upto 50MHz) */ 175/* High Speed Capable - Supports HS cards (up to 50MHz) */
176#define DW_MCI_QUIRK_HIGHSPEED BIT(2) 176#define DW_MCI_QUIRK_HIGHSPEED BIT(2)
177/* Unreliable card detection */ 177/* Unreliable card detection */
178#define DW_MCI_QUIRK_BROKEN_CARD_DETECTION BIT(3) 178#define DW_MCI_QUIRK_BROKEN_CARD_DETECTION BIT(3)
diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h
index 9d2deb200f54..a3759cb0ac10 100644
--- a/include/linux/mroute6.h
+++ b/include/linux/mroute6.h
@@ -249,7 +249,7 @@ static inline int ip6mr_sk_done(struct sock *sk)
249 * Structure used to communicate from kernel to multicast router. 249 * Structure used to communicate from kernel to multicast router.
250 * We'll overlay the structure onto an MLD header (not an IPv6 heder like igmpmsg{} 250 * We'll overlay the structure onto an MLD header (not an IPv6 heder like igmpmsg{}
251 * used for IPv4 implementation). This is because this structure will be passed via an 251 * used for IPv4 implementation). This is because this structure will be passed via an
252 * IPv6 raw socket, on wich an application will only receiver the payload i.e the data after 252 * IPv6 raw socket, on which an application will only receiver the payload i.e the data after
253 * the IPv6 header and all the extension headers. (See section 3 of RFC 3542) 253 * the IPv6 header and all the extension headers. (See section 3 of RFC 3542)
254 */ 254 */
255 255
diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
index 0d823f2dd667..d24925492972 100644
--- a/include/linux/mtd/cfi.h
+++ b/include/linux/mtd/cfi.h
@@ -308,7 +308,7 @@ static inline uint32_t cfi_build_cmd_addr(uint32_t cmd_ofs,
308 308
309 addr = (cmd_ofs * type) * interleave; 309 addr = (cmd_ofs * type) * interleave;
310 310
311 /* Modify the unlock address if we are in compatiblity mode. 311 /* Modify the unlock address if we are in compatibility mode.
312 * For 16bit devices on 8 bit busses 312 * For 16bit devices on 8 bit busses
313 * and 32bit devices on 16 bit busses 313 * and 32bit devices on 16 bit busses
314 * set the low bit of the alternating bit sequence of the address. 314 * set the low bit of the alternating bit sequence of the address.
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index ae67ef56a8f5..d44192740f6f 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -416,9 +416,9 @@ struct nand_buffers {
416 * @select_chip: [REPLACEABLE] select chip nr 416 * @select_chip: [REPLACEABLE] select chip nr
417 * @block_bad: [REPLACEABLE] check, if the block is bad 417 * @block_bad: [REPLACEABLE] check, if the block is bad
418 * @block_markbad: [REPLACEABLE] mark the block bad 418 * @block_markbad: [REPLACEABLE] mark the block bad
419 * @cmd_ctrl: [BOARDSPECIFIC] hardwarespecific funtion for controlling 419 * @cmd_ctrl: [BOARDSPECIFIC] hardwarespecific function for controlling
420 * ALE/CLE/nCE. Also used to write command and address 420 * ALE/CLE/nCE. Also used to write command and address
421 * @init_size: [BOARDSPECIFIC] hardwarespecific funtion for setting 421 * @init_size: [BOARDSPECIFIC] hardwarespecific function for setting
422 * mtd->oobsize, mtd->writesize and so on. 422 * mtd->oobsize, mtd->writesize and so on.
423 * @id_data contains the 8 bytes values of NAND_CMD_READID. 423 * @id_data contains the 8 bytes values of NAND_CMD_READID.
424 * Return with the bus width. 424 * Return with the bus width.
@@ -437,7 +437,7 @@ struct nand_buffers {
437 * @erase_cmd: [INTERN] erase command write function, selectable due 437 * @erase_cmd: [INTERN] erase command write function, selectable due
438 * to AND support. 438 * to AND support.
439 * @scan_bbt: [REPLACEABLE] function to scan bad block table 439 * @scan_bbt: [REPLACEABLE] function to scan bad block table
440 * @chip_delay: [BOARDSPECIFIC] chip dependent delay for transfering 440 * @chip_delay: [BOARDSPECIFIC] chip dependent delay for transferring
441 * data from array to read regs (tR). 441 * data from array to read regs (tR).
442 * @state: [INTERN] the current state of the NAND device 442 * @state: [INTERN] the current state of the NAND device
443 * @oob_poi: poison value buffer 443 * @oob_poi: poison value buffer
diff --git a/include/linux/mtd/xip.h b/include/linux/mtd/xip.h
index 36efcba15ecd..abed4dec5c2f 100644
--- a/include/linux/mtd/xip.h
+++ b/include/linux/mtd/xip.h
@@ -51,7 +51,7 @@
51 * return in usecs the elapsed timebetween now and the reference x as 51 * return in usecs the elapsed timebetween now and the reference x as
52 * returned by xip_currtime(). 52 * returned by xip_currtime().
53 * 53 *
54 * note 1: convertion to usec can be approximated, as long as the 54 * note 1: conversion to usec can be approximated, as long as the
55 * returned value is <= the real elapsed time. 55 * returned value is <= the real elapsed time.
56 * note 2: this should be able to cope with a few seconds without 56 * note 2: this should be able to cope with a few seconds without
57 * overflowing. 57 * overflowing.
diff --git a/include/linux/netfilter/nf_conntrack_proto_gre.h b/include/linux/netfilter/nf_conntrack_proto_gre.h
index 2a10efda17fb..6a0664c0c451 100644
--- a/include/linux/netfilter/nf_conntrack_proto_gre.h
+++ b/include/linux/netfilter/nf_conntrack_proto_gre.h
@@ -60,7 +60,7 @@ struct gre_hdr_pptp {
60 __be16 payload_len; /* size of ppp payload, not inc. gre header */ 60 __be16 payload_len; /* size of ppp payload, not inc. gre header */
61 __be16 call_id; /* peer's call_id for this session */ 61 __be16 call_id; /* peer's call_id for this session */
62 __be32 seq; /* sequence number. Present if S==1 */ 62 __be32 seq; /* sequence number. Present if S==1 */
63 __be32 ack; /* seq number of highest packet recieved by */ 63 __be32 ack; /* seq number of highest packet received by */
64 /* sender in this session */ 64 /* sender in this session */
65}; 65};
66 66
diff --git a/include/linux/netfilter_bridge/ebtables.h b/include/linux/netfilter_bridge/ebtables.h
index 1c6f0c5f530e..8797ed16feb2 100644
--- a/include/linux/netfilter_bridge/ebtables.h
+++ b/include/linux/netfilter_bridge/ebtables.h
@@ -92,7 +92,7 @@ struct ebt_entries {
92 92
93/* This is a hack to make a difference between an ebt_entry struct and an 93/* This is a hack to make a difference between an ebt_entry struct and an
94 * ebt_entries struct when traversing the entries from start to end. 94 * ebt_entries struct when traversing the entries from start to end.
95 * Using this simplifies the code alot, while still being able to use 95 * Using this simplifies the code a lot, while still being able to use
96 * ebt_entries. 96 * ebt_entries.
97 * Contrary, iptables doesn't use something like ebt_entries and therefore uses 97 * Contrary, iptables doesn't use something like ebt_entries and therefore uses
98 * different techniques for naming the policy and such. So, iptables doesn't 98 * different techniques for naming the policy and such. So, iptables doesn't
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index b528f6d4b860..178fafe0ff93 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -359,7 +359,7 @@ enum nfsstat4 {
359 /* Error 10073 is unused. */ 359 /* Error 10073 is unused. */
360 NFS4ERR_CLIENTID_BUSY = 10074, /* clientid has state */ 360 NFS4ERR_CLIENTID_BUSY = 10074, /* clientid has state */
361 NFS4ERR_PNFS_IO_HOLE = 10075, /* IO to _SPARSE file hole */ 361 NFS4ERR_PNFS_IO_HOLE = 10075, /* IO to _SPARSE file hole */
362 NFS4ERR_SEQ_FALSE_RETRY = 10076, /* retry not origional */ 362 NFS4ERR_SEQ_FALSE_RETRY = 10076, /* retry not original */
363 NFS4ERR_BAD_HIGH_SLOT = 10077, /* sequence arg bad */ 363 NFS4ERR_BAD_HIGH_SLOT = 10077, /* sequence arg bad */
364 NFS4ERR_DEADSESSION = 10078, /* persistent session dead */ 364 NFS4ERR_DEADSESSION = 10078, /* persistent session dead */
365 NFS4ERR_ENCR_ALG_UNSUPP = 10079, /* SSV alg mismatch */ 365 NFS4ERR_ENCR_ALG_UNSUPP = 10079, /* SSV alg mismatch */
diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h
index bd316159278c..84058ec69390 100644
--- a/include/linux/nfsd/export.h
+++ b/include/linux/nfsd/export.h
@@ -80,7 +80,7 @@ struct nfsd4_fs_locations {
80 80
81/* 81/*
82 * We keep an array of pseudoflavors with the export, in order from most 82 * We keep an array of pseudoflavors with the export, in order from most
83 * to least preferred. For the forseeable future, we don't expect more 83 * to least preferred. For the foreseeable future, we don't expect more
84 * than the eight pseudoflavors null, unix, krb5, krb5i, krb5p, skpm3, 84 * than the eight pseudoflavors null, unix, krb5, krb5i, krb5p, skpm3,
85 * spkm3i, and spkm3p (and using all 8 at once should be rare). 85 * spkm3i, and spkm3p (and using all 8 at once should be rare).
86 */ 86 */
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h
index 80d55bbc5365..f76d80ccec10 100644
--- a/include/linux/nfsd/nfsfh.h
+++ b/include/linux/nfsd/nfsfh.h
@@ -49,7 +49,7 @@ struct nfs_fhbase_old {
49 * 49 *
50 * The auth_type field specifies how the filehandle can be authenticated 50 * The auth_type field specifies how the filehandle can be authenticated
51 * This might allow a file to be confirmed to be in a writable part of a 51 * This might allow a file to be confirmed to be in a writable part of a
52 * filetree without checking the path from it upto the root. 52 * filetree without checking the path from it up to the root.
53 * Current values: 53 * Current values:
54 * 0 - No authentication. fb_auth is 0 bytes long 54 * 0 - No authentication. fb_auth is 0 bytes long
55 * Possible future values: 55 * Possible future values:
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index 30022189104d..bbfa1093f606 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -414,7 +414,7 @@
414 * @__NL80211_CMD_AFTER_LAST: internal use 414 * @__NL80211_CMD_AFTER_LAST: internal use
415 */ 415 */
416enum nl80211_commands { 416enum nl80211_commands {
417/* don't change the order or add anything inbetween, this is ABI! */ 417/* don't change the order or add anything between, this is ABI! */
418 NL80211_CMD_UNSPEC, 418 NL80211_CMD_UNSPEC,
419 419
420 NL80211_CMD_GET_WIPHY, /* can dump */ 420 NL80211_CMD_GET_WIPHY, /* can dump */
@@ -860,7 +860,7 @@ enum nl80211_commands {
860 * This can be used to mask out antennas which are not attached or should 860 * This can be used to mask out antennas which are not attached or should
861 * not be used for receiving. If an antenna is not selected in this bitmap 861 * not be used for receiving. If an antenna is not selected in this bitmap
862 * the hardware should not be configured to receive on this antenna. 862 * the hardware should not be configured to receive on this antenna.
863 * For a more detailed descripton see @NL80211_ATTR_WIPHY_ANTENNA_TX. 863 * For a more detailed description see @NL80211_ATTR_WIPHY_ANTENNA_TX.
864 * 864 *
865 * @NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX: Bitmap of antennas which are available 865 * @NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX: Bitmap of antennas which are available
866 * for configuration as TX antennas via the above parameters. 866 * for configuration as TX antennas via the above parameters.
@@ -891,7 +891,7 @@ enum nl80211_commands {
891 * @__NL80211_ATTR_AFTER_LAST: internal use 891 * @__NL80211_ATTR_AFTER_LAST: internal use
892 */ 892 */
893enum nl80211_attrs { 893enum nl80211_attrs {
894/* don't change the order or add anything inbetween, this is ABI! */ 894/* don't change the order or add anything between, this is ABI! */
895 NL80211_ATTR_UNSPEC, 895 NL80211_ATTR_UNSPEC,
896 896
897 NL80211_ATTR_WIPHY, 897 NL80211_ATTR_WIPHY,
@@ -1419,7 +1419,7 @@ enum nl80211_bitrate_attr {
1419 * 802.11 country information element with regulatory information it 1419 * 802.11 country information element with regulatory information it
1420 * thinks we should consider. cfg80211 only processes the country 1420 * thinks we should consider. cfg80211 only processes the country
1421 * code from the IE, and relies on the regulatory domain information 1421 * code from the IE, and relies on the regulatory domain information
1422 * structure pased by userspace (CRDA) from our wireless-regdb. 1422 * structure passed by userspace (CRDA) from our wireless-regdb.
1423 * If a channel is enabled but the country code indicates it should 1423 * If a channel is enabled but the country code indicates it should
1424 * be disabled we disable the channel and re-enable it upon disassociation. 1424 * be disabled we disable the channel and re-enable it upon disassociation.
1425 */ 1425 */
@@ -1598,7 +1598,7 @@ enum nl80211_mntr_flags {
1598 * @NL80211_MESHCONF_RETRY_TIMEOUT: specifies the initial retry timeout in 1598 * @NL80211_MESHCONF_RETRY_TIMEOUT: specifies the initial retry timeout in
1599 * millisecond units, used by the Peer Link Open message 1599 * millisecond units, used by the Peer Link Open message
1600 * 1600 *
1601 * @NL80211_MESHCONF_CONFIRM_TIMEOUT: specifies the inital confirm timeout, in 1601 * @NL80211_MESHCONF_CONFIRM_TIMEOUT: specifies the initial confirm timeout, in
1602 * millisecond units, used by the peer link management to close a peer link 1602 * millisecond units, used by the peer link management to close a peer link
1603 * 1603 *
1604 * @NL80211_MESHCONF_HOLDING_TIMEOUT: specifies the holding timeout, in 1604 * @NL80211_MESHCONF_HOLDING_TIMEOUT: specifies the holding timeout, in
diff --git a/include/linux/notifier.h b/include/linux/notifier.h
index 2026f9e1ceb8..621dfa16acc0 100644
--- a/include/linux/notifier.h
+++ b/include/linux/notifier.h
@@ -237,7 +237,7 @@ static inline int notifier_to_errno(int ret)
237 * enabling interrupts. Must not sleep, 237 * enabling interrupts. Must not sleep,
238 * must not fail */ 238 * must not fail */
239 239
240/* Used for CPU hotplug events occuring while tasks are frozen due to a suspend 240/* Used for CPU hotplug events occurring while tasks are frozen due to a suspend
241 * operation in progress 241 * operation in progress
242 */ 242 */
243#define CPU_TASKS_FROZEN 0x0010 243#define CPU_TASKS_FROZEN 0x0010
diff --git a/include/linux/omap3isp.h b/include/linux/omap3isp.h
index 150822b4dbff..b6111f8cd49a 100644
--- a/include/linux/omap3isp.h
+++ b/include/linux/omap3isp.h
@@ -250,7 +250,7 @@ enum omap3isp_h3a_af_rgbpos {
250/* Contains the information regarding the Horizontal Median Filter */ 250/* Contains the information regarding the Horizontal Median Filter */
251struct omap3isp_h3a_af_hmf { 251struct omap3isp_h3a_af_hmf {
252 __u8 enable; /* Status of Horizontal Median Filter */ 252 __u8 enable; /* Status of Horizontal Median Filter */
253 __u8 threshold; /* Threshhold Value for Horizontal Median Filter */ 253 __u8 threshold; /* Threshold Value for Horizontal Median Filter */
254}; 254};
255 255
256/* Contains the information regarding the IIR Filters */ 256/* Contains the information regarding the IIR Filters */
diff --git a/include/linux/page_cgroup.h b/include/linux/page_cgroup.h
index f5de21de31dd..961ecc7d30bc 100644
--- a/include/linux/page_cgroup.h
+++ b/include/linux/page_cgroup.h
@@ -138,7 +138,7 @@ static inline void move_unlock_page_cgroup(struct page_cgroup *pc,
138 138
139#define PCG_ARRAYID_OFFSET (BITS_PER_LONG - PCG_ARRAYID_WIDTH) 139#define PCG_ARRAYID_OFFSET (BITS_PER_LONG - PCG_ARRAYID_WIDTH)
140/* 140/*
141 * Zero the shift count for non-existant fields, to prevent compiler 141 * Zero the shift count for non-existent fields, to prevent compiler
142 * warnings and ensure references are optimized away. 142 * warnings and ensure references are optimized away.
143 */ 143 */
144#define PCG_ARRAYID_SHIFT (PCG_ARRAYID_OFFSET * (PCG_ARRAYID_WIDTH != 0)) 144#define PCG_ARRAYID_SHIFT (PCG_ARRAYID_OFFSET * (PCG_ARRAYID_WIDTH != 0))
diff --git a/include/linux/pci_regs.h b/include/linux/pci_regs.h
index 5b7e6b1ba54f..be01380f798a 100644
--- a/include/linux/pci_regs.h
+++ b/include/linux/pci_regs.h
@@ -223,7 +223,7 @@
223#define PCI_PM_CAP_PME_CLOCK 0x0008 /* PME clock required */ 223#define PCI_PM_CAP_PME_CLOCK 0x0008 /* PME clock required */
224#define PCI_PM_CAP_RESERVED 0x0010 /* Reserved field */ 224#define PCI_PM_CAP_RESERVED 0x0010 /* Reserved field */
225#define PCI_PM_CAP_DSI 0x0020 /* Device specific initialization */ 225#define PCI_PM_CAP_DSI 0x0020 /* Device specific initialization */
226#define PCI_PM_CAP_AUX_POWER 0x01C0 /* Auxilliary power support mask */ 226#define PCI_PM_CAP_AUX_POWER 0x01C0 /* Auxiliary power support mask */
227#define PCI_PM_CAP_D1 0x0200 /* D1 power state support */ 227#define PCI_PM_CAP_D1 0x0200 /* D1 power state support */
228#define PCI_PM_CAP_D2 0x0400 /* D2 power state support */ 228#define PCI_PM_CAP_D2 0x0400 /* D2 power state support */
229#define PCI_PM_CAP_PME 0x0800 /* PME pin supported */ 229#define PCI_PM_CAP_PME 0x0800 /* PME pin supported */
@@ -435,7 +435,7 @@
435#define PCI_EXP_LNKCAP_L0SEL 0x00007000 /* L0s Exit Latency */ 435#define PCI_EXP_LNKCAP_L0SEL 0x00007000 /* L0s Exit Latency */
436#define PCI_EXP_LNKCAP_L1EL 0x00038000 /* L1 Exit Latency */ 436#define PCI_EXP_LNKCAP_L1EL 0x00038000 /* L1 Exit Latency */
437#define PCI_EXP_LNKCAP_CLKPM 0x00040000 /* L1 Clock Power Management */ 437#define PCI_EXP_LNKCAP_CLKPM 0x00040000 /* L1 Clock Power Management */
438#define PCI_EXP_LNKCAP_SDERC 0x00080000 /* Suprise Down Error Reporting Capable */ 438#define PCI_EXP_LNKCAP_SDERC 0x00080000 /* Surprise Down Error Reporting Capable */
439#define PCI_EXP_LNKCAP_DLLLARC 0x00100000 /* Data Link Layer Link Active Reporting Capable */ 439#define PCI_EXP_LNKCAP_DLLLARC 0x00100000 /* Data Link Layer Link Active Reporting Capable */
440#define PCI_EXP_LNKCAP_LBNC 0x00200000 /* Link Bandwidth Notification Capability */ 440#define PCI_EXP_LNKCAP_LBNC 0x00200000 /* Link Bandwidth Notification Capability */
441#define PCI_EXP_LNKCAP_PN 0xff000000 /* Port Number */ 441#define PCI_EXP_LNKCAP_PN 0xff000000 /* Port Number */
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 04d75a8a20ee..ee9f1e782800 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -662,7 +662,7 @@ struct pmu {
662 int (*commit_txn) (struct pmu *pmu); /* optional */ 662 int (*commit_txn) (struct pmu *pmu); /* optional */
663 /* 663 /*
664 * Will cancel the transaction, assumes ->del() is called 664 * Will cancel the transaction, assumes ->del() is called
665 * for each successfull ->add() during the transaction. 665 * for each successful ->add() during the transaction.
666 */ 666 */
667 void (*cancel_txn) (struct pmu *pmu); /* optional */ 667 void (*cancel_txn) (struct pmu *pmu); /* optional */
668}; 668};
diff --git a/include/linux/pid.h b/include/linux/pid.h
index efceda0a51b1..31afb7ecbe1f 100644
--- a/include/linux/pid.h
+++ b/include/linux/pid.h
@@ -21,7 +21,7 @@ enum pid_type
21 * quickly from the numeric pid value. The attached processes may be 21 * quickly from the numeric pid value. The attached processes may be
22 * quickly accessed by following pointers from struct pid. 22 * quickly accessed by following pointers from struct pid.
23 * 23 *
24 * Storing pid_t values in the kernel and refering to them later has a 24 * Storing pid_t values in the kernel and referring to them later has a
25 * problem. The process originally with that pid may have exited and the 25 * problem. The process originally with that pid may have exited and the
26 * pid allocator wrapped, and another process could have come along 26 * pid allocator wrapped, and another process could have come along
27 * and been assigned that pid. 27 * and been assigned that pid.
diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index b1032a3fafdc..3a02e0208575 100644
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -223,7 +223,7 @@ struct tc_gred_qopt {
223 __u32 limit; /* HARD maximal queue length (bytes) */ 223 __u32 limit; /* HARD maximal queue length (bytes) */
224 __u32 qth_min; /* Min average length threshold (bytes) */ 224 __u32 qth_min; /* Min average length threshold (bytes) */
225 __u32 qth_max; /* Max average length threshold (bytes) */ 225 __u32 qth_max; /* Max average length threshold (bytes) */
226 __u32 DP; /* upto 2^32 DPs */ 226 __u32 DP; /* up to 2^32 DPs */
227 __u32 backlog; 227 __u32 backlog;
228 __u32 qave; 228 __u32 qave;
229 __u32 forced; 229 __u32 forced;
diff --git a/include/linux/poll.h b/include/linux/poll.h
index 1a2ccd6f3823..cf40010ce0cd 100644
--- a/include/linux/poll.h
+++ b/include/linux/poll.h
@@ -82,7 +82,7 @@ static inline int poll_schedule(struct poll_wqueues *pwq, int state)
82} 82}
83 83
84/* 84/*
85 * Scaleable version of the fd_set. 85 * Scalable version of the fd_set.
86 */ 86 */
87 87
88typedef struct { 88typedef struct {
diff --git a/include/linux/prefetch.h b/include/linux/prefetch.h
index af7c36a5a521..a3bfbdf63d32 100644
--- a/include/linux/prefetch.h
+++ b/include/linux/prefetch.h
@@ -29,7 +29,7 @@
29 prefetchw(x) - prefetches the cacheline at "x" for write 29 prefetchw(x) - prefetches the cacheline at "x" for write
30 spin_lock_prefetch(x) - prefetches the spinlock *x for taking 30 spin_lock_prefetch(x) - prefetches the spinlock *x for taking
31 31
32 there is also PREFETCH_STRIDE which is the architecure-prefered 32 there is also PREFETCH_STRIDE which is the architecure-preferred
33 "lookahead" size for prefetching streamed operations. 33 "lookahead" size for prefetching streamed operations.
34 34
35*/ 35*/
diff --git a/include/linux/pxa2xx_ssp.h b/include/linux/pxa2xx_ssp.h
index 2f691e4e6222..44835fb39793 100644
--- a/include/linux/pxa2xx_ssp.h
+++ b/include/linux/pxa2xx_ssp.h
@@ -122,7 +122,7 @@
122#define SSCR1_TSRE (1 << 21) /* Transmit Service Request Enable */ 122#define SSCR1_TSRE (1 << 21) /* Transmit Service Request Enable */
123#define SSCR1_RSRE (1 << 20) /* Receive Service Request Enable */ 123#define SSCR1_RSRE (1 << 20) /* Receive Service Request Enable */
124#define SSCR1_TINTE (1 << 19) /* Receiver Time-out Interrupt enable */ 124#define SSCR1_TINTE (1 << 19) /* Receiver Time-out Interrupt enable */
125#define SSCR1_PINTE (1 << 18) /* Peripheral Trailing Byte Interupt Enable */ 125#define SSCR1_PINTE (1 << 18) /* Peripheral Trailing Byte Interrupt Enable */
126#define SSCR1_IFS (1 << 16) /* Invert Frame Signal */ 126#define SSCR1_IFS (1 << 16) /* Invert Frame Signal */
127#define SSCR1_STRF (1 << 15) /* Select FIFO or EFWR */ 127#define SSCR1_STRF (1 << 15) /* Select FIFO or EFWR */
128#define SSCR1_EFWR (1 << 14) /* Enable FIFO Write/Read */ 128#define SSCR1_EFWR (1 << 14) /* Enable FIFO Write/Read */
diff --git a/include/linux/raid/md_p.h b/include/linux/raid/md_p.h
index ffa2efbbe382..75cbf4f62fe8 100644
--- a/include/linux/raid/md_p.h
+++ b/include/linux/raid/md_p.h
@@ -251,7 +251,7 @@ struct mdp_superblock_1 {
251 __le64 utime; /* 40 bits second, 24 btes microseconds */ 251 __le64 utime; /* 40 bits second, 24 btes microseconds */
252 __le64 events; /* incremented when superblock updated */ 252 __le64 events; /* incremented when superblock updated */
253 __le64 resync_offset; /* data before this offset (from data_offset) known to be in sync */ 253 __le64 resync_offset; /* data before this offset (from data_offset) known to be in sync */
254 __le32 sb_csum; /* checksum upto devs[max_dev] */ 254 __le32 sb_csum; /* checksum up to devs[max_dev] */
255 __le32 max_dev; /* size of devs[] array to consider */ 255 __le32 max_dev; /* size of devs[] array to consider */
256 __u8 pad3[64-32]; /* set to 0 when writing */ 256 __u8 pad3[64-32]; /* set to 0 when writing */
257 257
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index 0a3842aacba9..eca75df00fed 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -1557,7 +1557,7 @@ struct tree_balance {
1557/* When inserting an item. */ 1557/* When inserting an item. */
1558#define M_INSERT 'i' 1558#define M_INSERT 'i'
1559/* When inserting into (directories only) or appending onto an already 1559/* When inserting into (directories only) or appending onto an already
1560 existant item. */ 1560 existent item. */
1561#define M_PASTE 'p' 1561#define M_PASTE 'p'
1562/* When deleting an item. */ 1562/* When deleting an item. */
1563#define M_DELETE 'd' 1563#define M_DELETE 'd'
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 83bd2e2982fc..4ec2c027e92c 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -854,7 +854,7 @@ extern int __weak arch_sd_sibiling_asym_packing(void);
854 854
855/* 855/*
856 * Optimise SD flags for power savings: 856 * Optimise SD flags for power savings:
857 * SD_BALANCE_NEWIDLE helps agressive task consolidation and power savings. 857 * SD_BALANCE_NEWIDLE helps aggressive task consolidation and power savings.
858 * Keep default SD flags if sched_{smt,mc}_power_saving=0 858 * Keep default SD flags if sched_{smt,mc}_power_saving=0
859 */ 859 */
860 860
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index d9e52fa2416d..d0ae90af0b40 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -474,7 +474,7 @@ static inline void skb_dst_set(struct sk_buff *skb, struct dst_entry *dst)
474extern void skb_dst_set_noref(struct sk_buff *skb, struct dst_entry *dst); 474extern void skb_dst_set_noref(struct sk_buff *skb, struct dst_entry *dst);
475 475
476/** 476/**
477 * skb_dst_is_noref - Test if skb dst isnt refcounted 477 * skb_dst_is_noref - Test if skb dst isn't refcounted
478 * @skb: buffer 478 * @skb: buffer
479 */ 479 */
480static inline bool skb_dst_is_noref(const struct sk_buff *skb) 480static inline bool skb_dst_is_noref(const struct sk_buff *skb)
diff --git a/include/linux/smc91x.h b/include/linux/smc91x.h
index bc21db598c06..76199b75d584 100644
--- a/include/linux/smc91x.h
+++ b/include/linux/smc91x.h
@@ -21,7 +21,7 @@
21#define RPC_LED_10 (0x02) /* LED = 10Mbps link detect */ 21#define RPC_LED_10 (0x02) /* LED = 10Mbps link detect */
22#define RPC_LED_FD (0x03) /* LED = Full Duplex Mode */ 22#define RPC_LED_FD (0x03) /* LED = Full Duplex Mode */
23#define RPC_LED_TX_RX (0x04) /* LED = TX or RX packet occurred */ 23#define RPC_LED_TX_RX (0x04) /* LED = TX or RX packet occurred */
24#define RPC_LED_100 (0x05) /* LED = 100Mbps link dectect */ 24#define RPC_LED_100 (0x05) /* LED = 100Mbps link detect */
25#define RPC_LED_TX (0x06) /* LED = TX packet occurred */ 25#define RPC_LED_TX (0x06) /* LED = TX packet occurred */
26#define RPC_LED_RX (0x07) /* LED = RX packet occurred */ 26#define RPC_LED_RX (0x07) /* LED = RX packet occurred */
27 27
diff --git a/include/linux/socket.h b/include/linux/socket.h
index edbb1d07ddf4..d2b5e982f079 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -88,7 +88,7 @@ struct cmsghdr {
88}; 88};
89 89
90/* 90/*
91 * Ancilliary data object information MACROS 91 * Ancillary data object information MACROS
92 * Table 5-14 of POSIX 1003.1g 92 * Table 5-14 of POSIX 1003.1g
93 */ 93 */
94 94
diff --git a/include/linux/soundcard.h b/include/linux/soundcard.h
index 1904afedb82f..fe204fe39f7c 100644
--- a/include/linux/soundcard.h
+++ b/include/linux/soundcard.h
@@ -1231,7 +1231,7 @@ void seqbuf_dump(void); /* This function must be provided by programs */
1231#define SEQ_PANNING(dev, voice, pos) SEQ_CONTROL(dev, voice, CTL_PAN, (pos+128) / 2) 1231#define SEQ_PANNING(dev, voice, pos) SEQ_CONTROL(dev, voice, CTL_PAN, (pos+128) / 2)
1232 1232
1233/* 1233/*
1234 * Timing and syncronization macros 1234 * Timing and synchronization macros
1235 */ 1235 */
1236 1236
1237#define _TIMER_EVENT(ev, parm) {_SEQ_NEEDBUF(8);\ 1237#define _TIMER_EVENT(ev, parm) {_SEQ_NEEDBUF(8);\
diff --git a/include/linux/spi/spidev.h b/include/linux/spi/spidev.h
index bf0570a84f7a..52d9ed01855f 100644
--- a/include/linux/spi/spidev.h
+++ b/include/linux/spi/spidev.h
@@ -66,7 +66,7 @@
66 * are in a different address space (and may be of different sizes in some 66 * are in a different address space (and may be of different sizes in some
67 * cases, such as 32-bit i386 userspace over a 64-bit x86_64 kernel). 67 * cases, such as 32-bit i386 userspace over a 64-bit x86_64 kernel).
68 * Zero-initialize the structure, including currently unused fields, to 68 * Zero-initialize the structure, including currently unused fields, to
69 * accomodate potential future updates. 69 * accommodate potential future updates.
70 * 70 *
71 * SPI_IOC_MESSAGE gives userspace the equivalent of kernel spi_sync(). 71 * SPI_IOC_MESSAGE gives userspace the equivalent of kernel spi_sync().
72 * Pass it an array of related transfers, they'll execute together. 72 * Pass it an array of related transfers, they'll execute together.
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
index 80e535897de6..0b22d51258e6 100644
--- a/include/linux/spinlock.h
+++ b/include/linux/spinlock.h
@@ -81,7 +81,7 @@
81#include <linux/spinlock_types.h> 81#include <linux/spinlock_types.h>
82 82
83/* 83/*
84 * Pull the arch_spin*() functions/declarations (UP-nondebug doesnt need them): 84 * Pull the arch_spin*() functions/declarations (UP-nondebug doesn't need them):
85 */ 85 */
86#ifdef CONFIG_SMP 86#ifdef CONFIG_SMP
87# include <asm/spinlock.h> 87# include <asm/spinlock.h>
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index e10352915698..f29197a4b227 100644
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -26,7 +26,7 @@
26#ifndef __STMMAC_PLATFORM_DATA 26#ifndef __STMMAC_PLATFORM_DATA
27#define __STMMAC_PLATFORM_DATA 27#define __STMMAC_PLATFORM_DATA
28 28
29/* platfrom data for platfrom device structure's platfrom_data field */ 29/* platform data for platform device structure's platform_data field */
30 30
31/* Private data for the STM on-board ethernet driver */ 31/* Private data for the STM on-board ethernet driver */
32struct plat_stmmacenet_data { 32struct plat_stmmacenet_data {
diff --git a/include/linux/stop_machine.h b/include/linux/stop_machine.h
index 1808960c5059..092dc9b1ce7d 100644
--- a/include/linux/stop_machine.h
+++ b/include/linux/stop_machine.h
@@ -105,7 +105,7 @@ static inline int try_stop_cpus(const struct cpumask *cpumask,
105 * @cpus: the cpus to run the @fn() on (NULL = any online cpu) 105 * @cpus: the cpus to run the @fn() on (NULL = any online cpu)
106 * 106 *
107 * Description: This causes a thread to be scheduled on every cpu, 107 * Description: This causes a thread to be scheduled on every cpu,
108 * each of which disables interrupts. The result is that noone is 108 * each of which disables interrupts. The result is that no one is
109 * holding a spinlock or inside any other preempt-disabled region when 109 * holding a spinlock or inside any other preempt-disabled region when
110 * @fn() runs. 110 * @fn() runs.
111 * 111 *
diff --git a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h
index 7898ea13de70..8d2eef1a8582 100644
--- a/include/linux/sunrpc/cache.h
+++ b/include/linux/sunrpc/cache.h
@@ -35,10 +35,10 @@
35 * Each cache must be registered so that it can be cleaned regularly. 35 * Each cache must be registered so that it can be cleaned regularly.
36 * When the cache is unregistered, it is flushed completely. 36 * When the cache is unregistered, it is flushed completely.
37 * 37 *
38 * Entries have a ref count and a 'hashed' flag which counts the existance 38 * Entries have a ref count and a 'hashed' flag which counts the existence
39 * in the hash table. 39 * in the hash table.
40 * We only expire entries when refcount is zero. 40 * We only expire entries when refcount is zero.
41 * Existance in the cache is counted the refcount. 41 * Existence in the cache is counted the refcount.
42 */ 42 */
43 43
44/* Every cache item has a common header that is used 44/* Every cache item has a common header that is used
diff --git a/include/linux/sunrpc/svcauth_gss.h b/include/linux/sunrpc/svcauth_gss.h
index ca7d725861fc..83bbee3f089c 100644
--- a/include/linux/sunrpc/svcauth_gss.h
+++ b/include/linux/sunrpc/svcauth_gss.h
@@ -2,7 +2,7 @@
2 * linux/include/linux/sunrpc/svcauth_gss.h 2 * linux/include/linux/sunrpc/svcauth_gss.h
3 * 3 *
4 * Bruce Fields <bfields@umich.edu> 4 * Bruce Fields <bfields@umich.edu>
5 * Copyright (c) 2002 The Regents of the Unviersity of Michigan 5 * Copyright (c) 2002 The Regents of the University of Michigan
6 */ 6 */
7 7
8#ifndef _LINUX_SUNRPC_SVCAUTH_GSS_H 8#ifndef _LINUX_SUNRPC_SVCAUTH_GSS_H
diff --git a/include/linux/sysdev.h b/include/linux/sysdev.h
index 8a75da551e4e..dfb078db8ebb 100644
--- a/include/linux/sysdev.h
+++ b/include/linux/sysdev.h
@@ -7,13 +7,13 @@
7 * We still have a notion of a driver for a system device, because we still 7 * We still have a notion of a driver for a system device, because we still
8 * want to perform basic operations on these devices. 8 * want to perform basic operations on these devices.
9 * 9 *
10 * We also support auxillary drivers binding to devices of a certain class. 10 * We also support auxiliary drivers binding to devices of a certain class.
11 * 11 *
12 * This allows configurable drivers to register themselves for devices of 12 * This allows configurable drivers to register themselves for devices of
13 * a certain type. And, it allows class definitions to reside in generic 13 * a certain type. And, it allows class definitions to reside in generic
14 * code while arch-specific code can register specific drivers. 14 * code while arch-specific code can register specific drivers.
15 * 15 *
16 * Auxillary drivers registered with a NULL cls are registered as drivers 16 * Auxiliary drivers registered with a NULL cls are registered as drivers
17 * for all system devices, and get notification calls for each device. 17 * for all system devices, and get notification calls for each device.
18 */ 18 */
19 19
@@ -70,7 +70,7 @@ extern int sysdev_class_create_file(struct sysdev_class *,
70extern void sysdev_class_remove_file(struct sysdev_class *, 70extern void sysdev_class_remove_file(struct sysdev_class *,
71 struct sysdev_class_attribute *); 71 struct sysdev_class_attribute *);
72/** 72/**
73 * Auxillary system device drivers. 73 * Auxiliary system device drivers.
74 */ 74 */
75 75
76struct sysdev_driver { 76struct sysdev_driver {
diff --git a/include/linux/timerqueue.h b/include/linux/timerqueue.h
index d24aabaca474..a520fd70a59f 100644
--- a/include/linux/timerqueue.h
+++ b/include/linux/timerqueue.h
@@ -24,7 +24,7 @@ extern struct timerqueue_node *timerqueue_iterate_next(
24 struct timerqueue_node *node); 24 struct timerqueue_node *node);
25 25
26/** 26/**
27 * timerqueue_getnext - Returns the timer with the earlies expiration time 27 * timerqueue_getnext - Returns the timer with the earliest expiration time
28 * 28 *
29 * @head: head of timerqueue 29 * @head: head of timerqueue
30 * 30 *
diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
index 3a2e66d88a32..ebcfa4ebdbf8 100644
--- a/include/linux/tracehook.h
+++ b/include/linux/tracehook.h
@@ -169,7 +169,7 @@ static inline int tracehook_unsafe_exec(struct task_struct *task)
169 * tracehook_tracer_task - return the task that is tracing the given task 169 * tracehook_tracer_task - return the task that is tracing the given task
170 * @tsk: task to consider 170 * @tsk: task to consider
171 * 171 *
172 * Returns NULL if noone is tracing @task, or the &struct task_struct 172 * Returns NULL if no one is tracing @task, or the &struct task_struct
173 * pointer to its tracer. 173 * pointer to its tracer.
174 * 174 *
175 * Must called under rcu_read_lock(). The pointer returned might be kept 175 * Must called under rcu_read_lock(). The pointer returned might be kept
@@ -448,7 +448,7 @@ static inline int tracehook_force_sigpending(void)
448 * 448 *
449 * Return zero to check for a real pending signal normally. 449 * Return zero to check for a real pending signal normally.
450 * Return -1 after releasing the siglock to repeat the check. 450 * Return -1 after releasing the siglock to repeat the check.
451 * Return a signal number to induce an artifical signal delivery, 451 * Return a signal number to induce an artificial signal delivery,
452 * setting *@info and *@return_ka to specify its details and behavior. 452 * setting *@info and *@return_ka to specify its details and behavior.
453 * 453 *
454 * The @return_ka->sa_handler value controls the disposition of the 454 * The @return_ka->sa_handler value controls the disposition of the
diff --git a/include/linux/ucb1400.h b/include/linux/ucb1400.h
index 1b4790911052..5c75153f9441 100644
--- a/include/linux/ucb1400.h
+++ b/include/linux/ucb1400.h
@@ -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/include/linux/usb.h b/include/linux/usb.h
index e63efeb378e3..65f78ca5d88e 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -623,7 +623,7 @@ extern struct usb_host_interface *usb_find_alt_setting(
623 * USB hubs. That makes it stay the same until systems are physically 623 * USB hubs. That makes it stay the same until systems are physically
624 * reconfigured, by re-cabling a tree of USB devices or by moving USB host 624 * reconfigured, by re-cabling a tree of USB devices or by moving USB host
625 * controllers. Adding and removing devices, including virtual root hubs 625 * controllers. Adding and removing devices, including virtual root hubs
626 * in host controller driver modules, does not change these path identifers; 626 * in host controller driver modules, does not change these path identifiers;
627 * neither does rebooting or re-enumerating. These are more useful identifiers 627 * neither does rebooting or re-enumerating. These are more useful identifiers
628 * than changeable ("unstable") ones like bus numbers or device addresses. 628 * than changeable ("unstable") ones like bus numbers or device addresses.
629 * 629 *
@@ -793,7 +793,7 @@ struct usbdrv_wrap {
793 * usb_set_intfdata() to associate driver-specific data with the 793 * usb_set_intfdata() to associate driver-specific data with the
794 * interface. It may also use usb_set_interface() to specify the 794 * interface. It may also use usb_set_interface() to specify the
795 * appropriate altsetting. If unwilling to manage the interface, 795 * appropriate altsetting. If unwilling to manage the interface,
796 * return -ENODEV, if genuine IO errors occured, an appropriate 796 * return -ENODEV, if genuine IO errors occurred, an appropriate
797 * negative errno value. 797 * negative errno value.
798 * @disconnect: Called when the interface is no longer accessible, usually 798 * @disconnect: Called when the interface is no longer accessible, usually
799 * because its device has been (or is being) disconnected or the 799 * because its device has been (or is being) disconnected or the
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
index 3d29a7dcac2d..882a084a8411 100644
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -188,7 +188,7 @@ ep_choose(struct usb_gadget *g, struct usb_endpoint_descriptor *hs,
188 * @bind() method is then used to initialize all the functions and then 188 * @bind() method is then used to initialize all the functions and then
189 * call @usb_add_function() for them. 189 * call @usb_add_function() for them.
190 * 190 *
191 * Those functions would normally be independant of each other, but that's 191 * Those functions would normally be independent of each other, but that's
192 * not mandatory. CDC WMC devices are an example where functions often 192 * not mandatory. CDC WMC devices are an example where functions often
193 * depend on other functions, with some functions subsidiary to others. 193 * depend on other functions, with some functions subsidiary to others.
194 * Such interdependency may be managed in any way, so long as all of the 194 * Such interdependency may be managed in any way, so long as all of the
diff --git a/include/linux/usb/ehci_def.h b/include/linux/usb/ehci_def.h
index 656380245198..e49dfd45baa4 100644
--- a/include/linux/usb/ehci_def.h
+++ b/include/linux/usb/ehci_def.h
@@ -159,7 +159,7 @@ struct ehci_regs {
159#define USBMODE_CM_IDLE (0<<0) /* idle state */ 159#define USBMODE_CM_IDLE (0<<0) /* idle state */
160 160
161/* Moorestown has some non-standard registers, partially due to the fact that 161/* Moorestown has some non-standard registers, partially due to the fact that
162 * its EHCI controller has both TT and LPM support. HOSTPCx are extentions to 162 * its EHCI controller has both TT and LPM support. HOSTPCx are extensions to
163 * PORTSCx 163 * PORTSCx
164 */ 164 */
165#define HOSTPC0 0x84 /* HOSTPC extension */ 165#define HOSTPC0 0x84 /* HOSTPC extension */
diff --git a/include/linux/usb/functionfs.h b/include/linux/usb/functionfs.h
index 6f649c13193b..7587ef934ba8 100644
--- a/include/linux/usb/functionfs.h
+++ b/include/linux/usb/functionfs.h
@@ -45,7 +45,7 @@ struct usb_functionfs_descs_head {
45 * | off | name | type | description | 45 * | off | name | type | description |
46 * |-----+-----------+--------------+--------------------------------------| 46 * |-----+-----------+--------------+--------------------------------------|
47 * | 0 | magic | LE32 | FUNCTIONFS_{FS,HS}_DESCRIPTORS_MAGIC | 47 * | 0 | magic | LE32 | FUNCTIONFS_{FS,HS}_DESCRIPTORS_MAGIC |
48 * | 4 | lenght | LE32 | length of the whole data chunk | 48 * | 4 | length | LE32 | length of the whole data chunk |
49 * | 8 | fs_count | LE32 | number of full-speed descriptors | 49 * | 8 | fs_count | LE32 | number of full-speed descriptors |
50 * | 12 | hs_count | LE32 | number of high-speed descriptors | 50 * | 12 | hs_count | LE32 | number of high-speed descriptors |
51 * | 16 | fs_descrs | Descriptor[] | list of full-speed descriptors | 51 * | 16 | fs_descrs | Descriptor[] | list of full-speed descriptors |
@@ -86,7 +86,7 @@ struct usb_functionfs_strings_head {
86 * | 0 | lang | LE16 | language code | 86 * | 0 | lang | LE16 | language code |
87 * | 2 | strings | String[str_count] | array of strings in given language | 87 * | 2 | strings | String[str_count] | array of strings in given language |
88 * 88 *
89 * For each string ther is one strings entry (ie. there are str_count 89 * For each string there is one strings entry (ie. there are str_count
90 * string entries). Each String is a NUL terminated string encoded in 90 * string entries). Each String is a NUL terminated string encoded in
91 * UTF-8. 91 * UTF-8.
92 */ 92 */
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 006412ce2303..e538172c0f64 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -72,7 +72,7 @@ struct usb_ep;
72 * Bulk endpoints can use any size buffers, and can also be used for interrupt 72 * Bulk endpoints can use any size buffers, and can also be used for interrupt
73 * transfers. interrupt-only endpoints can be much less functional. 73 * transfers. interrupt-only endpoints can be much less functional.
74 * 74 *
75 * NOTE: this is analagous to 'struct urb' on the host side, except that 75 * NOTE: this is analogous to 'struct urb' on the host side, except that
76 * it's thinner and promotes more pre-allocation. 76 * it's thinner and promotes more pre-allocation.
77 */ 77 */
78 78
@@ -269,7 +269,7 @@ static inline void usb_ep_free_request(struct usb_ep *ep,
269 * 269 *
270 * Control endpoints ... after getting a setup() callback, the driver queues 270 * Control endpoints ... after getting a setup() callback, the driver queues
271 * one response (even if it would be zero length). That enables the 271 * one response (even if it would be zero length). That enables the
272 * status ack, after transfering data as specified in the response. Setup 272 * status ack, after transferring data as specified in the response. Setup
273 * functions may return negative error codes to generate protocol stalls. 273 * functions may return negative error codes to generate protocol stalls.
274 * (Note that some USB device controllers disallow protocol stall responses 274 * (Note that some USB device controllers disallow protocol stall responses
275 * in some cases.) When control responses are deferred (the response is 275 * in some cases.) When control responses are deferred (the response is
diff --git a/include/linux/usb/midi.h b/include/linux/usb/midi.h
index 1d1040865661..c8c52e3c91de 100644
--- a/include/linux/usb/midi.h
+++ b/include/linux/usb/midi.h
@@ -70,7 +70,7 @@ struct usb_midi_out_jack_descriptor {
70 __u8 bJackID; 70 __u8 bJackID;
71 __u8 bNrInputPins; /* p */ 71 __u8 bNrInputPins; /* p */
72 struct usb_midi_source_pin pins[]; /* [p] */ 72 struct usb_midi_source_pin pins[]; /* [p] */
73 /*__u8 iJack; -- ommitted due to variable-sized pins[] */ 73 /*__u8 iJack; -- omitted due to variable-sized pins[] */
74} __attribute__ ((packed)); 74} __attribute__ ((packed));
75 75
76#define USB_DT_MIDI_OUT_SIZE(p) (7 + 2 * (p)) 76#define USB_DT_MIDI_OUT_SIZE(p) (7 + 2 * (p))
diff --git a/include/linux/usb/wusb.h b/include/linux/usb/wusb.h
index 63ebdcc5dda6..0c4d4ca370ec 100644
--- a/include/linux/usb/wusb.h
+++ b/include/linux/usb/wusb.h
@@ -126,7 +126,7 @@ enum {
126/** 126/**
127 * WUSB IE: Channel Stop (WUSB1.0[7.5.8]) 127 * WUSB IE: Channel Stop (WUSB1.0[7.5.8])
128 * 128 *
129 * Tells devices the host is going to stop sending MMCs and will dissapear. 129 * Tells devices the host is going to stop sending MMCs and will disappear.
130 */ 130 */
131struct wuie_channel_stop { 131struct wuie_channel_stop {
132 struct wuie_hdr hdr; 132 struct wuie_hdr hdr;
diff --git a/include/linux/uwb.h b/include/linux/uwb.h
index 7fc9746f22cd..b0c564ec2160 100644
--- a/include/linux/uwb.h
+++ b/include/linux/uwb.h
@@ -274,7 +274,7 @@ static inline void uwb_mas_bm_copy_le(void *dst, const struct uwb_mas_bm *mas)
274 274
275/** 275/**
276 * struct uwb_drp_avail - a radio controller's view of MAS usage 276 * struct uwb_drp_avail - a radio controller's view of MAS usage
277 * @global: MAS unused by neighbors (excluding reservations targetted 277 * @global: MAS unused by neighbors (excluding reservations targeted
278 * or owned by the local radio controller) or the beaon period 278 * or owned by the local radio controller) or the beaon period
279 * @local: MAS unused by local established reservations 279 * @local: MAS unused by local established reservations
280 * @pending: MAS unused by local pending reservations 280 * @pending: MAS unused by local pending reservations
@@ -702,10 +702,10 @@ void edc_init(struct edc *edc)
702 edc->timestart = jiffies; 702 edc->timestart = jiffies;
703} 703}
704 704
705/* Called when an error occured. 705/* Called when an error occurred.
706 * This is way to determine if the number of acceptable errors per time 706 * This is way to determine if the number of acceptable errors per time
707 * period has been exceeded. It is not accurate as there are cases in which 707 * period has been exceeded. It is not accurate as there are cases in which
708 * this scheme will not work, for example if there are periodic occurences 708 * this scheme will not work, for example if there are periodic occurrences
709 * of errors that straddle updates to the start time. This scheme is 709 * of errors that straddle updates to the start time. This scheme is
710 * sufficient for our usage. 710 * sufficient for our usage.
711 * 711 *
diff --git a/include/linux/uwb/umc.h b/include/linux/uwb/umc.h
index 4b4fc0f43855..7b4842028ca7 100644
--- a/include/linux/uwb/umc.h
+++ b/include/linux/uwb/umc.h
@@ -132,7 +132,7 @@ int umc_match_pci_id(struct umc_driver *umc_drv, struct umc_dev *umc);
132 * 132 *
133 * FIXME: This is as dirty as it gets, but we need some way to check 133 * FIXME: This is as dirty as it gets, but we need some way to check
134 * the correct type of umc_dev->parent (so that for example, we can 134 * the correct type of umc_dev->parent (so that for example, we can
135 * cast to pci_dev). Casting to pci_dev is necesary because at some 135 * cast to pci_dev). Casting to pci_dev is necessary because at some
136 * point we need to request resources from the device. Mapping is 136 * point we need to request resources from the device. Mapping is
137 * easily over come (ioremap and stuff are bus agnostic), but hooking 137 * easily over come (ioremap and stuff are bus agnostic), but hooking
138 * up to some error handlers (such as pci error handlers) might need 138 * up to some error handlers (such as pci error handlers) might need
diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
index e9e1524b582c..9c3120dca294 100644
--- a/include/linux/vgaarb.h
+++ b/include/linux/vgaarb.h
@@ -78,7 +78,7 @@ extern void vga_set_legacy_decoding(struct pci_dev *pdev,
78 * wether the card is doing legacy decoding for that type of resource. If 78 * wether the card is doing legacy decoding for that type of resource. If
79 * yes, the lock is "converted" into a legacy resource lock. 79 * yes, the lock is "converted" into a legacy resource lock.
80 * The arbiter will first look for all VGA cards that might conflict 80 * The arbiter will first look for all VGA cards that might conflict
81 * and disable their IOs and/or Memory access, inlcuding VGA forwarding 81 * and disable their IOs and/or Memory access, including VGA forwarding
82 * on P2P bridges if necessary, so that the requested resources can 82 * on P2P bridges if necessary, so that the requested resources can
83 * be used. Then, the card is marked as locking these resources and 83 * be used. Then, the card is marked as locking these resources and
84 * the IO and/or Memory accesse are enabled on the card (including 84 * the IO and/or Memory accesse are enabled on the card (including
@@ -187,7 +187,7 @@ extern struct pci_dev *vga_default_device(void);
187 * vga_conflicts 187 * vga_conflicts
188 * 188 *
189 * Architectures should define this if they have several 189 * Architectures should define this if they have several
190 * independant PCI domains that can afford concurrent VGA 190 * independent PCI domains that can afford concurrent VGA
191 * decoding 191 * decoding
192 */ 192 */
193 193
diff --git a/include/linux/wimax.h b/include/linux/wimax.h
index 4fdcc5635518..9f6b77af2f6d 100644
--- a/include/linux/wimax.h
+++ b/include/linux/wimax.h
@@ -114,7 +114,7 @@ enum {
114 WIMAX_GNL_RESET_IFIDX = 1, 114 WIMAX_GNL_RESET_IFIDX = 1,
115}; 115};
116 116
117/* Atributes for wimax_state_get() */ 117/* Attributes for wimax_state_get() */
118enum { 118enum {
119 WIMAX_GNL_STGET_IFIDX = 1, 119 WIMAX_GNL_STGET_IFIDX = 1,
120}; 120};
diff --git a/include/linux/xilinxfb.h b/include/linux/xilinxfb.h
index f2463f559fb9..5a155a968054 100644
--- a/include/linux/xilinxfb.h
+++ b/include/linux/xilinxfb.h
@@ -16,7 +16,7 @@
16/* ML300/403 reference design framebuffer driver platform data struct */ 16/* ML300/403 reference design framebuffer driver platform data struct */
17struct xilinxfb_platform_data { 17struct xilinxfb_platform_data {
18 u32 rotate_screen; /* Flag to rotate display 180 degrees */ 18 u32 rotate_screen; /* Flag to rotate display 180 degrees */
19 u32 screen_height_mm; /* Physical dimentions of screen in mm */ 19 u32 screen_height_mm; /* Physical dimensions of screen in mm */
20 u32 screen_width_mm; 20 u32 screen_width_mm;
21 u32 xres, yres; /* resolution of screen in pixels */ 21 u32 xres, yres; /* resolution of screen in pixels */
22 u32 xvirt, yvirt; /* resolution of memory buffer */ 22 u32 xvirt, yvirt; /* resolution of memory buffer */
diff --git a/include/media/davinci/dm355_ccdc.h b/include/media/davinci/dm355_ccdc.h
index df8a7b107477..adf2fe4bf0bb 100644
--- a/include/media/davinci/dm355_ccdc.h
+++ b/include/media/davinci/dm355_ccdc.h
@@ -193,7 +193,7 @@ struct ccdc_dft_corr_mem_ctl {
193#define CCDC_DFT_TABLE_SIZE 16 193#define CCDC_DFT_TABLE_SIZE 16
194/* 194/*
195 * Main Structure for vertical defect correction. Vertical defect 195 * Main Structure for vertical defect correction. Vertical defect
196 * correction can correct upto 16 defects if defects less than 16 196 * correction can correct up to 16 defects if defects less than 16
197 * then pad the rest with 0 197 * then pad the rest with 0
198 */ 198 */
199struct ccdc_vertical_dft { 199struct ccdc_vertical_dft {
diff --git a/include/media/davinci/isif.h b/include/media/davinci/isif.h
index b0b74ad618cc..7f3d76a4b9e3 100644
--- a/include/media/davinci/isif.h
+++ b/include/media/davinci/isif.h
@@ -199,7 +199,7 @@ struct isif_black_clamp {
199}; 199};
200 200
201/************************************************************************* 201/*************************************************************************
202** Color Space Convertion (CSC) 202** Color Space Conversion (CSC)
203*************************************************************************/ 203*************************************************************************/
204#define ISIF_CSC_NUM_COEFF 16 204#define ISIF_CSC_NUM_COEFF 16
205struct isif_color_space_conv { 205struct isif_color_space_conv {
diff --git a/include/media/lirc.h b/include/media/lirc.h
index 6678a169fd9e..4b3ab2966b5a 100644
--- a/include/media/lirc.h
+++ b/include/media/lirc.h
@@ -137,7 +137,7 @@
137 */ 137 */
138#define LIRC_SET_REC_FILTER_SPACE _IOW('i', 0x0000001b, __u32) 138#define LIRC_SET_REC_FILTER_SPACE _IOW('i', 0x0000001b, __u32)
139/* 139/*
140 * if filter cannot be set independantly for pulse/space, this should 140 * if filter cannot be set independently for pulse/space, this should
141 * be used 141 * be used
142 */ 142 */
143#define LIRC_SET_REC_FILTER _IOW('i', 0x0000001c, __u32) 143#define LIRC_SET_REC_FILTER _IOW('i', 0x0000001c, __u32)
diff --git a/include/net/9p/9p.h b/include/net/9p/9p.h
index 6b75a6971346..cdf2e8ac4309 100644
--- a/include/net/9p/9p.h
+++ b/include/net/9p/9p.h
@@ -119,7 +119,7 @@ do { \
119 * @P9_TREAD: request to transfer data from a file or directory 119 * @P9_TREAD: request to transfer data from a file or directory
120 * @P9_RREAD: response with data requested 120 * @P9_RREAD: response with data requested
121 * @P9_TWRITE: reuqest to transfer data to a file 121 * @P9_TWRITE: reuqest to transfer data to a file
122 * @P9_RWRITE: response with out much data was transfered to file 122 * @P9_RWRITE: response with out much data was transferred to file
123 * @P9_TCLUNK: forget about a handle to an entity within the file system 123 * @P9_TCLUNK: forget about a handle to an entity within the file system
124 * @P9_RCLUNK: response when server has forgotten about the handle 124 * @P9_RCLUNK: response when server has forgotten about the handle
125 * @P9_TREMOVE: request to remove an entity from the hierarchy 125 * @P9_TREMOVE: request to remove an entity from the hierarchy
@@ -294,7 +294,7 @@ enum p9_perm_t {
294 * 294 *
295 * QID types are a subset of permissions - they are primarily 295 * QID types are a subset of permissions - they are primarily
296 * used to differentiate semantics for a file system entity via 296 * used to differentiate semantics for a file system entity via
297 * a jump-table. Their value is also the most signifigant 16 bits 297 * a jump-table. Their value is also the most significant 16 bits
298 * of the permission_t 298 * of the permission_t
299 * 299 *
300 * See Also: http://plan9.bell-labs.com/magic/man2html/2/stat 300 * See Also: http://plan9.bell-labs.com/magic/man2html/2/stat
@@ -366,8 +366,8 @@ struct p9_qid {
366/** 366/**
367 * struct p9_stat - file system metadata information 367 * struct p9_stat - file system metadata information
368 * @size: length prefix for this stat structure instance 368 * @size: length prefix for this stat structure instance
369 * @type: the type of the server (equivilent to a major number) 369 * @type: the type of the server (equivalent to a major number)
370 * @dev: the sub-type of the server (equivilent to a minor number) 370 * @dev: the sub-type of the server (equivalent to a minor number)
371 * @qid: unique id from the server of type &p9_qid 371 * @qid: unique id from the server of type &p9_qid
372 * @mode: Plan 9 format permissions of type &p9_perm_t 372 * @mode: Plan 9 format permissions of type &p9_perm_t
373 * @atime: Last access/read time 373 * @atime: Last access/read time
diff --git a/include/net/9p/client.h b/include/net/9p/client.h
index 0a30977e3c1f..85c1413f054d 100644
--- a/include/net/9p/client.h
+++ b/include/net/9p/client.h
@@ -101,7 +101,7 @@ enum p9_req_status_t {
101 * Transport use an array to track outstanding requests 101 * Transport use an array to track outstanding requests
102 * instead of a list. While this may incurr overhead during initial 102 * instead of a list. While this may incurr overhead during initial
103 * allocation or expansion, it makes request lookup much easier as the 103 * allocation or expansion, it makes request lookup much easier as the
104 * tag id is a index into an array. (We use tag+1 so that we can accomodate 104 * tag id is a index into an array. (We use tag+1 so that we can accommodate
105 * the -1 tag for the T_VERSION request). 105 * the -1 tag for the T_VERSION request).
106 * This also has the nice effect of only having to allocate wait_queues 106 * This also has the nice effect of only having to allocate wait_queues
107 * once, instead of constantly allocating and freeing them. Its possible 107 * once, instead of constantly allocating and freeing them. Its possible
diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
index 82868f18c573..8f08c736c4c3 100644
--- a/include/net/9p/transport.h
+++ b/include/net/9p/transport.h
@@ -30,7 +30,7 @@
30 30
31/* Default. Add Payload to PDU before sending it down to transport layer */ 31/* Default. Add Payload to PDU before sending it down to transport layer */
32#define P9_TRANS_PREF_PAYLOAD_DEF 0x0 32#define P9_TRANS_PREF_PAYLOAD_DEF 0x0
33/* Send pay load seperately to transport layer along with PDU.*/ 33/* Send pay load separately to transport layer along with PDU.*/
34#define P9_TRANS_PREF_PAYLOAD_SEP 0x1 34#define P9_TRANS_PREF_PAYLOAD_SEP 0x1
35 35
36/** 36/**
diff --git a/include/net/caif/cfcnfg.h b/include/net/caif/cfcnfg.h
index f688478bfb84..f33d36341132 100644
--- a/include/net/caif/cfcnfg.h
+++ b/include/net/caif/cfcnfg.h
@@ -69,7 +69,7 @@ void cfcnfg_remove(struct cfcnfg *cfg);
69 * cfcnfg_add_adapt_layer to specify PHY for the link. 69 * cfcnfg_add_adapt_layer to specify PHY for the link.
70 * @pref: The phy (link layer) preference. 70 * @pref: The phy (link layer) preference.
71 * @fcs: Specify if checksum is used in CAIF Framing Layer. 71 * @fcs: Specify if checksum is used in CAIF Framing Layer.
72 * @stx: Specify if Start Of Frame eXtention is used. 72 * @stx: Specify if Start Of Frame extension is used.
73 */ 73 */
74 74
75void 75void
diff --git a/include/net/gen_stats.h b/include/net/gen_stats.h
index fa157712e982..a79b6cfb02a8 100644
--- a/include/net/gen_stats.h
+++ b/include/net/gen_stats.h
@@ -11,7 +11,7 @@ struct gnet_dump {
11 struct sk_buff * skb; 11 struct sk_buff * skb;
12 struct nlattr * tail; 12 struct nlattr * tail;
13 13
14 /* Backward compatability */ 14 /* Backward compatibility */
15 int compat_tc_stats; 15 int compat_tc_stats;
16 int compat_xstats; 16 int compat_xstats;
17 void * xstats; 17 void * xstats;
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 30b49ed72f0d..814b434db749 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -92,7 +92,7 @@ static inline struct net *skb_sknet(const struct sk_buff *skb)
92} 92}
93/* 93/*
94 * This one needed for single_open_net since net is stored directly in 94 * This one needed for single_open_net since net is stored directly in
95 * private not as a struct i.e. seq_file_net cant be used. 95 * private not as a struct i.e. seq_file_net can't be used.
96 */ 96 */
97static inline struct net *seq_file_single_net(struct seq_file *seq) 97static inline struct net *seq_file_single_net(struct seq_file *seq)
98{ 98{
diff --git a/include/net/irda/irlap.h b/include/net/irda/irlap.h
index 17fcd964f9d9..fb4b76d5d7f1 100644
--- a/include/net/irda/irlap.h
+++ b/include/net/irda/irlap.h
@@ -204,7 +204,7 @@ struct irlap_cb {
204 204
205 notify_t notify; /* Callbacks to IrLMP */ 205 notify_t notify; /* Callbacks to IrLMP */
206 206
207 int mtt_required; /* Minumum turnaround time required */ 207 int mtt_required; /* Minimum turnaround time required */
208 int xbofs_delay; /* Nr of XBOF's used to MTT */ 208 int xbofs_delay; /* Nr of XBOF's used to MTT */
209 int bofs_count; /* Negotiated extra BOFs */ 209 int bofs_count; /* Negotiated extra BOFs */
210 int next_bofs; /* Negotiated extra BOFs after next frame */ 210 int next_bofs; /* Negotiated extra BOFs after next frame */
diff --git a/include/net/irda/wrapper.h b/include/net/irda/wrapper.h
index 2942ad6ab932..eef53ebe3d76 100644
--- a/include/net/irda/wrapper.h
+++ b/include/net/irda/wrapper.h
@@ -42,7 +42,7 @@
42 42
43#define IRDA_TRANS 0x20 /* Asynchronous transparency modifier */ 43#define IRDA_TRANS 0x20 /* Asynchronous transparency modifier */
44 44
45/* States for receving a frame in async mode */ 45/* States for receiving a frame in async mode */
46enum { 46enum {
47 OUTSIDE_FRAME, 47 OUTSIDE_FRAME,
48 BEGIN_FRAME, 48 BEGIN_FRAME,
diff --git a/include/net/iucv/iucv.h b/include/net/iucv/iucv.h
index 205a3360156e..1121baa9f695 100644
--- a/include/net/iucv/iucv.h
+++ b/include/net/iucv/iucv.h
@@ -173,7 +173,7 @@ struct iucv_handler {
173 /* 173 /*
174 * The message_pending function is called after an icuv interrupt 174 * The message_pending function is called after an icuv interrupt
175 * type 0x06 or type 0x07 has been received. A new message is 175 * type 0x06 or type 0x07 has been received. A new message is
176 * availabe and can be received with iucv_message_receive. 176 * available and can be received with iucv_message_receive.
177 */ 177 */
178 void (*message_pending)(struct iucv_path *, struct iucv_message *); 178 void (*message_pending)(struct iucv_path *, struct iucv_message *);
179 /* 179 /*
diff --git a/include/net/iw_handler.h b/include/net/iw_handler.h
index 3afdb21cc31d..5d5a6a4732ef 100644
--- a/include/net/iw_handler.h
+++ b/include/net/iw_handler.h
@@ -91,7 +91,7 @@
91 * -------------------- 91 * --------------------
92 * The implementation goals were as follow : 92 * The implementation goals were as follow :
93 * o Obvious : you should not need a PhD to understand what's happening, 93 * o Obvious : you should not need a PhD to understand what's happening,
94 * the benefit is easier maintainance. 94 * the benefit is easier maintenance.
95 * o Flexible : it should accommodate a wide variety of driver 95 * o Flexible : it should accommodate a wide variety of driver
96 * implementations and be as flexible as the old API. 96 * implementations and be as flexible as the old API.
97 * o Lean : it should be efficient memory wise to minimise the impact 97 * o Lean : it should be efficient memory wise to minimise the impact
@@ -129,7 +129,7 @@
129 * 129 *
130 * Functions prototype uses union iwreq_data 130 * Functions prototype uses union iwreq_data
131 * ----------------------------------------- 131 * -----------------------------------------
132 * Some would have prefered functions defined this way : 132 * Some would have preferred functions defined this way :
133 * static int mydriver_ioctl_setrate(struct net_device *dev, 133 * static int mydriver_ioctl_setrate(struct net_device *dev,
134 * long rate, int auto) 134 * long rate, int auto)
135 * 1) The kernel code doesn't "validate" the content of iwreq_data, and 135 * 1) The kernel code doesn't "validate" the content of iwreq_data, and
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index cefe1b37c493..cb13239fe8e3 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1294,7 +1294,7 @@ ieee80211_get_alt_retry_rate(const struct ieee80211_hw *hw,
1294 * acceleration (i.e. iwlwifi). Those drivers should provide update_tkip_key 1294 * acceleration (i.e. iwlwifi). Those drivers should provide update_tkip_key
1295 * handler. 1295 * handler.
1296 * The update_tkip_key() call updates the driver with the new phase 1 key. 1296 * The update_tkip_key() call updates the driver with the new phase 1 key.
1297 * This happens everytime the iv16 wraps around (every 65536 packets). The 1297 * This happens every time the iv16 wraps around (every 65536 packets). The
1298 * set_key() call will happen only once for each key (unless the AP did 1298 * set_key() call will happen only once for each key (unless the AP did
1299 * rekeying), it will not include a valid phase 1 key. The valid phase 1 key is 1299 * rekeying), it will not include a valid phase 1 key. The valid phase 1 key is
1300 * provided by update_tkip_key only. The trigger that makes mac80211 call this 1300 * provided by update_tkip_key only. The trigger that makes mac80211 call this
diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index d9549af6929a..65afc4966204 100644
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -32,7 +32,7 @@ static inline void *qdisc_priv(struct Qdisc *q)
32 32
33 The result: [34]86 is not good choice for QoS router :-( 33 The result: [34]86 is not good choice for QoS router :-(
34 34
35 The things are not so bad, because we may use artifical 35 The things are not so bad, because we may use artificial
36 clock evaluated by integration of network data flow 36 clock evaluated by integration of network data flow
37 in the most critical places. 37 in the most critical places.
38 */ 38 */
diff --git a/include/net/sock.h b/include/net/sock.h
index da0534d3401c..01810a3f19df 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1749,7 +1749,7 @@ void sock_net_set(struct sock *sk, struct net *net)
1749 1749
1750/* 1750/*
1751 * Kernel sockets, f.e. rtnl or icmp_socket, are a part of a namespace. 1751 * Kernel sockets, f.e. rtnl or icmp_socket, are a part of a namespace.
1752 * They should not hold a referrence to a namespace in order to allow 1752 * They should not hold a reference to a namespace in order to allow
1753 * to stop it. 1753 * to stop it.
1754 * Sockets after sk_change_net should be released using sk_release_kernel 1754 * Sockets after sk_change_net should be released using sk_release_kernel
1755 */ 1755 */
diff --git a/include/net/transp_v6.h b/include/net/transp_v6.h
index eeb077dd735f..a8122dc56410 100644
--- a/include/net/transp_v6.h
+++ b/include/net/transp_v6.h
@@ -16,7 +16,7 @@ extern struct proto tcpv6_prot;
16 16
17struct flowi6; 17struct flowi6;
18 18
19/* extention headers */ 19/* extension headers */
20extern int ipv6_exthdrs_init(void); 20extern int ipv6_exthdrs_init(void);
21extern void ipv6_exthdrs_exit(void); 21extern void ipv6_exthdrs_exit(void);
22extern int ipv6_frag_init(void); 22extern int ipv6_frag_init(void);
diff --git a/include/net/wimax.h b/include/net/wimax.h
index 3461aa1df1e0..c799ba7b708b 100644
--- a/include/net/wimax.h
+++ b/include/net/wimax.h
@@ -286,7 +286,7 @@ struct wimax_dev;
286 * does not disconnect the device from the bus and return 0. 286 * does not disconnect the device from the bus and return 0.
287 * If that fails, it should resort to some sort of cold or bus 287 * If that fails, it should resort to some sort of cold or bus
288 * reset (even if it implies a bus disconnection and device 288 * reset (even if it implies a bus disconnection and device
289 * dissapearance). In that case, -ENODEV should be returned to 289 * disappearance). In that case, -ENODEV should be returned to
290 * indicate the device is gone. 290 * indicate the device is gone.
291 * This operation has to be synchronous, and return only when the 291 * This operation has to be synchronous, and return only when the
292 * reset is complete. In case of having had to resort to bus/cold 292 * reset is complete. In case of having had to resort to bus/cold
diff --git a/include/net/wpan-phy.h b/include/net/wpan-phy.h
index 85926231c07a..d86fffd3c03c 100644
--- a/include/net/wpan-phy.h
+++ b/include/net/wpan-phy.h
@@ -28,7 +28,7 @@ struct wpan_phy {
28 struct mutex pib_lock; 28 struct mutex pib_lock;
29 29
30 /* 30 /*
31 * This is a PIB acording to 802.15.4-2006. 31 * This is a PIB according to 802.15.4-2006.
32 * We do not provide timing-related variables, as they 32 * We do not provide timing-related variables, as they
33 * aren't used outside of driver 33 * aren't used outside of driver
34 */ 34 */
diff --git a/include/rxrpc/packet.h b/include/rxrpc/packet.h
index 9b2c30897e50..f2902ef7ab75 100644
--- a/include/rxrpc/packet.h
+++ b/include/rxrpc/packet.h
@@ -148,7 +148,7 @@ struct rxkad_challenge {
148 * Kerberos security type-2 response packet 148 * Kerberos security type-2 response packet
149 */ 149 */
150struct rxkad_response { 150struct rxkad_response {
151 __be32 version; /* version of this reponse type */ 151 __be32 version; /* version of this response type */
152 __be32 __pad; 152 __be32 __pad;
153 153
154 /* encrypted bit of the response */ 154 /* encrypted bit of the response */
diff --git a/include/scsi/fc/fc_fcp.h b/include/scsi/fc/fc_fcp.h
index 8a143ca79878..652dec230514 100644
--- a/include/scsi/fc/fc_fcp.h
+++ b/include/scsi/fc/fc_fcp.h
@@ -75,7 +75,7 @@ struct fcp_cmnd32 {
75#define FCP_PTA_SIMPLE 0 /* simple task attribute */ 75#define FCP_PTA_SIMPLE 0 /* simple task attribute */
76#define FCP_PTA_HEADQ 1 /* head of queue task attribute */ 76#define FCP_PTA_HEADQ 1 /* head of queue task attribute */
77#define FCP_PTA_ORDERED 2 /* ordered task attribute */ 77#define FCP_PTA_ORDERED 2 /* ordered task attribute */
78#define FCP_PTA_ACA 4 /* auto. contigent allegiance */ 78#define FCP_PTA_ACA 4 /* auto. contingent allegiance */
79#define FCP_PTA_MASK 7 /* mask for task attribute field */ 79#define FCP_PTA_MASK 7 /* mask for task attribute field */
80#define FCP_PRI_SHIFT 3 /* priority field starts in bit 3 */ 80#define FCP_PRI_SHIFT 3 /* priority field starts in bit 3 */
81#define FCP_PRI_RESVD_MASK 0x80 /* reserved bits in priority field */ 81#define FCP_PRI_RESVD_MASK 0x80 /* reserved bits in priority field */
diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index c3e1cbcc2ad2..ddb04568a509 100644
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -292,7 +292,7 @@ enum iscsi_param {
292 ISCSI_PARAM_PERSISTENT_PORT, 292 ISCSI_PARAM_PERSISTENT_PORT,
293 ISCSI_PARAM_SESS_RECOVERY_TMO, 293 ISCSI_PARAM_SESS_RECOVERY_TMO,
294 294
295 /* pased in through bind conn using transport_fd */ 295 /* passed in through bind conn using transport_fd */
296 ISCSI_PARAM_CONN_PORT, 296 ISCSI_PARAM_CONN_PORT,
297 ISCSI_PARAM_CONN_ADDRESS, 297 ISCSI_PARAM_CONN_ADDRESS,
298 298
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index 24193c1b0da0..a3cbda4ddb5c 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -260,7 +260,7 @@ struct fcoe_dev_stats {
260/** 260/**
261 * struct fc_seq_els_data - ELS data used for passing ELS specific responses 261 * struct fc_seq_els_data - ELS data used for passing ELS specific responses
262 * @reason: The reason for rejection 262 * @reason: The reason for rejection
263 * @explan: The explaination of the rejection 263 * @explan: The explanation of the rejection
264 * 264 *
265 * Mainly used by the exchange manager layer. 265 * Mainly used by the exchange manager layer.
266 */ 266 */
@@ -525,7 +525,7 @@ struct libfc_function_template {
525 struct fc_frame *); 525 struct fc_frame *);
526 526
527 /* 527 /*
528 * Send an ELS response using infomation from the received frame. 528 * Send an ELS response using information from the received frame.
529 * 529 *
530 * STATUS: OPTIONAL 530 * STATUS: OPTIONAL
531 */ 531 */
@@ -663,7 +663,7 @@ struct libfc_function_template {
663 int (*rport_logoff)(struct fc_rport_priv *); 663 int (*rport_logoff)(struct fc_rport_priv *);
664 664
665 /* 665 /*
666 * Recieve a request from a remote port. 666 * Receive a request from a remote port.
667 * 667 *
668 * STATUS: OPTIONAL 668 * STATUS: OPTIONAL
669 */ 669 */
@@ -704,7 +704,7 @@ struct libfc_function_template {
704 void *)); 704 void *));
705 705
706 /* 706 /*
707 * Cleanup the FCP layer, used durring link down and reset 707 * Cleanup the FCP layer, used during link down and reset
708 * 708 *
709 * STATUS: OPTIONAL 709 * STATUS: OPTIONAL
710 */ 710 */
diff --git a/include/scsi/libiscsi_tcp.h b/include/scsi/libiscsi_tcp.h
index e6b9fd2eea34..ac0cc1d925ef 100644
--- a/include/scsi/libiscsi_tcp.h
+++ b/include/scsi/libiscsi_tcp.h
@@ -52,7 +52,7 @@ struct iscsi_segment {
52 iscsi_segment_done_fn_t *done; 52 iscsi_segment_done_fn_t *done;
53}; 53};
54 54
55/* Socket connection recieve helper */ 55/* Socket connection receive helper */
56struct iscsi_tcp_recv { 56struct iscsi_tcp_recv {
57 struct iscsi_hdr *hdr; 57 struct iscsi_hdr *hdr;
58 struct iscsi_segment segment; 58 struct iscsi_segment segment;
diff --git a/include/scsi/osd_initiator.h b/include/scsi/osd_initiator.h
index 53a9e886612b..0a5079974fe9 100644
--- a/include/scsi/osd_initiator.h
+++ b/include/scsi/osd_initiator.h
@@ -265,7 +265,7 @@ int osd_execute_request_async(struct osd_request *or,
265 * @osi - Recievs a more detailed error report information (optional). 265 * @osi - Recievs a more detailed error report information (optional).
266 * @silent - Do not print to dmsg (Even if enabled) 266 * @silent - Do not print to dmsg (Even if enabled)
267 * @bad_obj_list - Some commands act on multiple objects. Failed objects will 267 * @bad_obj_list - Some commands act on multiple objects. Failed objects will
268 * be recieved here (optional) 268 * be received here (optional)
269 * @max_obj - Size of @bad_obj_list. 269 * @max_obj - Size of @bad_obj_list.
270 * @bad_attr_list - List of failing attributes (optional) 270 * @bad_attr_list - List of failing attributes (optional)
271 * @max_attr - Size of @bad_attr_list. 271 * @max_attr - Size of @bad_attr_list.
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index e7e385842a38..f1f2644137b8 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -46,7 +46,7 @@ struct blk_queue_tags;
46enum { 46enum {
47 SCSI_QDEPTH_DEFAULT, /* default requested change, e.g. from sysfs */ 47 SCSI_QDEPTH_DEFAULT, /* default requested change, e.g. from sysfs */
48 SCSI_QDEPTH_QFULL, /* scsi-ml requested due to queue full */ 48 SCSI_QDEPTH_QFULL, /* scsi-ml requested due to queue full */
49 SCSI_QDEPTH_RAMP_UP, /* scsi-ml requested due to threshhold event */ 49 SCSI_QDEPTH_RAMP_UP, /* scsi-ml requested due to threshold event */
50}; 50};
51 51
52struct scsi_host_template { 52struct scsi_host_template {
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index 59816fe31e68..2a65167a8f10 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -192,9 +192,9 @@ struct fc_vport_identifiers {
192 * 192 *
193 * This structure exists for each FC port is a virtual FC port. Virtual 193 * This structure exists for each FC port is a virtual FC port. Virtual
194 * ports share the physical link with the Physical port. Each virtual 194 * ports share the physical link with the Physical port. Each virtual
195 * ports has a unique presense on the SAN, and may be instantiated via 195 * ports has a unique presence on the SAN, and may be instantiated via
196 * NPIV, Virtual Fabrics, or via additional ALPAs. As the vport is a 196 * NPIV, Virtual Fabrics, or via additional ALPAs. As the vport is a
197 * unique presense, each vport has it's own view of the fabric, 197 * unique presence, each vport has it's own view of the fabric,
198 * authentication privilege, and priorities. 198 * authentication privilege, and priorities.
199 * 199 *
200 * A virtual port may support 1 or more FC4 roles. Typically it is a 200 * A virtual port may support 1 or more FC4 roles. Typically it is a
@@ -370,7 +370,7 @@ struct fc_rport { /* aka fc_starget_attrs */
370/* 370/*
371 * FC SCSI Target Attributes 371 * FC SCSI Target Attributes
372 * 372 *
373 * The SCSI Target is considered an extention of a remote port (as 373 * The SCSI Target is considered an extension of a remote port (as
374 * a remote port can be more than a SCSI Target). Within the scsi 374 * a remote port can be more than a SCSI Target). Within the scsi
375 * subsystem, we leave the Target as a separate entity. Doing so 375 * subsystem, we leave the Target as a separate entity. Doing so
376 * provides backward compatibility with prior FC transport api's, 376 * provides backward compatibility with prior FC transport api's,
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index f1dcefe4532b..02cbb50225bb 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -385,7 +385,7 @@
385#define AC97_SCAP_DETECT_BY_VENDOR (1<<8) /* use vendor registers for read tests */ 385#define AC97_SCAP_DETECT_BY_VENDOR (1<<8) /* use vendor registers for read tests */
386#define AC97_SCAP_NO_SPDIF (1<<9) /* don't build SPDIF controls */ 386#define AC97_SCAP_NO_SPDIF (1<<9) /* don't build SPDIF controls */
387#define AC97_SCAP_EAPD_LED (1<<10) /* EAPD as mute LED */ 387#define AC97_SCAP_EAPD_LED (1<<10) /* EAPD as mute LED */
388#define AC97_SCAP_POWER_SAVE (1<<11) /* capable for aggresive power-saving */ 388#define AC97_SCAP_POWER_SAVE (1<<11) /* capable for aggressive power-saving */
389 389
390/* ac97->flags */ 390/* ac97->flags */
391#define AC97_HAS_PC_BEEP (1<<0) /* force PC Speaker usage */ 391#define AC97_HAS_PC_BEEP (1<<0) /* force PC Speaker usage */
diff --git a/include/sound/control.h b/include/sound/control.h
index e67db2869360..404acb859cee 100644
--- a/include/sound/control.h
+++ b/include/sound/control.h
@@ -191,7 +191,7 @@ int _snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave,
191 * Returns zero if successful or a negative error code. 191 * Returns zero if successful or a negative error code.
192 * 192 *
193 * All slaves must be the same type (returning the same information 193 * All slaves must be the same type (returning the same information
194 * via info callback). The fucntion doesn't check it, so it's your 194 * via info callback). The function doesn't check it, so it's your
195 * responsibility. 195 * responsibility.
196 * 196 *
197 * Also, some additional limitations: 197 * Also, some additional limitations:
diff --git a/include/sound/cs46xx_dsp_spos.h b/include/sound/cs46xx_dsp_spos.h
index 49b03c9e5e55..8008c59288a6 100644
--- a/include/sound/cs46xx_dsp_spos.h
+++ b/include/sound/cs46xx_dsp_spos.h
@@ -147,7 +147,7 @@ struct dsp_pcm_channel_descriptor {
147}; 147};
148 148
149struct dsp_spos_instance { 149struct dsp_spos_instance {
150 struct dsp_symbol_desc symbol_table; /* currently availble loaded symbols in SP */ 150 struct dsp_symbol_desc symbol_table; /* currently available loaded symbols in SP */
151 151
152 int nmodules; 152 int nmodules;
153 struct dsp_module_desc * modules; /* modules loaded into SP */ 153 struct dsp_module_desc * modules; /* modules loaded into SP */
diff --git a/include/sound/hdspm.h b/include/sound/hdspm.h
index 1774ff5ff632..1f59ea2a4a76 100644
--- a/include/sound/hdspm.h
+++ b/include/sound/hdspm.h
@@ -193,7 +193,7 @@ struct hdspm_version {
193 * 32768 Bytes 193 * 32768 Bytes
194 */ 194 */
195 195
196/* organisation is 64 channelfader in a continous memory block */ 196/* organisation is 64 channelfader in a continuous memory block */
197/* equivalent to hardware definition, maybe for future feature of mmap of 197/* equivalent to hardware definition, maybe for future feature of mmap of
198 * them 198 * them
199 */ 199 */
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index ddc2b3d6be03..f72c1039a6fb 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -23,7 +23,7 @@
23/* 23/*
24 * SoC dynamic audio power management 24 * SoC dynamic audio power management
25 * 25 *
26 * We can have upto 4 power domains 26 * We can have up to 4 power domains
27 * 1. Codec domain - VREF, VMID 27 * 1. Codec domain - VREF, VMID
28 * Usually controlled at codec probe/remove, although can be set 28 * Usually controlled at codec probe/remove, although can be set
29 * at stream time if power is not needed for sidetone, etc. 29 * at stream time if power is not needed for sidetone, etc.
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index c15ed5026fb5..1d3b5b2f0dbc 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -22,7 +22,7 @@
22 * Note that both include/scsi/scsi_cmnd.h:MAX_COMMAND_SIZE and 22 * Note that both include/scsi/scsi_cmnd.h:MAX_COMMAND_SIZE and
23 * include/linux/blkdev.h:BLOCK_MAX_CDB as of v2.6.36-rc4 still use 23 * include/linux/blkdev.h:BLOCK_MAX_CDB as of v2.6.36-rc4 still use
24 * 16-byte CDBs by default and require an extra allocation for 24 * 16-byte CDBs by default and require an extra allocation for
25 * 32-byte CDBs to becasue of legacy issues. 25 * 32-byte CDBs to because of legacy issues.
26 * 26 *
27 * Within TCM Core there are no such legacy limitiations, so we go ahead 27 * Within TCM Core there are no such legacy limitiations, so we go ahead
28 * use 32-byte CDBs by default and use include/scsi/scsi.h:scsi_command_size() 28 * use 32-byte CDBs by default and use include/scsi/scsi.h:scsi_command_size()
@@ -302,7 +302,7 @@ struct t10_wwn {
302 302
303 303
304/* 304/*
305 * Used by TCM Core internally to signal if >= SPC-3 peristent reservations 305 * Used by TCM Core internally to signal if >= SPC-3 persistent reservations
306 * emulation is enabled or disabled, or running in with TCM/pSCSI passthrough 306 * emulation is enabled or disabled, or running in with TCM/pSCSI passthrough
307 * mode 307 * mode
308 */ 308 */
@@ -934,7 +934,7 @@ struct se_portal_group {
934 struct list_head acl_node_list; 934 struct list_head acl_node_list;
935 struct se_lun *tpg_lun_list; 935 struct se_lun *tpg_lun_list;
936 struct se_lun tpg_virt_lun0; 936 struct se_lun tpg_virt_lun0;
937 /* List of TCM sessions assoicated wth this TPG */ 937 /* List of TCM sessions associated wth this TPG */
938 struct list_head tpg_sess_list; 938 struct list_head tpg_sess_list;
939 /* Pointer to $FABRIC_MOD dependent code */ 939 /* Pointer to $FABRIC_MOD dependent code */
940 struct target_core_fabric_ops *se_tpg_tfo; 940 struct target_core_fabric_ops *se_tpg_tfo;
diff --git a/include/target/target_core_fabric_ops.h b/include/target/target_core_fabric_ops.h
index 5eb8b1ae59d1..dc78f77f9450 100644
--- a/include/target/target_core_fabric_ops.h
+++ b/include/target/target_core_fabric_ops.h
@@ -35,7 +35,7 @@ struct target_core_fabric_ops {
35 /* 35 /*
36 * Optional function pointer for TCM to perform command map 36 * Optional function pointer for TCM to perform command map
37 * from TCM processing thread context, for those struct se_cmd 37 * from TCM processing thread context, for those struct se_cmd
38 * initally allocated in interrupt context. 38 * initially allocated in interrupt context.
39 */ 39 */
40 int (*new_cmd_map)(struct se_cmd *); 40 int (*new_cmd_map)(struct se_cmd *);
41 /* 41 /*
diff --git a/include/video/kyro.h b/include/video/kyro.h
index dba7de2ee4a8..c563968e926c 100644
--- a/include/video/kyro.h
+++ b/include/video/kyro.h
@@ -32,7 +32,7 @@ struct kyrofb_info {
32 u32 PIXCLK; /* Pixel Clock */ 32 u32 PIXCLK; /* Pixel Clock */
33 u32 HCLK; /* Hor Clock */ 33 u32 HCLK; /* Hor Clock */
34 34
35 /* Usefull to hold depth here for Linux */ 35 /* Useful to hold depth here for Linux */
36 u8 PIXDEPTH; 36 u8 PIXDEPTH;
37 37
38#ifdef CONFIG_MTRR 38#ifdef CONFIG_MTRR
diff --git a/include/video/neomagic.h b/include/video/neomagic.h
index 08b663782956..bc5013e8059d 100644
--- a/include/video/neomagic.h
+++ b/include/video/neomagic.h
@@ -129,7 +129,7 @@ struct neofb_par {
129 unsigned char CRTC[25]; /* Crtc Controller */ 129 unsigned char CRTC[25]; /* Crtc Controller */
130 unsigned char Sequencer[5]; /* Video Sequencer */ 130 unsigned char Sequencer[5]; /* Video Sequencer */
131 unsigned char Graphics[9]; /* Video Graphics */ 131 unsigned char Graphics[9]; /* Video Graphics */
132 unsigned char Attribute[21]; /* Video Atribute */ 132 unsigned char Attribute[21]; /* Video Attribute */
133 133
134 unsigned char GeneralLockReg; 134 unsigned char GeneralLockReg;
135 unsigned char ExtCRTDispAddr; 135 unsigned char ExtCRTDispAddr;
diff --git a/include/video/newport.h b/include/video/newport.h
index 001b935e71c4..3d7c4b492ec6 100644
--- a/include/video/newport.h
+++ b/include/video/newport.h
@@ -5,7 +5,7 @@
5 * 5 *
6 * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) 6 * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
7 * 7 *
8 * Ulf Carlsson - Compability with the IRIX structures added 8 * Ulf Carlsson - Compatibility with the IRIX structures added
9 */ 9 */
10 10
11#ifndef _SGI_NEWPORT_H 11#ifndef _SGI_NEWPORT_H
diff --git a/include/video/sisfb.h b/include/video/sisfb.h
index fdd74f1a6791..6dc5df9e43f3 100644
--- a/include/video/sisfb.h
+++ b/include/video/sisfb.h
@@ -151,7 +151,7 @@ struct sisfb_cmd {
151 __u32 sisfb_result[4]; 151 __u32 sisfb_result[4];
152}; 152};
153 153
154/* Addtional IOCTLs for communication sisfb <> X driver */ 154/* Additional IOCTLs for communication sisfb <> X driver */
155/* If changing this, vgatypes.h must also be changed (for X driver) */ 155/* If changing this, vgatypes.h must also be changed (for X driver) */
156 156
157/* ioctl for identifying and giving some info (esp. memory heap start) */ 157/* ioctl for identifying and giving some info (esp. memory heap start) */
diff --git a/include/video/sstfb.h b/include/video/sstfb.h
index b52f07381243..c449eace12cd 100644
--- a/include/video/sstfb.h
+++ b/include/video/sstfb.h
@@ -156,7 +156,7 @@
156#define DAC_READ FBIINIT2 /* in remap mode */ 156#define DAC_READ FBIINIT2 /* in remap mode */
157#define FBIINIT3 0x021c /* fbi controls */ 157#define FBIINIT3 0x021c /* fbi controls */
158# define DISABLE_TEXTURE BIT(6) 158# define DISABLE_TEXTURE BIT(6)
159# define Y_SWAP_ORIGIN_SHIFT 22 /* Y swap substraction value */ 159# define Y_SWAP_ORIGIN_SHIFT 22 /* Y swap subtraction value */
160#define HSYNC 0x0220 160#define HSYNC 0x0220
161#define VSYNC 0x0224 161#define VSYNC 0x0224
162#define DAC_DATA 0x022c 162#define DAC_DATA 0x022c
@@ -212,9 +212,9 @@
212# define DACREG_CR0_24BPP 0x50 /* mode 5 */ 212# define DACREG_CR0_24BPP 0x50 /* mode 5 */
213#define DACREG_CR1_I 0x05 213#define DACREG_CR1_I 0x05
214#define DACREG_CC_I 0x06 214#define DACREG_CC_I 0x06
215# define DACREG_CC_CLKA BIT(7) /* clk A controled by regs */ 215# define DACREG_CC_CLKA BIT(7) /* clk A controlled by regs */
216# define DACREG_CC_CLKA_C (2<<4) /* clk A uses reg C */ 216# define DACREG_CC_CLKA_C (2<<4) /* clk A uses reg C */
217# define DACREG_CC_CLKB BIT(3) /* clk B controled by regs */ 217# define DACREG_CC_CLKB BIT(3) /* clk B controlled by regs */
218# define DACREG_CC_CLKB_D 3 /* clkB uses reg D */ 218# define DACREG_CC_CLKB_D 3 /* clkB uses reg D */
219#define DACREG_AC0_I 0x48 /* clock A reg C */ 219#define DACREG_AC0_I 0x48 /* clock A reg C */
220#define DACREG_AC1_I 0x49 220#define DACREG_AC1_I 0x49
diff --git a/include/xen/interface/elfnote.h b/include/xen/interface/elfnote.h
index 7a8262c375cc..0360b15f4883 100644
--- a/include/xen/interface/elfnote.h
+++ b/include/xen/interface/elfnote.h
@@ -51,7 +51,7 @@
51 51
52/* 52/*
53 * The offset of the ELF paddr field from the acutal required 53 * The offset of the ELF paddr field from the acutal required
54 * psuedo-physical address (numeric). 54 * pseudo-physical address (numeric).
55 * 55 *
56 * This is used to maintain backwards compatibility with older kernels 56 * This is used to maintain backwards compatibility with older kernels
57 * which wrote __PAGE_OFFSET into that field. This field defaults to 0 57 * which wrote __PAGE_OFFSET into that field. This field defaults to 0
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 3e0112157795..c0851a8e030c 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -186,7 +186,7 @@ dev_t name_to_dev_t(char *name)
186 goto done; 186 goto done;
187 187
188 /* 188 /*
189 * try non-existant, but valid partition, which may only exist 189 * try non-existent, but valid partition, which may only exist
190 * after revalidating the disk, like partitioned md devices 190 * after revalidating the disk, like partitioned md devices
191 */ 191 */
192 while (p > s && isdigit(p[-1])) 192 while (p > s && isdigit(p[-1]))
diff --git a/ipc/msg.c b/ipc/msg.c
index 0e732e92e22f..7385de25788a 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -704,7 +704,7 @@ long do_msgsnd(int msqid, long mtype, void __user *mtext,
704 msq->q_stime = get_seconds(); 704 msq->q_stime = get_seconds();
705 705
706 if (!pipelined_send(msq, msg)) { 706 if (!pipelined_send(msq, msg)) {
707 /* noone is waiting for this message, enqueue it */ 707 /* no one is waiting for this message, enqueue it */
708 list_add_tail(&msg->m_list, &msq->q_messages); 708 list_add_tail(&msg->m_list, &msq->q_messages);
709 msq->q_cbytes += msgsz; 709 msq->q_cbytes += msgsz;
710 msq->q_qnum++; 710 msq->q_qnum++;
@@ -842,7 +842,7 @@ long do_msgrcv(int msqid, long *pmtype, void __user *mtext,
842 * Disable preemption. We don't hold a reference to the queue 842 * Disable preemption. We don't hold a reference to the queue
843 * and getting a reference would defeat the idea of a lockless 843 * and getting a reference would defeat the idea of a lockless
844 * operation, thus the code relies on rcu to guarantee the 844 * operation, thus the code relies on rcu to guarantee the
845 * existance of msq: 845 * existence of msq:
846 * Prior to destruction, expunge_all(-EIRDM) changes r_msg. 846 * Prior to destruction, expunge_all(-EIRDM) changes r_msg.
847 * Thus if r_msg is -EAGAIN, then the queue not yet destroyed. 847 * Thus if r_msg is -EAGAIN, then the queue not yet destroyed.
848 * rcu_read_lock() prevents preemption between reading r_msg 848 * rcu_read_lock() prevents preemption between reading r_msg
diff --git a/ipc/sem.c b/ipc/sem.c
index ae040a0727c2..34193ed69fbe 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -1362,7 +1362,7 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
1362 * semid identifiers are not unique - find_alloc_undo may have 1362 * semid identifiers are not unique - find_alloc_undo may have
1363 * allocated an undo structure, it was invalidated by an RMID 1363 * allocated an undo structure, it was invalidated by an RMID
1364 * and now a new array with received the same id. Check and fail. 1364 * and now a new array with received the same id. Check and fail.
1365 * This case can be detected checking un->semid. The existance of 1365 * This case can be detected checking un->semid. The existence of
1366 * "un" itself is guaranteed by rcu. 1366 * "un" itself is guaranteed by rcu.
1367 */ 1367 */
1368 error = -EIDRM; 1368 error = -EIDRM;
diff --git a/ipc/shm.c b/ipc/shm.c
index 8644452f5c4c..729acb7e3148 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -1056,7 +1056,7 @@ SYSCALL_DEFINE1(shmdt, char __user *, shmaddr)
1056 /* 1056 /*
1057 * We need look no further than the maximum address a fragment 1057 * We need look no further than the maximum address a fragment
1058 * could possibly have landed at. Also cast things to loff_t to 1058 * could possibly have landed at. Also cast things to loff_t to
1059 * prevent overflows and make comparisions vs. equal-width types. 1059 * prevent overflows and make comparisons vs. equal-width types.
1060 */ 1060 */
1061 size = PAGE_ALIGN(size); 1061 size = PAGE_ALIGN(size);
1062 while (vma && (loff_t)(vma->vm_end - addr) <= size) { 1062 while (vma && (loff_t)(vma->vm_end - addr) <= size) {
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
index 37b2bea170c8..e99dda04b126 100644
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
@@ -607,7 +607,7 @@ void audit_trim_trees(void)
607 spin_lock(&hash_lock); 607 spin_lock(&hash_lock);
608 list_for_each_entry(node, &tree->chunks, list) { 608 list_for_each_entry(node, &tree->chunks, list) {
609 struct audit_chunk *chunk = find_chunk(node); 609 struct audit_chunk *chunk = find_chunk(node);
610 /* this could be NULL if the watch is dieing else where... */ 610 /* this could be NULL if the watch is dying else where... */
611 struct inode *inode = chunk->mark.i.inode; 611 struct inode *inode = chunk->mark.i.inode;
612 node->index |= 1U<<31; 612 node->index |= 1U<<31;
613 if (iterate_mounts(compare_root, inode, root_mnt)) 613 if (iterate_mounts(compare_root, inode, root_mnt))
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index f49a0318c2ed..b33513a08beb 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1011,7 +1011,7 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,
1011/* 1011/*
1012 * to_send and len_sent accounting are very loose estimates. We aren't 1012 * to_send and len_sent accounting are very loose estimates. We aren't
1013 * really worried about a hard cap to MAX_EXECVE_AUDIT_LEN so much as being 1013 * really worried about a hard cap to MAX_EXECVE_AUDIT_LEN so much as being
1014 * within about 500 bytes (next page boundry) 1014 * within about 500 bytes (next page boundary)
1015 * 1015 *
1016 * why snprintf? an int is up to 12 digits long. if we just assumed when 1016 * why snprintf? an int is up to 12 digits long. if we just assumed when
1017 * logging that a[%d]= was going to be 16 characters long we would be wasting 1017 * logging that a[%d]= was going to be 16 characters long we would be wasting
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index e31b220a743d..25c7eb52de1a 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -157,7 +157,7 @@ struct css_id {
157}; 157};
158 158
159/* 159/*
160 * cgroup_event represents events which userspace want to recieve. 160 * cgroup_event represents events which userspace want to receive.
161 */ 161 */
162struct cgroup_event { 162struct cgroup_event {
163 /* 163 /*
diff --git a/kernel/cpu.c b/kernel/cpu.c
index c95fc4df0faa..12b7458f23b1 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -126,7 +126,7 @@ static void cpu_hotplug_done(void)
126#else /* #if CONFIG_HOTPLUG_CPU */ 126#else /* #if CONFIG_HOTPLUG_CPU */
127static void cpu_hotplug_begin(void) {} 127static void cpu_hotplug_begin(void) {}
128static void cpu_hotplug_done(void) {} 128static void cpu_hotplug_done(void) {}
129#endif /* #esle #if CONFIG_HOTPLUG_CPU */ 129#endif /* #else #if CONFIG_HOTPLUG_CPU */
130 130
131/* Need to know about CPUs going up/down? */ 131/* Need to know about CPUs going up/down? */
132int __ref register_cpu_notifier(struct notifier_block *nb) 132int __ref register_cpu_notifier(struct notifier_block *nb)
diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
index cefd4a11f6d9..bad6786dee88 100644
--- a/kernel/debug/debug_core.c
+++ b/kernel/debug/debug_core.c
@@ -538,7 +538,7 @@ return_normal:
538 538
539 /* 539 /*
540 * For single stepping, try to only enter on the processor 540 * For single stepping, try to only enter on the processor
541 * that was single stepping. To gaurd against a deadlock, the 541 * that was single stepping. To guard against a deadlock, the
542 * kernel will only try for the value of sstep_tries before 542 * kernel will only try for the value of sstep_tries before
543 * giving up and continuing on. 543 * giving up and continuing on.
544 */ 544 */
diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
index 6bc6e3bc4f9c..be14779bcef6 100644
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
@@ -441,9 +441,9 @@ static int kdb_check_regs(void)
441 * symbol name, and offset to the caller. 441 * symbol name, and offset to the caller.
442 * 442 *
443 * The argument may consist of a numeric value (decimal or 443 * The argument may consist of a numeric value (decimal or
444 * hexidecimal), a symbol name, a register name (preceeded by the 444 * hexidecimal), a symbol name, a register name (preceded by the
445 * percent sign), an environment variable with a numeric value 445 * percent sign), an environment variable with a numeric value
446 * (preceeded by a dollar sign) or a simple arithmetic expression 446 * (preceded by a dollar sign) or a simple arithmetic expression
447 * consisting of a symbol name, +/-, and a numeric constant value 447 * consisting of a symbol name, +/-, and a numeric constant value
448 * (offset). 448 * (offset).
449 * Parameters: 449 * Parameters:
@@ -1335,7 +1335,7 @@ void kdb_print_state(const char *text, int value)
1335 * error The hardware-defined error code 1335 * error The hardware-defined error code
1336 * reason2 kdb's current reason code. 1336 * reason2 kdb's current reason code.
1337 * Initially error but can change 1337 * Initially error but can change
1338 * acording to kdb state. 1338 * according to kdb state.
1339 * db_result Result code from break or debug point. 1339 * db_result Result code from break or debug point.
1340 * regs The exception frame at time of fault/breakpoint. 1340 * regs The exception frame at time of fault/breakpoint.
1341 * should always be valid. 1341 * should always be valid.
diff --git a/kernel/debug/kdb/kdb_support.c b/kernel/debug/kdb/kdb_support.c
index 6b2485dcb050..5532dd37aa86 100644
--- a/kernel/debug/kdb/kdb_support.c
+++ b/kernel/debug/kdb/kdb_support.c
@@ -545,7 +545,7 @@ int kdb_putword(unsigned long addr, unsigned long word, size_t size)
545 * Mask for process state. 545 * Mask for process state.
546 * Notes: 546 * Notes:
547 * The mask folds data from several sources into a single long value, so 547 * The mask folds data from several sources into a single long value, so
548 * be carefull not to overlap the bits. TASK_* bits are in the LSB, 548 * be careful not to overlap the bits. TASK_* bits are in the LSB,
549 * special cases like UNRUNNABLE are in the MSB. As of 2.6.10-rc1 there 549 * special cases like UNRUNNABLE are in the MSB. As of 2.6.10-rc1 there
550 * is no overlap between TASK_* and EXIT_* but that may not always be 550 * is no overlap between TASK_* and EXIT_* but that may not always be
551 * true, so EXIT_* bits are shifted left 16 bits before being stored in 551 * true, so EXIT_* bits are shifted left 16 bits before being stored in
diff --git a/kernel/exit.c b/kernel/exit.c
index 6a488ad2dce5..f5d2f63bae0b 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -841,7 +841,7 @@ static void exit_notify(struct task_struct *tsk, int group_dead)
841 /* Let father know we died 841 /* Let father know we died
842 * 842 *
843 * Thread signals are configurable, but you aren't going to use 843 * Thread signals are configurable, but you aren't going to use
844 * that to send signals to arbitary processes. 844 * that to send signals to arbitrary processes.
845 * That stops right now. 845 * That stops right now.
846 * 846 *
847 * If the parent exec id doesn't match the exec id we saved 847 * If the parent exec id doesn't match the exec id we saved
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 1dafc8652bd8..4af1e2b244cb 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -415,7 +415,7 @@ out:
415 * @desc: the interrupt description structure for this irq 415 * @desc: the interrupt description structure for this irq
416 * 416 *
417 * Interrupt occures on the falling and/or rising edge of a hardware 417 * Interrupt occures on the falling and/or rising edge of a hardware
418 * signal. The occurence is latched into the irq controller hardware 418 * signal. The occurrence is latched into the irq controller hardware
419 * and must be acked in order to be reenabled. After the ack another 419 * and must be acked in order to be reenabled. After the ack another
420 * interrupt can happen on the same source even before the first one 420 * interrupt can happen on the same source even before the first one
421 * is handled by the associated event handler. If this happens it 421 * is handled by the associated event handler. If this happens it
diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index bc6194698dfd..47420908fba0 100644
--- a/kernel/irq/migration.c
+++ b/kernel/irq/migration.c
@@ -35,7 +35,7 @@ void irq_move_masked_irq(struct irq_data *idata)
35 * do the disable, re-program, enable sequence. 35 * do the disable, re-program, enable sequence.
36 * This is *not* particularly important for level triggered 36 * This is *not* particularly important for level triggered
37 * but in a edge trigger case, we might be setting rte 37 * but in a edge trigger case, we might be setting rte
38 * when an active trigger is comming in. This could 38 * when an active trigger is coming in. This could
39 * cause some ioapics to mal-function. 39 * cause some ioapics to mal-function.
40 * Being paranoid i guess! 40 * Being paranoid i guess!
41 * 41 *
diff --git a/kernel/kexec.c b/kernel/kexec.c
index 4e240a378df6..55936f9cb251 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -144,7 +144,7 @@ static int do_kimage_alloc(struct kimage **rimage, unsigned long entry,
144 /* Initialize the list of destination pages */ 144 /* Initialize the list of destination pages */
145 INIT_LIST_HEAD(&image->dest_pages); 145 INIT_LIST_HEAD(&image->dest_pages);
146 146
147 /* Initialize the list of unuseable pages */ 147 /* Initialize the list of unusable pages */
148 INIT_LIST_HEAD(&image->unuseable_pages); 148 INIT_LIST_HEAD(&image->unuseable_pages);
149 149
150 /* Read in the segments */ 150 /* Read in the segments */
@@ -454,7 +454,7 @@ static struct page *kimage_alloc_normal_control_pages(struct kimage *image,
454 /* Deal with the destination pages I have inadvertently allocated. 454 /* Deal with the destination pages I have inadvertently allocated.
455 * 455 *
456 * Ideally I would convert multi-page allocations into single 456 * Ideally I would convert multi-page allocations into single
457 * page allocations, and add everyting to image->dest_pages. 457 * page allocations, and add everything to image->dest_pages.
458 * 458 *
459 * For now it is simpler to just free the pages. 459 * For now it is simpler to just free the pages.
460 */ 460 */
@@ -602,7 +602,7 @@ static void kimage_free_extra_pages(struct kimage *image)
602 /* Walk through and free any extra destination pages I may have */ 602 /* Walk through and free any extra destination pages I may have */
603 kimage_free_page_list(&image->dest_pages); 603 kimage_free_page_list(&image->dest_pages);
604 604
605 /* Walk through and free any unuseable pages I have cached */ 605 /* Walk through and free any unusable pages I have cached */
606 kimage_free_page_list(&image->unuseable_pages); 606 kimage_free_page_list(&image->unuseable_pages);
607 607
608} 608}
diff --git a/kernel/kthread.c b/kernel/kthread.c
index 684ab3f7dd72..3b34d2732bce 100644
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -139,7 +139,7 @@ static void create_kthread(struct kthread_create_info *create)
139 * in @node, to get NUMA affinity for kthread stack, or else give -1. 139 * in @node, to get NUMA affinity for kthread stack, or else give -1.
140 * When woken, the thread will run @threadfn() with @data as its 140 * When woken, the thread will run @threadfn() with @data as its
141 * argument. @threadfn() can either call do_exit() directly if it is a 141 * argument. @threadfn() can either call do_exit() directly if it is a
142 * standalone thread for which noone will call kthread_stop(), or 142 * standalone thread for which no one will call kthread_stop(), or
143 * return when 'kthread_should_stop()' is true (which means 143 * return when 'kthread_should_stop()' is true (which means
144 * kthread_stop() has been called). The return value should be zero 144 * kthread_stop() has been called). The return value should be zero
145 * or a negative error number; it will be passed to kthread_stop(). 145 * or a negative error number; it will be passed to kthread_stop().
diff --git a/kernel/latencytop.c b/kernel/latencytop.c
index ee74b35e528d..376066e10413 100644
--- a/kernel/latencytop.c
+++ b/kernel/latencytop.c
@@ -153,7 +153,7 @@ static inline void store_stacktrace(struct task_struct *tsk,
153} 153}
154 154
155/** 155/**
156 * __account_scheduler_latency - record an occured latency 156 * __account_scheduler_latency - record an occurred latency
157 * @tsk - the task struct of the task hitting the latency 157 * @tsk - the task struct of the task hitting the latency
158 * @usecs - the duration of the latency in microseconds 158 * @usecs - the duration of the latency in microseconds
159 * @inter - 1 if the sleep was interruptible, 0 if uninterruptible 159 * @inter - 1 if the sleep was interruptible, 0 if uninterruptible
diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 0d2058da80f5..53a68956f131 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -2309,7 +2309,7 @@ void trace_hardirqs_on_caller(unsigned long ip)
2309 if (unlikely(curr->hardirqs_enabled)) { 2309 if (unlikely(curr->hardirqs_enabled)) {
2310 /* 2310 /*
2311 * Neither irq nor preemption are disabled here 2311 * Neither irq nor preemption are disabled here
2312 * so this is racy by nature but loosing one hit 2312 * so this is racy by nature but losing one hit
2313 * in a stat is not a big deal. 2313 * in a stat is not a big deal.
2314 */ 2314 */
2315 __debug_atomic_inc(redundant_hardirqs_on); 2315 __debug_atomic_inc(redundant_hardirqs_on);
@@ -2620,7 +2620,7 @@ static int mark_lock(struct task_struct *curr, struct held_lock *this,
2620 if (!graph_lock()) 2620 if (!graph_lock())
2621 return 0; 2621 return 0;
2622 /* 2622 /*
2623 * Make sure we didnt race: 2623 * Make sure we didn't race:
2624 */ 2624 */
2625 if (unlikely(hlock_class(this)->usage_mask & new_mask)) { 2625 if (unlikely(hlock_class(this)->usage_mask & new_mask)) {
2626 graph_unlock(); 2626 graph_unlock();
diff --git a/kernel/module.c b/kernel/module.c
index 1f9f7bc56ca1..d5938a5c19c4 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -809,7 +809,7 @@ SYSCALL_DEFINE2(delete_module, const char __user *, name_user,
809 wait_for_zero_refcount(mod); 809 wait_for_zero_refcount(mod);
810 810
811 mutex_unlock(&module_mutex); 811 mutex_unlock(&module_mutex);
812 /* Final destruction now noone is using it. */ 812 /* Final destruction now no one is using it. */
813 if (mod->exit != NULL) 813 if (mod->exit != NULL)
814 mod->exit(); 814 mod->exit();
815 blocking_notifier_call_chain(&module_notify_list, 815 blocking_notifier_call_chain(&module_notify_list,
@@ -2777,7 +2777,7 @@ static struct module *load_module(void __user *umod,
2777 mod->state = MODULE_STATE_COMING; 2777 mod->state = MODULE_STATE_COMING;
2778 2778
2779 /* Now sew it into the lists so we can get lockdep and oops 2779 /* Now sew it into the lists so we can get lockdep and oops
2780 * info during argument parsing. Noone should access us, since 2780 * info during argument parsing. No one should access us, since
2781 * strong_try_module_get() will fail. 2781 * strong_try_module_get() will fail.
2782 * lockdep/oops can run asynchronous, so use the RCU list insertion 2782 * lockdep/oops can run asynchronous, so use the RCU list insertion
2783 * function to insert in a way safe to concurrent readers. 2783 * function to insert in a way safe to concurrent readers.
@@ -2971,7 +2971,7 @@ static const char *get_ksymbol(struct module *mod,
2971 else 2971 else
2972 nextval = (unsigned long)mod->module_core+mod->core_text_size; 2972 nextval = (unsigned long)mod->module_core+mod->core_text_size;
2973 2973
2974 /* Scan for closest preceeding symbol, and next symbol. (ELF 2974 /* Scan for closest preceding symbol, and next symbol. (ELF
2975 starts real symbols at 1). */ 2975 starts real symbols at 1). */
2976 for (i = 1; i < mod->num_symtab; i++) { 2976 for (i = 1; i < mod->num_symtab; i++) {
2977 if (mod->symtab[i].st_shndx == SHN_UNDEF) 2977 if (mod->symtab[i].st_shndx == SHN_UNDEF)
diff --git a/kernel/mutex.c b/kernel/mutex.c
index a5889fb28ecf..c4195fa98900 100644
--- a/kernel/mutex.c
+++ b/kernel/mutex.c
@@ -245,7 +245,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
245 } 245 }
246 __set_task_state(task, state); 246 __set_task_state(task, state);
247 247
248 /* didnt get the lock, go to sleep: */ 248 /* didn't get the lock, go to sleep: */
249 spin_unlock_mutex(&lock->wait_lock, flags); 249 spin_unlock_mutex(&lock->wait_lock, flags);
250 preempt_enable_no_resched(); 250 preempt_enable_no_resched();
251 schedule(); 251 schedule();
diff --git a/kernel/padata.c b/kernel/padata.c
index 751019415d23..b91941df5e63 100644
--- a/kernel/padata.c
+++ b/kernel/padata.c
@@ -262,7 +262,7 @@ static void padata_reorder(struct parallel_data *pd)
262 /* 262 /*
263 * This cpu has to do the parallel processing of the next 263 * This cpu has to do the parallel processing of the next
264 * object. It's waiting in the cpu's parallelization queue, 264 * object. It's waiting in the cpu's parallelization queue,
265 * so exit imediately. 265 * so exit immediately.
266 */ 266 */
267 if (PTR_ERR(padata) == -ENODATA) { 267 if (PTR_ERR(padata) == -ENODATA) {
268 del_timer(&pd->timer); 268 del_timer(&pd->timer);
@@ -284,7 +284,7 @@ static void padata_reorder(struct parallel_data *pd)
284 /* 284 /*
285 * The next object that needs serialization might have arrived to 285 * The next object that needs serialization might have arrived to
286 * the reorder queues in the meantime, we will be called again 286 * the reorder queues in the meantime, we will be called again
287 * from the timer function if noone else cares for it. 287 * from the timer function if no one else cares for it.
288 */ 288 */
289 if (atomic_read(&pd->reorder_objects) 289 if (atomic_read(&pd->reorder_objects)
290 && !(pinst->flags & PADATA_RESET)) 290 && !(pinst->flags & PADATA_RESET))
@@ -515,7 +515,7 @@ static void __padata_stop(struct padata_instance *pinst)
515 put_online_cpus(); 515 put_online_cpus();
516} 516}
517 517
518/* Replace the internal control stucture with a new one. */ 518/* Replace the internal control structure with a new one. */
519static void padata_replace(struct padata_instance *pinst, 519static void padata_replace(struct padata_instance *pinst,
520 struct parallel_data *pd_new) 520 struct parallel_data *pd_new)
521{ 521{
@@ -768,7 +768,7 @@ static int __padata_remove_cpu(struct padata_instance *pinst, int cpu)
768} 768}
769 769
770 /** 770 /**
771 * padata_remove_cpu - remove a cpu from the one or both(serial and paralell) 771 * padata_remove_cpu - remove a cpu from the one or both(serial and parallel)
772 * padata cpumasks. 772 * padata cpumasks.
773 * 773 *
774 * @pinst: padata instance 774 * @pinst: padata instance
diff --git a/kernel/params.c b/kernel/params.c
index 0da1411222b9..7ab388a48a2e 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -95,7 +95,7 @@ static int parse_one(char *param,
95 /* Find parameter */ 95 /* Find parameter */
96 for (i = 0; i < num_params; i++) { 96 for (i = 0; i < num_params; i++) {
97 if (parameq(param, params[i].name)) { 97 if (parameq(param, params[i].name)) {
98 /* Noone handled NULL, so do it here. */ 98 /* No one handled NULL, so do it here. */
99 if (!val && params[i].ops->set != param_set_bool) 99 if (!val && params[i].ops->set != param_set_bool)
100 return -EINVAL; 100 return -EINVAL;
101 DEBUGP("They are equal! Calling %p\n", 101 DEBUGP("They are equal! Calling %p\n",
diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index 67fea9d25d55..0791b13df7bf 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -1347,7 +1347,7 @@ void run_posix_cpu_timers(struct task_struct *tsk)
1347 1347
1348 /* 1348 /*
1349 * Now that all the timers on our list have the firing flag, 1349 * Now that all the timers on our list have the firing flag,
1350 * noone will touch their list entries but us. We'll take 1350 * no one will touch their list entries but us. We'll take
1351 * each timer's lock before clearing its firing flag, so no 1351 * each timer's lock before clearing its firing flag, so no
1352 * timer call will interfere. 1352 * timer call will interfere.
1353 */ 1353 */
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
index 4c0124919f9a..e5498d7405c3 100644
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
@@ -313,7 +313,7 @@ static void schedule_next_timer(struct k_itimer *timr)
313 * restarted (i.e. we have flagged this in the sys_private entry of the 313 * restarted (i.e. we have flagged this in the sys_private entry of the
314 * info block). 314 * info block).
315 * 315 *
316 * To protect aginst the timer going away while the interrupt is queued, 316 * To protect against the timer going away while the interrupt is queued,
317 * we require that the it_requeue_pending flag be set. 317 * we require that the it_requeue_pending flag be set.
318 */ 318 */
319void do_schedule_next_timer(struct siginfo *info) 319void do_schedule_next_timer(struct siginfo *info)
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 8eaba5f27b10..de9aef8742f4 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -224,7 +224,7 @@ power_attr(state);
224 * writing to 'state'. It first should read from 'wakeup_count' and store 224 * writing to 'state'. It first should read from 'wakeup_count' and store
225 * the read value. Then, after carrying out its own preparations for the system 225 * the read value. Then, after carrying out its own preparations for the system
226 * transition to a sleep state, it should write the stored value to 226 * transition to a sleep state, it should write the stored value to
227 * 'wakeup_count'. If that fails, at least one wakeup event has occured since 227 * 'wakeup_count'. If that fails, at least one wakeup event has occurred since
228 * 'wakeup_count' was read and 'state' should not be written to. Otherwise, it 228 * 'wakeup_count' was read and 'state' should not be written to. Otherwise, it
229 * is allowed to write to 'state', but the transition will be aborted if there 229 * is allowed to write to 'state', but the transition will be aborted if there
230 * are any wakeup events detected after 'wakeup_count' was written to. 230 * are any wakeup events detected after 'wakeup_count' was written to.
diff --git a/kernel/sched.c b/kernel/sched.c
index a8845516ace6..dc7ca5c2a7ab 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2309,7 +2309,7 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
2309 * Cause a process which is running on another CPU to enter 2309 * Cause a process which is running on another CPU to enter
2310 * kernel-mode, without any delay. (to get signals handled.) 2310 * kernel-mode, without any delay. (to get signals handled.)
2311 * 2311 *
2312 * NOTE: this function doesnt have to take the runqueue lock, 2312 * NOTE: this function doesn't have to take the runqueue lock,
2313 * because all it wants to ensure is that the remote task enters 2313 * because all it wants to ensure is that the remote task enters
2314 * the kernel. If the IPI races and the task has been migrated 2314 * the kernel. If the IPI races and the task has been migrated
2315 * to another CPU then no harm is done and the purpose has been 2315 * to another CPU then no harm is done and the purpose has been
@@ -4997,7 +4997,7 @@ recheck:
4997 */ 4997 */
4998 raw_spin_lock_irqsave(&p->pi_lock, flags); 4998 raw_spin_lock_irqsave(&p->pi_lock, flags);
4999 /* 4999 /*
5000 * To be able to change p->policy safely, the apropriate 5000 * To be able to change p->policy safely, the appropriate
5001 * runqueue lock must be held. 5001 * runqueue lock must be held.
5002 */ 5002 */
5003 rq = __task_rq_lock(p); 5003 rq = __task_rq_lock(p);
@@ -5716,7 +5716,7 @@ void show_state_filter(unsigned long state_filter)
5716 do_each_thread(g, p) { 5716 do_each_thread(g, p) {
5717 /* 5717 /*
5718 * reset the NMI-timeout, listing all files on a slow 5718 * reset the NMI-timeout, listing all files on a slow
5719 * console might take alot of time: 5719 * console might take a lot of time:
5720 */ 5720 */
5721 touch_nmi_watchdog(); 5721 touch_nmi_watchdog();
5722 if (!state_filter || (p->state & state_filter)) 5722 if (!state_filter || (p->state & state_filter))
diff --git a/kernel/sched_autogroup.c b/kernel/sched_autogroup.c
index 5946ac515602..429242f3c484 100644
--- a/kernel/sched_autogroup.c
+++ b/kernel/sched_autogroup.c
@@ -179,7 +179,7 @@ void sched_autogroup_create_attach(struct task_struct *p)
179 struct autogroup *ag = autogroup_create(); 179 struct autogroup *ag = autogroup_create();
180 180
181 autogroup_move_group(p, ag); 181 autogroup_move_group(p, ag);
182 /* drop extra refrence added by autogroup_create() */ 182 /* drop extra reference added by autogroup_create() */
183 autogroup_kref_put(ag); 183 autogroup_kref_put(ag);
184} 184}
185EXPORT_SYMBOL(sched_autogroup_create_attach); 185EXPORT_SYMBOL(sched_autogroup_create_attach);
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index c7ec5c8e7b44..4104533d43ef 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -3062,7 +3062,7 @@ static inline void calculate_imbalance(struct sd_lb_stats *sds, int this_cpu,
3062 3062
3063 /* 3063 /*
3064 * if *imbalance is less than the average load per runnable task 3064 * if *imbalance is less than the average load per runnable task
3065 * there is no gaurantee that any tasks will be moved so we'll have 3065 * there is no guarantee that any tasks will be moved so we'll have
3066 * a think about bumping its value to force at least one task to be 3066 * a think about bumping its value to force at least one task to be
3067 * moved 3067 * moved
3068 */ 3068 */
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c
index db308cb08b75..e7cebdc65f82 100644
--- a/kernel/sched_rt.c
+++ b/kernel/sched_rt.c
@@ -1378,7 +1378,7 @@ retry:
1378 task = pick_next_pushable_task(rq); 1378 task = pick_next_pushable_task(rq);
1379 if (task_cpu(next_task) == rq->cpu && task == next_task) { 1379 if (task_cpu(next_task) == rq->cpu && task == next_task) {
1380 /* 1380 /*
1381 * If we get here, the task hasnt moved at all, but 1381 * If we get here, the task hasn't moved at all, but
1382 * it has failed to push. We will not try again, 1382 * it has failed to push. We will not try again,
1383 * since the other cpus will pull from us when they 1383 * since the other cpus will pull from us when they
1384 * are ready. 1384 * are ready.
@@ -1488,7 +1488,7 @@ static int pull_rt_task(struct rq *this_rq)
1488 /* 1488 /*
1489 * We continue with the search, just in 1489 * We continue with the search, just in
1490 * case there's an even higher prio task 1490 * case there's an even higher prio task
1491 * in another runqueue. (low likelyhood 1491 * in another runqueue. (low likelihood
1492 * but possible) 1492 * but possible)
1493 */ 1493 */
1494 } 1494 }
diff --git a/kernel/signal.c b/kernel/signal.c
index dc17929ab78a..29e233fd7a0f 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1887,7 +1887,7 @@ relock:
1887 for (;;) { 1887 for (;;) {
1888 struct k_sigaction *ka; 1888 struct k_sigaction *ka;
1889 /* 1889 /*
1890 * Tracing can induce an artifical signal and choose sigaction. 1890 * Tracing can induce an artificial signal and choose sigaction.
1891 * The return value in @signr determines the default action, 1891 * The return value in @signr determines the default action,
1892 * but @info->si_signo is the signal number we will report. 1892 * but @info->si_signo is the signal number we will report.
1893 */ 1893 */
diff --git a/kernel/softirq.c b/kernel/softirq.c
index 735d87095172..174f976c2874 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -567,7 +567,7 @@ static void __tasklet_hrtimer_trampoline(unsigned long data)
567/** 567/**
568 * tasklet_hrtimer_init - Init a tasklet/hrtimer combo for softirq callbacks 568 * tasklet_hrtimer_init - Init a tasklet/hrtimer combo for softirq callbacks
569 * @ttimer: tasklet_hrtimer which is initialized 569 * @ttimer: tasklet_hrtimer which is initialized
570 * @function: hrtimer callback funtion which gets called from softirq context 570 * @function: hrtimer callback function which gets called from softirq context
571 * @which_clock: clock id (CLOCK_MONOTONIC/CLOCK_REALTIME) 571 * @which_clock: clock id (CLOCK_MONOTONIC/CLOCK_REALTIME)
572 * @mode: hrtimer mode (HRTIMER_MODE_ABS/HRTIMER_MODE_REL) 572 * @mode: hrtimer mode (HRTIMER_MODE_ABS/HRTIMER_MODE_REL)
573 */ 573 */
diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c
index b2fa506667c0..a470154e0408 100644
--- a/kernel/time/jiffies.c
+++ b/kernel/time/jiffies.c
@@ -34,7 +34,7 @@
34 * inaccuracies caused by missed or lost timer 34 * inaccuracies caused by missed or lost timer
35 * interrupts and the inability for the timer 35 * interrupts and the inability for the timer
36 * interrupt hardware to accuratly tick at the 36 * interrupt hardware to accuratly tick at the
37 * requested HZ value. It is also not reccomended 37 * requested HZ value. It is also not recommended
38 * for "tick-less" systems. 38 * for "tick-less" systems.
39 */ 39 */
40#define NSEC_PER_JIFFY ((u32)((((u64)NSEC_PER_SEC)<<8)/ACTHZ)) 40#define NSEC_PER_JIFFY ((u32)((((u64)NSEC_PER_SEC)<<8)/ACTHZ))
diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
index 2f3b585b8d7d..a5d0a3a85dd8 100644
--- a/kernel/time/timer_stats.c
+++ b/kernel/time/timer_stats.c
@@ -236,7 +236,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
236 unsigned int timer_flag) 236 unsigned int timer_flag)
237{ 237{
238 /* 238 /*
239 * It doesnt matter which lock we take: 239 * It doesn't matter which lock we take:
240 */ 240 */
241 raw_spinlock_t *lock; 241 raw_spinlock_t *lock;
242 struct entry *entry, input; 242 struct entry *entry, input;
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index c075f4ea6b94..ee24fa1935ac 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1268,7 +1268,7 @@ static int ftrace_update_code(struct module *mod)
1268 p->flags = 0L; 1268 p->flags = 0L;
1269 1269
1270 /* 1270 /*
1271 * Do the initial record convertion from mcount jump 1271 * Do the initial record conversion from mcount jump
1272 * to the NOP instructions. 1272 * to the NOP instructions.
1273 */ 1273 */
1274 if (!ftrace_code_disable(mod, p)) { 1274 if (!ftrace_code_disable(mod, p)) {
@@ -3425,7 +3425,7 @@ graph_init_task(struct task_struct *t, struct ftrace_ret_stack *ret_stack)
3425 atomic_set(&t->tracing_graph_pause, 0); 3425 atomic_set(&t->tracing_graph_pause, 0);
3426 atomic_set(&t->trace_overrun, 0); 3426 atomic_set(&t->trace_overrun, 0);
3427 t->ftrace_timestamp = 0; 3427 t->ftrace_timestamp = 0;
3428 /* make curr_ret_stack visable before we add the ret_stack */ 3428 /* make curr_ret_stack visible before we add the ret_stack */
3429 smp_wmb(); 3429 smp_wmb();
3430 t->ret_stack = ret_stack; 3430 t->ret_stack = ret_stack;
3431} 3431}
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index d9c8bcafb120..0ef7b4b2a1f7 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -1478,7 +1478,7 @@ static inline unsigned long rb_page_entries(struct buffer_page *bpage)
1478 return local_read(&bpage->entries) & RB_WRITE_MASK; 1478 return local_read(&bpage->entries) & RB_WRITE_MASK;
1479} 1479}
1480 1480
1481/* Size is determined by what has been commited */ 1481/* Size is determined by what has been committed */
1482static inline unsigned rb_page_size(struct buffer_page *bpage) 1482static inline unsigned rb_page_size(struct buffer_page *bpage)
1483{ 1483{
1484 return rb_page_commit(bpage); 1484 return rb_page_commit(bpage);
@@ -2932,7 +2932,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
2932 /* 2932 /*
2933 * cpu_buffer->pages just needs to point to the buffer, it 2933 * cpu_buffer->pages just needs to point to the buffer, it
2934 * has no specific buffer page to point to. Lets move it out 2934 * has no specific buffer page to point to. Lets move it out
2935 * of our way so we don't accidently swap it. 2935 * of our way so we don't accidentally swap it.
2936 */ 2936 */
2937 cpu_buffer->pages = reader->list.prev; 2937 cpu_buffer->pages = reader->list.prev;
2938 2938
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 9541c27c1cf2..d38c16a06a6f 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3239,7 +3239,7 @@ waitagain:
3239 trace_seq_init(&iter->seq); 3239 trace_seq_init(&iter->seq);
3240 3240
3241 /* 3241 /*
3242 * If there was nothing to send to user, inspite of consuming trace 3242 * If there was nothing to send to user, in spite of consuming trace
3243 * entries, go back to wait for more entries. 3243 * entries, go back to wait for more entries.
3244 */ 3244 */
3245 if (sret == -EBUSY) 3245 if (sret == -EBUSY)
diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
index 685a67d55db0..6302747a1398 100644
--- a/kernel/trace/trace_clock.c
+++ b/kernel/trace/trace_clock.c
@@ -46,7 +46,7 @@ u64 notrace trace_clock_local(void)
46} 46}
47 47
48/* 48/*
49 * trace_clock(): 'inbetween' trace clock. Not completely serialized, 49 * trace_clock(): 'between' trace clock. Not completely serialized,
50 * but not completely incorrect when crossing CPUs either. 50 * but not completely incorrect when crossing CPUs either.
51 * 51 *
52 * This is based on cpu_clock(), which will allow at most ~1 jiffy of 52 * This is based on cpu_clock(), which will allow at most ~1 jiffy of
diff --git a/kernel/trace/trace_entries.h b/kernel/trace/trace_entries.h
index 1516cb3ec549..e32744c84d94 100644
--- a/kernel/trace/trace_entries.h
+++ b/kernel/trace/trace_entries.h
@@ -27,7 +27,7 @@
27 * in the structure. 27 * in the structure.
28 * 28 *
29 * * for structures within structures, the format of the internal 29 * * for structures within structures, the format of the internal
30 * structure is layed out. This allows the internal structure 30 * structure is laid out. This allows the internal structure
31 * to be deciphered for the format file. Although these macros 31 * to be deciphered for the format file. Although these macros
32 * may become out of sync with the internal structure, they 32 * may become out of sync with the internal structure, they
33 * will create a compile error if it happens. Since the 33 * will create a compile error if it happens. Since the
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index 76b05980225c..962cdb24ed81 100644
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -905,7 +905,7 @@ print_graph_prologue(struct trace_iterator *iter, struct trace_seq *s,
905 * 905 *
906 * returns 1 if 906 * returns 1 if
907 * - we are inside irq code 907 * - we are inside irq code
908 * - we just extered irq code 908 * - we just entered irq code
909 * 909 *
910 * retunns 0 if 910 * retunns 0 if
911 * - funcgraph-interrupts option is set 911 * - funcgraph-interrupts option is set
diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c
index 92b6e1e12d98..a4969b47afc1 100644
--- a/kernel/trace/trace_irqsoff.c
+++ b/kernel/trace/trace_irqsoff.c
@@ -80,7 +80,7 @@ static struct tracer_flags tracer_flags = {
80 * skip the latency if the sequence has changed - some other section 80 * skip the latency if the sequence has changed - some other section
81 * did a maximum and could disturb our measurement with serial console 81 * did a maximum and could disturb our measurement with serial console
82 * printouts, etc. Truly coinciding maximum latencies should be rare 82 * printouts, etc. Truly coinciding maximum latencies should be rare
83 * and what happens together happens separately as well, so this doesnt 83 * and what happens together happens separately as well, so this doesn't
84 * decrease the validity of the maximum found: 84 * decrease the validity of the maximum found:
85 */ 85 */
86static __cacheline_aligned_in_smp unsigned long max_sequence; 86static __cacheline_aligned_in_smp unsigned long max_sequence;
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 8435b43b1782..35d55a386145 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1839,7 +1839,7 @@ static void unregister_probe_event(struct trace_probe *tp)
1839 kfree(tp->call.print_fmt); 1839 kfree(tp->call.print_fmt);
1840} 1840}
1841 1841
1842/* Make a debugfs interface for controling probe points */ 1842/* Make a debugfs interface for controlling probe points */
1843static __init int init_kprobe_trace(void) 1843static __init int init_kprobe_trace(void)
1844{ 1844{
1845 struct dentry *d_tracer; 1845 struct dentry *d_tracer;
diff --git a/kernel/user-return-notifier.c b/kernel/user-return-notifier.c
index eb27fd3430a2..92cb706c7fc8 100644
--- a/kernel/user-return-notifier.c
+++ b/kernel/user-return-notifier.c
@@ -20,7 +20,7 @@ EXPORT_SYMBOL_GPL(user_return_notifier_register);
20 20
21/* 21/*
22 * Removes a registered user return notifier. Must be called from atomic 22 * Removes a registered user return notifier. Must be called from atomic
23 * context, and from the same cpu registration occured in. 23 * context, and from the same cpu registration occurred in.
24 */ 24 */
25void user_return_notifier_unregister(struct user_return_notifier *urn) 25void user_return_notifier_unregister(struct user_return_notifier *urn)
26{ 26{
diff --git a/kernel/wait.c b/kernel/wait.c
index b0310eb6cc1e..f45ea8d2a1ce 100644
--- a/kernel/wait.c
+++ b/kernel/wait.c
@@ -142,7 +142,7 @@ EXPORT_SYMBOL(finish_wait);
142 * woken up through the queue. 142 * woken up through the queue.
143 * 143 *
144 * This prevents waiter starvation where an exclusive waiter 144 * This prevents waiter starvation where an exclusive waiter
145 * aborts and is woken up concurrently and noone wakes up 145 * aborts and is woken up concurrently and no one wakes up
146 * the next waiter. 146 * the next waiter.
147 */ 147 */
148void abort_exclusive_wait(wait_queue_head_t *q, wait_queue_t *wait, 148void abort_exclusive_wait(wait_queue_head_t *q, wait_queue_t *wait,
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 04ef830690ec..8859a41806dd 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -1291,7 +1291,7 @@ __acquires(&gcwq->lock)
1291 return true; 1291 return true;
1292 spin_unlock_irq(&gcwq->lock); 1292 spin_unlock_irq(&gcwq->lock);
1293 1293
1294 /* CPU has come up inbetween, retry migration */ 1294 /* CPU has come up in between, retry migration */
1295 cpu_relax(); 1295 cpu_relax();
1296 } 1296 }
1297} 1297}
diff --git a/lib/bitmap.c b/lib/bitmap.c
index 741fae905ae3..91e0ccfdb424 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -830,7 +830,7 @@ EXPORT_SYMBOL(bitmap_bitremap);
830 * @orig (i.e. bits 3, 5, 7 and 9) were also set. 830 * @orig (i.e. bits 3, 5, 7 and 9) were also set.
831 * 831 *
832 * When bit 11 is set in @orig, it means turn on the bit in 832 * When bit 11 is set in @orig, it means turn on the bit in
833 * @dst corresponding to whatever is the twelth bit that is 833 * @dst corresponding to whatever is the twelfth bit that is
834 * turned on in @relmap. In the above example, there were 834 * turned on in @relmap. In the above example, there were
835 * only ten bits turned on in @relmap (30..39), so that bit 835 * only ten bits turned on in @relmap (30..39), so that bit
836 * 11 was set in @orig had no affect on @dst. 836 * 11 was set in @orig had no affect on @dst.
diff --git a/lib/btree.c b/lib/btree.c
index c9c6f0351526..2a34392bcecc 100644
--- a/lib/btree.c
+++ b/lib/btree.c
@@ -11,7 +11,7 @@
11 * see http://programming.kicks-ass.net/kernel-patches/vma_lookup/btree.patch 11 * see http://programming.kicks-ass.net/kernel-patches/vma_lookup/btree.patch
12 * 12 *
13 * A relatively simple B+Tree implementation. I have written it as a learning 13 * A relatively simple B+Tree implementation. I have written it as a learning
14 * excercise to understand how B+Trees work. Turned out to be useful as well. 14 * exercise to understand how B+Trees work. Turned out to be useful as well.
15 * 15 *
16 * B+Trees can be used similar to Linux radix trees (which don't have anything 16 * B+Trees can be used similar to Linux radix trees (which don't have anything
17 * in common with textbook radix trees, beware). Prerequisite for them working 17 * in common with textbook radix trees, beware). Prerequisite for them working
@@ -541,7 +541,7 @@ static void rebalance(struct btree_head *head, struct btree_geo *geo,
541 int i, no_left, no_right; 541 int i, no_left, no_right;
542 542
543 if (fill == 0) { 543 if (fill == 0) {
544 /* Because we don't steal entries from a neigbour, this case 544 /* Because we don't steal entries from a neighbour, this case
545 * can happen. Parent node contains a single child, this 545 * can happen. Parent node contains a single child, this
546 * node, so merging with a sibling never happens. 546 * node, so merging with a sibling never happens.
547 */ 547 */
diff --git a/lib/decompress_unxz.c b/lib/decompress_unxz.c
index cecd23df2b9a..9f34eb56854d 100644
--- a/lib/decompress_unxz.c
+++ b/lib/decompress_unxz.c
@@ -83,7 +83,7 @@
83 * safety_margin = 128 + uncompressed_size * 8 / 32768 + 65536 83 * safety_margin = 128 + uncompressed_size * 8 / 32768 + 65536
84 * = 128 + (uncompressed_size >> 12) + 65536 84 * = 128 + (uncompressed_size >> 12) + 65536
85 * 85 *
86 * For comparision, according to arch/x86/boot/compressed/misc.c, the 86 * For comparison, according to arch/x86/boot/compressed/misc.c, the
87 * equivalent formula for Deflate is this: 87 * equivalent formula for Deflate is this:
88 * 88 *
89 * safety_margin = 18 + (uncompressed_size >> 12) + 32768 89 * safety_margin = 18 + (uncompressed_size >> 12) + 32768
diff --git a/lib/parser.c b/lib/parser.c
index 6e89eca5cca0..dcbaaef6cf11 100644
--- a/lib/parser.c
+++ b/lib/parser.c
@@ -13,7 +13,7 @@
13 13
14/** 14/**
15 * match_one: - Determines if a string matches a simple pattern 15 * match_one: - Determines if a string matches a simple pattern
16 * @s: the string to examine for presense of the pattern 16 * @s: the string to examine for presence of the pattern
17 * @p: the string containing the pattern 17 * @p: the string containing the pattern
18 * @args: array of %MAX_OPT_ARGS &substring_t elements. Used to return match 18 * @args: array of %MAX_OPT_ARGS &substring_t elements. Used to return match
19 * locations. 19 * locations.
diff --git a/lib/timerqueue.c b/lib/timerqueue.c
index e3a1050e6820..191176a43e9a 100644
--- a/lib/timerqueue.c
+++ b/lib/timerqueue.c
@@ -5,7 +5,7 @@
5 * Uses rbtrees for quick list adds and expiration. 5 * Uses rbtrees for quick list adds and expiration.
6 * 6 *
7 * NOTE: All of the following functions need to be serialized 7 * NOTE: All of the following functions need to be serialized
8 * to avoid races. No locking is done by this libary code. 8 * to avoid races. No locking is done by this library code.
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/mm/backing-dev.c b/mm/backing-dev.c
index 0d9a036ada66..befc87531e4f 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -787,7 +787,7 @@ EXPORT_SYMBOL(congestion_wait);
787 * jiffies for either a BDI to exit congestion of the given @sync queue 787 * jiffies for either a BDI to exit congestion of the given @sync queue
788 * or a write to complete. 788 * or a write to complete.
789 * 789 *
790 * In the absense of zone congestion, cond_resched() is called to yield 790 * In the absence of zone congestion, cond_resched() is called to yield
791 * the processor if necessary but otherwise does not sleep. 791 * the processor if necessary but otherwise does not sleep.
792 * 792 *
793 * The return value is 0 if the sleep is for the full timeout. Otherwise, 793 * The return value is 0 if the sleep is for the full timeout. Otherwise,
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 06de5aa4d644..8ee3bd8ec5b5 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -146,7 +146,7 @@ static long region_chg(struct list_head *head, long f, long t)
146 if (rg->from > t) 146 if (rg->from > t)
147 return chg; 147 return chg;
148 148
149 /* We overlap with this area, if it extends futher than 149 /* We overlap with this area, if it extends further than
150 * us then we must extend ourselves. Account for its 150 * us then we must extend ourselves. Account for its
151 * existing reservation. */ 151 * existing reservation. */
152 if (rg->to > t) { 152 if (rg->to > t) {
@@ -842,7 +842,7 @@ struct page *alloc_huge_page_node(struct hstate *h, int nid)
842} 842}
843 843
844/* 844/*
845 * Increase the hugetlb pool such that it can accomodate a reservation 845 * Increase the hugetlb pool such that it can accommodate a reservation
846 * of size 'delta'. 846 * of size 'delta'.
847 */ 847 */
848static int gather_surplus_pages(struct hstate *h, int delta) 848static int gather_surplus_pages(struct hstate *h, int delta)
@@ -890,7 +890,7 @@ retry:
890 890
891 /* 891 /*
892 * The surplus_list now contains _at_least_ the number of extra pages 892 * The surplus_list now contains _at_least_ the number of extra pages
893 * needed to accomodate the reservation. Add the appropriate number 893 * needed to accommodate the reservation. Add the appropriate number
894 * of pages to the hugetlb pool and free the extras back to the buddy 894 * of pages to the hugetlb pool and free the extras back to the buddy
895 * allocator. Commit the entire reservation here to prevent another 895 * allocator. Commit the entire reservation here to prevent another
896 * process from stealing the pages as they are added to the pool but 896 * process from stealing the pages as they are added to the pool but
@@ -2043,7 +2043,7 @@ static void hugetlb_vm_op_open(struct vm_area_struct *vma)
2043 * This new VMA should share its siblings reservation map if present. 2043 * This new VMA should share its siblings reservation map if present.
2044 * The VMA will only ever have a valid reservation map pointer where 2044 * The VMA will only ever have a valid reservation map pointer where
2045 * it is being copied for another still existing VMA. As that VMA 2045 * it is being copied for another still existing VMA. As that VMA
2046 * has a reference to the reservation map it cannot dissappear until 2046 * has a reference to the reservation map it cannot disappear until
2047 * after this open call completes. It is therefore safe to take a 2047 * after this open call completes. It is therefore safe to take a
2048 * new reference here without additional locking. 2048 * new reference here without additional locking.
2049 */ 2049 */
@@ -2490,7 +2490,7 @@ static int hugetlb_no_page(struct mm_struct *mm, struct vm_area_struct *vma,
2490 /* 2490 /*
2491 * Currently, we are forced to kill the process in the event the 2491 * Currently, we are forced to kill the process in the event the
2492 * original mapper has unmapped pages from the child due to a failed 2492 * original mapper has unmapped pages from the child due to a failed
2493 * COW. Warn that such a situation has occured as it may not be obvious 2493 * COW. Warn that such a situation has occurred as it may not be obvious
2494 */ 2494 */
2495 if (is_vma_resv_set(vma, HPAGE_RESV_UNMAPPED)) { 2495 if (is_vma_resv_set(vma, HPAGE_RESV_UNMAPPED)) {
2496 printk(KERN_WARNING 2496 printk(KERN_WARNING
diff --git a/mm/hwpoison-inject.c b/mm/hwpoison-inject.c
index 0948f1072d6b..c7fc7fd00e32 100644
--- a/mm/hwpoison-inject.c
+++ b/mm/hwpoison-inject.c
@@ -1,4 +1,4 @@
1/* Inject a hwpoison memory failure on a arbitary pfn */ 1/* Inject a hwpoison memory failure on a arbitrary pfn */
2#include <linux/module.h> 2#include <linux/module.h>
3#include <linux/debugfs.h> 3#include <linux/debugfs.h>
4#include <linux/kernel.h> 4#include <linux/kernel.h>
diff --git a/mm/internal.h b/mm/internal.h
index 3438dd43a062..9d0ced8e505e 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -162,7 +162,7 @@ static inline struct page *mem_map_offset(struct page *base, int offset)
162} 162}
163 163
164/* 164/*
165 * Iterator over all subpages withing the maximally aligned gigantic 165 * Iterator over all subpages within the maximally aligned gigantic
166 * page 'base'. Handle any discontiguity in the mem_map. 166 * page 'base'. Handle any discontiguity in the mem_map.
167 */ 167 */
168static inline struct page *mem_map_next(struct page *iter, 168static inline struct page *mem_map_next(struct page *iter,
diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index 84225f3b7190..c1d5867543e4 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -265,7 +265,7 @@ static void kmemleak_disable(void);
265} while (0) 265} while (0)
266 266
267/* 267/*
268 * Macro invoked when a serious kmemleak condition occured and cannot be 268 * Macro invoked when a serious kmemleak condition occurred and cannot be
269 * recovered from. Kmemleak will be disabled and further allocation/freeing 269 * recovered from. Kmemleak will be disabled and further allocation/freeing
270 * tracing no longer available. 270 * tracing no longer available.
271 */ 271 */
@@ -1006,7 +1006,7 @@ static bool update_checksum(struct kmemleak_object *object)
1006 1006
1007/* 1007/*
1008 * Memory scanning is a long process and it needs to be interruptable. This 1008 * Memory scanning is a long process and it needs to be interruptable. This
1009 * function checks whether such interrupt condition occured. 1009 * function checks whether such interrupt condition occurred.
1010 */ 1010 */
1011static int scan_should_stop(void) 1011static int scan_should_stop(void)
1012{ 1012{
@@ -1733,7 +1733,7 @@ static int __init kmemleak_late_init(void)
1733 1733
1734 if (atomic_read(&kmemleak_error)) { 1734 if (atomic_read(&kmemleak_error)) {
1735 /* 1735 /*
1736 * Some error occured and kmemleak was disabled. There is a 1736 * Some error occurred and kmemleak was disabled. There is a
1737 * small chance that kmemleak_disable() was called immediately 1737 * small chance that kmemleak_disable() was called immediately
1738 * after setting kmemleak_initialized and we may end up with 1738 * after setting kmemleak_initialized and we may end up with
1739 * two clean-up threads but serialized by scan_mutex. 1739 * two clean-up threads but serialized by scan_mutex.
diff --git a/mm/ksm.c b/mm/ksm.c
index 1bbe785aa559..942dfc73a2ff 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -720,7 +720,7 @@ static int write_protect_page(struct vm_area_struct *vma, struct page *page,
720 swapped = PageSwapCache(page); 720 swapped = PageSwapCache(page);
721 flush_cache_page(vma, addr, page_to_pfn(page)); 721 flush_cache_page(vma, addr, page_to_pfn(page));
722 /* 722 /*
723 * Ok this is tricky, when get_user_pages_fast() run it doesnt 723 * Ok this is tricky, when get_user_pages_fast() run it doesn't
724 * take any lock, therefore the check that we are going to make 724 * take any lock, therefore the check that we are going to make
725 * with the pagecount against the mapcount is racey and 725 * with the pagecount against the mapcount is racey and
726 * O_DIRECT can happen right after the check. 726 * O_DIRECT can happen right after the check.
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 1f0b460fe58c..010f9166fa6e 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1466,7 +1466,7 @@ static int mem_cgroup_hierarchical_reclaim(struct mem_cgroup *root_mem,
1466 break; 1466 break;
1467 } 1467 }
1468 /* 1468 /*
1469 * We want to do more targetted reclaim. 1469 * We want to do more targeted reclaim.
1470 * excess >> 2 is not to excessive so as to 1470 * excess >> 2 is not to excessive so as to
1471 * reclaim too much, nor too less that we keep 1471 * reclaim too much, nor too less that we keep
1472 * coming back to reclaim from this cgroup 1472 * coming back to reclaim from this cgroup
@@ -2265,7 +2265,7 @@ void mem_cgroup_split_huge_fixup(struct page *head, struct page *tail)
2265 * - compound_lock is held when nr_pages > 1 2265 * - compound_lock is held when nr_pages > 1
2266 * 2266 *
2267 * This function doesn't do "charge" nor css_get to new cgroup. It should be 2267 * This function doesn't do "charge" nor css_get to new cgroup. It should be
2268 * done by a caller(__mem_cgroup_try_charge would be usefull). If @uncharge is 2268 * done by a caller(__mem_cgroup_try_charge would be useful). If @uncharge is
2269 * true, this function does "uncharge" from old cgroup, but it doesn't if 2269 * true, this function does "uncharge" from old cgroup, but it doesn't if
2270 * @uncharge is false, so a caller should do "uncharge". 2270 * @uncharge is false, so a caller should do "uncharge".
2271 */ 2271 */
@@ -2318,7 +2318,7 @@ static int mem_cgroup_move_account(struct page *page,
2318 * We charges against "to" which may not have any tasks. Then, "to" 2318 * We charges against "to" which may not have any tasks. Then, "to"
2319 * can be under rmdir(). But in current implementation, caller of 2319 * can be under rmdir(). But in current implementation, caller of
2320 * this function is just force_empty() and move charge, so it's 2320 * this function is just force_empty() and move charge, so it's
2321 * garanteed that "to" is never removed. So, we don't check rmdir 2321 * guaranteed that "to" is never removed. So, we don't check rmdir
2322 * status here. 2322 * status here.
2323 */ 2323 */
2324 move_unlock_page_cgroup(pc, &flags); 2324 move_unlock_page_cgroup(pc, &flags);
@@ -2648,7 +2648,7 @@ static void mem_cgroup_do_uncharge(struct mem_cgroup *mem,
2648 batch->memcg = mem; 2648 batch->memcg = mem;
2649 /* 2649 /*
2650 * do_batch > 0 when unmapping pages or inode invalidate/truncate. 2650 * do_batch > 0 when unmapping pages or inode invalidate/truncate.
2651 * In those cases, all pages freed continously can be expected to be in 2651 * In those cases, all pages freed continuously can be expected to be in
2652 * the same cgroup and we have chance to coalesce uncharges. 2652 * the same cgroup and we have chance to coalesce uncharges.
2653 * But we do uncharge one by one if this is killed by OOM(TIF_MEMDIE) 2653 * But we do uncharge one by one if this is killed by OOM(TIF_MEMDIE)
2654 * because we want to do uncharge as soon as possible. 2654 * because we want to do uncharge as soon as possible.
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 37feb9fec228..2b9a5eef39e0 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -208,7 +208,7 @@ static int kill_proc_ao(struct task_struct *t, unsigned long addr, int trapno,
208 * Don't use force here, it's convenient if the signal 208 * Don't use force here, it's convenient if the signal
209 * can be temporarily blocked. 209 * can be temporarily blocked.
210 * This could cause a loop when the user sets SIGBUS 210 * This could cause a loop when the user sets SIGBUS
211 * to SIG_IGN, but hopefully noone will do that? 211 * to SIG_IGN, but hopefully no one will do that?
212 */ 212 */
213 ret = send_sig_info(SIGBUS, &si, t); /* synchronous? */ 213 ret = send_sig_info(SIGBUS, &si, t); /* synchronous? */
214 if (ret < 0) 214 if (ret < 0)
@@ -634,7 +634,7 @@ static int me_pagecache_dirty(struct page *p, unsigned long pfn)
634 * when the page is reread or dropped. If an 634 * when the page is reread or dropped. If an
635 * application assumes it will always get error on 635 * application assumes it will always get error on
636 * fsync, but does other operations on the fd before 636 * fsync, but does other operations on the fd before
637 * and the page is dropped inbetween then the error 637 * and the page is dropped between then the error
638 * will not be properly reported. 638 * will not be properly reported.
639 * 639 *
640 * This can already happen even without hwpoisoned 640 * This can already happen even without hwpoisoned
@@ -728,7 +728,7 @@ static int me_huge_page(struct page *p, unsigned long pfn)
728 * The table matches them in order and calls the right handler. 728 * The table matches them in order and calls the right handler.
729 * 729 *
730 * This is quite tricky because we can access page at any time 730 * This is quite tricky because we can access page at any time
731 * in its live cycle, so all accesses have to be extremly careful. 731 * in its live cycle, so all accesses have to be extremely careful.
732 * 732 *
733 * This is not complete. More states could be added. 733 * This is not complete. More states could be added.
734 * For any missing state don't attempt recovery. 734 * For any missing state don't attempt recovery.
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 321fc7455df7..a2acaf820fe5 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -724,7 +724,7 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
724 pfn); 724 pfn);
725 dump_page(page); 725 dump_page(page);
726#endif 726#endif
727 /* Becasue we don't have big zone->lock. we should 727 /* Because we don't have big zone->lock. we should
728 check this again here. */ 728 check this again here. */
729 if (page_count(page)) { 729 if (page_count(page)) {
730 not_managed++; 730 not_managed++;
diff --git a/mm/migrate.c b/mm/migrate.c
index b0406d739ea7..34132f8e9109 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -375,7 +375,7 @@ void migrate_page_copy(struct page *newpage, struct page *page)
375 * redo the accounting that clear_page_dirty_for_io undid, 375 * redo the accounting that clear_page_dirty_for_io undid,
376 * but we can't use set_page_dirty because that function 376 * but we can't use set_page_dirty because that function
377 * is actually a signal that all of the page has become dirty. 377 * is actually a signal that all of the page has become dirty.
378 * Wheras only part of our page may be dirty. 378 * Whereas only part of our page may be dirty.
379 */ 379 */
380 __set_page_dirty_nobuffers(newpage); 380 __set_page_dirty_nobuffers(newpage);
381 } 381 }
diff --git a/mm/nobootmem.c b/mm/nobootmem.c
index e99f6cd1da1f..9109049f0bbc 100644
--- a/mm/nobootmem.c
+++ b/mm/nobootmem.c
@@ -150,7 +150,7 @@ unsigned long __init free_all_bootmem(void)
150{ 150{
151 /* 151 /*
152 * We need to use MAX_NUMNODES instead of NODE_DATA(0)->node_id 152 * We need to use MAX_NUMNODES instead of NODE_DATA(0)->node_id
153 * because in some case like Node0 doesnt have RAM installed 153 * because in some case like Node0 doesn't have RAM installed
154 * low ram will be on Node1 154 * low ram will be on Node1
155 * Use MAX_NUMNODES will make sure all ranges in early_node_map[] 155 * Use MAX_NUMNODES will make sure all ranges in early_node_map[]
156 * will be used instead of only Node0 related 156 * will be used instead of only Node0 related
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index d6e7ba7373be..2747f5e5abc1 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -942,7 +942,7 @@ __rmqueue_fallback(struct zone *zone, int order, int start_migratetype)
942 * If breaking a large block of pages, move all free 942 * If breaking a large block of pages, move all free
943 * pages to the preferred allocation list. If falling 943 * pages to the preferred allocation list. If falling
944 * back for a reclaimable kernel allocation, be more 944 * back for a reclaimable kernel allocation, be more
945 * agressive about taking ownership of free pages 945 * aggressive about taking ownership of free pages
946 */ 946 */
947 if (unlikely(current_order >= (pageblock_order >> 1)) || 947 if (unlikely(current_order >= (pageblock_order >> 1)) ||
948 start_migratetype == MIGRATE_RECLAIMABLE || 948 start_migratetype == MIGRATE_RECLAIMABLE ||
@@ -3926,7 +3926,7 @@ static void __init find_usable_zone_for_movable(void)
3926 3926
3927/* 3927/*
3928 * The zone ranges provided by the architecture do not include ZONE_MOVABLE 3928 * The zone ranges provided by the architecture do not include ZONE_MOVABLE
3929 * because it is sized independant of architecture. Unlike the other zones, 3929 * because it is sized independent of architecture. Unlike the other zones,
3930 * the starting point for ZONE_MOVABLE is not fixed. It may be different 3930 * the starting point for ZONE_MOVABLE is not fixed. It may be different
3931 * in each node depending on the size of each node and how evenly kernelcore 3931 * in each node depending on the size of each node and how evenly kernelcore
3932 * is distributed. This helper function adjusts the zone ranges 3932 * is distributed. This helper function adjusts the zone ranges
diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c
index a12cc3fa9859..99055010cece 100644
--- a/mm/page_cgroup.c
+++ b/mm/page_cgroup.c
@@ -377,7 +377,7 @@ not_enough_page:
377 * @new: new id 377 * @new: new id
378 * 378 *
379 * Returns old id at success, 0 at failure. 379 * Returns old id at success, 0 at failure.
380 * (There is no mem_cgroup useing 0 as its id) 380 * (There is no mem_cgroup using 0 as its id)
381 */ 381 */
382unsigned short swap_cgroup_cmpxchg(swp_entry_t ent, 382unsigned short swap_cgroup_cmpxchg(swp_entry_t ent,
383 unsigned short old, unsigned short new) 383 unsigned short old, unsigned short new)
diff --git a/mm/percpu.c b/mm/percpu.c
index 55d4d113fbd3..a160db39b810 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -342,7 +342,7 @@ static void pcpu_chunk_relocate(struct pcpu_chunk *chunk, int oslot)
342 * @chunk: chunk of interest 342 * @chunk: chunk of interest
343 * 343 *
344 * Determine whether area map of @chunk needs to be extended to 344 * Determine whether area map of @chunk needs to be extended to
345 * accomodate a new allocation. 345 * accommodate a new allocation.
346 * 346 *
347 * CONTEXT: 347 * CONTEXT:
348 * pcpu_lock. 348 * pcpu_lock.
@@ -431,7 +431,7 @@ out_unlock:
431 * depending on @head, is reduced by @tail bytes and @tail byte block 431 * depending on @head, is reduced by @tail bytes and @tail byte block
432 * is inserted after the target block. 432 * is inserted after the target block.
433 * 433 *
434 * @chunk->map must have enough free slots to accomodate the split. 434 * @chunk->map must have enough free slots to accommodate the split.
435 * 435 *
436 * CONTEXT: 436 * CONTEXT:
437 * pcpu_lock. 437 * pcpu_lock.
@@ -1435,7 +1435,7 @@ static struct pcpu_alloc_info * __init pcpu_build_alloc_info(
1435 /* 1435 /*
1436 * Determine min_unit_size, alloc_size and max_upa such that 1436 * Determine min_unit_size, alloc_size and max_upa such that
1437 * alloc_size is multiple of atom_size and is the smallest 1437 * alloc_size is multiple of atom_size and is the smallest
1438 * which can accomodate 4k aligned segments which are equal to 1438 * which can accommodate 4k aligned segments which are equal to
1439 * or larger than min_unit_size. 1439 * or larger than min_unit_size.
1440 */ 1440 */
1441 min_unit_size = max_t(size_t, size_sum, PCPU_MIN_UNIT_SIZE); 1441 min_unit_size = max_t(size_t, size_sum, PCPU_MIN_UNIT_SIZE);
@@ -1550,7 +1550,7 @@ static struct pcpu_alloc_info * __init pcpu_build_alloc_info(
1550 * @atom_size: allocation atom size 1550 * @atom_size: allocation atom size
1551 * @cpu_distance_fn: callback to determine distance between cpus, optional 1551 * @cpu_distance_fn: callback to determine distance between cpus, optional
1552 * @alloc_fn: function to allocate percpu page 1552 * @alloc_fn: function to allocate percpu page
1553 * @free_fn: funtion to free percpu page 1553 * @free_fn: function to free percpu page
1554 * 1554 *
1555 * This is a helper to ease setting up embedded first percpu chunk and 1555 * This is a helper to ease setting up embedded first percpu chunk and
1556 * can be called where pcpu_setup_first_chunk() is expected. 1556 * can be called where pcpu_setup_first_chunk() is expected.
@@ -1678,7 +1678,7 @@ out_free:
1678 * pcpu_page_first_chunk - map the first chunk using PAGE_SIZE pages 1678 * pcpu_page_first_chunk - map the first chunk using PAGE_SIZE pages
1679 * @reserved_size: the size of reserved percpu area in bytes 1679 * @reserved_size: the size of reserved percpu area in bytes
1680 * @alloc_fn: function to allocate percpu page, always called with PAGE_SIZE 1680 * @alloc_fn: function to allocate percpu page, always called with PAGE_SIZE
1681 * @free_fn: funtion to free percpu page, always called with PAGE_SIZE 1681 * @free_fn: function to free percpu page, always called with PAGE_SIZE
1682 * @populate_pte_fn: function to populate pte 1682 * @populate_pte_fn: function to populate pte
1683 * 1683 *
1684 * This is a helper to ease setting up page-remapped first percpu 1684 * This is a helper to ease setting up page-remapped first percpu
diff --git a/mm/slab.c b/mm/slab.c
index 568803f121a8..46a9c163a92f 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -878,7 +878,7 @@ static struct array_cache *alloc_arraycache(int node, int entries,
878 nc = kmalloc_node(memsize, gfp, node); 878 nc = kmalloc_node(memsize, gfp, node);
879 /* 879 /*
880 * The array_cache structures contain pointers to free object. 880 * The array_cache structures contain pointers to free object.
881 * However, when such objects are allocated or transfered to another 881 * However, when such objects are allocated or transferred to another
882 * cache the pointers are not cleared and they could be counted as 882 * cache the pointers are not cleared and they could be counted as
883 * valid references during a kmemleak scan. Therefore, kmemleak must 883 * valid references during a kmemleak scan. Therefore, kmemleak must
884 * not scan such objects. 884 * not scan such objects.
@@ -2606,7 +2606,7 @@ EXPORT_SYMBOL(kmem_cache_shrink);
2606 * 2606 *
2607 * The cache must be empty before calling this function. 2607 * The cache must be empty before calling this function.
2608 * 2608 *
2609 * The caller must guarantee that noone will allocate memory from the cache 2609 * The caller must guarantee that no one will allocate memory from the cache
2610 * during the kmem_cache_destroy(). 2610 * during the kmem_cache_destroy().
2611 */ 2611 */
2612void kmem_cache_destroy(struct kmem_cache *cachep) 2612void kmem_cache_destroy(struct kmem_cache *cachep)
diff --git a/mm/slub.c b/mm/slub.c
index f881874843a5..94d2a33a866e 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -64,7 +64,7 @@
64 * we must stay away from it for a while since we may cause a bouncing 64 * we must stay away from it for a while since we may cause a bouncing
65 * cacheline if we try to acquire the lock. So go onto the next slab. 65 * cacheline if we try to acquire the lock. So go onto the next slab.
66 * If all pages are busy then we may allocate a new slab instead of reusing 66 * If all pages are busy then we may allocate a new slab instead of reusing
67 * a partial slab. A new slab has noone operating on it and thus there is 67 * a partial slab. A new slab has no one operating on it and thus there is
68 * no danger of cacheline contention. 68 * no danger of cacheline contention.
69 * 69 *
70 * Interrupts are disabled during allocation and deallocation in order to 70 * Interrupts are disabled during allocation and deallocation in order to
@@ -1929,7 +1929,7 @@ redo:
1929 else { 1929 else {
1930#ifdef CONFIG_CMPXCHG_LOCAL 1930#ifdef CONFIG_CMPXCHG_LOCAL
1931 /* 1931 /*
1932 * The cmpxchg will only match if there was no additonal 1932 * The cmpxchg will only match if there was no additional
1933 * operation and if we are on the right processor. 1933 * operation and if we are on the right processor.
1934 * 1934 *
1935 * The cmpxchg does the following atomically (without lock semantics!) 1935 * The cmpxchg does the following atomically (without lock semantics!)
@@ -3547,7 +3547,7 @@ void *__kmalloc_track_caller(size_t size, gfp_t gfpflags, unsigned long caller)
3547 3547
3548 ret = slab_alloc(s, gfpflags, NUMA_NO_NODE, caller); 3548 ret = slab_alloc(s, gfpflags, NUMA_NO_NODE, caller);
3549 3549
3550 /* Honor the call site pointer we recieved. */ 3550 /* Honor the call site pointer we received. */
3551 trace_kmalloc(caller, ret, size, s->size, gfpflags); 3551 trace_kmalloc(caller, ret, size, s->size, gfpflags);
3552 3552
3553 return ret; 3553 return ret;
@@ -3577,7 +3577,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
3577 3577
3578 ret = slab_alloc(s, gfpflags, node, caller); 3578 ret = slab_alloc(s, gfpflags, node, caller);
3579 3579
3580 /* Honor the call site pointer we recieved. */ 3580 /* Honor the call site pointer we received. */
3581 trace_kmalloc_node(caller, ret, size, s->size, gfpflags, node); 3581 trace_kmalloc_node(caller, ret, size, s->size, gfpflags, node);
3582 3582
3583 return ret; 3583 return ret;
diff --git a/mm/sparse.c b/mm/sparse.c
index 93250207c5cf..aa64b12831a2 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -500,7 +500,7 @@ void __init sparse_init(void)
500 * so alloc 2M (with 2M align) and 24 bytes in turn will 500 * so alloc 2M (with 2M align) and 24 bytes in turn will
501 * make next 2M slip to one more 2M later. 501 * make next 2M slip to one more 2M later.
502 * then in big system, the memory will have a lot of holes... 502 * then in big system, the memory will have a lot of holes...
503 * here try to allocate 2M pages continously. 503 * here try to allocate 2M pages continuously.
504 * 504 *
505 * powerpc need to call sparse_init_one_section right after each 505 * powerpc need to call sparse_init_one_section right after each
506 * sparse_early_mem_map_alloc, so allocate usemap_map at first. 506 * sparse_early_mem_map_alloc, so allocate usemap_map at first.
diff --git a/mm/util.c b/mm/util.c
index f126975ef23e..e7b103a6fd21 100644
--- a/mm/util.c
+++ b/mm/util.c
@@ -227,7 +227,7 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
227/* 227/*
228 * Like get_user_pages_fast() except its IRQ-safe in that it won't fall 228 * Like get_user_pages_fast() except its IRQ-safe in that it won't fall
229 * back to the regular GUP. 229 * back to the regular GUP.
230 * If the architecture not support this fucntion, simply return with no 230 * If the architecture not support this function, simply return with no
231 * page pinned 231 * page pinned
232 */ 232 */
233int __attribute__((weak)) __get_user_pages_fast(unsigned long start, 233int __attribute__((weak)) __get_user_pages_fast(unsigned long start,
diff --git a/mm/vmscan.c b/mm/vmscan.c
index f73b8657c2d0..c7f5a6d4b75b 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1065,7 +1065,7 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan,
1065 * surrounding the tag page. Only take those pages of 1065 * surrounding the tag page. Only take those pages of
1066 * the same active state as that tag page. We may safely 1066 * the same active state as that tag page. We may safely
1067 * round the target page pfn down to the requested order 1067 * round the target page pfn down to the requested order
1068 * as the mem_map is guarenteed valid out to MAX_ORDER, 1068 * as the mem_map is guaranteed valid out to MAX_ORDER,
1069 * where that page is in a different zone we will detect 1069 * where that page is in a different zone we will detect
1070 * it from its zone id and abort this block scan. 1070 * it from its zone id and abort this block scan.
1071 */ 1071 */
@@ -2224,7 +2224,7 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *mem_cont,
2224 * o a 16M DMA zone that is balanced will not balance a zone on any 2224 * o a 16M DMA zone that is balanced will not balance a zone on any
2225 * reasonable sized machine 2225 * reasonable sized machine
2226 * o On all other machines, the top zone must be at least a reasonable 2226 * o On all other machines, the top zone must be at least a reasonable
2227 * precentage of the middle zones. For example, on 32-bit x86, highmem 2227 * percentage of the middle zones. For example, on 32-bit x86, highmem
2228 * would need to be at least 256M for it to be balance a whole node. 2228 * would need to be at least 256M for it to be balance a whole node.
2229 * Similarly, on x86-64 the Normal zone would need to be at least 1G 2229 * Similarly, on x86-64 the Normal zone would need to be at least 1G
2230 * to balance a node on its own. These seemed like reasonable ratios. 2230 * to balance a node on its own. These seemed like reasonable ratios.
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index d1314cf18adf..d940c49d168a 100644
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -54,7 +54,7 @@ static const char name_conf[] = "config";
54 54
55/* 55/*
56 * Structures for interfacing with the /proc filesystem. 56 * Structures for interfacing with the /proc filesystem.
57 * VLAN creates its own directory /proc/net/vlan with the folowing 57 * VLAN creates its own directory /proc/net/vlan with the following
58 * entries: 58 * entries:
59 * config device status/configuration 59 * config device status/configuration
60 * <device> entry for each device 60 * <device> entry for each device
diff --git a/net/9p/client.c b/net/9p/client.c
index 2ccbf04d37df..48b8e084e710 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -178,7 +178,7 @@ free_and_return:
178 * @tag: numeric id for transaction 178 * @tag: numeric id for transaction
179 * 179 *
180 * this is a simple array lookup, but will grow the 180 * this is a simple array lookup, but will grow the
181 * request_slots as necessary to accomodate transaction 181 * request_slots as necessary to accommodate transaction
182 * ids which did not previously have a slot. 182 * ids which did not previously have a slot.
183 * 183 *
184 * this code relies on the client spinlock to manage locks, its 184 * this code relies on the client spinlock to manage locks, its
diff --git a/net/9p/trans_common.c b/net/9p/trans_common.c
index 9172ab78fcb0..d47880e971dd 100644
--- a/net/9p/trans_common.c
+++ b/net/9p/trans_common.c
@@ -36,7 +36,7 @@ p9_release_req_pages(struct trans_rpage_info *rpinfo)
36EXPORT_SYMBOL(p9_release_req_pages); 36EXPORT_SYMBOL(p9_release_req_pages);
37 37
38/** 38/**
39 * p9_nr_pages - Return number of pages needed to accomodate the payload. 39 * p9_nr_pages - Return number of pages needed to accommodate the payload.
40 */ 40 */
41int 41int
42p9_nr_pages(struct p9_req_t *req) 42p9_nr_pages(struct p9_req_t *req)
@@ -55,7 +55,7 @@ EXPORT_SYMBOL(p9_nr_pages);
55 * @req: Request to be sent to server. 55 * @req: Request to be sent to server.
56 * @pdata_off: data offset into the first page after translation (gup). 56 * @pdata_off: data offset into the first page after translation (gup).
57 * @pdata_len: Total length of the IO. gup may not return requested # of pages. 57 * @pdata_len: Total length of the IO. gup may not return requested # of pages.
58 * @nr_pages: number of pages to accomodate the payload 58 * @nr_pages: number of pages to accommodate the payload
59 * @rw: Indicates if the pages are for read or write. 59 * @rw: Indicates if the pages are for read or write.
60 */ 60 */
61int 61int
diff --git a/net/9p/util.c b/net/9p/util.c
index b84619b5ba22..da6af81e59d9 100644
--- a/net/9p/util.c
+++ b/net/9p/util.c
@@ -67,7 +67,7 @@ EXPORT_SYMBOL(p9_idpool_create);
67 67
68/** 68/**
69 * p9_idpool_destroy - create a new per-connection id pool 69 * p9_idpool_destroy - create a new per-connection id pool
70 * @p: idpool to destory 70 * @p: idpool to destroy
71 */ 71 */
72 72
73void p9_idpool_destroy(struct p9_idpool *p) 73void p9_idpool_destroy(struct p9_idpool *p)
diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index fce2eae8d476..2252c2085dac 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -509,7 +509,7 @@ static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg)
509 write_lock_irq(&devs_lock); 509 write_lock_irq(&devs_lock);
510 net_dev = br2684_find_dev(&be.ifspec); 510 net_dev = br2684_find_dev(&be.ifspec);
511 if (net_dev == NULL) { 511 if (net_dev == NULL) {
512 pr_err("tried to attach to non-existant device\n"); 512 pr_err("tried to attach to non-existent device\n");
513 err = -ENXIO; 513 err = -ENXIO;
514 goto error; 514 goto error;
515 } 515 }
diff --git a/net/atm/lec.h b/net/atm/lec.h
index 9d14d196cc1d..dfc071966463 100644
--- a/net/atm/lec.h
+++ b/net/atm/lec.h
@@ -35,7 +35,7 @@ struct lecdatahdr_8025 {
35 * Operations that LANE2 capable device can do. Two first functions 35 * Operations that LANE2 capable device can do. Two first functions
36 * are used to make the device do things. See spec 3.1.3 and 3.1.4. 36 * are used to make the device do things. See spec 3.1.3 and 3.1.4.
37 * 37 *
38 * The third function is intented for the MPOA component sitting on 38 * The third function is intended for the MPOA component sitting on
39 * top of the LANE device. The MPOA component assigns it's own function 39 * top of the LANE device. The MPOA component assigns it's own function
40 * to (*associate_indicator)() and the LANE device will use that 40 * to (*associate_indicator)() and the LANE device will use that
41 * function to tell about TLVs it sees floating through. 41 * function to tell about TLVs it sees floating through.
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 9ed26140a269..824e1f6e50f2 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -474,7 +474,7 @@ void interface_rx(struct net_device *soft_iface,
474 goto dropped; 474 goto dropped;
475 skb->protocol = eth_type_trans(skb, soft_iface); 475 skb->protocol = eth_type_trans(skb, soft_iface);
476 476
477 /* should not be neccesary anymore as we use skb_pull_rcsum() 477 /* should not be necessary anymore as we use skb_pull_rcsum()
478 * TODO: please verify this and remove this TODO 478 * TODO: please verify this and remove this TODO
479 * -- Dec 21st 2009, Simon Wunderlich */ 479 * -- Dec 21st 2009, Simon Wunderlich */
480 480
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 2216620ff296..c83f618282f7 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1883,7 +1883,7 @@ static void hci_tx_task(unsigned long arg)
1883 read_unlock(&hci_task_lock); 1883 read_unlock(&hci_task_lock);
1884} 1884}
1885 1885
1886/* ----- HCI RX task (incoming data proccessing) ----- */ 1886/* ----- HCI RX task (incoming data processing) ----- */
1887 1887
1888/* ACL data packet */ 1888/* ACL data packet */
1889static inline void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb) 1889static inline void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb)
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index f77308e63e58..299fe56a9668 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -679,7 +679,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
679 679
680 if (opt == BT_FLUSHABLE_OFF) { 680 if (opt == BT_FLUSHABLE_OFF) {
681 struct l2cap_conn *conn = l2cap_pi(sk)->conn; 681 struct l2cap_conn *conn = l2cap_pi(sk)->conn;
682 /* proceed futher only when we have l2cap_conn and 682 /* proceed further only when we have l2cap_conn and
683 No Flush support in the LM */ 683 No Flush support in the LM */
684 if (!conn || !lmp_no_flush_capable(conn->hcon->hdev)) { 684 if (!conn || !lmp_no_flush_capable(conn->hcon->hdev)) {
685 err = -EINVAL; 685 err = -EINVAL;
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 88485cc74dc3..cc4d3c5ab1c6 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -169,7 +169,7 @@ void br_fdb_flush(struct net_bridge *br)
169 spin_unlock_bh(&br->hash_lock); 169 spin_unlock_bh(&br->hash_lock);
170} 170}
171 171
172/* Flush all entries refering to a specific port. 172/* Flush all entries referring to a specific port.
173 * if do_all is set also flush static entries 173 * if do_all is set also flush static entries
174 */ 174 */
175void br_fdb_delete_by_port(struct net_bridge *br, 175void br_fdb_delete_by_port(struct net_bridge *br,
diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c
index cb43312b846e..3d9fca0e3370 100644
--- a/net/bridge/br_ioctl.c
+++ b/net/bridge/br_ioctl.c
@@ -106,7 +106,7 @@ static int add_del_if(struct net_bridge *br, int ifindex, int isadd)
106/* 106/*
107 * Legacy ioctl's through SIOCDEVPRIVATE 107 * Legacy ioctl's through SIOCDEVPRIVATE
108 * This interface is deprecated because it was too difficult to 108 * This interface is deprecated because it was too difficult to
109 * to do the translation for 32/64bit ioctl compatability. 109 * to do the translation for 32/64bit ioctl compatibility.
110 */ 110 */
111static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 111static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
112{ 112{
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
index 8184c031d028..37a4034dfc29 100644
--- a/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c
@@ -852,7 +852,7 @@ static int caif_connect(struct socket *sock, struct sockaddr *uaddr,
852 sock->state = SS_CONNECTING; 852 sock->state = SS_CONNECTING;
853 sk->sk_state = CAIF_CONNECTING; 853 sk->sk_state = CAIF_CONNECTING;
854 854
855 /* Check priority value comming from socket */ 855 /* Check priority value coming from socket */
856 /* if priority value is out of range it will be ajusted */ 856 /* if priority value is out of range it will be ajusted */
857 if (cf_sk->sk.sk_priority > CAIF_PRIO_MAX) 857 if (cf_sk->sk.sk_priority > CAIF_PRIO_MAX)
858 cf_sk->conn_req.priority = CAIF_PRIO_MAX; 858 cf_sk->conn_req.priority = CAIF_PRIO_MAX;
diff --git a/net/can/bcm.c b/net/can/bcm.c
index 871a0ad51025..57b1aed79014 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -387,7 +387,7 @@ static void bcm_tx_timeout_tsklet(unsigned long data)
387} 387}
388 388
389/* 389/*
390 * bcm_tx_timeout_handler - performes cyclic CAN frame transmissions 390 * bcm_tx_timeout_handler - performs cyclic CAN frame transmissions
391 */ 391 */
392static enum hrtimer_restart bcm_tx_timeout_handler(struct hrtimer *hrtimer) 392static enum hrtimer_restart bcm_tx_timeout_handler(struct hrtimer *hrtimer)
393{ 393{
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 3b91d651fe08..50af02737a3d 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -917,7 +917,7 @@ EXPORT_SYMBOL(ceph_osdc_set_request_linger);
917/* 917/*
918 * Pick an osd (the first 'up' osd in the pg), allocate the osd struct 918 * Pick an osd (the first 'up' osd in the pg), allocate the osd struct
919 * (as needed), and set the request r_osd appropriately. If there is 919 * (as needed), and set the request r_osd appropriately. If there is
920 * no up osd, set r_osd to NULL. Move the request to the appropiate list 920 * no up osd, set r_osd to NULL. Move the request to the appropriate list
921 * (unsent, homeless) or leave on in-flight lru. 921 * (unsent, homeless) or leave on in-flight lru.
922 * 922 *
923 * Return 0 if unchanged, 1 if changed, or negative on error. 923 * Return 0 if unchanged, 1 if changed, or negative on error.
diff --git a/net/core/dev.c b/net/core/dev.c
index 3da9fb06d47a..956d3b006e8b 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2091,7 +2091,7 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
2091 u32 features; 2091 u32 features;
2092 2092
2093 /* 2093 /*
2094 * If device doesnt need skb->dst, release it right now while 2094 * If device doesn't need skb->dst, release it right now while
2095 * its hot in this cpu cache 2095 * its hot in this cpu cache
2096 */ 2096 */
2097 if (dev->priv_flags & IFF_XMIT_DST_RELEASE) 2097 if (dev->priv_flags & IFF_XMIT_DST_RELEASE)
@@ -2151,7 +2151,7 @@ gso:
2151 nskb->next = NULL; 2151 nskb->next = NULL;
2152 2152
2153 /* 2153 /*
2154 * If device doesnt need nskb->dst, release it right now while 2154 * If device doesn't need nskb->dst, release it right now while
2155 * its hot in this cpu cache 2155 * its hot in this cpu cache
2156 */ 2156 */
2157 if (dev->priv_flags & IFF_XMIT_DST_RELEASE) 2157 if (dev->priv_flags & IFF_XMIT_DST_RELEASE)
@@ -2970,8 +2970,8 @@ EXPORT_SYMBOL_GPL(br_fdb_test_addr_hook);
2970 * when CONFIG_NET_CLS_ACT is? otherwise some useless instructions 2970 * when CONFIG_NET_CLS_ACT is? otherwise some useless instructions
2971 * a compare and 2 stores extra right now if we dont have it on 2971 * a compare and 2 stores extra right now if we dont have it on
2972 * but have CONFIG_NET_CLS_ACT 2972 * but have CONFIG_NET_CLS_ACT
2973 * NOTE: This doesnt stop any functionality; if you dont have 2973 * NOTE: This doesn't stop any functionality; if you dont have
2974 * the ingress scheduler, you just cant add policies on ingress. 2974 * the ingress scheduler, you just can't add policies on ingress.
2975 * 2975 *
2976 */ 2976 */
2977static int ing_filter(struct sk_buff *skb, struct netdev_queue *rxq) 2977static int ing_filter(struct sk_buff *skb, struct netdev_queue *rxq)
@@ -3800,7 +3800,7 @@ static void net_rx_action(struct softirq_action *h)
3800 * with netpoll's poll_napi(). Only the entity which 3800 * with netpoll's poll_napi(). Only the entity which
3801 * obtains the lock and sees NAPI_STATE_SCHED set will 3801 * obtains the lock and sees NAPI_STATE_SCHED set will
3802 * actually make the ->poll() call. Therefore we avoid 3802 * actually make the ->poll() call. Therefore we avoid
3803 * accidently calling ->poll() when NAPI is not scheduled. 3803 * accidentally calling ->poll() when NAPI is not scheduled.
3804 */ 3804 */
3805 work = 0; 3805 work = 0;
3806 if (test_bit(NAPI_STATE_SCHED, &n->state)) { 3806 if (test_bit(NAPI_STATE_SCHED, &n->state)) {
@@ -6336,7 +6336,7 @@ static void __net_exit default_device_exit(struct net *net)
6336 if (dev->rtnl_link_ops) 6336 if (dev->rtnl_link_ops)
6337 continue; 6337 continue;
6338 6338
6339 /* Push remaing network devices to init_net */ 6339 /* Push remaining network devices to init_net */
6340 snprintf(fb_name, IFNAMSIZ, "dev%d", dev->ifindex); 6340 snprintf(fb_name, IFNAMSIZ, "dev%d", dev->ifindex);
6341 err = dev_change_net_namespace(dev, &init_net, fb_name); 6341 err = dev_change_net_namespace(dev, &init_net, fb_name);
6342 if (err) { 6342 if (err) {
diff --git a/net/core/filter.c b/net/core/filter.c
index 232b1873bb28..afb8afb066bb 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -425,7 +425,7 @@ EXPORT_SYMBOL(sk_run_filter);
425 * As we dont want to clear mem[] array for each packet going through 425 * As we dont want to clear mem[] array for each packet going through
426 * sk_run_filter(), we check that filter loaded by user never try to read 426 * sk_run_filter(), we check that filter loaded by user never try to read
427 * a cell if not previously written, and we check all branches to be sure 427 * a cell if not previously written, and we check all branches to be sure
428 * a malicious user doesnt try to abuse us. 428 * a malicious user doesn't try to abuse us.
429 */ 429 */
430static int check_load_and_stores(struct sock_filter *filter, int flen) 430static int check_load_and_stores(struct sock_filter *filter, int flen)
431{ 431{
diff --git a/net/core/link_watch.c b/net/core/link_watch.c
index 01a1101b5936..a7b342131869 100644
--- a/net/core/link_watch.c
+++ b/net/core/link_watch.c
@@ -129,7 +129,7 @@ static void linkwatch_schedule_work(int urgent)
129 if (!cancel_delayed_work(&linkwatch_work)) 129 if (!cancel_delayed_work(&linkwatch_work))
130 return; 130 return;
131 131
132 /* Otherwise we reschedule it again for immediate exection. */ 132 /* Otherwise we reschedule it again for immediate execution. */
133 schedule_delayed_work(&linkwatch_work, 0); 133 schedule_delayed_work(&linkwatch_work, 0);
134} 134}
135 135
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 49f7ea5b4c75..d7c4bb4b1820 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -196,7 +196,7 @@ EXPORT_SYMBOL_GPL(__rtnl_register);
196 * as failure of this function is very unlikely, it can only happen due 196 * as failure of this function is very unlikely, it can only happen due
197 * to lack of memory when allocating the chain to store all message 197 * to lack of memory when allocating the chain to store all message
198 * handlers for a protocol. Meant for use in init functions where lack 198 * handlers for a protocol. Meant for use in init functions where lack
199 * of memory implies no sense in continueing. 199 * of memory implies no sense in continuing.
200 */ 200 */
201void rtnl_register(int protocol, int msgtype, 201void rtnl_register(int protocol, int msgtype,
202 rtnl_doit_func doit, rtnl_dumpit_func dumpit) 202 rtnl_doit_func doit, rtnl_dumpit_func dumpit)
@@ -1440,7 +1440,7 @@ static int do_setlink(struct net_device *dev, struct ifinfomsg *ifm,
1440errout: 1440errout:
1441 if (err < 0 && modified && net_ratelimit()) 1441 if (err < 0 && modified && net_ratelimit())
1442 printk(KERN_WARNING "A link change request failed with " 1442 printk(KERN_WARNING "A link change request failed with "
1443 "some changes comitted already. Interface %s may " 1443 "some changes committed already. Interface %s may "
1444 "have been left with an inconsistent configuration, " 1444 "have been left with an inconsistent configuration, "
1445 "please check.\n", dev->name); 1445 "please check.\n", dev->name);
1446 1446
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 801dd08908f9..7ebeed0a877c 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2267,7 +2267,7 @@ EXPORT_SYMBOL(skb_prepare_seq_read);
2267 * of bytes already consumed and the next call to 2267 * of bytes already consumed and the next call to
2268 * skb_seq_read() will return the remaining part of the block. 2268 * skb_seq_read() will return the remaining part of the block.
2269 * 2269 *
2270 * Note 1: The size of each block of data returned can be arbitary, 2270 * Note 1: The size of each block of data returned can be arbitrary,
2271 * this limitation is the cost for zerocopy seqeuental 2271 * this limitation is the cost for zerocopy seqeuental
2272 * reads of potentially non linear data. 2272 * reads of potentially non linear data.
2273 * 2273 *
diff --git a/net/core/sock.c b/net/core/sock.c
index 7dfed792434d..6e819780c232 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -215,7 +215,7 @@ __u32 sysctl_rmem_max __read_mostly = SK_RMEM_MAX;
215__u32 sysctl_wmem_default __read_mostly = SK_WMEM_MAX; 215__u32 sysctl_wmem_default __read_mostly = SK_WMEM_MAX;
216__u32 sysctl_rmem_default __read_mostly = SK_RMEM_MAX; 216__u32 sysctl_rmem_default __read_mostly = SK_RMEM_MAX;
217 217
218/* Maximal space eaten by iovec or ancilliary data plus some space */ 218/* Maximal space eaten by iovec or ancillary data plus some space */
219int sysctl_optmem_max __read_mostly = sizeof(unsigned long)*(2*UIO_MAXIOV+512); 219int sysctl_optmem_max __read_mostly = sizeof(unsigned long)*(2*UIO_MAXIOV+512);
220EXPORT_SYMBOL(sysctl_optmem_max); 220EXPORT_SYMBOL(sysctl_optmem_max);
221 221
@@ -1175,7 +1175,7 @@ static void __sk_free(struct sock *sk)
1175void sk_free(struct sock *sk) 1175void sk_free(struct sock *sk)
1176{ 1176{
1177 /* 1177 /*
1178 * We substract one from sk_wmem_alloc and can know if 1178 * We subtract one from sk_wmem_alloc and can know if
1179 * some packets are still in some tx queue. 1179 * some packets are still in some tx queue.
1180 * If not null, sock_wfree() will call __sk_free(sk) later 1180 * If not null, sock_wfree() will call __sk_free(sk) later
1181 */ 1181 */
@@ -1185,10 +1185,10 @@ void sk_free(struct sock *sk)
1185EXPORT_SYMBOL(sk_free); 1185EXPORT_SYMBOL(sk_free);
1186 1186
1187/* 1187/*
1188 * Last sock_put should drop referrence to sk->sk_net. It has already 1188 * Last sock_put should drop reference to sk->sk_net. It has already
1189 * been dropped in sk_change_net. Taking referrence to stopping namespace 1189 * been dropped in sk_change_net. Taking reference to stopping namespace
1190 * is not an option. 1190 * is not an option.
1191 * Take referrence to a socket to remove it from hash _alive_ and after that 1191 * Take reference to a socket to remove it from hash _alive_ and after that
1192 * destroy it in the context of init_net. 1192 * destroy it in the context of init_net.
1193 */ 1193 */
1194void sk_release_kernel(struct sock *sk) 1194void sk_release_kernel(struct sock *sk)
diff --git a/net/dccp/output.c b/net/dccp/output.c
index 784d30210543..136d41cbcd02 100644
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
@@ -143,7 +143,7 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb)
143} 143}
144 144
145/** 145/**
146 * dccp_determine_ccmps - Find out about CCID-specfic packet-size limits 146 * dccp_determine_ccmps - Find out about CCID-specific packet-size limits
147 * We only consider the HC-sender CCID for setting the CCMPS (RFC 4340, 14.), 147 * We only consider the HC-sender CCID for setting the CCMPS (RFC 4340, 14.),
148 * since the RX CCID is restricted to feedback packets (Acks), which are small 148 * since the RX CCID is restricted to feedback packets (Acks), which are small
149 * in comparison with the data traffic. A value of 0 means "no current CCMPS". 149 * in comparison with the data traffic. A value of 0 means "no current CCMPS".
diff --git a/net/dsa/mv88e6131.c b/net/dsa/mv88e6131.c
index bb2b41bc854e..d951f93644bf 100644
--- a/net/dsa/mv88e6131.c
+++ b/net/dsa/mv88e6131.c
@@ -124,7 +124,7 @@ static int mv88e6131_setup_global(struct dsa_switch *ds)
124 * Ignore removed tag data on doubly tagged packets, disable 124 * Ignore removed tag data on doubly tagged packets, disable
125 * flow control messages, force flow control priority to the 125 * flow control messages, force flow control priority to the
126 * highest, and send all special multicast frames to the CPU 126 * highest, and send all special multicast frames to the CPU
127 * port at the higest priority. 127 * port at the highest priority.
128 */ 128 */
129 REG_WRITE(REG_GLOBAL2, 0x05, 0x00ff); 129 REG_WRITE(REG_GLOBAL2, 0x05, 0x00ff);
130 130
diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
index 094e150c6260..a0af7ea87870 100644
--- a/net/ipv4/cipso_ipv4.c
+++ b/net/ipv4/cipso_ipv4.c
@@ -112,7 +112,7 @@ int cipso_v4_rbm_strictvalid = 1;
112/* The maximum number of category ranges permitted in the ranged category tag 112/* The maximum number of category ranges permitted in the ranged category tag
113 * (tag #5). You may note that the IETF draft states that the maximum number 113 * (tag #5). You may note that the IETF draft states that the maximum number
114 * of category ranges is 7, but if the low end of the last category range is 114 * of category ranges is 7, but if the low end of the last category range is
115 * zero then it is possibile to fit 8 category ranges because the zero should 115 * zero then it is possible to fit 8 category ranges because the zero should
116 * be omitted. */ 116 * be omitted. */
117#define CIPSO_V4_TAG_RNG_CAT_MAX 8 117#define CIPSO_V4_TAG_RNG_CAT_MAX 8
118 118
@@ -438,7 +438,7 @@ cache_add_failure:
438 * 438 *
439 * Description: 439 * Description:
440 * Search the DOI definition list for a DOI definition with a DOI value that 440 * Search the DOI definition list for a DOI definition with a DOI value that
441 * matches @doi. The caller is responsibile for calling rcu_read_[un]lock(). 441 * matches @doi. The caller is responsible for calling rcu_read_[un]lock().
442 * Returns a pointer to the DOI definition on success and NULL on failure. 442 * Returns a pointer to the DOI definition on success and NULL on failure.
443 */ 443 */
444static struct cipso_v4_doi *cipso_v4_doi_search(u32 doi) 444static struct cipso_v4_doi *cipso_v4_doi_search(u32 doi)
@@ -1293,7 +1293,7 @@ static int cipso_v4_gentag_rbm(const struct cipso_v4_doi *doi_def,
1293 return ret_val; 1293 return ret_val;
1294 1294
1295 /* This will send packets using the "optimized" format when 1295 /* This will send packets using the "optimized" format when
1296 * possibile as specified in section 3.4.2.6 of the 1296 * possible as specified in section 3.4.2.6 of the
1297 * CIPSO draft. */ 1297 * CIPSO draft. */
1298 if (cipso_v4_rbm_optfmt && ret_val > 0 && ret_val <= 10) 1298 if (cipso_v4_rbm_optfmt && ret_val > 0 && ret_val <= 10)
1299 tag_len = 14; 1299 tag_len = 14;
@@ -1752,7 +1752,7 @@ validate_return:
1752} 1752}
1753 1753
1754/** 1754/**
1755 * cipso_v4_error - Send the correct reponse for a bad packet 1755 * cipso_v4_error - Send the correct response for a bad packet
1756 * @skb: the packet 1756 * @skb: the packet
1757 * @error: the error code 1757 * @error: the error code
1758 * @gateway: CIPSO gateway flag 1758 * @gateway: CIPSO gateway flag
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index b92c86f6e9b3..e9013d6c1f51 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -12,7 +12,7 @@
12 * 12 *
13 * Hans Liss <hans.liss@its.uu.se> Uppsala Universitet 13 * Hans Liss <hans.liss@its.uu.se> Uppsala Universitet
14 * 14 *
15 * This work is based on the LPC-trie which is originally descibed in: 15 * This work is based on the LPC-trie which is originally described in:
16 * 16 *
17 * An experimental study of compression methods for dynamic tries 17 * An experimental study of compression methods for dynamic tries
18 * Stefan Nilsson and Matti Tikkanen. Algorithmica, 33(1):19-33, 2002. 18 * Stefan Nilsson and Matti Tikkanen. Algorithmica, 33(1):19-33, 2002.
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index a91dc1611081..e5f8a71d3a2a 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -704,7 +704,7 @@ static void icmp_unreach(struct sk_buff *skb)
704 */ 704 */
705 705
706 /* 706 /*
707 * Check the other end isnt violating RFC 1122. Some routers send 707 * Check the other end isn't violating RFC 1122. Some routers send
708 * bogus responses to broadcast frames. If you see this message 708 * bogus responses to broadcast frames. If you see this message
709 * first check your netmask matches at both ends, if it does then 709 * first check your netmask matches at both ends, if it does then
710 * get the other vendor to fix their kit. 710 * get the other vendor to fix their kit.
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 67f241b97649..459c011b1d4a 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -603,7 +603,7 @@ slow_path:
603 /* IF: it doesn't fit, use 'mtu' - the data space left */ 603 /* IF: it doesn't fit, use 'mtu' - the data space left */
604 if (len > mtu) 604 if (len > mtu)
605 len = mtu; 605 len = mtu;
606 /* IF: we are not sending upto and including the packet end 606 /* IF: we are not sending up to and including the packet end
607 then align the next start on an eight byte boundary */ 607 then align the next start on an eight byte boundary */
608 if (len < left) { 608 if (len < left) {
609 len &= ~7; 609 len &= ~7;
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 2b097752426b..cbff2ecccf3d 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -1444,7 +1444,7 @@ static int __init ip_auto_config(void)
1444 root_server_addr = addr; 1444 root_server_addr = addr;
1445 1445
1446 /* 1446 /*
1447 * Use defaults whereever applicable. 1447 * Use defaults wherever applicable.
1448 */ 1448 */
1449 if (ic_defaults() < 0) 1449 if (ic_defaults() < 0)
1450 return -1; 1450 return -1;
diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
index 4b5d457c2d76..89bc7e66d598 100644
--- a/net/ipv4/netfilter/arp_tables.c
+++ b/net/ipv4/netfilter/arp_tables.c
@@ -76,7 +76,7 @@ static inline int arp_devaddr_compare(const struct arpt_devaddr_info *ap,
76} 76}
77 77
78/* 78/*
79 * Unfortunatly, _b and _mask are not aligned to an int (or long int) 79 * Unfortunately, _b and _mask are not aligned to an int (or long int)
80 * Some arches dont care, unrolling the loop is a win on them. 80 * Some arches dont care, unrolling the loop is a win on them.
81 * For other arches, we only have a 16bit alignement. 81 * For other arches, we only have a 16bit alignement.
82 */ 82 */
@@ -1874,7 +1874,7 @@ static int __init arp_tables_init(void)
1874 if (ret < 0) 1874 if (ret < 0)
1875 goto err1; 1875 goto err1;
1876 1876
1877 /* Noone else will be downing sem now, so we won't sleep */ 1877 /* No one else will be downing sem now, so we won't sleep */
1878 ret = xt_register_targets(arpt_builtin_tg, ARRAY_SIZE(arpt_builtin_tg)); 1878 ret = xt_register_targets(arpt_builtin_tg, ARRAY_SIZE(arpt_builtin_tg));
1879 if (ret < 0) 1879 if (ret < 0)
1880 goto err2; 1880 goto err2;
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index ffcea0d1678e..704915028009 100644
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -2233,7 +2233,7 @@ static int __init ip_tables_init(void)
2233 if (ret < 0) 2233 if (ret < 0)
2234 goto err1; 2234 goto err1;
2235 2235
2236 /* Noone else will be downing sem now, so we won't sleep */ 2236 /* No one else will be downing sem now, so we won't sleep */
2237 ret = xt_register_targets(ipt_builtin_tg, ARRAY_SIZE(ipt_builtin_tg)); 2237 ret = xt_register_targets(ipt_builtin_tg, ARRAY_SIZE(ipt_builtin_tg));
2238 if (ret < 0) 2238 if (ret < 0)
2239 goto err2; 2239 goto err2;
diff --git a/net/ipv4/netfilter/nf_nat_core.c b/net/ipv4/netfilter/nf_nat_core.c
index 21bcf471b25a..9c71b2755ce3 100644
--- a/net/ipv4/netfilter/nf_nat_core.c
+++ b/net/ipv4/netfilter/nf_nat_core.c
@@ -521,7 +521,7 @@ int nf_nat_protocol_register(const struct nf_nat_protocol *proto)
521} 521}
522EXPORT_SYMBOL(nf_nat_protocol_register); 522EXPORT_SYMBOL(nf_nat_protocol_register);
523 523
524/* Noone stores the protocol anywhere; simply delete it. */ 524/* No one stores the protocol anywhere; simply delete it. */
525void nf_nat_protocol_unregister(const struct nf_nat_protocol *proto) 525void nf_nat_protocol_unregister(const struct nf_nat_protocol *proto)
526{ 526{
527 spin_lock_bh(&nf_nat_lock); 527 spin_lock_bh(&nf_nat_lock);
@@ -532,7 +532,7 @@ void nf_nat_protocol_unregister(const struct nf_nat_protocol *proto)
532} 532}
533EXPORT_SYMBOL(nf_nat_protocol_unregister); 533EXPORT_SYMBOL(nf_nat_protocol_unregister);
534 534
535/* Noone using conntrack by the time this called. */ 535/* No one using conntrack by the time this called. */
536static void nf_nat_cleanup_conntrack(struct nf_conn *ct) 536static void nf_nat_cleanup_conntrack(struct nf_conn *ct)
537{ 537{
538 struct nf_conn_nat *nat = nf_ct_ext_find(ct, NF_CT_EXT_NAT); 538 struct nf_conn_nat *nat = nf_ct_ext_find(ct, NF_CT_EXT_NAT);
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 2d3c72e5bbbf..bceaec42c37d 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -622,7 +622,7 @@ do_confirm:
622static void raw_close(struct sock *sk, long timeout) 622static void raw_close(struct sock *sk, long timeout)
623{ 623{
624 /* 624 /*
625 * Raw sockets may have direct kernel refereneces. Kill them. 625 * Raw sockets may have direct kernel references. Kill them.
626 */ 626 */
627 ip_ra_control(sk, 0, NULL); 627 ip_ra_control(sk, 0, NULL);
628 628
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 4b0c81180804..ea107515c53e 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -821,7 +821,7 @@ static int has_noalias(const struct rtable *head, const struct rtable *rth)
821} 821}
822 822
823/* 823/*
824 * Pertubation of rt_genid by a small quantity [1..256] 824 * Perturbation of rt_genid by a small quantity [1..256]
825 * Using 8 bits of shuffling ensure we can call rt_cache_invalidate() 825 * Using 8 bits of shuffling ensure we can call rt_cache_invalidate()
826 * many times (2^24) without giving recent rt_genid. 826 * many times (2^24) without giving recent rt_genid.
827 * Jenkins hash is strong enough that litle changes of rt_genid are OK. 827 * Jenkins hash is strong enough that litle changes of rt_genid are OK.
@@ -1191,7 +1191,7 @@ restart:
1191#endif 1191#endif
1192 /* 1192 /*
1193 * Since lookup is lockfree, we must make sure 1193 * Since lookup is lockfree, we must make sure
1194 * previous writes to rt are comitted to memory 1194 * previous writes to rt are committed to memory
1195 * before making rt visible to other CPUS. 1195 * before making rt visible to other CPUS.
1196 */ 1196 */
1197 rcu_assign_pointer(rt_hash_table[hash].chain, rt); 1197 rcu_assign_pointer(rt_hash_table[hash].chain, rt);
diff --git a/net/ipv4/tcp_lp.c b/net/ipv4/tcp_lp.c
index 656d431c99ad..72f7218b03f5 100644
--- a/net/ipv4/tcp_lp.c
+++ b/net/ipv4/tcp_lp.c
@@ -12,7 +12,7 @@
12 * within cong_avoid. 12 * within cong_avoid.
13 * o Error correcting in remote HZ, therefore remote HZ will be keeped 13 * o Error correcting in remote HZ, therefore remote HZ will be keeped
14 * on checking and updating. 14 * on checking and updating.
15 * o Handling calculation of One-Way-Delay (OWD) within rtt_sample, sicne 15 * o Handling calculation of One-Way-Delay (OWD) within rtt_sample, since
16 * OWD have a similar meaning as RTT. Also correct the buggy formular. 16 * OWD have a similar meaning as RTT. Also correct the buggy formular.
17 * o Handle reaction for Early Congestion Indication (ECI) within 17 * o Handle reaction for Early Congestion Indication (ECI) within
18 * pkts_acked, as mentioned within pseudo code. 18 * pkts_acked, as mentioned within pseudo code.
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 8b0d0167e44a..17388c7f49c4 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -73,7 +73,7 @@ static void tcp_event_new_data_sent(struct sock *sk, struct sk_buff *skb)
73 tcp_advance_send_head(sk, skb); 73 tcp_advance_send_head(sk, skb);
74 tp->snd_nxt = TCP_SKB_CB(skb)->end_seq; 74 tp->snd_nxt = TCP_SKB_CB(skb)->end_seq;
75 75
76 /* Don't override Nagle indefinately with F-RTO */ 76 /* Don't override Nagle indefinitely with F-RTO */
77 if (tp->frto_counter == 2) 77 if (tp->frto_counter == 2)
78 tp->frto_counter = 3; 78 tp->frto_counter = 3;
79 79
diff --git a/net/ipv4/tcp_yeah.c b/net/ipv4/tcp_yeah.c
index dc7f43179c9a..05c3b6f0e8e1 100644
--- a/net/ipv4/tcp_yeah.c
+++ b/net/ipv4/tcp_yeah.c
@@ -20,7 +20,7 @@
20#define TCP_YEAH_DELTA 3 //log minimum fraction of cwnd to be removed on loss 20#define TCP_YEAH_DELTA 3 //log minimum fraction of cwnd to be removed on loss
21#define TCP_YEAH_EPSILON 1 //log maximum fraction to be removed on early decongestion 21#define TCP_YEAH_EPSILON 1 //log maximum fraction to be removed on early decongestion
22#define TCP_YEAH_PHY 8 //lin maximum delta from base 22#define TCP_YEAH_PHY 8 //lin maximum delta from base
23#define TCP_YEAH_RHO 16 //lin minumum number of consecutive rtt to consider competition on loss 23#define TCP_YEAH_RHO 16 //lin minimum number of consecutive rtt to consider competition on loss
24#define TCP_YEAH_ZETA 50 //lin minimum number of state switchs to reset reno_count 24#define TCP_YEAH_ZETA 50 //lin minimum number of state switchs to reset reno_count
25 25
26#define TCP_SCALABLE_AI_CNT 100U 26#define TCP_SCALABLE_AI_CNT 100U
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 588f47af5faf..f87a8eb76f3b 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -189,7 +189,7 @@ static int udp_lib_lport_inuse2(struct net *net, __u16 num,
189 * @sk: socket struct in question 189 * @sk: socket struct in question
190 * @snum: port number to look up 190 * @snum: port number to look up
191 * @saddr_comp: AF-dependent comparison of bound local IP addresses 191 * @saddr_comp: AF-dependent comparison of bound local IP addresses
192 * @hash2_nulladdr: AF-dependant hash value in secondary hash chains, 192 * @hash2_nulladdr: AF-dependent hash value in secondary hash chains,
193 * with NULL address 193 * with NULL address
194 */ 194 */
195int udp_lib_get_port(struct sock *sk, unsigned short snum, 195int udp_lib_get_port(struct sock *sk, unsigned short snum,
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 3daaf3c7703c..1493534116df 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1084,7 +1084,7 @@ static int ipv6_get_saddr_eval(struct net *net,
1084 case IPV6_SADDR_RULE_PRIVACY: 1084 case IPV6_SADDR_RULE_PRIVACY:
1085 { 1085 {
1086 /* Rule 7: Prefer public address 1086 /* Rule 7: Prefer public address
1087 * Note: prefer temprary address if use_tempaddr >= 2 1087 * Note: prefer temporary address if use_tempaddr >= 2
1088 */ 1088 */
1089 int preftmp = dst->prefs & (IPV6_PREFER_SRC_PUBLIC|IPV6_PREFER_SRC_TMP) ? 1089 int preftmp = dst->prefs & (IPV6_PREFER_SRC_PUBLIC|IPV6_PREFER_SRC_TMP) ?
1090 !!(dst->prefs & IPV6_PREFER_SRC_TMP) : 1090 !!(dst->prefs & IPV6_PREFER_SRC_TMP) :
@@ -1968,7 +1968,7 @@ ok:
1968 * to the stored lifetime since we'll 1968 * to the stored lifetime since we'll
1969 * be updating the timestamp below, 1969 * be updating the timestamp below,
1970 * else we'll set it back to the 1970 * else we'll set it back to the
1971 * minumum. 1971 * minimum.
1972 */ 1972 */
1973 if (prefered_lft != ifp->prefered_lft) { 1973 if (prefered_lft != ifp->prefered_lft) {
1974 valid_lft = stored_lft; 1974 valid_lft = stored_lft;
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 4b13d5d8890e..afcc7099f96d 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -1113,7 +1113,7 @@ static int __init inet6_init(void)
1113 /* 1113 /*
1114 * ipngwg API draft makes clear that the correct semantics 1114 * ipngwg API draft makes clear that the correct semantics
1115 * for TCP and UDP is to consider one TCP and UDP instance 1115 * for TCP and UDP is to consider one TCP and UDP instance
1116 * in a host availiable by both INET and INET6 APIs and 1116 * in a host available by both INET and INET6 APIs and
1117 * able to communicate via both network protocols. 1117 * able to communicate via both network protocols.
1118 */ 1118 */
1119 1119
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 18208876aa8a..46cf7bea6769 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -779,7 +779,7 @@ slow_path:
779 /* IF: it doesn't fit, use 'mtu' - the data space left */ 779 /* IF: it doesn't fit, use 'mtu' - the data space left */
780 if (len > mtu) 780 if (len > mtu)
781 len = mtu; 781 len = mtu;
782 /* IF: we are not sending upto and including the packet end 782 /* IF: we are not sending up to and including the packet end
783 then align the next start on an eight byte boundary */ 783 then align the next start on an eight byte boundary */
784 if (len < left) { 784 if (len < left) {
785 len &= ~7; 785 len &= ~7;
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index 0b2af9b85cec..5a1c6f27ffaf 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -2248,7 +2248,7 @@ static int __init ip6_tables_init(void)
2248 if (ret < 0) 2248 if (ret < 0)
2249 goto err1; 2249 goto err1;
2250 2250
2251 /* Noone else will be downing sem now, so we won't sleep */ 2251 /* No one else will be downing sem now, so we won't sleep */
2252 ret = xt_register_targets(ip6t_builtin_tg, ARRAY_SIZE(ip6t_builtin_tg)); 2252 ret = xt_register_targets(ip6t_builtin_tg, ARRAY_SIZE(ip6t_builtin_tg));
2253 if (ret < 0) 2253 if (ret < 0)
2254 goto err2; 2254 goto err2;
diff --git a/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c b/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
index 97c5b21b9674..cdd6d045e42e 100644
--- a/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
+++ b/net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
@@ -71,7 +71,7 @@ static unsigned int ipv6_defrag(unsigned int hooknum,
71 if (reasm == NULL) 71 if (reasm == NULL)
72 return NF_STOLEN; 72 return NF_STOLEN;
73 73
74 /* error occured or not fragmented */ 74 /* error occurred or not fragmented */
75 if (reasm == skb) 75 if (reasm == skb)
76 return NF_ACCEPT; 76 return NF_ACCEPT;
77 77
diff --git a/net/irda/irlap.c b/net/irda/irlap.c
index 783c5f367d29..005b424494a0 100644
--- a/net/irda/irlap.c
+++ b/net/irda/irlap.c
@@ -165,7 +165,7 @@ struct irlap_cb *irlap_open(struct net_device *dev, struct qos_info *qos,
165 165
166 irlap_apply_default_connection_parameters(self); 166 irlap_apply_default_connection_parameters(self);
167 167
168 self->N3 = 3; /* # connections attemts to try before giving up */ 168 self->N3 = 3; /* # connections attempts to try before giving up */
169 169
170 self->state = LAP_NDM; 170 self->state = LAP_NDM;
171 171
diff --git a/net/irda/irlap_event.c b/net/irda/irlap_event.c
index d434c8880745..bb47021c9a55 100644
--- a/net/irda/irlap_event.c
+++ b/net/irda/irlap_event.c
@@ -708,7 +708,7 @@ static int irlap_state_reply(struct irlap_cb *self, IRLAP_EVENT event,
708 708
709 self->frame_sent = TRUE; 709 self->frame_sent = TRUE;
710 } 710 }
711 /* Readjust our timer to accomodate devices 711 /* Readjust our timer to accommodate devices
712 * doing faster or slower discovery than us... 712 * doing faster or slower discovery than us...
713 * Jean II */ 713 * Jean II */
714 irlap_start_query_timer(self, info->S, info->s); 714 irlap_start_query_timer(self, info->S, info->s);
@@ -931,7 +931,7 @@ static int irlap_state_setup(struct irlap_cb *self, IRLAP_EVENT event,
931 irlap_send_rr_frame(self, CMD_FRAME); 931 irlap_send_rr_frame(self, CMD_FRAME);
932 932
933 /* The timer is set to half the normal timer to quickly 933 /* The timer is set to half the normal timer to quickly
934 * detect a failure to negociate the new connection 934 * detect a failure to negotiate the new connection
935 * parameters. IrLAP 6.11.3.2, note 3. 935 * parameters. IrLAP 6.11.3.2, note 3.
936 * Note that currently we don't process this failure 936 * Note that currently we don't process this failure
937 * properly, as we should do a quick disconnect. 937 * properly, as we should do a quick disconnect.
@@ -1052,7 +1052,7 @@ static int irlap_state_xmit_p(struct irlap_cb *self, IRLAP_EVENT event,
1052 return -EPROTO; 1052 return -EPROTO;
1053 } 1053 }
1054 1054
1055 /* Substract space used by this skb */ 1055 /* Subtract space used by this skb */
1056 self->bytes_left -= skb->len; 1056 self->bytes_left -= skb->len;
1057#else /* CONFIG_IRDA_DYNAMIC_WINDOW */ 1057#else /* CONFIG_IRDA_DYNAMIC_WINDOW */
1058 /* Window has been adjusted for the max packet 1058 /* Window has been adjusted for the max packet
@@ -1808,7 +1808,7 @@ static int irlap_state_xmit_s(struct irlap_cb *self, IRLAP_EVENT event,
1808 1808
1809 return -EPROTO; /* Try again later */ 1809 return -EPROTO; /* Try again later */
1810 } 1810 }
1811 /* Substract space used by this skb */ 1811 /* Subtract space used by this skb */
1812 self->bytes_left -= skb->len; 1812 self->bytes_left -= skb->len;
1813#else /* CONFIG_IRDA_DYNAMIC_WINDOW */ 1813#else /* CONFIG_IRDA_DYNAMIC_WINDOW */
1814 /* Window has been adjusted for the max packet 1814 /* Window has been adjusted for the max packet
diff --git a/net/irda/irlap_frame.c b/net/irda/irlap_frame.c
index 688222cbf55b..8c004161a843 100644
--- a/net/irda/irlap_frame.c
+++ b/net/irda/irlap_frame.c
@@ -848,7 +848,7 @@ void irlap_send_data_primary_poll(struct irlap_cb *self, struct sk_buff *skb)
848 * though IrLAP is currently sending the *last* frame of the 848 * though IrLAP is currently sending the *last* frame of the
849 * tx-window, the driver most likely has only just started 849 * tx-window, the driver most likely has only just started
850 * sending the *first* frame of the same tx-window. 850 * sending the *first* frame of the same tx-window.
851 * I.e. we are always at the very begining of or Tx window. 851 * I.e. we are always at the very beginning of or Tx window.
852 * Now, we are supposed to set the final timer from the end 852 * Now, we are supposed to set the final timer from the end
853 * of our tx-window to let the other peer reply. So, we need 853 * of our tx-window to let the other peer reply. So, we need
854 * to add extra time to compensate for the fact that we 854 * to add extra time to compensate for the fact that we
diff --git a/net/irda/irlmp_event.c b/net/irda/irlmp_event.c
index c1fb5db81042..9505a7d06f1a 100644
--- a/net/irda/irlmp_event.c
+++ b/net/irda/irlmp_event.c
@@ -498,7 +498,7 @@ static int irlmp_state_disconnected(struct lsap_cb *self, IRLMP_EVENT event,
498 switch (event) { 498 switch (event) {
499#ifdef CONFIG_IRDA_ULTRA 499#ifdef CONFIG_IRDA_ULTRA
500 case LM_UDATA_INDICATION: 500 case LM_UDATA_INDICATION:
501 /* This is most bizzare. Those packets are aka unreliable 501 /* This is most bizarre. Those packets are aka unreliable
502 * connected, aka IrLPT or SOCK_DGRAM/IRDAPROTO_UNITDATA. 502 * connected, aka IrLPT or SOCK_DGRAM/IRDAPROTO_UNITDATA.
503 * Why do we pass them as Ultra ??? Jean II */ 503 * Why do we pass them as Ultra ??? Jean II */
504 irlmp_connless_data_indication(self, skb); 504 irlmp_connless_data_indication(self, skb);
diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h
index 0d82ff5aeff1..979ecb2435a7 100644
--- a/net/irda/irnet/irnet.h
+++ b/net/irda/irnet/irnet.h
@@ -73,7 +73,7 @@
73 * Infinite thanks to those brave souls for providing the infrastructure 73 * Infinite thanks to those brave souls for providing the infrastructure
74 * upon which IrNET is built. 74 * upon which IrNET is built.
75 * 75 *
76 * Thanks to all my collegues in HP for helping me. In particular, 76 * Thanks to all my colleagues in HP for helping me. In particular,
77 * thanks to Salil Pradhan and Bill Serra for W2k testing... 77 * thanks to Salil Pradhan and Bill Serra for W2k testing...
78 * Thanks to Luiz Magalhaes for irnetd and much testing... 78 * Thanks to Luiz Magalhaes for irnetd and much testing...
79 * 79 *
diff --git a/net/irda/irqueue.c b/net/irda/irqueue.c
index 849aaf0dabb5..9715e6e5900b 100644
--- a/net/irda/irqueue.c
+++ b/net/irda/irqueue.c
@@ -40,7 +40,7 @@
40 * o the hash function for ints is pathetic (but could be changed) 40 * o the hash function for ints is pathetic (but could be changed)
41 * o locking is sometime suspicious (especially during enumeration) 41 * o locking is sometime suspicious (especially during enumeration)
42 * o most users have only a few elements (== overhead) 42 * o most users have only a few elements (== overhead)
43 * o most users never use seach, so don't benefit from hashing 43 * o most users never use search, so don't benefit from hashing
44 * Problem already fixed : 44 * Problem already fixed :
45 * o not 64 bit compliant (most users do hashv = (int) self) 45 * o not 64 bit compliant (most users do hashv = (int) self)
46 * o hashbin_remove() is broken => use hashbin_remove_this() 46 * o hashbin_remove() is broken => use hashbin_remove_this()
diff --git a/net/irda/irttp.c b/net/irda/irttp.c
index f6054f9ccbe3..9d9af4606970 100644
--- a/net/irda/irttp.c
+++ b/net/irda/irttp.c
@@ -1193,7 +1193,7 @@ EXPORT_SYMBOL(irttp_connect_request);
1193/* 1193/*
1194 * Function irttp_connect_confirm (handle, qos, skb) 1194 * Function irttp_connect_confirm (handle, qos, skb)
1195 * 1195 *
1196 * Sevice user confirms TSAP connection with peer. 1196 * Service user confirms TSAP connection with peer.
1197 * 1197 *
1198 */ 1198 */
1199static void irttp_connect_confirm(void *instance, void *sap, 1199static void irttp_connect_confirm(void *instance, void *sap,
diff --git a/net/irda/qos.c b/net/irda/qos.c
index 2b00974e5bae..1b51bcf42394 100644
--- a/net/irda/qos.c
+++ b/net/irda/qos.c
@@ -39,16 +39,16 @@
39#include <net/irda/irlap_frame.h> 39#include <net/irda/irlap_frame.h>
40 40
41/* 41/*
42 * Maximum values of the baud rate we negociate with the other end. 42 * Maximum values of the baud rate we negotiate with the other end.
43 * Most often, you don't have to change that, because Linux-IrDA will 43 * Most often, you don't have to change that, because Linux-IrDA will
44 * use the maximum offered by the link layer, which usually works fine. 44 * use the maximum offered by the link layer, which usually works fine.
45 * In some very rare cases, you may want to limit it to lower speeds... 45 * In some very rare cases, you may want to limit it to lower speeds...
46 */ 46 */
47int sysctl_max_baud_rate = 16000000; 47int sysctl_max_baud_rate = 16000000;
48/* 48/*
49 * Maximum value of the lap disconnect timer we negociate with the other end. 49 * Maximum value of the lap disconnect timer we negotiate with the other end.
50 * Most often, the value below represent the best compromise, but some user 50 * Most often, the value below represent the best compromise, but some user
51 * may want to keep the LAP alive longuer or shorter in case of link failure. 51 * may want to keep the LAP alive longer or shorter in case of link failure.
52 * Remember that the threshold time (early warning) is fixed to 3s... 52 * Remember that the threshold time (early warning) is fixed to 3s...
53 */ 53 */
54int sysctl_max_noreply_time = 12; 54int sysctl_max_noreply_time = 12;
@@ -411,7 +411,7 @@ static void irlap_adjust_qos_settings(struct qos_info *qos)
411 * Fix tx data size according to user limits - Jean II 411 * Fix tx data size according to user limits - Jean II
412 */ 412 */
413 if (qos->data_size.value > sysctl_max_tx_data_size) 413 if (qos->data_size.value > sysctl_max_tx_data_size)
414 /* Allow non discrete adjustement to avoid loosing capacity */ 414 /* Allow non discrete adjustement to avoid losing capacity */
415 qos->data_size.value = sysctl_max_tx_data_size; 415 qos->data_size.value = sysctl_max_tx_data_size;
416 /* 416 /*
417 * Override Tx window if user request it. - Jean II 417 * Override Tx window if user request it. - Jean II
diff --git a/net/irda/timer.c b/net/irda/timer.c
index 0335ba0cc593..f418cb2ad49c 100644
--- a/net/irda/timer.c
+++ b/net/irda/timer.c
@@ -59,7 +59,7 @@ void irlap_start_query_timer(struct irlap_cb *self, int S, int s)
59 * slot time, plus add some extra time to properly receive the last 59 * slot time, plus add some extra time to properly receive the last
60 * discovery packet (which is longer due to extra discovery info), 60 * discovery packet (which is longer due to extra discovery info),
61 * to avoid messing with for incomming connections requests and 61 * to avoid messing with for incomming connections requests and
62 * to accomodate devices that perform discovery slower than us. 62 * to accommodate devices that perform discovery slower than us.
63 * Jean II */ 63 * Jean II */
64 timeout = ((sysctl_slot_timeout * HZ / 1000) * (S - s) 64 timeout = ((sysctl_slot_timeout * HZ / 1000) * (S - s)
65 + XIDEXTRA_TIMEOUT + SMALLBUSY_TIMEOUT); 65 + XIDEXTRA_TIMEOUT + SMALLBUSY_TIMEOUT);
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 9637e45744fa..986b2a5e8769 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -250,7 +250,7 @@ static struct device *af_iucv_dev;
250 * PRMDATA[0..6] socket data (max 7 bytes); 250 * PRMDATA[0..6] socket data (max 7 bytes);
251 * PRMDATA[7] socket data length value (len is 0xff - PRMDATA[7]) 251 * PRMDATA[7] socket data length value (len is 0xff - PRMDATA[7])
252 * 252 *
253 * The socket data length is computed by substracting the socket data length 253 * The socket data length is computed by subtracting the socket data length
254 * value from 0xFF. 254 * value from 0xFF.
255 * If the socket data len is greater 7, then PRMDATA can be used for special 255 * If the socket data len is greater 7, then PRMDATA can be used for special
256 * notifications (see iucv_sock_shutdown); and further, 256 * notifications (see iucv_sock_shutdown); and further,
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index 1ee5dab3cfae..8f156bd86be7 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -735,7 +735,7 @@ static void iucv_cleanup_queue(void)
735 struct iucv_irq_list *p, *n; 735 struct iucv_irq_list *p, *n;
736 736
737 /* 737 /*
738 * When a path is severed, the pathid can be reused immediatly 738 * When a path is severed, the pathid can be reused immediately
739 * on a iucv connect or a connection pending interrupt. Remove 739 * on a iucv connect or a connection pending interrupt. Remove
740 * all entries from the task queue that refer to a stale pathid 740 * all entries from the task queue that refer to a stale pathid
741 * (iucv_path_table[ix] == NULL). Only then do the iucv connect 741 * (iucv_path_table[ix] == NULL). Only then do the iucv connect
@@ -807,7 +807,7 @@ void iucv_unregister(struct iucv_handler *handler, int smp)
807 spin_lock_bh(&iucv_table_lock); 807 spin_lock_bh(&iucv_table_lock);
808 /* Remove handler from the iucv_handler_list. */ 808 /* Remove handler from the iucv_handler_list. */
809 list_del_init(&handler->list); 809 list_del_init(&handler->list);
810 /* Sever all pathids still refering to the handler. */ 810 /* Sever all pathids still referring to the handler. */
811 list_for_each_entry_safe(p, n, &handler->paths, list) { 811 list_for_each_entry_safe(p, n, &handler->paths, list) {
812 iucv_sever_pathid(p->pathid, NULL); 812 iucv_sever_pathid(p->pathid, NULL);
813 iucv_path_table[p->pathid] = NULL; 813 iucv_path_table[p->pathid] = NULL;
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index a40401701424..c18396c248d7 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -97,7 +97,7 @@ struct ieee80211_bss {
97 size_t supp_rates_len; 97 size_t supp_rates_len;
98 98
99 /* 99 /*
100 * During assocation, we save an ERP value from a probe response so 100 * During association, we save an ERP value from a probe response so
101 * that we can feed ERP info to the driver when handling the 101 * that we can feed ERP info to the driver when handling the
102 * association completes. these fields probably won't be up-to-date 102 * association completes. these fields probably won't be up-to-date
103 * otherwise, you probably don't want to use them. 103 * otherwise, you probably don't want to use them.
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index 8d65b47d9837..336ca9d0c5c4 100644
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -628,7 +628,7 @@ void mesh_path_discard_frame(struct sk_buff *skb,
628 * 628 *
629 * @mpath: mesh path whose queue has to be freed 629 * @mpath: mesh path whose queue has to be freed
630 * 630 *
631 * Locking: the function must me called withing a rcu_read_lock region 631 * Locking: the function must me called within a rcu_read_lock region
632 */ 632 */
633void mesh_path_flush_pending(struct mesh_path *mpath) 633void mesh_path_flush_pending(struct mesh_path *mpath)
634{ 634{
diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
index dbdebeda097f..c06aa3ac6b9d 100644
--- a/net/mac80211/rc80211_minstrel_ht.c
+++ b/net/mac80211/rc80211_minstrel_ht.c
@@ -259,7 +259,7 @@ minstrel_ht_update_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)
259 } 259 }
260 } 260 }
261 261
262 /* try to sample up to half of the availble rates during each interval */ 262 /* try to sample up to half of the available rates during each interval */
263 mi->sample_count *= 4; 263 mi->sample_count *= 4;
264 264
265 cur_prob = 0; 265 cur_prob = 0;
diff --git a/net/mac80211/rc80211_pid.h b/net/mac80211/rc80211_pid.h
index 6510f8ee738e..19111c7bf454 100644
--- a/net/mac80211/rc80211_pid.h
+++ b/net/mac80211/rc80211_pid.h
@@ -77,7 +77,7 @@ union rc_pid_event_data {
77}; 77};
78 78
79struct rc_pid_event { 79struct rc_pid_event {
80 /* The time when the event occured */ 80 /* The time when the event occurred */
81 unsigned long timestamp; 81 unsigned long timestamp;
82 82
83 /* Event ID number */ 83 /* Event ID number */
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index aa5cc37b4921..9d192d665ff5 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -381,7 +381,7 @@ static void ieee80211_parse_qos(struct ieee80211_rx_data *rx)
381 * specs were sane enough this time around to require padding each A-MSDU 381 * specs were sane enough this time around to require padding each A-MSDU
382 * subframe to a length that is a multiple of four. 382 * subframe to a length that is a multiple of four.
383 * 383 *
384 * Padding like Atheros hardware adds which is inbetween the 802.11 header and 384 * Padding like Atheros hardware adds which is between the 802.11 header and
385 * the payload is not supported, the driver is required to move the 802.11 385 * the payload is not supported, the driver is required to move the 802.11
386 * header to be directly in front of the payload in that case. 386 * header to be directly in front of the payload in that case.
387 */ 387 */
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index d0311a322ddd..13e8c30adf01 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -47,9 +47,9 @@
47 * Station entries are added by mac80211 when you establish a link with a 47 * Station entries are added by mac80211 when you establish a link with a
48 * peer. This means different things for the different type of interfaces 48 * peer. This means different things for the different type of interfaces
49 * we support. For a regular station this mean we add the AP sta when we 49 * we support. For a regular station this mean we add the AP sta when we
50 * receive an assocation response from the AP. For IBSS this occurs when 50 * receive an association response from the AP. For IBSS this occurs when
51 * get to know about a peer on the same IBSS. For WDS we add the sta for 51 * get to know about a peer on the same IBSS. For WDS we add the sta for
52 * the peer imediately upon device open. When using AP mode we add stations 52 * the peer immediately upon device open. When using AP mode we add stations
53 * for each respective station upon request from userspace through nl80211. 53 * for each respective station upon request from userspace through nl80211.
54 * 54 *
55 * In order to remove a STA info structure, various sta_info_destroy_*() 55 * In order to remove a STA info structure, various sta_info_destroy_*()
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 57681149e37f..b2f95966c7f4 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -173,7 +173,7 @@ struct sta_ampdu_mlme {
173/** 173/**
174 * enum plink_state - state of a mesh peer link finite state machine 174 * enum plink_state - state of a mesh peer link finite state machine
175 * 175 *
176 * @PLINK_LISTEN: initial state, considered the implicit state of non existant 176 * @PLINK_LISTEN: initial state, considered the implicit state of non existent
177 * mesh peer links 177 * mesh peer links
178 * @PLINK_OPN_SNT: mesh plink open frame has been sent to this mesh peer 178 * @PLINK_OPN_SNT: mesh plink open frame has been sent to this mesh peer
179 * @PLINK_OPN_RCVD: mesh plink open frame has been received from this mesh peer 179 * @PLINK_OPN_RCVD: mesh plink open frame has been received from this mesh peer
diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index d6b48230a540..253326e8d990 100644
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -893,7 +893,7 @@ ip_set_swap(struct sock *ctnl, struct sk_buff *skb,
893 to = ip_set_list[to_id]; 893 to = ip_set_list[to_id];
894 894
895 /* Features must not change. 895 /* Features must not change.
896 * Not an artifical restriction anymore, as we must prevent 896 * Not an artificial restriction anymore, as we must prevent
897 * possible loops created by swapping in setlist type of sets. */ 897 * possible loops created by swapping in setlist type of sets. */
898 if (!(from->type->features == to->type->features && 898 if (!(from->type->features == to->type->features &&
899 from->type->family == to->type->family)) 899 from->type->family == to->type->family))
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
index f289306cbf12..c97bd45975be 100644
--- a/net/netfilter/ipvs/ip_vs_conn.c
+++ b/net/netfilter/ipvs/ip_vs_conn.c
@@ -595,7 +595,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
595 atomic_inc(&dest->inactconns); 595 atomic_inc(&dest->inactconns);
596 } else { 596 } else {
597 /* It is a persistent connection/template, so increase 597 /* It is a persistent connection/template, so increase
598 the peristent connection counter */ 598 the persistent connection counter */
599 atomic_inc(&dest->persistconns); 599 atomic_inc(&dest->persistconns);
600 } 600 }
601 601
@@ -657,7 +657,7 @@ static inline void ip_vs_unbind_dest(struct ip_vs_conn *cp)
657 } 657 }
658 } else { 658 } else {
659 /* It is a persistent connection/template, so decrease 659 /* It is a persistent connection/template, so decrease
660 the peristent connection counter */ 660 the persistent connection counter */
661 atomic_dec(&dest->persistconns); 661 atomic_dec(&dest->persistconns);
662 } 662 }
663 663
diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
index f276df9896b3..87e40ea77a95 100644
--- a/net/netfilter/ipvs/ip_vs_lblc.c
+++ b/net/netfilter/ipvs/ip_vs_lblc.c
@@ -131,7 +131,7 @@ static inline void ip_vs_lblc_free(struct ip_vs_lblc_entry *en)
131{ 131{
132 list_del(&en->list); 132 list_del(&en->list);
133 /* 133 /*
134 * We don't kfree dest because it is refered either by its service 134 * We don't kfree dest because it is referred either by its service
135 * or the trash dest list. 135 * or the trash dest list.
136 */ 136 */
137 atomic_dec(&en->dest->refcnt); 137 atomic_dec(&en->dest->refcnt);
diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
index cb1c9913d38b..90f618ab6dda 100644
--- a/net/netfilter/ipvs/ip_vs_lblcr.c
+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
@@ -152,7 +152,7 @@ static void ip_vs_dest_set_eraseall(struct ip_vs_dest_set *set)
152 write_lock(&set->lock); 152 write_lock(&set->lock);
153 list_for_each_entry_safe(e, ep, &set->list, list) { 153 list_for_each_entry_safe(e, ep, &set->list, list) {
154 /* 154 /*
155 * We don't kfree dest because it is refered either 155 * We don't kfree dest because it is referred either
156 * by its service or by the trash dest list. 156 * by its service or by the trash dest list.
157 */ 157 */
158 atomic_dec(&e->dest->refcnt); 158 atomic_dec(&e->dest->refcnt);
diff --git a/net/netfilter/ipvs/ip_vs_proto_sctp.c b/net/netfilter/ipvs/ip_vs_proto_sctp.c
index b027ccc49f43..d12ed53ec95f 100644
--- a/net/netfilter/ipvs/ip_vs_proto_sctp.c
+++ b/net/netfilter/ipvs/ip_vs_proto_sctp.c
@@ -566,7 +566,7 @@ static struct ipvs_sctp_nextstate
566 * SHUTDOWN sent from the client, waitinf for SHUT ACK from the server 566 * SHUTDOWN sent from the client, waitinf for SHUT ACK from the server
567 */ 567 */
568 /* 568 /*
569 * We recieved the data chuck, keep the state unchanged. I assume 569 * We received the data chuck, keep the state unchanged. I assume
570 * that still data chuncks can be received by both the peers in 570 * that still data chuncks can be received by both the peers in
571 * SHUDOWN state 571 * SHUDOWN state
572 */ 572 */
@@ -633,7 +633,7 @@ static struct ipvs_sctp_nextstate
633 * SHUTDOWN sent from the server, waitinf for SHUTDOWN ACK from client 633 * SHUTDOWN sent from the server, waitinf for SHUTDOWN ACK from client
634 */ 634 */
635 /* 635 /*
636 * We recieved the data chuck, keep the state unchanged. I assume 636 * We received the data chuck, keep the state unchanged. I assume
637 * that still data chuncks can be received by both the peers in 637 * that still data chuncks can be received by both the peers in
638 * SHUDOWN state 638 * SHUDOWN state
639 */ 639 */
@@ -701,7 +701,7 @@ static struct ipvs_sctp_nextstate
701 * SHUTDOWN ACK from the client, awaiting for SHUTDOWN COM from server 701 * SHUTDOWN ACK from the client, awaiting for SHUTDOWN COM from server
702 */ 702 */
703 /* 703 /*
704 * We recieved the data chuck, keep the state unchanged. I assume 704 * We received the data chuck, keep the state unchanged. I assume
705 * that still data chuncks can be received by both the peers in 705 * that still data chuncks can be received by both the peers in
706 * SHUDOWN state 706 * SHUDOWN state
707 */ 707 */
@@ -771,7 +771,7 @@ static struct ipvs_sctp_nextstate
771 * SHUTDOWN ACK from the server, awaiting for SHUTDOWN COM from client 771 * SHUTDOWN ACK from the server, awaiting for SHUTDOWN COM from client
772 */ 772 */
773 /* 773 /*
774 * We recieved the data chuck, keep the state unchanged. I assume 774 * We received the data chuck, keep the state unchanged. I assume
775 * that still data chuncks can be received by both the peers in 775 * that still data chuncks can be received by both the peers in
776 * SHUDOWN state 776 * SHUDOWN state
777 */ 777 */
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 941286ca911d..2e1c11f78419 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -453,7 +453,7 @@ __nf_conntrack_confirm(struct sk_buff *skb)
453 REJECT will give spurious warnings here. */ 453 REJECT will give spurious warnings here. */
454 /* NF_CT_ASSERT(atomic_read(&ct->ct_general.use) == 1); */ 454 /* NF_CT_ASSERT(atomic_read(&ct->ct_general.use) == 1); */
455 455
456 /* No external references means noone else could have 456 /* No external references means no one else could have
457 confirmed us. */ 457 confirmed us. */
458 NF_CT_ASSERT(!nf_ct_is_confirmed(ct)); 458 NF_CT_ASSERT(!nf_ct_is_confirmed(ct));
459 pr_debug("Confirming conntrack %p\n", ct); 459 pr_debug("Confirming conntrack %p\n", ct);
@@ -901,7 +901,7 @@ nf_conntrack_in(struct net *net, u_int8_t pf, unsigned int hooknum,
901 ret = l3proto->get_l4proto(skb, skb_network_offset(skb), 901 ret = l3proto->get_l4proto(skb, skb_network_offset(skb),
902 &dataoff, &protonum); 902 &dataoff, &protonum);
903 if (ret <= 0) { 903 if (ret <= 0) {
904 pr_debug("not prepared to track yet or error occured\n"); 904 pr_debug("not prepared to track yet or error occurred\n");
905 NF_CT_STAT_INC_ATOMIC(net, error); 905 NF_CT_STAT_INC_ATOMIC(net, error);
906 NF_CT_STAT_INC_ATOMIC(net, invalid); 906 NF_CT_STAT_INC_ATOMIC(net, invalid);
907 ret = -ret; 907 ret = -ret;
diff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c
index 9ae57c57c50e..2e664a69d7db 100644
--- a/net/netfilter/nf_conntrack_proto_dccp.c
+++ b/net/netfilter/nf_conntrack_proto_dccp.c
@@ -98,7 +98,7 @@ static const char * const dccp_state_names[] = {
98#define sIV CT_DCCP_INVALID 98#define sIV CT_DCCP_INVALID
99 99
100/* 100/*
101 * DCCP state transistion table 101 * DCCP state transition table
102 * 102 *
103 * The assumption is the same as for TCP tracking: 103 * The assumption is the same as for TCP tracking:
104 * 104 *
diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c
index 6f4ee70f460b..6772b1154654 100644
--- a/net/netfilter/nf_conntrack_proto_sctp.c
+++ b/net/netfilter/nf_conntrack_proto_sctp.c
@@ -107,9 +107,9 @@ static const u8 sctp_conntracks[2][9][SCTP_CONNTRACK_MAX] = {
107/* abort */ {sCL, sCL, sCL, sCL, sCL, sCL, sCL, sCL}, 107/* abort */ {sCL, sCL, sCL, sCL, sCL, sCL, sCL, sCL},
108/* shutdown */ {sCL, sCL, sCW, sCE, sSS, sSS, sSR, sSA}, 108/* shutdown */ {sCL, sCL, sCW, sCE, sSS, sSS, sSR, sSA},
109/* shutdown_ack */ {sSA, sCL, sCW, sCE, sES, sSA, sSA, sSA}, 109/* shutdown_ack */ {sSA, sCL, sCW, sCE, sES, sSA, sSA, sSA},
110/* error */ {sCL, sCL, sCW, sCE, sES, sSS, sSR, sSA},/* Cant have Stale cookie*/ 110/* error */ {sCL, sCL, sCW, sCE, sES, sSS, sSR, sSA},/* Can't have Stale cookie*/
111/* cookie_echo */ {sCL, sCL, sCE, sCE, sES, sSS, sSR, sSA},/* 5.2.4 - Big TODO */ 111/* cookie_echo */ {sCL, sCL, sCE, sCE, sES, sSS, sSR, sSA},/* 5.2.4 - Big TODO */
112/* cookie_ack */ {sCL, sCL, sCW, sCE, sES, sSS, sSR, sSA},/* Cant come in orig dir */ 112/* cookie_ack */ {sCL, sCL, sCW, sCE, sES, sSS, sSR, sSA},/* Can't come in orig dir */
113/* shutdown_comp*/ {sCL, sCL, sCW, sCE, sES, sSS, sSR, sCL} 113/* shutdown_comp*/ {sCL, sCL, sCW, sCE, sES, sSS, sSR, sCL}
114 }, 114 },
115 { 115 {
@@ -121,7 +121,7 @@ static const u8 sctp_conntracks[2][9][SCTP_CONNTRACK_MAX] = {
121/* shutdown */ {sIV, sCL, sCW, sCE, sSR, sSS, sSR, sSA}, 121/* shutdown */ {sIV, sCL, sCW, sCE, sSR, sSS, sSR, sSA},
122/* shutdown_ack */ {sIV, sCL, sCW, sCE, sES, sSA, sSA, sSA}, 122/* shutdown_ack */ {sIV, sCL, sCW, sCE, sES, sSA, sSA, sSA},
123/* error */ {sIV, sCL, sCW, sCL, sES, sSS, sSR, sSA}, 123/* error */ {sIV, sCL, sCW, sCL, sES, sSS, sSR, sSA},
124/* cookie_echo */ {sIV, sCL, sCW, sCE, sES, sSS, sSR, sSA},/* Cant come in reply dir */ 124/* cookie_echo */ {sIV, sCL, sCW, sCE, sES, sSS, sSR, sSA},/* Can't come in reply dir */
125/* cookie_ack */ {sIV, sCL, sCW, sES, sES, sSS, sSR, sSA}, 125/* cookie_ack */ {sIV, sCL, sCW, sES, sES, sSS, sSR, sSA},
126/* shutdown_comp*/ {sIV, sCL, sCW, sCE, sES, sSS, sSR, sCL} 126/* shutdown_comp*/ {sIV, sCL, sCW, sCE, sES, sSS, sSR, sCL}
127 } 127 }
diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c
index bcf47eb518ef..237cc1981b89 100644
--- a/net/netfilter/nf_conntrack_sip.c
+++ b/net/netfilter/nf_conntrack_sip.c
@@ -707,7 +707,7 @@ static const char *ct_sdp_header_search(const char *dptr, const char *limit,
707} 707}
708 708
709/* Locate a SDP header (optionally a substring within the header value), 709/* Locate a SDP header (optionally a substring within the header value),
710 * optionally stopping at the first occurence of the term header, parse 710 * optionally stopping at the first occurrence of the term header, parse
711 * it and return the offset and length of the data we're interested in. 711 * it and return the offset and length of the data we're interested in.
712 */ 712 */
713int ct_sip_get_sdp_header(const struct nf_conn *ct, const char *dptr, 713int ct_sip_get_sdp_header(const struct nf_conn *ct, const char *dptr,
diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
index 5ab22e2bbd7d..5b466cd1272f 100644
--- a/net/netfilter/nf_queue.c
+++ b/net/netfilter/nf_queue.c
@@ -134,7 +134,7 @@ static int __nf_queue(struct sk_buff *skb,
134 const struct nf_afinfo *afinfo; 134 const struct nf_afinfo *afinfo;
135 const struct nf_queue_handler *qh; 135 const struct nf_queue_handler *qh;
136 136
137 /* QUEUE == DROP if noone is waiting, to be safe. */ 137 /* QUEUE == DROP if no one is waiting, to be safe. */
138 rcu_read_lock(); 138 rcu_read_lock();
139 139
140 qh = rcu_dereference(queue_handler[pf]); 140 qh = rcu_dereference(queue_handler[pf]);
diff --git a/net/netlabel/netlabel_domainhash.c b/net/netlabel/netlabel_domainhash.c
index d37b7f80fa37..de0d8e4cbfb6 100644
--- a/net/netlabel/netlabel_domainhash.c
+++ b/net/netlabel/netlabel_domainhash.c
@@ -109,7 +109,7 @@ static void netlbl_domhsh_free_entry(struct rcu_head *entry)
109 * 109 *
110 * Description: 110 * Description:
111 * This is the hashing function for the domain hash table, it returns the 111 * This is the hashing function for the domain hash table, it returns the
112 * correct bucket number for the domain. The caller is responsibile for 112 * correct bucket number for the domain. The caller is responsible for
113 * ensuring that the hash table is protected with either a RCU read lock or the 113 * ensuring that the hash table is protected with either a RCU read lock or the
114 * hash table lock. 114 * hash table lock.
115 * 115 *
@@ -134,7 +134,7 @@ static u32 netlbl_domhsh_hash(const char *key)
134 * 134 *
135 * Description: 135 * Description:
136 * Searches the domain hash table and returns a pointer to the hash table 136 * Searches the domain hash table and returns a pointer to the hash table
137 * entry if found, otherwise NULL is returned. The caller is responsibile for 137 * entry if found, otherwise NULL is returned. The caller is responsible for
138 * ensuring that the hash table is protected with either a RCU read lock or the 138 * ensuring that the hash table is protected with either a RCU read lock or the
139 * hash table lock. 139 * hash table lock.
140 * 140 *
@@ -165,7 +165,7 @@ static struct netlbl_dom_map *netlbl_domhsh_search(const char *domain)
165 * Searches the domain hash table and returns a pointer to the hash table 165 * Searches the domain hash table and returns a pointer to the hash table
166 * entry if an exact match is found, if an exact match is not present in the 166 * entry if an exact match is found, if an exact match is not present in the
167 * hash table then the default entry is returned if valid otherwise NULL is 167 * hash table then the default entry is returned if valid otherwise NULL is
168 * returned. The caller is responsibile ensuring that the hash table is 168 * returned. The caller is responsible ensuring that the hash table is
169 * protected with either a RCU read lock or the hash table lock. 169 * protected with either a RCU read lock or the hash table lock.
170 * 170 *
171 */ 171 */
@@ -193,7 +193,7 @@ static struct netlbl_dom_map *netlbl_domhsh_search_def(const char *domain)
193 * 193 *
194 * Description: 194 * Description:
195 * Generate an audit record for adding a new NetLabel/LSM mapping entry with 195 * Generate an audit record for adding a new NetLabel/LSM mapping entry with
196 * the given information. Caller is responsibile for holding the necessary 196 * the given information. Caller is responsible for holding the necessary
197 * locks. 197 * locks.
198 * 198 *
199 */ 199 */
@@ -605,7 +605,7 @@ int netlbl_domhsh_remove_default(struct netlbl_audit *audit_info)
605 * 605 *
606 * Description: 606 * Description:
607 * Look through the domain hash table searching for an entry to match @domain, 607 * Look through the domain hash table searching for an entry to match @domain,
608 * return a pointer to a copy of the entry or NULL. The caller is responsibile 608 * return a pointer to a copy of the entry or NULL. The caller is responsible
609 * for ensuring that rcu_read_[un]lock() is called. 609 * for ensuring that rcu_read_[un]lock() is called.
610 * 610 *
611 */ 611 */
diff --git a/net/netlabel/netlabel_mgmt.c b/net/netlabel/netlabel_mgmt.c
index 998e85e895d0..4f251b19fbcc 100644
--- a/net/netlabel/netlabel_mgmt.c
+++ b/net/netlabel/netlabel_mgmt.c
@@ -259,7 +259,7 @@ add_failure:
259 * 259 *
260 * Description: 260 * Description:
261 * This function is a helper function used by the LISTALL and LISTDEF command 261 * This function is a helper function used by the LISTALL and LISTDEF command
262 * handlers. The caller is responsibile for ensuring that the RCU read lock 262 * handlers. The caller is responsible for ensuring that the RCU read lock
263 * is held. Returns zero on success, negative values on failure. 263 * is held. Returns zero on success, negative values on failure.
264 * 264 *
265 */ 265 */
diff --git a/net/rds/ib_send.c b/net/rds/ib_send.c
index c47a511f203d..7c4dce8fa5e6 100644
--- a/net/rds/ib_send.c
+++ b/net/rds/ib_send.c
@@ -355,7 +355,7 @@ void rds_ib_send_cq_comp_handler(struct ib_cq *cq, void *context)
355 * 355 *
356 * Conceptually, we have two counters: 356 * Conceptually, we have two counters:
357 * - send credits: this tells us how many WRs we're allowed 357 * - send credits: this tells us how many WRs we're allowed
358 * to submit without overruning the reciever's queue. For 358 * to submit without overruning the receiver's queue. For
359 * each SEND WR we post, we decrement this by one. 359 * each SEND WR we post, we decrement this by one.
360 * 360 *
361 * - posted credits: this tells us how many WRs we recently 361 * - posted credits: this tells us how many WRs we recently
diff --git a/net/rds/iw_cm.c b/net/rds/iw_cm.c
index 712cf2d1f28e..3a60a15d1b4a 100644
--- a/net/rds/iw_cm.c
+++ b/net/rds/iw_cm.c
@@ -181,7 +181,7 @@ static int rds_iw_init_qp_attrs(struct ib_qp_init_attr *attr,
181 unsigned int send_size, recv_size; 181 unsigned int send_size, recv_size;
182 int ret; 182 int ret;
183 183
184 /* The offset of 1 is to accomodate the additional ACK WR. */ 184 /* The offset of 1 is to accommodate the additional ACK WR. */
185 send_size = min_t(unsigned int, rds_iwdev->max_wrs, rds_iw_sysctl_max_send_wr + 1); 185 send_size = min_t(unsigned int, rds_iwdev->max_wrs, rds_iw_sysctl_max_send_wr + 1);
186 recv_size = min_t(unsigned int, rds_iwdev->max_wrs, rds_iw_sysctl_max_recv_wr + 1); 186 recv_size = min_t(unsigned int, rds_iwdev->max_wrs, rds_iw_sysctl_max_recv_wr + 1);
187 rds_iw_ring_resize(send_ring, send_size - 1); 187 rds_iw_ring_resize(send_ring, send_size - 1);
diff --git a/net/rds/iw_rdma.c b/net/rds/iw_rdma.c
index 59509e9a9e72..6deaa77495e3 100644
--- a/net/rds/iw_rdma.c
+++ b/net/rds/iw_rdma.c
@@ -122,7 +122,7 @@ static int rds_iw_get_device(struct rds_sock *rs, struct rds_iw_device **rds_iwd
122#else 122#else
123 /* FIXME - needs to compare the local and remote 123 /* FIXME - needs to compare the local and remote
124 * ipaddr/port tuple, but the ipaddr is the only 124 * ipaddr/port tuple, but the ipaddr is the only
125 * available infomation in the rds_sock (as the rest are 125 * available information in the rds_sock (as the rest are
126 * zero'ed. It doesn't appear to be properly populated 126 * zero'ed. It doesn't appear to be properly populated
127 * during connection setup... 127 * during connection setup...
128 */ 128 */
diff --git a/net/rds/iw_send.c b/net/rds/iw_send.c
index 6280ea020d4e..545d8ee3efb1 100644
--- a/net/rds/iw_send.c
+++ b/net/rds/iw_send.c
@@ -307,7 +307,7 @@ void rds_iw_send_cq_comp_handler(struct ib_cq *cq, void *context)
307 * 307 *
308 * Conceptually, we have two counters: 308 * Conceptually, we have two counters:
309 * - send credits: this tells us how many WRs we're allowed 309 * - send credits: this tells us how many WRs we're allowed
310 * to submit without overruning the reciever's queue. For 310 * to submit without overruning the receiver's queue. For
311 * each SEND WR we post, we decrement this by one. 311 * each SEND WR we post, we decrement this by one.
312 * 312 *
313 * - posted credits: this tells us how many WRs we recently 313 * - posted credits: this tells us how many WRs we recently
diff --git a/net/rds/send.c b/net/rds/send.c
index 35b9c2e9caf1..d58ae5f9339e 100644
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -116,7 +116,7 @@ static void release_in_xmit(struct rds_connection *conn)
116} 116}
117 117
118/* 118/*
119 * We're making the concious trade-off here to only send one message 119 * We're making the conscious trade-off here to only send one message
120 * down the connection at a time. 120 * down the connection at a time.
121 * Pro: 121 * Pro:
122 * - tx queueing is a simple fifo list 122 * - tx queueing is a simple fifo list
diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c
index 08dcd2f29cdc..479cae57d187 100644
--- a/net/rose/rose_route.c
+++ b/net/rose/rose_route.c
@@ -587,7 +587,7 @@ static int rose_clear_routes(void)
587 587
588/* 588/*
589 * Check that the device given is a valid AX.25 interface that is "up". 589 * Check that the device given is a valid AX.25 interface that is "up".
590 * called whith RTNL 590 * called with RTNL
591 */ 591 */
592static struct net_device *rose_ax25_dev_find(char *devname) 592static struct net_device *rose_ax25_dev_find(char *devname)
593{ 593{
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 15873e14cb54..14b42f4ad791 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -999,7 +999,7 @@ static int tc_ctl_action(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
999 switch (n->nlmsg_type) { 999 switch (n->nlmsg_type) {
1000 case RTM_NEWACTION: 1000 case RTM_NEWACTION:
1001 /* we are going to assume all other flags 1001 /* we are going to assume all other flags
1002 * imply create only if it doesnt exist 1002 * imply create only if it doesn't exist
1003 * Note that CREATE | EXCL implies that 1003 * Note that CREATE | EXCL implies that
1004 * but since we want avoid ambiguity (eg when flags 1004 * but since we want avoid ambiguity (eg when flags
1005 * is zero) then just set this 1005 * is zero) then just set this
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index 50c7c06c019d..7affe9a92757 100644
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -161,7 +161,7 @@ static int tcf_pedit(struct sk_buff *skb, struct tc_action *a,
161 } 161 }
162 if (offset > 0 && offset > skb->len) { 162 if (offset > 0 && offset > skb->len) {
163 pr_info("tc filter pedit" 163 pr_info("tc filter pedit"
164 " offset %d cant exceed pkt length %d\n", 164 " offset %d can't exceed pkt length %d\n",
165 offset, skb->len); 165 offset, skb->len);
166 goto bad; 166 goto bad;
167 } 167 }
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c
index a4de67eca824..49130e8abff0 100644
--- a/net/sched/em_meta.c
+++ b/net/sched/em_meta.c
@@ -47,7 +47,7 @@
47 * on the meta type. Obviously, the length of the data must also 47 * on the meta type. Obviously, the length of the data must also
48 * be provided for non-numeric types. 48 * be provided for non-numeric types.
49 * 49 *
50 * Additionaly, type dependant modifiers such as shift operators 50 * Additionally, type dependent modifiers such as shift operators
51 * or mask may be applied to extend the functionaliy. As of now, 51 * or mask may be applied to extend the functionaliy. As of now,
52 * the variable length type supports shifting the byte string to 52 * the variable length type supports shifting the byte string to
53 * the right, eating up any number of octets and thus supporting 53 * the right, eating up any number of octets and thus supporting
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index e1429a85091f..29b942ce9e82 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -183,7 +183,7 @@ static inline struct htb_class *htb_find(u32 handle, struct Qdisc *sch)
183 * filters in qdisc and in inner nodes (if higher filter points to the inner 183 * filters in qdisc and in inner nodes (if higher filter points to the inner
184 * node). If we end up with classid MAJOR:0 we enqueue the skb into special 184 * node). If we end up with classid MAJOR:0 we enqueue the skb into special
185 * internal fifo (direct). These packets then go directly thru. If we still 185 * internal fifo (direct). These packets then go directly thru. If we still
186 * have no valid leaf we try to use MAJOR:default leaf. It still unsuccessfull 186 * have no valid leaf we try to use MAJOR:default leaf. It still unsuccessful
187 * then finish and return direct queue. 187 * then finish and return direct queue.
188 */ 188 */
189#define HTB_DIRECT ((struct htb_class *)-1L) 189#define HTB_DIRECT ((struct htb_class *)-1L)
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index edbbf7ad6623..69c35f6cd13f 100644
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -160,7 +160,7 @@ static bool loss_4state(struct netem_sched_data *q)
160 u32 rnd = net_random(); 160 u32 rnd = net_random();
161 161
162 /* 162 /*
163 * Makes a comparision between rnd and the transition 163 * Makes a comparison between rnd and the transition
164 * probabilities outgoing from the current state, then decides the 164 * probabilities outgoing from the current state, then decides the
165 * next state and if the next packet has to be transmitted or lost. 165 * next state and if the next packet has to be transmitted or lost.
166 * The four states correspond to: 166 * The four states correspond to:
@@ -212,9 +212,9 @@ static bool loss_4state(struct netem_sched_data *q)
212 * Generates losses according to the Gilbert-Elliot loss model or 212 * Generates losses according to the Gilbert-Elliot loss model or
213 * its special cases (Gilbert or Simple Gilbert) 213 * its special cases (Gilbert or Simple Gilbert)
214 * 214 *
215 * Makes a comparision between random number and the transition 215 * Makes a comparison between random number and the transition
216 * probabilities outgoing from the current state, then decides the 216 * probabilities outgoing from the current state, then decides the
217 * next state. A second random number is extracted and the comparision 217 * next state. A second random number is extracted and the comparison
218 * with the loss probability of the current state decides if the next 218 * with the loss probability of the current state decides if the next
219 * packet will be transmitted or lost. 219 * packet will be transmitted or lost.
220 */ 220 */
diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index 6b04287913cd..0698cad61763 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -1593,7 +1593,7 @@ void sctp_assoc_clean_asconf_ack_cache(const struct sctp_association *asoc)
1593 struct sctp_chunk *ack; 1593 struct sctp_chunk *ack;
1594 struct sctp_chunk *tmp; 1594 struct sctp_chunk *tmp;
1595 1595
1596 /* We can remove all the entries from the queue upto 1596 /* We can remove all the entries from the queue up to
1597 * the "Peer-Sequence-Number". 1597 * the "Peer-Sequence-Number".
1598 */ 1598 */
1599 list_for_each_entry_safe(ack, tmp, &asoc->asconf_ack_list, 1599 list_for_each_entry_safe(ack, tmp, &asoc->asconf_ack_list,
diff --git a/net/sctp/auth.c b/net/sctp/auth.c
index ddbbf7c81fa1..865e68fef21c 100644
--- a/net/sctp/auth.c
+++ b/net/sctp/auth.c
@@ -113,7 +113,7 @@ struct sctp_shared_key *sctp_auth_shkey_create(__u16 key_id, gfp_t gfp)
113 return new; 113 return new;
114} 114}
115 115
116/* Free the shared key stucture */ 116/* Free the shared key structure */
117static void sctp_auth_shkey_free(struct sctp_shared_key *sh_key) 117static void sctp_auth_shkey_free(struct sctp_shared_key *sh_key)
118{ 118{
119 BUG_ON(!list_empty(&sh_key->key_list)); 119 BUG_ON(!list_empty(&sh_key->key_list));
@@ -122,7 +122,7 @@ static void sctp_auth_shkey_free(struct sctp_shared_key *sh_key)
122 kfree(sh_key); 122 kfree(sh_key);
123} 123}
124 124
125/* Destory the entire key list. This is done during the 125/* Destroy the entire key list. This is done during the
126 * associon and endpoint free process. 126 * associon and endpoint free process.
127 */ 127 */
128void sctp_auth_destroy_keys(struct list_head *keys) 128void sctp_auth_destroy_keys(struct list_head *keys)
@@ -324,7 +324,7 @@ static struct sctp_auth_bytes *sctp_auth_asoc_create_secret(
324 if (!peer_key_vector || !local_key_vector) 324 if (!peer_key_vector || !local_key_vector)
325 goto out; 325 goto out;
326 326
327 /* Figure out the order in wich the key_vectors will be 327 /* Figure out the order in which the key_vectors will be
328 * added to the endpoint shared key. 328 * added to the endpoint shared key.
329 * SCTP-AUTH, Section 6.1: 329 * SCTP-AUTH, Section 6.1:
330 * This is performed by selecting the numerically smaller key 330 * This is performed by selecting the numerically smaller key
diff --git a/net/sctp/input.c b/net/sctp/input.c
index 826661be73e7..5436c6921167 100644
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -1034,7 +1034,7 @@ static struct sctp_association *__sctp_rcv_asconf_lookup(
1034* association. 1034* association.
1035* 1035*
1036* This means that any chunks that can help us identify the association need 1036* This means that any chunks that can help us identify the association need
1037* to be looked at to find this assocation. 1037* to be looked at to find this association.
1038*/ 1038*/
1039static struct sctp_association *__sctp_rcv_walk_lookup(struct sk_buff *skb, 1039static struct sctp_association *__sctp_rcv_walk_lookup(struct sk_buff *skb,
1040 const union sctp_addr *laddr, 1040 const union sctp_addr *laddr,
diff --git a/net/sctp/output.c b/net/sctp/output.c
index 60600d337a3a..b4f3cf06d8da 100644
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -510,7 +510,7 @@ int sctp_packet_transmit(struct sctp_packet *packet)
510 sh->checksum = sctp_end_cksum(crc32); 510 sh->checksum = sctp_end_cksum(crc32);
511 } else { 511 } else {
512 if (dst->dev->features & NETIF_F_SCTP_CSUM) { 512 if (dst->dev->features & NETIF_F_SCTP_CSUM) {
513 /* no need to seed psuedo checksum for SCTP */ 513 /* no need to seed pseudo checksum for SCTP */
514 nskb->ip_summed = CHECKSUM_PARTIAL; 514 nskb->ip_summed = CHECKSUM_PARTIAL;
515 nskb->csum_start = (skb_transport_header(nskb) - 515 nskb->csum_start = (skb_transport_header(nskb) -
516 nskb->head); 516 nskb->head);
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
index 26dc005113a0..bf92a5b68f8b 100644
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@ -177,13 +177,13 @@ static inline int sctp_cacc_skip_3_2(struct sctp_transport *primary, __u32 tsn)
177 * 3) If the missing report count for TSN t is to be 177 * 3) If the missing report count for TSN t is to be
178 * incremented according to [RFC2960] and 178 * incremented according to [RFC2960] and
179 * [SCTP_STEWART-2002], and CHANGEOVER_ACTIVE is set, 179 * [SCTP_STEWART-2002], and CHANGEOVER_ACTIVE is set,
180 * then the sender MUST futher execute steps 3.1 and 180 * then the sender MUST further execute steps 3.1 and
181 * 3.2 to determine if the missing report count for 181 * 3.2 to determine if the missing report count for
182 * TSN t SHOULD NOT be incremented. 182 * TSN t SHOULD NOT be incremented.
183 * 183 *
184 * 3.3) If 3.1 and 3.2 do not dictate that the missing 184 * 3.3) If 3.1 and 3.2 do not dictate that the missing
185 * report count for t should not be incremented, then 185 * report count for t should not be incremented, then
186 * the sender SOULD increment missing report count for 186 * the sender SHOULD increment missing report count for
187 * t (according to [RFC2960] and [SCTP_STEWART_2002]). 187 * t (according to [RFC2960] and [SCTP_STEWART_2002]).
188 */ 188 */
189static inline int sctp_cacc_skip(struct sctp_transport *primary, 189static inline int sctp_cacc_skip(struct sctp_transport *primary,
@@ -843,7 +843,7 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)
843 case SCTP_CID_ECN_CWR: 843 case SCTP_CID_ECN_CWR:
844 case SCTP_CID_ASCONF_ACK: 844 case SCTP_CID_ASCONF_ACK:
845 one_packet = 1; 845 one_packet = 1;
846 /* Fall throught */ 846 /* Fall through */
847 847
848 case SCTP_CID_SACK: 848 case SCTP_CID_SACK:
849 case SCTP_CID_HEARTBEAT: 849 case SCTP_CID_HEARTBEAT:
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index b21b218d564f..5f86ee4b54c1 100644
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -482,7 +482,7 @@ static void sctp_do_8_2_transport_strike(struct sctp_association *asoc,
482 * If the timer was a heartbeat, we only increment error counts 482 * If the timer was a heartbeat, we only increment error counts
483 * when we already have an outstanding HEARTBEAT that has not 483 * when we already have an outstanding HEARTBEAT that has not
484 * been acknowledged. 484 * been acknowledged.
485 * Additionaly, some tranport states inhibit error increments. 485 * Additionally, some tranport states inhibit error increments.
486 */ 486 */
487 if (!is_hb) { 487 if (!is_hb) {
488 asoc->overall_error_count++; 488 asoc->overall_error_count++;
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 4b4eb7c96bbd..76792083c379 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -551,7 +551,7 @@ sctp_disposition_t sctp_sf_do_5_1C_ack(const struct sctp_endpoint *ep,
551 * 551 *
552 * This means that if we only want to abort associations 552 * This means that if we only want to abort associations
553 * in an authenticated way (i.e AUTH+ABORT), then we 553 * in an authenticated way (i.e AUTH+ABORT), then we
554 * can't destroy this association just becuase the packet 554 * can't destroy this association just because the packet
555 * was malformed. 555 * was malformed.
556 */ 556 */
557 if (sctp_auth_recv_cid(SCTP_CID_ABORT, asoc)) 557 if (sctp_auth_recv_cid(SCTP_CID_ABORT, asoc))
@@ -1546,7 +1546,7 @@ cleanup:
1546} 1546}
1547 1547
1548/* 1548/*
1549 * Handle simultanous INIT. 1549 * Handle simultaneous INIT.
1550 * This means we started an INIT and then we got an INIT request from 1550 * This means we started an INIT and then we got an INIT request from
1551 * our peer. 1551 * our peer.
1552 * 1552 *
@@ -2079,7 +2079,7 @@ sctp_disposition_t sctp_sf_shutdown_pending_abort(
2079 * RFC 2960, Section 3.3.7 2079 * RFC 2960, Section 3.3.7
2080 * If an endpoint receives an ABORT with a format error or for an 2080 * If an endpoint receives an ABORT with a format error or for an
2081 * association that doesn't exist, it MUST silently discard it. 2081 * association that doesn't exist, it MUST silently discard it.
2082 * Becasue the length is "invalid", we can't really discard just 2082 * Because the length is "invalid", we can't really discard just
2083 * as we do not know its true length. So, to be safe, discard the 2083 * as we do not know its true length. So, to be safe, discard the
2084 * packet. 2084 * packet.
2085 */ 2085 */
@@ -2120,7 +2120,7 @@ sctp_disposition_t sctp_sf_shutdown_sent_abort(const struct sctp_endpoint *ep,
2120 * RFC 2960, Section 3.3.7 2120 * RFC 2960, Section 3.3.7
2121 * If an endpoint receives an ABORT with a format error or for an 2121 * If an endpoint receives an ABORT with a format error or for an
2122 * association that doesn't exist, it MUST silently discard it. 2122 * association that doesn't exist, it MUST silently discard it.
2123 * Becasue the length is "invalid", we can't really discard just 2123 * Because the length is "invalid", we can't really discard just
2124 * as we do not know its true length. So, to be safe, discard the 2124 * as we do not know its true length. So, to be safe, discard the
2125 * packet. 2125 * packet.
2126 */ 2126 */
@@ -2381,7 +2381,7 @@ sctp_disposition_t sctp_sf_do_9_1_abort(const struct sctp_endpoint *ep,
2381 * RFC 2960, Section 3.3.7 2381 * RFC 2960, Section 3.3.7
2382 * If an endpoint receives an ABORT with a format error or for an 2382 * If an endpoint receives an ABORT with a format error or for an
2383 * association that doesn't exist, it MUST silently discard it. 2383 * association that doesn't exist, it MUST silently discard it.
2384 * Becasue the length is "invalid", we can't really discard just 2384 * Because the length is "invalid", we can't really discard just
2385 * as we do not know its true length. So, to be safe, discard the 2385 * as we do not know its true length. So, to be safe, discard the
2386 * packet. 2386 * packet.
2387 */ 2387 */
@@ -2448,7 +2448,7 @@ sctp_disposition_t sctp_sf_cookie_wait_abort(const struct sctp_endpoint *ep,
2448 * RFC 2960, Section 3.3.7 2448 * RFC 2960, Section 3.3.7
2449 * If an endpoint receives an ABORT with a format error or for an 2449 * If an endpoint receives an ABORT with a format error or for an
2450 * association that doesn't exist, it MUST silently discard it. 2450 * association that doesn't exist, it MUST silently discard it.
2451 * Becasue the length is "invalid", we can't really discard just 2451 * Because the length is "invalid", we can't really discard just
2452 * as we do not know its true length. So, to be safe, discard the 2452 * as we do not know its true length. So, to be safe, discard the
2453 * packet. 2453 * packet.
2454 */ 2454 */
@@ -3855,7 +3855,7 @@ gen_shutdown:
3855} 3855}
3856 3856
3857/* 3857/*
3858 * SCTP-AUTH Section 6.3 Receving authenticated chukns 3858 * SCTP-AUTH Section 6.3 Receiving authenticated chukns
3859 * 3859 *
3860 * The receiver MUST use the HMAC algorithm indicated in the HMAC 3860 * The receiver MUST use the HMAC algorithm indicated in the HMAC
3861 * Identifier field. If this algorithm was not specified by the 3861 * Identifier field. If this algorithm was not specified by the
@@ -4231,7 +4231,7 @@ static sctp_disposition_t sctp_sf_abort_violation(
4231 * 4231 *
4232 * This means that if we only want to abort associations 4232 * This means that if we only want to abort associations
4233 * in an authenticated way (i.e AUTH+ABORT), then we 4233 * in an authenticated way (i.e AUTH+ABORT), then we
4234 * can't destroy this association just becuase the packet 4234 * can't destroy this association just because the packet
4235 * was malformed. 4235 * was malformed.
4236 */ 4236 */
4237 if (sctp_auth_recv_cid(SCTP_CID_ABORT, asoc)) 4237 if (sctp_auth_recv_cid(SCTP_CID_ABORT, asoc))
@@ -4402,9 +4402,9 @@ static sctp_disposition_t sctp_sf_violation_ctsn(
4402} 4402}
4403 4403
4404/* Handle protocol violation of an invalid chunk bundling. For example, 4404/* Handle protocol violation of an invalid chunk bundling. For example,
4405 * when we have an association and we recieve bundled INIT-ACK, or 4405 * when we have an association and we receive bundled INIT-ACK, or
4406 * SHUDOWN-COMPLETE, our peer is clearly violationg the "MUST NOT bundle" 4406 * SHUDOWN-COMPLETE, our peer is clearly violationg the "MUST NOT bundle"
4407 * statement from the specs. Additinally, there might be an attacker 4407 * statement from the specs. Additionally, there might be an attacker
4408 * on the path and we may not want to continue this communication. 4408 * on the path and we may not want to continue this communication.
4409 */ 4409 */
4410static sctp_disposition_t sctp_sf_violation_chunk( 4410static sctp_disposition_t sctp_sf_violation_chunk(
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 3951a10605bc..deb82e35a107 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -1193,7 +1193,7 @@ out_free:
1193 * an endpoint that is multi-homed. Much like sctp_bindx() this call 1193 * an endpoint that is multi-homed. Much like sctp_bindx() this call
1194 * allows a caller to specify multiple addresses at which a peer can be 1194 * allows a caller to specify multiple addresses at which a peer can be
1195 * reached. The way the SCTP stack uses the list of addresses to set up 1195 * reached. The way the SCTP stack uses the list of addresses to set up
1196 * the association is implementation dependant. This function only 1196 * the association is implementation dependent. This function only
1197 * specifies that the stack will try to make use of all the addresses in 1197 * specifies that the stack will try to make use of all the addresses in
1198 * the list when needed. 1198 * the list when needed.
1199 * 1199 *
diff --git a/net/sctp/ulpevent.c b/net/sctp/ulpevent.c
index aa72e89c3ee1..dff27d5e22fd 100644
--- a/net/sctp/ulpevent.c
+++ b/net/sctp/ulpevent.c
@@ -554,7 +554,7 @@ struct sctp_ulpevent *sctp_ulpevent_make_send_failed(
554 memcpy(&ssf->ssf_info, &chunk->sinfo, sizeof(struct sctp_sndrcvinfo)); 554 memcpy(&ssf->ssf_info, &chunk->sinfo, sizeof(struct sctp_sndrcvinfo));
555 555
556 /* Per TSVWG discussion with Randy. Allow the application to 556 /* Per TSVWG discussion with Randy. Allow the application to
557 * ressemble a fragmented message. 557 * resemble a fragmented message.
558 */ 558 */
559 ssf->ssf_info.sinfo_flags = chunk->chunk_hdr->flags; 559 ssf->ssf_info.sinfo_flags = chunk->chunk_hdr->flags;
560 560
diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c
index 17678189d054..f2d1de7f2ffb 100644
--- a/net/sctp/ulpqueue.c
+++ b/net/sctp/ulpqueue.c
@@ -240,7 +240,7 @@ int sctp_ulpq_tail_event(struct sctp_ulpq *ulpq, struct sctp_ulpevent *event)
240 } else { 240 } else {
241 /* 241 /*
242 * If fragment interleave is enabled, we 242 * If fragment interleave is enabled, we
243 * can queue this to the recieve queue instead 243 * can queue this to the receive queue instead
244 * of the lobby. 244 * of the lobby.
245 */ 245 */
246 if (sctp_sk(sk)->frag_interleave) 246 if (sctp_sk(sk)->frag_interleave)
diff --git a/net/socket.c b/net/socket.c
index 5212447c86e7..310d16b1b3c9 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -2986,7 +2986,7 @@ out:
2986 2986
2987/* Since old style bridge ioctl's endup using SIOCDEVPRIVATE 2987/* Since old style bridge ioctl's endup using SIOCDEVPRIVATE
2988 * for some operations; this forces use of the newer bridge-utils that 2988 * for some operations; this forces use of the newer bridge-utils that
2989 * use compatiable ioctls 2989 * use compatible ioctls
2990 */ 2990 */
2991static int old_bridge_ioctl(compat_ulong_t __user *argp) 2991static int old_bridge_ioctl(compat_ulong_t __user *argp)
2992{ 2992{
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index bcdae78fdfc6..8d0f7d3c71c8 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -1101,7 +1101,7 @@ svcauth_gss_accept(struct svc_rqst *rqstp, __be32 *authp)
1101 1101
1102 /* credential is: 1102 /* credential is:
1103 * version(==1), proc(0,1,2,3), seq, service (1,2,3), handle 1103 * version(==1), proc(0,1,2,3), seq, service (1,2,3), handle
1104 * at least 5 u32s, and is preceeded by length, so that makes 6. 1104 * at least 5 u32s, and is preceded by length, so that makes 6.
1105 */ 1105 */
1106 1106
1107 if (argv->iov_len < 5 * 4) 1107 if (argv->iov_len < 5 * 4)
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 1e336a06d3e6..bf005d3c65ef 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -504,7 +504,7 @@ static int xs_nospace(struct rpc_task *task)
504 * EAGAIN: The socket was blocked, please call again later to 504 * EAGAIN: The socket was blocked, please call again later to
505 * complete the request 505 * complete the request
506 * ENOTCONN: Caller needs to invoke connect logic then call again 506 * ENOTCONN: Caller needs to invoke connect logic then call again
507 * other: Some other error occured, the request was not sent 507 * other: Some other error occurred, the request was not sent
508 */ 508 */
509static int xs_udp_send_request(struct rpc_task *task) 509static int xs_udp_send_request(struct rpc_task *task)
510{ 510{
@@ -590,7 +590,7 @@ static inline void xs_encode_tcp_record_marker(struct xdr_buf *buf)
590 * EAGAIN: The socket was blocked, please call again later to 590 * EAGAIN: The socket was blocked, please call again later to
591 * complete the request 591 * complete the request
592 * ENOTCONN: Caller needs to invoke connect logic then call again 592 * ENOTCONN: Caller needs to invoke connect logic then call again
593 * other: Some other error occured, the request was not sent 593 * other: Some other error occurred, the request was not sent
594 * 594 *
595 * XXX: In the case of soft timeouts, should we eventually give up 595 * XXX: In the case of soft timeouts, should we eventually give up
596 * if sendmsg is not able to make progress? 596 * if sendmsg is not able to make progress?
diff --git a/net/tipc/link.c b/net/tipc/link.c
index 43639ff1cbec..ebf338f7b14e 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -2471,7 +2471,7 @@ exit:
2471 * A pending message being re-assembled must store certain values 2471 * A pending message being re-assembled must store certain values
2472 * to handle subsequent fragments correctly. The following functions 2472 * to handle subsequent fragments correctly. The following functions
2473 * help storing these values in unused, available fields in the 2473 * help storing these values in unused, available fields in the
2474 * pending message. This makes dynamic memory allocation unecessary. 2474 * pending message. This makes dynamic memory allocation unnecessary.
2475 */ 2475 */
2476 2476
2477static void set_long_msg_seqno(struct sk_buff *buf, u32 seqno) 2477static void set_long_msg_seqno(struct sk_buff *buf, u32 seqno)
diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c
index c9fa6dfcf287..80025a1b3bfd 100644
--- a/net/tipc/name_distr.c
+++ b/net/tipc/name_distr.c
@@ -160,7 +160,7 @@ void tipc_named_withdraw(struct publication *publ)
160 160
161 buf = named_prepare_buf(WITHDRAWAL, ITEM_SIZE, 0); 161 buf = named_prepare_buf(WITHDRAWAL, ITEM_SIZE, 0);
162 if (!buf) { 162 if (!buf) {
163 warn("Withdrawl distribution failure\n"); 163 warn("Withdrawal distribution failure\n");
164 return; 164 return;
165 } 165 }
166 166
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 1663e1a2efdd..3a43a8304768 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -207,7 +207,7 @@ static int unix_mkname(struct sockaddr_un *sunaddr, int len, unsigned *hashp)
207 /* 207 /*
208 * This may look like an off by one error but it is a bit more 208 * This may look like an off by one error but it is a bit more
209 * subtle. 108 is the longest valid AF_UNIX path for a binding. 209 * subtle. 108 is the longest valid AF_UNIX path for a binding.
210 * sun_path[108] doesnt as such exist. However in kernel space 210 * sun_path[108] doesn't as such exist. However in kernel space
211 * we are guaranteed that it is a valid memory location in our 211 * we are guaranteed that it is a valid memory location in our
212 * kernel address buffer. 212 * kernel address buffer.
213 */ 213 */
diff --git a/net/wanrouter/wanproc.c b/net/wanrouter/wanproc.c
index 11f25c7a7a05..f346395314ba 100644
--- a/net/wanrouter/wanproc.c
+++ b/net/wanrouter/wanproc.c
@@ -51,7 +51,7 @@
51 51
52/* 52/*
53 * Structures for interfacing with the /proc filesystem. 53 * Structures for interfacing with the /proc filesystem.
54 * Router creates its own directory /proc/net/router with the folowing 54 * Router creates its own directory /proc/net/router with the following
55 * entries: 55 * entries:
56 * config device configuration 56 * config device configuration
57 * status global device statistics 57 * status global device statistics
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 3332d5bce317..ab801a1097b2 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -809,7 +809,7 @@ static void handle_channel(struct wiphy *wiphy,
809 if (r) { 809 if (r) {
810 /* 810 /*
811 * We will disable all channels that do not match our 811 * We will disable all channels that do not match our
812 * recieved regulatory rule unless the hint is coming 812 * received regulatory rule unless the hint is coming
813 * from a Country IE and the Country IE had no information 813 * from a Country IE and the Country IE had no information
814 * about a band. The IEEE 802.11 spec allows for an AP 814 * about a band. The IEEE 802.11 spec allows for an AP
815 * to send only a subset of the regulatory rules allowed, 815 * to send only a subset of the regulatory rules allowed,
@@ -838,7 +838,7 @@ static void handle_channel(struct wiphy *wiphy,
838 request_wiphy && request_wiphy == wiphy && 838 request_wiphy && request_wiphy == wiphy &&
839 request_wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY) { 839 request_wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY) {
840 /* 840 /*
841 * This gaurantees the driver's requested regulatory domain 841 * This guarantees the driver's requested regulatory domain
842 * will always be used as a base for further regulatory 842 * will always be used as a base for further regulatory
843 * settings 843 * settings
844 */ 844 */
diff --git a/net/x25/x25_facilities.c b/net/x25/x25_facilities.c
index 406207515b5e..f77e4e75f914 100644
--- a/net/x25/x25_facilities.c
+++ b/net/x25/x25_facilities.c
@@ -31,7 +31,7 @@
31 * x25_parse_facilities - Parse facilities from skb into the facilities structs 31 * x25_parse_facilities - Parse facilities from skb into the facilities structs
32 * 32 *
33 * @skb: sk_buff to parse 33 * @skb: sk_buff to parse
34 * @facilities: Regular facilites, updated as facilities are found 34 * @facilities: Regular facilities, updated as facilities are found
35 * @dte_facs: ITU DTE facilities, updated as DTE facilities are found 35 * @dte_facs: ITU DTE facilities, updated as DTE facilities are found
36 * @vc_fac_mask: mask is updated with all facilities found 36 * @vc_fac_mask: mask is updated with all facilities found
37 * 37 *
diff --git a/net/x25/x25_forward.c b/net/x25/x25_forward.c
index 25a810793968..c541b622ae16 100644
--- a/net/x25/x25_forward.c
+++ b/net/x25/x25_forward.c
@@ -31,7 +31,7 @@ int x25_forward_call(struct x25_address *dest_addr, struct x25_neigh *from,
31 goto out_no_route; 31 goto out_no_route;
32 32
33 if ((neigh_new = x25_get_neigh(rt->dev)) == NULL) { 33 if ((neigh_new = x25_get_neigh(rt->dev)) == NULL) {
34 /* This shouldnt happen, if it occurs somehow 34 /* This shouldn't happen, if it occurs somehow
35 * do something sensible 35 * do something sensible
36 */ 36 */
37 goto out_put_route; 37 goto out_put_route;
@@ -45,7 +45,7 @@ int x25_forward_call(struct x25_address *dest_addr, struct x25_neigh *from,
45 } 45 }
46 46
47 /* Remote end sending a call request on an already 47 /* Remote end sending a call request on an already
48 * established LCI? It shouldnt happen, just in case.. 48 * established LCI? It shouldn't happen, just in case..
49 */ 49 */
50 read_lock_bh(&x25_forward_list_lock); 50 read_lock_bh(&x25_forward_list_lock);
51 list_for_each(entry, &x25_forward_list) { 51 list_for_each(entry, &x25_forward_list) {
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 3d15d3e1b2c4..5d1d60d3ca83 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -894,7 +894,7 @@ static int build_spdinfo(struct sk_buff *skb, struct net *net,
894 u32 *f; 894 u32 *f;
895 895
896 nlh = nlmsg_put(skb, pid, seq, XFRM_MSG_NEWSPDINFO, sizeof(u32), 0); 896 nlh = nlmsg_put(skb, pid, seq, XFRM_MSG_NEWSPDINFO, sizeof(u32), 0);
897 if (nlh == NULL) /* shouldnt really happen ... */ 897 if (nlh == NULL) /* shouldn't really happen ... */
898 return -EMSGSIZE; 898 return -EMSGSIZE;
899 899
900 f = nlmsg_data(nlh); 900 f = nlmsg_data(nlh);
@@ -954,7 +954,7 @@ static int build_sadinfo(struct sk_buff *skb, struct net *net,
954 u32 *f; 954 u32 *f;
955 955
956 nlh = nlmsg_put(skb, pid, seq, XFRM_MSG_NEWSADINFO, sizeof(u32), 0); 956 nlh = nlmsg_put(skb, pid, seq, XFRM_MSG_NEWSADINFO, sizeof(u32), 0);
957 if (nlh == NULL) /* shouldnt really happen ... */ 957 if (nlh == NULL) /* shouldn't really happen ... */
958 return -EMSGSIZE; 958 return -EMSGSIZE;
959 959
960 f = nlmsg_data(nlh); 960 f = nlmsg_data(nlh);
@@ -1361,7 +1361,7 @@ static int xfrm_add_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
1361 if (!xp) 1361 if (!xp)
1362 return err; 1362 return err;
1363 1363
1364 /* shouldnt excl be based on nlh flags?? 1364 /* shouldn't excl be based on nlh flags??
1365 * Aha! this is anti-netlink really i.e more pfkey derived 1365 * Aha! this is anti-netlink really i.e more pfkey derived
1366 * in netlink excl is a flag and you wouldnt need 1366 * in netlink excl is a flag and you wouldnt need
1367 * a type XFRM_MSG_UPDPOLICY - JHS */ 1367 * a type XFRM_MSG_UPDPOLICY - JHS */
diff --git a/samples/Kconfig b/samples/Kconfig
index e03cf0e374d7..41063e7592d2 100644
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@ -55,7 +55,7 @@ config SAMPLE_KFIFO
55 If in doubt, say "N" here. 55 If in doubt, say "N" here.
56 56
57config SAMPLE_KDB 57config SAMPLE_KDB
58 tristate "Build kdb command exmaple -- loadable modules only" 58 tristate "Build kdb command example -- loadable modules only"
59 depends on KGDB_KDB && m 59 depends on KGDB_KDB && m
60 help 60 help
61 Build an example of how to dynamically add the hello 61 Build an example of how to dynamically add the hello
diff --git a/samples/hw_breakpoint/data_breakpoint.c b/samples/hw_breakpoint/data_breakpoint.c
index bd0f337afcab..063653955f9f 100644
--- a/samples/hw_breakpoint/data_breakpoint.c
+++ b/samples/hw_breakpoint/data_breakpoint.c
@@ -19,7 +19,7 @@
19 * 19 *
20 * This file is a kernel module that places a breakpoint over ksym_name kernel 20 * This file is a kernel module that places a breakpoint over ksym_name kernel
21 * variable using Hardware Breakpoint register. The corresponding handler which 21 * variable using Hardware Breakpoint register. The corresponding handler which
22 * prints a backtrace is invoked everytime a write operation is performed on 22 * prints a backtrace is invoked every time a write operation is performed on
23 * that variable. 23 * that variable.
24 * 24 *
25 * Copyright (C) IBM Corporation, 2009 25 * Copyright (C) IBM Corporation, 2009
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 7d22056582c1..56dfafc73c1a 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -35,14 +35,14 @@
35# KBUILD_MODPOST_WARN can be set to avoid error out in case of undefined 35# KBUILD_MODPOST_WARN can be set to avoid error out in case of undefined
36# symbols in the final module linking stage 36# symbols in the final module linking stage
37# KBUILD_MODPOST_NOFINAL can be set to skip the final link of modules. 37# KBUILD_MODPOST_NOFINAL can be set to skip the final link of modules.
38# This is solely usefull to speed up test compiles 38# This is solely useful to speed up test compiles
39PHONY := _modpost 39PHONY := _modpost
40_modpost: __modpost 40_modpost: __modpost
41 41
42include include/config/auto.conf 42include include/config/auto.conf
43include scripts/Kbuild.include 43include scripts/Kbuild.include
44 44
45# When building external modules load the Kbuild file to retreive EXTRA_SYMBOLS info 45# When building external modules load the Kbuild file to retrieve EXTRA_SYMBOLS info
46ifneq ($(KBUILD_EXTMOD),) 46ifneq ($(KBUILD_EXTMOD),)
47 47
48# set src + obj - they may be used when building the .mod.c file 48# set src + obj - they may be used when building the .mod.c file
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 8f9e394298cd..d8670810db65 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1946,13 +1946,13 @@ sub process {
1946# printk should use KERN_* levels. Note that follow on printk's on the 1946# printk should use KERN_* levels. Note that follow on printk's on the
1947# same line do not need a level, so we use the current block context 1947# same line do not need a level, so we use the current block context
1948# to try and find and validate the current printk. In summary the current 1948# to try and find and validate the current printk. In summary the current
1949# printk includes all preceeding printk's which have no newline on the end. 1949# printk includes all preceding printk's which have no newline on the end.
1950# we assume the first bad printk is the one to report. 1950# we assume the first bad printk is the one to report.
1951 if ($line =~ /\bprintk\((?!KERN_)\s*"/) { 1951 if ($line =~ /\bprintk\((?!KERN_)\s*"/) {
1952 my $ok = 0; 1952 my $ok = 0;
1953 for (my $ln = $linenr - 1; $ln >= $first_line; $ln--) { 1953 for (my $ln = $linenr - 1; $ln >= $first_line; $ln--) {
1954 #print "CHECK<$lines[$ln - 1]\n"; 1954 #print "CHECK<$lines[$ln - 1]\n";
1955 # we have a preceeding printk if it ends 1955 # we have a preceding printk if it ends
1956 # with "\n" ignore it, else it is to blame 1956 # with "\n" ignore it, else it is to blame
1957 if ($lines[$ln - 1] =~ m{\bprintk\(}) { 1957 if ($lines[$ln - 1] =~ m{\bprintk\(}) {
1958 if ($rawlines[$ln - 1] !~ m{\\n"}) { 1958 if ($rawlines[$ln - 1] !~ m{\\n"}) {
@@ -2044,7 +2044,7 @@ sub process {
2044 for (my $n = 0; $n < $#elements; $n += 2) { 2044 for (my $n = 0; $n < $#elements; $n += 2) {
2045 $off += length($elements[$n]); 2045 $off += length($elements[$n]);
2046 2046
2047 # Pick up the preceeding and succeeding characters. 2047 # Pick up the preceding and succeeding characters.
2048 my $ca = substr($opline, 0, $off); 2048 my $ca = substr($opline, 0, $off);
2049 my $cc = ''; 2049 my $cc = '';
2050 if (length($opline) >= ($off + length($elements[$n + 1]))) { 2050 if (length($opline) >= ($off + length($elements[$n + 1]))) {
diff --git a/scripts/dtc/libfdt/libfdt.h b/scripts/dtc/libfdt/libfdt.h
index ce80e4fb41b2..ff6246f000ce 100644
--- a/scripts/dtc/libfdt/libfdt.h
+++ b/scripts/dtc/libfdt/libfdt.h
@@ -61,7 +61,7 @@
61#define FDT_ERR_NOTFOUND 1 61#define FDT_ERR_NOTFOUND 1
62 /* FDT_ERR_NOTFOUND: The requested node or property does not exist */ 62 /* FDT_ERR_NOTFOUND: The requested node or property does not exist */
63#define FDT_ERR_EXISTS 2 63#define FDT_ERR_EXISTS 2
64 /* FDT_ERR_EXISTS: Attemped to create a node or property which 64 /* FDT_ERR_EXISTS: Attempted to create a node or property which
65 * already exists */ 65 * already exists */
66#define FDT_ERR_NOSPACE 3 66#define FDT_ERR_NOSPACE 3
67 /* FDT_ERR_NOSPACE: Operation needed to expand the device 67 /* FDT_ERR_NOSPACE: Operation needed to expand the device
diff --git a/scripts/dtc/livetree.c b/scripts/dtc/livetree.c
index c9209d5c999e..26d0e1e60c0c 100644
--- a/scripts/dtc/livetree.c
+++ b/scripts/dtc/livetree.c
@@ -155,7 +155,7 @@ struct node *merge_nodes(struct node *old_node, struct node *new_node)
155 } 155 }
156 } 156 }
157 157
158 /* if no collision occured, add child to the old node. */ 158 /* if no collision occurred, add child to the old node. */
159 if (new_child) 159 if (new_child)
160 add_child(old_node, new_child); 160 add_child(old_node, new_child);
161 } 161 }
diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh
index 55caecdad995..e12b1a7525cf 100644
--- a/scripts/gen_initramfs_list.sh
+++ b/scripts/gen_initramfs_list.sh
@@ -284,7 +284,7 @@ while [ $# -gt 0 ]; do
284done 284done
285 285
286# If output_file is set we will generate cpio archive and compress it 286# If output_file is set we will generate cpio archive and compress it
287# we are carefull to delete tmp files 287# we are careful to delete tmp files
288if [ ! -z ${output_file} ]; then 288if [ ! -z ${output_file} ]; then
289 if [ -z ${cpio_file} ]; then 289 if [ -z ${cpio_file} ]; then
290 cpio_tfile="$(mktemp ${TMPDIR:-/tmp}/cpiofile.XXXXXX)" 290 cpio_tfile="$(mktemp ${TMPDIR:-/tmp}/cpiofile.XXXXXX)"
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 9f85012acf0d..d793001929cf 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1705,7 +1705,7 @@ sub push_parameter($$$) {
1705 1705
1706 $param = xml_escape($param); 1706 $param = xml_escape($param);
1707 1707
1708 # strip spaces from $param so that it is one continous string 1708 # strip spaces from $param so that it is one continuous string
1709 # on @parameterlist; 1709 # on @parameterlist;
1710 # this fixes a problem where check_sections() cannot find 1710 # this fixes a problem where check_sections() cannot find
1711 # a parameter like "addr[6 + 2]" because it actually appears 1711 # a parameter like "addr[6 + 2]" because it actually appears
diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index 83c9c04102f2..8a7b15598ea9 100644
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -92,7 +92,7 @@ case "${ARCH}" in
92 echo "" >&2 92 echo "" >&2
93 echo '** ** ** WARNING ** ** **' >&2 93 echo '** ** ** WARNING ** ** **' >&2
94 echo "" >&2 94 echo "" >&2
95 echo "Your architecture did not define any architecture-dependant files" >&2 95 echo "Your architecture did not define any architecture-dependent files" >&2
96 echo "to be placed into the tarball. Please add those to ${0} ..." >&2 96 echo "to be placed into the tarball. Please add those to ${0} ..." >&2
97 echo "" >&2 97 echo "" >&2
98 sleep 5 98 sleep 5
diff --git a/scripts/rt-tester/rt-tester.py b/scripts/rt-tester/rt-tester.py
index 8c81d76959ee..34186cac1d2f 100644
--- a/scripts/rt-tester/rt-tester.py
+++ b/scripts/rt-tester/rt-tester.py
@@ -180,7 +180,7 @@ while 1:
180 for s in stat: 180 for s in stat:
181 s = s.strip() 181 s = s.strip()
182 if s.startswith(testop[0]): 182 if s.startswith(testop[0]):
183 # Seperate status value 183 # Separate status value
184 val = s[2:].strip() 184 val = s[2:].strip()
185 query = analyse(val, testop, dat) 185 query = analyse(val, testop, dat)
186 break 186 break
diff --git a/security/apparmor/match.c b/security/apparmor/match.c
index 5cb4dc1f6992..06d764ccbbe5 100644
--- a/security/apparmor/match.c
+++ b/security/apparmor/match.c
@@ -195,7 +195,7 @@ void aa_dfa_free_kref(struct kref *kref)
195 * 195 *
196 * Unpack a dfa that has been serialized. To find information on the dfa 196 * Unpack a dfa that has been serialized. To find information on the dfa
197 * format look in Documentation/apparmor.txt 197 * format look in Documentation/apparmor.txt
198 * Assumes the dfa @blob stream has been aligned on a 8 byte boundry 198 * Assumes the dfa @blob stream has been aligned on a 8 byte boundary
199 * 199 *
200 * Returns: an unpacked dfa ready for matching or ERR_PTR on failure 200 * Returns: an unpacked dfa ready for matching or ERR_PTR on failure
201 */ 201 */
diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
index eb3700e9fd37..e33aaf7e5744 100644
--- a/security/apparmor/policy_unpack.c
+++ b/security/apparmor/policy_unpack.c
@@ -359,7 +359,7 @@ fail:
359 * @e: serialized data extent information (NOT NULL) 359 * @e: serialized data extent information (NOT NULL)
360 * @profile: profile to add the accept table to (NOT NULL) 360 * @profile: profile to add the accept table to (NOT NULL)
361 * 361 *
362 * Returns: 1 if table succesfully unpacked 362 * Returns: 1 if table successfully unpacked
363 */ 363 */
364static bool unpack_trans_table(struct aa_ext *e, struct aa_profile *profile) 364static bool unpack_trans_table(struct aa_ext *e, struct aa_profile *profile)
365{ 365{
diff --git a/security/selinux/netlabel.c b/security/selinux/netlabel.c
index 1c2fc46544bf..c3bf3ed07b06 100644
--- a/security/selinux/netlabel.c
+++ b/security/selinux/netlabel.c
@@ -151,7 +151,7 @@ void selinux_netlbl_sk_security_free(struct sk_security_struct *sksec)
151 * 151 *
152 * Description: 152 * Description:
153 * Called when the NetLabel state of a sk_security_struct needs to be reset. 153 * Called when the NetLabel state of a sk_security_struct needs to be reset.
154 * The caller is responsibile for all the NetLabel sk_security_struct locking. 154 * The caller is responsible for all the NetLabel sk_security_struct locking.
155 * 155 *
156 */ 156 */
157void selinux_netlbl_sk_security_reset(struct sk_security_struct *sksec) 157void selinux_netlbl_sk_security_reset(struct sk_security_struct *sksec)
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index ea7c01f4a2bf..6ef4af47dac4 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -2806,7 +2806,7 @@ int selinux_audit_rule_init(u32 field, u32 op, char *rulestr, void **vrule)
2806 case AUDIT_SUBJ_CLR: 2806 case AUDIT_SUBJ_CLR:
2807 case AUDIT_OBJ_LEV_LOW: 2807 case AUDIT_OBJ_LEV_LOW:
2808 case AUDIT_OBJ_LEV_HIGH: 2808 case AUDIT_OBJ_LEV_HIGH:
2809 /* we do not allow a range, indicated by the presense of '-' */ 2809 /* we do not allow a range, indicated by the presence of '-' */
2810 if (strchr(rulestr, '-')) 2810 if (strchr(rulestr, '-'))
2811 return -EINVAL; 2811 return -EINVAL;
2812 break; 2812 break;
@@ -3075,7 +3075,7 @@ static void security_netlbl_cache_add(struct netlbl_lsm_secattr *secattr,
3075 * Description: 3075 * Description:
3076 * Convert the given NetLabel security attributes in @secattr into a 3076 * Convert the given NetLabel security attributes in @secattr into a
3077 * SELinux SID. If the @secattr field does not contain a full SELinux 3077 * SELinux SID. If the @secattr field does not contain a full SELinux
3078 * SID/context then use SECINITSID_NETMSG as the foundation. If possibile the 3078 * SID/context then use SECINITSID_NETMSG as the foundation. If possible the
3079 * 'cache' field of @secattr is set and the CACHE flag is set; this is to 3079 * 'cache' field of @secattr is set and the CACHE flag is set; this is to
3080 * allow the @secattr to be used by NetLabel to cache the secattr to SID 3080 * allow the @secattr to be used by NetLabel to cache the secattr to SID
3081 * conversion for future lookups. Returns zero on success, negative values on 3081 * conversion for future lookups. Returns zero on success, negative values on
diff --git a/security/smack/smack_access.c b/security/smack/smack_access.c
index 86453db4333d..9637e107f7ea 100644
--- a/security/smack/smack_access.c
+++ b/security/smack/smack_access.c
@@ -431,7 +431,7 @@ char *smk_import(const char *string, int len)
431 * smack_from_secid - find the Smack label associated with a secid 431 * smack_from_secid - find the Smack label associated with a secid
432 * @secid: an integer that might be associated with a Smack label 432 * @secid: an integer that might be associated with a Smack label
433 * 433 *
434 * Returns a pointer to the appropraite Smack label if there is one, 434 * Returns a pointer to the appropriate Smack label if there is one,
435 * otherwise a pointer to the invalid Smack label. 435 * otherwise a pointer to the invalid Smack label.
436 */ 436 */
437char *smack_from_secid(const u32 secid) 437char *smack_from_secid(const u32 secid)
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 23c7a6d0c80c..c6f8fcadae07 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -1794,7 +1794,7 @@ static void smack_set_catset(char *catset, struct netlbl_lsm_secattr *sap)
1794 * Casey says that CIPSO is good enough for now. 1794 * Casey says that CIPSO is good enough for now.
1795 * It can be used to effect. 1795 * It can be used to effect.
1796 * It can also be abused to effect when necessary. 1796 * It can also be abused to effect when necessary.
1797 * Appologies to the TSIG group in general and GW in particular. 1797 * Apologies to the TSIG group in general and GW in particular.
1798 */ 1798 */
1799static void smack_to_secattr(char *smack, struct netlbl_lsm_secattr *nlsp) 1799static void smack_to_secattr(char *smack, struct netlbl_lsm_secattr *nlsp)
1800{ 1800{
@@ -2530,7 +2530,7 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode)
2530 switch (sbp->s_magic) { 2530 switch (sbp->s_magic) {
2531 case SMACK_MAGIC: 2531 case SMACK_MAGIC:
2532 /* 2532 /*
2533 * Casey says that it's a little embarassing 2533 * Casey says that it's a little embarrassing
2534 * that the smack file system doesn't do 2534 * that the smack file system doesn't do
2535 * extended attributes. 2535 * extended attributes.
2536 */ 2536 */
@@ -3084,7 +3084,7 @@ static int smack_inet_conn_request(struct sock *sk, struct sk_buff *skb,
3084 /* 3084 /*
3085 * We need to decide if we want to label the incoming connection here 3085 * We need to decide if we want to label the incoming connection here
3086 * if we do we only need to label the request_sock and the stack will 3086 * if we do we only need to label the request_sock and the stack will
3087 * propogate the wire-label to the sock when it is created. 3087 * propagate the wire-label to the sock when it is created.
3088 */ 3088 */
3089 hdr = ip_hdr(skb); 3089 hdr = ip_hdr(skb);
3090 addr.sin_addr.s_addr = hdr->saddr; 3090 addr.sin_addr.s_addr = hdr->saddr;
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
index 90d1bbaaa6f3..f93460156dce 100644
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@ -208,7 +208,7 @@ static ssize_t smk_write_load_list(struct file *file, const char __user *buf,
208 if (*ppos != 0) 208 if (*ppos != 0)
209 return -EINVAL; 209 return -EINVAL;
210 /* 210 /*
211 * Minor hack for backward compatability 211 * Minor hack for backward compatibility
212 */ 212 */
213 if (count < (SMK_OLOADLEN) || count > SMK_LOADLEN) 213 if (count < (SMK_OLOADLEN) || count > SMK_LOADLEN)
214 return -EINVAL; 214 return -EINVAL;
@@ -223,7 +223,7 @@ static ssize_t smk_write_load_list(struct file *file, const char __user *buf,
223 } 223 }
224 224
225 /* 225 /*
226 * More on the minor hack for backward compatability 226 * More on the minor hack for backward compatibility
227 */ 227 */
228 if (count == (SMK_OLOADLEN)) 228 if (count == (SMK_OLOADLEN))
229 data[SMK_OLOADLEN] = '-'; 229 data[SMK_OLOADLEN] = '-';
@@ -927,7 +927,7 @@ static ssize_t smk_write_netlbladdr(struct file *file, const char __user *buf,
927 } 927 }
928 } else { 928 } else {
929 /* we delete the unlabeled entry, only if the previous label 929 /* we delete the unlabeled entry, only if the previous label
930 * wasnt the special CIPSO option */ 930 * wasn't the special CIPSO option */
931 if (skp->smk_label != smack_cipso_option) 931 if (skp->smk_label != smack_cipso_option)
932 rc = netlbl_cfg_unlbl_static_del(&init_net, NULL, 932 rc = netlbl_cfg_unlbl_static_del(&init_net, NULL,
933 &skp->smk_host.sin_addr, &skp->smk_mask, 933 &skp->smk_host.sin_addr, &skp->smk_mask,
diff --git a/security/tomoyo/load_policy.c b/security/tomoyo/load_policy.c
index bbada7ca1b91..3312e5624f24 100644
--- a/security/tomoyo/load_policy.c
+++ b/security/tomoyo/load_policy.c
@@ -23,7 +23,7 @@ static bool tomoyo_policy_loader_exists(void)
23 * If the initrd includes /sbin/init but real-root-dev has not 23 * If the initrd includes /sbin/init but real-root-dev has not
24 * mounted on / yet, activating MAC will block the system since 24 * mounted on / yet, activating MAC will block the system since
25 * policies are not loaded yet. 25 * policies are not loaded yet.
26 * Thus, let do_execve() call this function everytime. 26 * Thus, let do_execve() call this function every time.
27 */ 27 */
28 struct path path; 28 struct path path;
29 29
diff --git a/sound/aoa/codecs/tas.c b/sound/aoa/codecs/tas.c
index fd2188c3df2b..58804c7acfcf 100644
--- a/sound/aoa/codecs/tas.c
+++ b/sound/aoa/codecs/tas.c
@@ -170,7 +170,7 @@ static void tas_set_volume(struct tas *tas)
170 /* analysing the volume and mixer tables shows 170 /* analysing the volume and mixer tables shows
171 * that they are similar enough when we shift 171 * that they are similar enough when we shift
172 * the mixer table down by 4 bits. The error 172 * the mixer table down by 4 bits. The error
173 * is miniscule, in just one item the error 173 * is minuscule, in just one item the error
174 * is 1, at a value of 0x07f17b (mixer table 174 * is 1, at a value of 0x07f17b (mixer table
175 * value is 0x07f17a) */ 175 * value is 0x07f17a) */
176 tmp = tas_gaintable[left]; 176 tmp = tas_gaintable[left];
diff --git a/sound/core/pcm_memory.c b/sound/core/pcm_memory.c
index 917e4055ee30..150cb7edffee 100644
--- a/sound/core/pcm_memory.c
+++ b/sound/core/pcm_memory.c
@@ -253,7 +253,7 @@ static int snd_pcm_lib_preallocate_pages1(struct snd_pcm_substream *substream,
253 * snd_pcm_lib_preallocate_pages - pre-allocation for the given DMA type 253 * snd_pcm_lib_preallocate_pages - pre-allocation for the given DMA type
254 * @substream: the pcm substream instance 254 * @substream: the pcm substream instance
255 * @type: DMA type (SNDRV_DMA_TYPE_*) 255 * @type: DMA type (SNDRV_DMA_TYPE_*)
256 * @data: DMA type dependant data 256 * @data: DMA type dependent data
257 * @size: the requested pre-allocation size in bytes 257 * @size: the requested pre-allocation size in bytes
258 * @max: the max. allowed pre-allocation size 258 * @max: the max. allowed pre-allocation size
259 * 259 *
@@ -278,10 +278,10 @@ int snd_pcm_lib_preallocate_pages(struct snd_pcm_substream *substream,
278EXPORT_SYMBOL(snd_pcm_lib_preallocate_pages); 278EXPORT_SYMBOL(snd_pcm_lib_preallocate_pages);
279 279
280/** 280/**
281 * snd_pcm_lib_preallocate_pages_for_all - pre-allocation for continous memory type (all substreams) 281 * snd_pcm_lib_preallocate_pages_for_all - pre-allocation for continuous memory type (all substreams)
282 * @pcm: the pcm instance 282 * @pcm: the pcm instance
283 * @type: DMA type (SNDRV_DMA_TYPE_*) 283 * @type: DMA type (SNDRV_DMA_TYPE_*)
284 * @data: DMA type dependant data 284 * @data: DMA type dependent data
285 * @size: the requested pre-allocation size in bytes 285 * @size: the requested pre-allocation size in bytes
286 * @max: the max. allowed pre-allocation size 286 * @max: the max. allowed pre-allocation size
287 * 287 *
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index fe5c8036beba..1a07750f3836 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -460,7 +460,7 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream,
460 PM_QOS_CPU_DMA_LATENCY, usecs); 460 PM_QOS_CPU_DMA_LATENCY, usecs);
461 return 0; 461 return 0;
462 _error: 462 _error:
463 /* hardware might be unuseable from this time, 463 /* hardware might be unusable from this time,
464 so we force application to retry to set 464 so we force application to retry to set
465 the correct hardware parameter settings */ 465 the correct hardware parameter settings */
466 runtime->status->state = SNDRV_PCM_STATE_OPEN; 466 runtime->status->state = SNDRV_PCM_STATE_OPEN;
diff --git a/sound/core/seq/seq_dummy.c b/sound/core/seq/seq_dummy.c
index f3bdc54b429a..1d7d90ca455e 100644
--- a/sound/core/seq/seq_dummy.c
+++ b/sound/core/seq/seq_dummy.c
@@ -50,7 +50,7 @@
50 50
51 option snd-seq-dummy ports=4 51 option snd-seq-dummy ports=4
52 52
53 The modle option "duplex=1" enables duplex operation to the port. 53 The model option "duplex=1" enables duplex operation to the port.
54 In duplex mode, a pair of ports are created instead of single port, 54 In duplex mode, a pair of ports are created instead of single port,
55 and events are tunneled between pair-ports. For example, input to 55 and events are tunneled between pair-ports. For example, input to
56 port A is sent to output port of another port B and vice versa. 56 port A is sent to output port of another port B and vice versa.
diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c
index a89948ae9e8d..a39d3d8c2f9c 100644
--- a/sound/core/vmaster.c
+++ b/sound/core/vmaster.c
@@ -233,7 +233,7 @@ static void slave_free(struct snd_kcontrol *kcontrol)
233 * Add a slave control to the group with the given master control 233 * Add a slave control to the group with the given master control
234 * 234 *
235 * All slaves must be the same type (returning the same information 235 * All slaves must be the same type (returning the same information
236 * via info callback). The fucntion doesn't check it, so it's your 236 * via info callback). The function doesn't check it, so it's your
237 * responsibility. 237 * responsibility.
238 * 238 *
239 * Also, some additional limitations: 239 * Also, some additional limitations:
diff --git a/sound/drivers/pcm-indirect2.c b/sound/drivers/pcm-indirect2.c
index 3c93c23e4883..e73fafd761b3 100644
--- a/sound/drivers/pcm-indirect2.c
+++ b/sound/drivers/pcm-indirect2.c
@@ -264,7 +264,7 @@ snd_pcm_indirect2_playback_transfer(struct snd_pcm_substream *substream,
264 if (diff < -(snd_pcm_sframes_t) (runtime->boundary / 2)) 264 if (diff < -(snd_pcm_sframes_t) (runtime->boundary / 2))
265 diff += runtime->boundary; 265 diff += runtime->boundary;
266 /* number of bytes "added" by ALSA increases the number of 266 /* number of bytes "added" by ALSA increases the number of
267 * bytes which are ready to "be transfered to HW"/"played" 267 * bytes which are ready to "be transferred to HW"/"played"
268 * Then, set rec->appl_ptr to not count bytes twice next time. 268 * Then, set rec->appl_ptr to not count bytes twice next time.
269 */ 269 */
270 rec->sw_ready += (int)frames_to_bytes(runtime, diff); 270 rec->sw_ready += (int)frames_to_bytes(runtime, diff);
@@ -330,7 +330,7 @@ snd_pcm_indirect2_playback_transfer(struct snd_pcm_substream *substream,
330 /* copy bytes from intermediate buffer position sw_data to the 330 /* copy bytes from intermediate buffer position sw_data to the
331 * HW and return number of bytes actually written 331 * HW and return number of bytes actually written
332 * Furthermore, set hw_ready to 0, if the fifo isn't empty 332 * Furthermore, set hw_ready to 0, if the fifo isn't empty
333 * now => more could be transfered to fifo 333 * now => more could be transferred to fifo
334 */ 334 */
335 bytes = copy(substream, rec, bytes); 335 bytes = copy(substream, rec, bytes);
336 rec->bytes2hw += bytes; 336 rec->bytes2hw += bytes;
diff --git a/sound/drivers/vx/vx_pcm.c b/sound/drivers/vx/vx_pcm.c
index 35a2f71a6af5..5e897b236cec 100644
--- a/sound/drivers/vx/vx_pcm.c
+++ b/sound/drivers/vx/vx_pcm.c
@@ -1189,7 +1189,7 @@ void vx_pcm_update_intr(struct vx_core *chip, unsigned int events)
1189 1189
1190 1190
1191/* 1191/*
1192 * vx_init_audio_io - check the availabe audio i/o and allocate pipe arrays 1192 * vx_init_audio_io - check the available audio i/o and allocate pipe arrays
1193 */ 1193 */
1194static int vx_init_audio_io(struct vx_core *chip) 1194static int vx_init_audio_io(struct vx_core *chip)
1195{ 1195{
diff --git a/sound/isa/sb/emu8000.c b/sound/isa/sb/emu8000.c
index 0c40951b6523..5d61f5a29130 100644
--- a/sound/isa/sb/emu8000.c
+++ b/sound/isa/sb/emu8000.c
@@ -370,7 +370,7 @@ init_arrays(struct snd_emu8000 *emu)
370 370
371/* 371/*
372 * Size the onboard memory. 372 * Size the onboard memory.
373 * This is written so as not to need arbitary delays after the write. It 373 * This is written so as not to need arbitrary delays after the write. It
374 * seems that the only way to do this is to use the one channel and keep 374 * seems that the only way to do this is to use the one channel and keep
375 * reallocating between read and write. 375 * reallocating between read and write.
376 */ 376 */
diff --git a/sound/isa/wavefront/wavefront_midi.c b/sound/isa/wavefront/wavefront_midi.c
index f14a7c0b6998..65329f3abc30 100644
--- a/sound/isa/wavefront/wavefront_midi.c
+++ b/sound/isa/wavefront/wavefront_midi.c
@@ -537,7 +537,7 @@ snd_wavefront_midi_start (snd_wavefront_card_t *card)
537 } 537 }
538 538
539 /* Turn on Virtual MIDI, but first *always* turn it off, 539 /* Turn on Virtual MIDI, but first *always* turn it off,
540 since otherwise consectutive reloads of the driver will 540 since otherwise consecutive reloads of the driver will
541 never cause the hardware to generate the initial "internal" or 541 never cause the hardware to generate the initial "internal" or
542 "external" source bytes in the MIDI data stream. This 542 "external" source bytes in the MIDI data stream. This
543 is pretty important, since the internal hardware generally will 543 is pretty important, since the internal hardware generally will
diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c
index 9191b32d9130..2a42cc377957 100644
--- a/sound/isa/wss/wss_lib.c
+++ b/sound/isa/wss/wss_lib.c
@@ -424,7 +424,7 @@ void snd_wss_mce_down(struct snd_wss *chip)
424 424
425 /* 425 /*
426 * Wait for (possible -- during init auto-calibration may not be set) 426 * Wait for (possible -- during init auto-calibration may not be set)
427 * calibration process to start. Needs upto 5 sample periods on AD1848 427 * calibration process to start. Needs up to 5 sample periods on AD1848
428 * which at the slowest possible rate of 5.5125 kHz means 907 us. 428 * which at the slowest possible rate of 5.5125 kHz means 907 us.
429 */ 429 */
430 msleep(1); 430 msleep(1);
diff --git a/sound/oss/ac97_codec.c b/sound/oss/ac97_codec.c
index 854c303264dc..0cd23d94888f 100644
--- a/sound/oss/ac97_codec.c
+++ b/sound/oss/ac97_codec.c
@@ -28,7 +28,7 @@
28 * 28 *
29 * History 29 * History
30 * May 02, 2003 Liam Girdwood <lrg@slimlogic.co.uk> 30 * May 02, 2003 Liam Girdwood <lrg@slimlogic.co.uk>
31 * Removed non existant WM9700 31 * Removed non existent WM9700
32 * Added support for WM9705, WM9708, WM9709, WM9710, WM9711 32 * Added support for WM9705, WM9708, WM9709, WM9710, WM9711
33 * WM9712 and WM9717 33 * WM9712 and WM9717
34 * Mar 28, 2002 Randolph Bentson <bentson@holmsjoen.com> 34 * Mar 28, 2002 Randolph Bentson <bentson@holmsjoen.com>
@@ -441,7 +441,7 @@ static void ac97_set_mixer(struct ac97_codec *codec, unsigned int oss_mixer, uns
441} 441}
442 442
443/* read or write the recmask, the ac97 can really have left and right recording 443/* read or write the recmask, the ac97 can really have left and right recording
444 inputs independantly set, but OSS doesn't seem to want us to express that to 444 inputs independently set, but OSS doesn't seem to want us to express that to
445 the user. the caller guarantees that we have a supported bit set, and they 445 the user. the caller guarantees that we have a supported bit set, and they
446 must be holding the card's spinlock */ 446 must be holding the card's spinlock */
447static int ac97_recmask_io(struct ac97_codec *codec, int rw, int mask) 447static int ac97_recmask_io(struct ac97_codec *codec, int rw, int mask)
@@ -754,7 +754,7 @@ int ac97_probe_codec(struct ac97_codec *codec)
754 if((codec->codec_ops == &null_ops) && (f & 4)) 754 if((codec->codec_ops == &null_ops) && (f & 4))
755 codec->codec_ops = &default_digital_ops; 755 codec->codec_ops = &default_digital_ops;
756 756
757 /* A device which thinks its a modem but isnt */ 757 /* A device which thinks its a modem but isn't */
758 if(codec->flags & AC97_DELUDED_MODEM) 758 if(codec->flags & AC97_DELUDED_MODEM)
759 codec->modem = 0; 759 codec->modem = 0;
760 760
diff --git a/sound/oss/audio.c b/sound/oss/audio.c
index 7df48a25c4ee..4b958b1c497c 100644
--- a/sound/oss/audio.c
+++ b/sound/oss/audio.c
@@ -514,7 +514,7 @@ int audio_ioctl(int dev, struct file *file, unsigned int cmd, void __user *arg)
514 count += dmap->bytes_in_use; /* Pointer wrap not handled yet */ 514 count += dmap->bytes_in_use; /* Pointer wrap not handled yet */
515 count += dmap->byte_counter; 515 count += dmap->byte_counter;
516 516
517 /* Substract current count from the number of bytes written by app */ 517 /* Subtract current count from the number of bytes written by app */
518 count = dmap->user_counter - count; 518 count = dmap->user_counter - count;
519 if (count < 0) 519 if (count < 0)
520 count = 0; 520 count = 0;
@@ -931,7 +931,7 @@ static int dma_ioctl(int dev, unsigned int cmd, void __user *arg)
931 if (count < dmap_out->fragment_size && dmap_out->qhead != 0) 931 if (count < dmap_out->fragment_size && dmap_out->qhead != 0)
932 count += dmap_out->bytes_in_use; /* Pointer wrap not handled yet */ 932 count += dmap_out->bytes_in_use; /* Pointer wrap not handled yet */
933 count += dmap_out->byte_counter; 933 count += dmap_out->byte_counter;
934 /* Substract current count from the number of bytes written by app */ 934 /* Subtract current count from the number of bytes written by app */
935 count = dmap_out->user_counter - count; 935 count = dmap_out->user_counter - count;
936 if (count < 0) 936 if (count < 0)
937 count = 0; 937 count = 0;
diff --git a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c
index 87e2c72651f5..c918313c2206 100644
--- a/sound/oss/dmasound/dmasound_core.c
+++ b/sound/oss/dmasound/dmasound_core.c
@@ -1021,7 +1021,7 @@ static int sq_ioctl(struct file *file, u_int cmd, u_long arg)
1021 case SNDCTL_DSP_SYNC: 1021 case SNDCTL_DSP_SYNC:
1022 /* This call, effectively, has the same behaviour as SNDCTL_DSP_RESET 1022 /* This call, effectively, has the same behaviour as SNDCTL_DSP_RESET
1023 except that it waits for output to finish before resetting 1023 except that it waits for output to finish before resetting
1024 everything - read, however, is killed imediately. 1024 everything - read, however, is killed immediately.
1025 */ 1025 */
1026 result = 0 ; 1026 result = 0 ;
1027 if (file->f_mode & FMODE_WRITE) { 1027 if (file->f_mode & FMODE_WRITE) {
diff --git a/sound/oss/midibuf.c b/sound/oss/midibuf.c
index ceedb1eff203..8cdb2cfe65c8 100644
--- a/sound/oss/midibuf.c
+++ b/sound/oss/midibuf.c
@@ -295,7 +295,7 @@ int MIDIbuf_write(int dev, struct file *file, const char __user *buf, int count)
295 295
296 for (i = 0; i < n; i++) 296 for (i = 0; i < n; i++)
297 { 297 {
298 /* BROKE BROKE BROKE - CANT DO THIS WITH CLI !! */ 298 /* BROKE BROKE BROKE - CAN'T DO THIS WITH CLI !! */
299 /* yes, think the same, so I removed the cli() brackets 299 /* yes, think the same, so I removed the cli() brackets
300 QUEUE_BYTE is protected against interrupts */ 300 QUEUE_BYTE is protected against interrupts */
301 if (copy_from_user((char *) &tmp_data, &(buf)[c], 1)) { 301 if (copy_from_user((char *) &tmp_data, &(buf)[c], 1)) {
diff --git a/sound/oss/sb_card.c b/sound/oss/sb_card.c
index 84ef4d06c1c2..fb5d7250de38 100644
--- a/sound/oss/sb_card.c
+++ b/sound/oss/sb_card.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * sound/oss/sb_card.c 2 * sound/oss/sb_card.c
3 * 3 *
4 * Detection routine for the ISA Sound Blaster and compatable sound 4 * Detection routine for the ISA Sound Blaster and compatible sound
5 * cards. 5 * cards.
6 * 6 *
7 * This file is distributed under the GNU GENERAL PUBLIC LICENSE (GPL) 7 * This file is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)
diff --git a/sound/oss/sb_ess.c b/sound/oss/sb_ess.c
index 9890cf2066ff..5c773dff5ac5 100644
--- a/sound/oss/sb_ess.c
+++ b/sound/oss/sb_ess.c
@@ -168,7 +168,7 @@
168 * corresponding playback levels, unless recmask says they aren't recorded. In 168 * corresponding playback levels, unless recmask says they aren't recorded. In
169 * the latter case the recording volumes are 0. 169 * the latter case the recording volumes are 0.
170 * Now recording levels of inputs can be controlled, by changing the playback 170 * Now recording levels of inputs can be controlled, by changing the playback
171 * levels. Futhermore several devices can be recorded together (which is not 171 * levels. Furthermore several devices can be recorded together (which is not
172 * possible with the ES1688). 172 * possible with the ES1688).
173 * Besides the separate recording level control for each input, the common 173 * Besides the separate recording level control for each input, the common
174 * recording level can also be controlled by RECLEV as described above. 174 * recording level can also be controlled by RECLEV as described above.
diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c
index 44357d877a27..09d46484bc1a 100644
--- a/sound/oss/swarm_cs4297a.c
+++ b/sound/oss/swarm_cs4297a.c
@@ -875,7 +875,7 @@ static void start_adc(struct cs4297a_state *s)
875 if (s->prop_adc.fmt & AFMT_S8 || s->prop_adc.fmt & AFMT_U8) { 875 if (s->prop_adc.fmt & AFMT_S8 || s->prop_adc.fmt & AFMT_U8) {
876 // 876 //
877 // now only use 16 bit capture, due to truncation issue 877 // now only use 16 bit capture, due to truncation issue
878 // in the chip, noticable distortion occurs. 878 // in the chip, noticeable distortion occurs.
879 // allocate buffer and then convert from 16 bit to 879 // allocate buffer and then convert from 16 bit to
880 // 8 bit for the user buffer. 880 // 8 bit for the user buffer.
881 // 881 //
diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c
index f0e0caa53200..12ba28e7b933 100644
--- a/sound/oss/vidc.c
+++ b/sound/oss/vidc.c
@@ -227,7 +227,7 @@ static int vidc_audio_set_speed(int dev, int rate)
227 } else { 227 } else {
228 /*printk("VIDC: internal %d %d %d\n", rate, rate_int, hwrate);*/ 228 /*printk("VIDC: internal %d %d %d\n", rate, rate_int, hwrate);*/
229 hwctrl=0x00000003; 229 hwctrl=0x00000003;
230 /* Allow rougly 0.4% tolerance */ 230 /* Allow roughly 0.4% tolerance */
231 if (diff_int > (rate/256)) 231 if (diff_int > (rate/256))
232 rate=rate_int; 232 rate=rate_int;
233 } 233 }
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index 4382d0fa6b9a..d8f6fd65ebbb 100644
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -29,7 +29,7 @@
29 * PM support 29 * PM support
30 * MIDI support 30 * MIDI support
31 * Game Port support 31 * Game Port support
32 * SG DMA support (this will need *alot* of work) 32 * SG DMA support (this will need *a lot* of work)
33 */ 33 */
34 34
35#include <linux/init.h> 35#include <linux/init.h>
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
index f53a31e939c1..f8ccc9677c6f 100644
--- a/sound/pci/asihpi/asihpi.c
+++ b/sound/pci/asihpi/asihpi.c
@@ -963,7 +963,7 @@ static int snd_card_asihpi_playback_open(struct snd_pcm_substream *substream)
963 963
964 /*? also check ASI5000 samplerate source 964 /*? also check ASI5000 samplerate source
965 If external, only support external rate. 965 If external, only support external rate.
966 If internal and other stream playing, cant switch 966 If internal and other stream playing, can't switch
967 */ 967 */
968 968
969 init_timer(&dpcm->timer); 969 init_timer(&dpcm->timer);
diff --git a/sound/pci/asihpi/hpi.h b/sound/pci/asihpi/hpi.h
index 6fc025c448de..255429c32c1c 100644
--- a/sound/pci/asihpi/hpi.h
+++ b/sound/pci/asihpi/hpi.h
@@ -725,7 +725,7 @@ enum HPI_AESEBU_ERRORS {
725#define HPI_PAD_TITLE_LEN 64 725#define HPI_PAD_TITLE_LEN 64
726/** The text string containing the comment. */ 726/** The text string containing the comment. */
727#define HPI_PAD_COMMENT_LEN 256 727#define HPI_PAD_COMMENT_LEN 256
728/** The PTY when the tuner has not recieved any PTY. */ 728/** The PTY when the tuner has not received any PTY. */
729#define HPI_PAD_PROGRAM_TYPE_INVALID 0xffff 729#define HPI_PAD_PROGRAM_TYPE_INVALID 0xffff
730/** \} */ 730/** \} */
731 731
diff --git a/sound/pci/asihpi/hpi6000.c b/sound/pci/asihpi/hpi6000.c
index 3e3c2ef6efd8..8c8aac4c567e 100644
--- a/sound/pci/asihpi/hpi6000.c
+++ b/sound/pci/asihpi/hpi6000.c
@@ -423,7 +423,7 @@ static void subsys_create_adapter(struct hpi_message *phm,
423 423
424 ao.priv = kzalloc(sizeof(struct hpi_hw_obj), GFP_KERNEL); 424 ao.priv = kzalloc(sizeof(struct hpi_hw_obj), GFP_KERNEL);
425 if (!ao.priv) { 425 if (!ao.priv) {
426 HPI_DEBUG_LOG(ERROR, "cant get mem for adapter object\n"); 426 HPI_DEBUG_LOG(ERROR, "can't get mem for adapter object\n");
427 phr->error = HPI_ERROR_MEMORY_ALLOC; 427 phr->error = HPI_ERROR_MEMORY_ALLOC;
428 return; 428 return;
429 } 429 }
diff --git a/sound/pci/asihpi/hpi6205.c b/sound/pci/asihpi/hpi6205.c
index 620525bdac59..22e9f08dea6d 100644
--- a/sound/pci/asihpi/hpi6205.c
+++ b/sound/pci/asihpi/hpi6205.c
@@ -466,7 +466,7 @@ static void subsys_create_adapter(struct hpi_message *phm,
466 466
467 ao.priv = kzalloc(sizeof(struct hpi_hw_obj), GFP_KERNEL); 467 ao.priv = kzalloc(sizeof(struct hpi_hw_obj), GFP_KERNEL);
468 if (!ao.priv) { 468 if (!ao.priv) {
469 HPI_DEBUG_LOG(ERROR, "cant get mem for adapter object\n"); 469 HPI_DEBUG_LOG(ERROR, "can't get mem for adapter object\n");
470 phr->error = HPI_ERROR_MEMORY_ALLOC; 470 phr->error = HPI_ERROR_MEMORY_ALLOC;
471 return; 471 return;
472 } 472 }
diff --git a/sound/pci/asihpi/hpi_internal.h b/sound/pci/asihpi/hpi_internal.h
index af678be0aa15..3b9fd115da36 100644
--- a/sound/pci/asihpi/hpi_internal.h
+++ b/sound/pci/asihpi/hpi_internal.h
@@ -607,7 +607,7 @@ struct hpi_data_compat32 {
607#endif 607#endif
608 608
609struct hpi_buffer { 609struct hpi_buffer {
610 /** placehoder for backward compatability (see dwBufferSize) */ 610 /** placehoder for backward compatibility (see dwBufferSize) */
611 struct hpi_msg_format reserved; 611 struct hpi_msg_format reserved;
612 u32 command; /**< HPI_BUFFER_CMD_xxx*/ 612 u32 command; /**< HPI_BUFFER_CMD_xxx*/
613 u32 pci_address; /**< PCI physical address of buffer for DSP DMA */ 613 u32 pci_address; /**< PCI physical address of buffer for DSP DMA */
diff --git a/sound/pci/asihpi/hpimsgx.c b/sound/pci/asihpi/hpimsgx.c
index bcbdf30a6aa0..360028b9abf5 100644
--- a/sound/pci/asihpi/hpimsgx.c
+++ b/sound/pci/asihpi/hpimsgx.c
@@ -722,7 +722,7 @@ static u16 HPIMSGX__init(struct hpi_message *phm,
722 return phr->error; 722 return phr->error;
723 } 723 }
724 if (hr.error == 0) { 724 if (hr.error == 0) {
725 /* the adapter was created succesfully 725 /* the adapter was created successfully
726 save the mapping for future use */ 726 save the mapping for future use */
727 hpi_entry_points[hr.u.s.adapter_index] = entry_point_func; 727 hpi_entry_points[hr.u.s.adapter_index] = entry_point_func;
728 /* prepare adapter (pre-open streams etc.) */ 728 /* prepare adapter (pre-open streams etc.) */
diff --git a/sound/pci/au88x0/au88x0.h b/sound/pci/au88x0/au88x0.h
index ecb8f4daf408..02f6e08f7592 100644
--- a/sound/pci/au88x0/au88x0.h
+++ b/sound/pci/au88x0/au88x0.h
@@ -104,7 +104,7 @@
104#define MIX_PLAYB(x) (vortex->mixplayb[x]) 104#define MIX_PLAYB(x) (vortex->mixplayb[x])
105#define MIX_SPDIF(x) (vortex->mixspdif[x]) 105#define MIX_SPDIF(x) (vortex->mixspdif[x])
106 106
107#define NR_WTPB 0x20 /* WT channels per eahc bank. */ 107#define NR_WTPB 0x20 /* WT channels per each bank. */
108 108
109/* Structs */ 109/* Structs */
110typedef struct { 110typedef struct {
diff --git a/sound/pci/au88x0/au88x0_a3d.c b/sound/pci/au88x0/au88x0_a3d.c
index f4aa8ff6f5f9..9ae8b3b17651 100644
--- a/sound/pci/au88x0/au88x0_a3d.c
+++ b/sound/pci/au88x0/au88x0_a3d.c
@@ -53,7 +53,7 @@ a3dsrc_GetTimeConsts(a3dsrc_t * a, short *HrtfTrack, short *ItdTrack,
53} 53}
54 54
55#endif 55#endif
56/* Atmospheric absorbtion. */ 56/* Atmospheric absorption. */
57 57
58static void 58static void
59a3dsrc_SetAtmosTarget(a3dsrc_t * a, short aa, short b, short c, short d, 59a3dsrc_SetAtmosTarget(a3dsrc_t * a, short aa, short b, short c, short d,
@@ -835,7 +835,7 @@ snd_vortex_a3d_filter_put(struct snd_kcontrol *kcontrol,
835 params[i] = ucontrol->value.integer.value[i]; 835 params[i] = ucontrol->value.integer.value[i];
836 /* Translate generic filter params to a3d filter params. */ 836 /* Translate generic filter params to a3d filter params. */
837 vortex_a3d_translate_filter(a->filter, params); 837 vortex_a3d_translate_filter(a->filter, params);
838 /* Atmospheric absorbtion and filtering. */ 838 /* Atmospheric absorption and filtering. */
839 a3dsrc_SetAtmosTarget(a, a->filter[0], 839 a3dsrc_SetAtmosTarget(a, a->filter[0],
840 a->filter[1], a->filter[2], 840 a->filter[1], a->filter[2],
841 a->filter[3], a->filter[4]); 841 a->filter[3], a->filter[4]);
diff --git a/sound/pci/au88x0/au88x0_pcm.c b/sound/pci/au88x0/au88x0_pcm.c
index 5439d662d104..33f0ba5559a7 100644
--- a/sound/pci/au88x0/au88x0_pcm.c
+++ b/sound/pci/au88x0/au88x0_pcm.c
@@ -515,7 +515,7 @@ static int __devinit snd_vortex_new_pcm(vortex_t *chip, int idx, int nr)
515 return -ENODEV; 515 return -ENODEV;
516 516
517 /* idx indicates which kind of PCM device. ADB, SPDIF, I2S and A3D share the 517 /* idx indicates which kind of PCM device. ADB, SPDIF, I2S and A3D share the
518 * same dma engine. WT uses it own separate dma engine whcih cant capture. */ 518 * same dma engine. WT uses it own separate dma engine which can't capture. */
519 if (idx == VORTEX_PCM_ADB) 519 if (idx == VORTEX_PCM_ADB)
520 nr_capt = nr; 520 nr_capt = nr;
521 else 521 else
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c
index 5715c4d05573..9b7a6346037a 100644
--- a/sound/pci/azt3328.c
+++ b/sound/pci/azt3328.c
@@ -140,7 +140,7 @@
140 * Possible remedies: 140 * Possible remedies:
141 * - use speaker (amplifier) output instead of headphone output 141 * - use speaker (amplifier) output instead of headphone output
142 * (in case crackling is due to overloaded output clipping) 142 * (in case crackling is due to overloaded output clipping)
143 * - plug card into a different PCI slot, preferrably one that isn't shared 143 * - plug card into a different PCI slot, preferably one that isn't shared
144 * too much (this helps a lot, but not completely!) 144 * too much (this helps a lot, but not completely!)
145 * - get rid of PCI VGA card, use AGP instead 145 * - get rid of PCI VGA card, use AGP instead
146 * - upgrade or downgrade BIOS 146 * - upgrade or downgrade BIOS
diff --git a/sound/pci/ca0106/ca0106.h b/sound/pci/ca0106/ca0106.h
index fc53b9bca26d..e8e8ccc96403 100644
--- a/sound/pci/ca0106/ca0106.h
+++ b/sound/pci/ca0106/ca0106.h
@@ -51,7 +51,7 @@
51 * Add support for mute control on SB Live 24bit (cards w/ SPI DAC) 51 * Add support for mute control on SB Live 24bit (cards w/ SPI DAC)
52 * 52 *
53 * 53 *
54 * This code was initally based on code from ALSA's emu10k1x.c which is: 54 * This code was initially based on code from ALSA's emu10k1x.c which is:
55 * Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com> 55 * Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com>
56 * 56 *
57 * This program is free software; you can redistribute it and/or modify 57 * This program is free software; you can redistribute it and/or modify
@@ -175,7 +175,7 @@
175/* CA0106 pointer-offset register set, accessed through the PTR and DATA registers */ 175/* CA0106 pointer-offset register set, accessed through the PTR and DATA registers */
176/********************************************************************************************************/ 176/********************************************************************************************************/
177 177
178/* Initally all registers from 0x00 to 0x3f have zero contents. */ 178/* Initially all registers from 0x00 to 0x3f have zero contents. */
179#define PLAYBACK_LIST_ADDR 0x00 /* Base DMA address of a list of pointers to each period/size */ 179#define PLAYBACK_LIST_ADDR 0x00 /* Base DMA address of a list of pointers to each period/size */
180 /* One list entry: 4 bytes for DMA address, 180 /* One list entry: 4 bytes for DMA address,
181 * 4 bytes for period_size << 16. 181 * 4 bytes for period_size << 16.
@@ -223,7 +223,7 @@
223 * The jack has 4 poles. I will call 1 - Tip, 2 - Next to 1, 3 - Next to 2, 4 - Next to 3 223 * The jack has 4 poles. I will call 1 - Tip, 2 - Next to 1, 3 - Next to 2, 4 - Next to 3
224 * For Analogue: 1 -> Center Speaker, 2 -> Sub Woofer, 3 -> Ground, 4 -> Ground 224 * For Analogue: 1 -> Center Speaker, 2 -> Sub Woofer, 3 -> Ground, 4 -> Ground
225 * For Digital: 1 -> Front SPDIF, 2 -> Rear SPDIF, 3 -> Center/Subwoofer SPDIF, 4 -> Ground. 225 * For Digital: 1 -> Front SPDIF, 2 -> Rear SPDIF, 3 -> Center/Subwoofer SPDIF, 4 -> Ground.
226 * Standard 4 pole Video A/V cable with RCA outputs: 1 -> White, 2 -> Yellow, 3 -> Sheild on all three, 4 -> Red. 226 * Standard 4 pole Video A/V cable with RCA outputs: 1 -> White, 2 -> Yellow, 3 -> Shield on all three, 4 -> Red.
227 * So, from this you can see that you cannot use a Standard 4 pole Video A/V cable with the SB Audigy LS card. 227 * So, from this you can see that you cannot use a Standard 4 pole Video A/V cable with the SB Audigy LS card.
228 */ 228 */
229/* The Front SPDIF PCM gets mixed with samples from the AC97 codec, so can only work for Stereo PCM and not AC3/DTS 229/* The Front SPDIF PCM gets mixed with samples from the AC97 codec, so can only work for Stereo PCM and not AC3/DTS
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 01b49388fafd..437759239694 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -117,7 +117,7 @@
117 * DAC: Unknown 117 * DAC: Unknown
118 * Trying to handle it like the SB0410. 118 * Trying to handle it like the SB0410.
119 * 119 *
120 * This code was initally based on code from ALSA's emu10k1x.c which is: 120 * This code was initially based on code from ALSA's emu10k1x.c which is:
121 * Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com> 121 * Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com>
122 * 122 *
123 * This program is free software; you can redistribute it and/or modify 123 * This program is free software; you can redistribute it and/or modify
diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c
index 630aa4998189..84f3f92436b5 100644
--- a/sound/pci/ca0106/ca0106_mixer.c
+++ b/sound/pci/ca0106/ca0106_mixer.c
@@ -42,7 +42,7 @@
42 * 0.0.18 42 * 0.0.18
43 * Add support for mute control on SB Live 24bit (cards w/ SPI DAC) 43 * Add support for mute control on SB Live 24bit (cards w/ SPI DAC)
44 * 44 *
45 * This code was initally based on code from ALSA's emu10k1x.c which is: 45 * This code was initially based on code from ALSA's emu10k1x.c which is:
46 * Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com> 46 * Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com>
47 * 47 *
48 * This program is free software; you can redistribute it and/or modify 48 * This program is free software; you can redistribute it and/or modify
diff --git a/sound/pci/ca0106/ca0106_proc.c b/sound/pci/ca0106/ca0106_proc.c
index ba96428c9f4c..c694464b1168 100644
--- a/sound/pci/ca0106/ca0106_proc.c
+++ b/sound/pci/ca0106/ca0106_proc.c
@@ -42,7 +42,7 @@
42 * 0.0.18 42 * 0.0.18
43 * Implement support for Line-in capture on SB Live 24bit. 43 * Implement support for Line-in capture on SB Live 24bit.
44 * 44 *
45 * This code was initally based on code from ALSA's emu10k1x.c which is: 45 * This code was initially based on code from ALSA's emu10k1x.c which is:
46 * Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com> 46 * Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com>
47 * 47 *
48 * This program is free software; you can redistribute it and/or modify 48 * This program is free software; you can redistribute it and/or modify
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index b5bb036ef73c..f4e573555da3 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -73,7 +73,7 @@ MODULE_PARM_DESC(mpu_port, "MPU-401 port.");
73module_param_array(fm_port, long, NULL, 0444); 73module_param_array(fm_port, long, NULL, 0444);
74MODULE_PARM_DESC(fm_port, "FM port."); 74MODULE_PARM_DESC(fm_port, "FM port.");
75module_param_array(soft_ac3, bool, NULL, 0444); 75module_param_array(soft_ac3, bool, NULL, 0444);
76MODULE_PARM_DESC(soft_ac3, "Sofware-conversion of raw SPDIF packets (model 033 only)."); 76MODULE_PARM_DESC(soft_ac3, "Software-conversion of raw SPDIF packets (model 033 only).");
77#ifdef SUPPORT_JOYSTICK 77#ifdef SUPPORT_JOYSTICK
78module_param_array(joystick_port, int, NULL, 0444); 78module_param_array(joystick_port, int, NULL, 0444);
79MODULE_PARM_DESC(joystick_port, "Joystick port address."); 79MODULE_PARM_DESC(joystick_port, "Joystick port address.");
@@ -656,8 +656,8 @@ out:
656} 656}
657 657
658/* 658/*
659 * Program pll register bits, I assume that the 8 registers 0xf8 upto 0xff 659 * Program pll register bits, I assume that the 8 registers 0xf8 up to 0xff
660 * are mapped onto the 8 ADC/DAC sampling frequency which can be choosen 660 * are mapped onto the 8 ADC/DAC sampling frequency which can be chosen
661 * at the register CM_REG_FUNCTRL1 (0x04). 661 * at the register CM_REG_FUNCTRL1 (0x04).
662 * Problem: other ways are also possible (any information about that?) 662 * Problem: other ways are also possible (any information about that?)
663 */ 663 */
@@ -666,7 +666,7 @@ static void snd_cmipci_set_pll(struct cmipci *cm, unsigned int rate, unsigned in
666 unsigned int reg = CM_REG_PLL + slot; 666 unsigned int reg = CM_REG_PLL + slot;
667 /* 667 /*
668 * Guess that this programs at reg. 0x04 the pos 15:13/12:10 668 * Guess that this programs at reg. 0x04 the pos 15:13/12:10
669 * for DSFC/ASFC (000 upto 111). 669 * for DSFC/ASFC (000 up to 111).
670 */ 670 */
671 671
672 /* FIXME: Init (Do we've to set an other register first before programming?) */ 672 /* FIXME: Init (Do we've to set an other register first before programming?) */
diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
index b9321544c31c..13f33c0719d3 100644
--- a/sound/pci/ctxfi/ctatc.c
+++ b/sound/pci/ctxfi/ctatc.c
@@ -1627,7 +1627,7 @@ static struct ct_atc atc_preset __devinitdata = {
1627 * Creates and initializes a hardware manager. 1627 * Creates and initializes a hardware manager.
1628 * 1628 *
1629 * Creates kmallocated ct_atc structure. Initializes hardware. 1629 * Creates kmallocated ct_atc structure. Initializes hardware.
1630 * Returns 0 if suceeds, or negative error code if fails. 1630 * Returns 0 if succeeds, or negative error code if fails.
1631 */ 1631 */
1632 1632
1633int __devinit ct_atc_create(struct snd_card *card, struct pci_dev *pci, 1633int __devinit ct_atc_create(struct snd_card *card, struct pci_dev *pci,
diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c
index 0cf400f879f9..a5c957db5cea 100644
--- a/sound/pci/ctxfi/cthw20k1.c
+++ b/sound/pci/ctxfi/cthw20k1.c
@@ -1285,7 +1285,7 @@ static int hw_trn_init(struct hw *hw, const struct trn_conf *info)
1285 hw_write_20kx(hw, PTPALX, ptp_phys_low); 1285 hw_write_20kx(hw, PTPALX, ptp_phys_low);
1286 hw_write_20kx(hw, PTPAHX, ptp_phys_high); 1286 hw_write_20kx(hw, PTPAHX, ptp_phys_high);
1287 hw_write_20kx(hw, TRNCTL, trnctl); 1287 hw_write_20kx(hw, TRNCTL, trnctl);
1288 hw_write_20kx(hw, TRNIS, 0x200c01); /* realy needed? */ 1288 hw_write_20kx(hw, TRNIS, 0x200c01); /* really needed? */
1289 1289
1290 return 0; 1290 return 0;
1291} 1291}
diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c
index 957a311514c8..c250614dadd0 100644
--- a/sound/pci/emu10k1/memory.c
+++ b/sound/pci/emu10k1/memory.c
@@ -248,7 +248,7 @@ static int is_valid_page(struct snd_emu10k1 *emu, dma_addr_t addr)
248/* 248/*
249 * map the given memory block on PTB. 249 * map the given memory block on PTB.
250 * if the block is already mapped, update the link order. 250 * if the block is already mapped, update the link order.
251 * if no empty pages are found, tries to release unsed memory blocks 251 * if no empty pages are found, tries to release unused memory blocks
252 * and retry the mapping. 252 * and retry the mapping.
253 */ 253 */
254int snd_emu10k1_memblk_map(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *blk) 254int snd_emu10k1_memblk_map(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *blk)
diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c
index 61b8ab39800f..a81dc44228ea 100644
--- a/sound/pci/emu10k1/p16v.c
+++ b/sound/pci/emu10k1/p16v.c
@@ -69,7 +69,7 @@
69 * ADC: Philips 1361T (Stereo 24bit) 69 * ADC: Philips 1361T (Stereo 24bit)
70 * DAC: CS4382-K (8-channel, 24bit, 192Khz) 70 * DAC: CS4382-K (8-channel, 24bit, 192Khz)
71 * 71 *
72 * This code was initally based on code from ALSA's emu10k1x.c which is: 72 * This code was initially based on code from ALSA's emu10k1x.c which is:
73 * Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com> 73 * Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com>
74 * 74 *
75 * This program is free software; you can redistribute it and/or modify 75 * This program is free software; you can redistribute it and/or modify
diff --git a/sound/pci/emu10k1/p16v.h b/sound/pci/emu10k1/p16v.h
index 00f4817533b1..4e0ee1a9747a 100644
--- a/sound/pci/emu10k1/p16v.h
+++ b/sound/pci/emu10k1/p16v.h
@@ -59,7 +59,7 @@
59 * ADC: Philips 1361T (Stereo 24bit) 59 * ADC: Philips 1361T (Stereo 24bit)
60 * DAC: CS4382-K (8-channel, 24bit, 192Khz) 60 * DAC: CS4382-K (8-channel, 24bit, 192Khz)
61 * 61 *
62 * This code was initally based on code from ALSA's emu10k1x.c which is: 62 * This code was initially based on code from ALSA's emu10k1x.c which is:
63 * Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com> 63 * Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com>
64 * 64 *
65 * This program is free software; you can redistribute it and/or modify 65 * This program is free software; you can redistribute it and/or modify
@@ -86,7 +86,7 @@
86 * The sample rate is also controlled by the same registers that control the rate of the EMU10K2 sample rate converters. 86 * The sample rate is also controlled by the same registers that control the rate of the EMU10K2 sample rate converters.
87 */ 87 */
88 88
89/* Initally all registers from 0x00 to 0x3f have zero contents. */ 89/* Initially all registers from 0x00 to 0x3f have zero contents. */
90#define PLAYBACK_LIST_ADDR 0x00 /* Base DMA address of a list of pointers to each period/size */ 90#define PLAYBACK_LIST_ADDR 0x00 /* Base DMA address of a list of pointers to each period/size */
91 /* One list entry: 4 bytes for DMA address, 91 /* One list entry: 4 bytes for DMA address,
92 * 4 bytes for period_size << 16. 92 * 4 bytes for period_size << 16.
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 2c79e96d0324..430f41db6044 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -3661,7 +3661,7 @@ int snd_hda_codec_build_pcms(struct hda_codec *codec)
3661 * with the proper parameters for set up. 3661 * with the proper parameters for set up.
3662 * ops.cleanup should be called in hw_free for clean up of streams. 3662 * ops.cleanup should be called in hw_free for clean up of streams.
3663 * 3663 *
3664 * This function returns 0 if successfull, or a negative error code. 3664 * This function returns 0 if successful, or a negative error code.
3665 */ 3665 */
3666int __devinit snd_hda_build_pcms(struct hda_bus *bus) 3666int __devinit snd_hda_build_pcms(struct hda_bus *bus)
3667{ 3667{
@@ -4851,7 +4851,7 @@ EXPORT_SYMBOL_HDA(snd_hda_suspend);
4851 * 4851 *
4852 * Returns 0 if successful. 4852 * Returns 0 if successful.
4853 * 4853 *
4854 * This fucntion is defined only when POWER_SAVE isn't set. 4854 * This function is defined only when POWER_SAVE isn't set.
4855 * In the power-save mode, the codec is resumed dynamically. 4855 * In the power-save mode, the codec is resumed dynamically.
4856 */ 4856 */
4857int snd_hda_resume(struct hda_bus *bus) 4857int snd_hda_resume(struct hda_bus *bus)
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 12c6f4508c54..7e28a64884f6 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -549,7 +549,7 @@ static int alc_ch_mode_put(struct snd_kcontrol *kcontrol,
549 549
550/* 550/*
551 * Control the mode of pin widget settings via the mixer. "pc" is used 551 * Control the mode of pin widget settings via the mixer. "pc" is used
552 * instead of "%" to avoid consequences of accidently treating the % as 552 * instead of "%" to avoid consequences of accidentally treating the % as
553 * being part of a format specifier. Maximum allowed length of a value is 553 * being part of a format specifier. Maximum allowed length of a value is
554 * 63 characters plus NULL terminator. 554 * 63 characters plus NULL terminator.
555 * 555 *
@@ -9836,7 +9836,7 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = {
9836 9836
9837 SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL), 9837 SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL),
9838 9838
9839 SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavillion", ALC883_6ST_DIG), 9839 SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavilion", ALC883_6ST_DIG),
9840 SND_PCI_QUIRK(0x103c, 0x2a4f, "HP Samba", ALC888_3ST_HP), 9840 SND_PCI_QUIRK(0x103c, 0x2a4f, "HP Samba", ALC888_3ST_HP),
9841 SND_PCI_QUIRK(0x103c, 0x2a60, "HP Lucknow", ALC888_3ST_HP), 9841 SND_PCI_QUIRK(0x103c, 0x2a60, "HP Lucknow", ALC888_3ST_HP),
9842 SND_PCI_QUIRK(0x103c, 0x2a61, "HP Nettle", ALC883_6ST_DIG), 9842 SND_PCI_QUIRK(0x103c, 0x2a61, "HP Nettle", ALC883_6ST_DIG),
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 05fcd60cc46f..1395991c39f2 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -2475,7 +2475,7 @@ static int stac92xx_hp_switch_put(struct snd_kcontrol *kcontrol,
2475 2475
2476 spec->hp_switch = ucontrol->value.integer.value[0] ? nid : 0; 2476 spec->hp_switch = ucontrol->value.integer.value[0] ? nid : 0;
2477 2477
2478 /* check to be sure that the ports are upto date with 2478 /* check to be sure that the ports are up to date with
2479 * switch changes 2479 * switch changes
2480 */ 2480 */
2481 stac_issue_unsol_event(codec, nid); 2481 stac_issue_unsol_event(codec, nid);
diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c
index 2f6252266a02..3e4f8c12ffce 100644
--- a/sound/pci/ice1712/aureon.c
+++ b/sound/pci/ice1712/aureon.c
@@ -148,7 +148,7 @@ static void aureon_pca9554_write(struct snd_ice1712 *ice, unsigned char reg,
148 udelay(100); 148 udelay(100);
149 /* 149 /*
150 * send device address, command and value, 150 * send device address, command and value,
151 * skipping ack cycles inbetween 151 * skipping ack cycles in between
152 */ 152 */
153 for (j = 0; j < 3; j++) { 153 for (j = 0; j < 3; j++) {
154 switch (j) { 154 switch (j) {
@@ -2143,7 +2143,7 @@ static int __devinit aureon_init(struct snd_ice1712 *ice)
2143 ice->num_total_adcs = 2; 2143 ice->num_total_adcs = 2;
2144 } 2144 }
2145 2145
2146 /* to remeber the register values of CS8415 */ 2146 /* to remember the register values of CS8415 */
2147 ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL); 2147 ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL);
2148 if (!ice->akm) 2148 if (!ice->akm)
2149 return -ENOMEM; 2149 return -ENOMEM;
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 4fc6d8bc637e..f4594d76b6ea 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -2755,7 +2755,7 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
2755 return err; 2755 return err;
2756 } 2756 }
2757 if (c->mpu401_1_name) 2757 if (c->mpu401_1_name)
2758 /* Prefered name available in card_info */ 2758 /* Preferred name available in card_info */
2759 snprintf(ice->rmidi[0]->name, 2759 snprintf(ice->rmidi[0]->name,
2760 sizeof(ice->rmidi[0]->name), 2760 sizeof(ice->rmidi[0]->name),
2761 "%s %d", c->mpu401_1_name, card->number); 2761 "%s %d", c->mpu401_1_name, card->number);
@@ -2772,7 +2772,7 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
2772 return err; 2772 return err;
2773 } 2773 }
2774 if (c->mpu401_2_name) 2774 if (c->mpu401_2_name)
2775 /* Prefered name available in card_info */ 2775 /* Preferred name available in card_info */
2776 snprintf(ice->rmidi[1]->name, 2776 snprintf(ice->rmidi[1]->name,
2777 sizeof(ice->rmidi[1]->name), 2777 sizeof(ice->rmidi[1]->name),
2778 "%s %d", c->mpu401_2_name, 2778 "%s %d", c->mpu401_2_name,
diff --git a/sound/pci/ice1712/pontis.c b/sound/pci/ice1712/pontis.c
index cdb873f5da50..92c1160d7ab5 100644
--- a/sound/pci/ice1712/pontis.c
+++ b/sound/pci/ice1712/pontis.c
@@ -768,7 +768,7 @@ static int __devinit pontis_init(struct snd_ice1712 *ice)
768 ice->num_total_dacs = 2; 768 ice->num_total_dacs = 2;
769 ice->num_total_adcs = 2; 769 ice->num_total_adcs = 2;
770 770
771 /* to remeber the register values */ 771 /* to remember the register values */
772 ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL); 772 ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL);
773 if (! ice->akm) 773 if (! ice->akm)
774 return -ENOMEM; 774 return -ENOMEM;
diff --git a/sound/pci/ice1712/prodigy_hifi.c b/sound/pci/ice1712/prodigy_hifi.c
index 6a9fee3ee78f..764cc93dbca4 100644
--- a/sound/pci/ice1712/prodigy_hifi.c
+++ b/sound/pci/ice1712/prodigy_hifi.c
@@ -1046,7 +1046,7 @@ static int __devinit prodigy_hifi_init(struct snd_ice1712 *ice)
1046 * don't call snd_ice1712_gpio_get/put(), otherwise it's overwritten 1046 * don't call snd_ice1712_gpio_get/put(), otherwise it's overwritten
1047 */ 1047 */
1048 ice->gpio.saved[0] = 0; 1048 ice->gpio.saved[0] = 0;
1049 /* to remeber the register values */ 1049 /* to remember the register values */
1050 1050
1051 ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL); 1051 ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL);
1052 if (! ice->akm) 1052 if (! ice->akm)
@@ -1128,7 +1128,7 @@ static int __devinit prodigy_hd2_init(struct snd_ice1712 *ice)
1128 * don't call snd_ice1712_gpio_get/put(), otherwise it's overwritten 1128 * don't call snd_ice1712_gpio_get/put(), otherwise it's overwritten
1129 */ 1129 */
1130 ice->gpio.saved[0] = 0; 1130 ice->gpio.saved[0] = 0;
1131 /* to remeber the register values */ 1131 /* to remember the register values */
1132 1132
1133 ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL); 1133 ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL);
1134 if (! ice->akm) 1134 if (! ice->akm)
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 629a5494347a..6c896dbfd796 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -534,7 +534,7 @@ static int snd_intel8x0_codec_semaphore(struct intel8x0 *chip, unsigned int code
534 udelay(10); 534 udelay(10);
535 } while (time--); 535 } while (time--);
536 536
537 /* access to some forbidden (non existant) ac97 registers will not 537 /* access to some forbidden (non existent) ac97 registers will not
538 * reset the semaphore. So even if you don't get the semaphore, still 538 * reset the semaphore. So even if you don't get the semaphore, still
539 * continue the access. We don't need the semaphore anyway. */ 539 * continue the access. We don't need the semaphore anyway. */
540 snd_printk(KERN_ERR "codec_semaphore: semaphore is not ready [0x%x][0x%x]\n", 540 snd_printk(KERN_ERR "codec_semaphore: semaphore is not ready [0x%x][0x%x]\n",
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c
index 2ae8d29500a8..27709f0cd2a6 100644
--- a/sound/pci/intel8x0m.c
+++ b/sound/pci/intel8x0m.c
@@ -331,7 +331,7 @@ static int snd_intel8x0m_codec_semaphore(struct intel8x0m *chip, unsigned int co
331 udelay(10); 331 udelay(10);
332 } while (time--); 332 } while (time--);
333 333
334 /* access to some forbidden (non existant) ac97 registers will not 334 /* access to some forbidden (non existent) ac97 registers will not
335 * reset the semaphore. So even if you don't get the semaphore, still 335 * reset the semaphore. So even if you don't get the semaphore, still
336 * continue the access. We don't need the semaphore anyway. */ 336 * continue the access. We don't need the semaphore anyway. */
337 snd_printk(KERN_ERR "codec_semaphore: semaphore is not ready [0x%x][0x%x]\n", 337 snd_printk(KERN_ERR "codec_semaphore: semaphore is not ready [0x%x][0x%x]\n",
diff --git a/sound/pci/mixart/mixart_core.c b/sound/pci/mixart/mixart_core.c
index d3350f383966..3df0f530f67c 100644
--- a/sound/pci/mixart/mixart_core.c
+++ b/sound/pci/mixart/mixart_core.c
@@ -265,7 +265,7 @@ int snd_mixart_send_msg(struct mixart_mgr *mgr, struct mixart_msg *request, int
265 if (! timeout) { 265 if (! timeout) {
266 /* error - no ack */ 266 /* error - no ack */
267 mutex_unlock(&mgr->msg_mutex); 267 mutex_unlock(&mgr->msg_mutex);
268 snd_printk(KERN_ERR "error: no reponse on msg %x\n", msg_frame); 268 snd_printk(KERN_ERR "error: no response on msg %x\n", msg_frame);
269 return -EIO; 269 return -EIO;
270 } 270 }
271 271
@@ -278,7 +278,7 @@ int snd_mixart_send_msg(struct mixart_mgr *mgr, struct mixart_msg *request, int
278 err = get_msg(mgr, &resp, msg_frame); 278 err = get_msg(mgr, &resp, msg_frame);
279 279
280 if( request->message_id != resp.message_id ) 280 if( request->message_id != resp.message_id )
281 snd_printk(KERN_ERR "REPONSE ERROR!\n"); 281 snd_printk(KERN_ERR "RESPONSE ERROR!\n");
282 282
283 mutex_unlock(&mgr->msg_mutex); 283 mutex_unlock(&mgr->msg_mutex);
284 return err; 284 return err;
diff --git a/sound/pci/pcxhr/pcxhr_core.c b/sound/pci/pcxhr/pcxhr_core.c
index 833e7180ad2d..304411c1fe4b 100644
--- a/sound/pci/pcxhr/pcxhr_core.c
+++ b/sound/pci/pcxhr/pcxhr_core.c
@@ -1042,11 +1042,11 @@ void pcxhr_msg_tasklet(unsigned long arg)
1042 int i, j; 1042 int i, j;
1043 1043
1044 if (mgr->src_it_dsp & PCXHR_IRQ_FREQ_CHANGE) 1044 if (mgr->src_it_dsp & PCXHR_IRQ_FREQ_CHANGE)
1045 snd_printdd("TASKLET : PCXHR_IRQ_FREQ_CHANGE event occured\n"); 1045 snd_printdd("TASKLET : PCXHR_IRQ_FREQ_CHANGE event occurred\n");
1046 if (mgr->src_it_dsp & PCXHR_IRQ_TIME_CODE) 1046 if (mgr->src_it_dsp & PCXHR_IRQ_TIME_CODE)
1047 snd_printdd("TASKLET : PCXHR_IRQ_TIME_CODE event occured\n"); 1047 snd_printdd("TASKLET : PCXHR_IRQ_TIME_CODE event occurred\n");
1048 if (mgr->src_it_dsp & PCXHR_IRQ_NOTIFY) 1048 if (mgr->src_it_dsp & PCXHR_IRQ_NOTIFY)
1049 snd_printdd("TASKLET : PCXHR_IRQ_NOTIFY event occured\n"); 1049 snd_printdd("TASKLET : PCXHR_IRQ_NOTIFY event occurred\n");
1050 if (mgr->src_it_dsp & (PCXHR_IRQ_FREQ_CHANGE | PCXHR_IRQ_TIME_CODE)) { 1050 if (mgr->src_it_dsp & (PCXHR_IRQ_FREQ_CHANGE | PCXHR_IRQ_TIME_CODE)) {
1051 /* clear events FREQ_CHANGE and TIME_CODE */ 1051 /* clear events FREQ_CHANGE and TIME_CODE */
1052 pcxhr_init_rmh(prmh, CMD_TEST_IT); 1052 pcxhr_init_rmh(prmh, CMD_TEST_IT);
@@ -1055,7 +1055,7 @@ void pcxhr_msg_tasklet(unsigned long arg)
1055 err, prmh->stat[0]); 1055 err, prmh->stat[0]);
1056 } 1056 }
1057 if (mgr->src_it_dsp & PCXHR_IRQ_ASYNC) { 1057 if (mgr->src_it_dsp & PCXHR_IRQ_ASYNC) {
1058 snd_printdd("TASKLET : PCXHR_IRQ_ASYNC event occured\n"); 1058 snd_printdd("TASKLET : PCXHR_IRQ_ASYNC event occurred\n");
1059 1059
1060 pcxhr_init_rmh(prmh, CMD_ASYNC); 1060 pcxhr_init_rmh(prmh, CMD_ASYNC);
1061 prmh->cmd[0] |= 1; /* add SEL_ASYNC_EVENTS */ 1061 prmh->cmd[0] |= 1; /* add SEL_ASYNC_EVENTS */
@@ -1233,7 +1233,7 @@ irqreturn_t pcxhr_interrupt(int irq, void *dev_id)
1233 reg = PCXHR_INPL(mgr, PCXHR_PLX_L2PCIDB); 1233 reg = PCXHR_INPL(mgr, PCXHR_PLX_L2PCIDB);
1234 PCXHR_OUTPL(mgr, PCXHR_PLX_L2PCIDB, reg); 1234 PCXHR_OUTPL(mgr, PCXHR_PLX_L2PCIDB, reg);
1235 1235
1236 /* timer irq occured */ 1236 /* timer irq occurred */
1237 if (reg & PCXHR_IRQ_TIMER) { 1237 if (reg & PCXHR_IRQ_TIMER) {
1238 int timer_toggle = reg & PCXHR_IRQ_TIMER; 1238 int timer_toggle = reg & PCXHR_IRQ_TIMER;
1239 /* is a 24 bit counter */ 1239 /* is a 24 bit counter */
@@ -1288,7 +1288,7 @@ irqreturn_t pcxhr_interrupt(int irq, void *dev_id)
1288 if (reg & PCXHR_IRQ_MASK) { 1288 if (reg & PCXHR_IRQ_MASK) {
1289 if (reg & PCXHR_IRQ_ASYNC) { 1289 if (reg & PCXHR_IRQ_ASYNC) {
1290 /* as we didn't request any async notifications, 1290 /* as we didn't request any async notifications,
1291 * some kind of xrun error will probably occured 1291 * some kind of xrun error will probably occurred
1292 */ 1292 */
1293 /* better resynchronize all streams next interrupt : */ 1293 /* better resynchronize all streams next interrupt : */
1294 mgr->dsp_time_last = PCXHR_DSP_TIME_INVALID; 1294 mgr->dsp_time_last = PCXHR_DSP_TIME_INVALID;
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c
index d5f5b440fc40..9ff247fc8871 100644
--- a/sound/pci/rme96.c
+++ b/sound/pci/rme96.c
@@ -150,7 +150,7 @@ MODULE_PARM_DESC(enable, "Enable RME Digi96 soundcard.");
150#define RME96_RCR_BITPOS_F1 28 150#define RME96_RCR_BITPOS_F1 28
151#define RME96_RCR_BITPOS_F2 29 151#define RME96_RCR_BITPOS_F2 29
152 152
153/* Additonal register bits */ 153/* Additional register bits */
154#define RME96_AR_WSEL (1 << 0) 154#define RME96_AR_WSEL (1 << 0)
155#define RME96_AR_ANALOG (1 << 1) 155#define RME96_AR_ANALOG (1 << 1)
156#define RME96_AR_FREQPAD_0 (1 << 2) 156#define RME96_AR_FREQPAD_0 (1 << 2)
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index a323eafb9e03..949691a876d3 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -391,7 +391,7 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
391 391
392/* Status2 Register bits */ /* MADI ONLY */ 392/* Status2 Register bits */ /* MADI ONLY */
393 393
394#define HDSPM_version0 (1<<0) /* not realy defined but I guess */ 394#define HDSPM_version0 (1<<0) /* not really defined but I guess */
395#define HDSPM_version1 (1<<1) /* in former cards it was ??? */ 395#define HDSPM_version1 (1<<1) /* in former cards it was ??? */
396#define HDSPM_version2 (1<<2) 396#define HDSPM_version2 (1<<2)
397 397
@@ -936,7 +936,7 @@ struct hdspm {
936 struct snd_kcontrol *playback_mixer_ctls[HDSPM_MAX_CHANNELS]; 936 struct snd_kcontrol *playback_mixer_ctls[HDSPM_MAX_CHANNELS];
937 /* but input to much, so not used */ 937 /* but input to much, so not used */
938 struct snd_kcontrol *input_mixer_ctls[HDSPM_MAX_CHANNELS]; 938 struct snd_kcontrol *input_mixer_ctls[HDSPM_MAX_CHANNELS];
939 /* full mixer accessable over mixer ioctl or hwdep-device */ 939 /* full mixer accessible over mixer ioctl or hwdep-device */
940 struct hdspm_mixer *mixer; 940 struct hdspm_mixer *mixer;
941 941
942 struct hdspm_tco *tco; /* NULL if no TCO detected */ 942 struct hdspm_tco *tco; /* NULL if no TCO detected */
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c
index 1b8f6742b5fa..2b5c7a95ae1f 100644
--- a/sound/pci/sis7019.c
+++ b/sound/pci/sis7019.c
@@ -308,7 +308,7 @@ static irqreturn_t sis_interrupt(int irq, void *dev)
308 u32 intr, status; 308 u32 intr, status;
309 309
310 /* We only use the DMA interrupts, and we don't enable any other 310 /* We only use the DMA interrupts, and we don't enable any other
311 * source of interrupts. But, it is possible to see an interupt 311 * source of interrupts. But, it is possible to see an interrupt
312 * status that didn't actually interrupt us, so eliminate anything 312 * status that didn't actually interrupt us, so eliminate anything
313 * we're not expecting to avoid falsely claiming an IRQ, and an 313 * we're not expecting to avoid falsely claiming an IRQ, and an
314 * ensuing endless loop. 314 * ensuing endless loop.
@@ -773,7 +773,7 @@ static void sis_prepare_timing_voice(struct voice *voice,
773 vperiod = 0; 773 vperiod = 0;
774 } 774 }
775 775
776 /* The interrupt handler implements the timing syncronization, so 776 /* The interrupt handler implements the timing synchronization, so
777 * setup its state. 777 * setup its state.
778 */ 778 */
779 timing->flags |= VOICE_SYNC_TIMING; 779 timing->flags |= VOICE_SYNC_TIMING;
@@ -1139,7 +1139,7 @@ static int sis_chip_init(struct sis7019 *sis)
1139 */ 1139 */
1140 outl(SIS_DMA_CSR_PCI_SETTINGS, io + SIS_DMA_CSR); 1140 outl(SIS_DMA_CSR_PCI_SETTINGS, io + SIS_DMA_CSR);
1141 1141
1142 /* Reset the syncronization groups for all of the channels 1142 /* Reset the synchronization groups for all of the channels
1143 * to be asyncronous. If we start doing SPDIF or 5.1 sound, etc. 1143 * to be asyncronous. If we start doing SPDIF or 5.1 sound, etc.
1144 * we'll need to change how we handle these. Until then, we just 1144 * we'll need to change how we handle these. Until then, we just
1145 * assign sub-mixer 0 to all playback channels, and avoid any 1145 * assign sub-mixer 0 to all playback channels, and avoid any
diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c
index edce8a27e3ee..bc823a547550 100644
--- a/sound/ppc/snd_ps3.c
+++ b/sound/ppc/snd_ps3.c
@@ -358,7 +358,7 @@ static irqreturn_t snd_ps3_interrupt(int irq, void *dev_id)
358 * filling dummy data, serial automatically start to 358 * filling dummy data, serial automatically start to
359 * consume them and then will generate normal buffer 359 * consume them and then will generate normal buffer
360 * empty interrupts. 360 * empty interrupts.
361 * If both buffer underflow and buffer empty are occured, 361 * If both buffer underflow and buffer empty are occurred,
362 * it is better to do nomal data transfer than empty one 362 * it is better to do nomal data transfer than empty one
363 */ 363 */
364 snd_ps3_program_dma(card, 364 snd_ps3_program_dma(card,
diff --git a/sound/ppc/snd_ps3_reg.h b/sound/ppc/snd_ps3_reg.h
index 03fdee4aaaf2..2e6302079566 100644
--- a/sound/ppc/snd_ps3_reg.h
+++ b/sound/ppc/snd_ps3_reg.h
@@ -125,7 +125,7 @@
125 transfers. Any interrupts associated with the canceled transfers 125 transfers. Any interrupts associated with the canceled transfers
126 will occur as if the transfer had finished. 126 will occur as if the transfer had finished.
127 Since this bit is designed to recover from DMA related issues 127 Since this bit is designed to recover from DMA related issues
128 which are caused by unpredictable situations, it is prefered to wait 128 which are caused by unpredictable situations, it is preferred to wait
129 for normal DMA transfer end without using this bit. 129 for normal DMA transfer end without using this bit.
130*/ 130*/
131#define PS3_AUDIO_CONFIG_CLEAR (1 << 8) /* RWIVF */ 131#define PS3_AUDIO_CONFIG_CLEAR (1 << 8) /* RWIVF */
@@ -316,13 +316,13 @@ DISABLED=Interrupt generation disabled.
316 316
317/* 317/*
318Audio Port Interrupt Status Register 318Audio Port Interrupt Status Register
319Indicates Interrupt status, which interrupt has occured, and can clear 319Indicates Interrupt status, which interrupt has occurred, and can clear
320each interrupt in this register. 320each interrupt in this register.
321Writing 1b to a field containing 1b clears field and de-asserts interrupt. 321Writing 1b to a field containing 1b clears field and de-asserts interrupt.
322Writing 0b to a field has no effect. 322Writing 0b to a field has no effect.
323Field vaules are the following: 323Field vaules are the following:
3240 - Interrupt hasn't occured. 3240 - Interrupt hasn't occurred.
3251 - Interrupt has occured. 3251 - Interrupt has occurred.
326 326
327 327
328 31 24 23 16 15 8 7 0 328 31 24 23 16 15 8 7 0
@@ -473,7 +473,7 @@ Channel N is out of action by setting 0 to asoen.
473/* 473/*
474Sampling Rate 474Sampling Rate
475Specifies the divide ratio of the bit clock (clock output 475Specifies the divide ratio of the bit clock (clock output
476from bclko) used by the 3-wire Audio Output Clock, whcih 476from bclko) used by the 3-wire Audio Output Clock, which
477is applied to the master clock selected by mcksel. 477is applied to the master clock selected by mcksel.
478Data output is synchronized with this clock. 478Data output is synchronized with this clock.
479*/ 479*/
@@ -756,7 +756,7 @@ The STATUS field can be used to monitor the progress of a DMA request.
756DONE indicates the previous request has completed. 756DONE indicates the previous request has completed.
757EVENT indicates that the DMA engine is waiting for the EVENT to occur. 757EVENT indicates that the DMA engine is waiting for the EVENT to occur.
758PENDING indicates that the DMA engine has not started processing this 758PENDING indicates that the DMA engine has not started processing this
759request, but the EVENT has occured. 759request, but the EVENT has occurred.
760DMA indicates that the data transfer is in progress. 760DMA indicates that the data transfer is in progress.
761NOTIFY indicates that the notifier signalling end of transfer is being written. 761NOTIFY indicates that the notifier signalling end of transfer is being written.
762CLEAR indicated that the previous transfer was cleared. 762CLEAR indicated that the previous transfer was cleared.
@@ -824,7 +824,7 @@ AUDIOFIFO = Audio WriteData FIFO,
824 824
825/* 825/*
826PS3_AUDIO_DMASIZE specifies the number of 128-byte blocks + 1 to transfer. 826PS3_AUDIO_DMASIZE specifies the number of 128-byte blocks + 1 to transfer.
827So a value of 0 means 128-bytes will get transfered. 827So a value of 0 means 128-bytes will get transferred.
828 828
829 829
830 31 24 23 16 15 8 7 0 830 31 24 23 16 15 8 7 0
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
index 5d230cee3fa7..7fbfa051f6e1 100644
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
@@ -672,7 +672,7 @@ static int atmel_ssc_resume(struct snd_soc_dai *cpu_dai)
672 /* re-enable interrupts */ 672 /* re-enable interrupts */
673 ssc_writel(ssc_p->ssc->regs, IER, ssc_p->ssc_state.ssc_imr); 673 ssc_writel(ssc_p->ssc->regs, IER, ssc_p->ssc_state.ssc_imr);
674 674
675 /* Re-enable recieve and transmit as appropriate */ 675 /* Re-enable receive and transmit as appropriate */
676 cr = 0; 676 cr = 0;
677 cr |= 677 cr |=
678 (ssc_p->ssc_state.ssc_sr & SSC_BIT(SR_RXEN)) ? SSC_BIT(CR_RXEN) : 0; 678 (ssc_p->ssc_state.ssc_sr & SSC_BIT(SR_RXEN)) ? SSC_BIT(CR_RXEN) : 0;
diff --git a/sound/soc/codecs/alc5623.c b/sound/soc/codecs/alc5623.c
index 4f377c9e868d..eecffb548947 100644
--- a/sound/soc/codecs/alc5623.c
+++ b/sound/soc/codecs/alc5623.c
@@ -481,7 +481,7 @@ struct _pll_div {
481}; 481};
482 482
483/* Note : pll code from original alc5623 driver. Not sure of how good it is */ 483/* Note : pll code from original alc5623 driver. Not sure of how good it is */
484/* usefull only for master mode */ 484/* useful only for master mode */
485static const struct _pll_div codec_master_pll_div[] = { 485static const struct _pll_div codec_master_pll_div[] = {
486 486
487 { 2048000, 8192000, 0x0ea0}, 487 { 2048000, 8192000, 0x0ea0},
diff --git a/sound/soc/codecs/lm4857.c b/sound/soc/codecs/lm4857.c
index 72de47e5d040..2c2a681da0d7 100644
--- a/sound/soc/codecs/lm4857.c
+++ b/sound/soc/codecs/lm4857.c
@@ -161,7 +161,7 @@ static const struct snd_kcontrol_new lm4857_controls[] = {
161 lm4857_get_mode, lm4857_set_mode), 161 lm4857_get_mode, lm4857_set_mode),
162}; 162};
163 163
164/* There is a demux inbetween the the input signal and the output signals. 164/* There is a demux between the input signal and the output signals.
165 * Currently there is no easy way to model it in ASoC and since it does not make 165 * Currently there is no easy way to model it in ASoC and since it does not make
166 * much of a difference in practice simply connect the input direclty to the 166 * much of a difference in practice simply connect the input direclty to the
167 * outputs. */ 167 * outputs. */
diff --git a/sound/soc/codecs/tlv320aic26.h b/sound/soc/codecs/tlv320aic26.h
index 62b1f2261429..67f19c3bebe6 100644
--- a/sound/soc/codecs/tlv320aic26.h
+++ b/sound/soc/codecs/tlv320aic26.h
@@ -14,14 +14,14 @@
14#define AIC26_PAGE_ADDR(page, offset) ((page << 6) | offset) 14#define AIC26_PAGE_ADDR(page, offset) ((page << 6) | offset)
15#define AIC26_NUM_REGS AIC26_PAGE_ADDR(3, 0) 15#define AIC26_NUM_REGS AIC26_PAGE_ADDR(3, 0)
16 16
17/* Page 0: Auxillary data registers */ 17/* Page 0: Auxiliary data registers */
18#define AIC26_REG_BAT1 AIC26_PAGE_ADDR(0, 0x05) 18#define AIC26_REG_BAT1 AIC26_PAGE_ADDR(0, 0x05)
19#define AIC26_REG_BAT2 AIC26_PAGE_ADDR(0, 0x06) 19#define AIC26_REG_BAT2 AIC26_PAGE_ADDR(0, 0x06)
20#define AIC26_REG_AUX AIC26_PAGE_ADDR(0, 0x07) 20#define AIC26_REG_AUX AIC26_PAGE_ADDR(0, 0x07)
21#define AIC26_REG_TEMP1 AIC26_PAGE_ADDR(0, 0x09) 21#define AIC26_REG_TEMP1 AIC26_PAGE_ADDR(0, 0x09)
22#define AIC26_REG_TEMP2 AIC26_PAGE_ADDR(0, 0x0A) 22#define AIC26_REG_TEMP2 AIC26_PAGE_ADDR(0, 0x0A)
23 23
24/* Page 1: Auxillary control registers */ 24/* Page 1: Auxiliary control registers */
25#define AIC26_REG_AUX_ADC AIC26_PAGE_ADDR(1, 0x00) 25#define AIC26_REG_AUX_ADC AIC26_PAGE_ADDR(1, 0x00)
26#define AIC26_REG_STATUS AIC26_PAGE_ADDR(1, 0x01) 26#define AIC26_REG_STATUS AIC26_PAGE_ADDR(1, 0x01)
27#define AIC26_REG_REFERENCE AIC26_PAGE_ADDR(1, 0x03) 27#define AIC26_REG_REFERENCE AIC26_PAGE_ADDR(1, 0x03)
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 3bedab26892f..6c43c13f0430 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -884,7 +884,7 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream,
884 if (bypass_pll) 884 if (bypass_pll)
885 return 0; 885 return 0;
886 886
887 /* Use PLL, compute apropriate setup for j, d, r and p, the closest 887 /* Use PLL, compute appropriate setup for j, d, r and p, the closest
888 * one wins the game. Try with d==0 first, next with d!=0. 888 * one wins the game. Try with d==0 first, next with d!=0.
889 * Constraints for j are according to the datasheet. 889 * Constraints for j are according to the datasheet.
890 * The sysclk is divided by 1000 to prevent integer overflows. 890 * The sysclk is divided by 1000 to prevent integer overflows.
diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c
index eb1a0b4e09b6..082e9d51963f 100644
--- a/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
@@ -1027,7 +1027,7 @@ static int dac33_prepare_chip(struct snd_pcm_substream *substream)
1027 /* 1027 /*
1028 * For FIFO bypass mode: 1028 * For FIFO bypass mode:
1029 * Enable the FIFO bypass (Disable the FIFO use) 1029 * Enable the FIFO bypass (Disable the FIFO use)
1030 * Set the BCLK as continous 1030 * Set the BCLK as continuous
1031 */ 1031 */
1032 fifoctrl_a |= DAC33_FBYPAS; 1032 fifoctrl_a |= DAC33_FBYPAS;
1033 aictrl_b |= DAC33_BCLKON; 1033 aictrl_b |= DAC33_BCLKON;
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 8512800f6326..575238d68e5e 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -281,7 +281,7 @@ static inline void twl4030_check_defaults(struct snd_soc_codec *codec)
281 i, val, twl4030_reg[i]); 281 i, val, twl4030_reg[i]);
282 } 282 }
283 } 283 }
284 dev_dbg(codec->dev, "Found %d non maching registers. %s\n", 284 dev_dbg(codec->dev, "Found %d non-matching registers. %s\n",
285 difference, difference ? "Not OK" : "OK"); 285 difference, difference ? "Not OK" : "OK");
286} 286}
287 287
@@ -2018,7 +2018,7 @@ static int twl4030_voice_startup(struct snd_pcm_substream *substream,
2018 u8 mode; 2018 u8 mode;
2019 2019
2020 /* If the system master clock is not 26MHz, the voice PCM interface is 2020 /* If the system master clock is not 26MHz, the voice PCM interface is
2021 * not avilable. 2021 * not available.
2022 */ 2022 */
2023 if (twl4030->sysclk != 26000) { 2023 if (twl4030->sysclk != 26000) {
2024 dev_err(codec->dev, "The board is configured for %u Hz, while" 2024 dev_err(codec->dev, "The board is configured for %u Hz, while"
@@ -2028,7 +2028,7 @@ static int twl4030_voice_startup(struct snd_pcm_substream *substream,
2028 } 2028 }
2029 2029
2030 /* If the codec mode is not option2, the voice PCM interface is not 2030 /* If the codec mode is not option2, the voice PCM interface is not
2031 * avilable. 2031 * available.
2032 */ 2032 */
2033 mode = twl4030_read_reg_cache(codec, TWL4030_REG_CODEC_MODE) 2033 mode = twl4030_read_reg_cache(codec, TWL4030_REG_CODEC_MODE)
2034 & TWL4030_OPT_MODE; 2034 & TWL4030_OPT_MODE;
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c
index 8f6b5ee6645b..4bbc0a79f01e 100644
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
@@ -772,7 +772,7 @@ static int wm8580_set_bias_level(struct snd_soc_codec *codec,
772 reg &= ~(WM8580_PWRDN1_PWDN | WM8580_PWRDN1_ALLDACPD); 772 reg &= ~(WM8580_PWRDN1_PWDN | WM8580_PWRDN1_ALLDACPD);
773 snd_soc_write(codec, WM8580_PWRDN1, reg); 773 snd_soc_write(codec, WM8580_PWRDN1, reg);
774 774
775 /* Make VMID high impedence */ 775 /* Make VMID high impedance */
776 reg = snd_soc_read(codec, WM8580_ADC_CONTROL1); 776 reg = snd_soc_read(codec, WM8580_ADC_CONTROL1);
777 reg &= ~0x100; 777 reg &= ~0x100;
778 snd_soc_write(codec, WM8580_ADC_CONTROL1, reg); 778 snd_soc_write(codec, WM8580_ADC_CONTROL1, reg);
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index 3f09deea8d9d..ffa2ffe5ec11 100644
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -1312,7 +1312,7 @@ static int wm8753_set_bias_level(struct snd_soc_codec *codec,
1312 SNDRV_PCM_FMTBIT_S24_LE) 1312 SNDRV_PCM_FMTBIT_S24_LE)
1313 1313
1314/* 1314/*
1315 * The WM8753 supports upto 4 different and mutually exclusive DAI 1315 * The WM8753 supports up to 4 different and mutually exclusive DAI
1316 * configurations. This gives 2 PCM's available for use, hifi and voice. 1316 * configurations. This gives 2 PCM's available for use, hifi and voice.
1317 * NOTE: The Voice PCM cannot play or capture audio to the CPU as it's DAI 1317 * NOTE: The Voice PCM cannot play or capture audio to the CPU as it's DAI
1318 * is connected between the wm8753 and a BT codec or GSM modem. 1318 * is connected between the wm8753 and a BT codec or GSM modem.
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index 443ae580445c..9b3bba4df5b3 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -1895,7 +1895,7 @@ static int fll_factors(struct _fll_div *fll_div, unsigned int Fref,
1895 1895
1896 pr_debug("Fvco=%dHz\n", target); 1896 pr_debug("Fvco=%dHz\n", target);
1897 1897
1898 /* Find an appropraite FLL_FRATIO and factor it out of the target */ 1898 /* Find an appropriate FLL_FRATIO and factor it out of the target */
1899 for (i = 0; i < ARRAY_SIZE(fll_fratios); i++) { 1899 for (i = 0; i < ARRAY_SIZE(fll_fratios); i++) {
1900 if (fll_fratios[i].min <= Fref && Fref <= fll_fratios[i].max) { 1900 if (fll_fratios[i].min <= Fref && Fref <= fll_fratios[i].max) {
1901 fll_div->fll_fratio = fll_fratios[i].fll_fratio; 1901 fll_div->fll_fratio = fll_fratios[i].fll_fratio;
diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c
index 5e0214d6293e..3c7198779c31 100644
--- a/sound/soc/codecs/wm8955.c
+++ b/sound/soc/codecs/wm8955.c
@@ -176,7 +176,7 @@ static int wm8995_pll_factors(struct device *dev,
176 return 0; 176 return 0;
177} 177}
178 178
179/* Lookup table specifiying SRATE (table 25 in datasheet); some of the 179/* Lookup table specifying SRATE (table 25 in datasheet); some of the
180 * output frequencies have been rounded to the standard frequencies 180 * output frequencies have been rounded to the standard frequencies
181 * they are intended to match where the error is slight. */ 181 * they are intended to match where the error is slight. */
182static struct { 182static struct {
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 3b71dd65c966..500011eb8b2b 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3137,7 +3137,7 @@ static int fll_factors(struct _fll_div *fll_div, unsigned int Fref,
3137 3137
3138 pr_debug("FLL Fvco=%dHz\n", target); 3138 pr_debug("FLL Fvco=%dHz\n", target);
3139 3139
3140 /* Find an appropraite FLL_FRATIO and factor it out of the target */ 3140 /* Find an appropriate FLL_FRATIO and factor it out of the target */
3141 for (i = 0; i < ARRAY_SIZE(fll_fratios); i++) { 3141 for (i = 0; i < ARRAY_SIZE(fll_fratios); i++) {
3142 if (fll_fratios[i].min <= Fref && Fref <= fll_fratios[i].max) { 3142 if (fll_fratios[i].min <= Fref && Fref <= fll_fratios[i].max) {
3143 fll_div->fll_fratio = fll_fratios[i].fll_fratio; 3143 fll_div->fll_fratio = fll_fratios[i].fll_fratio;
diff --git a/sound/soc/codecs/wm8991.c b/sound/soc/codecs/wm8991.c
index 28fdfd66661d..3c2ee1bb73cd 100644
--- a/sound/soc/codecs/wm8991.c
+++ b/sound/soc/codecs/wm8991.c
@@ -981,7 +981,7 @@ static int wm8991_set_dai_pll(struct snd_soc_dai *codec_dai,
981 reg = snd_soc_read(codec, WM8991_CLOCKING_2); 981 reg = snd_soc_read(codec, WM8991_CLOCKING_2);
982 snd_soc_write(codec, WM8991_CLOCKING_2, reg | WM8991_SYSCLK_SRC); 982 snd_soc_write(codec, WM8991_CLOCKING_2, reg | WM8991_SYSCLK_SRC);
983 983
984 /* set up N , fractional mode and pre-divisor if neccessary */ 984 /* set up N , fractional mode and pre-divisor if necessary */
985 snd_soc_write(codec, WM8991_PLL1, pll_div.n | WM8991_SDM | 985 snd_soc_write(codec, WM8991_PLL1, pll_div.n | WM8991_SDM |
986 (pll_div.div2 ? WM8991_PRESCALE : 0)); 986 (pll_div.div2 ? WM8991_PRESCALE : 0));
987 snd_soc_write(codec, WM8991_PLL2, (u8)(pll_div.k>>8)); 987 snd_soc_write(codec, WM8991_PLL2, (u8)(pll_div.k>>8));
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c
index 379fa22c5b6c..056aef904347 100644
--- a/sound/soc/codecs/wm8993.c
+++ b/sound/soc/codecs/wm8993.c
@@ -324,7 +324,7 @@ static int fll_factors(struct _fll_div *fll_div, unsigned int Fref,
324 324
325 pr_debug("Fvco=%dHz\n", target); 325 pr_debug("Fvco=%dHz\n", target);
326 326
327 /* Find an appropraite FLL_FRATIO and factor it out of the target */ 327 /* Find an appropriate FLL_FRATIO and factor it out of the target */
328 for (i = 0; i < ARRAY_SIZE(fll_fratios); i++) { 328 for (i = 0; i < ARRAY_SIZE(fll_fratios); i++) {
329 if (fll_fratios[i].min <= Fref && Fref <= fll_fratios[i].max) { 329 if (fll_fratios[i].min <= Fref && Fref <= fll_fratios[i].max) {
330 fll_div->fll_fratio = fll_fratios[i].fll_fratio; 330 fll_div->fll_fratio = fll_fratios[i].fll_fratio;
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 3dc64c8b6a5c..3290333b2bb9 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -82,18 +82,18 @@ struct wm8994_priv {
82 82
83 int mbc_ena[3]; 83 int mbc_ena[3];
84 84
85 /* Platform dependant DRC configuration */ 85 /* Platform dependent DRC configuration */
86 const char **drc_texts; 86 const char **drc_texts;
87 int drc_cfg[WM8994_NUM_DRC]; 87 int drc_cfg[WM8994_NUM_DRC];
88 struct soc_enum drc_enum; 88 struct soc_enum drc_enum;
89 89
90 /* Platform dependant ReTune mobile configuration */ 90 /* Platform dependent ReTune mobile configuration */
91 int num_retune_mobile_texts; 91 int num_retune_mobile_texts;
92 const char **retune_mobile_texts; 92 const char **retune_mobile_texts;
93 int retune_mobile_cfg[WM8994_NUM_EQ]; 93 int retune_mobile_cfg[WM8994_NUM_EQ];
94 struct soc_enum retune_mobile_enum; 94 struct soc_enum retune_mobile_enum;
95 95
96 /* Platform dependant MBC configuration */ 96 /* Platform dependent MBC configuration */
97 int mbc_cfg; 97 int mbc_cfg;
98 const char **mbc_texts; 98 const char **mbc_texts;
99 struct soc_enum mbc_enum; 99 struct soc_enum mbc_enum;
diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c
index 55cdf2982020..91c6b39de50c 100644
--- a/sound/soc/codecs/wm9081.c
+++ b/sound/soc/codecs/wm9081.c
@@ -305,7 +305,7 @@ static int speaker_mode_get(struct snd_kcontrol *kcontrol,
305/* 305/*
306 * Stop any attempts to change speaker mode while the speaker is enabled. 306 * Stop any attempts to change speaker mode while the speaker is enabled.
307 * 307 *
308 * We also have some special anti-pop controls dependant on speaker 308 * We also have some special anti-pop controls dependent on speaker
309 * mode which must be changed along with the mode. 309 * mode which must be changed along with the mode.
310 */ 310 */
311static int speaker_mode_put(struct snd_kcontrol *kcontrol, 311static int speaker_mode_put(struct snd_kcontrol *kcontrol,
@@ -456,7 +456,7 @@ static int fll_factors(struct _fll_div *fll_div, unsigned int Fref,
456 456
457 pr_debug("Fvco=%dHz\n", target); 457 pr_debug("Fvco=%dHz\n", target);
458 458
459 /* Find an appropraite FLL_FRATIO and factor it out of the target */ 459 /* Find an appropriate FLL_FRATIO and factor it out of the target */
460 for (i = 0; i < ARRAY_SIZE(fll_fratios); i++) { 460 for (i = 0; i < ARRAY_SIZE(fll_fratios); i++) {
461 if (fll_fratios[i].min <= Fref && Fref <= fll_fratios[i].max) { 461 if (fll_fratios[i].min <= Fref && Fref <= fll_fratios[i].max) {
462 fll_div->fll_fratio = fll_fratios[i].fll_fratio; 462 fll_div->fll_fratio = fll_fratios[i].fll_fratio;
diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c
index bc92ec620004..ac2ded969253 100644
--- a/sound/soc/imx/imx-ssi.c
+++ b/sound/soc/imx/imx-ssi.c
@@ -16,7 +16,7 @@
16 * sane processor vendors have a FIFO per AC97 slot, the i.MX has only 16 * sane processor vendors have a FIFO per AC97 slot, the i.MX has only
17 * one FIFO which combines all valid receive slots. We cannot even select 17 * one FIFO which combines all valid receive slots. We cannot even select
18 * which slots we want to receive. The WM9712 with which this driver 18 * which slots we want to receive. The WM9712 with which this driver
19 * was developped with always sends GPIO status data in slot 12 which 19 * was developed with always sends GPIO status data in slot 12 which
20 * we receive in our (PCM-) data stream. The only chance we have is to 20 * we receive in our (PCM-) data stream. The only chance we have is to
21 * manually skip this data in the FIQ handler. With sampling rates different 21 * manually skip this data in the FIQ handler. With sampling rates different
22 * from 48000Hz not every frame has valid receive data, so the ratio 22 * from 48000Hz not every frame has valid receive data, so the ratio
diff --git a/sound/soc/kirkwood/kirkwood-dma.c b/sound/soc/kirkwood/kirkwood-dma.c
index 0fd6a630db01..e13c6ce46328 100644
--- a/sound/soc/kirkwood/kirkwood-dma.c
+++ b/sound/soc/kirkwood/kirkwood-dma.c
@@ -132,7 +132,7 @@ static int kirkwood_dma_open(struct snd_pcm_substream *substream)
132 priv = snd_soc_dai_get_dma_data(cpu_dai, substream); 132 priv = snd_soc_dai_get_dma_data(cpu_dai, substream);
133 snd_soc_set_runtime_hwparams(substream, &kirkwood_dma_snd_hw); 133 snd_soc_set_runtime_hwparams(substream, &kirkwood_dma_snd_hw);
134 134
135 /* Ensure that all constraints linked to dma burst are fullfilled */ 135 /* Ensure that all constraints linked to dma burst are fulfilled */
136 err = snd_pcm_hw_constraint_minmax(runtime, 136 err = snd_pcm_hw_constraint_minmax(runtime,
137 SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 137 SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
138 priv->burst * 2, 138 priv->burst * 2,
@@ -170,7 +170,7 @@ static int kirkwood_dma_open(struct snd_pcm_substream *substream)
170 170
171 /* 171 /*
172 * Enable Error interrupts. We're only ack'ing them but 172 * Enable Error interrupts. We're only ack'ing them but
173 * it's usefull for diagnostics 173 * it's useful for diagnostics
174 */ 174 */
175 writel((unsigned long)-1, priv->io + KIRKWOOD_ERR_MASK); 175 writel((unsigned long)-1, priv->io + KIRKWOOD_ERR_MASK);
176 } 176 }
diff --git a/sound/soc/mid-x86/sst_platform.c b/sound/soc/mid-x86/sst_platform.c
index ee2c22475a76..b2e9198a983a 100644
--- a/sound/soc/mid-x86/sst_platform.c
+++ b/sound/soc/mid-x86/sst_platform.c
@@ -440,7 +440,7 @@ static int sst_platform_remove(struct platform_device *pdev)
440 440
441 snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sst_platform_dai)); 441 snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sst_platform_dai));
442 snd_soc_unregister_platform(&pdev->dev); 442 snd_soc_unregister_platform(&pdev->dev);
443 pr_debug("sst_platform_remove sucess\n"); 443 pr_debug("sst_platform_remove success\n");
444 return 0; 444 return 0;
445} 445}
446 446
@@ -463,7 +463,7 @@ module_init(sst_soc_platform_init);
463static void __exit sst_soc_platform_exit(void) 463static void __exit sst_soc_platform_exit(void)
464{ 464{
465 platform_driver_unregister(&sst_platform_driver); 465 platform_driver_unregister(&sst_platform_driver);
466 pr_debug("sst_soc_platform_exit sucess\n"); 466 pr_debug("sst_soc_platform_exit success\n");
467} 467}
468module_exit(sst_soc_platform_exit); 468module_exit(sst_soc_platform_exit);
469 469
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c
index 3167be689621..462cbcbea74a 100644
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@ -248,7 +248,7 @@ static struct snd_soc_jack_pin ams_delta_hook_switch_pins[] = {
248 */ 248 */
249 249
250/* To actually apply any modem controlled configuration changes to the codec, 250/* To actually apply any modem controlled configuration changes to the codec,
251 * we must connect codec DAI pins to the modem for a moment. Be carefull not 251 * we must connect codec DAI pins to the modem for a moment. Be careful not
252 * to interfere with our digital mute function that shares the same hardware. */ 252 * to interfere with our digital mute function that shares the same hardware. */
253static struct timer_list cx81801_timer; 253static struct timer_list cx81801_timer;
254static bool cx81801_cmd_pending; 254static bool cx81801_cmd_pending;
@@ -402,9 +402,9 @@ static struct tty_ldisc_ops cx81801_ops = {
402 402
403 403
404/* 404/*
405 * Even if not very usefull, the sound card can still work without any of the 405 * Even if not very useful, the sound card can still work without any of the
406 * above functonality activated. You can still control its audio input/output 406 * above functonality activated. You can still control its audio input/output
407 * constellation and speakerphone gain from userspace by issueing AT commands 407 * constellation and speakerphone gain from userspace by issuing AT commands
408 * over the modem port. 408 * over the modem port.
409 */ 409 */
410 410
diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c
index 78bfdb3f5d7e..452230975632 100644
--- a/sound/soc/samsung/neo1973_wm8753.c
+++ b/sound/soc/samsung/neo1973_wm8753.c
@@ -228,7 +228,7 @@ static const struct snd_kcontrol_new neo1973_wm8753_controls[] = {
228 SOC_DAPM_PIN_SWITCH("Handset Mic"), 228 SOC_DAPM_PIN_SWITCH("Handset Mic"),
229}; 229};
230 230
231/* GTA02 specific routes and controlls */ 231/* GTA02 specific routes and controls */
232 232
233#ifdef CONFIG_MACH_NEO1973_GTA02 233#ifdef CONFIG_MACH_NEO1973_GTA02
234 234
@@ -372,7 +372,7 @@ static int neo1973_wm8753_init(struct snd_soc_pcm_runtime *rtd)
372 return 0; 372 return 0;
373} 373}
374 374
375/* GTA01 specific controlls */ 375/* GTA01 specific controls */
376 376
377#ifdef CONFIG_MACH_NEO1973_GTA01 377#ifdef CONFIG_MACH_NEO1973_GTA01
378 378
diff --git a/sound/usb/6fire/firmware.c b/sound/usb/6fire/firmware.c
index 9081a54a9c6c..86c1a3103760 100644
--- a/sound/usb/6fire/firmware.c
+++ b/sound/usb/6fire/firmware.c
@@ -76,7 +76,7 @@ struct ihex_record {
76 u16 address; 76 u16 address;
77 u8 len; 77 u8 len;
78 u8 data[256]; 78 u8 data[256];
79 char error; /* true if an error occured parsing this record */ 79 char error; /* true if an error occurred parsing this record */
80 80
81 u8 max_len; /* maximum record length in whole ihex */ 81 u8 max_len; /* maximum record length in whole ihex */
82 82
@@ -107,7 +107,7 @@ static u8 usb6fire_fw_ihex_hex(const u8 *data, u8 *crc)
107 107
108/* 108/*
109 * returns true if record is available, false otherwise. 109 * returns true if record is available, false otherwise.
110 * iff an error occured, false will be returned and record->error will be true. 110 * iff an error occurred, false will be returned and record->error will be true.
111 */ 111 */
112static bool usb6fire_fw_ihex_next_record(struct ihex_record *record) 112static bool usb6fire_fw_ihex_next_record(struct ihex_record *record)
113{ 113{
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 5e4775716607..6ec33b62e6cf 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -1182,7 +1182,7 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
1182/* 1182/*
1183 * parse a feature unit 1183 * parse a feature unit
1184 * 1184 *
1185 * most of controlls are defined here. 1185 * most of controls are defined here.
1186 */ 1186 */
1187static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void *_ftr) 1187static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void *_ftr)
1188{ 1188{
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 355759bad581..ec07e62e53f3 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -266,7 +266,7 @@ static int create_uaxx_quirk(struct snd_usb_audio *chip,
266 * audio-interface quirks 266 * audio-interface quirks
267 * 267 *
268 * returns zero if no standard audio/MIDI parsing is needed. 268 * returns zero if no standard audio/MIDI parsing is needed.
269 * returns a postive value if standard audio/midi interfaces are parsed 269 * returns a positive value if standard audio/midi interfaces are parsed
270 * after this. 270 * after this.
271 * returns a negative value at error. 271 * returns a negative value at error.
272 */ 272 */
diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c
index 287ef73b1237..a51340f6f2db 100644
--- a/sound/usb/usx2y/usx2yhwdeppcm.c
+++ b/sound/usb/usx2y/usx2yhwdeppcm.c
@@ -20,7 +20,7 @@
20 at standard samplerates, 20 at standard samplerates,
21 what led to this part of the usx2y module: 21 what led to this part of the usx2y module:
22 It provides the alsa kernel half of the usx2y-alsa-jack driver pair. 22 It provides the alsa kernel half of the usx2y-alsa-jack driver pair.
23 The pair uses a hardware dependant alsa-device for mmaped pcm transport. 23 The pair uses a hardware dependent alsa-device for mmaped pcm transport.
24 Advantage achieved: 24 Advantage achieved:
25 The usb_hc moves pcm data from/into memory via DMA. 25 The usb_hc moves pcm data from/into memory via DMA.
26 That memory is mmaped by jack's usx2y driver. 26 That memory is mmaped by jack's usx2y driver.
@@ -38,7 +38,7 @@
38 2periods works but is useless cause of crackling). 38 2periods works but is useless cause of crackling).
39 39
40 This is a first "proof of concept" implementation. 40 This is a first "proof of concept" implementation.
41 Later, functionalities should migrate to more apropriate places: 41 Later, functionalities should migrate to more appropriate places:
42 Userland: 42 Userland:
43 - The jackd could mmap its float-pcm buffers directly from alsa-lib. 43 - The jackd could mmap its float-pcm buffers directly from alsa-lib.
44 - alsa-lib could provide power of 2 period sized shaping combined with int/float 44 - alsa-lib could provide power of 2 period sized shaping combined with int/float
diff --git a/tools/perf/util/string.c b/tools/perf/util/string.c
index 8fc0bd3a3a4a..b9a985dadd08 100644
--- a/tools/perf/util/string.c
+++ b/tools/perf/util/string.c
@@ -85,7 +85,7 @@ out:
85 85
86/* 86/*
87 * Helper function for splitting a string into an argv-like array. 87 * Helper function for splitting a string into an argv-like array.
88 * originaly copied from lib/argv_split.c 88 * originally copied from lib/argv_split.c
89 */ 89 */
90static const char *skip_sep(const char *cp) 90static const char *skip_sep(const char *cp)
91{ 91{
diff --git a/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c b/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c
index d9678a34dd70..2618ef2ba31f 100644
--- a/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c
+++ b/tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c
@@ -46,7 +46,7 @@ int cpu = -1;
46 * 46 *
47 * performance 47 * performance
48 * Performance is paramount. 48 * Performance is paramount.
49 * Unwilling to sacrafice any performance 49 * Unwilling to sacrifice any performance
50 * for the sake of energy saving. (hardware default) 50 * for the sake of energy saving. (hardware default)
51 * 51 *
52 * normal 52 * normal
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index 3656849f78a0..36d8092dbb3f 100644
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -578,7 +578,7 @@ kvm_assign_ioeventfd(struct kvm *kvm, struct kvm_ioeventfd *args)
578 578
579 mutex_lock(&kvm->slots_lock); 579 mutex_lock(&kvm->slots_lock);
580 580
581 /* Verify that there isnt a match already */ 581 /* Verify that there isn't a match already */
582 if (ioeventfd_check_collision(kvm, p)) { 582 if (ioeventfd_check_collision(kvm, p)) {
583 ret = -EEXIST; 583 ret = -EEXIST;
584 goto unlock_fail; 584 goto unlock_fail;