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

Pull i2c changes from Wolfram Sang:

 - an arbitration driver.  While the driver is quite simple, it caused
   discussion if we need additional arbitration on top of the one
   specified in the I2C standard.  Conclusion is that I accept a few
   generic mechanisms, but not very specific ones.

 - the core lost the detach_adapter() call.  It has no users anymore and
   was in the way for other cleanups.  attach_adapter() is sadly still
   there since there are users waiting to be converted.

 - the core gained a bus recovery infrastructure.  I2C defines a way to
   recover if the data line is stalled.  This mechanism is now in the
   core and drivers can now pass some data to make use of it.

 - bigger driver cleanups for designware, s3c2410

 - removing superfluous refcounting from drivers

 - removing Ben Dooks as second maintainer due to inactivity.  Thanks
   for all your work so far, Ben!

 - bugfixes, feature additions, devicetree fixups, simplifications...

* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (38 commits)
  i2c: xiic: must always write 16-bit words to TX_FIFO
  i2c: octeon: use HZ in timeout value
  i2c: octeon: Fix i2c fail problem when a process is terminated by a signal
  i2c: designware-pci: drop superfluous {get|put}_device
  i2c: designware-plat: drop superfluous {get|put}_device
  i2c: davinci: drop superfluous {get|put}_device
  MAINTAINERS: Ben Dooks is inactive regarding I2C
  i2c: mux: Add i2c-arb-gpio-challenge 'mux' driver
  i2c: at91: convert to dma_request_slave_channel_compat()
  i2c: mxs: do error checking and handling in PIO mode
  i2c: mxs: remove races in PIO code
  i2c-designware: switch to use runtime PM autosuspend
  i2c-designware: use usleep_range() in the busy-loop
  i2c-designware: enable/disable the controller properly
  i2c-designware: use dynamic adapter numbering on Lynxpoint
  i2c-designware-pci: use managed functions pcim_* and devm_*
  i2c-designware-pci: use dev_err() instead of printk()
  i2c-designware: move to managed functions (devm_*)
  i2c: remove CONFIG_HOTPLUG ifdefs
  i2c: s3c2410: Add SMBus emulation for block read
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-tegra/tegra.c
index 84deeab23ee7e6d7209d7389ce76a4cbd42cb70a,6e1c9a91848fb65dd6be4d7de9575af59584d13e..9cf1ab17afeb9ddd7069ab0b7a1c56b3cc930e4d
--- 1/arch/arm/mach-tegra/tegra.c
--- 2/arch/arm/mach-tegra/board-dt-tegra20.c
+++ b/arch/arm/mach-tegra/tegra.c
@@@ -31,10 -30,6 +31,8 @@@
  #include <linux/pda_power.h>
  #include <linux/platform_data/tegra_usb.h>
  #include <linux/io.h>
- #include <linux/i2c.h>
- #include <linux/i2c-tegra.h>
 +#include <linux/slab.h>
 +#include <linux/sys_soc.h>
  #include <linux/usb/tegra_usb_phy.h>
  
  #include <asm/mach-types.h>

diff --cc arch/arm/plat-samsung/devs.c
Simple merge

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

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

diff --cc drivers/media/pci/bt8xx/bttv-i2c.c
index b7c52dc8999c4f9acfb115f7fde26822dd3328a2,c63c643ed1f83360bb05586aa21ee003a4a8e4cc..d43911deb617a97a78348bc5e7bdb5f6ee1bf265
--- 1/drivers/media/pci/bt8xx/bttv-i2c.c
--- 2/drivers/media/pci/bt8xx/bttv-i2c.c
+++ b/drivers/media/pci/bt8xx/bttv-i2c.c
@@@ -394,11 -394,3 +394,11 @@@ int init_bttv_i2c(struct bttv *btv
  
        return btv->i2c_rc;
  }
-       if (0 != btv->i2c_rc)
-               return 0;
 +
 +int fini_bttv_i2c(struct bttv *btv)
 +{
-       return i2c_del_adapter(&btv->c.i2c_adap);
++      if (btv->i2c_rc == 0)
++              i2c_del_adapter(&btv->c.i2c_adap);
 +
++      return 0;
 +}

diff --cc drivers/net/ethernet/sfc/falcon.c
Simple merge

diff --cc drivers/staging/media/go7007/go7007-driver.c
index a5ca99d7c0b29bad2d13d392fa5ef881df541092,6f83c52a0b5204721f0c01e865cbfd9ef30a40a2..3640df0aa0c1faf6e819a1395d2c846da6ba0ca5
--- 1/drivers/staging/media/go7007/go7007-driver.c
--- 2/drivers/staging/media/go7007/go7007-driver.c
+++ b/drivers/staging/media/go7007/go7007-driver.c
@@@ -208,50 -201,13 +208,47 @@@ static int init_i2c_module(struct i2c_a
  {
        struct go7007 *go = i2c_get_adapdata(adapter);
        struct v4l2_device *v4l2_dev = &go->v4l2_dev;
 -
 -      if (v4l2_i2c_new_subdev(v4l2_dev, adapter, type, addr, NULL))
 +      struct v4l2_subdev *sd;
 +      struct i2c_board_info info;
 +
 +      memset(&info, 0, sizeof(info));
 +      strlcpy(info.type, i2c->type, sizeof(info.type));
 +      info.addr = i2c->addr;
 +      info.flags = i2c->flags;
 +
 +      sd = v4l2_i2c_new_subdev_board(v4l2_dev, adapter, &info, NULL);
 +      if (sd) {
 +              if (i2c->is_video)
 +                      go->sd_video = sd;
 +              if (i2c->is_audio)
 +                      go->sd_audio = sd;
                return 0;
-               if (i2c_del_adapter(&go->i2c_adapter) == 0)
-                       go->i2c_adapter_online = 0;
-               else
-                       v4l2_err(&go->v4l2_dev,
-                               "error removing I2C adapter!\n");
 +      }
 +
 +      printk(KERN_INFO "go7007: probing for module i2c:%s failed\n", i2c->type);
 +      return -EINVAL;
 +}
 +
 +/*
 + * Detach and unregister the encoder.  The go7007 struct won't be freed
 + * until v4l2 finishes releasing its resources and all associated fds are
 + * closed by applications.
 + */
 +static void go7007_remove(struct v4l2_device *v4l2_dev)
 +{
 +      struct go7007 *go = container_of(v4l2_dev, struct go7007, v4l2_dev);
 +
 +      v4l2_device_unregister(v4l2_dev);
 +      if (go->hpi_ops->release)
 +              go->hpi_ops->release(go);
 +      if (go->i2c_adapter_online) {
++              i2c_del_adapter(&go->i2c_adapter);
++              go->i2c_adapter_online = 0;
 +      }
  
 -      dev_info(&adapter->dev,
 -               "go7007: probing for module i2c:%s failed\n", type);
 -      return -1;
 +      kfree(go->boot_fw);
 +      go7007_v4l2_remove(go);
 +      kfree(go);
  }
  
  /*