The patch titled
add-max6902-rtc-support-tidy
has been removed from the -mm tree. Its filename is
add-max6902-rtc-support-tidy.patch
This patch was dropped because it was folded into add-max6902-rtc-support.patch
------------------------------------------------------
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
remove-for_each_cpu.patch
more-for_each_cpu-removal.patch
disable-debugging-version-of-write_lock.patch
rewritten-backlight-infrastructure-for-portable-apple-computers.patch
ufs-printk-warning-fixes.patch
msnd-section-fix.patch
openpromfs-factorize-out.patch
add-driver-for-arm-amba-pl031-rtc.patch
kernel-sysc-cleanups.patch
cpqarray-section-fix.patch
pdflush-handle-resume-wakeups.patch
schedule_on_each_cpu-reduce-kmalloc-size.patch
ax88796-parallel-port-driver.patch
for_each_cpu_mask-warning-fix.patch
add-max6902-rtc-support.patch
add-max6902-rtc-support-tidy.patch
add-v3020-rtc-support-tidy.patch
at91rm9200-rtc-driver-tidy.patch
rtc-add-rtc-ds1553-driver-tidy.patch
rtc-add-rtc-ds1553-driver-fix.patch
rtc-add-rtc-ds1742-driver-tidy.patch
rtc-add-rtc-ds1742-driver-fix.patch
readahead-backoff-on-i-o-error-tweaks.patch
cyclades-cleanup-cleanup.patch
fuse-add-control-filesystem-get_sb_single-fix.patch
fuse-add-control-filesystem-printk-fix.patch
kthread-update-loopc-to-use-kthread-fix.patch
kthread-convert-smbiod-tidy.patch
kthread-convert-stop_machine-into-a-kthread.patch
fix-bounds-check-in-vsnprintf-to-allow-for-a-0-size-and-tidy.patch
irda-usb-printk-fix.patch
add-receive_room-flow-control-to-flush_to_ldisc-tidy.patch
reiserfs-on-demand-bitmap-loading-fix.patch
cpu-hotplug-make-cpu_notifier-related-notifier-calls-__cpuinit-only-fix-fix.patch
per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays-warning-fix.patch
add-via-hw-rng-driver-fix.patch
add-bcm43xx-hw-rng-support-locking-update.patch
hangcheck-remove-monotomic_clock-on-x86.patch
sched-fix-smt-nice-lock-contention-and-optimization-tidy.patch
swap_prefetch-vs-zoned-counters.patch
pi-futex-rt-mutex-tester-fix.patch
rtmutex-propagate-priority-settings-into-pi-lock-chains-fix.patch
mark-address_space_operations-const-vs-ecryptfs-mmap-operations.patch
ecryptfs-alpha-build-fix.patch
ecryptfs-more-elegant-aes-key-size-manipulation-tidy.patch
ecryptfs-get_sb_dev-fix.patch
namespaces-add-nsproxy-dont-include-compileh.patch
namespaces-utsname-switch-to-using-uts-namespaces-alpha-fix.patch
namespaces-utsname-use-init_utsname-when-appropriate-cifs-update.patch
namespaces-utsname-implement-utsname-namespaces-export.patch
namespaces-utsname-implement-utsname-namespaces-dont-include-compileh.patch
namespaces-utsname-sysctl-hack-cleanup-2-fix.patch
ipc-namespace-core-fix.patch
task-watchers-task-watchers-tidy.patch
task-watchers-add-support-for-per-task-watchers-warning-fix.patch
readahead-sysctl-parameters-fix.patch
make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch
reiser4-hardirq-include-fix.patch
reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.patch
reiser4-get_sb_dev-fix.patch
reiser4-vs-zoned-allocator.patch
hpt3xx-rework-rate-filtering-tidy.patch
savagefb-add-state-save-and_restore-hooks-tidy.patch
au1100fb-add-power-management-support-tidy.patch
imacfb-add-intel-based-macintosh-framebuffer-support-tidy.patch
vt-binding-add-sysfs-control-to-the-vt-layer-fix.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-rename-desc-handler-to-desc-chip-terminate_irqs-fix.patch
genirq-ia64-build-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
