Re: [PATCH] ds1337 3/4
On Fri, Apr 08, 2005 at 12:08:38PM +0200, Jean Delvare wrote: > Looks OK to me. Ok, I have few more fixes for this driver and will send them later when I find time to split them out into smaller chunks. Again, here is patch with signed off line. dev_{dbg,err} functions should print client's device name. data->id can be dropped from message, because device is determined by bus it hangs on (it has fixed address). Signed-off-by: Ladislav Michl <[EMAIL PROTECTED]> --- linux-omap/drivers/i2c/chips/ds1337.c.orig 2005-04-08 00:36:15.072302800 +0200 +++ linux-omap/drivers/i2c/chips/ds1337.c 2005-04-08 00:44:44.130914128 +0200 @@ -95,7 +95,6 @@ static inline int ds1337_read(struct i2c */ 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; @@ -103,9 +102,7 @@ static int ds1337_get_datetime(struct i2 u8 offs = 0; if (!dt) { - dev_dbg(>adapter->dev, "%s: EINVAL: dt=NULL\n", - __FUNCTION__); - + dev_dbg(>dev, "%s: EINVAL: dt=NULL\n", __FUNCTION__); return -EINVAL; } @@ -121,8 +118,7 @@ static int ds1337_get_datetime(struct i2 result = i2c_transfer(client->adapter, msg, 2); - dev_dbg(>adapter->dev, - "%s: [%d] %02x %02x %02x %02x %02x %02x %02x\n", + dev_dbg(>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]); @@ -139,14 +135,13 @@ static int ds1337_get_datetime(struct i2 if (buf[5] & 0x80) dt->tm_year += 100; - dev_dbg(>adapter->dev, "%s: secs=%d, mins=%d, " + dev_dbg(>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(>adapter->dev, "ds1337[%d]: error reading " - "data! %d\n", data->id, result); + dev_err(>dev, "error reading data! %d\n", result); result = -EIO; } @@ -155,20 +150,17 @@ static int ds1337_get_datetime(struct i2 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(>adapter->dev, "%s: EINVAL: dt=NULL\n", - __FUNCTION__); - + dev_dbg(>dev, "%s: EINVAL: dt=NULL\n", __FUNCTION__); return -EINVAL; } - dev_dbg(>adapter->dev, "%s: secs=%d, mins=%d, hours=%d, " + dev_dbg(>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); @@ -195,8 +187,7 @@ static int ds1337_set_datetime(struct i2 result = i2c_transfer(client->adapter, msg, 1); if (result < 0) { - dev_err(>adapter->dev, "ds1337[%d]: error " - "writing data! %d\n", data->id, result); + dev_err(>dev, "error writing data! %d\n", result); result = -EIO; } else { result = 0; @@ -208,7 +199,7 @@ static int ds1337_set_datetime(struct i2 static int ds1337_command(struct i2c_client *client, unsigned int cmd, void *arg) { - dev_dbg(>adapter->dev, "%s: cmd=%d\n", __FUNCTION__, cmd); + dev_dbg(>dev, "%s: cmd=%d\n", __FUNCTION__, cmd); switch (cmd) { case DS1337_GET_DATE: - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] ds1337 3/4
Hi Ladislav, > dev_{dbg,err} functions should print client's device name. data->id can > be dropped from message, because device is determined by bus it hangs on > (it has fixed address). Looks OK to me. Thanks, -- Jean Delvare - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] ds1337 3/4
Hi Ladislav, dev_{dbg,err} functions should print client's device name. data-id can be dropped from message, because device is determined by bus it hangs on (it has fixed address). Looks OK to me. Thanks, -- Jean Delvare - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] ds1337 3/4
On Fri, Apr 08, 2005 at 12:08:38PM +0200, Jean Delvare wrote: Looks OK to me. Ok, I have few more fixes for this driver and will send them later when I find time to split them out into smaller chunks. Again, here is patch with signed off line. dev_{dbg,err} functions should print client's device name. data-id can be dropped from message, because device is determined by bus it hangs on (it has fixed address). Signed-off-by: Ladislav Michl [EMAIL PROTECTED] --- linux-omap/drivers/i2c/chips/ds1337.c.orig 2005-04-08 00:36:15.072302800 +0200 +++ linux-omap/drivers/i2c/chips/ds1337.c 2005-04-08 00:44:44.130914128 +0200 @@ -95,7 +95,6 @@ static inline int ds1337_read(struct i2c */ 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; @@ -103,9 +102,7 @@ static int ds1337_get_datetime(struct i2 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; } @@ -121,8 +118,7 @@ static int ds1337_get_datetime(struct i2 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]); @@ -139,14 +135,13 @@ static int ds1337_get_datetime(struct i2 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; } @@ -155,20 +150,17 @@ static int ds1337_get_datetime(struct i2 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); @@ -195,8 +187,7 @@ static int ds1337_set_datetime(struct i2 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; @@ -208,7 +199,7 @@ static int ds1337_set_datetime(struct i2 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: - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] ds1337 3/4
dev_{dbg,err} functions should print client's device name. data->id can be dropped from message, because device is determined by bus it hangs on (it has fixed address). --- linux-omap/drivers/i2c/chips/ds1337.c.orig 2005-04-08 00:36:15.072302800 +0200 +++ linux-omap/drivers/i2c/chips/ds1337.c 2005-04-08 00:44:44.130914128 +0200 @@ -95,7 +95,6 @@ static inline int ds1337_read(struct i2c */ 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; @@ -103,9 +102,7 @@ static int ds1337_get_datetime(struct i2 u8 offs = 0; if (!dt) { - dev_dbg(>adapter->dev, "%s: EINVAL: dt=NULL\n", - __FUNCTION__); - + dev_dbg(>dev, "%s: EINVAL: dt=NULL\n", __FUNCTION__); return -EINVAL; } @@ -121,8 +118,7 @@ static int ds1337_get_datetime(struct i2 result = i2c_transfer(client->adapter, msg, 2); - dev_dbg(>adapter->dev, - "%s: [%d] %02x %02x %02x %02x %02x %02x %02x\n", + dev_dbg(>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]); @@ -139,14 +135,13 @@ static int ds1337_get_datetime(struct i2 if (buf[5] & 0x80) dt->tm_year += 100; - dev_dbg(>adapter->dev, "%s: secs=%d, mins=%d, " + dev_dbg(>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(>adapter->dev, "ds1337[%d]: error reading " - "data! %d\n", data->id, result); + dev_err(>dev, "error reading data! %d\n", result); result = -EIO; } @@ -155,20 +150,17 @@ static int ds1337_get_datetime(struct i2 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(>adapter->dev, "%s: EINVAL: dt=NULL\n", - __FUNCTION__); - + dev_dbg(>dev, "%s: EINVAL: dt=NULL\n", __FUNCTION__); return -EINVAL; } - dev_dbg(>adapter->dev, "%s: secs=%d, mins=%d, hours=%d, " + dev_dbg(>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); @@ -195,8 +187,7 @@ static int ds1337_set_datetime(struct i2 result = i2c_transfer(client->adapter, msg, 1); if (result < 0) { - dev_err(>adapter->dev, "ds1337[%d]: error " - "writing data! %d\n", data->id, result); + dev_err(>dev, "error writing data! %d\n", result); result = -EIO; } else { result = 0; @@ -208,7 +199,7 @@ static int ds1337_set_datetime(struct i2 static int ds1337_command(struct i2c_client *client, unsigned int cmd, void *arg) { - dev_dbg(>adapter->dev, "%s: cmd=%d\n", __FUNCTION__, cmd); + dev_dbg(>dev, "%s: cmd=%d\n", __FUNCTION__, cmd); switch (cmd) { case DS1337_GET_DATE: - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] ds1337 3/4
dev_{dbg,err} functions should print client's device name. data-id can be dropped from message, because device is determined by bus it hangs on (it has fixed address). --- linux-omap/drivers/i2c/chips/ds1337.c.orig 2005-04-08 00:36:15.072302800 +0200 +++ linux-omap/drivers/i2c/chips/ds1337.c 2005-04-08 00:44:44.130914128 +0200 @@ -95,7 +95,6 @@ static inline int ds1337_read(struct i2c */ 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; @@ -103,9 +102,7 @@ static int ds1337_get_datetime(struct i2 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; } @@ -121,8 +118,7 @@ static int ds1337_get_datetime(struct i2 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]); @@ -139,14 +135,13 @@ static int ds1337_get_datetime(struct i2 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; } @@ -155,20 +150,17 @@ static int ds1337_get_datetime(struct i2 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); @@ -195,8 +187,7 @@ static int ds1337_set_datetime(struct i2 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; @@ -208,7 +199,7 @@ static int ds1337_set_datetime(struct i2 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: - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/