Merge branch 'i2c/platform_data-immutable' into i2c/for-4.18

diff --combined drivers/i2c/busses/i2c-i801.c
index 954fb3f,bff160d..aa72660
--- 1/drivers/i2c/busses/i2c-i801.c
--- 2/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@@ -106,7 -106,7 +106,7 @@@
  
  #if IS_ENABLED(CONFIG_I2C_MUX_GPIO) && defined CONFIG_DMI
  #include <linux/gpio.h>
- #include <linux/i2c-mux-gpio.h>
+ #include <linux/platform_data/i2c-mux-gpio.h>
  #endif
  
  /* I801 SMBus address offsets */
@@@ -1710,7 -1710,7 +1710,7 @@@ static void i801_shutdown(struct pci_de
        pci_write_config_byte(dev, SMBHSTCFG, priv->original_hstcfg);
  }
  
 -#ifdef CONFIG_PM
 +#ifdef CONFIG_PM_SLEEP
  static int i801_suspend(struct device *dev)
  {
        struct pci_dev *pci_dev = to_pci_dev(dev);
@@@ -1731,7 -1731,8 +1731,7 @@@ static int i801_resume(struct device *d
  }
  #endif
  
 -static UNIVERSAL_DEV_PM_OPS(i801_pm_ops, i801_suspend,
 -                          i801_resume, NULL);
 +static SIMPLE_DEV_PM_OPS(i801_pm_ops, i801_suspend, i801_resume);
  
  static struct pci_driver i801_driver = {
        .name           = "i801_smbus",

diff --combined drivers/i2c/busses/i2c-xiic.c
index 92def98,0ff36f6..e3161fe
--- 1/drivers/i2c/busses/i2c-xiic.c
--- 2/drivers/i2c/busses/i2c-xiic.c
+++ b/drivers/i2c/busses/i2c-xiic.c
@@@ -33,7 -33,7 +33,7 @@@
  #include <linux/i2c.h>
  #include <linux/interrupt.h>
  #include <linux/wait.h>
- #include <linux/i2c-xiic.h>
+ #include <linux/platform_data/i2c-xiic.h>
  #include <linux/io.h>
  #include <linux/slab.h>
  #include <linux/of.h>
@@@ -415,7 -415,7 +415,7 @@@ static irqreturn_t xiic_process(int irq
                clr |= XIIC_INTR_RX_FULL_MASK;
                if (!i2c->rx_msg) {
                        dev_dbg(i2c->adap.dev.parent,
 -                              "%s unexpexted RX IRQ\n", __func__);
 +                              "%s unexpected RX IRQ\n", __func__);
                        xiic_clear_rx_fifo(i2c);
                        goto out;
                }
@@@ -470,7 -470,7 +470,7 @@@
  
                if (!i2c->tx_msg) {
                        dev_dbg(i2c->adap.dev.parent,
 -                              "%s unexpexted TX IRQ\n", __func__);
 +                              "%s unexpected TX IRQ\n", __func__);
                        goto out;
                }