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

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: (61 commits)
  sysfs: add parameter "struct bin_attribute *" in .read/.write methods for sysfs binary attributes
  sysfs: make directory dentries and inodes reclaimable
  sysfs: implement sysfs_get_dentry()
  sysfs: move sysfs_drop_dentry() to dir.c and make it static
  sysfs: restructure add/remove paths and fix inode update
  sysfs: use sysfs_mutex to protect the sysfs_dirent tree
  sysfs: consolidate sysfs spinlocks
  sysfs: make kobj point to sysfs_dirent instead of dentry
  sysfs: implement sysfs_find_dirent() and sysfs_get_dirent()
  sysfs: implement SYSFS_FLAG_REMOVED flag
  sysfs: rename sysfs_dirent->s_type to s_flags and make room for flags
  sysfs: make sysfs_drop_dentry() access inodes using ilookup()
  sysfs: Fix oops in sysfs_drop_dentry on x86_64
  sysfs: use singly-linked list for sysfs_dirent tree
  sysfs: slim down sysfs_dirent->s_active
  sysfs: move s_active functions to fs/sysfs/dir.c
  sysfs: fix root sysfs_dirent -> root dentry association
  sysfs: use iget_locked() instead of new_inode()
  sysfs: reorganize sysfs_new_indoe() and sysfs_create()
  sysfs: fix parent refcounting during rename and move
  ...

diff --combined drivers/i2c/chips/eeprom.c
index 48f857ae87485fc51e9ea44d6914ea2f92189525,3328164311058dfe59070165fd834fa386077d0c..d3da1fb05b9bebe13d342f7d3a09fbbda585e58d
--- 1/drivers/i2c/chips/eeprom.c
--- 2/drivers/i2c/chips/eeprom.c
+++ b/drivers/i2c/chips/eeprom.c
@@@ -88,10 -88,8 +88,10 @@@ static void eeprom_update_client(struc
                dev_dbg(&client->dev, "Starting eeprom update, slice %u\n", slice);
  
                if (i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
 -                      for (i = slice << 5; i < (slice + 1) << 5; i += I2C_SMBUS_BLOCK_MAX)
 -                              if (i2c_smbus_read_i2c_block_data(client, i, data->data + i) != I2C_SMBUS_BLOCK_MAX)
 +                      for (i = slice << 5; i < (slice + 1) << 5; i += 32)
 +                              if (i2c_smbus_read_i2c_block_data(client, i,
 +                                                      32, data->data + i)
 +                                                      != 32)
                                        goto exit;
                } else {
                        if (i2c_smbus_write_byte(client, slice << 5)) {
@@@ -112,7 -110,8 +112,8 @@@ exit
        mutex_unlock(&data->update_lock);
  }
  
- static ssize_t eeprom_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
+ static ssize_t eeprom_read(struct kobject *kobj, struct bin_attribute *bin_attr,
+                          char *buf, loff_t off, size_t count)
  {
        struct i2c_client *client = to_i2c_client(container_of(kobj, struct device, kobj));
        struct eeprom_data *data = i2c_get_clientdata(client);
@@@ -145,7 -144,6 +146,6 @@@ static struct bin_attribute eeprom_att
        .attr = {
                .name = "eeprom",
                .mode = S_IRUGO,
-               .owner = THIS_MODULE,
        },
        .size = EEPROM_SIZE,
        .read = eeprom_read,

diff --combined drivers/i2c/chips/max6875.c
index e9e9e5171b5356fc76d5e8558ba599f493c89965,4e238c0a7ca3ab5c6816abb99c2db1596117f2cb..64692f666372e374cacfeaedaab1bad5293b3e1f
--- 1/drivers/i2c/chips/max6875.c
--- 2/drivers/i2c/chips/max6875.c
+++ b/drivers/i2c/chips/max6875.c
@@@ -106,7 -106,6 +106,7 @@@ static void max6875_update_slice(struc
                                            I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
                        if (i2c_smbus_read_i2c_block_data(client,
                                                          MAX6875_CMD_BLK_READ,
 +                                                        SLICE_SIZE,
                                                          buf) != SLICE_SIZE) {
                                goto exit_up;
                        }
@@@ -126,8 -125,9 +126,9 @@@ exit_up
        mutex_unlock(&data->update_lock);
  }
  
- static ssize_t max6875_read(struct kobject *kobj, char *buf, loff_t off,
-                           size_t count)
+ static ssize_t max6875_read(struct kobject *kobj,
+                           struct bin_attribute *bin_attr,
+                           char *buf, loff_t off, size_t count)
  {
        struct i2c_client *client = kobj_to_i2c_client(kobj);
        struct max6875_data *data = i2c_get_clientdata(client);
@@@ -153,7 -153,6 +154,6 @@@ static struct bin_attribute user_eeprom
        .attr = {
                .name = "eeprom",
                .mode = S_IRUGO,
-               .owner = THIS_MODULE,
        },
        .size = USER_EEPROM_SIZE,
        .read = max6875_read,