Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull driver core update from Greg KH:
 "Here's the set of driver core patches for 3.19-rc1.

  They are dominated by the removal of the .owner field in platform
  drivers.  They touch a lot of files, but they are "simple" changes,
  just removing a line in a structure.

  Other than that, a few minor driver core and debugfs changes.  There
  are some ath9k patches coming in through this tree that have been
  acked by the wireless maintainers as they relied on the debugfs
  changes.

  Everything has been in linux-next for a while"

* tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (324 commits)
  Revert "ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries"
  fs: debugfs: add forward declaration for struct device type
  firmware class: Deletion of an unnecessary check before the function call "vunmap"
  firmware loader: fix hung task warning dump
  devcoredump: provide a one-way disable function
  device: Add dev_<level>_once variants
  ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries
  ath: use seq_file api for ath9k debugfs files
  debugfs: add helper function to create device related seq_file
  drivers/base: cacheinfo: remove noisy error boot message
  Revert "core: platform: add warning if driver has no owner"
  drivers: base: support cpu cache information interface to userspace via sysfs
  drivers: base: add cpu_device_create to support per-cpu devices
  topology: replace custom attribute macros with standard DEVICE_ATTR*
  cpumask: factor out show_cpumap into separate helper function
  driver core: Fix unbalanced device reference in drivers_probe
  driver core: fix race with userland in device_add()
  sysfs/kernfs: make read requests on pre-alloc files use the buffer.
  sysfs/kernfs: allow attributes to request write buffer be pre-allocated.
  fs: sysfs: return EGBIG on write if offset is larger than file size
  ...

diff --cc arch/arm/common/sa1111.c
Simple merge

diff --cc arch/arm/mach-davinci/cpuidle.c
Simple merge

diff --cc arch/arm/mach-imx/mmdc.c
Simple merge

diff --cc arch/arm/mach-pxa/pxa3xx-ulpi.c
Simple merge

diff --cc arch/mips/lantiq/xway/xrx200_phy_fw.c
Simple merge

diff --cc arch/mips/pci/pci-ar71xx.c
Simple merge

diff --cc arch/mips/pci/pci-ar724x.c
Simple merge

diff --cc arch/mips/pci/pci-rt3883.c
Simple merge

diff --cc arch/powerpc/platforms/85xx/sgy_cts1000.c
Simple merge

diff --cc arch/powerpc/platforms/cell/axon_msi.c
Simple merge

diff --cc arch/powerpc/sysdev/fsl_msi.c
Simple merge

diff --cc arch/powerpc/sysdev/fsl_rio.c
Simple merge

diff --cc arch/powerpc/sysdev/ppc4xx_hsta_msi.c
Simple merge

diff --cc arch/powerpc/sysdev/ppc4xx_msi.c
Simple merge

diff --cc arch/powerpc/sysdev/qe_lib/qe.c
Simple merge

diff --cc arch/sparc/kernel/pci_schizo.c
Simple merge

diff --cc drivers/acpi/apei/ghes.c
Simple merge

diff --cc drivers/ata/ahci_sunxi.c
Simple merge

diff --cc drivers/ata/sata_fsl.c
Simple merge

diff --cc drivers/ata/sata_rcar.c
Simple merge

diff --cc drivers/base/Makefile
index 53c3fe1aeb29ceb5c31cc0e0ecaa569d91f8b891,e81a55ca513cb29ec29f269765154af5f66524a6..527d291706e89220db44d4f4a0880990ef12fddf
--- 1/drivers/base/Makefile
--- 2/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@@ -4,7 -4,7 +4,7 @@@ obj-y                    := component.o core.o bus.o dd.
                           driver.o class.o platform.o \
                           cpu.o firmware.o init.o map.o devres.o \
                           attribute_container.o transport_class.o \
-                          topology.o container.o property.o
 -                         topology.o container.o cacheinfo.o
++                         topology.o container.o property.o cacheinfo.o
  obj-$(CONFIG_DEVTMPFS)        += devtmpfs.o
  obj-$(CONFIG_DMA_CMA) += dma-contiguous.o
  obj-y                 += power/

diff --cc drivers/base/core.c
Simple merge

diff --cc drivers/base/platform.c
Simple merge

diff --cc drivers/bus/brcmstb_gisb.c
index 46de8dc39eb4c47b5f9046c7b750224b2c2bdfa7,5b15cd2cbd8efb22bf72c53090b627e2b6243d79..738612c45266c1b11f1319ae95275dcc881b8590
--- 1/drivers/bus/brcmstb_gisb.c
--- 2/drivers/bus/brcmstb_gisb.c
+++ b/drivers/bus/brcmstb_gisb.c
@@@ -387,11 -273,10 +387,10 @@@ static const struct dev_pm_ops brcmstb_
  };
  
  static struct platform_driver brcmstb_gisb_arb_driver = {
 -      .probe  = brcmstb_gisb_arb_probe,
        .driver = {
                .name   = "brcm-gisb-arb",
-               .owner  = THIS_MODULE,
                .of_match_table = brcmstb_gisb_arb_of_match,
 +              .pm     = &brcmstb_gisb_arb_pm_ops,
        },
  };
  

diff --cc drivers/bus/omap_l3_noc.c
index 17d86595951c03a00ab8d0389766bedb5635b45a,1ff1863415c5e8c326e08ecd084f6132400bd02f..029bc73de001cbb917f6e90a79ee48e117dd0dd5
--- 1/drivers/bus/omap_l3_noc.c
--- 2/drivers/bus/omap_l3_noc.c
+++ b/drivers/bus/omap_l3_noc.c
@@@ -358,8 -300,6 +358,7 @@@ static struct platform_driver omap_l3_d
        .probe          = omap_l3_probe,
        .driver         = {
                .name           = "omap_l3_noc",
-               .owner          = THIS_MODULE,
 +              .pm             = L3_DEV_PM_OPS,
                .of_match_table = of_match_ptr(l3_noc_match),
        },
  };

diff --cc drivers/char/hw_random/atmel-rng.c
Simple merge

diff --cc drivers/char/hw_random/exynos-rng.c
Simple merge

diff --cc drivers/char/ipmi/ipmi_si_intf.c
Simple merge

diff --cc drivers/clk/clk-s2mps11.c
Simple merge

diff --cc drivers/cpufreq/arm_big_little_dt.c
Simple merge

diff --cc drivers/cpufreq/cpufreq-dt.c
Simple merge

diff --cc drivers/cpufreq/exynos5440-cpufreq.c
Simple merge

diff --cc drivers/cpufreq/imx6q-cpufreq.c
Simple merge

diff --cc drivers/cpuidle/cpuidle-at91.c
Simple merge

diff --cc drivers/cpuidle/cpuidle-calxeda.c
Simple merge

diff --cc drivers/cpuidle/cpuidle-exynos.c
Simple merge

diff --cc drivers/cpuidle/cpuidle-kirkwood.c
Simple merge

diff --cc drivers/cpuidle/cpuidle-mvebu-v7.c
Simple merge

diff --cc drivers/cpuidle/cpuidle-ux500.c
Simple merge

diff --cc drivers/cpuidle/cpuidle-zynq.c
Simple merge

diff --cc drivers/crypto/bfin_crc.c
Simple merge

diff --cc drivers/crypto/caam/jr.c
Simple merge

diff --cc drivers/crypto/sahara.c
Simple merge

diff --cc drivers/crypto/ux500/cryp/cryp_core.c
Simple merge

diff --cc drivers/crypto/ux500/hash/hash_core.c
Simple merge

diff --cc drivers/dma/edma.c
Simple merge

diff --cc drivers/dma/fsl-edma.c
Simple merge

diff --cc drivers/dma/fsldma.c
Simple merge

diff --cc drivers/dma/omap-dma.c
Simple merge

diff --cc drivers/dma/sa11x0-dma.c
Simple merge

diff --cc drivers/dma/sh/shdmac.c
Simple merge

diff --cc drivers/dma/sirf-dma.c
Simple merge

diff --cc drivers/dma/ste_dma40.c
Simple merge

diff --cc drivers/edac/ppc4xx_edac.c
Simple merge

diff --cc drivers/gpio/gpio-bcm-kona.c
Simple merge

diff --cc drivers/gpio/gpio-cs5535.c
Simple merge

diff --cc drivers/gpio/gpio-davinci.c
Simple merge

diff --cc drivers/gpio/gpio-dwapb.c
Simple merge

diff --cc drivers/gpio/gpio-em.c
Simple merge

diff --cc drivers/gpio/gpio-grgpio.c
Simple merge

diff --cc drivers/gpio/gpio-msm-v1.c
Simple merge

diff --cc drivers/gpio/gpio-mvebu.c
Simple merge

diff --cc drivers/gpio/gpio-mxs.c
Simple merge

diff --cc drivers/gpio/gpio-sch.c
Simple merge

diff --cc drivers/gpio/gpio-spear-spics.c
Simple merge

diff --cc drivers/gpio/gpio-stp-xway.c
Simple merge

diff --cc drivers/gpio/gpio-tb10x.c
Simple merge

diff --cc drivers/gpio/gpio-tegra.c
Simple merge

diff --cc drivers/gpio/gpio-tz1090.c
Simple merge

diff --cc drivers/gpio/gpio-vr41xx.c
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_drm_drv.c
Simple merge

diff --cc drivers/hsi/controllers/omap_ssi.c
Simple merge

diff --cc drivers/hsi/controllers/omap_ssi_port.c
Simple merge

diff --cc drivers/hwmon/ibmpowernv.c
index 7c2c7be182f25df547af0316abbcb1b52e8258cd,58ea44ec6c77fa3a5f0200808c9b3eb19d84b8a2..febe8175d36ced56b1894d663f3cf84f3b3f341b
--- 1/drivers/hwmon/ibmpowernv.c
--- 2/drivers/hwmon/ibmpowernv.c
+++ b/drivers/hwmon/ibmpowernv.c
@@@ -301,24 -309,50 +301,23 @@@ static int ibmpowernv_probe(struct plat
        return PTR_ERR_OR_ZERO(hwmon_dev);
  }
  
 -static struct platform_driver ibmpowernv_driver = {
 -      .driver = {
 -              .name = DRVNAME,
 +static const struct platform_device_id opal_sensor_driver_ids[] = {
 +      {
 +              .name = "opal-sensor",
        },
 +      { }
  };
 +MODULE_DEVICE_TABLE(platform, opal_sensor_driver_ids);
  
 -static int __init ibmpowernv_init(void)
 -{
 -      int err;
 -
 -      pdevice = platform_device_alloc(DRVNAME, 0);
 -      if (!pdevice) {
 -              pr_err("Device allocation failed\n");
 -              err = -ENOMEM;
 -              goto exit;
 -      }
 -
 -      err = platform_device_add(pdevice);
 -      if (err) {
 -              pr_err("Device addition failed (%d)\n", err);
 -              goto exit_device_put;
 -      }
 -
 -      err = platform_driver_probe(&ibmpowernv_driver, ibmpowernv_probe);
 -      if (err) {
 -              pr_err("Platfrom driver probe failed\n");
 -              goto exit_device_del;
 -      }
 -
 -      return 0;
 -
 -exit_device_del:
 -      platform_device_del(pdevice);
 -exit_device_put:
 -      platform_device_put(pdevice);
 -exit:
 -      return err;
 -}
 +static struct platform_driver ibmpowernv_driver = {
 +      .probe          = ibmpowernv_probe,
 +      .id_table       = opal_sensor_driver_ids,
 +      .driver         = {
-               .owner  = THIS_MODULE,
 +              .name   = DRVNAME,
 +      },
 +};
  
 -static void __exit ibmpowernv_exit(void)
 -{
 -      platform_driver_unregister(&ibmpowernv_driver);
 -      platform_device_unregister(pdevice);
 -}
 +module_platform_driver(ibmpowernv_driver);
  
  MODULE_AUTHOR("Neelesh Gupta <neelegup@linux.vnet.ibm.com>");
  MODULE_DESCRIPTION("IBM POWERNV platform sensors");

diff --cc drivers/hwmon/iio_hwmon.c
Simple merge

diff --cc drivers/hwmon/nct6775.c
Simple merge

diff --cc drivers/i2c/busses/i2c-at91.c
Simple merge

diff --cc drivers/i2c/busses/i2c-au1550.c
Simple merge

diff --cc drivers/i2c/busses/i2c-cadence.c
Simple merge

diff --cc drivers/i2c/busses/i2c-cpm.c
Simple merge

diff --cc drivers/i2c/busses/i2c-davinci.c
Simple merge

diff --cc drivers/i2c/busses/i2c-designware-platdrv.c
Simple merge

diff --cc drivers/i2c/busses/i2c-exynos5.c
Simple merge

diff --cc drivers/i2c/busses/i2c-imx.c
Simple merge

diff --cc drivers/i2c/busses/i2c-isch.c
Simple merge

diff --cc drivers/i2c/busses/i2c-mpc.c
Simple merge

diff --cc drivers/i2c/busses/i2c-mxs.c
Simple merge

diff --cc drivers/i2c/busses/i2c-omap.c
Simple merge

diff --cc drivers/i2c/busses/i2c-parport-light.c
Simple merge

diff --cc drivers/i2c/busses/i2c-pmcmsp.c
Simple merge

diff --cc drivers/i2c/busses/i2c-pxa.c
Simple merge

diff --cc drivers/i2c/busses/i2c-rcar.c
Simple merge

diff --cc drivers/i2c/busses/i2c-rk3x.c
Simple merge

diff --cc drivers/i2c/busses/i2c-s3c2410.c
Simple merge

diff --cc drivers/i2c/busses/i2c-sh_mobile.c
Simple merge

diff --cc drivers/i2c/busses/i2c-simtec.c
Simple merge

diff --cc drivers/i2c/busses/i2c-xiic.c
Simple merge

diff --cc drivers/i2c/busses/scx200_acb.c
Simple merge

diff --cc drivers/input/keyboard/gpio_keys_polled.c
index c9c1c8ca7267cb8085c5cc84bb166fb00d7c69ca,10f0098f3c7731e84823e6dd05a809070024e5c0..90df4df58b076ee3feac7f50db0d3d27760f9cbb
--- 1/drivers/input/keyboard/gpio_keys_polled.c
--- 2/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@@ -297,8 -307,7 +297,7 @@@ static struct platform_driver gpio_keys
        .probe  = gpio_keys_polled_probe,
        .driver = {
                .name   = DRV_NAME,
-               .owner  = THIS_MODULE,
 -              .of_match_table = of_match_ptr(gpio_keys_polled_of_match),
 +              .of_match_table = gpio_keys_polled_of_match,
        },
  };
  module_platform_driver(gpio_keys_polled_driver);

diff --cc drivers/input/keyboard/samsung-keypad.c
Simple merge

diff --cc drivers/input/misc/twl4030-pwrbutton.c
Simple merge

diff --cc drivers/iommu/arm-smmu.c
Simple merge

diff --cc drivers/iommu/exynos-iommu.c
Simple merge

diff --cc drivers/iommu/ipmmu-vmsa.c
Simple merge

diff --cc drivers/leds/leds-gpio.c
index 868e6fc17cbad51725412adf483cd4b2f4e8d788,ac4768f2b2b4ef51969e65ec807983f22b4f3961..8a8ba11c5c14c33f85dd29adc543081fefd9d10b
--- 1/drivers/leds/leds-gpio.c
--- 2/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@@ -291,8 -287,7 +291,7 @@@ static struct platform_driver gpio_led_
        .remove         = gpio_led_remove,
        .driver         = {
                .name   = "leds-gpio",
-               .owner  = THIS_MODULE,
 -              .of_match_table = of_match_ptr(of_gpio_leds_match),
 +              .of_match_table = of_gpio_leds_match,
        },
  };
  

diff --cc drivers/mailbox/omap-mailbox.c
Simple merge

diff --cc drivers/media/platform/blackfin/bfin_capture.c
Simple merge

diff --cc drivers/media/platform/coda/coda-common.c
Simple merge

diff --cc drivers/media/platform/davinci/vpbe.c
Simple merge

diff --cc drivers/media/platform/davinci/vpbe_display.c
Simple merge

diff --cc drivers/media/platform/davinci/vpfe_capture.c
Simple merge

diff --cc drivers/media/platform/davinci/vpif_capture.c
Simple merge

diff --cc drivers/media/platform/exynos-gsc/gsc-core.c
Simple merge

diff --cc drivers/media/platform/exynos4-is/fimc-core.c
Simple merge

diff --cc drivers/media/platform/exynos4-is/fimc-is-i2c.c
Simple merge

diff --cc drivers/media/platform/exynos4-is/fimc-is.c
Simple merge

diff --cc drivers/media/platform/exynos4-is/fimc-lite.c
Simple merge

diff --cc drivers/media/platform/exynos4-is/mipi-csis.c
Simple merge

diff --cc drivers/media/platform/fsl-viu.c
Simple merge

diff --cc drivers/media/platform/mx2_emmaprp.c
Simple merge

diff --cc drivers/media/platform/s3c-camif/camif-core.c
Simple merge

diff --cc drivers/media/platform/s5p-g2d/g2d.c
Simple merge

diff --cc drivers/media/platform/s5p-jpeg/jpeg-core.c
Simple merge

diff --cc drivers/media/platform/s5p-mfc/s5p_mfc.c
Simple merge

diff --cc drivers/media/platform/s5p-tv/hdmi_drv.c
Simple merge

diff --cc drivers/media/platform/s5p-tv/sdo_drv.c
Simple merge

diff --cc drivers/media/platform/sh_vou.c
Simple merge

diff --cc drivers/media/platform/soc_camera/atmel-isi.c
Simple merge

diff --cc drivers/media/platform/soc_camera/mx3_camera.c
Simple merge

diff --cc drivers/media/platform/soc_camera/rcar_vin.c
Simple merge

diff --cc drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
Simple merge

diff --cc drivers/media/platform/soc_camera/sh_mobile_csi2.c
Simple merge

diff --cc drivers/media/platform/soc_camera/soc_camera.c
Simple merge

diff --cc drivers/media/platform/soc_camera/soc_camera_platform.c
Simple merge

diff --cc drivers/media/platform/vim2m.c
index 1105c111cc1070abfae6785010407f22914c1d3c,b8c9677a7c70ee4c602700d114f4b17a72200cbc..d9d844aab39b76aa49d43bf5bcb8ade5fdfaf826
--- 1/drivers/media/platform/vim2m.c
--- 2/drivers/media/platform/mem2mem_testdev.c
+++ b/drivers/media/platform/vim2m.c
@@@ -1055,12 -1055,11 +1055,11 @@@ static int vim2m_remove(struct platform
        return 0;
  }
  
 -static struct platform_driver m2mtest_pdrv = {
 -      .probe          = m2mtest_probe,
 -      .remove         = m2mtest_remove,
 +static struct platform_driver vim2m_pdrv = {
 +      .probe          = vim2m_probe,
 +      .remove         = vim2m_remove,
        .driver         = {
                .name   = MEM2MEM_NAME,
-               .owner  = THIS_MODULE,
        },
  };
  

diff --cc drivers/media/radio/radio-wl1273.c
Simple merge

diff --cc drivers/media/radio/si4713/radio-platform-si4713.c
Simple merge

diff --cc drivers/memory/omap-gpmc.c
Simple merge

diff --cc drivers/mfd/ab8500-gpadc.c
Simple merge

diff --cc drivers/mfd/ab8500-sysctrl.c
Simple merge

diff --cc drivers/mfd/db8500-prcmu.c
Simple merge

diff --cc drivers/mfd/syscon.c
index 72373b1138857769a56f510600ef0a221591808a,e85c052b302c19ca9fa637d9335b183065928d0d..176bf0fa2685e70749f42bad44931b8489e0d681
--- 1/drivers/mfd/syscon.c
--- 2/drivers/mfd/syscon.c
+++ b/drivers/mfd/syscon.c
@@@ -219,7 -166,7 +219,6 @@@ static const struct platform_device_id 
  static struct platform_driver syscon_driver = {
        .driver = {
                .name = "syscon",
-               .owner = THIS_MODULE,
 -              .of_match_table = of_syscon_match,
        },
        .probe          = syscon_probe,
        .id_table       = syscon_ids,

diff --cc drivers/mfd/t7l66xb.c
Simple merge

diff --cc drivers/mfd/tc6393xb.c
Simple merge

diff --cc drivers/mfd/twl4030-power.c
Simple merge

diff --cc drivers/mmc/host/sdhci-acpi.c
Simple merge

diff --cc drivers/mmc/host/tmio_mmc.c
Simple merge

diff --cc drivers/net/can/c_can/c_can_platform.c
Simple merge

diff --cc drivers/net/can/flexcan.c
Simple merge

diff --cc drivers/net/can/rcar_can.c
Simple merge

diff --cc drivers/net/can/xilinx_can.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bcmsysport.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/genet/bcmgenet.c
Simple merge

diff --cc drivers/net/ethernet/cadence/macb.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fec_main.c
Simple merge

diff --cc drivers/net/ethernet/freescale/gianfar.c
Simple merge

diff --cc drivers/net/ethernet/ibm/emac/core.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mv643xx_eth.c
Simple merge

diff --cc drivers/net/ethernet/natsemi/macsonic.c
Simple merge

diff --cc drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c
Simple merge

diff --cc drivers/net/ethernet/smsc/smc91x.c
Simple merge

diff --cc drivers/net/ethernet/smsc/smsc911x.c
Simple merge

diff --cc drivers/net/ethernet/sun/niu.c
Simple merge

diff --cc drivers/net/ethernet/sun/sunhme.c
Simple merge

diff --cc drivers/net/ethernet/wiznet/w5100.c
Simple merge

diff --cc drivers/net/ethernet/wiznet/w5300.c
Simple merge

diff --cc drivers/net/ieee802154/fakelb.c
Simple merge

diff --cc drivers/net/irda/ali-ircc.c
Simple merge

diff --cc drivers/net/phy/mdio-mux-gpio.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/debug.c
index 696e3d5309c6bdfc5f890c6dd2189ceee28f51c1,e7b709f03b29ef4149f358b358627e2ba831410d..871e969409bfd16e0b6c0fe43d9407fc7dde1d51
--- 1/drivers/net/wireless/ath/ath9k/debug.c
--- 2/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@@ -832,57 -758,42 +758,46 @@@ static int read_file_misc(struct seq_fi
                        continue;
                ath9k_calculate_iter_data(sc, ctx, &iter_data);
  
-               len += scnprintf(buf + len, sizeof(buf) - len,
-                       "VIFS: CTX %i(%i) AP: %i STA: %i MESH: %i WDS: %i",
-                       i++, (int)(ctx->assigned), iter_data.naps,
-                       iter_data.nstations,
-                       iter_data.nmeshes, iter_data.nwds);
-               len += scnprintf(buf + len, sizeof(buf) - len,
-                       " ADHOC: %i TOTAL: %hi BEACON-VIF: %hi\n",
-                       iter_data.nadhocs, sc->cur_chan->nvifs, sc->nbcnvifs);
+               seq_printf(file,
 -                         "VIF-COUNTS: CTX %i AP: %i STA: %i MESH: %i WDS: %i",
 -                         i++, iter_data.naps, iter_data.nstations,
++                         "VIFS: CTX %i(%i) AP: %i STA: %i MESH: %i WDS: %i",
++                         i++, (int)(ctx->assigned), iter_data.naps,
++                         iter_data.nstations,
+                          iter_data.nmeshes, iter_data.nwds);
+               seq_printf(file, " ADHOC: %i TOTAL: %hi BEACON-VIF: %hi\n",
+                          iter_data.nadhocs, sc->cur_chan->nvifs,
+                          sc->nbcnvifs);
        }
  
-       if (len > sizeof(buf))
-               len = sizeof(buf);
- 
-       retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
-       return retval;
+       return 0;
  }
  
- static ssize_t read_file_reset(struct file *file, char __user *user_buf,
-                              size_t count, loff_t *ppos)
+ static int read_file_reset(struct seq_file *file, void *data)
  {
-       struct ath_softc *sc = file->private_data;
+       struct ath_softc *sc = file->private;
 +      static const char * const reset_cause[__RESET_TYPE_MAX] = {
 +              [RESET_TYPE_BB_HANG] = "Baseband Hang",
 +              [RESET_TYPE_BB_WATCHDOG] = "Baseband Watchdog",
 +              [RESET_TYPE_FATAL_INT] = "Fatal HW Error",
 +              [RESET_TYPE_TX_ERROR] = "TX HW error",
 +              [RESET_TYPE_TX_GTT] = "Transmit timeout",
 +              [RESET_TYPE_TX_HANG] = "TX Path Hang",
 +              [RESET_TYPE_PLL_HANG] = "PLL RX Hang",
 +              [RESET_TYPE_MAC_HANG] = "MAC Hang",
 +              [RESET_TYPE_BEACON_STUCK] = "Stuck Beacon",
 +              [RESET_TYPE_MCI] = "MCI Reset",
 +              [RESET_TYPE_CALIBRATION] = "Calibration error",
 +      };
-       char buf[512];
-       unsigned int len = 0;
 +      int i;
  
 -      seq_printf(file, "%17s: %2d\n", "Baseband Hang",
 -                 sc->debug.stats.reset[RESET_TYPE_BB_HANG]);
 -      seq_printf(file, "%17s: %2d\n", "Baseband Watchdog",
 -                 sc->debug.stats.reset[RESET_TYPE_BB_WATCHDOG]);
 -      seq_printf(file, "%17s: %2d\n", "Fatal HW Error",
 -                 sc->debug.stats.reset[RESET_TYPE_FATAL_INT]);
 -      seq_printf(file, "%17s: %2d\n", "TX HW error",
 -                 sc->debug.stats.reset[RESET_TYPE_TX_ERROR]);
 -      seq_printf(file, "%17s: %2d\n", "TX Path Hang",
 -                 sc->debug.stats.reset[RESET_TYPE_TX_HANG]);
 -      seq_printf(file, "%17s: %2d\n", "PLL RX Hang",
 -                 sc->debug.stats.reset[RESET_TYPE_PLL_HANG]);
 -      seq_printf(file, "%17s: %2d\n", "MAC Hang",
 -                 sc->debug.stats.reset[RESET_TYPE_MAC_HANG]);
 -      seq_printf(file, "%17s: %2d\n", "Stuck Beacon",
 -                 sc->debug.stats.reset[RESET_TYPE_BEACON_STUCK]);
 -      seq_printf(file, "%17s: %2d\n", "MCI Reset",
 -                 sc->debug.stats.reset[RESET_TYPE_MCI]);
 +      for (i = 0; i < ARRAY_SIZE(reset_cause); i++) {
 +              if (!reset_cause[i])
 +                  continue;
 +
-               len += scnprintf(buf + len, sizeof(buf) - len,
-                                "%17s: %2d\n", reset_cause[i],
-                                sc->debug.stats.reset[i]);
++              seq_printf(file, "%17s: %2d\n", reset_cause[i],
++                         sc->debug.stats.reset[i]);
 +      }
  
-       if (len > sizeof(buf))
-               len = sizeof(buf);
- 
-       return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+       return 0;
  }
  
  void ath_debug_stat_tx(struct ath_softc *sc, struct ath_buf *bf,

diff --cc drivers/net/wireless/ath/ath9k/debug.h
Simple merge

diff --cc drivers/net/wireless/ath/wcn36xx/main.c
Simple merge

diff --cc drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
Simple merge

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge

diff --cc drivers/pci/host/pci-dra7xx.c
Simple merge

diff --cc drivers/pci/host/pci-exynos.c
Simple merge

diff --cc drivers/pci/host/pci-host-generic.c
Simple merge

diff --cc drivers/pci/host/pci-imx6.c
Simple merge

diff --cc drivers/pci/host/pci-keystone.c
Simple merge

diff --cc drivers/pci/host/pci-mvebu.c
Simple merge

diff --cc drivers/pci/host/pci-tegra.c
Simple merge

diff --cc drivers/pci/host/pci-xgene.c
Simple merge

diff --cc drivers/pci/host/pcie-rcar.c
Simple merge

diff --cc drivers/pci/host/pcie-spear13xx.c
Simple merge

diff --cc drivers/pci/host/pcie-xilinx.c
Simple merge

diff --cc drivers/pci/pci-sysfs.c
Simple merge

diff --cc drivers/pcmcia/sa1100_generic.c
Simple merge

diff --cc drivers/pinctrl/intel/pinctrl-baytrail.c
Simple merge

diff --cc drivers/pinctrl/nomadik/pinctrl-abx500.c
Simple merge

diff --cc drivers/pinctrl/nomadik/pinctrl-nomadik.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-at91.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-bcm281xx.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-rockchip.c
index 40970c305dd0aa7947fe63cff952284eb88db9a2,71d5835d864b3744a992a8f4594350384ae328d3..ba74f0aa60c76ac76d90d2edaff8c219d280e6a3
--- 1/drivers/pinctrl/pinctrl-rockchip.c
--- 2/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
@@@ -2053,8 -1982,6 +2053,7 @@@ static struct platform_driver rockchip_
        .probe          = rockchip_pinctrl_probe,
        .driver = {
                .name   = "rockchip-pinctrl",
-               .owner  = THIS_MODULE,
 +              .pm = &rockchip_pinctrl_dev_pm_ops,
                .of_match_table = rockchip_pinctrl_dt_match,
        },
  };

diff --cc drivers/pinctrl/pinctrl-st.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-tb10x.c
Simple merge

diff --cc drivers/pinctrl/samsung/pinctrl-samsung.c
Simple merge

diff --cc drivers/pinctrl/spear/pinctrl-plgpio.c
Simple merge

diff --cc drivers/platform/x86/acer-wmi.c
Simple merge

diff --cc drivers/platform/x86/ideapad-laptop.c
Simple merge

diff --cc drivers/power/ab8500_fg.c
Simple merge

diff --cc drivers/power/charger-manager.c
Simple merge

diff --cc drivers/regulator/88pm8607.c
Simple merge

diff --cc drivers/regulator/anatop-regulator.c
Simple merge

diff --cc drivers/regulator/arizona-ldo1.c
Simple merge

diff --cc drivers/regulator/arizona-micsupp.c
Simple merge

diff --cc drivers/regulator/da9052-regulator.c
Simple merge

diff --cc drivers/regulator/da9063-regulator.c
Simple merge

diff --cc drivers/regulator/dummy.c
Simple merge

diff --cc drivers/regulator/fixed.c
Simple merge

diff --cc drivers/regulator/gpio-regulator.c
Simple merge

diff --cc drivers/regulator/max77686.c
Simple merge

diff --cc drivers/regulator/max77693.c
Simple merge

diff --cc drivers/regulator/max77802.c
Simple merge

diff --cc drivers/regulator/max8997.c
Simple merge

diff --cc drivers/regulator/max8998.c
Simple merge

diff --cc drivers/regulator/pwm-regulator.c
Simple merge

diff --cc drivers/regulator/qcom_rpm-regulator.c
Simple merge

diff --cc drivers/regulator/rk808-regulator.c
Simple merge

diff --cc drivers/regulator/s2mpa01.c
Simple merge

diff --cc drivers/regulator/s2mps11.c
Simple merge

diff --cc drivers/regulator/s5m8767.c
Simple merge

diff --cc drivers/regulator/stw481x-vmmc.c
Simple merge

diff --cc drivers/regulator/ti-abb-regulator.c
Simple merge

diff --cc drivers/regulator/tps65090-regulator.c
Simple merge

diff --cc drivers/regulator/tps65218-regulator.c
Simple merge

diff --cc drivers/regulator/twl-regulator.c
Simple merge

diff --cc drivers/regulator/vexpress.c
Simple merge

diff --cc drivers/regulator/wm8994-regulator.c
Simple merge

diff --cc drivers/remoteproc/omap_remoteproc.c
Simple merge

diff --cc drivers/reset/reset-socfpga.c
Simple merge

diff --cc drivers/rtc/rtc-ab8500.c
Simple merge

diff --cc drivers/rtc/rtc-at91sam9.c
index abac38abd38e58b1ff958169c1eb2109e412814c,dcf211b941a5af581aea2b9ea8e4a57dc07e881c..6b9aaf1afc72088737bbb111e5684731fc3bb7d2
--- 1/drivers/rtc/rtc-at91sam9.c
--- 2/drivers/rtc/rtc-at91sam9.c
+++ b/drivers/rtc/rtc-at91sam9.c
@@@ -525,9 -446,7 +525,8 @@@ static struct platform_driver at91_rtc_
        .shutdown       = at91_rtc_shutdown,
        .driver         = {
                .name   = "rtc-at91sam9",
-               .owner  = THIS_MODULE,
                .pm     = &at91_rtc_pm_ops,
 +              .of_match_table = of_match_ptr(at91_rtc_dt_ids),
        },
  };
  

diff --cc drivers/rtc/rtc-omap.c
index 4f1c6ca9721127528a84b94350c1b2027f440e1b,ae444a8bd602b847165b08d30153a4c76077fd2f..8e5851aa4369b4a2b86437ca1f6e25b5b4fb4c8a
--- 1/drivers/rtc/rtc-omap.c
--- 2/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@@ -718,8 -568,7 +718,7 @@@ static struct platform_driver omap_rtc_
        .remove         = __exit_p(omap_rtc_remove),
        .shutdown       = omap_rtc_shutdown,
        .driver         = {
 -              .name   = DRIVER_NAME,
 +              .name   = "omap_rtc",
-               .owner  = THIS_MODULE,
                .pm     = &omap_rtc_pm_ops,
                .of_match_table = omap_rtc_of_match,
        },

diff --cc drivers/rtc/rtc-sirfsoc.c
Simple merge

diff --cc drivers/rtc/rtc-snvs.c
index 942b267c62713dfa4fd25a497ede6f9b3a45b193,f04c378b781afae5517b889ddc8c8e32dbffa361..0479e807a776a2d506a50c68feda55b1218b0e73
--- 1/drivers/rtc/rtc-snvs.c
--- 2/drivers/rtc/rtc-snvs.c
+++ b/drivers/rtc/rtc-snvs.c
@@@ -367,8 -327,7 +367,7 @@@ MODULE_DEVICE_TABLE(of, snvs_dt_ids)
  static struct platform_driver snvs_rtc_driver = {
        .driver = {
                .name   = "snvs_rtc",
-               .owner  = THIS_MODULE,
 -              .pm     = &snvs_rtc_pm_ops,
 +              .pm     = SNVS_RTC_PM_OPS,
                .of_match_table = snvs_dt_ids,
        },
        .probe          = snvs_rtc_probe,

diff --cc drivers/scsi/ufs/ufshcd-pltfrm.c
Simple merge

diff --cc drivers/soc/ti/knav_qmss_queue.c
Simple merge

diff --cc drivers/spi/spi-atmel.c
Simple merge

diff --cc drivers/spi/spi-fsl-espi.c
Simple merge

diff --cc drivers/spi/spi-fsl-spi.c
Simple merge

diff --cc drivers/spi/spi-gpio.c
Simple merge

diff --cc drivers/spi/spi-mxs.c
Simple merge

diff --cc drivers/spi/spi-pxa2xx.c
Simple merge

diff --cc drivers/spi/spi-rockchip.c
Simple merge

diff --cc drivers/spi/spi-s3c64xx.c
Simple merge

diff --cc drivers/spi/spi-sirf.c
Simple merge

diff --cc drivers/spi/spi-txx9.c
Simple merge

diff --cc drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c
Simple merge

diff --cc drivers/thermal/imx_thermal.c
Simple merge

diff --cc drivers/thermal/samsung/exynos_tmu.c
Simple merge

diff --cc drivers/tty/ehv_bytechan.c
Simple merge

diff --cc drivers/tty/serial/8250/8250_core.c
Simple merge

diff --cc drivers/tty/serial/8250/8250_dw.c
Simple merge

diff --cc drivers/tty/serial/8250/8250_em.c
Simple merge

diff --cc drivers/tty/serial/ar933x_uart.c
Simple merge

diff --cc drivers/tty/serial/atmel_serial.c
Simple merge

diff --cc drivers/tty/serial/bcm63xx_uart.c
Simple merge

diff --cc drivers/tty/serial/bfin_uart.c
Simple merge

diff --cc drivers/tty/serial/clps711x.c
Simple merge

diff --cc drivers/tty/serial/cpm_uart/cpm_uart_core.c
Simple merge

diff --cc drivers/tty/serial/fsl_lpuart.c
Simple merge

diff --cc drivers/tty/serial/imx.c
Simple merge

diff --cc drivers/tty/serial/lantiq.c
Simple merge

diff --cc drivers/tty/serial/mcf.c
Simple merge

diff --cc drivers/tty/serial/mpsc.c
Simple merge

diff --cc drivers/tty/serial/msm_serial.c
Simple merge

diff --cc drivers/tty/serial/mxs-auart.c
Simple merge

diff --cc drivers/tty/serial/of_serial.c
index 6dbd34c4f9e703f5bc70b3e40ba9a5afca2665c6,1f65e727c0eaf7e18db77273dd9caab2cc14076d..64f1bab7e9d75e7bcaeda1ff40bea99d7a928d4e
--- 1/drivers/tty/serial/of_serial.c
--- 2/drivers/tty/serial/of_serial.c
+++ b/drivers/tty/serial/of_serial.c
@@@ -342,8 -295,8 +342,7 @@@ static struct of_device_id of_platform_
  static struct platform_driver of_platform_serial_driver = {
        .driver = {
                .name = "of_serial",
-               .owner = THIS_MODULE,
                .of_match_table = of_platform_serial_table,
 -              .pm = &of_serial_pm_ops,
        },
        .probe = of_platform_serial_probe,
        .remove = of_platform_serial_remove,

diff --cc drivers/tty/serial/pmac_zilog.c
Simple merge

diff --cc drivers/tty/serial/pnx8xxx_uart.c
Simple merge

diff --cc drivers/tty/serial/pxa.c
Simple merge

diff --cc drivers/tty/serial/sa1100.c
Simple merge

diff --cc drivers/tty/serial/samsung.c
Simple merge

diff --cc drivers/tty/serial/sh-sci.c
Simple merge

diff --cc drivers/tty/serial/sirfsoc_uart.c
Simple merge

diff --cc drivers/tty/serial/sunsab.c
Simple merge

diff --cc drivers/tty/serial/sunsu.c
Simple merge

diff --cc drivers/tty/serial/sunzilog.c
Simple merge

diff --cc drivers/tty/serial/timbuart.c
Simple merge

diff --cc drivers/usb/chipidea/ci_hdrc_imx.c
index 450a168974d5d4b2c3c0a54742d537151fffd575,e913792e4df563eef59c8dccb81e0cf6a4dfa300..0f05de7c6b6c790e766ed035143840a84d4aef5c
--- 1/drivers/usb/chipidea/ci_hdrc_imx.c
--- 2/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@@ -247,9 -215,7 +247,8 @@@ static struct platform_driver ci_hdrc_i
        .remove = ci_hdrc_imx_remove,
        .driver = {
                .name = "imx_usb",
-               .owner = THIS_MODULE,
                .of_match_table = ci_hdrc_imx_dt_ids,
 +              .pm = &ci_hdrc_imx_pm_ops,
         },
  };
  

diff --cc drivers/usb/chipidea/core.c
index e14eafb2a05e2803e1998d400ed47d76a9527a85,947ed6e78be2cb67811983a902f6afcd45832dbc..5b9825a4538a67740a3ccf0d1ceea28d08f5d5c5
--- 1/drivers/usb/chipidea/core.c
--- 2/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@@ -867,8 -751,6 +867,7 @@@ static struct platform_driver ci_hdrc_d
        .remove = ci_hdrc_remove,
        .driver = {
                .name   = "ci_hdrc",
-               .owner  = THIS_MODULE,
 +              .pm     = &ci_pm_ops,
        },
  };
  

diff --cc drivers/usb/chipidea/usbmisc_imx.c
Simple merge

diff --cc drivers/usb/gadget/legacy/hid.c
Simple merge

diff --cc drivers/usb/gadget/udc/at91_udc.c
Simple merge

diff --cc drivers/usb/gadget/udc/atmel_usba_udc.c
Simple merge

diff --cc drivers/usb/gadget/udc/bcm63xx_udc.c
Simple merge

diff --cc drivers/usb/gadget/udc/dummy_hcd.c
Simple merge

diff --cc drivers/usb/gadget/udc/fotg210-udc.c
Simple merge

diff --cc drivers/usb/gadget/udc/fsl_qe_udc.c
Simple merge

diff --cc drivers/usb/gadget/udc/fsl_udc_core.c
Simple merge

diff --cc drivers/usb/gadget/udc/fusb300_udc.c
Simple merge

diff --cc drivers/usb/gadget/udc/gr_udc.c
Simple merge

diff --cc drivers/usb/gadget/udc/lpc32xx_udc.c
Simple merge

diff --cc drivers/usb/gadget/udc/m66592-udc.c
Simple merge

diff --cc drivers/usb/gadget/udc/mv_u3d_core.c
Simple merge

diff --cc drivers/usb/gadget/udc/mv_udc_core.c
Simple merge

diff --cc drivers/usb/gadget/udc/net2272.c
Simple merge

diff --cc drivers/usb/gadget/udc/omap_udc.c
Simple merge

diff --cc drivers/usb/gadget/udc/pxa25x_udc.c
Simple merge

diff --cc drivers/usb/gadget/udc/pxa27x_udc.c
index 9b03fab1370708e19f9dee7b0c2a1dde10539ed6,61bceedf515d9d16be2e5f760e2da822d41d153e..c61a896061faf7bbf79f5a143f6539fb2c87bb39
--- 1/drivers/usb/gadget/udc/pxa27x_udc.c
--- 2/drivers/usb/gadget/udc/pxa27x_udc.c
+++ b/drivers/usb/gadget/udc/pxa27x_udc.c
@@@ -2591,8 -2614,6 +2591,7 @@@ MODULE_ALIAS("platform:pxa27x-udc")
  static struct platform_driver udc_driver = {
        .driver         = {
                .name   = "pxa27x-udc",
-               .owner  = THIS_MODULE,
 +              .of_match_table = of_match_ptr(udc_pxa_dt_ids),
        },
        .probe          = pxa_udc_probe,
        .remove         = pxa_udc_remove,

diff --cc drivers/usb/gadget/udc/s3c-hsudc.c
Simple merge

diff --cc drivers/usb/gadget/udc/s3c2410_udc.c
Simple merge

diff --cc drivers/usb/host/ehci-exynos.c
Simple merge

diff --cc drivers/usb/host/ehci-orion.c
Simple merge

diff --cc drivers/usb/host/ehci-platform.c
Simple merge

diff --cc drivers/usb/host/ehci-w90x900.c
Simple merge

diff --cc drivers/usb/host/ohci-at91.c
Simple merge

diff --cc drivers/usb/host/ohci-exynos.c
Simple merge

diff --cc drivers/usb/host/ohci-omap.c
Simple merge

diff --cc drivers/usb/host/ohci-platform.c
Simple merge

diff --cc drivers/usb/host/ohci-pxa27x.c
Simple merge

diff --cc drivers/usb/host/ohci-spear.c
Simple merge

diff --cc drivers/usb/host/u132-hcd.c
Simple merge

diff --cc drivers/usb/misc/usb3503.c
Simple merge

diff --cc drivers/usb/musb/musb_core.c
Simple merge

diff --cc drivers/usb/phy/phy-ab8500-usb.c
Simple merge

diff --cc drivers/usb/phy/phy-am335x-control.c
Simple merge

diff --cc drivers/usb/phy/phy-generic.c
Simple merge

diff --cc drivers/usb/phy/phy-gpio-vbus-usb.c
Simple merge

diff --cc drivers/usb/phy/phy-isp1301-omap.c
Simple merge

diff --cc drivers/usb/phy/phy-mv-usb.c
Simple merge

diff --cc drivers/usb/phy/phy-mxs-usb.c
Simple merge

diff --cc drivers/usb/phy/phy-tahvo.c
Simple merge

diff --cc drivers/usb/phy/phy-tegra-usb.c
Simple merge

diff --cc drivers/usb/usbip/vhci_hcd.c
Simple merge

diff --cc drivers/video/fbdev/exynos/exynos_mipi_dsi.c
Simple merge

diff --cc drivers/video/fbdev/mmp/hw/mmp_ctrl.c
Simple merge

diff --cc drivers/video/fbdev/mx3fb.c
Simple merge

diff --cc drivers/video/fbdev/omap2/displays-new/connector-dvi.c
Simple merge

diff --cc drivers/video/fbdev/omap2/displays-new/connector-hdmi.c
Simple merge

diff --cc drivers/video/fbdev/omap2/displays-new/encoder-tfp410.c
Simple merge

diff --cc drivers/video/fbdev/omap2/displays-new/encoder-tpd12s015.c
Simple merge

diff --cc drivers/video/fbdev/omap2/dss/dispc.c
Simple merge

diff --cc drivers/video/fbdev/omap2/dss/dpi.c
Simple merge

diff --cc drivers/video/fbdev/omap2/dss/dsi.c
Simple merge

diff --cc drivers/video/fbdev/omap2/dss/dss.c
Simple merge

diff --cc drivers/video/fbdev/omap2/dss/hdmi4.c
Simple merge

diff --cc drivers/video/fbdev/omap2/dss/hdmi5.c
Simple merge

diff --cc drivers/video/fbdev/omap2/dss/sdi.c
Simple merge

diff --cc drivers/video/fbdev/sa1100fb.c
Simple merge

diff --cc drivers/video/fbdev/sh_mobile_lcdcfb.c
Simple merge

diff --cc drivers/video/fbdev/simplefb.c
Simple merge

diff --cc drivers/video/fbdev/sm501fb.c
Simple merge

diff --cc drivers/virtio/virtio_mmio.c
Simple merge

diff --cc drivers/watchdog/orion_wdt.c
Simple merge

diff --cc drivers/watchdog/s3c2410_wdt.c
Simple merge

diff --cc fs/debugfs/file.c
Simple merge

diff --cc fs/pstore/ram.c
Simple merge

diff --cc include/linux/bitmap.h
Simple merge

diff --cc include/linux/debugfs.h
Simple merge

diff --cc include/linux/device.h
Simple merge

diff --cc lib/bitmap.c
Simple merge

diff --cc net/dsa/dsa.c
Simple merge

diff --cc net/rfkill/rfkill-gpio.c
Simple merge

diff --cc sound/atmel/abdac.c
Simple merge

diff --cc sound/atmel/ac97c.c
Simple merge

diff --cc sound/drivers/mts64.c
Simple merge

diff --cc sound/drivers/virmidi.c
Simple merge

diff --cc sound/mips/sgio2audio.c
Simple merge

diff --cc sound/soc/au1x/ac97c.c
Simple merge

diff --cc sound/soc/au1x/psc-ac97.c
Simple merge

diff --cc sound/soc/blackfin/bf5xx-ac97.c
Simple merge

diff --cc sound/soc/cirrus/ep93xx-ac97.c
Simple merge

diff --cc sound/soc/codecs/ab8500-codec.c
Simple merge

diff --cc sound/soc/codecs/ac97.c
Simple merge

diff --cc sound/soc/codecs/ad1980.c
Simple merge

diff --cc sound/soc/codecs/cq93vc.c
Simple merge

diff --cc sound/soc/codecs/hdmi.c
Simple merge

diff --cc sound/soc/codecs/sirf-audio-codec.c
Simple merge

diff --cc sound/soc/codecs/sn95031.c
Simple merge

diff --cc sound/soc/codecs/stac9766.c
Simple merge

diff --cc sound/soc/codecs/twl4030.c
Simple merge

diff --cc sound/soc/codecs/twl6040.c
Simple merge

diff --cc sound/soc/codecs/uda134x.c
Simple merge

diff --cc sound/soc/codecs/wl1273.c
Simple merge

diff --cc sound/soc/codecs/wm5102.c
Simple merge

diff --cc sound/soc/codecs/wm8350.c
Simple merge

diff --cc sound/soc/codecs/wm8400.c
Simple merge

diff --cc sound/soc/codecs/wm8994.c
Simple merge

diff --cc sound/soc/codecs/wm9705.c
Simple merge

diff --cc sound/soc/codecs/wm9712.c
Simple merge

diff --cc sound/soc/codecs/wm9713.c
Simple merge

diff --cc sound/soc/davinci/davinci-mcasp.c
Simple merge

diff --cc sound/soc/dwc/designware_i2s.c
Simple merge

diff --cc sound/soc/fsl/eukrea-tlv320.c
Simple merge

diff --cc sound/soc/fsl/fsl_dma.c
Simple merge

diff --cc sound/soc/fsl/fsl_esai.c
Simple merge

diff --cc sound/soc/fsl/fsl_ssi.c
Simple merge

diff --cc sound/soc/fsl/imx-sgtl5000.c
Simple merge

diff --cc sound/soc/fsl/imx-spdif.c
Simple merge

diff --cc sound/soc/fsl/imx-ssi.c
Simple merge

diff --cc sound/soc/fsl/imx-wm8962.c
Simple merge

diff --cc sound/soc/fsl/mpc5200_psc_ac97.c
Simple merge

diff --cc sound/soc/generic/simple-card.c
Simple merge

diff --cc sound/soc/intel/broadwell.c
Simple merge

diff --cc sound/soc/intel/haswell.c
Simple merge

diff --cc sound/soc/intel/sst-haswell-pcm.c
index 0180b386c4211f9b0de80ef2ec82d7bcae2714b5,ad21e636edc6c8bc877bbd0ac3da526d52cd48c1..b8a782c0d4cd26ba3bb63394670bbcfd648d1880
--- 1/sound/soc/intel/sst-haswell-pcm.c
--- 2/sound/soc/intel/sst-haswell-pcm.c
+++ b/sound/soc/intel/sst-haswell-pcm.c
@@@ -1170,9 -899,6 +1170,7 @@@ static const struct dev_pm_ops hsw_pcm_
  static struct platform_driver hsw_pcm_driver = {
        .driver = {
                .name = "haswell-pcm-audio",
-               .owner = THIS_MODULE,
 +              .pm = &hsw_pcm_pm,
- 
        },
  
        .probe = hsw_pcm_dev_probe,

diff --cc sound/soc/intel/sst-mfld-platform-pcm.c
Simple merge

diff --cc sound/soc/jz4740/qi_lb60.c
Simple merge

diff --cc sound/soc/mxs/mxs-saif.c
Simple merge

diff --cc sound/soc/mxs/mxs-sgtl5000.c
Simple merge

diff --cc sound/soc/nuc900/nuc900-ac97.c
Simple merge

diff --cc sound/soc/pxa/mioa701_wm9713.c
Simple merge

diff --cc sound/soc/pxa/pxa-ssp.c
Simple merge

diff --cc sound/soc/pxa/pxa2xx-ac97.c
Simple merge

diff --cc sound/soc/rockchip/rockchip_i2s.c
Simple merge

diff --cc sound/soc/samsung/ac97.c
Simple merge

diff --cc sound/soc/samsung/i2s.c
Simple merge

diff --cc sound/soc/samsung/odroidx2_max98090.c
Simple merge

diff --cc sound/soc/samsung/snow.c
Simple merge

diff --cc sound/soc/sh/hac.c
Simple merge

diff --cc sound/soc/soc-core.c
Simple merge

diff --cc sound/soc/tegra/tegra20_ac97.c
Simple merge

diff --cc sound/soc/tegra/tegra_rt5640.c
Simple merge

diff --cc sound/soc/txx9/txx9aclc-ac97.c
Simple merge

diff --cc sound/soc/txx9/txx9aclc.c
Simple merge

diff --cc sound/soc/ux500/mop500.c
Simple merge

diff --cc sound/sparc/cs4231.c
Simple merge