mir/lm-sensors
2
0
Fork 0
mirror of https://github.com/lm-sensors/lm-sensors synced 2025-09-01 06:45:24 +00:00
Code Issues Releases Wiki Activity

Don't handle the isa bus in sensors_parse_i2cbus_name(). We really

Browse Source 
don't need to, as there is a single ISA bus, there's no need for
substituting anything.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4674 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare
2007-08-16 09:57:56 +00:00
parent 8896ba3b1f
commit e9fccf7d01
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/data.c
View File

@@ -190,10 +190,6 @@ int sensors_parse_i2cbus_name(const char *name, int *res)
{ {
int i; int i;
if (! strcmp(name,"isa")) {
*res = SENSORS_CHIP_NAME_BUS_ISA;
return 0;
}
if (strncmp(name,"i2c-",4)) { if (strncmp(name,"i2c-",4)) {
return -SENSORS_ERR_BUS_NAME; return -SENSORS_ERR_BUS_NAME;
} }

10
lib/sysfs.c
View File

@@ -374,17 +374,15 @@ int sensors_read_sysfs_bus(void)
(attr = sysfs_get_device_attr(dev, "name")))) (attr = sysfs_get_device_attr(dev, "name"))))
continue; continue;
if (sscanf(clsdev->name, "i2c-%d", &entry.number) != 1 ||
entry.number == 9191) /* legacy ISA */
continue;
/* NB: attr->value[attr->len-1] == '\n'; chop that off */ /* NB: attr->value[attr->len-1] == '\n'; chop that off */
entry.adapter = strndup(attr->value, attr->len - 1); entry.adapter = strndup(attr->value, attr->len - 1);
if (!entry.adapter) if (!entry.adapter)
sensors_fatal_error(__FUNCTION__, "out of memory"); sensors_fatal_error(__FUNCTION__, "out of memory");
if (!strncmp(entry.adapter, "ISA ", 4)) {
entry.number = SENSORS_CHIP_NAME_BUS_ISA;
} else if (sscanf(clsdev->name, "i2c-%d", &entry.number) != 1) {
continue;
}
sensors_add_proc_bus(&entry); sensors_add_proc_bus(&entry);
} }