mirror of
https://github.com/lm-sensors/lm-sensors.git
synced 2026-11-20 19:41:47 +00:00
(Kyösti) Cleanups
Copy sysctl enums to chip drivers from sensors.h for now, as seen in drivers included in 2.5 tree. File no longer included from kernel side. Apply i2c-proc change in CVS tagged -km2. Partial clean and sort of includes everywhere. Add i2c-dev.h, as a partial copy from i2c. Add to sensors.h from i2c-proc.h to compile things. Remove i2c-isa.h. Reflect header file changes to lib/ and prog/. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1705 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
1 parent
d2e650b473
commit
1cfe63804a
68 files changed
+1609
-879
No files matched your search
+12
-14
@@ -21,12 +21,11 @@
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/version.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/i2c.h>
|
||||
#include "sensors.h"
|
||||
#include "version.h"
|
||||
#include <linux/i2c-proc.h>
|
||||
#include <linux/init.h>
|
||||
#include "version.h"
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@@ -73,8 +72,6 @@ static int ddcmon_attach_adapter(struct i2c_adapter *adapter);
|
||||
static int ddcmon_detect(struct i2c_adapter *adapter, int address,
|
||||
unsigned short flags, int kind);
|
||||
static int ddcmon_detach_client(struct i2c_client *client);
|
||||
static int ddcmon_command(struct i2c_client *client, unsigned int cmd,
|
||||
void *arg);
|
||||
|
||||
static void ddcmon_idcall(struct i2c_client *client, int operation,
|
||||
int ctl_name, int *nrels_mag, long *results);
|
||||
@@ -97,9 +94,17 @@ static struct i2c_driver ddcmon_driver = {
|
||||
.flags = I2C_DF_NOTIFY,
|
||||
.attach_adapter = ddcmon_attach_adapter,
|
||||
.detach_client = ddcmon_detach_client,
|
||||
.command = ddcmon_command,
|
||||
};
|
||||
|
||||
/* -- SENSORS SYSCTL START -- */
|
||||
#define DDCMON_SYSCTL_ID 1010
|
||||
#define DDCMON_SYSCTL_SIZE 1011
|
||||
#define DDCMON_SYSCTL_SYNC 1012
|
||||
#define DDCMON_SYSCTL_TIMINGS 1013
|
||||
#define DDCMON_SYSCTL_SERIAL 1014
|
||||
|
||||
/* -- SENSORS SYSCTL END -- */
|
||||
|
||||
/* These files are created for each detected DDCMON. This is just a template;
|
||||
though at first sight, you might think we could use a statically
|
||||
allocated list, we need some way to get back to the parent - which
|
||||
@@ -188,8 +193,7 @@ int ddcmon_detect(struct i2c_adapter *adapter, int address,
|
||||
|
||||
/* Register a new directory entry with module sensors */
|
||||
if ((i = i2c_register_entry(new_client, type_name,
|
||||
ddcmon_dir_table_template,
|
||||
THIS_MODULE)) < 0) {
|
||||
ddcmon_dir_table_template)) < 0) {
|
||||
err = i;
|
||||
goto ERROR4;
|
||||
}
|
||||
@@ -221,12 +225,6 @@ static int ddcmon_detach_client(struct i2c_client *client)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* No commands defined yet */
|
||||
static int ddcmon_command(struct i2c_client *client, unsigned int cmd, void *arg)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void ddcmon_update_client(struct i2c_client *client)
|
||||
{
|
||||
struct ddcmon_data *data = client->data;
|
||||
|
||||
Reference in new issue
Block a user