OSDN Git Service

ALSA: ppc: keywest: convert to use i2c_new_client_device()
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Thu, 26 Mar 2020 21:10:12 +0000 (22:10 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 27 Mar 2020 08:33:01 +0000 (09:33 +0100)
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/20200326211013.13531-2-wsa+renesas@sang-engineering.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/ppc/keywest.c

index 093806d..9554a0c 100644 (file)
@@ -40,6 +40,7 @@ static int keywest_probe(struct i2c_client *client,
 static int keywest_attach_adapter(struct i2c_adapter *adapter)
 {
        struct i2c_board_info info;
+       struct i2c_client *client;
 
        if (! keywest_ctx)
                return -EINVAL;
@@ -50,9 +51,11 @@ static int keywest_attach_adapter(struct i2c_adapter *adapter)
        memset(&info, 0, sizeof(struct i2c_board_info));
        strlcpy(info.type, "keywest", I2C_NAME_SIZE);
        info.addr = keywest_ctx->addr;
-       keywest_ctx->client = i2c_new_device(adapter, &info);
-       if (!keywest_ctx->client)
-               return -ENODEV;
+       client = i2c_new_client_device(adapter, &info);
+       if (IS_ERR(client))
+               return PTR_ERR(client);
+       keywest_ctx->client = client;
+
        /*
         * We know the driver is already loaded, so the device should be
         * already bound. If not it means binding failed, and then there