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

Pull i2c updates from Wolfram Sang:
 "New stuff from the I2C world:

   - in the core, getting irqs from ACPI is now similar to OF

   - new driver for MediaTek MT7621/7628/7688 SoCs

   - bcm2835, i801, and tegra drivers got some more attention

   - GPIO API cleanups

   - cleanups in the core headers

   - lots of usual driver updates"

* 'i2c/for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (74 commits)
  i2c: mt7621: Fix platform_no_drv_owner.cocci warnings
  i2c: cpm: remove casting dma_alloc
  dt-bindings: i2c: sun6i-p2wi: Fix the binding example
  dt-bindings: i2c: mv64xxx: Fix the example compatible
  i2c: i801: Documentation update
  i2c: i801: Add support for Intel Tiger Lake
  i2c: i801: Fix PCI ID sorting
  dt-bindings: i2c-stm32: document optional dmas
  i2c: i2c-stm32f7: Add I2C_SMBUS_I2C_BLOCK_DATA support
  i2c: core: Tidy up handling of init_irq
  i2c: core: Move ACPI gpio IRQ handling into i2c_acpi_get_irq
  i2c: core: Move ACPI IRQ handling to probe time
  i2c: acpi: Factor out getting the IRQ from ACPI
  i2c: acpi: Use available IRQ helper functions
  i2c: core: Allow whole core to use i2c_dev_irq_from_resources
  eeprom: at24: modify a comment referring to platform data
  dt-bindings: i2c: omap: Add new compatible for J721E SoCs
  dt-bindings: i2c: mv64xxx: Add YAML schemas
  dt-bindings: i2c: sun6i-p2wi: Add YAML schemas
  i2c: mt7621: Add MediaTek MT7621/7628/7688 I2C driver
  ...

1 files changed, 28 insertions, 58 deletions

diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
index 63aa541c9608..35bf2477693d 100644
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -507,38 +507,24 @@ static const struct at24_chip_data *at24_get_chip_data(struct device *dev)
         return cdata;
 }
 
-static void at24_remove_dummy_clients(struct at24_data *at24)
-{
-        int i;
-
-        for (i = 1; i < at24->num_addresses; i++)
-                i2c_unregister_device(at24->client[i].client);
-}
-
 static int at24_make_dummy_client(struct at24_data *at24, unsigned int index,
                                   struct regmap_config *regmap_config)
 {
         struct i2c_client *base_client, *dummy_client;
-        unsigned short int addr;
         struct regmap *regmap;
         struct device *dev;
 
         base_client = at24->client[0].client;
         dev = &base_client->dev;
-        addr = base_client->addr + index;
 
-        dummy_client = i2c_new_dummy(base_client->adapter,
-                                     base_client->addr + index);
-        if (!dummy_client) {
-                dev_err(dev, "address 0x%02x unavailable\n", addr);
-                return -EADDRINUSE;
-        }
+        dummy_client = devm_i2c_new_dummy_device(dev, base_client->adapter,
+                                                 base_client->addr + index);
+        if (IS_ERR(dummy_client))
+                return PTR_ERR(dummy_client);
 
         regmap = devm_regmap_init_i2c(dummy_client, regmap_config);
-        if (IS_ERR(regmap)) {
-                i2c_unregister_device(dummy_client);
+        if (IS_ERR(regmap))
                 return PTR_ERR(regmap);
-        }
 
         at24->client[index].client = dummy_client;
         at24->client[index].regmap = regmap;
@@ -580,7 +566,6 @@ static int at24_probe(struct i2c_client *client)
         unsigned int i, num_addresses;
         struct at24_data *at24;
         struct regmap *regmap;
-        size_t at24_size;
         bool writable;
         u8 test_byte;
         int err;
@@ -597,8 +582,8 @@ static int at24_probe(struct i2c_client *client)
         if (err)
                 /*
                  * This is slow, but we can't know all eeproms, so we better
-                 * play safe. Specifying custom eeprom-types via platform_data
-                 * is recommended anyhow.
+                 * play safe. Specifying custom eeprom-types via device tree
+                 * or properties is recommended anyhow.
                  */
                 page_size = 1;
 
@@ -664,8 +649,8 @@ static int at24_probe(struct i2c_client *client)
         if (IS_ERR(regmap))
                 return PTR_ERR(regmap);
 
-        at24_size = sizeof(*at24) + num_addresses * sizeof(struct at24_client);
-        at24 = devm_kzalloc(dev, at24_size, GFP_KERNEL);
+        at24 = devm_kzalloc(dev, struct_size(at24, client, num_addresses),
+                            GFP_KERNEL);
         if (!at24)
                 return -ENOMEM;
 
@@ -693,27 +678,8 @@ static int at24_probe(struct i2c_client *client)
         /* use dummy devices for multiple-address chips */
         for (i = 1; i < num_addresses; i++) {
                 err = at24_make_dummy_client(at24, i, &regmap_config);
-                if (err) {
-                        at24_remove_dummy_clients(at24);
+                if (err)
                         return err;
-                }
-        }
-
-        i2c_set_clientdata(client, at24);
-
-        /* enable runtime pm */
-        pm_runtime_set_active(dev);
-        pm_runtime_enable(dev);
-
-        /*
-         * Perform a one-byte test read to verify that the
-         * chip is functional.
-         */
-        err = at24_read(at24, 0, &test_byte, 1);
-        pm_runtime_idle(dev);
-        if (err) {
-                err = -ENODEV;
-                goto err_clients;
         }
 
         nvmem_config.name = dev_name(dev);
@@ -731,9 +697,24 @@ static int at24_probe(struct i2c_client *client)
         nvmem_config.size = byte_len;
 
         at24->nvmem = devm_nvmem_register(dev, &nvmem_config);
-        if (IS_ERR(at24->nvmem)) {
-                err = PTR_ERR(at24->nvmem);
-                goto err_clients;
+        if (IS_ERR(at24->nvmem))
+                return PTR_ERR(at24->nvmem);
+
+        i2c_set_clientdata(client, at24);
+
+        /* enable runtime pm */
+        pm_runtime_set_active(dev);
+        pm_runtime_enable(dev);
+
+        /*
+         * Perform a one-byte test read to verify that the
+         * chip is functional.
+         */
+        err = at24_read(at24, 0, &test_byte, 1);
+        pm_runtime_idle(dev);
+        if (err) {
+                pm_runtime_disable(dev);
+                return -ENODEV;
         }
 
         dev_info(dev, "%u byte %s EEPROM, %s, %u bytes/write\n",
@@ -741,21 +722,10 @@ static int at24_probe(struct i2c_client *client)
                  writable ? "writable" : "read-only", at24->write_max);
 
         return 0;
-
-err_clients:
-        at24_remove_dummy_clients(at24);
-        pm_runtime_disable(dev);
-
-        return err;
 }
 
 static int at24_remove(struct i2c_client *client)
 {
-        struct at24_data *at24;
-
-        at24 = i2c_get_clientdata(client);
-
-        at24_remove_dummy_clients(at24);
         pm_runtime_disable(&client->dev);
         pm_runtime_set_suspended(&client->dev);