The patch titled
Subject: rtc-add-rtc-abx80x-a-driver-for-the-abracon-ab-x80x-i2c-rtc-v3
has been removed from the -mm tree. Its filename was
rtc-add-rtc-abx80x-a-driver-for-the-abracon-ab-x80x-i2c-rtc-v3.patch
This patch was dropped because it was folded into rtc-add-rtc-abx80x-a-driver-for-the-abracon-ab-x80x-i2c-rtc.patch
------------------------------------------------------
From: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxxxxxxxxx>
Subject: rtc-add-rtc-abx80x-a-driver-for-the-abracon-ab-x80x-i2c-rtc-v3
- renamed buffer from date to buf in abx80x_rtc_read_time()
Signed-off-by: Philippe De Muyter <phdm@xxxxxxxxx>
Signed-off-by: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rtc/rtc-abx80x.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff -puN drivers/rtc/rtc-abx80x.c~rtc-add-rtc-abx80x-a-driver-for-the-abracon-ab-x80x-i2c-rtc-v3 drivers/rtc/rtc-abx80x.c
--- a/drivers/rtc/rtc-abx80x.c~rtc-add-rtc-abx80x-a-driver-for-the-abracon-ab-x80x-i2c-rtc-v3
+++ a/drivers/rtc/rtc-abx80x.c
@@ -95,23 +95,23 @@ static int abx80x_enable_trickle_charger
static int abx80x_rtc_read_time(struct device *dev, struct rtc_time *tm)
{
struct i2c_client *client = to_i2c_client(dev);
- unsigned char date[8];
+ unsigned char buf[8];
int err;
err = i2c_smbus_read_i2c_block_data(client, ABX8XX_REG_HTH,
- sizeof(date), date);
+ sizeof(buf), buf);
if (err < 0) {
dev_err(&client->dev, "Unable to read date\n");
return -EIO;
}
- tm->tm_sec = bcd2bin(date[ABX8XX_REG_SC] & 0x7F);
- tm->tm_min = bcd2bin(date[ABX8XX_REG_MN] & 0x7F);
- tm->tm_hour = bcd2bin(date[ABX8XX_REG_HR] & 0x3F);
- tm->tm_wday = date[ABX8XX_REG_WD] & 0x7;
- tm->tm_mday = bcd2bin(date[ABX8XX_REG_DA] & 0x3F);
- tm->tm_mon = bcd2bin(date[ABX8XX_REG_MO] & 0x1F) - 1;
- tm->tm_year = bcd2bin(date[ABX8XX_REG_YR]) + 100;
+ tm->tm_sec = bcd2bin(buf[ABX8XX_REG_SC] & 0x7F);
+ tm->tm_min = bcd2bin(buf[ABX8XX_REG_MN] & 0x7F);
+ tm->tm_hour = bcd2bin(buf[ABX8XX_REG_HR] & 0x3F);
+ tm->tm_wday = buf[ABX8XX_REG_WD] & 0x7;
+ tm->tm_mday = bcd2bin(buf[ABX8XX_REG_DA] & 0x3F);
+ tm->tm_mon = bcd2bin(buf[ABX8XX_REG_MO] & 0x1F) - 1;
+ tm->tm_year = bcd2bin(buf[ABX8XX_REG_YR]) + 100;
err = rtc_valid_tm(tm);
if (err < 0)
_
Patches currently in -mm which might be from alexandre.belloni@xxxxxxxxxxxxxxxxxx are
documentation-bindings-add-abraconabx80x.patch
rtc-add-rtc-abx80x-a-driver-for-the-abracon-ab-x80x-i2c-rtc.patch
rtc-armada38x-fix-concurrency-access-in-armada38x_rtc_set_time.patch
drivers-rtc-rtc-ds1307c-enable-the-mcp794xx-alarm-after-programming-time.patch
linux-next.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
