Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 2690
b: refs/heads/master
c: d01b79d
h: refs/heads/master
v: v3
  • Loading branch information
Ladislav Michl authored and Greg Kroah-Hartman committed Jun 22, 2005
1 parent 51c96f2 commit d1c0a83
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 18 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6069ffde15472da9d041a58df490d388bb175d51
refs/heads/master: d01b79d0613ebb6810bb48baf6e53e9319701fea
25 changes: 8 additions & 17 deletions trunk/drivers/i2c/chips/ds1337.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,17 +95,14 @@ static inline int ds1337_read(struct i2c_client *client, u8 reg, u8 *value)
*/
static int ds1337_get_datetime(struct i2c_client *client, struct rtc_time *dt)
{
struct ds1337_data *data = i2c_get_clientdata(client);
int result;
u8 buf[7];
u8 val;
struct i2c_msg msg[2];
u8 offs = 0;

if (!dt) {
dev_dbg(&client->adapter->dev, "%s: EINVAL: dt=NULL\n",
__FUNCTION__);

dev_dbg(&client->dev, "%s: EINVAL: dt=NULL\n", __FUNCTION__);
return -EINVAL;
}

Expand All @@ -121,8 +118,7 @@ static int ds1337_get_datetime(struct i2c_client *client, struct rtc_time *dt)

result = i2c_transfer(client->adapter, msg, 2);

dev_dbg(&client->adapter->dev,
"%s: [%d] %02x %02x %02x %02x %02x %02x %02x\n",
dev_dbg(&client->dev, "%s: [%d] %02x %02x %02x %02x %02x %02x %02x\n",
__FUNCTION__, result, buf[0], buf[1], buf[2], buf[3],
buf[4], buf[5], buf[6]);

Expand All @@ -139,14 +135,13 @@ static int ds1337_get_datetime(struct i2c_client *client, struct rtc_time *dt)
if (buf[5] & 0x80)
dt->tm_year += 100;

dev_dbg(&client->adapter->dev, "%s: secs=%d, mins=%d, "
dev_dbg(&client->dev, "%s: secs=%d, mins=%d, "
"hours=%d, mday=%d, mon=%d, year=%d, wday=%d\n",
__FUNCTION__, dt->tm_sec, dt->tm_min,
dt->tm_hour, dt->tm_mday,
dt->tm_mon, dt->tm_year, dt->tm_wday);
} else {
dev_err(&client->adapter->dev, "ds1337[%d]: error reading "
"data! %d\n", data->id, result);
dev_err(&client->dev, "error reading data! %d\n", result);
result = -EIO;
}

Expand All @@ -155,20 +150,17 @@ static int ds1337_get_datetime(struct i2c_client *client, struct rtc_time *dt)

static int ds1337_set_datetime(struct i2c_client *client, struct rtc_time *dt)
{
struct ds1337_data *data = i2c_get_clientdata(client);
int result;
u8 buf[8];
u8 val;
struct i2c_msg msg[1];

if (!dt) {
dev_dbg(&client->adapter->dev, "%s: EINVAL: dt=NULL\n",
__FUNCTION__);

dev_dbg(&client->dev, "%s: EINVAL: dt=NULL\n", __FUNCTION__);
return -EINVAL;
}

dev_dbg(&client->adapter->dev, "%s: secs=%d, mins=%d, hours=%d, "
dev_dbg(&client->dev, "%s: secs=%d, mins=%d, hours=%d, "
"mday=%d, mon=%d, year=%d, wday=%d\n", __FUNCTION__,
dt->tm_sec, dt->tm_min, dt->tm_hour,
dt->tm_mday, dt->tm_mon, dt->tm_year, dt->tm_wday);
Expand All @@ -195,8 +187,7 @@ static int ds1337_set_datetime(struct i2c_client *client, struct rtc_time *dt)

result = i2c_transfer(client->adapter, msg, 1);
if (result < 0) {
dev_err(&client->adapter->dev, "ds1337[%d]: error "
"writing data! %d\n", data->id, result);
dev_err(&client->dev, "error writing data! %d\n", result);
result = -EIO;
} else {
result = 0;
Expand All @@ -208,7 +199,7 @@ static int ds1337_set_datetime(struct i2c_client *client, struct rtc_time *dt)
static int ds1337_command(struct i2c_client *client, unsigned int cmd,
void *arg)
{
dev_dbg(&client->adapter->dev, "%s: cmd=%d\n", __FUNCTION__, cmd);
dev_dbg(&client->dev, "%s: cmd=%d\n", __FUNCTION__, cmd);

switch (cmd) {
case DS1337_GET_DATE:
Expand Down

0 comments on commit d1c0a83

Please sign in to comment.