adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-30 12:46:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] RTCs don't use i2c_adapter.dev

Browse source 
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>
This commit is contained in:
David Brownell 2006-12-10 02:19:02 -08:00 committed by Linus Torvalds
parent 884b4aaaa2
commit a14e189350
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/rtc/rtc-ds1672.c
View file

@ -199,7 +199,7 @@ static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind)
struct i2c_client *client; struct i2c_client *client;
struct rtc_device *rtc; struct rtc_device *rtc;
dev_dbg(&adapter->dev, "%s\n", __FUNCTION__); dev_dbg(adapter->class_dev.dev, "%s\n", __FUNCTION__);
if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
err = -ENODEV; err = -ENODEV;

6
drivers/rtc/rtc-pcf8563.c
View file

@ -192,7 +192,7 @@ static int pcf8563_validate_client(struct i2c_client *client)
xfer = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs)); xfer = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
if (xfer != ARRAY_SIZE(msgs)) { if (xfer != ARRAY_SIZE(msgs)) {
dev_err(&client->adapter->dev, dev_err(&client->dev,
"%s: could not read register 0x%02X\n", "%s: could not read register 0x%02X\n",
__FUNCTION__, pattern[i].reg); __FUNCTION__, pattern[i].reg);
@ -203,7 +203,7 @@ static int pcf8563_validate_client(struct i2c_client *client)
if (value > pattern[i].max || if (value > pattern[i].max ||
value < pattern[i].min) { value < pattern[i].min) {
dev_dbg(&client->adapter->dev, dev_dbg(&client->dev,
"%s: pattern=%d, reg=%x, mask=0x%02x, min=%d, " "%s: pattern=%d, reg=%x, mask=0x%02x, min=%d, "
"max=%d, value=%d, raw=0x%02X\n", "max=%d, value=%d, raw=0x%02X\n",
__FUNCTION__, i, pattern[i].reg, pattern[i].mask, __FUNCTION__, i, pattern[i].reg, pattern[i].mask,
@ -253,7 +253,7 @@ static int pcf8563_probe(struct i2c_adapter *adapter, int address, int kind)
int err = 0; int err = 0;
dev_dbg(&adapter->dev, "%s\n", __FUNCTION__); dev_dbg(adapter->class_dev.dev, "%s\n", __FUNCTION__);
if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
err = -ENODEV; err = -ENODEV;

2
drivers/rtc/rtc-rs5c372.c
View file

@ -200,7 +200,7 @@ static int rs5c372_probe(struct i2c_adapter *adapter, int address, int kind)
struct i2c_client *client; struct i2c_client *client;
struct rs5c372 *rs5c372; struct rs5c372 *rs5c372;
dev_dbg(&adapter->dev, "%s\n", __FUNCTION__); dev_dbg(adapter->class_dev.dev, "%s\n", __FUNCTION__);
if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
err = -ENODEV; err = -ENODEV;

10
drivers/rtc/rtc-x1205.c
View file

@ -372,7 +372,7 @@ static int x1205_validate_client(struct i2c_client *client)
}; };
if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) { if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) {
dev_err(&client->adapter->dev, dev_err(&client->dev,
"%s: could not read register %x\n", "%s: could not read register %x\n",
__FUNCTION__, probe_zero_pattern[i]); __FUNCTION__, probe_zero_pattern[i]);
@ -380,7 +380,7 @@ static int x1205_validate_client(struct i2c_client *client)
} }
if ((buf & probe_zero_pattern[i+1]) != 0) { if ((buf & probe_zero_pattern[i+1]) != 0) {
dev_err(&client->adapter->dev, dev_err(&client->dev,
"%s: register=%02x, zero pattern=%d, value=%x\n", "%s: register=%02x, zero pattern=%d, value=%x\n",
__FUNCTION__, probe_zero_pattern[i], i, buf); __FUNCTION__, probe_zero_pattern[i], i, buf);
@ -400,7 +400,7 @@ static int x1205_validate_client(struct i2c_client *client)
}; };
if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) { if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) {
dev_err(&client->adapter->dev, dev_err(&client->dev,
"%s: could not read register %x\n", "%s: could not read register %x\n",
__FUNCTION__, probe_limits_pattern[i].reg); __FUNCTION__, probe_limits_pattern[i].reg);
@ -411,7 +411,7 @@ static int x1205_validate_client(struct i2c_client *client)
if (value > probe_limits_pattern[i].max || if (value > probe_limits_pattern[i].max ||
value < probe_limits_pattern[i].min) { value < probe_limits_pattern[i].min) {
dev_dbg(&client->adapter->dev, dev_dbg(&client->dev,
"%s: register=%x, lim pattern=%d, value=%d\n", "%s: register=%x, lim pattern=%d, value=%d\n",
__FUNCTION__, probe_limits_pattern[i].reg, __FUNCTION__, probe_limits_pattern[i].reg,
i, value); i, value);
@ -506,7 +506,7 @@ static int x1205_probe(struct i2c_adapter *adapter, int address, int kind)
struct i2c_client *client; struct i2c_client *client;
struct rtc_device *rtc; struct rtc_device *rtc;
dev_dbg(&adapter->dev, "%s\n", __FUNCTION__); dev_dbg(adapter->class_dev.dev, "%s\n", __FUNCTION__);
if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) { if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
err = -ENODEV; err = -ENODEV;