forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5
kernel/sound/ppc/keywest.c
....@@ -1,21 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /*
23 * common keywest i2c layer
34 *
45 * Copyright (c) by Takashi Iwai <tiwai@suse.de>
5
- *
6
- * This program is free software; you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License as published by
8
- * the Free Software Foundation; either version 2 of the License, or
9
- * (at your option) any later version.
10
- *
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14
- * GNU General Public License for more details.
15
- *
16
- * You should have received a copy of the GNU General Public License
17
- * along with this program; if not, write to the Free Software
18
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
196 */
207
218
....@@ -53,6 +40,7 @@
5340 static int keywest_attach_adapter(struct i2c_adapter *adapter)
5441 {
5542 struct i2c_board_info info;
43
+ struct i2c_client *client;
5644
5745 if (! keywest_ctx)
5846 return -EINVAL;
....@@ -63,9 +51,11 @@
6351 memset(&info, 0, sizeof(struct i2c_board_info));
6452 strlcpy(info.type, "keywest", I2C_NAME_SIZE);
6553 info.addr = keywest_ctx->addr;
66
- keywest_ctx->client = i2c_new_device(adapter, &info);
67
- if (!keywest_ctx->client)
68
- return -ENODEV;
54
+ client = i2c_new_client_device(adapter, &info);
55
+ if (IS_ERR(client))
56
+ return PTR_ERR(client);
57
+ keywest_ctx->client = client;
58
+
6959 /*
7060 * We know the driver is already loaded, so the device should be
7161 * already bound. If not it means binding failed, and then there