]> nv-tegra.nvidia Code Review - linux-3.10.git/commitdiff
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6.git/
authorLinus Torvalds <torvalds@ppc970.osdl.org.(none)>
Tue, 19 Apr 2005 14:31:40 +0000 (07:31 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org.(none)>
Tue, 19 Apr 2005 14:31:40 +0000 (07:31 -0700)
drivers/i2c/chips/it87.c
drivers/i2c/chips/via686a.c
drivers/w1/w1.c
drivers/w1/w1_smem.c

index 3d484a7aff127b9adc3120011efd7573f6eb0bf0..cf7e6898754f6dffe9a0bad6b77230f2922a37c9 100644 (file)
@@ -668,7 +668,7 @@ static ssize_t show_alarms(struct device *dev, char *buf)
        struct it87_data *data = it87_update_device(dev);
        return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms));
 }
-static DEVICE_ATTR(alarms, S_IRUGO | S_IWUSR, show_alarms, NULL);
+static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
 static ssize_t
 show_vrm_reg(struct device *dev, char *buf)
index 9b948f4531f5ade8899ca3efee959c7c3d33da04..6614a59cecd4a85e527ff5c172cf76cdcc0178d0 100644 (file)
@@ -574,7 +574,7 @@ static ssize_t show_alarms(struct device *dev, char *buf) {
        struct via686a_data *data = via686a_update_device(dev);
        return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms));
 }
-static DEVICE_ATTR(alarms, S_IRUGO | S_IWUSR, show_alarms, NULL);
+static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
 /* The driver. I choose to use type i2c_driver, as at is identical to both
    smbus_driver and isa_driver, and clients could be of either kind */
@@ -651,10 +651,9 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
        new_client->adapter = adapter;
        new_client->driver = &via686a_driver;
        new_client->flags = 0;
-       new_client->dev.parent = &adapter->dev;
 
        /* Fill in the remaining client fields and put into the global list */
-       snprintf(new_client->name, I2C_NAME_SIZE, client_name);
+       strlcpy(new_client->name, client_name, I2C_NAME_SIZE);
 
        data->valid = 0;
        init_MUTEX(&data->update_lock);
index fd630cec0e7915bcdbc620d49b098002b18bbc0c..8d7821899cc10440137299c7254ee4750c416d8d 100644 (file)
@@ -522,10 +522,11 @@ void w1_slave_found(unsigned long data, u64 rn)
                slave_count++;
        }
 
-               if (slave_count == dev->slave_count && rn ) {
-                       tmp = cpu_to_le64(rn);
-                       if(((rn >> 56) & 0xff) == w1_calc_crc8((u8 *)&tmp, 7))
-                               w1_attach_slave_device(dev, (struct w1_reg_num *) &rn);
+       rn = cpu_to_le64(rn);
+
+       if (slave_count == dev->slave_count &&
+               rn && ((le64_to_cpu(rn) >> 56) & 0xff) == w1_calc_crc8((u8 *)&rn, 7)) {
+               w1_attach_slave_device(dev, tmp);
        }
                        
        atomic_dec(&dev->refcnt);
index ab82eb7ed74f73061cdb630eda275d3aea0fe208..a54e425217a06736cdf873e8a914b434eb30a6ce 100644 (file)
@@ -60,7 +60,7 @@ static ssize_t w1_smem_read_val(struct device *dev, char *buf)
        int i;
        ssize_t count = 0;
        
-       for (i = 0; i < 9; ++i)
+       for (i = 0; i < 8; ++i)
                count += sprintf(buf + count, "%02x ", ((u8 *)&sl->reg_num)[i]);
        count += sprintf(buf + count, "\n");
 
@@ -87,7 +87,7 @@ static ssize_t w1_smem_read_bin(struct kobject *kobj, char *buf, loff_t off, siz
                count = 0;
                goto out;
        }
-       for (i = 0; i < 9; ++i)
+       for (i = 0; i < 8; ++i)
                count += sprintf(buf + count, "%02x ", ((u8 *)&sl->reg_num)[i]);
        count += sprintf(buf + count, "\n");