* [PATCH] therm_* drivers need i2c-keywest
@ 2004-01-16 11:27 Colin Leroy
2004-01-16 11:41 ` Colin Leroy
2004-01-16 16:44 ` valvoline
0 siblings, 2 replies; 6+ messages in thread
From: Colin Leroy @ 2004-01-16 11:27 UTC (permalink / raw)
To: linuxppc-dev; +Cc: benh
[-- Attachment #1: Type: text/plain, Size: 125 bytes --]
Hi,
This patch lets the different pmac thermostat drivers try to load i2c-keywest if necessary and possible.
HTH,
--
Colin
[-- Attachment #2: therm_load_i2c.diff --]
[-- Type: text/plain, Size: 2553 bytes --]
Index: drivers/macintosh/therm_adt7467.c
===================================================================
RCS file: /home/cvsroot/linuxppc/drivers/macintosh/therm_adt7467.c,v
retrieving revision 1.1
diff -u -u -r1.1 therm_adt7467.c
--- drivers/macintosh/therm_adt7467.c 11 Jan 2004 20:21:54 -0000 1.1
+++ drivers/macintosh/therm_adt7467.c 16 Jan 2004 11:23:58 -0000
@@ -27,6 +27,7 @@
#include <asm/system.h>
#include <asm/sections.h>
#include <asm/of_device.h>
+#include <linux/kmod.h>
#undef DEBUG
@@ -392,6 +393,7 @@
{
struct device_node* np;
u32 *prop;
+ int res = 0;
/* Currently, we only deal with the iBook G4, we will support
* all "2003" powerbooks later on
@@ -424,6 +426,10 @@
device_create_file(&of_dev->dev, &dev_attr_gpu_limit);
device_create_file(&of_dev->dev, &dev_attr_fan_speed);
+#ifdef CONFIG_KMOD
+ if ((res = request_module("i2c-keywest")) != 0)
+ return res;
+#endif
return i2c_add_driver(&thermostat_driver);
}
Index: drivers/macintosh/therm_pm72.c
===================================================================
RCS file: /home/cvsroot/linuxppc/drivers/macintosh/therm_pm72.c,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 therm_pm72.c
--- drivers/macintosh/therm_pm72.c 8 Jan 2004 11:25:19 -0000 1.1.1.1
+++ drivers/macintosh/therm_pm72.c 16 Jan 2004 11:23:32 -0000
@@ -91,6 +91,7 @@
#include <asm/system.h>
#include <asm/sections.h>
#include <asm/of_device.h>
+#include <linux/kmod.h>
#include "therm_pm72.h"
@@ -1165,6 +1166,11 @@
state = state_detached;
+#ifdef CONFIG_KMOD
+ rc = request_module("i2c-keywest");
+ if (rc != 0)
+ return ret;
+#endif
rc = i2c_add_driver(&therm_pm72_driver);
if (rc < 0)
return rc;
Index: drivers/macintosh/therm_windtunnel.c
===================================================================
RCS file: /home/cvsroot/linuxppc/drivers/macintosh/therm_windtunnel.c,v
retrieving revision 1.1
diff -u -u -r1.1 therm_windtunnel.c
--- drivers/macintosh/therm_windtunnel.c 11 Jan 2004 20:21:55 -0000 1.1
+++ drivers/macintosh/therm_windtunnel.c 16 Jan 2004 11:24:18 -0000
@@ -44,6 +44,7 @@
#include <asm/io.h>
#include <asm/system.h>
#include <asm/sections.h>
+#include <linux/kmod.h>
MODULE_AUTHOR("Samuel Rydh <samuel@ibrium.se>");
MODULE_DESCRIPTION("Apple G4 (windtunnel) fan driver");
@@ -380,6 +381,10 @@
printk(KERN_ERR "g4fan: unsupported machine type\n");
return -ENODEV;
}
+#ifdef CONFIG_KMOD
+ if( (ret=request_module("i2c-keywest")) )
+ return ret;
+#endif
if( (ret=i2c_add_driver(&g4fan_driver)) )
return ret;
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] therm_* drivers need i2c-keywest
2004-01-16 11:27 [PATCH] therm_* drivers need i2c-keywest Colin Leroy
@ 2004-01-16 11:41 ` Colin Leroy
2004-01-16 12:03 ` Geert Uytterhoeven
2004-01-16 16:44 ` valvoline
1 sibling, 1 reply; 6+ messages in thread
From: Colin Leroy @ 2004-01-16 11:41 UTC (permalink / raw)
To: linuxppc-dev; +Cc: benh
[-- Attachment #1: Type: text/plain, Size: 333 bytes --]
On 16 Jan 2004 at 12h01, Colin Leroy wrote:
> Hi,
>
> This patch lets the different pmac thermostat drivers try to load
> i2c-keywest if necessary and possible.
As I didn't saw that request_module() errors if the module is already loaded (heh.), a better version of this is to avoid checking return value...
See attached.
--
Colin
[-- Attachment #2: therm_load_i2c.diff --]
[-- Type: text/plain, Size: 2457 bytes --]
Index: drivers/macintosh/therm_adt7467.c
===================================================================
RCS file: /home/cvsroot/linuxppc/drivers/macintosh/therm_adt7467.c,v
retrieving revision 1.1
diff -u -u -r1.1 therm_adt7467.c
--- drivers/macintosh/therm_adt7467.c 11 Jan 2004 20:21:54 -0000 1.1
+++ drivers/macintosh/therm_adt7467.c 16 Jan 2004 11:40:08 -0000
@@ -27,6 +27,7 @@
#include <asm/system.h>
#include <asm/sections.h>
#include <asm/of_device.h>
+#include <linux/kmod.h>
#undef DEBUG
@@ -392,6 +393,7 @@
{
struct device_node* np;
u32 *prop;
+ int res = 0;
/* Currently, we only deal with the iBook G4, we will support
* all "2003" powerbooks later on
@@ -424,6 +426,9 @@
device_create_file(&of_dev->dev, &dev_attr_gpu_limit);
device_create_file(&of_dev->dev, &dev_attr_fan_speed);
+#ifdef CONFIG_KMOD
+ request_module("i2c-keywest");
+#endif
return i2c_add_driver(&thermostat_driver);
}
Index: drivers/macintosh/therm_pm72.c
===================================================================
RCS file: /home/cvsroot/linuxppc/drivers/macintosh/therm_pm72.c,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 therm_pm72.c
--- drivers/macintosh/therm_pm72.c 8 Jan 2004 11:25:19 -0000 1.1.1.1
+++ drivers/macintosh/therm_pm72.c 16 Jan 2004 11:39:56 -0000
@@ -91,6 +91,7 @@
#include <asm/system.h>
#include <asm/sections.h>
#include <asm/of_device.h>
+#include <linux/kmod.h>
#include "therm_pm72.h"
@@ -1165,6 +1166,9 @@
state = state_detached;
+#ifdef CONFIG_KMOD
+ request_module("i2c-keywest");
+#endif
rc = i2c_add_driver(&therm_pm72_driver);
if (rc < 0)
return rc;
Index: drivers/macintosh/therm_windtunnel.c
===================================================================
RCS file: /home/cvsroot/linuxppc/drivers/macintosh/therm_windtunnel.c,v
retrieving revision 1.1
diff -u -u -r1.1 therm_windtunnel.c
--- drivers/macintosh/therm_windtunnel.c 11 Jan 2004 20:21:55 -0000 1.1
+++ drivers/macintosh/therm_windtunnel.c 16 Jan 2004 11:39:35 -0000
@@ -44,6 +44,7 @@
#include <asm/io.h>
#include <asm/system.h>
#include <asm/sections.h>
+#include <linux/kmod.h>
MODULE_AUTHOR("Samuel Rydh <samuel@ibrium.se>");
MODULE_DESCRIPTION("Apple G4 (windtunnel) fan driver");
@@ -380,6 +381,9 @@
printk(KERN_ERR "g4fan: unsupported machine type\n");
return -ENODEV;
}
+#ifdef CONFIG_KMOD
+ request_module("i2c-keywest");
+#endif
if( (ret=i2c_add_driver(&g4fan_driver)) )
return ret;
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] therm_* drivers need i2c-keywest
2004-01-16 11:41 ` Colin Leroy
@ 2004-01-16 12:03 ` Geert Uytterhoeven
2004-01-16 12:44 ` Colin Leroy
0 siblings, 1 reply; 6+ messages in thread
From: Geert Uytterhoeven @ 2004-01-16 12:03 UTC (permalink / raw)
To: Colin Leroy; +Cc: Linux/PPC Development, Benjamin Herrenschmidt
On Fri, 16 Jan 2004, Colin Leroy wrote:
> On 16 Jan 2004 at 12h01, Colin Leroy wrote:
> > This patch lets the different pmac thermostat drivers try to load
> > i2c-keywest if necessary and possible.
>
> As I didn't saw that request_module() errors if the module is already loaded (heh.), a better version of this is to avoid checking return value...
> See attached.
And you want to drop the #ifdef CONFIG_KMOD, since that's already in
<linux/kmod.h>.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] therm_* drivers need i2c-keywest
2004-01-16 12:03 ` Geert Uytterhoeven
@ 2004-01-16 12:44 ` Colin Leroy
0 siblings, 0 replies; 6+ messages in thread
From: Colin Leroy @ 2004-01-16 12:44 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Linux/PPC Development, Benjamin Herrenschmidt
[-- Attachment #1: Type: text/plain, Size: 158 bytes --]
hi,
> And you want to drop the #ifdef CONFIG_KMOD, since that's already in
> <linux/kmod.h>.
Sure, here it is.
--
Colin
Ne disez pas disez, mais disez dites
[-- Attachment #2: therm_load_i2c.diff --]
[-- Type: application/octet-stream, Size: 2275 bytes --]
Index: drivers/macintosh/therm_adt7467.c
===================================================================
RCS file: /home/cvsroot/linuxppc/drivers/macintosh/therm_adt7467.c,v
retrieving revision 1.1
diff -u -u -r1.1 therm_adt7467.c
--- drivers/macintosh/therm_adt7467.c 11 Jan 2004 20:21:54 -0000 1.1
+++ drivers/macintosh/therm_adt7467.c 16 Jan 2004 12:47:07 -0000
@@ -27,6 +27,7 @@
#include <asm/system.h>
#include <asm/sections.h>
#include <asm/of_device.h>
+#include <linux/kmod.h>
#undef DEBUG
@@ -424,6 +425,7 @@
device_create_file(&of_dev->dev, &dev_attr_gpu_limit);
device_create_file(&of_dev->dev, &dev_attr_fan_speed);
+ request_module("i2c-keywest");
return i2c_add_driver(&thermostat_driver);
}
Index: drivers/macintosh/therm_pm72.c
===================================================================
RCS file: /home/cvsroot/linuxppc/drivers/macintosh/therm_pm72.c,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 therm_pm72.c
--- drivers/macintosh/therm_pm72.c 8 Jan 2004 11:25:19 -0000 1.1.1.1
+++ drivers/macintosh/therm_pm72.c 16 Jan 2004 12:47:15 -0000
@@ -91,6 +91,7 @@
#include <asm/system.h>
#include <asm/sections.h>
#include <asm/of_device.h>
+#include <linux/kmod.h>
#include "therm_pm72.h"
@@ -1165,6 +1166,7 @@
state = state_detached;
+ request_module("i2c-keywest");
rc = i2c_add_driver(&therm_pm72_driver);
if (rc < 0)
return rc;
Index: drivers/macintosh/therm_windtunnel.c
===================================================================
RCS file: /home/cvsroot/linuxppc/drivers/macintosh/therm_windtunnel.c,v
retrieving revision 1.1
diff -u -u -r1.1 therm_windtunnel.c
--- drivers/macintosh/therm_windtunnel.c 11 Jan 2004 20:21:55 -0000 1.1
+++ drivers/macintosh/therm_windtunnel.c 16 Jan 2004 12:47:23 -0000
@@ -44,6 +44,7 @@
#include <asm/io.h>
#include <asm/system.h>
#include <asm/sections.h>
+#include <linux/kmod.h>
MODULE_AUTHOR("Samuel Rydh <samuel@ibrium.se>");
MODULE_DESCRIPTION("Apple G4 (windtunnel) fan driver");
@@ -380,6 +381,7 @@
printk(KERN_ERR "g4fan: unsupported machine type\n");
return -ENODEV;
}
+ request_module("i2c-keywest");
if( (ret=i2c_add_driver(&g4fan_driver)) )
return ret;
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] therm_* drivers need i2c-keywest
2004-01-16 11:27 [PATCH] therm_* drivers need i2c-keywest Colin Leroy
2004-01-16 11:41 ` Colin Leroy
@ 2004-01-16 16:44 ` valvoline
2004-01-17 9:41 ` Colin Leroy
1 sibling, 1 reply; 6+ messages in thread
From: valvoline @ 2004-01-16 16:44 UTC (permalink / raw)
To: linuxppc-dev
On Fri, Jan 16, 2004 at 12:27:56PM +0100, Colin Leroy wrote:
> This patch lets the different pmac thermostat drivers try to load i2c-keywest if necessary and possible.
the patch works fine against the soundcore/i2c_west modprobing problem,
which i've talk about some threads ago.
what's about /dev/ entries ?, i still see nothing into it...the only infos
that i can fetch are into /var/log/syslog.
If i don't make a mismatch, there should be some /dev entries that the
module should create, usefull to set/fetch important informations about
fans/cpu.
regards
--
[ valvoline :: VRL Team :: s0ftpj :: freaknet Medialab :: GPG key available ]
[ key fingerprint :: - :: B7E2 48BC 705F AE8F 9ABE E422 076A 2561 1D67 B4DD ]
[ GPG key available on keyserver :: pgp.mit.edu :: with keyID :: 1D67B4DD :: ]
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] therm_* drivers need i2c-keywest
2004-01-16 16:44 ` valvoline
@ 2004-01-17 9:41 ` Colin Leroy
0 siblings, 0 replies; 6+ messages in thread
From: Colin Leroy @ 2004-01-17 9:41 UTC (permalink / raw)
To: valvoline, linuxppc-dev
On 16 Jan 2004 at 17h01, valvoline wrote:
Hi,
> what's about /dev/ entries ?, i still see nothing into it...the only infos
> that i can fetch are into /var/log/syslog.
>
> If i don't make a mismatch, there should be some /dev entries that the
> module should create, usefull to set/fetch important informations about
> fans/cpu.
They're in /sys - that's the new 2.6 location for such things.
Look in /sys/devices/temperatures/
--
Colin
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2004-01-17 9:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-01-16 11:27 [PATCH] therm_* drivers need i2c-keywest Colin Leroy
2004-01-16 11:41 ` Colin Leroy
2004-01-16 12:03 ` Geert Uytterhoeven
2004-01-16 12:44 ` Colin Leroy
2004-01-16 16:44 ` valvoline
2004-01-17 9:41 ` Colin Leroy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).