git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: convert /proc/net/rt_acct to seq_file
[safe/jmp/linux-2.6]
/
drivers
/
hwmon
/
w83781d.c
diff --git
a/drivers/hwmon/w83781d.c
b/drivers/hwmon/w83781d.c
index
d4d1b85
..
d27ed1b
100644
(file)
--- a/
drivers/hwmon/w83781d.c
+++ b/
drivers/hwmon/w83781d.c
@@
-48,7
+48,7
@@
#ifdef CONFIG_ISA
#include <linux/platform_device.h>
#include <linux/ioport.h>
#ifdef CONFIG_ISA
#include <linux/platform_device.h>
#include <linux/ioport.h>
-#include <
asm
/io.h>
+#include <
linux
/io.h>
#endif
#include "lm75.h"
#endif
#include "lm75.h"
@@
-58,7
+58,10
@@
static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
0x2e, 0x2f, I2C_CLIENT_END };
/* Insmod parameters */
I2C_CLIENT_INSMOD_4(w83781d, w83782d, w83783s, as99127f);
0x2e, 0x2f, I2C_CLIENT_END };
/* Insmod parameters */
I2C_CLIENT_INSMOD_4(w83781d, w83782d, w83783s, as99127f);
-I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: "
+
+static unsigned short force_subclients[4];
+module_param_array(force_subclients, short, NULL, 0);
+MODULE_PARM_DESC(force_subclients, "List of subclient addresses: "
"{bus, clientaddr, subclientaddr1, subclientaddr2}");
static int reset;
"{bus, clientaddr, subclientaddr1, subclientaddr2}");
static int reset;
@@
-1459,7
+1462,8
@@
static struct w83781d_data *w83781d_update_device(struct device *dev)
data->pwm[i] =
w83781d_read_value(data,
W83781D_REG_PWM[i]);
data->pwm[i] =
w83781d_read_value(data,
W83781D_REG_PWM[i]);
- if ((data->type != w83782d || !client->driver)
+ /* Only W83782D on SMBus has PWM3 and PWM4 */
+ if ((data->type != w83782d || !client)
&& i == 1)
break;
}
&& i == 1)
break;
}
@@
-1968,7
+1972,7
@@
exit:
return res;
}
return res;
}
-static void
__exit
+static void
w83781d_isa_unregister(void)
{
if (pdev) {
w83781d_isa_unregister(void)
{
if (pdev) {
@@
-2017,7
+2021,7
@@
w83781d_isa_register(void)
return 0;
}
return 0;
}
-static void
__exit
+static void
w83781d_isa_unregister(void)
{
}
w83781d_isa_unregister(void)
{
}