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

Pull i2c updates from Wolfram Sang:
 "Here is the I2C pull request for 4.8:

   - the core and i801 driver gained support for SMBus Host Notify

   - core support for more than one address in DT

   - i2c_add_adapter() has now better error messages.  We can remove all
     error messages from drivers calling it as a next step.

   - bigger updates to rk3x driver to support rk3399 SoC

   - the at24 eeprom driver got refactored and can now read special
     variants with unique serials or fixed MAC addresses.

  The rest is regular driver updates and bugfixes"

* 'i2c/for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (66 commits)
  i2c: i801: use IS_ENABLED() instead of checking for built-in or module
  Documentation: i2c: slave: give proper example for pm usage
  Documentation: i2c: slave: describe buffer problems a bit better
  i2c: bcm2835: Don't complain on -EPROBE_DEFER from getting our clock
  i2c: i2c-smbus: drop useless stubs
  i2c: efm32: fix a failure path in efm32_i2c_probe()
  Revert "i2c: core: Cleanup I2C ACPI namespace"
  Revert "i2c: core: Add function for finding the bus speed from ACPI"
  i2c: Update the description of I2C_SMBUS
  i2c: i2c-smbus: fix i2c_handle_smbus_host_notify documentation
  eeprom: at24: tweak the loop_until_timeout() macro
  eeprom: at24: add support for at24mac series
  eeprom: at24: support reading the serial number for 24csxx
  eeprom: at24: platform_data: use BIT() macro
  eeprom: at24: split at24_eeprom_write() into specialized functions
  eeprom: at24: split at24_eeprom_read() into specialized functions
  eeprom: at24: hide the read/write loop behind a macro
  eeprom: at24: call read/write functions via function pointers
  eeprom: at24: coding style fixes
  eeprom: at24: move at24_read() below at24_eeprom_write()
  ...

diff --cc drivers/hwmon/lm90.c
index f51e758,5b62c57..1e82374
--- 1/drivers/hwmon/lm90.c
--- 2/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@@ -1717,9 -1600,32 +1717,10 @@@ static int lm90_probe(struct i2c_clien
        }
  
        return 0;
 -
 -exit_unregister:
 -      hwmon_device_unregister(data->hwmon_dev);
 -exit_remove_pec:
 -      device_remove_file(dev, &dev_attr_pec);
 -exit_restore:
 -      lm90_restore_conf(client, data);
 -      regulator_disable(data->regulator);
 -
 -      return err;
 -}
 -
 -static int lm90_remove(struct i2c_client *client)
 -{
 -      struct lm90_data *data = i2c_get_clientdata(client);
 -
 -      hwmon_device_unregister(data->hwmon_dev);
 -      device_remove_file(&client->dev, &dev_attr_pec);
 -      lm90_restore_conf(client, data);
 -      regulator_disable(data->regulator);
 -
 -      return 0;
  }
  
- static void lm90_alert(struct i2c_client *client, unsigned int flag)
+ static void lm90_alert(struct i2c_client *client, enum i2c_alert_protocol type,
+                      unsigned int flag)
  {
        u16 alarms;
  

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

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