42 files changed, 20 insertions, 81 deletions

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index f299e0d6abc4..61c67526a656 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -574,7 +574,6 @@ static int add_probe_files(struct bus_type *bus)
 
         bus->drivers_probe_attr.attr.name = "drivers_probe";
         bus->drivers_probe_attr.attr.mode = S_IWUSR;
-        bus->drivers_probe_attr.attr.owner = bus->owner;
         bus->drivers_probe_attr.store = store_drivers_probe;
         retval = bus_create_file(bus, &bus->drivers_probe_attr);
         if (retval)
@@ -582,7 +581,6 @@ static int add_probe_files(struct bus_type *bus)
 
         bus->drivers_autoprobe_attr.attr.name = "drivers_autoprobe";
         bus->drivers_autoprobe_attr.attr.mode = S_IWUSR | S_IRUGO;
-        bus->drivers_autoprobe_attr.attr.owner = bus->owner;
         bus->drivers_autoprobe_attr.show = show_drivers_autoprobe;
         bus->drivers_autoprobe_attr.store = store_drivers_autoprobe;
         retval = bus_create_file(bus, &bus->drivers_autoprobe_attr);
diff --git a/drivers/base/class.c b/drivers/base/class.c
index 8c506dbe3913..9cbfde23b9e3 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -605,7 +605,6 @@ int class_device_add(struct class_device *class_dev)
                 goto out3;
         class_dev->uevent_attr.attr.name = "uevent";
         class_dev->uevent_attr.attr.mode = S_IWUSR;
-        class_dev->uevent_attr.attr.owner = parent_class->owner;
         class_dev->uevent_attr.store = store_uevent;
         error = class_device_create_file(class_dev, &class_dev->uevent_attr);
         if (error)
@@ -620,7 +619,6 @@ int class_device_add(struct class_device *class_dev)
                 }
                 attr->attr.name = "dev";
                 attr->attr.mode = S_IRUGO;
-                attr->attr.owner = parent_class->owner;
                 attr->show = show_dev;
                 error = class_device_create_file(class_dev, attr);
                 if (error) {
diff --git a/drivers/base/core.c b/drivers/base/core.c
index cff4fbfbb055..e3fb87bfc6e1 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -683,8 +683,6 @@ int device_add(struct device *dev)
 
         dev->uevent_attr.attr.name = "uevent";
         dev->uevent_attr.attr.mode = S_IRUGO | S_IWUSR;
-        if (dev->driver)
-                dev->uevent_attr.attr.owner = dev->driver->owner;
         dev->uevent_attr.store = store_uevent;
         dev->uevent_attr.show = show_uevent;
         error = device_create_file(dev, &dev->uevent_attr);
@@ -700,8 +698,6 @@ int device_add(struct device *dev)
                 }
                 attr->attr.name = "dev";
                 attr->attr.mode = S_IRUGO;
-                if (dev->driver)
-                        attr->attr.owner = dev->driver->owner;
                 attr->show = show_dev;
                 error = device_create_file(dev, attr);
                 if (error) {
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 89a5f4a54913..0e511485d2e6 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -271,7 +271,7 @@ out:
 }
 
 static struct bin_attribute firmware_attr_data_tmpl = {
-        .attr = {.name = "data", .mode = 0644, .owner = THIS_MODULE},
+        .attr = {.name = "data", .mode = 0644},
         .size = 0,
         .read = firmware_data_read,
         .write = firmware_data_write,
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index f1b9dd7d47d6..ce64e86d6ffb 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -146,8 +146,7 @@ static void pkt_kobj_release(struct kobject *kobj)
  **********************************************************/
 
 #define DEF_ATTR(_obj,_name,_mode) \
-        static struct attribute _obj = { \
-                .name = _name, .owner = THIS_MODULE, .mode = _mode }
+        static struct attribute _obj = { .name = _name, .mode = _mode }
 
 /**********************************************************
   /sys/class/pktcdvd/pktcdvd[0-7]/
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;
 
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
index d2f0cbd8b8f3..917b9bab9ccb 100644
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -25,8 +25,7 @@ static spinlock_t cpufreq_stats_lock;
 
 #define CPUFREQ_STATDEVICE_ATTR(_name,_mode,_show) \
 static struct freq_attr _attr_##_name = {\
-        .attr = {.name = __stringify(_name), .owner = THIS_MODULE, \
-                .mode = _mode, }, \
+        .attr = {.name = __stringify(_name), .mode = _mode, }, \
         .show = _show,\
 };
 
diff --git a/drivers/cpufreq/cpufreq_userspace.c b/drivers/cpufreq/cpufreq_userspace.c
index 860345c7799a..a648970338b0 100644
--- a/drivers/cpufreq/cpufreq_userspace.c
+++ b/drivers/cpufreq/cpufreq_userspace.c
@@ -120,7 +120,7 @@ store_speed (struct cpufreq_policy *policy, const char *buf, size_t count)
 
 static struct freq_attr freq_attr_scaling_setspeed =
 {
-        .attr = { .name = "scaling_setspeed", .mode = 0644, .owner = THIS_MODULE },
+        .attr = { .name = "scaling_setspeed", .mode = 0644 },
         .show = show_speed,
         .store = store_speed,
 };
diff --git a/drivers/cpufreq/freq_table.c b/drivers/cpufreq/freq_table.c
index e7490925fdcf..5409f3afb3f8 100644
--- a/drivers/cpufreq/freq_table.c
+++ b/drivers/cpufreq/freq_table.c
@@ -199,7 +199,6 @@ static ssize_t show_available_freqs (struct cpufreq_policy *policy, char *buf)
 struct freq_attr cpufreq_freq_attr_scaling_available_freqs = {
         .attr = { .name = "scaling_available_frequencies",
                   .mode = 0444,
-                  .owner=THIS_MODULE
                 },
         .show = show_available_freqs,
 };
diff --git a/drivers/firmware/dcdbas.h b/drivers/firmware/dcdbas.h
index 58a85182b3e8..dcdba0f1b32c 100644
--- a/drivers/firmware/dcdbas.h
+++ b/drivers/firmware/dcdbas.h
@@ -67,8 +67,7 @@
 #define DCDBAS_BIN_ATTR_RW(_name) \
 struct bin_attribute bin_attr_##_name = { \
         .attr =  { .name = __stringify(_name), \
-                   .mode = 0600, \
-                   .owner = THIS_MODULE }, \
+                   .mode = 0600 }, \
         .read =  _name##_read, \
         .write = _name##_write, \
 }
diff --git a/drivers/firmware/dell_rbu.c b/drivers/firmware/dell_rbu.c
index fc702e40bd43..f8afecb7d0cf 100644
--- a/drivers/firmware/dell_rbu.c
+++ b/drivers/firmware/dell_rbu.c
@@ -687,18 +687,18 @@ static ssize_t write_rbu_packet_size(struct kobject *kobj, char *buffer,
 }
 
 static struct bin_attribute rbu_data_attr = {
-        .attr = {.name = "data",.owner = THIS_MODULE,.mode = 0444},
+        .attr = {.name = "data", .mode = 0444},
         .read = read_rbu_data,
 };
 
 static struct bin_attribute rbu_image_type_attr = {
-        .attr = {.name = "image_type",.owner = THIS_MODULE,.mode = 0644},
+        .attr = {.name = "image_type", .mode = 0644},
         .read = read_rbu_image_type,
         .write = write_rbu_image_type,
 };
 
 static struct bin_attribute rbu_packet_size_attr = {
-        .attr = {.name = "packet_size",.owner = THIS_MODULE,.mode = 0644},
+        .attr = {.name = "packet_size", .mode = 0644},
         .read = read_rbu_packet_size,
         .write = write_rbu_packet_size,
 };
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index d8806e4f1829..15232271d848 100644
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
@@ -74,7 +74,7 @@ static struct edd_device *edd_devices[EDD_MBR_SIG_MAX];
 
 #define EDD_DEVICE_ATTR(_name,_mode,_show,_test) \
 struct edd_attribute edd_attr_##_name = {       \
-        .attr = {.name = __stringify(_name), .mode = _mode, .owner = THIS_MODULE },     \
+        .attr = {.name = __stringify(_name), .mode = _mode },   \
         .show   = _show,                                \
         .test   = _test,                                \
 };
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index 1324984a4c35..bfd2d67df689 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -131,21 +131,21 @@ struct efivar_attribute {
 
 #define EFI_ATTR(_name, _mode, _show, _store) \
 struct subsys_attribute efi_attr_##_name = { \
-        .attr = {.name = __stringify(_name), .mode = _mode, .owner = THIS_MODULE}, \
+        .attr = {.name = __stringify(_name), .mode = _mode}, \
         .show = _show, \
         .store = _store, \
 };
 
 #define EFIVAR_ATTR(_name, _mode, _show, _store) \
 struct efivar_attribute efivar_attr_##_name = { \
-        .attr = {.name = __stringify(_name), .mode = _mode, .owner = THIS_MODULE}, \
+        .attr = {.name = __stringify(_name), .mode = _mode}, \
         .show = _show, \
         .store = _store, \
 };
 
 #define VAR_SUBSYS_ATTR(_name, _mode, _show, _store) \
 struct subsys_attribute var_subsys_attr_##_name = { \
-        .attr = {.name = __stringify(_name), .mode = _mode, .owner = THIS_MODULE}, \
+        .attr = {.name = __stringify(_name), .mode = _mode}, \
         .show = _show, \
         .store = _store, \
 };
diff --git a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c
index bfce13c8f1ff..5990dd5fc773 100644
--- a/drivers/i2c/chips/eeprom.c
+++ b/drivers/i2c/chips/eeprom.c
@@ -143,7 +143,6 @@ static struct bin_attribute eeprom_attr = {
         .attr = {
                 .name = "eeprom",
                 .mode = S_IRUGO,
-                .owner = THIS_MODULE,
         },
         .size = EEPROM_SIZE,
         .read = eeprom_read,
diff --git a/drivers/i2c/chips/max6875.c b/drivers/i2c/chips/max6875.c
index 76645c142977..1405ce5b236c 100644
--- a/drivers/i2c/chips/max6875.c
+++ b/drivers/i2c/chips/max6875.c
@@ -152,7 +152,6 @@ static struct bin_attribute user_eeprom_attr = {
         .attr = {
                 .name = "eeprom",
                 .mode = S_IRUGO,
-                .owner = THIS_MODULE,
         },
         .size = USER_EEPROM_SIZE,
         .read = max6875_read,
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index 08c299ebf4a8..bf9b99292048 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -479,7 +479,6 @@ alloc_group_attrs(ssize_t (*show)(struct ib_port *,
 
                 element->attr.attr.name  = element->name;
                 element->attr.attr.mode  = S_IRUGO;
-                element->attr.attr.owner = THIS_MODULE;
                 element->attr.show       = show;
                 element->index           = i;
 
diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
index 27a68835b5ba..1317bdd8cc7c 100644
--- a/drivers/input/mouse/psmouse.h
+++ b/drivers/input/mouse/psmouse.h
@@ -119,7 +119,6 @@ static struct psmouse_attribute psmouse_attr_##_name = {			\
                 .attr   = {                                                     \
                         .name   = __stringify(_name),                           \
                         .mode   = _mode,                                        \
-                        .owner  = THIS_MODULE,                                  \
                 },                                                              \
                 .show   = psmouse_attr_show_helper,                             \
                 .store  = psmouse_attr_set_helper,                              \
diff --git a/drivers/macintosh/windfarm_core.c b/drivers/macintosh/windfarm_core.c
index 11ced17f438a..4fcb245ba184 100644
--- a/drivers/macintosh/windfarm_core.c
+++ b/drivers/macintosh/windfarm_core.c
@@ -212,7 +212,6 @@ int wf_register_control(struct wf_control *new_ct)
         list_add(&new_ct->link, &wf_controls);
 
         new_ct->attr.attr.name = new_ct->name;
-        new_ct->attr.attr.owner = THIS_MODULE;
         new_ct->attr.attr.mode = 0644;
         new_ct->attr.show = wf_show_control;
         new_ct->attr.store = wf_store_control;
@@ -325,7 +324,6 @@ int wf_register_sensor(struct wf_sensor *new_sr)
         list_add(&new_sr->link, &wf_sensors);
 
         new_sr->attr.attr.name = new_sr->name;
-        new_sr->attr.attr.owner = THIS_MODULE;
         new_sr->attr.attr.mode = 0444;
         new_sr->attr.show = wf_show_sensor;
         new_sr->attr.store = NULL;
diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c
index 4f9060a2a2f2..7798f590e5aa 100644
--- a/drivers/misc/asus-laptop.c
+++ b/drivers/misc/asus-laptop.c
@@ -737,8 +737,7 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
         struct device_attribute dev_attr_##_name = {                    \
                 .attr = {                                               \
                         .name = __stringify(_name),                     \
-                        .mode = 0,                                      \
-                        .owner = THIS_MODULE },                         \
+                        .mode = 0 },                                    \
                 .show   = NULL,                                         \
                 .store  = NULL,                                         \
         }
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 6ec3d500f334..d96eb7229548 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -1337,7 +1337,7 @@ const char * buf, size_t count)
 
 #define ATTR(_name, _mode)      \
         struct attribute veth_##_name##_attr = {               \
-        .name = __stringify(_name), .mode = _mode, .owner = THIS_MODULE \
+        .name = __stringify(_name), .mode = _mode, \
         };
 
 static ATTR(active, 0644);
diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index 924ef0609460..fc4bde259dc7 100644
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
@@ -121,14 +121,14 @@ struct pdcspath_entry pdcspath_entry_##_name = { \
 
 #define PDCS_ATTR(_name, _mode, _show, _store) \
 struct subsys_attribute pdcs_attr_##_name = { \
-        .attr = {.name = __stringify(_name), .mode = _mode, .owner = THIS_MODULE}, \
+        .attr = {.name = __stringify(_name), .mode = _mode}, \
         .show = _show, \
         .store = _store, \
 };
 
 #define PATHS_ATTR(_name, _mode, _show, _store) \
 struct pdcspath_attribute paths_attr_##_name = { \
-        .attr = {.name = __stringify(_name), .mode = _mode, .owner = THIS_MODULE}, \
+        .attr = {.name = __stringify(_name), .mode = _mode}, \
         .show = _show, \
         .store = _store, \
 };
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index e7322c25d377..74556ec31a5b 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -117,7 +117,6 @@ static struct notification ibm_note;
 static struct bin_attribute ibm_apci_table_attr = {
             .attr = {
                     .name = "apci_table",
-                    .owner = THIS_MODULE,
                     .mode = S_IRUGO,
             },
             .read = ibm_read_apci_table,
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 284e83a527f9..d448f8df8613 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -499,7 +499,6 @@ static int pci_create_resource_files(struct pci_dev *pdev)
                         sprintf(res_attr_name, "resource%d", i);
                         res_attr->attr.name = res_attr_name;
                         res_attr->attr.mode = S_IRUSR | S_IWUSR;
-                        res_attr->attr.owner = THIS_MODULE;
                         res_attr->size = pci_resource_len(pdev, i);
                         res_attr->mmap = pci_mmap_resource;
                         res_attr->private = &pdev->resource[i];
@@ -582,7 +581,6 @@ static struct bin_attribute pci_config_attr = {
         .attr = {
                 .name = "config",
                 .mode = S_IRUGO | S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size = 256,
         .read = pci_read_config,
@@ -593,7 +591,6 @@ static struct bin_attribute pcie_config_attr = {
         .attr = {
                 .name = "config",
                 .mode = S_IRUGO | S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size = 4096,
         .read = pci_read_config,
@@ -628,7 +625,6 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
                         rom_attr->size = pci_resource_len(pdev, PCI_ROM_RESOURCE);
                         rom_attr->attr.name = "rom";
                         rom_attr->attr.mode = S_IRUSR;
-                        rom_attr->attr.owner = THIS_MODULE;
                         rom_attr->read = pci_read_rom;
                         rom_attr->write = pci_write_rom;
                         retval = sysfs_create_bin_file(&pdev->dev.kobj, rom_attr);
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index e48fcf089621..08783bd381f5 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -39,7 +39,6 @@ static void pci_create_legacy_files(struct pci_bus *b)
                 b->legacy_io->attr.name = "legacy_io";
                 b->legacy_io->size = 0xffff;
                 b->legacy_io->attr.mode = S_IRUSR | S_IWUSR;
-                b->legacy_io->attr.owner = THIS_MODULE;
                 b->legacy_io->read = pci_read_legacy_io;
                 b->legacy_io->write = pci_write_legacy_io;
                 class_device_create_bin_file(&b->class_dev, b->legacy_io);
@@ -49,7 +48,6 @@ static void pci_create_legacy_files(struct pci_bus *b)
                 b->legacy_mem->attr.name = "legacy_mem";
                 b->legacy_mem->size = 1024*1024;
                 b->legacy_mem->attr.mode = S_IRUSR | S_IWUSR;
-                b->legacy_mem->attr.owner = THIS_MODULE;
                 b->legacy_mem->mmap = pci_mmap_legacy_mem;
                 class_device_create_bin_file(&b->class_dev, b->legacy_mem);
         }
diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c
index a2bb46526b56..dbfbe65779e5 100644
--- a/drivers/pcmcia/socket_sysfs.c
+++ b/drivers/pcmcia/socket_sysfs.c
@@ -366,7 +366,7 @@ static struct device_attribute *pccard_socket_attributes[] = {
 };
 
 static struct bin_attribute pccard_cis_attr = {
-        .attr = { .name = "cis", .mode = S_IRUGO | S_IWUSR, .owner = THIS_MODULE},
+        .attr = { .name = "cis", .mode = S_IRUGO | S_IWUSR },
         .size = 0x200,
         .read = pccard_show_cis,
         .write = pccard_store_cis,
diff --git a/drivers/rapidio/rio-sysfs.c b/drivers/rapidio/rio-sysfs.c
index eed91434417d..a3972b9f96e6 100644
--- a/drivers/rapidio/rio-sysfs.c
+++ b/drivers/rapidio/rio-sysfs.c
@@ -197,7 +197,6 @@ static struct bin_attribute rio_config_attr = {
         .attr = {
                  .name = "config",
                  .mode = S_IRUGO | S_IWUSR,
-                 .owner = THIS_MODULE,
                  },
         .size = 0x200000,
         .read = rio_read_config,
diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c
index afa64c7fa2e2..b024cfb558f4 100644
--- a/drivers/rtc/rtc-ds1553.c
+++ b/drivers/rtc/rtc-ds1553.c
@@ -290,7 +290,6 @@ static struct bin_attribute ds1553_nvram_attr = {
         .attr = {
                 .name = "nvram",
                 .mode = S_IRUGO | S_IWUGO,
-                .owner = THIS_MODULE,
         },
         .size = RTC_OFFSET,
         .read = ds1553_nvram_read,
diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c
index d68288b389dc..1638acdbc913 100644
--- a/drivers/rtc/rtc-ds1742.c
+++ b/drivers/rtc/rtc-ds1742.c
@@ -159,7 +159,6 @@ static struct bin_attribute ds1742_nvram_attr = {
         .attr = {
                 .name = "nvram",
                 .mode = S_IRUGO | S_IWUGO,
-                .owner = THIS_MODULE,
         },
         .read = ds1742_nvram_read,
         .write = ds1742_nvram_write,
diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c
index ac289e6eadfe..96a8a72a6083 100644
--- a/drivers/s390/cio/chp.c
+++ b/drivers/s390/cio/chp.c
@@ -165,7 +165,6 @@ static struct bin_attribute chp_measurement_chars_attr = {
         .attr = {
                 .name = "measurement_chars",
                 .mode = S_IRUSR,
-                .owner = THIS_MODULE,
         },
         .size = sizeof(struct cmg_chars),
         .read = chp_measurement_chars_read,
@@ -217,7 +216,6 @@ static struct bin_attribute chp_measurement_attr = {
         .attr = {
                 .name = "measurement",
                 .mode = S_IRUSR,
-                .owner = THIS_MODULE,
         },
         .size = sizeof(struct cmg_entry),
         .read = chp_measurement_read,
diff --git a/drivers/s390/net/qeth_sys.c b/drivers/s390/net/qeth_sys.c
index 65ffc21afc37..bb0287ad1aac 100644
--- a/drivers/s390/net/qeth_sys.c
+++ b/drivers/s390/net/qeth_sys.c
@@ -991,7 +991,7 @@ static struct attribute_group qeth_osn_device_attr_group = {
 
 #define QETH_DEVICE_ATTR(_id,_name,_mode,_show,_store)                       \
 struct device_attribute dev_attr_##_id = {                                   \
-        .attr = {.name=__stringify(_name), .mode=_mode, .owner=THIS_MODULE },\
+        .attr = {.name=__stringify(_name), .mode=_mode, },\
         .show   = _show,                                                     \
         .store  = _store,                                                    \
 };
diff --git a/drivers/scsi/arcmsr/arcmsr_attr.c b/drivers/scsi/arcmsr/arcmsr_attr.c
index 03bfed61bffc..8908228bc134 100644
--- a/drivers/scsi/arcmsr/arcmsr_attr.c
+++ b/drivers/scsi/arcmsr/arcmsr_attr.c
@@ -188,7 +188,6 @@ static struct bin_attribute arcmsr_sysfs_message_read_attr = {
         .attr = {
                 .name = "mu_read",
                 .mode = S_IRUSR ,
-                .owner = THIS_MODULE,
         },
         .size = 1032,
         .read = arcmsr_sysfs_iop_message_read,
@@ -198,7 +197,6 @@ static struct bin_attribute arcmsr_sysfs_message_write_attr = {
         .attr = {
                 .name = "mu_write",
                 .mode = S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size = 1032,
         .write = arcmsr_sysfs_iop_message_write,
@@ -208,7 +206,6 @@ static struct bin_attribute arcmsr_sysfs_message_clear_attr = {
         .attr = {
                 .name = "mu_clear",
                 .mode = S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size = 1,
         .write = arcmsr_sysfs_iop_message_clear,
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index e34442e405e8..578ed79f4148 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -1368,7 +1368,6 @@ static void sas_ex_smp_hook(struct domain_device *dev)
         memset(bin_attr, 0, sizeof(*bin_attr));
 
         bin_attr->attr.name = SMP_BIN_ATTR_NAME;
-        bin_attr->attr.owner = THIS_MODULE;
         bin_attr->attr.mode = 0600;
 
         bin_attr->size = 0;
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index 95fe77e816f8..f81fe501a4a1 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -1200,7 +1200,6 @@ static struct bin_attribute sysfs_ctlreg_attr = {
         .attr = {
                 .name = "ctlreg",
                 .mode = S_IRUSR | S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size = 256,
         .read = sysfs_ctlreg_read,
@@ -1422,7 +1421,6 @@ static struct bin_attribute sysfs_mbox_attr = {
         .attr = {
                 .name = "mbox",
                 .mode = S_IRUSR | S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size = MAILBOX_CMD_SIZE,
         .read = sysfs_mbox_read,
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 8081b637d97e..96587253bfa9 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -73,7 +73,6 @@ static struct bin_attribute sysfs_fw_dump_attr = {
         .attr = {
                 .name = "fw_dump",
                 .mode = S_IRUSR | S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size = 0,
         .read = qla2x00_sysfs_read_fw_dump,
@@ -149,7 +148,6 @@ static struct bin_attribute sysfs_nvram_attr = {
         .attr = {
                 .name = "nvram",
                 .mode = S_IRUSR | S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size = 512,
         .read = qla2x00_sysfs_read_nvram,
@@ -198,7 +196,6 @@ static struct bin_attribute sysfs_optrom_attr = {
         .attr = {
                 .name = "optrom",
                 .mode = S_IRUSR | S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size = OPTROM_SIZE_24XX,
         .read = qla2x00_sysfs_read_optrom,
@@ -279,7 +276,6 @@ static struct bin_attribute sysfs_optrom_ctl_attr = {
         .attr = {
                 .name = "optrom_ctl",
                 .mode = S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size = 0,
         .write = qla2x00_sysfs_write_optrom_ctl,
@@ -327,7 +323,6 @@ static struct bin_attribute sysfs_vpd_attr = {
         .attr = {
                 .name = "vpd",
                 .mode = S_IRUSR | S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size = 0,
         .read = qla2x00_sysfs_read_vpd,
@@ -375,7 +370,6 @@ static struct bin_attribute sysfs_sfp_attr = {
         .attr = {
                 .name = "sfp",
                 .mode = S_IRUSR | S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size = SFP_DEV_SIZE * 2,
         .read = qla2x00_sysfs_read_sfp,
diff --git a/drivers/spi/at25.c b/drivers/spi/at25.c
index 8efa07e8b8c2..fde1dededba3 100644
--- a/drivers/spi/at25.c
+++ b/drivers/spi/at25.c
@@ -314,7 +314,6 @@ static int at25_probe(struct spi_device *spi)
          */
         at25->bin.attr.name = "eeprom";
         at25->bin.attr.mode = S_IRUSR;
-        at25->bin.attr.owner = THIS_MODULE;
         at25->bin.read = at25_bin_read;
 
         at25->bin.size = at25->chip.byte_len;
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 2ce050193018..3b3c6571f583 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -2126,7 +2126,6 @@ static ssize_t radeon_show_edid2(struct kobject *kobj, char *buf, loff_t off, si
 static struct bin_attribute edid1_attr = {
         .attr   = {
                 .name   = "edid1",
-                .owner  = THIS_MODULE,
                 .mode   = 0444,
         },
         .size   = EDID_LENGTH,
@@ -2136,7 +2135,6 @@ static struct bin_attribute edid1_attr = {
 static struct bin_attribute edid2_attr = {
         .attr   = {
                 .name   = "edid2",
-                .owner  = THIS_MODULE,
                 .mode   = 0444,
         },
         .size   = EDID_LENGTH,
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index c65e81ff3578..7e06223bca94 100644
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -172,7 +172,7 @@ static struct class backlight_class = {
 
 #define DECLARE_ATTR(_name,_mode,_show,_store)                  \
 {                                                               \
-        .attr   = { .name = __stringify(_name), .mode = _mode, .owner = THIS_MODULE },  \
+        .attr   = { .name = __stringify(_name), .mode = _mode }, \
         .show   = _show,                                        \
         .store  = _store,                                       \
 }
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
index 6ef8f0a7a137..648b53c1fdea 100644
--- a/drivers/video/backlight/lcd.c
+++ b/drivers/video/backlight/lcd.c
@@ -157,7 +157,7 @@ static struct class lcd_class = {
 
 #define DECLARE_ATTR(_name,_mode,_show,_store)                  \
 {                                                               \
-        .attr   = { .name = __stringify(_name), .mode = _mode, .owner = THIS_MODULE },  \
+        .attr   = { .name = __stringify(_name), .mode = _mode }, \
         .show   = _show,                                        \
         .store  = _store,                                       \
 }
diff --git a/drivers/w1/slaves/w1_ds2433.c b/drivers/w1/slaves/w1_ds2433.c
index 8ea17a53eed8..4e13aa71adea 100644
--- a/drivers/w1/slaves/w1_ds2433.c
+++ b/drivers/w1/slaves/w1_ds2433.c
@@ -252,7 +252,6 @@ static struct bin_attribute w1_f23_bin_attr = {
         .attr = {
                 .name = "eeprom",
                 .mode = S_IRUGO | S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size = W1_EEPROM_SIZE,
         .read = w1_f23_read_bin,
diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
index 1a6937dc190b..8ba4e572e09c 100644
--- a/drivers/w1/slaves/w1_therm.c
+++ b/drivers/w1/slaves/w1_therm.c
@@ -48,7 +48,6 @@ static struct bin_attribute w1_therm_bin_attr = {
         .attr = {
                 .name = "w1_slave",
                 .mode = S_IRUGO,
-                .owner = THIS_MODULE,
         },
         .size = W1_SLAVE_DATA_SIZE,
         .read = w1_therm_read_bin,
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 7d6876dbcc96..1838cb29b646 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -128,7 +128,6 @@ static struct bin_attribute w1_slave_attr_bin_id = {
       .attr = {
               .name = "id",
               .mode = S_IRUGO,
-              .owner = THIS_MODULE,
       },
       .size = 8,
       .read = w1_slave_read_id,
@@ -167,7 +166,6 @@ static struct bin_attribute w1_default_attr = {
       .attr = {
               .name = "rw",
               .mode = S_IRUGO | S_IWUSR,
-              .owner = THIS_MODULE,
       },
       .size = PAGE_SIZE,
       .read = w1_default_read,
diff --git a/drivers/zorro/zorro-sysfs.c b/drivers/zorro/zorro-sysfs.c
index c3ba0ec334c4..7e03cc68b182 100644
--- a/drivers/zorro/zorro-sysfs.c
+++ b/drivers/zorro/zorro-sysfs.c
@@ -78,7 +78,6 @@ static struct bin_attribute zorro_config_attr = {
         .attr = {
                 .name = "config",
                 .mode = S_IRUGO | S_IWUSR,
-                .owner = THIS_MODULE
         },
         .size = sizeof(struct ConfigDev),
         .read = zorro_read_config,