From 3c361584f00f542a1a9d5e451e9a4356057f335e Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Wed, 2 Jan 2013 11:50:19 +0000 Subject: [PATCH] --- yaml --- r: 348249 b: refs/heads/master c: 7ae42c96cffc432e1a4f90b7f12b11acb66723ed h: refs/heads/master i: 348247: 5317679a4339d6f2dd9c4d27fc3786598bddb623 v: v3 --- [refs] | 2 +- .../DocBook/media/v4l/driver.xml | 6 +- trunk/Documentation/PCI/pci-iov-howto.txt | 6 +- trunk/Documentation/PCI/pci.txt | 20 +++ trunk/Documentation/acpi/enumeration.txt | 2 +- .../bindings/pinctrl/pinctrl-sirf.txt | 47 ----- .../bindings/watchdog/twl4030-wdt.txt | 10 -- trunk/Documentation/i2c/instantiating-devices | 2 +- trunk/Documentation/rpmsg.txt | 4 +- trunk/Documentation/spi/spi-summary | 4 +- .../video4linux/v4l2-framework.txt | 3 +- .../zh_CN/video4linux/v4l2-framework.txt | 3 +- trunk/MAINTAINERS | 19 --- trunk/Makefile | 2 +- trunk/arch/alpha/include/asm/parport.h | 4 +- trunk/arch/alpha/kernel/pci.c | 12 +- trunk/arch/alpha/kernel/smp.c | 6 +- trunk/arch/alpha/kernel/sys_titan.c | 2 +- trunk/arch/arm/boot/dts/dbx5x0.dtsi | 4 +- trunk/arch/arm/boot/dts/twl4030.dtsi | 4 - trunk/arch/arm/common/sa1111.c | 5 +- trunk/arch/arm/common/scoop.c | 6 +- trunk/arch/arm/configs/multi_v7_defconfig | 1 - trunk/arch/arm/configs/omap2plus_defconfig | 5 - trunk/arch/arm/kernel/bios32.c | 18 +- trunk/arch/arm/kernel/etm.c | 4 +- trunk/arch/arm/kernel/perf_event_cpu.c | 10 +- trunk/arch/arm/kernel/perf_event_v6.c | 4 +- trunk/arch/arm/kernel/perf_event_v7.c | 12 +- trunk/arch/arm/kernel/perf_event_xscale.c | 4 +- .../arch/arm/mach-davinci/board-dm646x-evm.c | 2 +- trunk/arch/arm/mach-davinci/cdce949.c | 4 +- trunk/arch/arm/mach-dove/pcie.c | 2 +- trunk/arch/arm/mach-imx/cpufreq.c | 2 +- trunk/arch/arm/mach-imx/mmdc.c | 2 +- trunk/arch/arm/mach-iop13xx/pci.c | 2 +- trunk/arch/arm/mach-kirkwood/pcie.c | 2 +- trunk/arch/arm/mach-ks8695/board-acs5k.c | 2 +- trunk/arch/arm/mach-mmp/sram.c | 4 +- trunk/arch/arm/mach-msm/proc_comm.c | 2 +- trunk/arch/arm/mach-msm/smd.c | 2 +- trunk/arch/arm/mach-mv78xx0/pcie.c | 2 +- trunk/arch/arm/mach-omap1/Makefile | 2 +- trunk/arch/arm/mach-omap1/fb.c | 80 --------- trunk/arch/arm/mach-omap1/mailbox.c | 6 +- trunk/arch/arm/mach-omap2/Makefile | 2 +- trunk/arch/arm/mach-omap2/control.h | 2 +- trunk/arch/arm/mach-omap2/dpll3xxx.c | 3 +- trunk/arch/arm/mach-omap2/drm.c | 1 + trunk/arch/arm/mach-omap2/dss-common.c | 3 +- trunk/arch/arm/mach-omap2/gpmc.c | 12 +- trunk/arch/arm/mach-omap2/mailbox.c | 6 +- .../arm/mach-omap2/omap_hwmod_44xx_data.c | 1 + trunk/arch/arm/mach-omap2/omap_twl.c | 8 +- trunk/arch/arm/mach-omap2/pmu.c | 2 + trunk/arch/arm/mach-omap2/prm2xxx.c | 3 +- trunk/arch/arm/mach-omap2/prm3xxx.c | 3 +- trunk/arch/arm/mach-orion5x/pci.c | 2 +- trunk/arch/arm/mach-prima2/pm.c | 2 +- trunk/arch/arm/mach-prima2/rtciobrg.c | 2 +- trunk/arch/arm/mach-pxa/corgi_pm.c | 2 +- trunk/arch/arm/mach-pxa/sharpsl_pm.c | 4 +- trunk/arch/arm/mach-pxa/spitz_pm.c | 2 +- trunk/arch/arm/mach-pxa/tosa-bt.c | 4 +- trunk/arch/arm/mach-s3c24xx/h1940-bluetooth.c | 2 +- trunk/arch/arm/mach-s3c24xx/mach-osiris-dvs.c | 6 +- .../arm/mach-s3c64xx/mach-crag6410-module.c | 6 +- trunk/arch/arm/mach-s3c64xx/mach-crag6410.c | 68 ++++---- trunk/arch/arm/mach-sa1100/jornada720_ssp.c | 2 +- trunk/arch/arm/mach-sa1100/neponset.c | 8 +- trunk/arch/arm/mach-sunxi/sunxi.c | 4 +- trunk/arch/arm/mach-tegra/pcie.c | 6 +- trunk/arch/arm/mach-tegra/tegra2_emc.c | 6 +- trunk/arch/arm/mach-u300/dummyspichip.c | 6 +- trunk/arch/arm/mach-ux500/cpu-db8500.c | 3 +- trunk/arch/arm/plat-omap/Makefile | 2 +- trunk/arch/arm/plat-omap/dma.c | 6 +- trunk/arch/arm/plat-omap/dmtimer.c | 19 ++- trunk/arch/arm/{mach-omap2 => plat-omap}/fb.c | 50 +++++- trunk/arch/arm/plat-omap/include/plat/cpu.h | 4 + trunk/arch/arm/plat-pxa/ssp.c | 6 +- trunk/arch/arm/plat-samsung/adc.c | 4 +- trunk/arch/arm64/include/asm/compat.h | 1 + trunk/arch/arm64/kernel/perf_event.c | 2 +- trunk/arch/avr32/lib/delay.c | 2 +- trunk/arch/blackfin/mach-common/dpmc.c | 6 +- trunk/arch/cris/arch-v32/drivers/pci/bios.c | 2 +- trunk/arch/cris/arch-v32/kernel/smp.c | 2 +- trunk/arch/frv/kernel/setup.c | 2 +- trunk/arch/frv/mb93090-mb00/pci-vdk.c | 6 +- trunk/arch/ia64/include/asm/acpi.h | 2 +- trunk/arch/ia64/include/asm/iosapic.h | 11 +- trunk/arch/ia64/include/asm/parport.h | 5 +- trunk/arch/ia64/include/asm/smp.h | 2 +- trunk/arch/ia64/include/asm/unistd.h | 2 +- trunk/arch/ia64/include/uapi/asm/unistd.h | 1 - trunk/arch/ia64/kernel/acpi.c | 6 +- trunk/arch/ia64/kernel/entry.S | 1 - trunk/arch/ia64/kernel/iosapic.c | 19 ++- trunk/arch/ia64/kernel/smpboot.c | 11 +- trunk/arch/ia64/kernel/time.c | 3 +- trunk/arch/ia64/mm/init.c | 5 +- trunk/arch/ia64/mm/tlb.c | 3 +- trunk/arch/ia64/pci/fixup.c | 2 +- trunk/arch/ia64/pci/pci.c | 31 ++-- trunk/arch/ia64/sn/kernel/io_common.c | 3 +- trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c | 2 +- trunk/arch/ia64/xen/irq_xen.c | 5 +- trunk/arch/m32r/kernel/smpboot.c | 2 +- trunk/arch/m68k/emu/nfeth.c | 2 +- trunk/arch/m68k/include/asm/parport.h | 4 +- trunk/arch/m68k/kernel/pcibios.c | 4 +- trunk/arch/microblaze/pci/pci-common.c | 28 +-- trunk/arch/mips/cavium-octeon/serial.c | 2 +- trunk/arch/mips/include/asm/pci.h | 4 +- trunk/arch/mips/kernel/smp.c | 2 +- trunk/arch/mips/lantiq/xway/dma.c | 2 +- trunk/arch/mips/lantiq/xway/gptu.c | 2 +- trunk/arch/mips/lantiq/xway/xrx200_phy_fw.c | 2 +- trunk/arch/mips/mti-sead3/sead3-i2c-drv.c | 6 +- .../arch/mips/mti-sead3/sead3-pic32-i2c-drv.c | 8 +- trunk/arch/mips/pci/fixup-cobalt.c | 8 +- trunk/arch/mips/pci/fixup-emma2rh.c | 4 +- trunk/arch/mips/pci/fixup-fuloong2e.c | 12 +- trunk/arch/mips/pci/fixup-lemote2f.c | 12 +- trunk/arch/mips/pci/fixup-malta.c | 10 +- trunk/arch/mips/pci/fixup-rc32434.c | 6 +- trunk/arch/mips/pci/fixup-sb1250.c | 6 +- trunk/arch/mips/pci/ops-bcm63xx.c | 2 +- trunk/arch/mips/pci/ops-tx4927.c | 6 +- trunk/arch/mips/pci/pci-alchemy.c | 2 +- trunk/arch/mips/pci/pci-ip27.c | 4 +- trunk/arch/mips/pci/pci-lantiq.c | 4 +- trunk/arch/mips/pci/pci.c | 9 +- trunk/arch/mips/sni/setup.c | 2 +- trunk/arch/mips/txx9/generic/pci.c | 11 +- trunk/arch/mn10300/kernel/smp.c | 4 +- trunk/arch/mn10300/unit-asb2305/pci.c | 6 +- trunk/arch/openrisc/lib/delay.c | 2 +- trunk/arch/parisc/include/asm/parport.h | 2 +- trunk/arch/parisc/kernel/hardware.c | 7 +- trunk/arch/powerpc/include/asm/eeh.h | 6 +- .../arch/powerpc/include/asm/io-workarounds.h | 4 +- trunk/arch/powerpc/include/asm/parport.h | 2 +- trunk/arch/powerpc/include/asm/smp.h | 4 +- trunk/arch/powerpc/include/asm/vio.h | 2 +- trunk/arch/powerpc/kernel/io-workarounds.c | 9 +- trunk/arch/powerpc/kernel/isa-bridge.c | 12 +- trunk/arch/powerpc/kernel/of_platform.c | 2 +- trunk/arch/powerpc/kernel/pci-common.c | 28 +-- trunk/arch/powerpc/kernel/pci_32.c | 2 +- trunk/arch/powerpc/kernel/pci_64.c | 6 +- trunk/arch/powerpc/kernel/pci_dn.c | 4 +- trunk/arch/powerpc/kernel/pci_of_scan.c | 12 +- trunk/arch/powerpc/kernel/rtas_pci.c | 4 +- trunk/arch/powerpc/kernel/smp-tbsync.c | 8 +- trunk/arch/powerpc/kernel/smp.c | 8 +- trunk/arch/powerpc/kernel/time.c | 5 + trunk/arch/powerpc/kernel/vio.c | 4 +- trunk/arch/powerpc/mm/tlb_hash64.c | 4 + .../powerpc/platforms/40x/ppc40x_simple.c | 3 +- trunk/arch/powerpc/platforms/44x/currituck.c | 2 +- .../arch/powerpc/platforms/44x/virtex_ml510.c | 2 +- .../arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 6 +- .../powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 8 +- trunk/arch/powerpc/platforms/82xx/ep8248e.c | 2 +- .../powerpc/platforms/83xx/mcu_mpc8349emitx.c | 9 +- .../arch/powerpc/platforms/85xx/corenet_ds.c | 2 +- .../arch/powerpc/platforms/85xx/mpc85xx_cds.c | 2 +- trunk/arch/powerpc/platforms/85xx/tqm85xx.c | 2 +- trunk/arch/powerpc/platforms/86xx/gef_ppc9a.c | 2 +- .../arch/powerpc/platforms/86xx/gef_sbc310.c | 2 +- .../arch/powerpc/platforms/86xx/gef_sbc610.c | 2 +- trunk/arch/powerpc/platforms/cell/setup.c | 2 +- trunk/arch/powerpc/platforms/cell/smp.c | 6 +- trunk/arch/powerpc/platforms/chrp/pci.c | 2 +- trunk/arch/powerpc/platforms/chrp/smp.c | 4 +- trunk/arch/powerpc/platforms/fsl_uli1575.c | 20 +-- trunk/arch/powerpc/platforms/maple/pci.c | 4 +- .../arch/powerpc/platforms/pasemi/gpio_mdio.c | 2 +- trunk/arch/powerpc/platforms/pasemi/pasemi.h | 4 +- trunk/arch/powerpc/platforms/pasemi/setup.c | 4 +- trunk/arch/powerpc/platforms/powermac/pci.c | 6 +- trunk/arch/powerpc/platforms/powermac/smp.c | 8 +- .../arch/powerpc/platforms/powernv/pci-ioda.c | 48 +++--- .../powerpc/platforms/powernv/pci-p5ioc2.c | 4 +- trunk/arch/powerpc/platforms/powernv/pci.c | 11 +- trunk/arch/powerpc/platforms/powernv/smp.c | 2 +- trunk/arch/powerpc/platforms/ps3/repository.c | 2 +- .../arch/powerpc/platforms/pseries/eeh_dev.c | 4 +- trunk/arch/powerpc/platforms/pseries/eeh_pe.c | 2 +- .../powerpc/platforms/pseries/pci_dlpar.c | 2 +- trunk/arch/powerpc/platforms/pseries/smp.c | 6 +- trunk/arch/powerpc/platforms/wsp/scom_smp.c | 3 +- trunk/arch/powerpc/platforms/wsp/smp.c | 4 +- trunk/arch/powerpc/platforms/wsp/wsp.h | 2 +- trunk/arch/powerpc/platforms/wsp/wsp_pci.c | 2 +- trunk/arch/powerpc/sysdev/bestcomm/bestcomm.c | 7 +- trunk/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 6 +- trunk/arch/powerpc/sysdev/fsl_ifc.c | 4 +- trunk/arch/powerpc/sysdev/fsl_lbc.c | 6 +- trunk/arch/powerpc/sysdev/fsl_msi.c | 7 +- trunk/arch/powerpc/sysdev/fsl_pci.c | 4 +- trunk/arch/powerpc/sysdev/fsl_rio.c | 2 +- trunk/arch/powerpc/sysdev/mpic.c | 2 +- trunk/arch/powerpc/sysdev/mpic_msgr.c | 2 +- trunk/arch/powerpc/sysdev/mv64x60_pci.c | 2 +- trunk/arch/powerpc/sysdev/ppc4xx_msi.c | 2 +- trunk/arch/s390/kernel/smp.c | 7 +- trunk/arch/s390/pci/pci.c | 2 +- trunk/arch/score/mm/cache.c | 2 +- trunk/arch/sh/drivers/pci/fixups-dreamcast.c | 2 +- trunk/arch/sh/drivers/pci/pci.c | 6 +- trunk/arch/sh/drivers/pci/pcie-sh7786.c | 2 +- trunk/arch/sparc/include/asm/parport.h | 6 +- trunk/arch/sparc/include/asm/timer_64.h | 2 +- trunk/arch/sparc/kernel/apc.c | 4 +- trunk/arch/sparc/kernel/auxio_64.c | 2 +- trunk/arch/sparc/kernel/central.c | 6 +- trunk/arch/sparc/kernel/chmc.c | 34 ++-- trunk/arch/sparc/kernel/ds.c | 5 +- trunk/arch/sparc/kernel/ldc.c | 2 +- trunk/arch/sparc/kernel/leon_pci.c | 2 +- trunk/arch/sparc/kernel/leon_pci_grpci2.c | 2 +- trunk/arch/sparc/kernel/pci.c | 33 ++-- trunk/arch/sparc/kernel/pci_fire.c | 6 +- trunk/arch/sparc/kernel/pci_psycho.c | 11 +- trunk/arch/sparc/kernel/pci_sabre.c | 8 +- trunk/arch/sparc/kernel/pci_schizo.c | 15 +- trunk/arch/sparc/kernel/pci_sun4v.c | 15 +- trunk/arch/sparc/kernel/pcic.c | 5 +- trunk/arch/sparc/kernel/pmc.c | 2 +- trunk/arch/sparc/kernel/power.c | 4 +- trunk/arch/sparc/kernel/smp_64.c | 4 +- trunk/arch/sparc/kernel/time_32.c | 2 +- trunk/arch/sparc/kernel/time_64.c | 10 +- trunk/arch/sparc/mm/init_64.c | 6 +- trunk/arch/tile/include/asm/pci.h | 2 +- trunk/arch/tile/kernel/pci.c | 23 ++- trunk/arch/tile/kernel/pci_gx.c | 33 ++-- trunk/arch/unicore32/kernel/pci.c | 2 +- trunk/arch/x86/include/asm/parport.h | 4 +- trunk/arch/x86/include/asm/pci_x86.h | 7 +- .../x86/kernel/cpu/perf_event_intel_uncore.c | 6 +- trunk/arch/x86/kernel/pci-dma.c | 2 +- trunk/arch/x86/kernel/quirks.c | 4 +- trunk/arch/x86/lib/delay.c | 2 +- trunk/arch/x86/pci/acpi.c | 11 +- trunk/arch/x86/pci/bus_numa.c | 4 +- trunk/arch/x86/pci/common.c | 29 ++-- trunk/arch/x86/pci/fixup.c | 30 ++-- trunk/arch/x86/pci/legacy.c | 4 +- trunk/arch/x86/pci/mmconfig-shared.c | 21 ++- trunk/arch/x86/pci/mmconfig_32.c | 2 +- trunk/arch/x86/pci/mmconfig_64.c | 4 +- trunk/arch/x86/pci/mrst.c | 6 +- trunk/arch/x86/pci/numaq_32.c | 2 +- trunk/arch/x86/pci/pcbios.c | 4 +- trunk/arch/x86/platform/mrst/mrst.c | 2 +- trunk/arch/x86/platform/olpc/olpc-xo1-pm.c | 8 +- trunk/arch/x86/platform/olpc/olpc-xo1-sci.c | 18 +- trunk/arch/x86/platform/scx200/scx200_32.c | 6 +- trunk/drivers/amba/bus.c | 4 + trunk/drivers/amba/tegra-ahb.c | 4 +- trunk/drivers/ata/ahci_platform.c | 2 +- trunk/drivers/ata/ata_piix.c | 17 +- trunk/drivers/ata/pata_arasan_cf.c | 6 +- trunk/drivers/ata/pata_at91.c | 6 +- trunk/drivers/ata/pata_bf54x.c | 6 +- trunk/drivers/ata/pata_cs5520.c | 2 +- trunk/drivers/ata/pata_ep93xx.c | 6 +- trunk/drivers/ata/pata_icside.c | 21 +-- trunk/drivers/ata/pata_imx.c | 6 +- trunk/drivers/ata/pata_ixp4xx_cf.c | 2 +- trunk/drivers/ata/pata_macio.c | 33 ++-- trunk/drivers/ata/pata_mpc52xx.c | 10 +- trunk/drivers/ata/pata_octeon_cf.c | 2 +- trunk/drivers/ata/pata_of_platform.c | 2 +- trunk/drivers/ata/pata_palmld.c | 6 +- trunk/drivers/ata/pata_pdc2027x.c | 3 +- trunk/drivers/ata/pata_platform.c | 11 +- trunk/drivers/ata/pata_pxa.c | 6 +- trunk/drivers/ata/pata_rb532_cf.c | 6 +- trunk/drivers/ata/pata_rdc.c | 3 +- trunk/drivers/ata/pata_sch.c | 3 +- trunk/drivers/ata/pata_sil680.c | 3 +- trunk/drivers/ata/sata_highbank.c | 2 +- trunk/drivers/ata/sata_mv.c | 8 +- trunk/drivers/ata/sata_vsc.c | 7 +- trunk/drivers/atm/ambassador.c | 53 +++--- trunk/drivers/atm/eni.c | 18 +- trunk/drivers/atm/firestream.c | 32 ++-- trunk/drivers/atm/fore200e.c | 70 +++++--- trunk/drivers/atm/he.c | 36 ++-- trunk/drivers/atm/horizon.c | 12 +- trunk/drivers/atm/idt77252.c | 16 +- trunk/drivers/atm/iphase.c | 11 +- trunk/drivers/atm/lanai.c | 28 +-- trunk/drivers/atm/nicstar.c | 18 +- trunk/drivers/atm/solos-pci.c | 4 +- trunk/drivers/atm/zatm.c | 31 ++-- trunk/drivers/auxdisplay/cfag12864bfb.c | 10 +- trunk/drivers/bcma/bcma_private.h | 6 +- trunk/drivers/bcma/driver_gmac_cmn.c | 2 +- trunk/drivers/bcma/driver_pci.c | 4 +- trunk/drivers/bcma/driver_pci_host.c | 13 +- trunk/drivers/bcma/host_pci.c | 8 +- trunk/drivers/bcma/main.c | 2 +- trunk/drivers/block/cciss.c | 90 +++++----- trunk/drivers/block/cpqarray.c | 16 +- trunk/drivers/block/nvme.c | 17 +- trunk/drivers/block/ps3disk.c | 2 +- trunk/drivers/block/ps3vram.c | 4 +- trunk/drivers/block/sunvdc.c | 9 +- trunk/drivers/block/swim.c | 11 +- trunk/drivers/block/swim3.c | 3 +- trunk/drivers/block/umem.c | 3 +- trunk/drivers/block/virtio_blk.c | 13 +- trunk/drivers/block/xsysace.c | 19 ++- trunk/drivers/bus/omap-ocp2scp.c | 6 +- trunk/drivers/bus/omap_l3_noc.c | 6 +- trunk/drivers/cdrom/gdrom.c | 18 +- trunk/drivers/char/agp/ali-agp.c | 3 +- trunk/drivers/char/agp/amd-k7-agp.c | 4 +- trunk/drivers/char/agp/amd64-agp.c | 15 +- trunk/drivers/char/agp/ati-agp.c | 3 +- trunk/drivers/char/agp/efficeon-agp.c | 4 +- trunk/drivers/char/agp/i460-agp.c | 6 +- trunk/drivers/char/agp/intel-agp.c | 6 +- trunk/drivers/char/agp/nvidia-agp.c | 4 +- trunk/drivers/char/agp/sgi-agp.c | 2 +- trunk/drivers/char/agp/sis-agp.c | 5 +- trunk/drivers/char/agp/sworks-agp.c | 4 +- trunk/drivers/char/agp/uninorth-agp.c | 4 +- trunk/drivers/char/agp/via-agp.c | 3 +- trunk/drivers/char/hw_random/atmel-rng.c | 2 +- trunk/drivers/char/hw_random/bcm63xx-rng.c | 4 +- trunk/drivers/char/hw_random/exynos-rng.c | 4 +- trunk/drivers/char/hw_random/n2-drv.c | 6 +- trunk/drivers/char/hw_random/octeon-rng.c | 2 +- trunk/drivers/char/hw_random/omap-rng.c | 2 +- trunk/drivers/char/hw_random/pasemi-rng.c | 2 +- trunk/drivers/char/hw_random/picoxcell-rng.c | 2 +- trunk/drivers/char/hw_random/ppc4xx-rng.c | 2 +- trunk/drivers/char/hw_random/timeriomem-rng.c | 4 +- trunk/drivers/char/hw_random/virtio-rng.c | 2 +- trunk/drivers/char/ipmi/ipmi_si_intf.c | 6 +- trunk/drivers/char/virtio_console.c | 6 +- trunk/drivers/clk/clk-twl6040.c | 6 +- trunk/drivers/clk/ux500/abx500-clk.c | 2 +- trunk/drivers/clocksource/acpi_pm.c | 6 +- trunk/drivers/clocksource/em_sti.c | 8 +- trunk/drivers/clocksource/sh_cmt.c | 6 +- trunk/drivers/clocksource/sh_mtu2.c | 6 +- trunk/drivers/clocksource/sh_tmu.c | 6 +- trunk/drivers/connector/connector.c | 4 +- trunk/drivers/crypto/atmel-aes.c | 6 +- trunk/drivers/crypto/atmel-sha.c | 6 +- trunk/drivers/crypto/atmel-tdes.c | 6 +- trunk/drivers/crypto/bfin_crc.c | 6 +- trunk/drivers/crypto/caam/ctrl.c | 2 +- trunk/drivers/crypto/geode-aes.c | 8 +- trunk/drivers/crypto/hifn_795x.c | 6 +- trunk/drivers/crypto/mv_cesa.c | 2 +- trunk/drivers/crypto/n2_core.c | 46 ++--- trunk/drivers/crypto/nx/nx.c | 7 +- trunk/drivers/crypto/omap-sham.c | 4 +- trunk/drivers/crypto/picoxcell_crypto.c | 6 +- trunk/drivers/crypto/tegra-aes.c | 6 +- trunk/drivers/devfreq/exynos4_bus.c | 6 +- trunk/drivers/dma/dw_dmac.c | 2 +- trunk/drivers/dma/edma.c | 2 +- trunk/drivers/dma/intel_mid_dma.c | 2 +- trunk/drivers/dma/ioat/dca.c | 9 +- trunk/drivers/dma/ioat/dma.c | 12 +- trunk/drivers/dma/ioat/dma.h | 13 +- trunk/drivers/dma/ioat/dma_v2.c | 2 +- trunk/drivers/dma/ioat/dma_v2.h | 8 +- trunk/drivers/dma/ioat/dma_v3.c | 8 +- trunk/drivers/dma/ioat/pci.c | 9 +- trunk/drivers/dma/iop-adma.c | 2 +- trunk/drivers/dma/mmp_pdma.c | 2 +- trunk/drivers/dma/mmp_tdma.c | 2 +- trunk/drivers/dma/mpc512x_dma.c | 2 +- trunk/drivers/dma/pch_dma.c | 2 +- trunk/drivers/dma/pl330.c | 2 +- trunk/drivers/dma/ppc4xx/adma.c | 4 +- trunk/drivers/dma/sa11x0-dma.c | 2 +- trunk/drivers/dma/sh/shdma.c | 2 +- trunk/drivers/dma/sirf-dma.c | 2 +- trunk/drivers/dma/tegra20-apb-dma.c | 6 +- trunk/drivers/dma/timb_dma.c | 2 +- trunk/drivers/edac/amd64_edac.c | 8 +- trunk/drivers/edac/amd76x_edac.c | 8 +- trunk/drivers/edac/cell_edac.c | 8 +- trunk/drivers/edac/cpc925_edac.c | 2 +- trunk/drivers/edac/e752x_edac.c | 7 +- trunk/drivers/edac/e7xxx_edac.c | 7 +- trunk/drivers/edac/highbank_l2_edac.c | 2 +- trunk/drivers/edac/highbank_mc_edac.c | 6 +- trunk/drivers/edac/i3000_edac.c | 7 +- trunk/drivers/edac/i3200_edac.c | 7 +- trunk/drivers/edac/i5000_edac.c | 7 +- trunk/drivers/edac/i5100_edac.c | 24 +-- trunk/drivers/edac/i5400_edac.c | 7 +- trunk/drivers/edac/i7300_edac.c | 9 +- trunk/drivers/edac/i7core_edac.c | 7 +- trunk/drivers/edac/i82443bxgx_edac.c | 8 +- trunk/drivers/edac/i82860_edac.c | 8 +- trunk/drivers/edac/i82875p_edac.c | 8 +- trunk/drivers/edac/i82975x_edac.c | 8 +- trunk/drivers/edac/mpc85xx_edac.c | 8 +- trunk/drivers/edac/mv64x60_edac.c | 10 +- trunk/drivers/edac/octeon_edac-l2c.c | 2 +- trunk/drivers/edac/octeon_edac-lmc.c | 2 +- trunk/drivers/edac/octeon_edac-pc.c | 2 +- trunk/drivers/edac/octeon_edac-pci.c | 2 +- trunk/drivers/edac/pasemi_edac.c | 8 +- trunk/drivers/edac/ppc4xx_edac.c | 27 +-- trunk/drivers/edac/r82600_edac.c | 8 +- trunk/drivers/edac/sb_edac.c | 7 +- trunk/drivers/edac/tile_edac.c | 8 +- trunk/drivers/edac/x38_edac.c | 7 +- trunk/drivers/firmware/dcdbas.c | 6 +- trunk/drivers/gpio/gpio-da9055.c | 8 +- trunk/drivers/gpio/gpio-ts5500.c | 6 +- trunk/drivers/gpio/gpio-viperboard.c | 6 +- trunk/drivers/gpu/drm/ast/ast_drv.c | 3 +- trunk/drivers/gpu/drm/cirrus/cirrus_drv.c | 4 +- trunk/drivers/gpu/drm/drm_mm.c | 41 ++--- trunk/drivers/gpu/drm/exynos/exynos_ddc.c | 2 +- trunk/drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +- .../drivers/gpu/drm/exynos/exynos_drm_fimc.c | 6 +- .../drivers/gpu/drm/exynos/exynos_drm_fimd.c | 6 +- trunk/drivers/gpu/drm/exynos/exynos_drm_g2d.c | 6 +- trunk/drivers/gpu/drm/exynos/exynos_drm_gsc.c | 6 +- .../drivers/gpu/drm/exynos/exynos_drm_hdmi.c | 6 +- trunk/drivers/gpu/drm/exynos/exynos_drm_ipp.c | 6 +- .../gpu/drm/exynos/exynos_drm_rotator.c | 6 +- .../drivers/gpu/drm/exynos/exynos_drm_vidi.c | 6 +- trunk/drivers/gpu/drm/exynos/exynos_hdmi.c | 8 +- trunk/drivers/gpu/drm/exynos/exynos_hdmiphy.c | 2 +- trunk/drivers/gpu/drm/exynos/exynos_mixer.c | 12 +- .../gpu/drm/gma500/tc35876x-dsi-lvds.c | 4 +- trunk/drivers/gpu/drm/i915/i915_dma.c | 3 - trunk/drivers/gpu/drm/i915/i915_drv.c | 3 +- trunk/drivers/gpu/drm/i915/i915_drv.h | 8 - trunk/drivers/gpu/drm/i915/i915_gem.c | 77 +++++---- trunk/drivers/gpu/drm/i915/i915_gem_dmabuf.c | 2 +- .../gpu/drm/i915/i915_gem_execbuffer.c | 2 - trunk/drivers/gpu/drm/i915/i915_irq.c | 12 -- trunk/drivers/gpu/drm/i915/i915_reg.h | 4 +- trunk/drivers/gpu/drm/i915/intel_display.c | 23 +-- trunk/drivers/gpu/drm/i915/intel_pm.c | 160 ++---------------- trunk/drivers/gpu/drm/i915/intel_ringbuffer.c | 76 +-------- trunk/drivers/gpu/drm/i915/intel_ringbuffer.h | 1 - trunk/drivers/gpu/drm/mgag200/mgag200_drv.c | 3 +- .../nouveau/core/engine/graph/fuc/gpcnve0.fuc | 5 - .../core/engine/graph/fuc/gpcnve0.fuc.h | 17 +- .../nouveau/core/engine/graph/fuc/hubnvc0.fuc | 10 -- .../core/engine/graph/fuc/hubnvc0.fuc.h | 147 ++++++++-------- .../nouveau/core/engine/graph/fuc/hubnve0.fuc | 13 -- .../core/engine/graph/fuc/hubnve0.fuc.h | 157 +++++++++-------- .../gpu/drm/nouveau/core/engine/graph/nvc0.c | 11 +- .../gpu/drm/nouveau/core/engine/graph/nvc0.h | 1 - .../gpu/drm/nouveau/core/engine/graph/nve0.c | 3 +- .../drm/nouveau/core/include/subdev/bios.h | 1 - .../nouveau/core/include/subdev/bios/gpio.h | 8 +- .../nouveau/core/include/subdev/bios/init.h | 1 - .../drm/nouveau/core/include/subdev/gpio.h | 2 +- .../gpu/drm/nouveau/core/subdev/bios/base.c | 5 +- .../gpu/drm/nouveau/core/subdev/bios/gpio.c | 128 ++++++-------- .../gpu/drm/nouveau/core/subdev/bios/init.c | 65 +------ .../gpu/drm/nouveau/core/subdev/device/nve0.c | 28 --- .../gpu/drm/nouveau/core/subdev/gpio/base.c | 9 +- .../gpu/drm/nouveau/core/subdev/gpio/nv50.c | 9 +- .../gpu/drm/nouveau/core/subdev/gpio/nvd0.c | 9 +- .../gpu/drm/nouveau/core/subdev/mxm/base.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_drm.c | 4 +- trunk/drivers/gpu/drm/nouveau/nouveau_pm.c | 4 +- trunk/drivers/gpu/drm/radeon/evergreen.c | 86 +++------- trunk/drivers/gpu/drm/radeon/evergreen_cs.c | 30 ---- trunk/drivers/gpu/drm/radeon/evergreend.h | 14 +- trunk/drivers/gpu/drm/radeon/ni.c | 106 +++--------- trunk/drivers/gpu/drm/radeon/nid.h | 3 +- trunk/drivers/gpu/drm/radeon/r600.c | 89 +++------- trunk/drivers/gpu/drm/radeon/r600_cs.c | 29 ---- trunk/drivers/gpu/drm/radeon/radeon.h | 8 +- trunk/drivers/gpu/drm/radeon/radeon_combios.c | 51 ------ .../gpu/drm/radeon/radeon_connectors.c | 10 +- trunk/drivers/gpu/drm/radeon/radeon_device.c | 17 +- trunk/drivers/gpu/drm/radeon/radeon_display.c | 13 +- trunk/drivers/gpu/drm/radeon/radeon_drv.c | 7 +- trunk/drivers/gpu/drm/radeon/radeon_fence.c | 49 ++---- trunk/drivers/gpu/drm/radeon/radeon_i2c.c | 10 +- trunk/drivers/gpu/drm/radeon/radeon_mode.h | 5 +- trunk/drivers/gpu/drm/radeon/radeon_pm.c | 15 +- trunk/drivers/gpu/drm/radeon/radeon_ring.c | 24 +-- trunk/drivers/gpu/drm/radeon/si.c | 78 ++------- trunk/drivers/gpu/drm/radeon/sid.h | 18 -- .../drivers/gpu/drm/shmobile/shmob_drm_drv.c | 10 +- trunk/drivers/gpu/drm/tegra/dc.c | 11 +- trunk/drivers/gpu/drm/tegra/drm.h | 18 ++ trunk/drivers/gpu/drm/tegra/hdmi.c | 25 ++- trunk/drivers/gpu/drm/tegra/host1x.c | 2 - trunk/drivers/hid/i2c-hid/i2c-hid.c | 12 +- trunk/drivers/hsi/clients/hsi_char.c | 8 +- trunk/drivers/hwmon/emc6w201.c | 2 +- trunk/drivers/hwmon/lm73.c | 16 +- trunk/drivers/hwmon/vexpress.c | 4 +- trunk/drivers/i2c/busses/i2c-ali1535.c | 8 +- trunk/drivers/i2c/busses/i2c-ali1563.c | 10 +- trunk/drivers/i2c/busses/i2c-ali15x3.c | 8 +- trunk/drivers/i2c/busses/i2c-amd756.c | 7 +- trunk/drivers/i2c/busses/i2c-amd8111.c | 7 +- trunk/drivers/i2c/busses/i2c-at91.c | 14 +- trunk/drivers/i2c/busses/i2c-au1550.c | 6 +- trunk/drivers/i2c/busses/i2c-cpm.c | 8 +- .../i2c/busses/i2c-designware-pcidrv.c | 6 +- .../i2c/busses/i2c-designware-platdrv.c | 6 +- trunk/drivers/i2c/busses/i2c-eg20t.c | 6 +- trunk/drivers/i2c/busses/i2c-elektor.c | 8 +- trunk/drivers/i2c/busses/i2c-gpio.c | 8 +- trunk/drivers/i2c/busses/i2c-highlander.c | 6 +- trunk/drivers/i2c/busses/i2c-hydra.c | 6 +- trunk/drivers/i2c/busses/i2c-i801.c | 28 +-- trunk/drivers/i2c/busses/i2c-ibm_iic.c | 8 +- trunk/drivers/i2c/busses/i2c-intel-mid.c | 6 +- trunk/drivers/i2c/busses/i2c-isch.c | 6 +- trunk/drivers/i2c/busses/i2c-mpc.c | 38 ++--- trunk/drivers/i2c/busses/i2c-mv64xxx.c | 18 +- trunk/drivers/i2c/busses/i2c-mxs.c | 6 +- trunk/drivers/i2c/busses/i2c-nforce2.c | 12 +- trunk/drivers/i2c/busses/i2c-nuc900.c | 6 +- trunk/drivers/i2c/busses/i2c-ocores.c | 6 +- trunk/drivers/i2c/busses/i2c-octeon.c | 10 +- trunk/drivers/i2c/busses/i2c-omap.c | 6 +- trunk/drivers/i2c/busses/i2c-parport-light.c | 6 +- trunk/drivers/i2c/busses/i2c-pasemi.c | 6 +- trunk/drivers/i2c/busses/i2c-pca-isa.c | 8 +- trunk/drivers/i2c/busses/i2c-pca-platform.c | 6 +- trunk/drivers/i2c/busses/i2c-piix4.c | 32 ++-- trunk/drivers/i2c/busses/i2c-pmcmsp.c | 6 +- trunk/drivers/i2c/busses/i2c-pnx.c | 6 +- trunk/drivers/i2c/busses/i2c-powermac.c | 16 +- trunk/drivers/i2c/busses/i2c-puv3.c | 6 +- trunk/drivers/i2c/busses/i2c-pxa-pci.c | 6 +- trunk/drivers/i2c/busses/i2c-rcar.c | 6 +- trunk/drivers/i2c/busses/i2c-s6000.c | 8 +- trunk/drivers/i2c/busses/i2c-sh7760.c | 8 +- trunk/drivers/i2c/busses/i2c-sh_mobile.c | 2 +- trunk/drivers/i2c/busses/i2c-sirf.c | 8 +- trunk/drivers/i2c/busses/i2c-sis5595.c | 4 +- trunk/drivers/i2c/busses/i2c-sis630.c | 8 +- trunk/drivers/i2c/busses/i2c-sis96x.c | 6 +- trunk/drivers/i2c/busses/i2c-tegra.c | 8 +- trunk/drivers/i2c/busses/i2c-via.c | 6 +- trunk/drivers/i2c/busses/i2c-viapro.c | 4 +- trunk/drivers/i2c/busses/i2c-viperboard.c | 6 +- trunk/drivers/i2c/busses/i2c-xiic.c | 8 +- trunk/drivers/i2c/busses/i2c-xlr.c | 6 +- trunk/drivers/i2c/busses/scx200_acb.c | 16 +- trunk/drivers/i2c/muxes/i2c-mux-gpio.c | 14 +- trunk/drivers/i2c/muxes/i2c-mux-pinctrl.c | 8 +- trunk/drivers/ide/aec62xx.c | 8 +- trunk/drivers/ide/alim15x3.c | 10 +- trunk/drivers/ide/amd74xx.c | 4 +- trunk/drivers/ide/atiixp.c | 4 +- trunk/drivers/ide/cmd64x.c | 4 +- trunk/drivers/ide/cs5520.c | 4 +- trunk/drivers/ide/cs5530.c | 6 +- trunk/drivers/ide/cs5535.c | 5 +- trunk/drivers/ide/cy82c693.c | 11 +- trunk/drivers/ide/delkin_cb.c | 5 +- trunk/drivers/ide/hpt366.c | 42 ++--- trunk/drivers/ide/icside.c | 15 +- trunk/drivers/ide/ide-pci-generic.c | 4 +- trunk/drivers/ide/ide_platform.c | 14 +- trunk/drivers/ide/it8172.c | 5 +- trunk/drivers/ide/it8213.c | 4 +- trunk/drivers/ide/it821x.c | 10 +- trunk/drivers/ide/jmicron.c | 4 +- trunk/drivers/ide/ns87415.c | 8 +- trunk/drivers/ide/opti621.c | 4 +- trunk/drivers/ide/palm_bk3710.c | 7 +- trunk/drivers/ide/pdc202xx_new.c | 10 +- trunk/drivers/ide/pdc202xx_old.c | 8 +- trunk/drivers/ide/piix.c | 8 +- trunk/drivers/ide/pmac.c | 16 +- trunk/drivers/ide/rapide.c | 7 +- trunk/drivers/ide/rz1000.c | 6 +- trunk/drivers/ide/sc1200.c | 4 +- trunk/drivers/ide/scc_pata.c | 20 ++- trunk/drivers/ide/serverworks.c | 4 +- trunk/drivers/ide/sgiioc4.c | 13 +- trunk/drivers/ide/siimage.c | 13 +- trunk/drivers/ide/sis5513.c | 10 +- trunk/drivers/ide/sl82c105.c | 4 +- trunk/drivers/ide/slc90e66.c | 5 +- trunk/drivers/ide/tc86c001.c | 12 +- trunk/drivers/ide/triflex.c | 5 +- trunk/drivers/ide/trm290.c | 6 +- trunk/drivers/ide/via82cxxx.c | 8 +- trunk/drivers/iio/accel/hid-sensor-accel-3d.c | 4 +- trunk/drivers/iio/adc/ad7266.c | 8 +- trunk/drivers/iio/adc/ad7298.c | 6 +- trunk/drivers/iio/adc/ad7476.c | 6 +- trunk/drivers/iio/adc/ad7791.c | 10 +- trunk/drivers/iio/adc/ad7887.c | 6 +- trunk/drivers/iio/adc/at91_adc.c | 6 +- trunk/drivers/iio/adc/lp8788_adc.c | 6 +- trunk/drivers/iio/adc/max1363.c | 10 +- trunk/drivers/iio/adc/ti_am335x_adc.c | 6 +- trunk/drivers/iio/adc/viperboard_adc.c | 6 +- trunk/drivers/iio/amplifiers/ad8366.c | 6 +- trunk/drivers/iio/dac/ad5064.c | 18 +- trunk/drivers/iio/dac/ad5360.c | 8 +- trunk/drivers/iio/dac/ad5380.c | 22 +-- trunk/drivers/iio/dac/ad5421.c | 6 +- trunk/drivers/iio/dac/ad5446.c | 18 +- trunk/drivers/iio/dac/ad5449.c | 6 +- trunk/drivers/iio/dac/ad5504.c | 6 +- trunk/drivers/iio/dac/ad5624r_spi.c | 6 +- trunk/drivers/iio/dac/ad5686.c | 6 +- trunk/drivers/iio/dac/ad5755.c | 16 +- trunk/drivers/iio/dac/ad5764.c | 6 +- trunk/drivers/iio/dac/ad5791.c | 6 +- trunk/drivers/iio/dac/max517.c | 6 +- trunk/drivers/iio/dac/mcp4725.c | 8 +- trunk/drivers/iio/frequency/ad9523.c | 6 +- trunk/drivers/iio/frequency/adf4350.c | 6 +- trunk/drivers/iio/gyro/hid-sensor-gyro-3d.c | 4 +- trunk/drivers/iio/light/adjd_s311.c | 8 +- trunk/drivers/iio/light/hid-sensor-als.c | 4 +- trunk/drivers/iio/light/lm3533-als.c | 19 ++- trunk/drivers/iio/light/vcnl4000.c | 8 +- .../iio/magnetometer/hid-sensor-magn-3d.c | 4 +- trunk/drivers/infiniband/hw/amso1100/c2.c | 7 +- trunk/drivers/infiniband/hw/amso1100/c2.h | 8 +- trunk/drivers/infiniband/hw/amso1100/c2_pd.c | 4 +- trunk/drivers/infiniband/hw/amso1100/c2_qp.c | 4 +- .../drivers/infiniband/hw/amso1100/c2_rnic.c | 4 +- trunk/drivers/infiniband/hw/ehca/ehca_main.c | 6 +- .../infiniband/hw/ipath/ipath_driver.c | 12 +- .../drivers/infiniband/hw/mthca/mthca_main.c | 9 +- trunk/drivers/infiniband/hw/nes/nes.c | 6 +- trunk/drivers/infiniband/hw/qib/qib_init.c | 12 +- trunk/drivers/input/keyboard/gpio_keys.c | 13 +- .../drivers/input/keyboard/gpio_keys_polled.c | 13 +- trunk/drivers/input/keyboard/tca8418_keypad.c | 2 +- trunk/drivers/input/mouse/sentelic.c | 2 +- trunk/drivers/iommu/intel-iommu.c | 4 +- trunk/drivers/iommu/omap-iommu.c | 6 +- trunk/drivers/iommu/tegra-gart.c | 4 +- trunk/drivers/iommu/tegra-smmu.c | 4 +- trunk/drivers/isdn/hardware/avm/b1pci.c | 8 +- trunk/drivers/isdn/hardware/avm/c4.c | 3 +- trunk/drivers/isdn/hardware/avm/t1pci.c | 3 +- trunk/drivers/isdn/hardware/eicon/divasmain.c | 9 +- trunk/drivers/isdn/hardware/mISDN/avmfritz.c | 10 +- trunk/drivers/isdn/hardware/mISDN/hfcmulti.c | 6 +- trunk/drivers/isdn/hardware/mISDN/hfcpci.c | 6 +- .../isdn/hardware/mISDN/mISDNinfineon.c | 16 +- trunk/drivers/isdn/hardware/mISDN/netjet.c | 10 +- trunk/drivers/isdn/hardware/mISDN/speedfax.c | 14 +- trunk/drivers/isdn/hardware/mISDN/w6692.c | 6 +- trunk/drivers/isdn/hisax/amd7930_fn.c | 3 +- trunk/drivers/isdn/hisax/asuscom.c | 9 +- trunk/drivers/isdn/hisax/avm_a1.c | 3 +- trunk/drivers/isdn/hisax/avm_a1p.c | 2 +- trunk/drivers/isdn/hisax/avm_pci.c | 17 +- trunk/drivers/isdn/hisax/avma1_cs.c | 12 +- trunk/drivers/isdn/hisax/bkm_a4t.c | 16 +- trunk/drivers/isdn/hisax/bkm_a8.c | 18 +- trunk/drivers/isdn/hisax/config.c | 26 ++- trunk/drivers/isdn/hisax/diva.c | 31 ++-- trunk/drivers/isdn/hisax/elsa.c | 31 ++-- trunk/drivers/isdn/hisax/elsa_cs.c | 12 +- trunk/drivers/isdn/hisax/enternow_pci.c | 14 +- trunk/drivers/isdn/hisax/gazel.c | 11 +- trunk/drivers/isdn/hisax/hfc4s8s_l1.c | 16 +- trunk/drivers/isdn/hisax/hfc_pci.c | 4 +- trunk/drivers/isdn/hisax/hfc_sx.c | 9 +- trunk/drivers/isdn/hisax/hfcscard.c | 9 +- trunk/drivers/isdn/hisax/hisax_fcpcipnp.c | 22 +-- trunk/drivers/isdn/hisax/icc.c | 3 +- trunk/drivers/isdn/hisax/isac.c | 7 +- trunk/drivers/isdn/hisax/isurf.c | 5 +- trunk/drivers/isdn/hisax/ix1_micro.c | 9 +- trunk/drivers/isdn/hisax/mic.c | 3 +- trunk/drivers/isdn/hisax/niccy.c | 6 +- trunk/drivers/isdn/hisax/nj_s.c | 14 +- trunk/drivers/isdn/hisax/nj_u.c | 14 +- trunk/drivers/isdn/hisax/s0box.c | 3 +- trunk/drivers/isdn/hisax/saphir.c | 3 +- trunk/drivers/isdn/hisax/sedlbauer.c | 23 ++- trunk/drivers/isdn/hisax/sedlbauer_cs.c | 12 +- trunk/drivers/isdn/hisax/sportster.c | 6 +- trunk/drivers/isdn/hisax/teleint.c | 3 +- trunk/drivers/isdn/hisax/teles0.c | 3 +- trunk/drivers/isdn/hisax/teles3.c | 9 +- trunk/drivers/isdn/hisax/teles_cs.c | 12 +- trunk/drivers/isdn/hisax/telespci.c | 5 +- trunk/drivers/isdn/hisax/w6692.c | 5 +- trunk/drivers/isdn/hysdn/hysdn_init.c | 8 +- trunk/drivers/isdn/mISDN/core.c | 4 + trunk/drivers/leds/leds-gpio.c | 5 +- trunk/drivers/macintosh/macio_asic.c | 6 +- trunk/drivers/macintosh/mediabay.c | 3 +- trunk/drivers/macintosh/rack-meter.c | 12 +- .../macintosh/windfarm_ad7417_sensor.c | 18 +- .../drivers/macintosh/windfarm_fcu_controls.c | 21 +-- trunk/drivers/macintosh/windfarm_pm112.c | 4 +- trunk/drivers/macintosh/windfarm_pm121.c | 4 +- trunk/drivers/macintosh/windfarm_pm72.c | 2 +- trunk/drivers/macintosh/windfarm_pm81.c | 4 +- trunk/drivers/macintosh/windfarm_pm91.c | 4 +- trunk/drivers/macintosh/windfarm_rm31.c | 2 +- trunk/drivers/media/i2c/adv7180.c | 8 +- trunk/drivers/media/i2c/adv7183.c | 2 +- trunk/drivers/media/i2c/as3645a.c | 10 +- trunk/drivers/media/i2c/m5mols/m5mols_core.c | 8 +- trunk/drivers/media/i2c/vs6624.c | 6 +- trunk/drivers/media/mmc/siano/smssdio.c | 4 +- trunk/drivers/media/pci/bt8xx/bt878.c | 11 +- trunk/drivers/media/pci/bt8xx/bttv-cards.c | 34 ++-- trunk/drivers/media/pci/bt8xx/bttv-driver.c | 9 +- trunk/drivers/media/pci/bt8xx/bttv-i2c.c | 6 +- trunk/drivers/media/pci/bt8xx/bttv-input.c | 4 +- trunk/drivers/media/pci/bt8xx/dvb-bt8xx.c | 7 +- trunk/drivers/media/pci/cx18/cx18-driver.c | 14 +- .../drivers/media/pci/cx23885/cx23885-core.c | 8 +- .../drivers/media/pci/cx25821/cx25821-core.c | 8 +- trunk/drivers/media/pci/cx88/cx88-alsa.c | 19 ++- trunk/drivers/media/pci/cx88/cx88-mpeg.c | 8 +- trunk/drivers/media/pci/cx88/cx88-video.c | 8 +- .../media/pci/ddbridge/ddbridge-core.c | 9 +- trunk/drivers/media/pci/dm1105/dm1105.c | 20 +-- trunk/drivers/media/pci/ivtv/ivtv-driver.c | 9 +- trunk/drivers/media/pci/mantis/hopper_cards.c | 9 +- trunk/drivers/media/pci/mantis/mantis_cards.c | 9 +- trunk/drivers/media/pci/mantis/mantis_dvb.c | 4 +- trunk/drivers/media/pci/mantis/mantis_i2c.c | 2 +- trunk/drivers/media/pci/mantis/mantis_pci.c | 2 +- trunk/drivers/media/pci/meye/meye.c | 7 +- trunk/drivers/media/pci/ngene/ngene-cards.c | 4 +- trunk/drivers/media/pci/ngene/ngene-core.c | 5 +- trunk/drivers/media/pci/ngene/ngene.h | 5 +- trunk/drivers/media/pci/pluto2/pluto2.c | 25 +-- trunk/drivers/media/pci/pt1/pt1.c | 7 +- .../drivers/media/pci/saa7134/saa7134-core.c | 10 +- trunk/drivers/media/pci/saa7134/saa7134.h | 2 +- .../drivers/media/pci/saa7164/saa7164-core.c | 8 +- trunk/drivers/media/pci/sta2x11/sta2x11_vip.c | 8 +- trunk/drivers/media/pci/ttpci/av7110.c | 8 +- trunk/drivers/media/pci/ttpci/av7110_ir.c | 4 +- trunk/drivers/media/pci/zoran/zoran_card.c | 20 ++- trunk/drivers/media/pci/zoran/zoran_driver.c | 2 +- .../media/platform/blackfin/bfin_capture.c | 6 +- trunk/drivers/media/platform/coda.c | 4 +- .../media/platform/davinci/dm355_ccdc.c | 4 +- .../media/platform/davinci/dm644x_ccdc.c | 4 +- trunk/drivers/media/platform/davinci/isif.c | 4 +- trunk/drivers/media/platform/davinci/vpbe.c | 2 +- .../media/platform/davinci/vpbe_display.c | 15 +- .../media/platform/davinci/vpfe_capture.c | 6 +- trunk/drivers/media/platform/davinci/vpif.c | 6 +- trunk/drivers/media/platform/davinci/vpss.c | 6 +- .../media/platform/exynos-gsc/gsc-core.c | 4 +- trunk/drivers/media/platform/fsl-viu.c | 6 +- trunk/drivers/media/platform/omap24xxcam.c | 2 +- trunk/drivers/media/platform/omap3isp/isp.c | 8 +- .../media/platform/s3c-camif/camif-core.c | 4 +- .../media/platform/s5p-fimc/fimc-core.c | 4 +- .../media/platform/s5p-fimc/fimc-lite.c | 6 +- .../media/platform/s5p-fimc/fimc-mdevice.c | 4 +- .../media/platform/s5p-fimc/mipi-csis.c | 6 +- .../drivers/media/platform/s5p-mfc/s5p_mfc.c | 4 +- .../drivers/media/platform/s5p-tv/hdmi_drv.c | 6 +- .../media/platform/s5p-tv/hdmiphy_drv.c | 8 +- trunk/drivers/media/platform/s5p-tv/mixer.h | 2 +- .../drivers/media/platform/s5p-tv/mixer_drv.c | 18 +- .../media/platform/s5p-tv/mixer_video.c | 4 +- trunk/drivers/media/platform/s5p-tv/sdo_drv.c | 6 +- .../media/platform/s5p-tv/sii9234_drv.c | 8 +- trunk/drivers/media/platform/sh_vou.c | 6 +- .../media/platform/soc_camera/atmel-isi.c | 6 +- .../media/platform/soc_camera/mx2_camera.c | 8 +- .../media/platform/soc_camera/mx3_camera.c | 6 +- .../media/platform/soc_camera/pxa_camera.c | 6 +- .../soc_camera/sh_mobile_ceu_camera.c | 6 +- .../platform/soc_camera/sh_mobile_csi2.c | 6 +- .../media/platform/soc_camera/soc_camera.c | 6 +- trunk/drivers/media/platform/timblogiw.c | 12 +- trunk/drivers/media/platform/via-camera.c | 6 +- trunk/drivers/media/radio/radio-maxiradio.c | 7 +- trunk/drivers/media/radio/radio-sf16fmi.c | 2 +- trunk/drivers/media/radio/radio-sf16fmr2.c | 19 ++- trunk/drivers/media/radio/radio-tea5764.c | 8 +- trunk/drivers/media/radio/radio-timb.c | 6 +- trunk/drivers/media/radio/radio-wl1273.c | 4 +- trunk/drivers/media/radio/saa7706h.c | 8 +- .../media/radio/si470x/radio-si470x-i2c.c | 8 +- trunk/drivers/media/radio/tef6862.c | 8 +- trunk/drivers/media/rc/ene_ir.c | 2 +- trunk/drivers/media/rc/fintek-cir.c | 4 +- trunk/drivers/media/rc/gpio-ir-recv.c | 6 +- trunk/drivers/media/rc/iguanair.c | 8 +- trunk/drivers/media/rc/imon.c | 8 +- trunk/drivers/media/rc/ir-rx51.c | 2 +- trunk/drivers/media/rc/ite-cir.c | 4 +- trunk/drivers/media/rc/mceusb.c | 8 +- trunk/drivers/media/rc/nuvoton-cir.c | 4 +- trunk/drivers/media/rc/redrat3.c | 8 +- trunk/drivers/media/rc/streamzap.c | 4 +- trunk/drivers/media/rc/ttusbir.c | 8 +- trunk/drivers/media/rc/winbond-cir.c | 6 +- trunk/drivers/media/usb/gspca/spca506.c | 3 +- trunk/drivers/media/usb/siano/smsusb.c | 2 +- .../media/usb/usbvision/usbvision-video.c | 10 +- trunk/drivers/media/usb/uvc/uvc_ctrl.c | 19 ++- trunk/drivers/media/usb/uvc/uvc_v4l2.c | 12 +- trunk/drivers/memory/tegra20-mc.c | 4 +- trunk/drivers/memory/tegra30-mc.c | 4 +- trunk/drivers/message/fusion/mptfc.c | 7 +- trunk/drivers/message/fusion/mptsas.c | 4 +- trunk/drivers/message/fusion/mptspi.c | 2 +- trunk/drivers/message/i2o/pci.c | 11 +- trunk/drivers/mfd/max8997.c | 2 +- trunk/drivers/mfd/retu-mfd.c | 5 +- trunk/drivers/mfd/rtsx_pcr.c | 8 +- trunk/drivers/mfd/sta2x11-mfd.c | 8 +- trunk/drivers/mfd/stmpe.c | 15 +- trunk/drivers/mfd/ti_am335x_tscadc.c | 6 +- trunk/drivers/mfd/tps80031.c | 11 +- trunk/drivers/mfd/twl6040.c | 8 +- trunk/drivers/mfd/vexpress-sysreg.c | 2 +- trunk/drivers/mmc/host/dw_mmc-pci.c | 2 +- trunk/drivers/mmc/host/dw_mmc-pltfm.c | 2 +- trunk/drivers/mmc/host/sdhci-acpi.c | 6 +- trunk/drivers/mmc/host/wmt-sdmmc.c | 4 +- trunk/drivers/mtd/devices/mtd_dataflash.c | 10 +- trunk/drivers/mtd/devices/spear_smi.c | 4 +- trunk/drivers/mtd/maps/esb2rom.c | 2 +- trunk/drivers/mtd/maps/intel_vr_nor.c | 3 +- trunk/drivers/mtd/maps/pci.c | 6 +- trunk/drivers/mtd/maps/physmap_of.c | 2 +- trunk/drivers/mtd/maps/pismo.c | 15 +- trunk/drivers/mtd/maps/scb2_flash.c | 10 +- trunk/drivers/mtd/nand/atmel_nand.c | 6 +- trunk/drivers/mtd/nand/bcm47xxnflash/main.c | 4 +- trunk/drivers/mtd/nand/fsl_upm.c | 4 +- trunk/drivers/mtd/nand/fsmc_nand.c | 4 +- trunk/drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 7 +- trunk/drivers/mtd/nand/jz4740_nand.c | 3 +- trunk/drivers/net/ethernet/marvell/mvmdio.c | 6 +- trunk/drivers/net/ethernet/marvell/mvneta.c | 19 ++- trunk/drivers/net/ethernet/ti/cpts.c | 3 +- trunk/drivers/net/ethernet/ti/cpts.h | 1 + trunk/drivers/net/tun.c | 24 ++- trunk/drivers/net/vxlan.c | 6 +- .../net/wireless/rtlwifi/rtl8723ae/sw.c | 2 +- trunk/drivers/nfc/pn544/i2c.c | 8 +- trunk/drivers/parisc/dino.c | 2 +- trunk/drivers/parisc/lba_pci.c | 2 +- trunk/drivers/parport/parport_gsc.c | 23 +-- trunk/drivers/parport/parport_pc.c | 55 +++--- trunk/drivers/parport/parport_serial.c | 21 +-- trunk/drivers/parport/parport_sunbpp.c | 6 +- trunk/drivers/pci/pci-sysfs.c | 85 ++++++---- trunk/drivers/pci/pcie/portdrv_pci.c | 20 +-- trunk/drivers/pci/quirks.c | 7 +- trunk/drivers/pinctrl/core.c | 2 +- .../pinctrl/mvebu/pinctrl-armada-370.c | 8 +- .../drivers/pinctrl/mvebu/pinctrl-armada-xp.c | 8 +- trunk/drivers/pinctrl/mvebu/pinctrl-dove.c | 8 +- .../drivers/pinctrl/mvebu/pinctrl-kirkwood.c | 8 +- trunk/drivers/pinctrl/mvebu/pinctrl-mvebu.c | 11 +- trunk/drivers/pinctrl/pinctrl-at91.c | 39 ++--- trunk/drivers/pinctrl/pinctrl-bcm2835.c | 2 +- trunk/drivers/pinctrl/pinctrl-exynos5440.c | 2 +- trunk/drivers/pinctrl/pinctrl-imx.c | 19 +-- trunk/drivers/pinctrl/pinctrl-imx23.c | 2 +- trunk/drivers/pinctrl/pinctrl-imx28.c | 2 +- trunk/drivers/pinctrl/pinctrl-imx35.c | 2 +- trunk/drivers/pinctrl/pinctrl-imx51.c | 2 +- trunk/drivers/pinctrl/pinctrl-imx53.c | 4 +- trunk/drivers/pinctrl/pinctrl-imx6q.c | 2 +- trunk/drivers/pinctrl/pinctrl-mmp2.c | 2 +- trunk/drivers/pinctrl/pinctrl-mxs.c | 14 +- .../drivers/pinctrl/pinctrl-nomadik-db8500.c | 3 +- .../drivers/pinctrl/pinctrl-nomadik-db8540.c | 3 +- .../drivers/pinctrl/pinctrl-nomadik-stn8815.c | 3 +- trunk/drivers/pinctrl/pinctrl-nomadik.c | 15 +- trunk/drivers/pinctrl/pinctrl-pxa168.c | 2 +- trunk/drivers/pinctrl/pinctrl-pxa910.c | 2 +- trunk/drivers/pinctrl/pinctrl-samsung.c | 26 ++- trunk/drivers/pinctrl/pinctrl-single.c | 9 +- trunk/drivers/pinctrl/pinctrl-sirf.c | 52 +----- trunk/drivers/pinctrl/pinctrl-tegra.c | 2 +- trunk/drivers/pinctrl/pinctrl-tegra20.c | 2 +- trunk/drivers/pinctrl/pinctrl-tegra30.c | 2 +- trunk/drivers/pinctrl/pinctrl-u300.c | 2 +- trunk/drivers/pinctrl/pinctrl-xway.c | 2 +- trunk/drivers/pinctrl/spear/pinctrl-plgpio.c | 5 +- trunk/drivers/pinctrl/spear/pinctrl-spear.c | 11 +- trunk/drivers/pinctrl/spear/pinctrl-spear.h | 11 +- .../drivers/pinctrl/spear/pinctrl-spear1310.c | 2 +- .../drivers/pinctrl/spear/pinctrl-spear1340.c | 2 +- .../drivers/pinctrl/spear/pinctrl-spear300.c | 2 +- .../drivers/pinctrl/spear/pinctrl-spear310.c | 2 +- .../drivers/pinctrl/spear/pinctrl-spear320.c | 2 +- trunk/drivers/platform/x86/acer-wmi.c | 8 +- trunk/drivers/platform/x86/acerhdf.c | 2 +- trunk/drivers/platform/x86/amilo-rfkill.c | 4 +- trunk/drivers/platform/x86/apple-gmux.c | 7 +- trunk/drivers/platform/x86/asus-laptop.c | 6 +- trunk/drivers/platform/x86/compal-laptop.c | 10 +- trunk/drivers/platform/x86/dell-laptop.c | 4 +- trunk/drivers/platform/x86/eeepc-laptop.c | 6 +- trunk/drivers/platform/x86/fujitsu-tablet.c | 17 +- trunk/drivers/platform/x86/hp-wmi.c | 8 +- trunk/drivers/platform/x86/ideapad-laptop.c | 13 +- .../drivers/platform/x86/intel_mid_powerbtn.c | 6 +- .../drivers/platform/x86/intel_mid_thermal.c | 2 +- trunk/drivers/platform/x86/intel_oaktrail.c | 6 +- trunk/drivers/platform/x86/intel_pmic_gpio.c | 2 +- trunk/drivers/platform/x86/samsung-q10.c | 6 +- trunk/drivers/platform/x86/tc1100-wmi.c | 4 +- trunk/drivers/platform/x86/thinkpad_acpi.c | 4 +- trunk/drivers/platform/x86/toshiba_acpi.c | 13 +- trunk/drivers/platform/x86/xo1-rfkill.c | 6 +- trunk/drivers/power/ab8500_bmdata.c | 6 +- trunk/drivers/power/avs/smartreflex.c | 2 + trunk/drivers/power/olpc_battery.c | 2 +- trunk/drivers/power/reset/gpio-poweroff.c | 6 +- trunk/drivers/power/rx51_battery.c | 6 +- trunk/drivers/pps/clients/pps-gpio.c | 2 +- trunk/drivers/ps3/ps3-lpm.c | 2 +- trunk/drivers/ps3/ps3-sys-manager.c | 2 +- trunk/drivers/ps3/ps3av.c | 2 +- trunk/drivers/regulator/anatop-regulator.c | 2 +- trunk/drivers/regulator/da9055-regulator.c | 12 +- trunk/drivers/regulator/fixed.c | 2 +- trunk/drivers/regulator/gpio-regulator.c | 2 +- trunk/drivers/regulator/max8973-regulator.c | 12 +- trunk/drivers/regulator/palmas-regulator.c | 2 +- trunk/drivers/regulator/twl-regulator.c | 2 +- trunk/drivers/remoteproc/omap_remoteproc.c | 6 +- trunk/drivers/rpmsg/virtio_rpmsg_bus.c | 4 +- trunk/drivers/rtc/rtc-88pm80x.c | 6 +- trunk/drivers/rtc/rtc-88pm860x.c | 10 +- trunk/drivers/rtc/rtc-ab8500.c | 6 +- trunk/drivers/rtc/rtc-at91sam9.c | 6 +- trunk/drivers/rtc/rtc-au1xxx.c | 6 +- trunk/drivers/rtc/rtc-bfin.c | 6 +- trunk/drivers/rtc/rtc-bq32k.c | 4 +- trunk/drivers/rtc/rtc-bq4802.c | 6 +- trunk/drivers/rtc/rtc-cmos.c | 9 +- trunk/drivers/rtc/rtc-da9052.c | 6 +- trunk/drivers/rtc/rtc-davinci.c | 4 +- trunk/drivers/rtc/rtc-dm355evm.c | 6 +- trunk/drivers/rtc/rtc-ds1286.c | 6 +- trunk/drivers/rtc/rtc-ds1302.c | 4 +- trunk/drivers/rtc/rtc-ds1305.c | 6 +- trunk/drivers/rtc/rtc-ds1307.c | 8 +- trunk/drivers/rtc/rtc-ds1374.c | 4 +- trunk/drivers/rtc/rtc-ds1390.c | 6 +- trunk/drivers/rtc/rtc-ds1511.c | 8 +- trunk/drivers/rtc/rtc-ds1553.c | 6 +- trunk/drivers/rtc/rtc-ds1742.c | 6 +- trunk/drivers/rtc/rtc-ds3232.c | 8 +- trunk/drivers/rtc/rtc-ds3234.c | 6 +- trunk/drivers/rtc/rtc-ep93xx.c | 6 +- trunk/drivers/rtc/rtc-fm3130.c | 8 +- trunk/drivers/rtc/rtc-imxdi.c | 4 +- trunk/drivers/rtc/rtc-jz4740.c | 6 +- trunk/drivers/rtc/rtc-lpc32xx.c | 6 +- trunk/drivers/rtc/rtc-ls1x.c | 6 +- trunk/drivers/rtc/rtc-m41t93.c | 6 +- trunk/drivers/rtc/rtc-m41t94.c | 6 +- trunk/drivers/rtc/rtc-m48t35.c | 6 +- trunk/drivers/rtc/rtc-m48t59.c | 6 +- trunk/drivers/rtc/rtc-m48t86.c | 6 +- trunk/drivers/rtc/rtc-max6902.c | 6 +- trunk/drivers/rtc/rtc-max8907.c | 6 +- trunk/drivers/rtc/rtc-max8925.c | 6 +- trunk/drivers/rtc/rtc-max8998.c | 6 +- trunk/drivers/rtc/rtc-mpc5121.c | 8 +- trunk/drivers/rtc/rtc-mrst.c | 12 +- trunk/drivers/rtc/rtc-mv.c | 2 +- trunk/drivers/rtc/rtc-mxc.c | 6 +- trunk/drivers/rtc/rtc-nuc900.c | 6 +- trunk/drivers/rtc/rtc-pcap.c | 6 +- trunk/drivers/rtc/rtc-pcf2123.c | 6 +- trunk/drivers/rtc/rtc-pcf50633.c | 6 +- trunk/drivers/rtc/rtc-pcf8563.c | 2 +- trunk/drivers/rtc/rtc-pcf8583.c | 4 +- trunk/drivers/rtc/rtc-pm8xxx.c | 6 +- trunk/drivers/rtc/rtc-puv3.c | 6 +- trunk/drivers/rtc/rtc-r9701.c | 6 +- trunk/drivers/rtc/rtc-rc5t583.c | 6 +- trunk/drivers/rtc/rtc-rs5c313.c | 4 +- trunk/drivers/rtc/rtc-rs5c348.c | 6 +- trunk/drivers/rtc/rtc-rv3029c2.c | 8 +- trunk/drivers/rtc/rtc-rx8025.c | 8 +- trunk/drivers/rtc/rtc-rx8581.c | 8 +- trunk/drivers/rtc/rtc-s3c.c | 6 +- trunk/drivers/rtc/rtc-snvs.c | 8 +- trunk/drivers/rtc/rtc-spear.c | 6 +- trunk/drivers/rtc/rtc-stk17ta8.c | 6 +- trunk/drivers/rtc/rtc-tegra.c | 6 +- trunk/drivers/rtc/rtc-test.c | 4 +- trunk/drivers/rtc/rtc-tile.c | 6 +- trunk/drivers/rtc/rtc-tps65910.c | 6 +- trunk/drivers/rtc/rtc-twl.c | 6 +- trunk/drivers/rtc/rtc-vr41xx.c | 6 +- trunk/drivers/rtc/rtc-vt8500.c | 6 +- trunk/drivers/rtc/rtc-wm831x.c | 4 +- trunk/drivers/rtc/rtc-wm8350.c | 4 +- trunk/drivers/sbus/char/bbc_i2c.c | 6 +- trunk/drivers/sbus/char/display7seg.c | 6 +- trunk/drivers/sbus/char/envctrl.c | 6 +- trunk/drivers/sbus/char/flash.c | 6 +- trunk/drivers/sbus/char/uctrl.c | 6 +- trunk/drivers/scsi/3w-9xxx.c | 4 +- trunk/drivers/scsi/3w-sas.c | 4 +- trunk/drivers/scsi/3w-xxxx.c | 4 +- trunk/drivers/scsi/BusLogic.c | 2 +- trunk/drivers/scsi/NCR5380.c | 2 +- trunk/drivers/scsi/NCR_D700.c | 12 +- trunk/drivers/scsi/NCR_Q720.c | 2 +- trunk/drivers/scsi/a100u2w.c | 8 +- trunk/drivers/scsi/a2091.c | 9 +- trunk/drivers/scsi/aacraid/linit.c | 15 +- trunk/drivers/scsi/advansys.c | 152 +++++++++-------- trunk/drivers/scsi/aha152x.c | 2 +- trunk/drivers/scsi/aha1740.c | 4 +- trunk/drivers/scsi/aic94xx/aic94xx_init.c | 23 +-- trunk/drivers/scsi/arm/acornscsi.c | 7 +- trunk/drivers/scsi/arm/arxescsi.c | 7 +- trunk/drivers/scsi/arm/cumana_1.c | 8 +- trunk/drivers/scsi/arm/cumana_2.c | 8 +- trunk/drivers/scsi/arm/eesox.c | 7 +- trunk/drivers/scsi/arm/oak.c | 7 +- trunk/drivers/scsi/arm/powertec.c | 8 +- trunk/drivers/scsi/atp870u.c | 2 +- trunk/drivers/scsi/be2iscsi/be_main.c | 4 +- trunk/drivers/scsi/bfa/bfad.c | 2 +- trunk/drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +- trunk/drivers/scsi/bnx2i/bnx2i_init.c | 2 +- trunk/drivers/scsi/bvme6000_scsi.c | 6 +- trunk/drivers/scsi/csiostor/csio_init.c | 17 +- trunk/drivers/scsi/dc395x.c | 51 +++--- trunk/drivers/scsi/dmx3191d.c | 8 +- trunk/drivers/scsi/fdomain.c | 2 +- trunk/drivers/scsi/fnic/fnic_main.c | 7 +- trunk/drivers/scsi/g_NCR5380.c | 2 +- trunk/drivers/scsi/gdth.c | 17 +- trunk/drivers/scsi/gvp11.c | 11 +- trunk/drivers/scsi/hpsa.c | 92 +++++----- trunk/drivers/scsi/hptiop.c | 3 +- trunk/drivers/scsi/ibmvscsi/ibmvfc.c | 2 +- trunk/drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +- trunk/drivers/scsi/ibmvscsi/ibmvstgt.c | 2 +- trunk/drivers/scsi/initio.c | 2 +- trunk/drivers/scsi/ipr.c | 32 ++-- trunk/drivers/scsi/ips.c | 10 +- trunk/drivers/scsi/isci/init.c | 8 +- trunk/drivers/scsi/jazz_esp.c | 6 +- trunk/drivers/scsi/lasi700.c | 2 +- trunk/drivers/scsi/lpfc/lpfc_init.c | 14 +- trunk/drivers/scsi/mac_esp.c | 6 +- trunk/drivers/scsi/megaraid.c | 6 +- trunk/drivers/scsi/megaraid/megaraid_mbox.c | 6 +- .../drivers/scsi/megaraid/megaraid_sas_base.c | 8 +- trunk/drivers/scsi/mpt2sas/mpt2sas_scsih.c | 4 +- trunk/drivers/scsi/mpt3sas/mpt3sas_scsih.c | 5 +- trunk/drivers/scsi/mvme16x_scsi.c | 8 +- trunk/drivers/scsi/mvsas/mv_64xx.c | 8 +- trunk/drivers/scsi/mvsas/mv_94xx.c | 7 +- trunk/drivers/scsi/mvsas/mv_chips.h | 2 +- trunk/drivers/scsi/mvsas/mv_init.c | 19 ++- trunk/drivers/scsi/mvsas/mv_sas.c | 4 +- trunk/drivers/scsi/mvsas/mv_sas.h | 4 +- trunk/drivers/scsi/mvumi.c | 5 +- trunk/drivers/scsi/nsp32.c | 16 +- trunk/drivers/scsi/pm8001/pm8001_hwi.c | 36 ++-- trunk/drivers/scsi/pm8001/pm8001_init.c | 28 +-- trunk/drivers/scsi/pmcraid.c | 31 ++-- trunk/drivers/scsi/ps3rom.c | 2 +- trunk/drivers/scsi/qla1280.c | 8 +- trunk/drivers/scsi/qla2xxx/qla_os.c | 2 +- trunk/drivers/scsi/qla4xxx/ql4_os.c | 6 +- trunk/drivers/scsi/qlogicfas.c | 2 +- trunk/drivers/scsi/qlogicpti.c | 20 +-- trunk/drivers/scsi/sgiwd93.c | 4 +- trunk/drivers/scsi/sim710.c | 11 +- trunk/drivers/scsi/sni_53c710.c | 4 +- trunk/drivers/scsi/stex.c | 5 +- trunk/drivers/scsi/sun3x_esp.c | 6 +- trunk/drivers/scsi/sun_esp.c | 30 ++-- trunk/drivers/scsi/sym53c416.c | 2 +- trunk/drivers/scsi/sym53c8xx_2/sym_glue.c | 23 +-- trunk/drivers/scsi/tmscsim.c | 23 +-- trunk/drivers/scsi/ufs/ufshcd.c | 5 +- trunk/drivers/scsi/virtio_scsi.c | 6 +- trunk/drivers/scsi/vmw_pvscsi.c | 9 +- trunk/drivers/scsi/zalon.c | 2 +- trunk/drivers/scsi/zorro7xx.c | 12 +- trunk/drivers/sh/pfc/gpio.c | 6 +- trunk/drivers/sh/pfc/pinctrl.c | 20 ++- trunk/drivers/sn/ioc3.c | 14 +- trunk/drivers/ssb/driver_gige.c | 14 +- trunk/drivers/ssb/driver_pcicore.c | 10 +- trunk/drivers/ssb/main.c | 27 +-- trunk/drivers/ssb/pcihost_wrapper.c | 6 +- trunk/drivers/thermal/exynos_thermal.c | 6 +- trunk/drivers/usb/host/ehci-orion.c | 2 +- trunk/drivers/video/acornfb.c | 22 +-- trunk/drivers/video/arcfb.c | 10 +- trunk/drivers/video/arkfb.c | 10 +- trunk/drivers/video/asiliantfb.c | 18 +- trunk/drivers/video/aty/aty128fb.c | 57 ++++--- trunk/drivers/video/aty/atyfb_base.c | 84 ++++----- trunk/drivers/video/aty/mach64_ct.c | 6 +- trunk/drivers/video/aty/mach64_cursor.c | 2 +- trunk/drivers/video/aty/radeon_base.c | 20 +-- trunk/drivers/video/aty/radeon_monitor.c | 24 +-- trunk/drivers/video/au1100fb.c | 6 +- trunk/drivers/video/au1200fb.c | 6 +- trunk/drivers/video/auo_k1900fb.c | 6 +- trunk/drivers/video/auo_k1901fb.c | 6 +- trunk/drivers/video/auo_k190x.c | 6 +- trunk/drivers/video/bf537-lq035.c | 18 +- trunk/drivers/video/bf54x-lq043fb.c | 6 +- trunk/drivers/video/bfin-lq035q1-fb.c | 14 +- trunk/drivers/video/bfin-t350mcqb-fb.c | 6 +- trunk/drivers/video/bfin_adv7393fb.c | 10 +- trunk/drivers/video/broadsheetfb.c | 16 +- trunk/drivers/video/bw2.c | 23 +-- trunk/drivers/video/carminefb.c | 16 +- trunk/drivers/video/cg14.c | 12 +- trunk/drivers/video/cg3.c | 26 +-- trunk/drivers/video/cg6.c | 12 +- trunk/drivers/video/chipsfb.c | 13 +- trunk/drivers/video/cirrusfb.c | 44 ++--- trunk/drivers/video/clps711xfb.c | 8 +- trunk/drivers/video/cobalt_lcdfb.c | 8 +- trunk/drivers/video/console/sticore.c | 83 +++++---- trunk/drivers/video/cyber2000fb.c | 23 +-- trunk/drivers/video/da8xx-fb.c | 10 +- trunk/drivers/video/dnfb.c | 6 +- trunk/drivers/video/efifb.c | 4 +- trunk/drivers/video/ep93xx-fb.c | 8 +- trunk/drivers/video/exynos/exynos_dp_core.c | 6 +- trunk/drivers/video/exynos/exynos_mipi_dsi.c | 4 +- trunk/drivers/video/ffb.c | 6 +- trunk/drivers/video/fm2fb.c | 14 +- trunk/drivers/video/fsl-diu-fb.c | 6 +- trunk/drivers/video/gbefb.c | 24 +-- trunk/drivers/video/geode/gx1fb_core.c | 14 +- trunk/drivers/video/geode/gxfb_core.c | 20 ++- trunk/drivers/video/geode/lxfb_core.c | 20 ++- trunk/drivers/video/grvga.c | 12 +- trunk/drivers/video/gxt4500.c | 13 +- trunk/drivers/video/hecubafb.c | 10 +- trunk/drivers/video/hgafb.c | 12 +- trunk/drivers/video/hitfb.c | 10 +- trunk/drivers/video/hpfb.c | 9 +- trunk/drivers/video/i740fb.c | 15 +- trunk/drivers/video/i810/i810_main.c | 72 ++++---- trunk/drivers/video/i810/i810_main.h | 2 +- trunk/drivers/video/igafb.c | 2 +- trunk/drivers/video/imsttfb.c | 17 +- trunk/drivers/video/imxfb.c | 4 +- trunk/drivers/video/intelfb/intelfbdrv.c | 29 ++-- trunk/drivers/video/jz4740_fb.c | 8 +- trunk/drivers/video/kyro/fbdev.c | 21 +-- trunk/drivers/video/leo.c | 6 +- trunk/drivers/video/mb862xx/mb862xxfbdrv.c | 20 +-- trunk/drivers/video/mbx/mbxdebugfs.c | 4 +- trunk/drivers/video/mbx/mbxfb.c | 18 +- trunk/drivers/video/metronomefb.c | 22 +-- trunk/drivers/video/msm/mddi.c | 9 +- trunk/drivers/video/mxsfb.c | 12 +- trunk/drivers/video/neofb.c | 26 +-- trunk/drivers/video/nuc900fb.c | 4 +- trunk/drivers/video/nvidia/nvidia.c | 49 +++--- trunk/drivers/video/omap/lcd_mipid.c | 2 +- .../video/omap2/displays/panel-acx565akm.c | 2 +- .../omap2/displays/panel-lgphilips-lb035q02.c | 6 +- .../drivers/video/omap2/displays/panel-n8x0.c | 2 +- .../omap2/displays/panel-nec-nl8048hl11-01b.c | 2 +- .../omap2/displays/panel-tpo-td043mtea1.c | 4 +- trunk/drivers/video/p9100.c | 6 +- trunk/drivers/video/platinumfb.c | 11 +- trunk/drivers/video/pm2fb.c | 17 +- trunk/drivers/video/pm3fb.c | 17 +- trunk/drivers/video/pmag-ba-fb.c | 6 +- trunk/drivers/video/pmagb-b-fb.c | 12 +- trunk/drivers/video/ps3fb.c | 4 +- trunk/drivers/video/pvr2fb.c | 28 +-- trunk/drivers/video/pxa168fb.c | 8 +- trunk/drivers/video/pxa3xx-gcu.c | 8 +- trunk/drivers/video/pxafb.c | 33 ++-- trunk/drivers/video/q40fb.c | 6 +- trunk/drivers/video/riva/fbdev.c | 45 ++--- trunk/drivers/video/riva/rivafb-i2c.c | 9 +- trunk/drivers/video/s1d13xxxfb.c | 10 +- trunk/drivers/video/s3c-fb.c | 15 +- trunk/drivers/video/s3c2410fb.c | 16 +- trunk/drivers/video/s3fb.c | 16 +- trunk/drivers/video/sa1100fb.c | 8 +- trunk/drivers/video/savage/savagefb_driver.c | 23 +-- trunk/drivers/video/sgivwfb.c | 12 +- trunk/drivers/video/sh7760fb.c | 6 +- trunk/drivers/video/sh_mipi_dsi.c | 4 +- trunk/drivers/video/sh_mobile_lcdcfb.c | 18 +- trunk/drivers/video/sh_mobile_meram.c | 2 +- trunk/drivers/video/sis/sis_main.c | 140 +++++++++------ trunk/drivers/video/sis/sis_main.h | 20 +-- trunk/drivers/video/skeletonfb.c | 17 +- trunk/drivers/video/sm501fb.c | 16 +- trunk/drivers/video/ssd1307fb.c | 11 +- trunk/drivers/video/sstfb.c | 33 ++-- trunk/drivers/video/sunxvr1000.c | 10 +- trunk/drivers/video/sunxvr2500.c | 12 +- trunk/drivers/video/sunxvr500.c | 12 +- trunk/drivers/video/tcx.c | 6 +- trunk/drivers/video/tdfxfb.c | 30 ++-- trunk/drivers/video/tgafb.c | 45 +++-- trunk/drivers/video/tmiofb.c | 8 +- trunk/drivers/video/tridentfb.c | 28 +-- trunk/drivers/video/uvesafb.c | 74 ++++---- trunk/drivers/video/vermilion/vermilion.c | 7 +- trunk/drivers/video/vfb.c | 6 +- trunk/drivers/video/vga16fb.c | 10 +- trunk/drivers/video/via/dvi.c | 10 +- trunk/drivers/video/via/dvi.h | 4 +- trunk/drivers/video/via/hw.c | 16 +- trunk/drivers/video/via/hw.h | 4 +- trunk/drivers/video/via/lcd.c | 10 +- trunk/drivers/video/via/lcd.h | 6 +- trunk/drivers/video/via/via-core.c | 19 ++- trunk/drivers/video/via/via-gpio.c | 2 +- trunk/drivers/video/via/viafbdev.c | 12 +- trunk/drivers/video/vt8500lcdfb.c | 6 +- trunk/drivers/video/vt8623fb.c | 8 +- trunk/drivers/video/w100fb.c | 10 +- trunk/drivers/video/wm8505fb.c | 6 +- trunk/drivers/video/wmt_ge_rops.c | 6 +- trunk/drivers/video/xen-fbfront.c | 7 +- trunk/drivers/video/xilinxfb.c | 8 +- trunk/drivers/virtio/virtio_balloon.c | 4 +- trunk/drivers/virtio/virtio_mmio.c | 6 +- trunk/drivers/virtio/virtio_pci.c | 8 +- trunk/drivers/vlynq/vlynq.c | 6 +- trunk/drivers/w1/masters/mxc_w1.c | 2 +- trunk/drivers/watchdog/da9055_wdt.c | 17 +- trunk/drivers/watchdog/omap_wdt.c | 1 + trunk/drivers/watchdog/twl4030_wdt.c | 11 +- trunk/drivers/xen/grant-table.c | 2 +- trunk/drivers/xen/platform-pci.c | 6 +- trunk/drivers/xen/xen-pciback/pci_stub.c | 13 +- trunk/drivers/zorro/zorro-driver.c | 4 + trunk/fs/ecryptfs/crypto.c | 2 +- trunk/fs/ecryptfs/kthread.c | 6 +- trunk/fs/ecryptfs/mmap.c | 12 +- trunk/fs/eventpoll.c | 22 +-- trunk/fs/ext4/extents.c | 22 +-- trunk/fs/ext4/file.c | 8 + trunk/fs/ext4/fsync.c | 2 + trunk/fs/ext4/inode.c | 99 ++--------- trunk/fs/ext4/namei.c | 3 +- trunk/fs/ext4/super.c | 30 ++-- trunk/fs/f2fs/acl.c | 1 + trunk/fs/f2fs/data.c | 1 - trunk/fs/f2fs/dir.c | 16 +- trunk/fs/f2fs/f2fs.h | 2 +- trunk/fs/f2fs/file.c | 10 +- trunk/fs/f2fs/gc.c | 34 ++-- trunk/fs/f2fs/hash.c | 18 +- trunk/fs/f2fs/inode.c | 1 - trunk/fs/f2fs/namei.c | 34 ++-- trunk/fs/f2fs/node.c | 37 ++-- trunk/fs/f2fs/recovery.c | 10 +- trunk/fs/f2fs/segment.c | 46 ++++- trunk/fs/f2fs/segment.h | 15 +- trunk/fs/f2fs/super.c | 15 +- trunk/fs/f2fs/xattr.c | 5 +- trunk/fs/file.c | 2 +- trunk/fs/gfs2/lock_dlm.c | 1 - trunk/fs/gfs2/rgrp.c | 35 ++-- trunk/fs/jbd2/transaction.c | 30 ++-- trunk/fs/proc/generic.c | 13 +- trunk/fs/proc/task_mmu.c | 2 +- trunk/fs/pstore/ram.c | 14 +- trunk/fs/pstore/ram_core.c | 9 +- trunk/include/Kbuild | 3 + trunk/include/asm-generic/parport.h | 4 +- trunk/include/drm/drm_mm.h | 25 +-- trunk/include/linux/Kbuild | 5 + trunk/include/linux/ata_platform.h | 12 +- .../include/linux/bcma/bcma_driver_gmac_cmn.h | 2 +- trunk/include/linux/bcma/bcma_driver_pci.h | 2 +- trunk/include/linux/hdlc/Kbuild | 0 trunk/include/linux/hsi/Kbuild | 0 trunk/include/linux/jbd2.h | 2 +- trunk/include/linux/mempolicy.h | 13 +- trunk/include/linux/netdevice.h | 2 +- trunk/include/linux/page-flags.h | 8 +- trunk/include/linux/pci_ids.h | 1 - trunk/include/linux/pid.h | 1 - trunk/include/linux/pid_namespace.h | 4 +- trunk/include/linux/pstore_ram.h | 5 +- trunk/include/linux/raid/Kbuild | 0 trunk/include/linux/usb/Kbuild | 0 trunk/include/net/sock.h | 2 +- trunk/include/rdma/Kbuild | 0 trunk/include/sound/Kbuild | 0 trunk/include/trace/events/ext4.h | 14 +- trunk/include/uapi/drm/i915_drm.h | 10 -- trunk/include/uapi/linux/pci_regs.h | 2 - trunk/kernel/fork.c | 8 - trunk/kernel/pid.c | 15 +- trunk/kernel/pid_namespace.c | 4 - trunk/lib/Kconfig.debug | 2 +- trunk/mm/mempolicy.c | 130 +++++++------- trunk/mm/shmem.c | 4 +- trunk/mm/vmscan.c | 111 ++++++------ trunk/net/batman-adv/bat_iv_ogm.c | 2 +- trunk/net/bridge/br_if.c | 8 +- trunk/net/ceph/messenger.c | 23 ++- trunk/net/ceph/osd_client.c | 34 ++-- trunk/net/core/dev.c | 18 +- trunk/net/core/net-sysfs.c | 4 + trunk/net/core/sock.c | 4 +- trunk/net/ipv4/arp.c | 10 +- trunk/net/ipv4/ip_gre.c | 13 +- trunk/net/ipv4/tcp_input.c | 14 +- trunk/net/ipv6/ip6_gre.c | 3 +- trunk/net/rds/ib_cm.c | 11 +- trunk/net/rds/ib_recv.c | 9 +- trunk/net/sched/sch_htb.c | 2 +- trunk/net/wireless/reg.c | 7 + trunk/net/wireless/sysfs.c | 4 + trunk/samples/rpmsg/rpmsg_client_sample.c | 4 +- trunk/scripts/headers_install.pl | 6 +- trunk/scripts/kernel-doc | 1 + 1351 files changed, 6504 insertions(+), 7040 deletions(-) delete mode 100644 trunk/Documentation/devicetree/bindings/pinctrl/pinctrl-sirf.txt delete mode 100644 trunk/Documentation/devicetree/bindings/watchdog/twl4030-wdt.txt delete mode 100644 trunk/arch/arm/mach-omap1/fb.c rename trunk/arch/arm/{mach-omap2 => plat-omap}/fb.c (76%) create mode 100644 trunk/include/linux/Kbuild create mode 100644 trunk/include/linux/hdlc/Kbuild create mode 100644 trunk/include/linux/hsi/Kbuild create mode 100644 trunk/include/linux/raid/Kbuild create mode 100644 trunk/include/linux/usb/Kbuild create mode 100644 trunk/include/rdma/Kbuild create mode 100644 trunk/include/sound/Kbuild diff --git a/[refs] b/[refs] index cb622ee358e2..5f5caf9899a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ed1914982e9cd46e37a6a6aa9e1fd1de6a50bf7 +refs/heads/master: 7ae42c96cffc432e1a4f90b7f12b11acb66723ed diff --git a/trunk/Documentation/DocBook/media/v4l/driver.xml b/trunk/Documentation/DocBook/media/v4l/driver.xml index 7c6638bacedb..eacafe312cd2 100644 --- a/trunk/Documentation/DocBook/media/v4l/driver.xml +++ b/trunk/Documentation/DocBook/media/v4l/driver.xml @@ -116,7 +116,7 @@ my_suspend (struct pci_dev * pci_dev, return 0; /* a negative value on error, 0 on success. */ } -static void +static void __devexit my_remove (struct pci_dev * pci_dev) { my_device *my = pci_get_drvdata (pci_dev); @@ -124,7 +124,7 @@ my_remove (struct pci_dev * pci_dev) /* Describe me. */ } -static int +static int __devinit my_probe (struct pci_dev * pci_dev, const struct pci_device_id * pci_id) { @@ -157,7 +157,7 @@ my_pci_driver = { .id_table = my_pci_device_ids, .probe = my_probe, - .remove = my_remove, + .remove = __devexit_p (my_remove), /* Power management functions. */ .suspend = my_suspend, diff --git a/trunk/Documentation/PCI/pci-iov-howto.txt b/trunk/Documentation/PCI/pci-iov-howto.txt index 86551cc72e03..cfaca7e69893 100644 --- a/trunk/Documentation/PCI/pci-iov-howto.txt +++ b/trunk/Documentation/PCI/pci-iov-howto.txt @@ -76,7 +76,7 @@ To notify SR-IOV core of Virtual Function Migration: Following piece of code illustrates the usage of the SR-IOV API. -static int dev_probe(struct pci_dev *dev, const struct pci_device_id *id) +static int __devinit dev_probe(struct pci_dev *dev, const struct pci_device_id *id) { pci_enable_sriov(dev, NR_VIRTFN); @@ -85,7 +85,7 @@ static int dev_probe(struct pci_dev *dev, const struct pci_device_id *id) return 0; } -static void dev_remove(struct pci_dev *dev) +static void __devexit dev_remove(struct pci_dev *dev) { pci_disable_sriov(dev); @@ -131,7 +131,7 @@ static struct pci_driver dev_driver = { .name = "SR-IOV Physical Function driver", .id_table = dev_id_table, .probe = dev_probe, - .remove = dev_remove, + .remove = __devexit_p(dev_remove), .suspend = dev_suspend, .resume = dev_resume, .shutdown = dev_shutdown, diff --git a/trunk/Documentation/PCI/pci.txt b/trunk/Documentation/PCI/pci.txt index bccf602a87f5..aa09e5476bba 100644 --- a/trunk/Documentation/PCI/pci.txt +++ b/trunk/Documentation/PCI/pci.txt @@ -183,6 +183,12 @@ Please mark the initialization and cleanup functions where appropriate initializes. __exit Exit code. Ignored for non-modular drivers. + + __devinit Device initialization code. + Identical to __init if the kernel is not compiled + with CONFIG_HOTPLUG, normal function otherwise. + __devexit The same for __exit. + Tips on when/where to use the above attributes: o The module_init()/module_exit() functions (and all initialization functions called _only_ from these) @@ -190,6 +196,20 @@ Tips on when/where to use the above attributes: o Do not mark the struct pci_driver. + o The ID table array should be marked __devinitconst; this is done + automatically if the table is declared with DEFINE_PCI_DEVICE_TABLE(). + + o The probe() and remove() functions should be marked __devinit + and __devexit respectively. All initialization functions + exclusively called by the probe() routine, can be marked __devinit. + Ditto for remove() and __devexit. + + o If mydriver_remove() is marked with __devexit(), then all address + references to mydriver_remove must use __devexit_p(mydriver_remove) + (in the struct pci_driver declaration for example). + __devexit_p() will generate the function name _or_ NULL if the + function will be discarded. For an example, see drivers/net/tg3.c. + o Do NOT mark a function if you are not sure which mark to use. Better to not mark the function than mark the function wrong. diff --git a/trunk/Documentation/acpi/enumeration.txt b/trunk/Documentation/acpi/enumeration.txt index 54469bc81b1c..4f27785ca0c8 100644 --- a/trunk/Documentation/acpi/enumeration.txt +++ b/trunk/Documentation/acpi/enumeration.txt @@ -185,7 +185,7 @@ input driver: .acpi_match_table ACPI_PTR(mpu3050_acpi_match), }, .probe = mpu3050_probe, - .remove = mpu3050_remove, + .remove = __devexit_p(mpu3050_remove), .id_table = mpu3050_ids, }; diff --git a/trunk/Documentation/devicetree/bindings/pinctrl/pinctrl-sirf.txt b/trunk/Documentation/devicetree/bindings/pinctrl/pinctrl-sirf.txt deleted file mode 100644 index c596a6ad3285..000000000000 --- a/trunk/Documentation/devicetree/bindings/pinctrl/pinctrl-sirf.txt +++ /dev/null @@ -1,47 +0,0 @@ -CSR SiRFprimaII pinmux controller - -Required properties: -- compatible : "sirf,prima2-pinctrl" -- reg : Address range of the pinctrl registers -- interrupts : Interrupts used by every GPIO group -- gpio-controller : Indicates this device is a GPIO controller -- interrupt-controller : Marks the device node as an interrupt controller -Optional properties: -- sirf,pullups : if n-th bit of m-th bank is set, set a pullup on GPIO-n of bank m -- sirf,pulldowns : if n-th bit of m-th bank is set, set a pulldown on GPIO-n of bank m - -Please refer to pinctrl-bindings.txt in this directory for details of the common -pinctrl bindings used by client devices. - -SiRFprimaII's pinmux nodes act as a container for an abitrary number of subnodes. -Each of these subnodes represents some desired configuration for a group of pins. - -Required subnode-properties: -- sirf,pins : An array of strings. Each string contains the name of a group. -- sirf,function: A string containing the name of the function to mux to the - group. - - Valid values for group and function names can be found from looking at the - group and function arrays in driver files: - drivers/pinctrl/pinctrl-sirf.c - -For example, pinctrl might have subnodes like the following: - uart2_pins_a: uart2@0 { - uart { - sirf,pins = "uart2grp"; - sirf,function = "uart2"; - }; - }; - uart2_noflow_pins_a: uart2@1 { - uart { - sirf,pins = "uart2_nostreamctrlgrp"; - sirf,function = "uart2_nostreamctrl"; - }; - }; - -For a specific board, if it wants to use uart2 without hardware flow control, -it can add the following to its board-specific .dts file. -uart2: uart@0xb0070000 { - pinctrl-names = "default"; - pinctrl-0 = <&uart2_noflow_pins_a>; -} diff --git a/trunk/Documentation/devicetree/bindings/watchdog/twl4030-wdt.txt b/trunk/Documentation/devicetree/bindings/watchdog/twl4030-wdt.txt deleted file mode 100644 index 80a37193c0b8..000000000000 --- a/trunk/Documentation/devicetree/bindings/watchdog/twl4030-wdt.txt +++ /dev/null @@ -1,10 +0,0 @@ -Device tree bindings for twl4030-wdt driver (TWL4030 watchdog) - -Required properties: - compatible = "ti,twl4030-wdt"; - -Example: - -watchdog { - compatible = "ti,twl4030-wdt"; -}; diff --git a/trunk/Documentation/i2c/instantiating-devices b/trunk/Documentation/i2c/instantiating-devices index 22182660dda7..abf63615ee05 100644 --- a/trunk/Documentation/i2c/instantiating-devices +++ b/trunk/Documentation/i2c/instantiating-devices @@ -91,7 +91,7 @@ Example (from the nxp OHCI driver): static const unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END }; -static int usb_hcd_nxp_probe(struct platform_device *pdev) +static int __devinit usb_hcd_nxp_probe(struct platform_device *pdev) { (...) struct i2c_adapter *i2c_adap; diff --git a/trunk/Documentation/rpmsg.txt b/trunk/Documentation/rpmsg.txt index f7edc3aa1e92..409d9f964c5b 100644 --- a/trunk/Documentation/rpmsg.txt +++ b/trunk/Documentation/rpmsg.txt @@ -236,7 +236,7 @@ static int rpmsg_sample_probe(struct rpmsg_channel *rpdev) return 0; } -static void rpmsg_sample_remove(struct rpmsg_channel *rpdev) +static void __devexit rpmsg_sample_remove(struct rpmsg_channel *rpdev) { dev_info(&rpdev->dev, "rpmsg sample client driver is removed\n"); } @@ -253,7 +253,7 @@ static struct rpmsg_driver rpmsg_sample_client = { .id_table = rpmsg_driver_sample_id_table, .probe = rpmsg_sample_probe, .callback = rpmsg_sample_cb, - .remove = rpmsg_sample_remove, + .remove = __devexit_p(rpmsg_sample_remove), }; static int __init init(void) diff --git a/trunk/Documentation/spi/spi-summary b/trunk/Documentation/spi/spi-summary index 2331eb214146..7312ec14dd89 100644 --- a/trunk/Documentation/spi/spi-summary +++ b/trunk/Documentation/spi/spi-summary @@ -345,7 +345,7 @@ SPI protocol drivers somewhat resemble platform device drivers: }, .probe = CHIP_probe, - .remove = CHIP_remove, + .remove = __devexit_p(CHIP_remove), .suspend = CHIP_suspend, .resume = CHIP_resume, }; @@ -355,7 +355,7 @@ device whose board_info gave a modalias of "CHIP". Your probe() code might look like this unless you're creating a device which is managing a bus (appearing under /sys/class/spi_master). - static int CHIP_probe(struct spi_device *spi) + static int __devinit CHIP_probe(struct spi_device *spi) { struct CHIP *chip; struct CHIP_platform_data *pdata; diff --git a/trunk/Documentation/video4linux/v4l2-framework.txt b/trunk/Documentation/video4linux/v4l2-framework.txt index b89567ad04b7..32bfe926e8d7 100644 --- a/trunk/Documentation/video4linux/v4l2-framework.txt +++ b/trunk/Documentation/video4linux/v4l2-framework.txt @@ -174,7 +174,8 @@ The recommended approach is as follows: static atomic_t drv_instance = ATOMIC_INIT(0); -static int drv_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) +static int __devinit drv_probe(struct pci_dev *pdev, + const struct pci_device_id *pci_id) { ... state->instance = atomic_inc_return(&drv_instance) - 1; diff --git a/trunk/Documentation/zh_CN/video4linux/v4l2-framework.txt b/trunk/Documentation/zh_CN/video4linux/v4l2-framework.txt index 44c1d934c4e3..3e74f13af426 100644 --- a/trunk/Documentation/zh_CN/video4linux/v4l2-framework.txt +++ b/trunk/Documentation/zh_CN/video4linux/v4l2-framework.txt @@ -182,7 +182,8 @@ int iterate(void *p) static atomic_t drv_instance = ATOMIC_INIT(0); -static int drv_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) +static int __devinit drv_probe(struct pci_dev *pdev, + const struct pci_device_id *pci_id) { ... state->instance = atomic_inc_return(&drv_instance) - 1; diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 7a58a25a6e7c..4e2a1f67a1fc 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3273,16 +3273,6 @@ F: Documentation/filesystems/caching/ F: fs/fscache/ F: include/linux/fscache*.h -F2FS FILE SYSTEM -M: Jaegeuk Kim -L: linux-f2fs-devel@lists.sourceforge.net -W: http://en.wikipedia.org/wiki/F2FS -T: git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git -S: Maintained -F: Documentation/filesystems/f2fs.txt -F: fs/f2fs/ -F: include/linux/f2fs_fs.h - FUJITSU FR-V (FRV) PORT M: David Howells S: Maintained @@ -5395,15 +5385,6 @@ F: arch/arm/*omap*/ F: drivers/i2c/busses/i2c-omap.c F: include/linux/i2c-omap.h -OMAP DEVICE TREE SUPPORT -M: Benoît Cousson -M: Tony Lindgren -L: linux-omap@vger.kernel.org -L: devicetree-discuss@lists.ozlabs.org (moderated for non-subscribers) -S: Maintained -F: arch/arm/boot/dts/*omap* -F: arch/arm/boot/dts/*am3* - OMAP CLOCK FRAMEWORK SUPPORT M: Paul Walmsley L: linux-omap@vger.kernel.org diff --git a/trunk/Makefile b/trunk/Makefile index 80c5694b29fd..275b9567382c 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 8 SUBLEVEL = 0 -EXTRAVERSION = -rc2 +EXTRAVERSION = -rc1 NAME = Terrified Chipmunk # *DOCUMENTATION* diff --git a/trunk/arch/alpha/include/asm/parport.h b/trunk/arch/alpha/include/asm/parport.h index 6abd0af11f13..c5ee7cbb2fcd 100644 --- a/trunk/arch/alpha/include/asm/parport.h +++ b/trunk/arch/alpha/include/asm/parport.h @@ -9,8 +9,8 @@ #ifndef _ASM_AXP_PARPORT_H #define _ASM_AXP_PARPORT_H 1 -static int parport_pc_find_isa_ports (int autoirq, int autodma); -static int parport_pc_find_nonpci_ports (int autoirq, int autodma) +static int __devinit parport_pc_find_isa_ports (int autoirq, int autodma); +static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma) { return parport_pc_find_isa_ports (autoirq, autodma); } diff --git a/trunk/arch/alpha/kernel/pci.c b/trunk/arch/alpha/kernel/pci.c index edb4e0097b75..ef757147cbf9 100644 --- a/trunk/arch/alpha/kernel/pci.c +++ b/trunk/arch/alpha/kernel/pci.c @@ -59,13 +59,13 @@ struct pci_controller *pci_isa_hose; * Quirks. */ -static void quirk_isa_bridge(struct pci_dev *dev) +static void __devinit quirk_isa_bridge(struct pci_dev *dev) { dev->class = PCI_CLASS_BRIDGE_ISA << 8; } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82378, quirk_isa_bridge); -static void quirk_cypress(struct pci_dev *dev) +static void __devinit quirk_cypress(struct pci_dev *dev) { /* The Notorious Cy82C693 chip. */ @@ -104,7 +104,7 @@ static void quirk_cypress(struct pci_dev *dev) DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CONTAQ, PCI_DEVICE_ID_CONTAQ_82C693, quirk_cypress); /* Called for each device after PCI setup is done. */ -static void pcibios_fixup_final(struct pci_dev *dev) +static void __devinit pcibios_fixup_final(struct pci_dev *dev) { unsigned int class = dev->class >> 8; @@ -198,7 +198,8 @@ subsys_initcall(pcibios_init); #ifdef ALPHA_RESTORE_SRM_SETUP static struct pdev_srm_saved_conf *srm_saved_configs; -void pdev_save_srm_config(struct pci_dev *dev) +void __devinit +pdev_save_srm_config(struct pci_dev *dev) { struct pdev_srm_saved_conf *tmp; static int printed = 0; @@ -240,7 +241,8 @@ pci_restore_srm_config(void) } #endif -void pcibios_fixup_bus(struct pci_bus *bus) +void __devinit +pcibios_fixup_bus(struct pci_bus *bus) { struct pci_dev *dev = bus->self; diff --git a/trunk/arch/alpha/kernel/smp.c b/trunk/arch/alpha/kernel/smp.c index 9603bc234b47..a41ad90a97a6 100644 --- a/trunk/arch/alpha/kernel/smp.c +++ b/trunk/arch/alpha/kernel/smp.c @@ -68,7 +68,7 @@ enum ipi_message_type { }; /* Set to a secondary's cpuid when it comes online. */ -static int smp_secondary_alive = 0; +static int smp_secondary_alive __devinitdata = 0; int smp_num_probed; /* Internal processor count */ int smp_num_cpus = 1; /* Number that came online. */ @@ -172,7 +172,7 @@ smp_callin(void) } /* Wait until hwrpb->txrdy is clear for cpu. Return -1 on timeout. */ -static int +static int __devinit wait_for_txrdy (unsigned long cpumask) { unsigned long timeout; @@ -468,7 +468,7 @@ smp_prepare_cpus(unsigned int max_cpus) smp_num_cpus = smp_num_probed; } -void +void __devinit smp_prepare_boot_cpu(void) { } diff --git a/trunk/arch/alpha/kernel/sys_titan.c b/trunk/arch/alpha/kernel/sys_titan.c index 5cf4a481b8c5..2533db280d9b 100644 --- a/trunk/arch/alpha/kernel/sys_titan.c +++ b/trunk/arch/alpha/kernel/sys_titan.c @@ -303,7 +303,7 @@ titan_late_init(void) } -static int +static int __devinit titan_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { u8 intline; diff --git a/trunk/arch/arm/boot/dts/dbx5x0.dtsi b/trunk/arch/arm/boot/dts/dbx5x0.dtsi index 63f2fbcfe819..2efd9c891bc9 100644 --- a/trunk/arch/arm/boot/dts/dbx5x0.dtsi +++ b/trunk/arch/arm/boot/dts/dbx5x0.dtsi @@ -170,9 +170,7 @@ gpio-bank = <8>; }; - pinctrl@80157000 { - // This is actually the PRCMU base address - reg = <0x80157000 0x2000>; + pinctrl { compatible = "stericsson,nmk_pinctrl"; }; diff --git a/trunk/arch/arm/boot/dts/twl4030.dtsi b/trunk/arch/arm/boot/dts/twl4030.dtsi index ed0bc9546837..63411b036932 100644 --- a/trunk/arch/arm/boot/dts/twl4030.dtsi +++ b/trunk/arch/arm/boot/dts/twl4030.dtsi @@ -19,10 +19,6 @@ interrupts = <11>; }; - watchdog { - compatible = "ti,twl4030-wdt"; - }; - vdac: regulator-vdac { compatible = "ti,twl4030-vdac"; regulator-min-microvolt = <1800000>; diff --git a/trunk/arch/arm/common/sa1111.c b/trunk/arch/arm/common/sa1111.c index e57d7e5bf96a..9173d112ea01 100644 --- a/trunk/arch/arm/common/sa1111.c +++ b/trunk/arch/arm/common/sa1111.c @@ -686,7 +686,8 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent, * %-EINVAL no platform data passed * %0 successful. */ -static int __sa1111_probe(struct device *me, struct resource *mem, int irq) +static int __devinit +__sa1111_probe(struct device *me, struct resource *mem, int irq) { struct sa1111_platform_data *pd = me->platform_data; struct sa1111 *sachip; @@ -1010,7 +1011,7 @@ static int sa1111_resume(struct platform_device *dev) #define sa1111_resume NULL #endif -static int sa1111_probe(struct platform_device *pdev) +static int __devinit sa1111_probe(struct platform_device *pdev) { struct resource *mem; int irq; diff --git a/trunk/arch/arm/common/scoop.c b/trunk/arch/arm/common/scoop.c index a5c3dc38aa18..0c616d5fcb0f 100644 --- a/trunk/arch/arm/common/scoop.c +++ b/trunk/arch/arm/common/scoop.c @@ -176,7 +176,7 @@ static int scoop_resume(struct platform_device *dev) #define scoop_resume NULL #endif -static int scoop_probe(struct platform_device *pdev) +static int __devinit scoop_probe(struct platform_device *pdev) { struct scoop_dev *devptr; struct scoop_config *inf; @@ -243,7 +243,7 @@ static int scoop_probe(struct platform_device *pdev) return ret; } -static int scoop_remove(struct platform_device *pdev) +static int __devexit scoop_remove(struct platform_device *pdev) { struct scoop_dev *sdev = platform_get_drvdata(pdev); int ret; @@ -268,7 +268,7 @@ static int scoop_remove(struct platform_device *pdev) static struct platform_driver scoop_driver = { .probe = scoop_probe, - .remove = scoop_remove, + .remove = __devexit_p(scoop_remove), .suspend = scoop_suspend, .resume = scoop_resume, .driver = { diff --git a/trunk/arch/arm/configs/multi_v7_defconfig b/trunk/arch/arm/configs/multi_v7_defconfig index 2eeff1e64b6e..dbea6f4efe9f 100644 --- a/trunk/arch/arm/configs/multi_v7_defconfig +++ b/trunk/arch/arm/configs/multi_v7_defconfig @@ -6,7 +6,6 @@ CONFIG_MACH_ARMADA_370=y CONFIG_MACH_ARMADA_XP=y CONFIG_ARCH_HIGHBANK=y CONFIG_ARCH_SOCFPGA=y -CONFIG_ARCH_SUNXI=y # CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set CONFIG_ARM_ERRATA_754322=y CONFIG_SMP=y diff --git a/trunk/arch/arm/configs/omap2plus_defconfig b/trunk/arch/arm/configs/omap2plus_defconfig index 82ce8d738fa1..a1dc5c071e71 100644 --- a/trunk/arch/arm/configs/omap2plus_defconfig +++ b/trunk/arch/arm/configs/omap2plus_defconfig @@ -65,8 +65,6 @@ CONFIG_MAC80211_RC_PID=y CONFIG_MAC80211_RC_DEFAULT_PID=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_CONNECTOR=y -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_CHAR=y @@ -134,11 +132,9 @@ CONFIG_POWER_SUPPLY=y CONFIG_WATCHDOG=y CONFIG_OMAP_WATCHDOG=y CONFIG_TWL4030_WATCHDOG=y -CONFIG_MFD_TPS65217=y CONFIG_REGULATOR_TWL4030=y CONFIG_REGULATOR_TPS65023=y CONFIG_REGULATOR_TPS6507X=y -CONFIG_REGULATOR_TPS65217=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y CONFIG_FB_MODE_HELPERS=y @@ -174,7 +170,6 @@ CONFIG_SND_DEBUG=y CONFIG_SND_USB_AUDIO=m CONFIG_SND_SOC=m CONFIG_SND_OMAP_SOC=m -CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m CONFIG_USB=y CONFIG_USB_DEBUG=y diff --git a/trunk/arch/arm/kernel/bios32.c b/trunk/arch/arm/kernel/bios32.c index 379cf3292390..9b722612553d 100644 --- a/trunk/arch/arm/kernel/bios32.c +++ b/trunk/arch/arm/kernel/bios32.c @@ -78,7 +78,7 @@ void pcibios_report_status(u_int status_mask, int warn) * Bug 3 is responsible for the sound DMA grinding to a halt. We now * live with bug 2. */ -static void pci_fixup_83c553(struct pci_dev *dev) +static void __devinit pci_fixup_83c553(struct pci_dev *dev) { /* * Set memory region to start at address 0, and enable IO @@ -130,7 +130,7 @@ static void pci_fixup_83c553(struct pci_dev *dev) } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_83C553, pci_fixup_83c553); -static void pci_fixup_unassign(struct pci_dev *dev) +static void __devinit pci_fixup_unassign(struct pci_dev *dev) { dev->resource[0].end -= dev->resource[0].start; dev->resource[0].start = 0; @@ -142,7 +142,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_89C940F, * if it is the host bridge by marking it as such. These resources are of * no consequence to the PCI layer (they are handled elsewhere). */ -static void pci_fixup_dec21285(struct pci_dev *dev) +static void __devinit pci_fixup_dec21285(struct pci_dev *dev) { int i; @@ -161,7 +161,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21285, pci_fixup_d /* * PCI IDE controllers use non-standard I/O port decoding, respect it. */ -static void pci_fixup_ide_bases(struct pci_dev *dev) +static void __devinit pci_fixup_ide_bases(struct pci_dev *dev) { struct resource *r; int i; @@ -182,7 +182,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases); /* * Put the DEC21142 to sleep */ -static void pci_fixup_dec21142(struct pci_dev *dev) +static void __devinit pci_fixup_dec21142(struct pci_dev *dev) { pci_write_config_dword(dev, 0x40, 0x80000000); } @@ -204,7 +204,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21142, pci_fixup_d * functional. However, The CY82C693U _does not work_ in bus * master mode without locking the PCI bus solid. */ -static void pci_fixup_cy82c693(struct pci_dev *dev) +static void __devinit pci_fixup_cy82c693(struct pci_dev *dev) { if ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE) { u32 base0, base1; @@ -254,7 +254,7 @@ static void pci_fixup_cy82c693(struct pci_dev *dev) } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CONTAQ, PCI_DEVICE_ID_CONTAQ_82C693, pci_fixup_cy82c693); -static void pci_fixup_it8152(struct pci_dev *dev) +static void __devinit pci_fixup_it8152(struct pci_dev *dev) { int i; /* fixup for ITE 8152 devices */ @@ -361,7 +361,9 @@ void pcibios_fixup_bus(struct pci_bus *bus) printk(KERN_INFO "PCI: bus%d: Fast back to back transfers %sabled\n", bus->number, (features & PCI_COMMAND_FAST_BACK) ? "en" : "dis"); } +#ifdef CONFIG_HOTPLUG EXPORT_SYMBOL(pcibios_fixup_bus); +#endif /* * Swizzle the device pin each time we cross a bridge. If a platform does @@ -378,7 +380,7 @@ EXPORT_SYMBOL(pcibios_fixup_bus); * PCI standard swizzle is implemented on plug-in cards and Cardbus based * PCI extenders, so it can not be ignored. */ -static u8 pcibios_swizzle(struct pci_dev *dev, u8 *pin) +static u8 __devinit pcibios_swizzle(struct pci_dev *dev, u8 *pin) { struct pci_sys_data *sys = dev->sysdata; int slot, oldpin = *pin; diff --git a/trunk/arch/arm/kernel/etm.c b/trunk/arch/arm/kernel/etm.c index 9b6de8c988f3..36d20bd50120 100644 --- a/trunk/arch/arm/kernel/etm.c +++ b/trunk/arch/arm/kernel/etm.c @@ -339,7 +339,7 @@ static struct miscdevice etb_miscdev = { .fops = &etb_fops, }; -static int etb_probe(struct amba_device *dev, const struct amba_id *id) +static int __devinit etb_probe(struct amba_device *dev, const struct amba_id *id) { struct tracectx *t = &tracer; int ret = 0; @@ -531,7 +531,7 @@ static ssize_t trace_mode_store(struct kobject *kobj, static struct kobj_attribute trace_mode_attr = __ATTR(trace_mode, 0644, trace_mode_show, trace_mode_store); -static int etm_probe(struct amba_device *dev, const struct amba_id *id) +static int __devinit etm_probe(struct amba_device *dev, const struct amba_id *id) { struct tracectx *t = &tracer; int ret = 0; diff --git a/trunk/arch/arm/kernel/perf_event_cpu.c b/trunk/arch/arm/kernel/perf_event_cpu.c index 5f6620684e25..9a4f6307a016 100644 --- a/trunk/arch/arm/kernel/perf_event_cpu.c +++ b/trunk/arch/arm/kernel/perf_event_cpu.c @@ -132,7 +132,7 @@ static int cpu_pmu_request_irq(struct arm_pmu *cpu_pmu, irq_handler_t handler) return 0; } -static void cpu_pmu_init(struct arm_pmu *cpu_pmu) +static void __devinit cpu_pmu_init(struct arm_pmu *cpu_pmu) { int cpu; for_each_possible_cpu(cpu) { @@ -178,7 +178,7 @@ static struct notifier_block __cpuinitdata cpu_pmu_hotplug_notifier = { /* * PMU platform driver and devicetree bindings. */ -static struct of_device_id cpu_pmu_of_device_ids[] = { +static struct of_device_id __devinitdata cpu_pmu_of_device_ids[] = { {.compatible = "arm,cortex-a15-pmu", .data = armv7_a15_pmu_init}, {.compatible = "arm,cortex-a9-pmu", .data = armv7_a9_pmu_init}, {.compatible = "arm,cortex-a8-pmu", .data = armv7_a8_pmu_init}, @@ -190,7 +190,7 @@ static struct of_device_id cpu_pmu_of_device_ids[] = { {}, }; -static struct platform_device_id cpu_pmu_plat_device_ids[] = { +static struct platform_device_id __devinitdata cpu_pmu_plat_device_ids[] = { {.name = "arm-pmu"}, {}, }; @@ -198,7 +198,7 @@ static struct platform_device_id cpu_pmu_plat_device_ids[] = { /* * CPU PMU identification and probing. */ -static int probe_current_pmu(struct arm_pmu *pmu) +static int __devinit probe_current_pmu(struct arm_pmu *pmu) { int cpu = get_cpu(); unsigned long cpuid = read_cpuid_id(); @@ -252,7 +252,7 @@ static int probe_current_pmu(struct arm_pmu *pmu) return ret; } -static int cpu_pmu_device_probe(struct platform_device *pdev) +static int __devinit cpu_pmu_device_probe(struct platform_device *pdev) { const struct of_device_id *of_id; int (*init_fn)(struct arm_pmu *); diff --git a/trunk/arch/arm/kernel/perf_event_v6.c b/trunk/arch/arm/kernel/perf_event_v6.c index 041d0526a288..f3e22ff8b6a2 100644 --- a/trunk/arch/arm/kernel/perf_event_v6.c +++ b/trunk/arch/arm/kernel/perf_event_v6.c @@ -653,7 +653,7 @@ static int armv6_map_event(struct perf_event *event) &armv6_perf_cache_map, 0xFF); } -static int armv6pmu_init(struct arm_pmu *cpu_pmu) +static int __devinit armv6pmu_init(struct arm_pmu *cpu_pmu) { cpu_pmu->name = "v6"; cpu_pmu->handle_irq = armv6pmu_handle_irq; @@ -685,7 +685,7 @@ static int armv6mpcore_map_event(struct perf_event *event) &armv6mpcore_perf_cache_map, 0xFF); } -static int armv6mpcore_pmu_init(struct arm_pmu *cpu_pmu) +static int __devinit armv6mpcore_pmu_init(struct arm_pmu *cpu_pmu) { cpu_pmu->name = "v6mpcore"; cpu_pmu->handle_irq = armv6pmu_handle_irq; diff --git a/trunk/arch/arm/kernel/perf_event_v7.c b/trunk/arch/arm/kernel/perf_event_v7.c index 4fbc757d9cff..7d0cce85d17e 100644 --- a/trunk/arch/arm/kernel/perf_event_v7.c +++ b/trunk/arch/arm/kernel/perf_event_v7.c @@ -1226,7 +1226,7 @@ static void armv7pmu_init(struct arm_pmu *cpu_pmu) cpu_pmu->max_period = (1LLU << 32) - 1; }; -static u32 armv7_read_num_pmnc_events(void) +static u32 __devinit armv7_read_num_pmnc_events(void) { u32 nb_cnt; @@ -1237,7 +1237,7 @@ static u32 armv7_read_num_pmnc_events(void) return nb_cnt + 1; } -static int armv7_a8_pmu_init(struct arm_pmu *cpu_pmu) +static int __devinit armv7_a8_pmu_init(struct arm_pmu *cpu_pmu) { armv7pmu_init(cpu_pmu); cpu_pmu->name = "ARMv7 Cortex-A8"; @@ -1246,7 +1246,7 @@ static int armv7_a8_pmu_init(struct arm_pmu *cpu_pmu) return 0; } -static int armv7_a9_pmu_init(struct arm_pmu *cpu_pmu) +static int __devinit armv7_a9_pmu_init(struct arm_pmu *cpu_pmu) { armv7pmu_init(cpu_pmu); cpu_pmu->name = "ARMv7 Cortex-A9"; @@ -1255,7 +1255,7 @@ static int armv7_a9_pmu_init(struct arm_pmu *cpu_pmu) return 0; } -static int armv7_a5_pmu_init(struct arm_pmu *cpu_pmu) +static int __devinit armv7_a5_pmu_init(struct arm_pmu *cpu_pmu) { armv7pmu_init(cpu_pmu); cpu_pmu->name = "ARMv7 Cortex-A5"; @@ -1264,7 +1264,7 @@ static int armv7_a5_pmu_init(struct arm_pmu *cpu_pmu) return 0; } -static int armv7_a15_pmu_init(struct arm_pmu *cpu_pmu) +static int __devinit armv7_a15_pmu_init(struct arm_pmu *cpu_pmu) { armv7pmu_init(cpu_pmu); cpu_pmu->name = "ARMv7 Cortex-A15"; @@ -1274,7 +1274,7 @@ static int armv7_a15_pmu_init(struct arm_pmu *cpu_pmu) return 0; } -static int armv7_a7_pmu_init(struct arm_pmu *cpu_pmu) +static int __devinit armv7_a7_pmu_init(struct arm_pmu *cpu_pmu) { armv7pmu_init(cpu_pmu); cpu_pmu->name = "ARMv7 Cortex-A7"; diff --git a/trunk/arch/arm/kernel/perf_event_xscale.c b/trunk/arch/arm/kernel/perf_event_xscale.c index 2b0fe30ec12e..0c8265e53d5f 100644 --- a/trunk/arch/arm/kernel/perf_event_xscale.c +++ b/trunk/arch/arm/kernel/perf_event_xscale.c @@ -440,7 +440,7 @@ static int xscale_map_event(struct perf_event *event) &xscale_perf_cache_map, 0xFF); } -static int xscale1pmu_init(struct arm_pmu *cpu_pmu) +static int __devinit xscale1pmu_init(struct arm_pmu *cpu_pmu) { cpu_pmu->name = "xscale1"; cpu_pmu->handle_irq = xscale1pmu_handle_irq; @@ -810,7 +810,7 @@ static inline void xscale2pmu_write_counter(struct perf_event *event, u32 val) } } -static int xscale2pmu_init(struct arm_pmu *cpu_pmu) +static int __devinit xscale2pmu_init(struct arm_pmu *cpu_pmu) { cpu_pmu->name = "xscale2"; cpu_pmu->handle_irq = xscale2pmu_handle_irq; diff --git a/trunk/arch/arm/mach-davinci/board-dm646x-evm.c b/trunk/arch/arm/mach-davinci/board-dm646x-evm.c index 6e2f1631df5b..9211e8800c79 100644 --- a/trunk/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/trunk/arch/arm/mach-davinci/board-dm646x-evm.c @@ -358,7 +358,7 @@ static int cpld_video_probe(struct i2c_client *client, return 0; } -static int cpld_video_remove(struct i2c_client *client) +static int __devexit cpld_video_remove(struct i2c_client *client) { cpld_client = NULL; return 0; diff --git a/trunk/arch/arm/mach-davinci/cdce949.c b/trunk/arch/arm/mach-davinci/cdce949.c index abafb92031c0..f2232ca6d070 100644 --- a/trunk/arch/arm/mach-davinci/cdce949.c +++ b/trunk/arch/arm/mach-davinci/cdce949.c @@ -256,7 +256,7 @@ static int cdce_probe(struct i2c_client *client, return 0; } -static int cdce_remove(struct i2c_client *client) +static int __devexit cdce_remove(struct i2c_client *client) { cdce_i2c_client = NULL; return 0; @@ -274,7 +274,7 @@ static struct i2c_driver cdce_driver = { .name = "cdce949", }, .probe = cdce_probe, - .remove = cdce_remove, + .remove = __devexit_p(cdce_remove), .id_table = cdce_id, }; diff --git a/trunk/arch/arm/mach-dove/pcie.c b/trunk/arch/arm/mach-dove/pcie.c index 8a275f297522..0ef4435b1657 100644 --- a/trunk/arch/arm/mach-dove/pcie.c +++ b/trunk/arch/arm/mach-dove/pcie.c @@ -135,7 +135,7 @@ static struct pci_ops pcie_ops = { .write = pcie_wr_conf, }; -static void rc_pci_fixup(struct pci_dev *dev) +static void __devinit rc_pci_fixup(struct pci_dev *dev) { /* * Prevent enumeration of root complex. diff --git a/trunk/arch/arm/mach-imx/cpufreq.c b/trunk/arch/arm/mach-imx/cpufreq.c index d8c75c3c925d..36e8b3994470 100644 --- a/trunk/arch/arm/mach-imx/cpufreq.c +++ b/trunk/arch/arm/mach-imx/cpufreq.c @@ -188,7 +188,7 @@ static struct cpufreq_driver mxc_driver = { .name = "imx", }; -static int mxc_cpufreq_driver_init(void) +static int __devinit mxc_cpufreq_driver_init(void) { return cpufreq_register_driver(&mxc_driver); } diff --git a/trunk/arch/arm/mach-imx/mmdc.c b/trunk/arch/arm/mach-imx/mmdc.c index 7a9686ad994c..c461e98496c3 100644 --- a/trunk/arch/arm/mach-imx/mmdc.c +++ b/trunk/arch/arm/mach-imx/mmdc.c @@ -21,7 +21,7 @@ #define BP_MMDC_MAPSR_PSD 0 #define BP_MMDC_MAPSR_PSS 4 -static int imx_mmdc_probe(struct platform_device *pdev) +static int __devinit imx_mmdc_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; void __iomem *mmdc_base, *reg; diff --git a/trunk/arch/arm/mach-iop13xx/pci.c b/trunk/arch/arm/mach-iop13xx/pci.c index 9082b84aeebb..2f28018c4447 100644 --- a/trunk/arch/arm/mach-iop13xx/pci.c +++ b/trunk/arch/arm/mach-iop13xx/pci.c @@ -504,7 +504,7 @@ iop13xx_pci_abort(unsigned long addr, unsigned int fsr, struct pt_regs *regs) /* Scan an IOP13XX PCI bus. nr selects which ATU we use. */ -struct pci_bus *iop13xx_scan_bus(int nr, struct pci_sys_data *sys) +struct pci_bus * __devinit iop13xx_scan_bus(int nr, struct pci_sys_data *sys) { int which_atu; struct pci_bus *bus = NULL; diff --git a/trunk/arch/arm/mach-kirkwood/pcie.c b/trunk/arch/arm/mach-kirkwood/pcie.c index a1c3ab6fc809..ef102646ba9a 100644 --- a/trunk/arch/arm/mach-kirkwood/pcie.c +++ b/trunk/arch/arm/mach-kirkwood/pcie.c @@ -214,7 +214,7 @@ static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys) * PCI_CLASS_BRIDGE_HOST or Linux will errantly try to process the BAR's on * the device. Decoding setup is handled by the orion code. */ -static void rc_pci_fixup(struct pci_dev *dev) +static void __devinit rc_pci_fixup(struct pci_dev *dev) { if (dev->bus->parent == NULL && dev->devfn == 0) { int i; diff --git a/trunk/arch/arm/mach-ks8695/board-acs5k.c b/trunk/arch/arm/mach-ks8695/board-acs5k.c index b0c306ccbc6e..255502ddd879 100644 --- a/trunk/arch/arm/mach-ks8695/board-acs5k.c +++ b/trunk/arch/arm/mach-ks8695/board-acs5k.c @@ -92,7 +92,7 @@ static struct i2c_board_info acs5k_i2c_devs[] __initdata = { }, }; -static void acs5k_i2c_init(void) +static void __devinit acs5k_i2c_init(void) { /* The gpio interface */ platform_device_register(&acs5k_i2c_device); diff --git a/trunk/arch/arm/mach-mmp/sram.c b/trunk/arch/arm/mach-mmp/sram.c index bf5e64906e65..a6c08ede4491 100644 --- a/trunk/arch/arm/mach-mmp/sram.c +++ b/trunk/arch/arm/mach-mmp/sram.c @@ -61,7 +61,7 @@ struct gen_pool *sram_get_gpool(char *pool_name) } EXPORT_SYMBOL(sram_get_gpool); -static int sram_probe(struct platform_device *pdev) +static int __devinit sram_probe(struct platform_device *pdev) { struct sram_platdata *pdata = pdev->dev.platform_data; struct sram_bank_info *info; @@ -125,7 +125,7 @@ static int sram_probe(struct platform_device *pdev) return ret; } -static int sram_remove(struct platform_device *pdev) +static int __devexit sram_remove(struct platform_device *pdev) { struct sram_bank_info *info; diff --git a/trunk/arch/arm/mach-msm/proc_comm.c b/trunk/arch/arm/mach-msm/proc_comm.c index 507f5ca80697..8f1eecd88186 100644 --- a/trunk/arch/arm/mach-msm/proc_comm.c +++ b/trunk/arch/arm/mach-msm/proc_comm.c @@ -120,7 +120,7 @@ int msm_proc_comm(unsigned cmd, unsigned *data1, unsigned *data2) * and unknown state. This function should be called early to * wait on the ARM9. */ -void proc_comm_boot_wait(void) +void __devinit proc_comm_boot_wait(void) { void __iomem *base = MSM_SHARED_RAM_BASE; diff --git a/trunk/arch/arm/mach-msm/smd.c b/trunk/arch/arm/mach-msm/smd.c index b1588a1ea2f8..c5a2eddc6cdc 100644 --- a/trunk/arch/arm/mach-msm/smd.c +++ b/trunk/arch/arm/mach-msm/smd.c @@ -988,7 +988,7 @@ int smd_core_init(void) return 0; } -static int msm_smd_probe(struct platform_device *pdev) +static int __devinit msm_smd_probe(struct platform_device *pdev) { /* * If we haven't waited for the ARM9 to boot up till now, diff --git a/trunk/arch/arm/mach-mv78xx0/pcie.c b/trunk/arch/arm/mach-mv78xx0/pcie.c index ee8c0b51df2c..a9a154a646dd 100644 --- a/trunk/arch/arm/mach-mv78xx0/pcie.c +++ b/trunk/arch/arm/mach-mv78xx0/pcie.c @@ -173,7 +173,7 @@ static struct pci_ops pcie_ops = { .write = pcie_wr_conf, }; -static void rc_pci_fixup(struct pci_dev *dev) +static void __devinit rc_pci_fixup(struct pci_dev *dev) { /* * Prevent enumeration of root complex. diff --git a/trunk/arch/arm/mach-omap1/Makefile b/trunk/arch/arm/mach-omap1/Makefile index 222d58c0ae76..f0e69cbc5baa 100644 --- a/trunk/arch/arm/mach-omap1/Makefile +++ b/trunk/arch/arm/mach-omap1/Makefile @@ -4,7 +4,7 @@ # Common support obj-y := io.o id.o sram-init.o sram.o time.o irq.o mux.o flash.o \ - serial.o devices.o dma.o fb.o + serial.o devices.o dma.o obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o timer.o ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),) diff --git a/trunk/arch/arm/mach-omap1/fb.c b/trunk/arch/arm/mach-omap1/fb.c deleted file mode 100644 index c770d45c7226..000000000000 --- a/trunk/arch/arm/mach-omap1/fb.c +++ /dev/null @@ -1,80 +0,0 @@ -/* - * File: arch/arm/plat-omap/fb.c - * - * Framebuffer device registration for TI OMAP platforms - * - * Copyright (C) 2006 Nokia Corporation - * Author: Imre Deak - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#if defined(CONFIG_FB_OMAP) || defined(CONFIG_FB_OMAP_MODULE) - -static bool omapfb_lcd_configured; -static struct omapfb_platform_data omapfb_config; - -static u64 omap_fb_dma_mask = ~(u32)0; - -static struct platform_device omap_fb_device = { - .name = "omapfb", - .id = -1, - .dev = { - .dma_mask = &omap_fb_dma_mask, - .coherent_dma_mask = DMA_BIT_MASK(32), - .platform_data = &omapfb_config, - }, - .num_resources = 0, -}; - -void __init omapfb_set_lcd_config(const struct omap_lcd_config *config) -{ - omapfb_config.lcd = *config; - omapfb_lcd_configured = true; -} - -static int __init omap_init_fb(void) -{ - /* - * If the board file has not set the lcd config with - * omapfb_set_lcd_config(), don't bother registering the omapfb device - */ - if (!omapfb_lcd_configured) - return 0; - - return platform_device_register(&omap_fb_device); -} - -arch_initcall(omap_init_fb); - -#else - -void __init omapfb_set_lcd_config(const struct omap_lcd_config *config) -{ -} - -#endif diff --git a/trunk/arch/arm/mach-omap1/mailbox.c b/trunk/arch/arm/mach-omap1/mailbox.c index efc8f207f6fc..e962926b67bc 100644 --- a/trunk/arch/arm/mach-omap1/mailbox.c +++ b/trunk/arch/arm/mach-omap1/mailbox.c @@ -142,7 +142,7 @@ static struct omap_mbox mbox_dsp_info = { static struct omap_mbox *omap1_mboxes[] = { &mbox_dsp_info, NULL }; -static int omap1_mbox_probe(struct platform_device *pdev) +static int __devinit omap1_mbox_probe(struct platform_device *pdev) { struct resource *mem; int ret; @@ -165,7 +165,7 @@ static int omap1_mbox_probe(struct platform_device *pdev) return 0; } -static int omap1_mbox_remove(struct platform_device *pdev) +static int __devexit omap1_mbox_remove(struct platform_device *pdev) { omap_mbox_unregister(); iounmap(mbox_base); @@ -174,7 +174,7 @@ static int omap1_mbox_remove(struct platform_device *pdev) static struct platform_driver omap1_mbox_driver = { .probe = omap1_mbox_probe, - .remove = omap1_mbox_remove, + .remove = __devexit_p(omap1_mbox_remove), .driver = { .name = "omap-mailbox", }, diff --git a/trunk/arch/arm/mach-omap2/Makefile b/trunk/arch/arm/mach-omap2/Makefile index 947cafe65aef..a8004f33b7e2 100644 --- a/trunk/arch/arm/mach-omap2/Makefile +++ b/trunk/arch/arm/mach-omap2/Makefile @@ -3,7 +3,7 @@ # # Common support -obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o gpmc.o timer.o pm.o \ +obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \ common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \ omap_device.o sram.o diff --git a/trunk/arch/arm/mach-omap2/control.h b/trunk/arch/arm/mach-omap2/control.h index e6c328128a0a..3d944d3263d2 100644 --- a/trunk/arch/arm/mach-omap2/control.h +++ b/trunk/arch/arm/mach-omap2/control.h @@ -234,7 +234,7 @@ #define OMAP343X_PADCONF_ETK_D14 OMAP343X_PADCONF_ETK(16) #define OMAP343X_PADCONF_ETK_D15 OMAP343X_PADCONF_ETK(17) -/* 34xx GENERAL_WKUP register offsets */ +/* 34xx GENERAL_WKUP regist offsets */ #define OMAP343X_CONTROL_WKUP_DEBOBSMUX(i) (OMAP343X_CONTROL_GENERAL_WKUP + \ 0x008 + (i)) #define OMAP343X_CONTROL_WKUP_DEBOBS0 (OMAP343X_CONTROL_GENERAL_WKUP + 0x008) diff --git a/trunk/arch/arm/mach-omap2/dpll3xxx.c b/trunk/arch/arm/mach-omap2/dpll3xxx.c index 0a02aab5df67..2bb18838cba9 100644 --- a/trunk/arch/arm/mach-omap2/dpll3xxx.c +++ b/trunk/arch/arm/mach-omap2/dpll3xxx.c @@ -504,7 +504,8 @@ int omap3_noncore_dpll_set_rate(struct clk_hw *hw, unsigned long rate, if (!cpu_is_omap44xx() && !cpu_is_omap3630()) { freqsel = _omap3_dpll_compute_freqsel(clk, dd->last_rounded_n); - WARN_ON(!freqsel); + if (!freqsel) + WARN_ON(1); } pr_debug("%s: %s: set rate: locking rate to %lu.\n", diff --git a/trunk/arch/arm/mach-omap2/drm.c b/trunk/arch/arm/mach-omap2/drm.c index 4c7566c7e24a..fce5aa3fff49 100644 --- a/trunk/arch/arm/mach-omap2/drm.c +++ b/trunk/arch/arm/mach-omap2/drm.c @@ -27,6 +27,7 @@ #include "omap_device.h" #include "omap_hwmod.h" +#include #if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE) diff --git a/trunk/arch/arm/mach-omap2/dss-common.c b/trunk/arch/arm/mach-omap2/dss-common.c index 4be5cfc81ab8..679a0478644f 100644 --- a/trunk/arch/arm/mach-omap2/dss-common.c +++ b/trunk/arch/arm/mach-omap2/dss-common.c @@ -31,7 +31,8 @@ #include