The patch titled
add-max6902-rtc-support-tidy
has been added to the -mm tree. Its filename is
add-max6902-rtc-support-tidy.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: add-max6902-rtc-support-tidy
From: Andrew Morton <akpm@xxxxxxxx>
Cc: Raphael Assenat <raph@xxxxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/rtc/rtc-max6902.c | 37 +++++++++++++++---------------------
1 file changed, 16 insertions(+), 21 deletions(-)
diff -puN drivers/rtc/rtc-max6902.c~add-max6902-rtc-support-tidy drivers/rtc/rtc-max6902.c
--- devel/drivers/rtc/rtc-max6902.c~add-max6902-rtc-support-tidy 2006-05-30 14:58:30.000000000 -0700
+++ devel-akpm/drivers/rtc/rtc-max6902.c 2006-05-30 14:58:30.000000000 -0700
@@ -29,8 +29,7 @@
#include <linux/rtc.h>
#include <linux/spi/spi.h>
#include <linux/bcd.h>
-
-#include <asm/delay.h>
+#include <linux/delay.h>
#define MAX6902_REG_SECONDS 0x01
#define MAX6902_REG_MINUTES 0x03
@@ -42,7 +41,6 @@
#define MAX6902_REG_CONTROL 0x0F
#define MAX6902_REG_CENTURY 0x13
-
#undef MAX6902_DEBUG
struct max6902 {
@@ -53,9 +51,9 @@ struct max6902 {
};
static void max6902_set_reg(struct device *dev, unsigned char address,
- unsigned char data)
+ unsigned char data)
{
- struct spi_device *spi = to_spi_device(dev);
+ struct spi_device *spi = to_spi_device(dev);
unsigned char buf[2];
/* MSB must be '0' to write */
@@ -65,15 +63,17 @@ static void max6902_set_reg(struct devic
spi_write(spi, buf, 2);
}
-static int max6902_get_reg(struct device *dev, unsigned char address, unsigned char *data)
+static int max6902_get_reg(struct device *dev, unsigned char address,
+ unsigned char *data)
{
- struct spi_device *spi = to_spi_device(dev);
+ struct spi_device *spi = to_spi_device(dev);
struct max6902 *chip = dev_get_drvdata(dev);
struct spi_message message;
struct spi_transfer xfer;
int status;
- if (!data) return -EINVAL;
+ if (!data)
+ return -EINVAL;
/* Build our spi message */
spi_message_init(&message);
@@ -90,9 +90,8 @@ static int max6902_get_reg(struct device
/* do the i/o */
status = spi_sync(spi, &message);
- if (status == 0) {
+ if (status == 0)
status = message.status;
- }
else
return status;
@@ -106,8 +105,7 @@ static int max6902_get_datetime(struct d
unsigned char tmp;
int century;
int err;
-
- struct spi_device *spi = to_spi_device(dev);
+ struct spi_device *spi = to_spi_device(dev);
struct max6902 *chip = dev_get_drvdata(dev);
struct spi_message message;
struct spi_transfer xfer;
@@ -120,17 +118,16 @@ static int max6902_get_datetime(struct d
/* build the message */
spi_message_init(&message);
memset(&xfer, 0, sizeof(xfer));
- xfer.len = 1 + 7; /* Burst read command + 7 registers */
+ xfer.len = 1 + 7; /* Burst read command + 7 registers */
xfer.tx_buf = chip->buf;
xfer.rx_buf = chip->buf;
- chip->buf[0] = 0xbf; // Burst read
+ chip->buf[0] = 0xbf; /* Burst read */
spi_message_add_tail(&xfer, &message);
/* do the i/o */
status = spi_sync(spi, &message);
- if (status == 0) {
+ if (status == 0)
status = message.status;
- }
else
return status;
@@ -144,7 +141,6 @@ static int max6902_get_datetime(struct d
dt->tm_wday = BCD2BIN(chip->buf[6]);
dt->tm_year = BCD2BIN(chip->buf[7]);
-
century = BCD2BIN(tmp) * 100;
dt->tm_year += century;
@@ -178,7 +174,7 @@ static int max6902_set_datetime(struct d
printk("tm_year: %i\n",dt->tm_year);
#endif
- // Remove write protection
+ /* Remove write protection */
max6902_set_reg(dev, 0xF, 0);
max6902_set_reg(dev, 0x01, BIN2BCD(dt->tm_sec));
@@ -195,7 +191,7 @@ static int max6902_set_datetime(struct d
* does not mention a delay being required anywhere... */
/* delay(2000); */
- // Write protect
+ /* Write protect */
max6902_set_reg(dev, 0xF, 0x80);
return 0;
@@ -225,9 +221,8 @@ static int __devinit max6902_probe(struc
rtc = rtc_device_register("max6902",
&spi->dev, &max6902_rtc_ops, THIS_MODULE);
- if (IS_ERR(rtc)) {
+ if (IS_ERR(rtc))
return PTR_ERR(rtc);
- }
spi->mode = SPI_MODE_3;
spi->bits_per_word = 8;
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
ext3-resize-fix-double-unlock_super.patch
tpm-more-bios-log-parsing-fixes-tidy.patch
revert-swsusp-add-check-for-suspension-of-x-controlled-devices.patch
net-compath-build-fix.patch
git-acpi.patch
acpi-update-asus_acpi-driver-registration-fix.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driver-register-start-func-for-memory-device.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driveravoid-redundant-call-add_memory.patch
acpi-dock-driver-interface-fixups.patch
acpi-atlas-acpi-driver-v2-tidy.patch
remove-for_each_cpu.patch
sony_apci-resume.patch
uninorth-agp-warning-fixes.patch
alpha-agp-warning-fix.patch
kauditd_thread-warning-fix.patch
powernow-k8-crash-workaround.patch
git-dvb.patch
scx200_acb-use-pci-i-o-resource-when-appropriate-fix.patch
git-gfs2.patch
ieee1394_core-switch-to-kthread-api-fix.patch
git-infiniband.patch
via-pmu-add-input-device-tidy.patch
git-intelfb.patch
git-klibc.patch
git-hdrcleanup-fixup.patch
git-hdrcleanup-vs-git-klibc-on-ia64.patch
git-hdrcleanup-vs-git-klibc-on-ia64-2.patch
git-hdrinstall-fixup.patch
git-libata-all.patch
libata-reduce-timeouts.patch
sdhci-truncated-pointer-fix.patch
git-mtd.patch
git-mtd-fixup.patch
git-mtd-cs553x_nand-build-fix.patch
git-mtd-ya-build-fix.patch
git-netdev-all.patch
git-netdev-all-fixup.patch
smc911x-Kconfig-fix.patch
pci-error-recovery-e1000-network-device-driver.patch
git-net.patch
git-net-git-klibc-fixup.patch
git-nfs-fixup.patch
git-powerpc.patch
powerpc-kbuild-warning-fix.patch
git-rbtree.patch
git-sas.patch
gregkh-pci-pci-64-bit-resources-drivers-others-changes-amba-fix.patch
kconfigurable-resources-core-changes-i386-fix.patch
kconfigurable-resources-core-changes-fix.patch
kconfigurable-resources-arch-dependent-changes-arch-a-i-fix.patch
typesh-sector_t-and-blkcnt_t-arent-for-userspace.patch
kconfigurable-resources-mtd-fixes.patch
bogus-disk-geometry-on-large-disks-warning-fix.patch
megaraid_sas-add-support-for-zcr-controller-fix.patch
areca-raid-linux-scsi-driver-update6-for-2617-rc1-mm3-externs-go-in-headers.patch
git-scsi-target-fixup.patch
git-scsi-target-warning-fix.patch
revert-gregkh-usb-usb-ohci-avoids-root-hub-timer-polling.patch
gregkh-usb-usb-serial-mos7720-powerpc-wrokaround.patch
driver-for-apple-cinema-display-tweaks.patch
git-supertrak-fixup.patch
x86_64-mm-reliable-stack-trace-support-non-x86-fix.patch
x86_64-mm-reliable-stack-trace-support-non-x86-fix-fix.patch
x86_64-mm-moving-phys_proc_id-and-cpu_core_id-to-cpuinfo_x86-warning-fix.patch
x86_64-dont-warn-for-overflow-in-nommu-case-when-dma_mask-is-32bit-fix.patch
xfs-sparc32-build-fix.patch
pg_uncached-is-ia64-only.patch
node-hotplug-fixes-callres-of-register_cpu-powerpc-warning-fix.patch
fix-update_mmu_cache-in-fremapc-fix.patch
page-migration-simplify-migrate_pages-tweaks.patch
page-migration-support-moving-of-individual-pages-x86-support-fix.patch
acx1xx-wireless-driver.patch
tiacx-pci-build-fix.patch
x86-kernel-irq-balancer-fix-tidy.patch
i386-moving-phys_proc_id-and-cpu_core_id-to-cpuinfo_x86-warning-fix.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-tidy.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-arch_vma_name-fix.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-vs-x86_64-mm-reliable-stack-trace-support-i386.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-vs-x86_64-mm-reliable-stack-trace-support-i386-2.patch
prune_one_dentry-tweaks.patch
mmput-might-sleep.patch
jbd-avoid-kfree-null.patch
ext3_clear_inode-avoid-kfree-null.patch
leds-amstrad-delta-led-support-tidy.patch
connector-exports.patch
config_net=n-build-fix.patch
rewritten-backlight-infrastructure-for-portable-apple-computers-fix.patch
allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-fix.patch
allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy.patch
deprecate-smbfs-in-favour-of-cifs.patch
msnd-section-fix.patch
openpromfs-factorize-out-tidy.patch
add-export_unused_symbol-and-export_unused_symbol_gpl-default.patch
kernel-sysc-cleanups-fix.patch
cpqarray-section-fix.patch
pdflush-handle-resume-wakeups.patch
schedule_on_each_cpu-reduce-kmalloc-size.patch
ax88796-parallel-port-driver-build-fix.patch
keys-fix-race-between-two-instantiators-of-a-key-tidy.patch
inotify-kernel-api-fix.patch
for_each_cpu_mask-warning-fix.patch
add-max6902-rtc-support-tidy.patch
per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays-warning-fix.patch
add-via-hw-rng-driver-fix.patch
hangcheck-remove-monotomic_clock-on-x86.patch
swap-prefetch-fix-lru_cache_add_tail-tidy.patch
mark-address_space_operations-const-vs-ecryptfs-mmap-operations.patch
ecryptfs-alpha-build-fix.patch
namespaces-add-nsproxy-dont-include-compileh.patch
namespaces-utsname-switch-to-using-uts-namespaces-alpha-fix.patch
namespaces-utsname-implement-utsname-namespaces-export.patch
namespaces-utsname-implement-utsname-namespaces-dont-include-compileh.patch
readahead-sysctl-parameters-fix.patch
make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch
reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.patch
ide_dma_speed-fixes-warning-fix.patch
ide_dma_speed-fixes-tidy.patch
hpt3xx-rework-rate-filtering-tidy.patch
savagefb-add-state-save-and_restore-hooks-tidy.patch
au1100fb-add-power-management-support-tidy.patch
lib-add-idr_replace-tidy.patch
genirq-rename-desc-handler-to-desc-chip-power-fix.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix-2.patch
genirq-convert-the-i386-architecture-to-irq-chips-fix-2.patch
lock-validator-beautify-x86_64-stacktraces-fix.patch
lock-validator-stacktrace-build-fix.patch
lock-validator-stacktrace-warning-fix.patch
lock-validator-irqtrace-core-powerpc-fix-1.patch
lock-validator-irqtrace-core-non-x86-fix.patch
lock-validator-irqtrace-core-non-x86-fix-2.patch
lock-validator-irqtrace-core-non-x86-fix-3.patch
lock-validator-add-per_cpu_offset-fix.patch
lock-validator-core-multichar-fix.patch
lock-validator-prove-rwsem-locking-correctness-fix.patch
lock-validator-prove-rwsem-locking-correctness-powerpc-fix.patch
lock-validator-special-locking-serial-fix.patch
lock-validator-special-locking-sb-s_umount-fix.patch
lock-validator-enable-lock-validator-in-kconfig-not-yet.patch
kgdb-core-lite-add-reboot-command.patch
kgdb-8250-fix.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
revert-tty-buffering-comment-out-debug-code.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
profile-likely-unlikely-macros-tidy.patch
profile-likely-unlikely-macros-fix.patch
profile-likely-unlikely-macros-fix-2.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
