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

Commit 0933e2d9 authored by Andi Kleen's avatar Andi Kleen Committed by Greg Kroah-Hartman
Browse files

driver core: Convert some drivers to CLASS_ATTR_STRING 



Convert some drivers who export a single string as class attribute
to the new class_attr_string functions. This removes redundant
code all over.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 869dfc87

drivers/gpu/drm/drm_sysfs.c

+8 −11
Original line number Diff line number Diff line
@@ -70,20 +70,17 @@ static int drm_class_resume(struct device *dev) 
	return 0;

}



/* Display the version of drm_core. This doesn't work right in current design */

static ssize_t version_show(struct class *dev, struct class_attribute *attr,

				char *buf)

{

	return sprintf(buf, "%s %d.%d.%d %s\n", CORE_NAME, CORE_MAJOR,

		       CORE_MINOR, CORE_PATCHLEVEL, CORE_DATE);

}



static char *drm_devnode(struct device *dev, mode_t *mode)

{

	return kasprintf(GFP_KERNEL, "dri/%s", dev_name(dev));

}



static CLASS_ATTR(version, S_IRUGO, version_show, NULL);

static CLASS_ATTR_STRING(version, S_IRUGO,

		CORE_NAME " "

		__stringify(CORE_MAJOR) "."

		__stringify(CORE_MINOR) "."

		__stringify(CORE_PATCHLEVEL) " "

		CORE_DATE);



/**

 * drm_sysfs_create - create a struct drm_sysfs_class structure
@@ -110,7 +107,7 @@ struct class *drm_sysfs_create(struct module *owner, char *name) 
	class->suspend = drm_class_suspend;

	class->resume = drm_class_resume;



	err = class_create_file(class, &class_attr_version);

	err = class_create_file(class, &class_attr_version.attr);

	if (err)

		goto err_out_class;
@@ -133,7 +130,7 @@ void drm_sysfs_destroy(void) 
{

	if ((drm_class == NULL) || (IS_ERR(drm_class)))

		return;

	class_remove_file(drm_class, &class_attr_version);

	class_remove_file(drm_class, &class_attr_version.attr);

	class_destroy(drm_class);

}

drivers/infiniband/core/ucm.c

+5 −10
Original line number Diff line number Diff line
@@ -1336,13 +1336,8 @@ static void ib_ucm_remove_one(struct ib_device *device) 
	device_unregister(&ucm_dev->dev);

}



static ssize_t show_abi_version(struct class *class,

				struct class_attribute *attr,

				char *buf)

{

	return sprintf(buf, "%d\n", IB_USER_CM_ABI_VERSION);

}

static CLASS_ATTR(abi_version, S_IRUGO, show_abi_version, NULL);

static CLASS_ATTR_STRING(abi_version, S_IRUGO,

			 __stringify(IB_USER_CM_ABI_VERSION));



static int __init ib_ucm_init(void)

{
@@ -1355,7 +1350,7 @@ static int __init ib_ucm_init(void) 
		goto error1;

	}



	ret = class_create_file(&cm_class, &class_attr_abi_version);

	ret = class_create_file(&cm_class, &class_attr_abi_version.attr);

	if (ret) {

		printk(KERN_ERR "ucm: couldn't create abi_version attribute\n");

		goto error2;
@@ -1369,7 +1364,7 @@ static int __init ib_ucm_init(void) 
	return 0;



error3:

	class_remove_file(&cm_class, &class_attr_abi_version);

	class_remove_file(&cm_class, &class_attr_abi_version.attr);

error2:

	unregister_chrdev_region(IB_UCM_BASE_DEV, IB_UCM_MAX_DEVICES);

error1:
@@ -1379,7 +1374,7 @@ static int __init ib_ucm_init(void) 
static void __exit ib_ucm_cleanup(void)

{

	ib_unregister_client(&ucm_client);

	class_remove_file(&cm_class, &class_attr_abi_version);

	class_remove_file(&cm_class, &class_attr_abi_version.attr);

	unregister_chrdev_region(IB_UCM_BASE_DEV, IB_UCM_MAX_DEVICES);

	if (overflow_maj)

		unregister_chrdev_region(overflow_maj, IB_UCM_MAX_DEVICES);

drivers/infiniband/core/user_mad.c

+3 −8
Original line number Diff line number Diff line
@@ -965,13 +965,8 @@ static ssize_t show_port(struct device *dev, struct device_attribute *attr, 
}

static DEVICE_ATTR(port, S_IRUGO, show_port, NULL);



static ssize_t show_abi_version(struct class *class,

				struct class_attribute *attr,

				char *buf)

{

	return sprintf(buf, "%d\n", IB_USER_MAD_ABI_VERSION);

}

static CLASS_ATTR(abi_version, S_IRUGO, show_abi_version, NULL);

static CLASS_ATTR_STRING(abi_version, S_IRUGO,

			 __stringify(IB_USER_MAD_ABI_VERSION));



static dev_t overflow_maj;

static DECLARE_BITMAP(overflow_map, IB_UMAD_MAX_PORTS);
@@ -1196,7 +1191,7 @@ static int __init ib_umad_init(void) 
		goto out_chrdev;

	}



	ret = class_create_file(umad_class, &class_attr_abi_version);

	ret = class_create_file(umad_class, &class_attr_abi_version.attr);

	if (ret) {

		printk(KERN_ERR "user_mad: couldn't create abi_version attribute\n");

		goto out_class;

drivers/infiniband/core/uverbs_main.c

+3 −8
Original line number Diff line number Diff line
@@ -691,13 +691,8 @@ static ssize_t show_dev_abi_version(struct device *device, 
}

static DEVICE_ATTR(abi_version, S_IRUGO, show_dev_abi_version, NULL);



static ssize_t show_abi_version(struct class *class,

				struct class_attribute *attr,

				char *buf)

{

	return sprintf(buf, "%d\n", IB_USER_VERBS_ABI_VERSION);

}

static CLASS_ATTR(abi_version, S_IRUGO, show_abi_version, NULL);

static CLASS_ATTR_STRING(abi_version, S_IRUGO,

			 __stringify(IB_USER_VERBS_ABI_VERSION));



static dev_t overflow_maj;

static DECLARE_BITMAP(overflow_map, IB_UVERBS_MAX_DEVICES);
@@ -843,7 +838,7 @@ static int __init ib_uverbs_init(void) 
		goto out_chrdev;

	}



	ret = class_create_file(uverbs_class, &class_attr_abi_version);

	ret = class_create_file(uverbs_class, &class_attr_abi_version.attr);

	if (ret) {

		printk(KERN_ERR "user_verbs: couldn't create abi_version attribute\n");

		goto out_class;

drivers/misc/phantom.c

+4 −9
Original line number Diff line number Diff line
@@ -497,12 +497,7 @@ static struct pci_driver phantom_pci_driver = { 
	.resume = phantom_resume

};



static ssize_t phantom_show_version(struct class *cls, struct class_attribute *attr, char *buf)

{

	return sprintf(buf, PHANTOM_VERSION "\n");

}



static CLASS_ATTR(version, 0444, phantom_show_version, NULL);

static CLASS_ATTR_STRING(version, 0444, PHANTOM_VERSION);



static int __init phantom_init(void)

{
@@ -515,7 +510,7 @@ static int __init phantom_init(void) 
		printk(KERN_ERR "phantom: can't register phantom class\n");

		goto err;

	}

	retval = class_create_file(phantom_class, &class_attr_version);

	retval = class_create_file(phantom_class, &class_attr_version.attr);

	if (retval) {

		printk(KERN_ERR "phantom: can't create sysfs version file\n");

		goto err_class;
@@ -541,7 +536,7 @@ static int __init phantom_init(void) 
err_unchr:

	unregister_chrdev_region(dev, PHANTOM_MAX_MINORS);

err_attr:

	class_remove_file(phantom_class, &class_attr_version);

	class_remove_file(phantom_class, &class_attr_version.attr);

err_class:

	class_destroy(phantom_class);

err:
@@ -554,7 +549,7 @@ static void __exit phantom_exit(void) 


	unregister_chrdev_region(MKDEV(phantom_major, 0), PHANTOM_MAX_MINORS);



	class_remove_file(phantom_class, &class_attr_version);

	class_remove_file(phantom_class, &class_attr_version.attr);

	class_destroy(phantom_class);



	pr_debug("phantom: module successfully removed\n");