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

[PATCH] RTCs don't use i2c_adapter.dev

Update more I2C drivers that live outside drivers/i2c to understand that using
adapter->dev is not The Way. When actually referring to the adapter hardware,
adapter->class_dev.dev is the answer. When referring to a device connected to
it, client->dev.dev is the answer.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

David Brownell and committed by
Linus Torvalds
a14e1893 884b4aaa

+10 -10
+1 -1
drivers/rtc/rtc-ds1672.c
··· 199 199 struct i2c_client *client; 200 200 struct rtc_device *rtc; 201 201 202 - dev_dbg(&adapter->dev, "%s\n", __FUNCTION__); 202 + dev_dbg(adapter->class_dev.dev, "%s\n", __FUNCTION__); 203 203 204 204 if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { 205 205 err = -ENODEV;
+3 -3
drivers/rtc/rtc-pcf8563.c
··· 192 192 xfer = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs)); 193 193 194 194 if (xfer != ARRAY_SIZE(msgs)) { 195 - dev_err(&client->adapter->dev, 195 + dev_err(&client->dev, 196 196 "%s: could not read register 0x%02X\n", 197 197 __FUNCTION__, pattern[i].reg); 198 198 ··· 203 203 204 204 if (value > pattern[i].max || 205 205 value < pattern[i].min) { 206 - dev_dbg(&client->adapter->dev, 206 + dev_dbg(&client->dev, 207 207 "%s: pattern=%d, reg=%x, mask=0x%02x, min=%d, " 208 208 "max=%d, value=%d, raw=0x%02X\n", 209 209 __FUNCTION__, i, pattern[i].reg, pattern[i].mask, ··· 253 253 254 254 int err = 0; 255 255 256 - dev_dbg(&adapter->dev, "%s\n", __FUNCTION__); 256 + dev_dbg(adapter->class_dev.dev, "%s\n", __FUNCTION__); 257 257 258 258 if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { 259 259 err = -ENODEV;
+1 -1
drivers/rtc/rtc-rs5c372.c
··· 200 200 struct i2c_client *client; 201 201 struct rs5c372 *rs5c372; 202 202 203 - dev_dbg(&adapter->dev, "%s\n", __FUNCTION__); 203 + dev_dbg(adapter->class_dev.dev, "%s\n", __FUNCTION__); 204 204 205 205 if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { 206 206 err = -ENODEV;
+5 -5
drivers/rtc/rtc-x1205.c
··· 372 372 }; 373 373 374 374 if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) { 375 - dev_err(&client->adapter->dev, 375 + dev_err(&client->dev, 376 376 "%s: could not read register %x\n", 377 377 __FUNCTION__, probe_zero_pattern[i]); 378 378 ··· 380 380 } 381 381 382 382 if ((buf & probe_zero_pattern[i+1]) != 0) { 383 - dev_err(&client->adapter->dev, 383 + dev_err(&client->dev, 384 384 "%s: register=%02x, zero pattern=%d, value=%x\n", 385 385 __FUNCTION__, probe_zero_pattern[i], i, buf); 386 386 ··· 400 400 }; 401 401 402 402 if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) { 403 - dev_err(&client->adapter->dev, 403 + dev_err(&client->dev, 404 404 "%s: could not read register %x\n", 405 405 __FUNCTION__, probe_limits_pattern[i].reg); 406 406 ··· 411 411 412 412 if (value > probe_limits_pattern[i].max || 413 413 value < probe_limits_pattern[i].min) { 414 - dev_dbg(&client->adapter->dev, 414 + dev_dbg(&client->dev, 415 415 "%s: register=%x, lim pattern=%d, value=%d\n", 416 416 __FUNCTION__, probe_limits_pattern[i].reg, 417 417 i, value); ··· 506 506 struct i2c_client *client; 507 507 struct rtc_device *rtc; 508 508 509 - dev_dbg(&adapter->dev, "%s\n", __FUNCTION__); 509 + dev_dbg(adapter->class_dev.dev, "%s\n", __FUNCTION__); 510 510 511 511 if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { 512 512 err = -ENODEV;