]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ASoC: pxa: magician: convert to use i2c_new_client_device()
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Thu, 26 Mar 2020 21:10:10 +0000 (22:10 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 27 Mar 2020 15:33:07 +0000 (15:33 +0000)
Move away from the deprecated API and return the shiny new ERRPTR where
useful.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20200326211010.13471-2-wsa+renesas@sang-engineering.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/pxa/magician.c

index 6483cff5b73da1ce79367fb4c44cc4310aa752e4..3bafd86bfb938afd47f6182119dd5cd25bdfe2a2 100644 (file)
@@ -358,10 +358,10 @@ static int __init magician_init(void)
        adapter = i2c_get_adapter(0);
        if (!adapter)
                return -ENODEV;
-       client = i2c_new_device(adapter, i2c_board_info);
+       client = i2c_new_client_device(adapter, i2c_board_info);
        i2c_put_adapter(adapter);
-       if (!client)
-               return -ENODEV;
+       if (IS_ERR(client))
+               return PTR_ERR(client);
 
        ret = gpio_request(EGPIO_MAGICIAN_SPK_POWER, "SPK_POWER");
        if (ret)