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

Commit 550dbf47 authored by Stefan Achatz's avatar Stefan Achatz Committed by Jiri Kosina
Browse files

HID: roccat: Fix "cannot create duplicate filename" problems 



Fixing some wrong macro stringification/concatenation.

Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarStefan Achatz <erazor_de@users.sourceforge.net>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 19872d20

drivers/hid/hid-roccat-kone.c

+1 −1
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ static ssize_t kone_sysfs_write_profilex(struct file *fp, 
}

#define PROFILE_ATTR(number)					\

static struct bin_attribute bin_attr_profile##number = {	\

	.attr = { .name = "profile##number", .mode = 0660 },	\

	.attr = { .name = "profile" #number, .mode = 0660 },	\

	.size = sizeof(struct kone_profile),			\

	.read = kone_sysfs_read_profilex,			\

	.write = kone_sysfs_write_profilex,			\

drivers/hid/hid-roccat-koneplus.c

+2 −2
Original line number Diff line number Diff line
@@ -229,13 +229,13 @@ static ssize_t koneplus_sysfs_read_profilex_buttons(struct file *fp, 


#define PROFILE_ATTR(number)						\

static struct bin_attribute bin_attr_profile##number##_settings = {	\

	.attr = { .name = "profile##number##_settings", .mode = 0440 },	\

	.attr = { .name = "profile" #number "_settings", .mode = 0440 },	\

	.size = KONEPLUS_SIZE_PROFILE_SETTINGS,				\

	.read = koneplus_sysfs_read_profilex_settings,			\

	.private = &profile_numbers[number-1],				\

};									\

static struct bin_attribute bin_attr_profile##number##_buttons = {	\

	.attr = { .name = "profile##number##_buttons", .mode = 0440 },	\

	.attr = { .name = "profile" #number "_buttons", .mode = 0440 },	\

	.size = KONEPLUS_SIZE_PROFILE_BUTTONS,				\

	.read = koneplus_sysfs_read_profilex_buttons,			\

	.private = &profile_numbers[number-1],				\

drivers/hid/hid-roccat-kovaplus.c

+2 −2
Original line number Diff line number Diff line
@@ -257,13 +257,13 @@ static ssize_t kovaplus_sysfs_read_profilex_buttons(struct file *fp, 


#define PROFILE_ATTR(number)						\

static struct bin_attribute bin_attr_profile##number##_settings = {	\

	.attr = { .name = "profile##number##_settings", .mode = 0440 },	\

	.attr = { .name = "profile" #number "_settings", .mode = 0440 },	\

	.size = KOVAPLUS_SIZE_PROFILE_SETTINGS,				\

	.read = kovaplus_sysfs_read_profilex_settings,			\

	.private = &profile_numbers[number-1],				\

};									\

static struct bin_attribute bin_attr_profile##number##_buttons = {	\

	.attr = { .name = "profile##number##_buttons", .mode = 0440 },	\

	.attr = { .name = "profile" #number "_buttons", .mode = 0440 },	\

	.size = KOVAPLUS_SIZE_PROFILE_BUTTONS,				\

	.read = kovaplus_sysfs_read_profilex_buttons,			\

	.private = &profile_numbers[number-1],				\

drivers/hid/hid-roccat-pyra.c

+2 −2
Original line number Diff line number Diff line
@@ -225,13 +225,13 @@ static ssize_t pyra_sysfs_read_profilex_buttons(struct file *fp, 


#define PROFILE_ATTR(number)						\

static struct bin_attribute bin_attr_profile##number##_settings = {	\

	.attr = { .name = "profile##number##_settings", .mode = 0440 },	\

	.attr = { .name = "profile" #number "_settings", .mode = 0440 },	\

	.size = PYRA_SIZE_PROFILE_SETTINGS,				\

	.read = pyra_sysfs_read_profilex_settings,			\

	.private = &profile_numbers[number-1],				\

};									\

static struct bin_attribute bin_attr_profile##number##_buttons = {	\

	.attr = { .name = "profile##number##_buttons", .mode = 0440 },	\

	.attr = { .name = "profile" #number "_buttons", .mode = 0440 },	\

	.size = PYRA_SIZE_PROFILE_BUTTONS,				\

	.read = pyra_sysfs_read_profilex_buttons,			\

	.private = &profile_numbers[number-1],				\