Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

Pull i2c updates from Wolfram Sang:
 "Highlights:

   - new drivers for Intel ismt & Broadcom bcm2835
   - a number of drivers got support for more variants and mostly got
     cleaned up on the way (sis630, i801, at91, tegra, designware)
   - i2c got rid of all *_set_drvdata(..., NULL) on remove/probe failure
   - removed the i2c_smbus_process_call from the core since there are no
     users
   - mxs can now switch between PIO and DMA depending on the message
     size and the bus speed can now be arbitrary

  In addition, there is the usual bunch of fixes, cleanups, devm_*
  conversions, etc"

Fixed conflict (and buggy devm_* conversion) in i2c-s3c2410.c

* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (39 commits)
  i2c: Remove unneeded xxx_set_drvdata(..., NULL) calls
  i2c: pxa: remove incorrect __exit annotations
  i2c: ocores: Fix pointer to integer cast warning
  i2c: tegra: remove warning dump if timeout happen in transfer
  i2c: fix i2c-ismt.c printk format warning
  i2c: i801: Add Device IDs for Intel Wellsburg PCH
  i2c: add bcm2835 driver
  i2c: ismt: Add Seth and Myself as maintainers
  i2c: sis630: checkpatch cleanup
  i2c: sis630: display unsigned hex
  i2c: sis630: use hex to constants for SMBus commands
  i2c: sis630: fix behavior after collision
  i2c: sis630: clear sticky bits
  i2c: sis630: Add SIS964 support
  i2c: isch: Add module parameter for backbone clock rate if divider is unset
  i2c: at91: fix unsed variable warning when building with !CONFIG_OF
  i2c: Adding support for Intel iSMT SMBus 2.0 host controller
  i2c: sh_mobile: don't send a stop condition by default inside transfers
  i2c: sh_mobile: eliminate an open-coded "goto" loop
  i2c: sh_mobile: fix timeout error handling
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/i2c/busses/Kconfig
Simple merge

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

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

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

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

diff --cc drivers/i2c/busses/i2c-s3c2410.c
index c807a6d,5e33df7..f6b880b
--- 1/drivers/i2c/busses/i2c-s3c2410.c
--- 2/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@@ -1038,16 -1038,15 +1038,13 @@@ static int s3c24xx_i2c_probe(struct pla
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (res == NULL) {
                dev_err(&pdev->dev, "cannot find IO resource\n");
-               ret = -ENOENT;
-               goto err_clk;
+               return -ENOENT;
        }
  
 -      i2c->regs = devm_request_and_ioremap(&pdev->dev, res);
 +      i2c->regs = devm_ioremap_resource(&pdev->dev, res);
  
-       if (IS_ERR(i2c->regs)) {
-               ret = PTR_ERR(i2c->regs);
-               goto err_clk;
 -      if (i2c->regs == NULL) {
 -              dev_err(&pdev->dev, "cannot request and map IO\n");
 -              return -ENXIO;
--      }
++      if (IS_ERR(i2c->regs))
++              return PTR_ERR(i2c->regs);
  
        dev_dbg(&pdev->dev, "registers %p (%p)\n",
                i2c->regs, res);

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

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

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