mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
Input: psmouse - switch to using i2c_new_scanned_device()
Move from the deprecated i2c_new_probed_device() to the new i2c_new_scanned_device(). Make use of the new ERRPTR if suitable. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Link: https://lore.kernel.org/r/20200210165902.5250-1-wsa+renesas@sang-engineering.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
parent
d0c5e7d4f5
commit
557d0841bc
1 changed files with 5 additions and 3 deletions
|
@ -190,6 +190,7 @@ static int psmouse_smbus_create_companion(struct device *dev, void *data)
|
|||
struct psmouse_smbus_dev *smbdev = data;
|
||||
unsigned short addr_list[] = { smbdev->board.addr, I2C_CLIENT_END };
|
||||
struct i2c_adapter *adapter;
|
||||
struct i2c_client *client;
|
||||
|
||||
adapter = i2c_verify_adapter(dev);
|
||||
if (!adapter)
|
||||
|
@ -198,12 +199,13 @@ static int psmouse_smbus_create_companion(struct device *dev, void *data)
|
|||
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_HOST_NOTIFY))
|
||||
return 0;
|
||||
|
||||
smbdev->client = i2c_new_probed_device(adapter, &smbdev->board,
|
||||
addr_list, NULL);
|
||||
if (!smbdev->client)
|
||||
client = i2c_new_scanned_device(adapter, &smbdev->board,
|
||||
addr_list, NULL);
|
||||
if (IS_ERR(client))
|
||||
return 0;
|
||||
|
||||
/* We have our(?) device, stop iterating i2c bus. */
|
||||
smbdev->client = client;
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue