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

Commit 46a58c44 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

HID: roccat: convert class code to use dev_groups 



The dev_attrs field of struct class is going away soon, dev_groups
should be used instead.  This converts the roccat class code to use the
correct field.

Cc: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a93d6b0a

drivers/hid/hid-roccat-arvo.c

+14 −11
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ static ssize_t arvo_sysfs_set_mode_key(struct device *dev, 


	return size;

}

static DEVICE_ATTR(mode_key, 0660,

		   arvo_sysfs_show_mode_key, arvo_sysfs_set_mode_key);



static ssize_t arvo_sysfs_show_key_mask(struct device *dev,

		struct device_attribute *attr, char *buf)
@@ -123,6 +125,8 @@ static ssize_t arvo_sysfs_set_key_mask(struct device *dev, 


	return size;

}

static DEVICE_ATTR(key_mask, 0660,

		   arvo_sysfs_show_key_mask, arvo_sysfs_set_key_mask);



/* retval is 1-5 on success, < 0 on error */

static int arvo_get_actual_profile(struct usb_device *usb_dev)
@@ -179,6 +183,9 @@ static ssize_t arvo_sysfs_set_actual_profile(struct device *dev, 
	mutex_unlock(&arvo->arvo_lock);

	return retval;

}

static DEVICE_ATTR(actual_profile, 0660,

		   arvo_sysfs_show_actual_profile,

		   arvo_sysfs_set_actual_profile);



static ssize_t arvo_sysfs_write(struct file *fp,

		struct kobject *kobj, void const *buf,
@@ -239,17 +246,13 @@ static ssize_t arvo_sysfs_read_info(struct file *fp, 
			sizeof(struct arvo_info), ARVO_COMMAND_INFO);

}





static struct device_attribute arvo_attributes[] = {

	__ATTR(mode_key, 0660,

			arvo_sysfs_show_mode_key, arvo_sysfs_set_mode_key),

	__ATTR(key_mask, 0660,

			arvo_sysfs_show_key_mask, arvo_sysfs_set_key_mask),

	__ATTR(actual_profile, 0660,

			arvo_sysfs_show_actual_profile,

			arvo_sysfs_set_actual_profile),

	__ATTR_NULL

static struct attribute *arvo_attrs[] = {

	&dev_attr_mode_key.attr,

	&dev_attr_key_mask.attr,

	&dev_attr_actual_profile.attr,

	NULL,

};

ATTRIBUTE_GROUPS(arvo);



static struct bin_attribute arvo_bin_attributes[] = {

	{
@@ -430,7 +433,7 @@ static int __init arvo_init(void) 
	arvo_class = class_create(THIS_MODULE, "arvo");

	if (IS_ERR(arvo_class))

		return PTR_ERR(arvo_class);

	arvo_class->dev_attrs = arvo_attributes;

	arvo_class->dev_groups = arvo_groups;

	arvo_class->dev_bin_attrs = arvo_bin_attributes;



	retval = hid_register_driver(&arvo_driver);

drivers/hid/hid-roccat-isku.c

+7 −6
Original line number Diff line number Diff line
@@ -109,13 +109,14 @@ static ssize_t isku_sysfs_set_actual_profile(struct device *dev, 


	return size;

}

static DEVICE_ATTR(actual_profile, 0660, isku_sysfs_show_actual_profile,

		   isku_sysfs_set_actual_profile);



static struct device_attribute isku_attributes[] = {

	__ATTR(actual_profile, 0660,

			isku_sysfs_show_actual_profile,

			isku_sysfs_set_actual_profile),

	__ATTR_NULL

static struct attribute *isku_attrs[] = {

	&dev_attr_actual_profile.attr,

	NULL,

};

ATTRIBUTE_GROUPS(isku);



static ssize_t isku_sysfs_read(struct file *fp, struct kobject *kobj,

		char *buf, loff_t off, size_t count,
@@ -427,7 +428,7 @@ static int __init isku_init(void) 
	isku_class = class_create(THIS_MODULE, "isku");

	if (IS_ERR(isku_class))

		return PTR_ERR(isku_class);

	isku_class->dev_attrs = isku_attributes;

	isku_class->dev_groups = isku_groups;

	isku_class->dev_bin_attrs = isku_bin_attributes;



	retval = hid_register_driver(&isku_driver);

drivers/hid/hid-roccat-kone.c

+18 −12
Original line number Diff line number Diff line
@@ -386,6 +386,7 @@ static ssize_t kone_sysfs_show_actual_profile(struct device *dev, 
			hid_get_drvdata(dev_get_drvdata(dev->parent->parent));

	return snprintf(buf, PAGE_SIZE, "%d\n", kone->actual_profile);

}

static DEVICE_ATTR(actual_profile, 0440, kone_sysfs_show_actual_profile, NULL);



static ssize_t kone_sysfs_show_actual_dpi(struct device *dev,

		struct device_attribute *attr, char *buf)
@@ -394,6 +395,7 @@ static ssize_t kone_sysfs_show_actual_dpi(struct device *dev, 
			hid_get_drvdata(dev_get_drvdata(dev->parent->parent));

	return snprintf(buf, PAGE_SIZE, "%d\n", kone->actual_dpi);

}

static DEVICE_ATTR(actual_dpi, 0440, kone_sysfs_show_actual_dpi, NULL);



/* weight is read each time, since we don't get informed when it's changed */

static ssize_t kone_sysfs_show_weight(struct device *dev,
@@ -416,6 +418,7 @@ static ssize_t kone_sysfs_show_weight(struct device *dev, 
		return retval;

	return snprintf(buf, PAGE_SIZE, "%d\n", weight);

}

static DEVICE_ATTR(weight, 0440, kone_sysfs_show_weight, NULL);



static ssize_t kone_sysfs_show_firmware_version(struct device *dev,

		struct device_attribute *attr, char *buf)
@@ -424,6 +427,8 @@ static ssize_t kone_sysfs_show_firmware_version(struct device *dev, 
			hid_get_drvdata(dev_get_drvdata(dev->parent->parent));

	return snprintf(buf, PAGE_SIZE, "%d\n", kone->firmware_version);

}

static DEVICE_ATTR(firmware_version, 0440, kone_sysfs_show_firmware_version,

		   NULL);



static ssize_t kone_sysfs_show_tcu(struct device *dev,

		struct device_attribute *attr, char *buf)
@@ -524,6 +529,7 @@ static ssize_t kone_sysfs_set_tcu(struct device *dev, 
	mutex_unlock(&kone->kone_lock);

	return retval;

}

static DEVICE_ATTR(tcu, 0660, kone_sysfs_show_tcu, kone_sysfs_set_tcu);



static ssize_t kone_sysfs_show_startup_profile(struct device *dev,

		struct device_attribute *attr, char *buf)
@@ -570,15 +576,17 @@ static ssize_t kone_sysfs_set_startup_profile(struct device *dev, 
	mutex_unlock(&kone->kone_lock);

	return size;

}

static DEVICE_ATTR(startup_profile, 0660, kone_sysfs_show_startup_profile,

		   kone_sysfs_set_startup_profile);



static struct device_attribute kone_attributes[] = {

static struct attribute *kone_attrs[] = {

	/*

	 * Read actual dpi settings.

	 * Returns raw value for further processing. Refer to enum

	 * kone_polling_rates to get real value.

	 */

	__ATTR(actual_dpi, 0440, kone_sysfs_show_actual_dpi, NULL),

	__ATTR(actual_profile, 0440, kone_sysfs_show_actual_profile, NULL),

	&dev_attr_actual_dpi.attr,

	&dev_attr_actual_profile.attr,



	/*

	 * The mouse can be equipped with one of four supplied weights from 5
@@ -587,7 +595,7 @@ static struct device_attribute kone_attributes[] = { 
	 * by software. Refer to enum kone_weights to get corresponding real

	 * weight.

	 */

	__ATTR(weight, 0440, kone_sysfs_show_weight, NULL),

	&dev_attr_weight.attr,



	/*

	 * Prints firmware version stored in mouse as integer.
@@ -595,22 +603,20 @@ static struct device_attribute kone_attributes[] = { 
	 * to get the real version number the decimal point has to be shifted 2

	 * positions to the left. E.g. a value of 138 means 1.38.

	 */

	__ATTR(firmware_version, 0440,

			kone_sysfs_show_firmware_version, NULL),

	&dev_attr_firmware_version.attr,



	/*

	 * Prints state of Tracking Control Unit as number where 0 = off and

	 * 1 = on. Writing 0 deactivates tcu and writing 1 calibrates and

	 * activates the tcu

	 */

	__ATTR(tcu, 0660, kone_sysfs_show_tcu, kone_sysfs_set_tcu),

	&dev_attr_tcu.attr,



	/* Prints and takes the number of the profile the mouse starts with */

	__ATTR(startup_profile, 0660,

			kone_sysfs_show_startup_profile,

			kone_sysfs_set_startup_profile),

	__ATTR_NULL

	&dev_attr_startup_profile.attr,

	NULL,

};

ATTRIBUTE_GROUPS(kone);



static struct bin_attribute kone_bin_attributes[] = {

	{
@@ -891,7 +897,7 @@ static int __init kone_init(void) 
	kone_class = class_create(THIS_MODULE, "kone");

	if (IS_ERR(kone_class))

		return PTR_ERR(kone_class);

	kone_class->dev_attrs = kone_attributes;

	kone_class->dev_groups = kone_groups;

	kone_class->dev_bin_attrs = kone_bin_attributes;



	retval = hid_register_driver(&kone_driver);

drivers/hid/hid-roccat-koneplus.c

+16 −12
Original line number Diff line number Diff line
@@ -274,6 +274,12 @@ static ssize_t koneplus_sysfs_set_actual_profile(struct device *dev, 


	return size;

}

static DEVICE_ATTR(actual_profile, 0660,

		   koneplus_sysfs_show_actual_profile,

		   koneplus_sysfs_set_actual_profile);

static DEVICE_ATTR(startup_profile, 0660,

		   koneplus_sysfs_show_actual_profile,

		   koneplus_sysfs_set_actual_profile);



static ssize_t koneplus_sysfs_show_firmware_version(struct device *dev,

		struct device_attribute *attr, char *buf)
@@ -293,18 +299,16 @@ static ssize_t koneplus_sysfs_show_firmware_version(struct device *dev, 


	return snprintf(buf, PAGE_SIZE, "%d\n", info.firmware_version);

}

static DEVICE_ATTR(firmware_version, 0440,

		   koneplus_sysfs_show_firmware_version, NULL);



static struct device_attribute koneplus_attributes[] = {

	__ATTR(actual_profile, 0660,

			koneplus_sysfs_show_actual_profile,

			koneplus_sysfs_set_actual_profile),

	__ATTR(startup_profile, 0660,

			koneplus_sysfs_show_actual_profile,

			koneplus_sysfs_set_actual_profile),

	__ATTR(firmware_version, 0440,

			koneplus_sysfs_show_firmware_version, NULL),

	__ATTR_NULL

static struct attribute *koneplus_attrs[] = {

	&dev_attr_actual_profile.attr,

	&dev_attr_startup_profile.attr,

	&dev_attr_firmware_version.attr,

	NULL,

};

ATTRIBUTE_GROUPS(koneplus);



static struct bin_attribute koneplus_bin_attributes[] = {

	KONEPLUS_BIN_ATTRIBUTE_W(control, CONTROL),
@@ -572,7 +576,7 @@ static int __init koneplus_init(void) 
	koneplus_class = class_create(THIS_MODULE, "koneplus");

	if (IS_ERR(koneplus_class))

		return PTR_ERR(koneplus_class);

	koneplus_class->dev_attrs = koneplus_attributes;

	koneplus_class->dev_groups = koneplus_groups;

	koneplus_class->dev_bin_attrs = koneplus_bin_attributes;



	retval = hid_register_driver(&koneplus_driver);

drivers/hid/hid-roccat-kovaplus.c

+19 −14
Original line number Diff line number Diff line
@@ -310,6 +310,9 @@ static ssize_t kovaplus_sysfs_set_actual_profile(struct device *dev, 


	return size;

}

static DEVICE_ATTR(actual_profile, 0660,

		   kovaplus_sysfs_show_actual_profile,

		   kovaplus_sysfs_set_actual_profile);



static ssize_t kovaplus_sysfs_show_actual_cpi(struct device *dev,

		struct device_attribute *attr, char *buf)
@@ -318,6 +321,7 @@ static ssize_t kovaplus_sysfs_show_actual_cpi(struct device *dev, 
			hid_get_drvdata(dev_get_drvdata(dev->parent->parent));

	return snprintf(buf, PAGE_SIZE, "%d\n", kovaplus->actual_cpi);

}

static DEVICE_ATTR(actual_cpi, 0440, kovaplus_sysfs_show_actual_cpi, NULL);



static ssize_t kovaplus_sysfs_show_actual_sensitivity_x(struct device *dev,

		struct device_attribute *attr, char *buf)
@@ -326,6 +330,8 @@ static ssize_t kovaplus_sysfs_show_actual_sensitivity_x(struct device *dev, 
			hid_get_drvdata(dev_get_drvdata(dev->parent->parent));

	return snprintf(buf, PAGE_SIZE, "%d\n", kovaplus->actual_x_sensitivity);

}

static DEVICE_ATTR(actual_sensitivity_x, 0440,

		   kovaplus_sysfs_show_actual_sensitivity_x, NULL);



static ssize_t kovaplus_sysfs_show_actual_sensitivity_y(struct device *dev,

		struct device_attribute *attr, char *buf)
@@ -334,6 +340,8 @@ static ssize_t kovaplus_sysfs_show_actual_sensitivity_y(struct device *dev, 
			hid_get_drvdata(dev_get_drvdata(dev->parent->parent));

	return snprintf(buf, PAGE_SIZE, "%d\n", kovaplus->actual_y_sensitivity);

}

static DEVICE_ATTR(actual_sensitivity_y, 0440,

		   kovaplus_sysfs_show_actual_sensitivity_y, NULL);



static ssize_t kovaplus_sysfs_show_firmware_version(struct device *dev,

		struct device_attribute *attr, char *buf)
@@ -353,21 +361,18 @@ static ssize_t kovaplus_sysfs_show_firmware_version(struct device *dev, 


	return snprintf(buf, PAGE_SIZE, "%d\n", info.firmware_version);

}

static DEVICE_ATTR(firmware_version, 0440,

		   kovaplus_sysfs_show_firmware_version, NULL);



static struct device_attribute kovaplus_attributes[] = {

	__ATTR(actual_cpi, 0440,

		kovaplus_sysfs_show_actual_cpi, NULL),

	__ATTR(firmware_version, 0440,

		kovaplus_sysfs_show_firmware_version, NULL),

	__ATTR(actual_profile, 0660,

		kovaplus_sysfs_show_actual_profile,

		kovaplus_sysfs_set_actual_profile),

	__ATTR(actual_sensitivity_x, 0440,

		kovaplus_sysfs_show_actual_sensitivity_x, NULL),

	__ATTR(actual_sensitivity_y, 0440,

		kovaplus_sysfs_show_actual_sensitivity_y, NULL),

	__ATTR_NULL

static struct attribute *kovaplus_attrs[] = {

	&dev_attr_actual_cpi.attr,

	&dev_attr_firmware_version.attr,

	&dev_attr_actual_profile.attr,

	&dev_attr_actual_sensitivity_x.attr,

	&dev_attr_actual_sensitivity_y.attr,

	NULL,

};

ATTRIBUTE_GROUPS(kovaplus);



static struct bin_attribute kovaplus_bin_attributes[] = {

	KOVAPLUS_BIN_ATTRIBUTE_W(control, CONTROL),
@@ -662,7 +667,7 @@ static int __init kovaplus_init(void) 
	kovaplus_class = class_create(THIS_MODULE, "kovaplus");

	if (IS_ERR(kovaplus_class))

		return PTR_ERR(kovaplus_class);

	kovaplus_class->dev_attrs = kovaplus_attributes;

	kovaplus_class->dev_groups = kovaplus_groups;

	kovaplus_class->dev_bin_attrs = kovaplus_bin_attributes;



	retval = hid_register_driver(&kovaplus_driver);