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
  ...

1 files changed, 0 insertions, 10 deletions

diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index 8e222f2b80cc..b5df7e61aeb2 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -2171,52 +2171,42 @@ static int create_files(struct bmc_device *bmc)
         int err;
 
         bmc->device_id_attr.attr.name = "device_id";
-        bmc->device_id_attr.attr.owner = THIS_MODULE;
         bmc->device_id_attr.attr.mode = S_IRUGO;
         bmc->device_id_attr.show = device_id_show;
 
         bmc->provides_dev_sdrs_attr.attr.name = "provides_device_sdrs";
-        bmc->provides_dev_sdrs_attr.attr.owner = THIS_MODULE;
         bmc->provides_dev_sdrs_attr.attr.mode = S_IRUGO;
         bmc->provides_dev_sdrs_attr.show = provides_dev_sdrs_show;
 
         bmc->revision_attr.attr.name = "revision";
-        bmc->revision_attr.attr.owner = THIS_MODULE;
         bmc->revision_attr.attr.mode = S_IRUGO;
         bmc->revision_attr.show = revision_show;
 
         bmc->firmware_rev_attr.attr.name = "firmware_revision";
-        bmc->firmware_rev_attr.attr.owner = THIS_MODULE;
         bmc->firmware_rev_attr.attr.mode = S_IRUGO;
         bmc->firmware_rev_attr.show = firmware_rev_show;
 
         bmc->version_attr.attr.name = "ipmi_version";
-        bmc->version_attr.attr.owner = THIS_MODULE;
         bmc->version_attr.attr.mode = S_IRUGO;
         bmc->version_attr.show = ipmi_version_show;
 
         bmc->add_dev_support_attr.attr.name = "additional_device_support";
-        bmc->add_dev_support_attr.attr.owner = THIS_MODULE;
         bmc->add_dev_support_attr.attr.mode = S_IRUGO;
         bmc->add_dev_support_attr.show = add_dev_support_show;
 
         bmc->manufacturer_id_attr.attr.name = "manufacturer_id";
-        bmc->manufacturer_id_attr.attr.owner = THIS_MODULE;
         bmc->manufacturer_id_attr.attr.mode = S_IRUGO;
         bmc->manufacturer_id_attr.show = manufacturer_id_show;
 
         bmc->product_id_attr.attr.name = "product_id";
-        bmc->product_id_attr.attr.owner = THIS_MODULE;
         bmc->product_id_attr.attr.mode = S_IRUGO;
         bmc->product_id_attr.show = product_id_show;
 
         bmc->guid_attr.attr.name = "guid";
-        bmc->guid_attr.attr.owner = THIS_MODULE;
         bmc->guid_attr.attr.mode = S_IRUGO;
         bmc->guid_attr.show = guid_show;
 
         bmc->aux_firmware_rev_attr.attr.name = "aux_firmware_revision";
-        bmc->aux_firmware_rev_attr.attr.owner = THIS_MODULE;
         bmc->aux_firmware_rev_attr.attr.mode = S_IRUGO;
         bmc->aux_firmware_rev_attr.show = aux_firmware_rev_show;