The patch titled arm: use bcd2bin/bin2bcd has been added to the -mm tree. Its filename is arm-use-bcd2bin-bin2bcd.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** 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 The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: arm: use bcd2bin/bin2bcd From: Adrian Bunk <bunk@xxxxxxxxxx> Change arm to use the new bcd2bin/bin2bcd functions instead of the obsolete BCD_TO_BIN/BIN_TO_BCD macros. Signed-off-by: Adrian Bunk <bunk@xxxxxxxxxx> Cc: Russell King <rmk@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/arm/mach-footbridge/time.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff -puN arch/arm/mach-footbridge/time.c~arm-use-bcd2bin-bin2bcd arch/arm/mach-footbridge/time.c --- a/arch/arm/mach-footbridge/time.c~arm-use-bcd2bin-bin2bcd +++ a/arch/arm/mach-footbridge/time.c @@ -49,12 +49,12 @@ static unsigned long __init get_isa_cmos } while (sec != CMOS_READ(RTC_SECONDS)); if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { - BCD_TO_BIN(sec); - BCD_TO_BIN(min); - BCD_TO_BIN(hour); - BCD_TO_BIN(day); - BCD_TO_BIN(mon); - BCD_TO_BIN(year); + sec = bcd2bin(sec); + min = bcd2bin(min); + hour = bcd2bin(hour); + day = bcd2bin(day); + mon = bcd2bin(mon); + year = bcd2bin(year); } if ((year += 1900) < 1970) year += 100; @@ -76,7 +76,7 @@ static int set_isa_cmos_time(void) cmos_minutes = CMOS_READ(RTC_MINUTES); if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) - BCD_TO_BIN(cmos_minutes); + cmos_minutes = bcd2bin(cmos_minutes); /* * since we're only adjusting minutes and seconds, @@ -92,8 +92,8 @@ static int set_isa_cmos_time(void) if (abs(real_minutes - cmos_minutes) < 30) { if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { - BIN_TO_BCD(real_seconds); - BIN_TO_BCD(real_minutes); + real_seconds = bin2bcd(real_seconds); + real_minutes = bin2bcd(real_minutes); } CMOS_WRITE(real_seconds,RTC_SECONDS); CMOS_WRITE(real_minutes,RTC_MINUTES); _ Patches currently in -mm which might be from bunk@xxxxxxxxxx are feature-removal-scheduletxt-remove-the-ncr53c9x-entry.patch linux-next.patch m32r-remove-the-unused-nohighmem-option.patch m32r-dont-offer-config_isa.patch m32r-export-empty_zero_page.patch m32r-export-__ndelay.patch m32r-kernel-cleanups.patch the-overdue-eepro100-removal.patch ntfs-update-homepage.patch parisc-lib-make-code-static.patch drivers-parisc-make-code-static.patch if-0-ses_match_host.patch scsi-remove-the-unused-scsi_qlogic_fc_firmware-option.patch drivers-scsi-a2091c-make-2-functions-static.patch drivers-scsi-a3000c-make-2-functions-static.patch git-block.patch fs_mbcache-dont-needlessly-make-it-built-in.patch git-xtensa.patch drivers-net-atl1e-atl1e_mainc-uninline-atl1e_setup_mac_ctrl.patch asm-h8300-mdh-remove-cvs-keyword.patch alpha-miata-remove-dead-url.patch uml-remove-the-dead-tty_log-code.patch include-linux-kernelh-userspace-header-cleanup.patch maintainers-remove-zf-machz-watchdog-entry.patch maintainers-remove-hga-framebuffer-driver-entry.patch include-linux-mounth-remove-cvs-keyword.patch kernel-dmac-remove-a-cvs-keyword.patch binfmt_somc-add-module_license.patch the-scheduled-serial_coldfire-removal.patch make-probe_serial_gsc-static.patch pnp-remove-printk-with-outdated-version.patch telephony-remove-cvs-keywords.patch reiserfs-procfsc-remove-cvs-keywords.patch quota-remove-cvs-keywords.patch make-ptrace_untrace-static.patch fs-partitions-acornc-remove-dead-code.patch parport-remove-cvs-keywords.patch make-mm-rmapc-anon_vma_cachep-static.patch drivers-firmware-iscsi_ibftc-make-3-functions-static.patch acpi-use-bcd2bin-bin2bcd.patch alpha-use-bcd2bin-bin2bcd.patch arm-use-bcd2bin-bin2bcd.patch cris-use-bcd2bin-bin2bcd.patch drivers-rtc-use-bcd2bin-bin2bcd.patch rtc-use-bcd2bin-bin2bcd.patch ia64-use-bcd2bin-bin2bcd.patch ide-cd-use-bcd2bin-bin2bcd.patch m68k-use-bcd2bin-bin2bcd.patch mips-use-bcd2bin-bin2bcd.patch mn10300-use-bcd2bin-bin2bcd.patch powerpc-use-bcd2bin-bin2bcd.patch i2c-use-bcd2bin-bin2bcd.patch drivers-scsi-sr_vendorc-use-bcd2bin.patch sparc64-use-bcd2bin-bin2bcd.patch remove-the-obsolete-bcdbin-binbcd-macros.patch include-linux-bcdh-remove-comments.patch reiser4.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