mirror of
https://github.com/lm-sensors/lm-sensors.git
synced 2026-11-21 19:51:45 +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
+14
-22
@@ -24,14 +24,12 @@
|
||||
Copyright (C) 2000 Hypercore Software Design, Ltd.
|
||||
*/
|
||||
|
||||
#include <linux/version.h>
|
||||
#include <linux/module.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"
|
||||
|
||||
|
||||
/* Addresses to scan */
|
||||
@@ -96,8 +94,6 @@ static int smartbatt_detect(struct i2c_adapter *adapter, int address,
|
||||
unsigned short flags, int kind);
|
||||
static void smartbatt_init_client(struct i2c_client *client);
|
||||
static int smartbatt_detach_client(struct i2c_client *client);
|
||||
static int smartbatt_command(struct i2c_client *client, unsigned int cmd,
|
||||
void *arg);
|
||||
|
||||
static u16 swap_bytes(u16 val);
|
||||
static int sb_read(struct i2c_client *client, u8 reg);
|
||||
@@ -127,9 +123,19 @@ static struct i2c_driver smartbatt_driver = {
|
||||
.flags = I2C_DF_NOTIFY,
|
||||
.attach_adapter = smartbatt_attach_adapter,
|
||||
.detach_client = smartbatt_detach_client,
|
||||
.command = smartbatt_command,
|
||||
};
|
||||
|
||||
|
||||
/* -- SENSORS SYSCTL START -- */
|
||||
#define SMARTBATT_SYSCTL_I 1001
|
||||
#define SMARTBATT_SYSCTL_V 1002
|
||||
#define SMARTBATT_SYSCTL_TEMP 1003
|
||||
#define SMARTBATT_SYSCTL_TIME 1004
|
||||
#define SMARTBATT_SYSCTL_ALARMS 1005
|
||||
#define SMARTBATT_SYSCTL_CHARGE 1006
|
||||
|
||||
/* -- SENSORS SYSCTL END -- */
|
||||
|
||||
/* These files are created for each detected SMARTBATT. 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
|
||||
@@ -222,8 +228,7 @@ int smartbatt_detect(struct i2c_adapter *adapter, int address,
|
||||
|
||||
/* Register a new directory entry with module sensors */
|
||||
if ((i = i2c_register_entry(new_client, type_name,
|
||||
smartbatt_dir_table_template,
|
||||
THIS_MODULE)) < 0) {
|
||||
smartbatt_dir_table_template)) < 0) {
|
||||
err = i;
|
||||
goto ERROR4;
|
||||
}
|
||||
@@ -248,12 +253,6 @@ static int smartbatt_detach_client(struct i2c_client *client)
|
||||
{
|
||||
int err;
|
||||
|
||||
#ifdef MODULE
|
||||
if (MOD_IN_USE)
|
||||
return -EBUSY;
|
||||
#endif
|
||||
|
||||
|
||||
i2c_deregister_entry(((struct smartbatt_data *) (client->data))->
|
||||
sysctl_id);
|
||||
|
||||
@@ -269,13 +268,6 @@ static int smartbatt_detach_client(struct i2c_client *client)
|
||||
}
|
||||
|
||||
|
||||
/* No commands defined yet */
|
||||
static int smartbatt_command(struct i2c_client *client, unsigned int cmd, void *arg)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static u16 swap_bytes(u16 val)
|
||||
{
|
||||
return (val >> 8) | (val << 8);
|
||||
|
||||
Reference in new issue
Block a user