aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlessandro Zummo <a.zummo@towertech.it>2006-04-11 01:54:41 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-11 09:18:46 -0400
commit3903586ab0eeaf363bd33633f0ae4846f03e2db5 (patch)
tree9d7a2683b0a4cf6b98265aea72ff405738103219 /drivers
parent8a95b252d194ea57c3d2c16ec2a25b1b70e36cad (diff)
[PATCH] RTC subsystem: DS1672 cleanup
- removed a duplicate error message - bumped driver version - removed some debugging messages in excess - refined the formatting - adjusted copyright notice Signed-off-by: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/rtc/rtc-ds1672.c29
1 files changed, 10 insertions, 19 deletions
diff --git a/drivers/rtc/rtc-ds1672.c b/drivers/rtc/rtc-ds1672.c
index 6d2dc7060652..56a331367386 100644
--- a/drivers/rtc/rtc-ds1672.c
+++ b/drivers/rtc/rtc-ds1672.c
@@ -1,6 +1,8 @@
1/* 1/*
2 * An rtc/i2c driver for the Dallas DS1672 2 * An rtc/i2c driver for the Dallas DS1672
3 * Copyright 2005 Alessandro Zummo 3 * Copyright 2005-06 Tower Technologies
4 *
5 * Author: Alessandro Zummo <a.zummo@towertech.it>
4 * 6 *
5 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 2 as 8 * it under the terms of the GNU General Public License version 2 as
@@ -11,7 +13,7 @@
11#include <linux/i2c.h> 13#include <linux/i2c.h>
12#include <linux/rtc.h> 14#include <linux/rtc.h>
13 15
14#define DRV_VERSION "0.2" 16#define DRV_VERSION "0.3"
15 17
16/* Addresses to scan: none. This chip cannot be detected. */ 18/* Addresses to scan: none. This chip cannot be detected. */
17static unsigned short normal_i2c[] = { I2C_CLIENT_END }; 19static unsigned short normal_i2c[] = { I2C_CLIENT_END };
@@ -23,9 +25,9 @@ I2C_CLIENT_INSMOD;
23 25
24#define DS1672_REG_CNT_BASE 0 26#define DS1672_REG_CNT_BASE 0
25#define DS1672_REG_CONTROL 4 27#define DS1672_REG_CONTROL 4
26#define DS1672_REG_CONTROL_EOSC 0x80
27#define DS1672_REG_TRICKLE 5 28#define DS1672_REG_TRICKLE 5
28 29
30#define DS1672_REG_CONTROL_EOSC 0x80
29 31
30/* Prototypes */ 32/* Prototypes */
31static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind); 33static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind);
@@ -54,8 +56,7 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm)
54 56
55 dev_dbg(&client->dev, 57 dev_dbg(&client->dev,
56 "%s: raw read data - counters=%02x,%02x,%02x,%02x\n" 58 "%s: raw read data - counters=%02x,%02x,%02x,%02x\n"
57 __FUNCTION__, 59 __FUNCTION__, buf[0], buf[1], buf[2], buf[3]);
58 buf[0], buf[1], buf[2], buf[3]);
59 60
60 time = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]; 61 time = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
61 62
@@ -63,8 +64,7 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm)
63 64
64 dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, " 65 dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
65 "mday=%d, mon=%d, year=%d, wday=%d\n", 66 "mday=%d, mon=%d, year=%d, wday=%d\n",
66 __FUNCTION__, 67 __FUNCTION__, tm->tm_sec, tm->tm_min, tm->tm_hour,
67 tm->tm_sec, tm->tm_min, tm->tm_hour,
68 tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday); 68 tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
69 69
70 return 0; 70 return 0;
@@ -144,7 +144,6 @@ static int ds1672_get_control(struct i2c_client *client, u8 *status)
144static ssize_t show_control(struct device *dev, struct device_attribute *attr, char *buf) 144static ssize_t show_control(struct device *dev, struct device_attribute *attr, char *buf)
145{ 145{
146 struct i2c_client *client = to_i2c_client(dev); 146 struct i2c_client *client = to_i2c_client(dev);
147 char *state = "enabled";
148 u8 control; 147 u8 control;
149 int err; 148 int err;
150 149
@@ -152,12 +151,9 @@ static ssize_t show_control(struct device *dev, struct device_attribute *attr, c
152 if (err) 151 if (err)
153 return err; 152 return err;
154 153
155 if (control & DS1672_REG_CONTROL_EOSC) 154 return sprintf(buf, "%s\n", (control & DS1672_REG_CONTROL_EOSC)
156 state = "disabled"; 155 ? "disabled" : "enabled");
157
158 return sprintf(buf, "%s\n", state);
159} 156}
160
161static DEVICE_ATTR(control, S_IRUGO, show_control, NULL); 157static DEVICE_ATTR(control, S_IRUGO, show_control, NULL);
162 158
163static struct rtc_class_ops ds1672_rtc_ops = { 159static struct rtc_class_ops ds1672_rtc_ops = {
@@ -168,7 +164,6 @@ static struct rtc_class_ops ds1672_rtc_ops = {
168 164
169static int ds1672_attach(struct i2c_adapter *adapter) 165static int ds1672_attach(struct i2c_adapter *adapter)
170{ 166{
171 dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
172 return i2c_probe(adapter, &addr_data, ds1672_probe); 167 return i2c_probe(adapter, &addr_data, ds1672_probe);
173} 168}
174 169
@@ -177,8 +172,6 @@ static int ds1672_detach(struct i2c_client *client)
177 int err; 172 int err;
178 struct rtc_device *rtc = i2c_get_clientdata(client); 173 struct rtc_device *rtc = i2c_get_clientdata(client);
179 174
180 dev_dbg(&client->dev, "%s\n", __FUNCTION__);
181
182 if (rtc) 175 if (rtc)
183 rtc_device_unregister(rtc); 176 rtc_device_unregister(rtc);
184 177
@@ -245,10 +238,8 @@ static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind)
245 238
246 /* read control register */ 239 /* read control register */
247 err = ds1672_get_control(client, &control); 240 err = ds1672_get_control(client, &control);
248 if (err) { 241 if (err)
249 dev_err(&client->dev, "%s: read error\n", __FUNCTION__);
250 goto exit_detach; 242 goto exit_detach;
251 }
252 243
253 if (control & DS1672_REG_CONTROL_EOSC) 244 if (control & DS1672_REG_CONTROL_EOSC)
254 dev_warn(&client->dev, "Oscillator not enabled. " 245 dev_warn(&client->dev, "Oscillator not enabled. "