The patch titled
rtc-add-device-driver-for-dallas-ds3234-spi-rtc-chip-fix
has been removed from the -mm tree. Its filename was
rtc-add-device-driver-for-dallas-ds3234-spi-rtc-chip-fix.patch
This patch was dropped because it was folded into rtc-add-device-driver-for-dallas-ds3234-spi-rtc-chip.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: rtc-add-device-driver-for-dallas-ds3234-spi-rtc-chip-fix
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
These are going away.
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Cc: David Brownell <david-b@xxxxxxxxxxx>
Cc: Dennis Aberilla <denzzzhome@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rtc/rtc-ds3234.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff -puN drivers/rtc/rtc-ds3234.c~rtc-add-device-driver-for-dallas-ds3234-spi-rtc-chip-fix drivers/rtc/rtc-ds3234.c
--- a/drivers/rtc/rtc-ds3234.c~rtc-add-device-driver-for-dallas-ds3234-spi-rtc-chip-fix
+++ a/drivers/rtc/rtc-ds3234.c
@@ -119,13 +119,13 @@ static int ds3234_get_datetime(struct de
return status;
/* Seconds, Minutes, Hours, Day, Date, Month, Year */
- dt->tm_sec = BCD2BIN(chip->buf[1]);
- dt->tm_min = BCD2BIN(chip->buf[2]);
- dt->tm_hour = BCD2BIN(chip->buf[3] & 0x3f);
- dt->tm_wday = BCD2BIN(chip->buf[4]) - 1; /* 0 = Sun */
- dt->tm_mday = BCD2BIN(chip->buf[5]);
- dt->tm_mon = BCD2BIN(chip->buf[6] & 0x1f) - 1; /* 0 = Jan */
- dt->tm_year = BCD2BIN(chip->buf[7] & 0xff) + 100; /* Assume 20YY */
+ dt->tm_sec = bcd2bin(chip->buf[1]);
+ dt->tm_min = bcd2bin(chip->buf[2]);
+ dt->tm_hour = bcd2bin(chip->buf[3] & 0x3f);
+ dt->tm_wday = bcd2bin(chip->buf[4]) - 1; /* 0 = Sun */
+ dt->tm_mday = bcd2bin(chip->buf[5]);
+ dt->tm_mon = bcd2bin(chip->buf[6] & 0x1f) - 1; /* 0 = Jan */
+ dt->tm_year = bcd2bin(chip->buf[7] & 0xff) + 100; /* Assume 20YY */
#ifdef DS3234_DEBUG
dev_dbg(dev, "\n%s : Read RTC values\n", __func__);
@@ -154,22 +154,22 @@ static int ds3234_set_datetime(struct de
dev_dbg(dev, "tm_year: %i\n", dt->tm_year);
#endif
- ds3234_set_reg(dev, DS3234_REG_SECONDS, BIN2BCD(dt->tm_sec));
- ds3234_set_reg(dev, DS3234_REG_MINUTES, BIN2BCD(dt->tm_min));
- ds3234_set_reg(dev, DS3234_REG_HOURS, BIN2BCD(dt->tm_hour) & 0x3f);
+ ds3234_set_reg(dev, DS3234_REG_SECONDS, bin2bcd(dt->tm_sec));
+ ds3234_set_reg(dev, DS3234_REG_MINUTES, bin2bcd(dt->tm_min));
+ ds3234_set_reg(dev, DS3234_REG_HOURS, bin2bcd(dt->tm_hour) & 0x3f);
/* 0 = Sun */
- ds3234_set_reg(dev, DS3234_REG_DAY, BIN2BCD(dt->tm_wday + 1));
- ds3234_set_reg(dev, DS3234_REG_DATE, BIN2BCD(dt->tm_mday));
+ ds3234_set_reg(dev, DS3234_REG_DAY, bin2bcd(dt->tm_wday + 1));
+ ds3234_set_reg(dev, DS3234_REG_DATE, bin2bcd(dt->tm_mday));
/* 0 = Jan */
- ds3234_set_reg(dev, DS3234_REG_MONTH, BIN2BCD(dt->tm_mon + 1));
+ ds3234_set_reg(dev, DS3234_REG_MONTH, bin2bcd(dt->tm_mon + 1));
/* Assume 20YY although we just want to make sure not to go negative. */
if (dt->tm_year > 100)
dt->tm_year -= 100;
- ds3234_set_reg(dev, DS3234_REG_YEAR, BIN2BCD(dt->tm_year));
+ ds3234_set_reg(dev, DS3234_REG_YEAR, bin2bcd(dt->tm_year));
return 0;
}
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
mm-page_allocc-free_area_init_nodes-fix-inappropriate-use-of-enum.patch
h8300-generic_bug-support-checkpatch-fixes.patch
pm-rework-disabling-of-user-mode-helpers-during-suspend-hibernation.patch
make-taint-bit-reliable-v3.patch
kernel-sysc-improve-code-generation.patch
compat-generic-compat-get-settimeofday.patch
allow-recursion-in-binfmt_script-and-binfmt_misc.patch
autofs4-track-uid-and-gid-of-last-mount-requester.patch
autofs4-add-miscellaneous-device-for-ioctls.patch
rtc-add-device-driver-for-dallas-ds3234-spi-rtc-chip.patch
rtc-add-device-driver-for-dallas-ds3234-spi-rtc-chip-fix.patch
viafb-viafbmodes-viafbtxt-fix-fix.patch
viafb-accelc-accelh-checkpatch-fixes.patch
viafb-dvic-dvih-globalc-and-globalh-checkpatch-fixes.patch
viafb-hwc-hwh-checkpatch-fixes.patch
viafb-viafbdevc-viafbdevh-checkpatch-fixes.patch
fbdev-kconfig-update-fix.patch
fbdev-allow-more-chip-revisions-in-epson-s1d13-video-driver-cleanups.patch
ext2-avoid-printk-floods-in-the-face-of-directory-corruption-checkpatch-fixes.patch
applicomc-fix-apparently-broken-code-in-do_ac_read.patch
drivers-char-tpm-tpmc-fix-error-patch-memory-leak.patch
w1-be-able-to-manually-add-and-remove-slaves-fix.patch
w1-new-driver-ds2431-chip-fix.patch
gru-driver-minor-updates-fix.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
