The patch titled
rtc: Add RTC class driver for the Maxim MAX6900 (update)
has been added to the -mm tree. Its filename is
rtc-add-rtc-class-driver-for-the-maxim-max6900-update.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: rtc: Add RTC class driver for the Maxim MAX6900 (update)
From: Dale Farnsworth <dale@xxxxxxxxxxxxxx>
I believe I addressed all of Jean's comments. I thank Jean for sending
them and apologize for losing the email. Regarding moving it to the
new-style i2c interface, I think Jean is referring to changes in -mm, but
not yet in mainline. I will be happy to revisit this driver and make the
changes when the new i2c-core infrastructure goes in.
Signed-off-by: Dale Farnsworth <dale@xxxxxxxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Cc: David Brownell <david-b@xxxxxxxxxxx>
Cc: Jean Delvare <khali@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rtc/rtc-max6900.c | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff -puN drivers/rtc/rtc-max6900.c~rtc-add-rtc-class-driver-for-the-maxim-max6900-update drivers/rtc/rtc-max6900.c
--- a/drivers/rtc/rtc-max6900.c~rtc-add-rtc-class-driver-for-the-maxim-max6900-update
+++ a/drivers/rtc/rtc-max6900.c
@@ -61,16 +61,16 @@ static int max6900_i2c_read_regs(struct
u8 reg_addr[1] = { MAX6900_REG_BURST_READ };
struct i2c_msg msgs[2] = {
{
- client->addr,
- 0, /* write */
- sizeof(reg_addr),
- reg_addr
+ .addr = client->addr,
+ .flags = 0, /* write */
+ .len = sizeof(reg_addr),
+ .buf = reg_addr
},
{
- client->addr,
- I2C_M_RD,
- MAX6900_REG_LEN,
- buf
+ .addr = client->addr,
+ .flags = I2C_M_RD,
+ .len = MAX6900_REG_LEN,
+ .buf = buf
}
};
int rc;
@@ -89,10 +89,10 @@ static int max6900_i2c_write_regs(struct
u8 i2c_buf[MAX6900_REG_LEN + 1] = { MAX6900_REG_BURST_WRITE };
struct i2c_msg msgs[1] = {
{
- client->addr,
- 0, /* write */
- MAX6900_REG_LEN + 1,
- i2c_buf
+ .addr = client->addr,
+ .flags = 0, /* write */
+ .len = MAX6900_REG_LEN + 1,
+ .buf = i2c_buf
}
};
int rc;
@@ -128,7 +128,7 @@ static int max6900_i2c_validate_client(s
reserved = i2c_smbus_read_byte_data(client, MAX6900_REG_RESERVED_READ);
if (reserved != 0x07)
- return -ENODEV;
+ return -ENODEV;
rc = max6900_i2c_read_regs(client, regs);
if (rc < 0)
@@ -230,8 +230,8 @@ static struct i2c_driver max6900_driver
.name = DRV_NAME,
},
.id = I2C_DRIVERID_MAX6900,
- .attach_adapter = &max6900_attach_adapter,
- .detach_client = &max6900_detach_client,
+ .attach_adapter = max6900_attach_adapter,
+ .detach_client = max6900_detach_client,
};
static const struct rtc_class_ops max6900_rtc_ops = {
@@ -259,8 +259,7 @@ static int max6900_probe(struct i2c_adap
client->addr = addr;
client->adapter = adapter;
client->driver = &max6900_driver;
- client->flags = 0;
- strcpy(client->name, DRV_NAME);
+ strlcpy(client->name, DRV_NAME, I2C_NAME_SIZE);
if (kind < 0) {
rc = max6900_i2c_validate_client(client);
_
Patches currently in -mm which might be from dale@xxxxxxxxxxxxxx are
origin.patch
git-r8169.patch
rtc-add-rtc-class-driver-for-the-maxim-max6900.patch
rtc-add-rtc-class-driver-for-the-maxim-max6900-update.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
