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

Commit 6f428096 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

driver core: remove CLASS_ATTR usage 



There was only 2 remaining users of CLASS_ATTR() so let's finally get
rid of them and force everyone to use the correct RW/RO/WO versions
instead.

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Acked-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 06a45a93

arch/powerpc/platforms/pseries/dlpar.c

+1 −1
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ static ssize_t dlpar_show(struct class *class, struct class_attribute *attr, 
	return sprintf(buf, "%s\n", "memory,cpu");

}



static CLASS_ATTR(dlpar, S_IWUSR | S_IRUSR, dlpar_show, dlpar_store);

static CLASS_ATTR_RW(dlpar);



static int __init pseries_dlpar_init(void)

{

arch/powerpc/platforms/pseries/mobility.c

+4 −3
Original line number Diff line number Diff line
@@ -349,8 +349,9 @@ void post_mobility_fixup(void) 
	return;

}



static ssize_t migrate_store(struct class *class, struct class_attribute *attr,

			     const char *buf, size_t count)

static ssize_t migration_store(struct class *class,

			       struct class_attribute *attr, const char *buf,

			       size_t count)

{

	u64 streamid;

	int rc;
@@ -380,7 +381,7 @@ static ssize_t migrate_store(struct class *class, struct class_attribute *attr, 
 */

#define MIGRATION_API_VERSION	1



static CLASS_ATTR(migration, S_IWUSR, NULL, migrate_store);

static CLASS_ATTR_WO(migration);

static CLASS_ATTR_STRING(api_version, S_IRUGO, __stringify(MIGRATION_API_VERSION));



static int __init mobility_sysfs_init(void)

include/linux/device.h

+0 −2
Original line number Diff line number Diff line
@@ -465,8 +465,6 @@ struct class_attribute { 
			const char *buf, size_t count);

};



#define CLASS_ATTR(_name, _mode, _show, _store) \

	struct class_attribute class_attr_##_name = __ATTR(_name, _mode, _show, _store)

#define CLASS_ATTR_RW(_name) \

	struct class_attribute class_attr_##_name = __ATTR_RW(_name)

#define CLASS_ATTR_RO(_name) \