From: Justin Thiessen <jthiessen@penguincomputing.com>
To: LM Sensors <sensors@Stimpy.netroedge.com>,
LKML <linux-kernel@vger.kernel.org>, Greg KH <greg@kroah.com>,
khali@linux-fr.org
Subject: PATCH (take 3) for adm1026.c, kernel 2.6.10-bk14
Date: Wed, 12 Jan 2005 10:50:55 -0800 [thread overview]
Message-ID: <20050112185055.GB16724@penguincomputing.com> (raw)
In-Reply-To: <20050103221249.GB12765@penguincomputing.com>
Ok, take 3 on the adm1026 patch.
In this patch:
(1) Code has been added which ensures that the fan divisor registers are
properly read into the data structure before fan minimum speeds are
determined. This prevents a possible divide by zero error. The line
which reads the hardware default fan divisor values has been reformatted
as suggested by Andreas Dilger to make the intent of the statement clearer.
(2) In a similar spirit, an unecessary carriage return from a "dev_dbg"
statement in the adm1026_print_gpio() function has been elminated,
shortening the statement to a single line and making the code easier
to read.
Signed-off-by: Justin Thiessen <jthiessen@penguincomputing.com
---------------------------------------
--- linux-2.6.10/drivers/i2c/chips/adm1026.c.orig 2005-01-12 10:28:15.000000000 -0800
+++ linux-2.6.10/drivers/i2c/chips/adm1026.c 2005-01-12 10:30:02.000000000 -0800
@@ -452,6 +452,14 @@ void adm1026_init_client(struct i2c_clie
client->id, value);
data->config1 = value;
adm1026_write_value(client, ADM1026_REG_CONFIG1, value);
+
+ /* initialize fan_div[] to hardware defaults */
+ value = adm1026_read_value(client, ADM1026_REG_FAN_DIV_0_3) |
+ (adm1026_read_value(client, ADM1026_REG_FAN_DIV_4_7) << 8);
+ for (i = 0;i <= 7;++i) {
+ data->fan_div[i] = DIV_FROM_REG(value & 0x03);
+ value >>= 2;
+ }
}
void adm1026_print_gpio(struct i2c_client *client)
@@ -459,8 +467,7 @@ void adm1026_print_gpio(struct i2c_clien
struct adm1026_data *data = i2c_get_clientdata(client);
int i;
- dev_dbg(&client->dev, "(%d): GPIO config is:",
- client->id);
+ dev_dbg(&client->dev, "(%d): GPIO config is:", client->id);
for (i = 0;i <= 7;++i) {
if (data->config2 & (1 << i)) {
dev_dbg(&client->dev, "\t(%d): %sGP%s%d\n", client->id,
next prev parent reply other threads:[~2005-01-12 17:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <41D5D075.4000200@paradyne.com>
[not found] ` <20050101001205.6b2a44d3.khali@linux-fr.org>
2005-01-03 19:43 ` Ticket #1851 - PATCH for adm1026.c, kernel 2.6.10-bk6 Justin Thiessen
2005-01-03 19:10 ` Jean Delvare
2005-01-03 21:37 ` Ticket #1851 - PATCH (take 2) " Justin Thiessen
2005-01-03 20:52 ` Andreas Dilger
2005-01-03 21:10 ` Jean Delvare
2005-01-03 22:12 ` Justin Thiessen
2005-01-12 18:50 ` Justin Thiessen [this message]
2005-01-12 18:55 ` PATCH (take 3) for adm1026.c, kernel 2.6.10-bk14 Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050112185055.GB16724@penguincomputing.com \
--to=jthiessen@penguincomputing.com \
--cc=greg@kroah.com \
--cc=khali@linux-fr.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sensors@Stimpy.netroedge.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox