Changeset 4031

Timestamp:

05/31/06 16:31:01 (2 years ago)

Author:

anonymous

Message:

Fix the subclient handling.

Files:

• lm-sensors/trunk/kernel/chips/w83792d.c (modified) (7 diffs)

lm-sensors/trunk/kernel/chips/w83792d.c

@@ -253 +253 @@
-        unsigned long last_updated;     /* In jiffies */
-
-
+[2]
-        /* pointer to array of 2 subclients */
-
@@ -505 +505 @@
-}
-
+static int 
+w83792d_create_subclient(struct i2c_adapter *adapter,
+                                struct i2c_client *new_client, int addr,
+                                struct i2c_client **sub_cli) 
+{
+        int err;
+        struct i2c_client *sub_client;
+        
+        (*sub_cli) = sub_client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
+        if (!(sub_client)) {
+                return -ENOMEM;
+        }
+        memset(sub_client, 0x00, sizeof(struct i2c_client));
+        sub_client->addr = 0x48 + addr;
+        sub_client->data = NULL;
+        sub_client->adapter = adapter;
+        sub_client->driver = &w83792d_driver;
+        sub_client->flags = 0;
+        strcpy(sub_client->name, "w83792d subclient");
+        if ((err = i2c_attach_client(sub_client))) {
+                printk(KERN_ERR "w83792: subclient registration "
+                        "at address 0x%x failed\n", sub_client->addr);
+                kfree(sub_client);
+                return err;
+        }
+        return 0;
+}
+
+static int
+w83792d_detect_subclients(struct i2c_adapter *adapter, int address, int kind,
+                struct i2c_client *new_client)
+{
+        int i, id, err;
+        u8 val;
+        struct w83792d_data *data = new_client->data;
+
+        data->lm75[0] = NULL;
+        data->lm75[1] = NULL;
+
+        id = i2c_adapter_id(adapter);
+        if (force_subclients[0] == id && force_subclients[1] == address) {
+                for (i = 2; i <= 3; i++) {
+                        if (force_subclients[i] < 0x48 ||
+                            force_subclients[i] > 0x4f) {
+                                printk(KERN_ERR "w83792d: invalid subclient "
+                                        "address %d; must be 0x48-0x4f\n",
+                                        force_subclients[i]);
+                                err = -ENODEV;
+                                goto ERROR_SC_0;
+                        }
+                }
+                w83792d_write_value(new_client, W83792D_REG_I2C_SUBADDR,
+                                        (force_subclients[2] & 0x07) |
+                                        ((force_subclients[3] & 0x07) << 4));
+        }
+
+        val = w83792d_read_value(new_client, W83792D_REG_I2C_SUBADDR);
+        if (!(val & 0x08)) {
+                err = w83792d_create_subclient(adapter, new_client, val & 0x7,
+                                                &data->lm75[0]);
+                if (err < 0)
+                        goto ERROR_SC_0;
+        }
+        if (!(val & 0x80)) {
+                if ((data->lm75[0] != NULL) &&
+                        ((val & 0x7) == ((val >> 4) & 0x7))) {
+                        printk(KERN_ERR "w83792d: duplicate addresses 0x%x, "
+                                "use force_subclient\n", data->lm75[0]->addr);
+                        err = -ENODEV;
+                        goto ERROR_SC_1;
+                }
+                err = w83792d_create_subclient(adapter, new_client,
+                                                (val >> 4) & 0x7, &data->lm75[1]);
+                if (err < 0)
+                        goto ERROR_SC_1;
+        }
+
+        return 0;
+
+/* Undo inits in case of errors */
+
+ERROR_SC_1:
+        if (data->lm75[0] != NULL) {
+                i2c_detach_client(data->lm75[0]);
+                kfree(data->lm75[0]);
+        }
+ERROR_SC_0:
+        return err;
+}
+
+
-static int w83792d_detect(struct i2c_adapter *adapter, int address,
-                          unsigned short flags, int kind)
-{
-, id
+
-        struct i2c_client *new_client;
-        struct w83792d_data *data;
@@ -619 +710 @@
-                goto ERROR1;
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-        /* Read GPIO enable register to check if pins for fan 4,5 are used as
@@ -690 +733 @@
-                                    w83792d_dir_table_template, THIS_MODULE)) < 0) {
-                err = i;
-7
+3
-        }
-        data->sysctl_id = i;
@@ -699 +742 @@
-        return 0;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        i2c_detach_client(new_client);
-      
+
-        kfree(data);
-      
+
-
-        LEAVE()
@@ -727 +767 @@
-        ENTER()
-
-
+
+
+
-
-        if ((err = i2c_detach_client(client))) {
@@ -734 +776 @@
-                return err;
-        }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        return 0;
-}