Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

misc: eeprom: ee1004: convert to i2c_new_dummy_device

Move from i2c_new_dummy() to i2c_new_dummy_device(), so we now get an
ERRPTR which we use in error handling.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20190722172616.3982-2-wsa+renesas@sang-engineering.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Wolfram Sang and committed by
Greg Kroah-Hartman
80257121 5f9e832c

+3 -3
+3 -3
drivers/misc/eeprom/ee1004.c
··· 195 195 mutex_lock(&ee1004_bus_lock); 196 196 if (++ee1004_dev_count == 1) { 197 197 for (cnr = 0; cnr < 2; cnr++) { 198 - ee1004_set_page[cnr] = i2c_new_dummy(client->adapter, 198 + ee1004_set_page[cnr] = i2c_new_dummy_device(client->adapter, 199 199 EE1004_ADDR_SET_PAGE + cnr); 200 - if (!ee1004_set_page[cnr]) { 200 + if (IS_ERR(ee1004_set_page[cnr])) { 201 201 dev_err(&client->dev, 202 202 "address 0x%02x unavailable\n", 203 203 EE1004_ADDR_SET_PAGE + cnr); 204 - err = -EADDRINUSE; 204 + err = PTR_ERR(ee1004_set_page[cnr]); 205 205 goto err_clients; 206 206 } 207 207 }