tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6.git/

Linus Torvalds c79bea07 a9e4820c

+10 -10
unified split
+1 -1
drivers/i2c/chips/it87.c
··· 668 struct it87_data *data = it87_update_device(dev); 669 return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms)); 670 } 671 - static DEVICE_ATTR(alarms, S_IRUGO | S_IWUSR, show_alarms, NULL); 672 673 static ssize_t 674 show_vrm_reg(struct device *dev, char *buf)
··· 668 struct it87_data *data = it87_update_device(dev); 669 return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms)); 670 } 671 + static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL); 672 673 static ssize_t 674 show_vrm_reg(struct device *dev, char *buf)
+2 -3
drivers/i2c/chips/via686a.c
··· 574 struct via686a_data *data = via686a_update_device(dev); 575 return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms)); 576 } 577 - static DEVICE_ATTR(alarms, S_IRUGO | S_IWUSR, show_alarms, NULL); 578 579 /* The driver. I choose to use type i2c_driver, as at is identical to both 580 smbus_driver and isa_driver, and clients could be of either kind */ ··· 651 new_client->adapter = adapter; 652 new_client->driver = &via686a_driver; 653 new_client->flags = 0; 654 - new_client->dev.parent = &adapter->dev; 655 656 /* Fill in the remaining client fields and put into the global list */ 657 - snprintf(new_client->name, I2C_NAME_SIZE, client_name); 658 659 data->valid = 0; 660 init_MUTEX(&data->update_lock);
··· 574 struct via686a_data *data = via686a_update_device(dev); 575 return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms)); 576 } 577 + static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL); 578 579 /* The driver. I choose to use type i2c_driver, as at is identical to both 580 smbus_driver and isa_driver, and clients could be of either kind */ ··· 651 new_client->adapter = adapter; 652 new_client->driver = &via686a_driver; 653 new_client->flags = 0; 654 655 /* Fill in the remaining client fields and put into the global list */ 656 + strlcpy(new_client->name, client_name, I2C_NAME_SIZE); 657 658 data->valid = 0; 659 init_MUTEX(&data->update_lock);
+5 -4
drivers/w1/w1.c
··· 522 slave_count++; 523 } 524 525 - if (slave_count == dev->slave_count && rn ) { 526 - tmp = cpu_to_le64(rn); 527 - if(((rn >> 56) & 0xff) == w1_calc_crc8((u8 *)&tmp, 7)) 528 - w1_attach_slave_device(dev, (struct w1_reg_num *) &rn); 529 } 530 531 atomic_dec(&dev->refcnt);
··· 522 slave_count++; 523 } 524 525 + rn = cpu_to_le64(rn); 526 + 527 + if (slave_count == dev->slave_count && 528 + rn && ((le64_to_cpu(rn) >> 56) & 0xff) == w1_calc_crc8((u8 *)&rn, 7)) { 529 + w1_attach_slave_device(dev, tmp); 530 } 531 532 atomic_dec(&dev->refcnt);
+2 -2
drivers/w1/w1_smem.c
··· 60 int i; 61 ssize_t count = 0; 62 63 - for (i = 0; i < 9; ++i) 64 count += sprintf(buf + count, "%02x ", ((u8 *)&sl->reg_num)[i]); 65 count += sprintf(buf + count, "\n"); 66 ··· 87 count = 0; 88 goto out; 89 } 90 - for (i = 0; i < 9; ++i) 91 count += sprintf(buf + count, "%02x ", ((u8 *)&sl->reg_num)[i]); 92 count += sprintf(buf + count, "\n"); 93
··· 60 int i; 61 ssize_t count = 0; 62 63 + for (i = 0; i < 8; ++i) 64 count += sprintf(buf + count, "%02x ", ((u8 *)&sl->reg_num)[i]); 65 count += sprintf(buf + count, "\n"); 66 ··· 87 count = 0; 88 goto out; 89 } 90 + for (i = 0; i < 8; ++i) 91 count += sprintf(buf + count, "%02x ", ((u8 *)&sl->reg_num)[i]); 92 count += sprintf(buf + count, "\n"); 93