Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01e8ef11 authored by Parag Warudkar's avatar Parag Warudkar Committed by Linus Torvalds
Browse files

x86: sysfs: kill owner field from attribute 



Tejun's commit 7b595756 made sysfs
attribute->owner unnecessary.  But the field was left in the structure to
ease the merge.  It's been over a year since that change and it is now
time to start killing attribute->owner along with its users - one arch at
a time!

This patch is attempt #1 to get rid of attribute->owner only for
CONFIG_X86_64 or CONFIG_X86_32 .  We will deal with other arches later on
as and when possible - avr32 will be the next since that is something I
can test.  Compile (make allyesconfig / make allmodconfig / custom config)
and boot tested.

akpm: the idea is that we put the declaration of sttribute.owner inside
`#ifndef CONFIG_X86'.  But that proved to be too ambitious for now because
new usages kept on turning up in subsystem trees.

[akpm: remove the ifdef for now]
Signed-off-by: default avatarParag Warudkar <parag.lkml@gmail.com>
Cc: Greg KH <greg@kroah.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Tejun Heo <htejun@gmail.com>
Cc: Len Brown <lenb@kernel.org>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: Roland Dreier <rolandd@cisco.com>
Cc: David Brownell <david-b@pacbell.net>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bb26b963

drivers/acpi/battery.c

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ static ssize_t acpi_battery_alarm_store(struct device *dev, 
}



static struct device_attribute alarm_attr = {

	.attr = {.name = "alarm", .mode = 0644, .owner = THIS_MODULE},

	.attr = {.name = "alarm", .mode = 0644},

	.show = acpi_battery_alarm_show,

	.store = acpi_battery_alarm_store,

};

drivers/acpi/sbs.c

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ static ssize_t acpi_battery_alarm_store(struct device *dev, 
}



static struct device_attribute alarm_attr = {

	.attr = {.name = "alarm", .mode = 0644, .owner = THIS_MODULE},

	.attr = {.name = "alarm", .mode = 0644},

	.show = acpi_battery_alarm_show,

	.store = acpi_battery_alarm_store,

};

drivers/acpi/system.c

+0 −1
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ static void acpi_table_attr_init(struct acpi_table_attr *table_attr, 
	table_attr->attr.read = acpi_table_show;

	table_attr->attr.attr.name = table_attr->name;

	table_attr->attr.attr.mode = 0444;

	table_attr->attr.attr.owner = THIS_MODULE;



	return;

}

drivers/block/aoe/aoeblk.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static DEVICE_ATTR(state, S_IRUGO, aoedisk_show_state, NULL); 
static DEVICE_ATTR(mac, S_IRUGO, aoedisk_show_mac, NULL);

static DEVICE_ATTR(netif, S_IRUGO, aoedisk_show_netif, NULL);

static struct device_attribute dev_attr_firmware_version = {

	.attr = { .name = "firmware-version", .mode = S_IRUGO, .owner = THIS_MODULE },

	.attr = { .name = "firmware-version", .mode = S_IRUGO },

	.show = aoedisk_show_fwver,

};

drivers/block/nbd.c

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ static ssize_t pid_show(struct device *dev, 
}



static struct device_attribute pid_attr = {

	.attr = { .name = "pid", .mode = S_IRUGO, .owner = THIS_MODULE },

	.attr = { .name = "pid", .mode = S_IRUGO},

	.show = pid_show,

};